diff --git a/.github/workflows/openmw.yml b/.github/workflows/openmw.yml
index 2b429df0a0..cfc1faa438 100644
--- a/.github/workflows/openmw.yml
+++ b/.github/workflows/openmw.yml
@@ -1,80 +1,264 @@
 name: CMake
 
 on:
-  push:
-    branches:
-      - 'master'
-  pull_request:
-    branches: [ master ]
+- push
+- pull_request
 
 env:
   BUILD_TYPE: RelWithDebInfo
+  VCPKG_DEPS_TAG: 2024-11-10
 
 jobs:
   Ubuntu:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
 
-      - name: Add OpenMW PPA Dependencies
-        run: sudo add-apt-repository ppa:openmw/openmw; sudo apt-get update
+    - name: Add OpenMW PPA Dependencies
+      run: sudo add-apt-repository ppa:openmw/openmw; sudo apt-get update
 
-      - name: Install Building Dependencies
-        run: sudo CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
+    - name: Install Building Dependencies
+      run: sudo CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
 
-      - name: Prime ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}
-          max-size: 1000M
+    - name: Prime ccache
+      uses: hendrikmuhs/ccache-action@v1
+      with:
+        key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}
+        max-size: 1000M
 
-      - name: Configure
-        run: cmake . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1 -DUSE_SYSTEM_TINYXML=1 -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=install
+    - name: Configure
+      run: >
+        cmake .
+        -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -D OPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
+        -D USE_SYSTEM_TINYXML=ON
+        -D BUILD_COMPONENTS_TESTS=ON
+        -D BUILD_OPENMW_TESTS=ON
+        -D BUILD_OPENCS_TESTS=ON
+        -D CMAKE_INSTALL_PREFIX=install
 
-      - name: Build
-        run: make -j3
+    - name: Build
+      run: cmake --build . -- -j$(nproc)
 
-      - name: Test
-        run: ./openmw_test_suite
+    - name: Run components tests
+      run: ./components-tests
 
-          #    - name: Install
-          #      shell: bash
-          #      run: cmake --install .
+    - name: Run OpenMW tests
+      run: ./openmw-tests
 
-          #    - name: Create Artifact
-          #      shell: bash
-          #      working-directory: install
-          #      run: |
-          #        ls -laR
-          #        7z a ../build_artifact.7z .
+    - name: Run OpenMW-CS tests
+      run: ./openmw-cs-tests
 
-  #    - name: Upload Artifact
-  #      uses: actions/upload-artifact@v1
-  #      with:
-  #        path: ./build_artifact.7z
-  #        name: build_artifact.7z
+    # - name: Install
+    #   shell: bash
+    #   run: cmake --install .
+
+    # - name: Create Artifact
+    #   shell: bash
+    #   working-directory: install
+    #   run: |
+    #     ls -laR
+    #     7z a ../build_artifact.7z .
+
+    # - name: Upload Artifact
+    #   uses: actions/upload-artifact@v1
+    #   with:
+    #     path: ./build_artifact.7z
+    #     name: build_artifact.7z
 
   MacOS:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
 
-      - name: Install Building Dependencies
-        run: CI/before_install.osx.sh
+    - name: Install Building Dependencies
+      run: CI/before_install.osx.sh
 
-      - name: Prime ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}
-          max-size: 1000M
+    - name: Prime ccache
+      uses: hendrikmuhs/ccache-action@v1
+      with:
+        key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}
+        max-size: 1000M
 
-      - name: Configure
-        run: |
-          rm -fr build  # remove the build directory
-          CI/before_script.osx.sh
-      - name: Build
-        run: |
-          cd build 
-          make -j $(sysctl -n hw.logicalcpu) package
+    - name: Configure
+      run: CI/before_script.osx.sh
+    - name: Build
+      run: |
+        cd build
+        make -j $(sysctl -n hw.logicalcpu) package
+
+  Windows:
+    strategy:
+      fail-fast: true
+      matrix:
+        image:
+        - "2019"
+        - "2022"
+
+    name: windows-${{ matrix.image }}
+
+    runs-on: windows-${{ matrix.image }}
+
+    env:
+      archive: FAILEDTODOWNLOAD
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create directories for dependencies
+      run: |
+        mkdir -p ${{ github.workspace }}/deps
+        mkdir -p ${{ github.workspace }}/deps/Qt
+
+    - name: Download prebuilt vcpkg packages
+      working-directory: ${{ github.workspace }}/deps
+      run: |
+        $MANIFEST = "vcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }}.txt"
+        curl --fail --retry 3 -L -o "$MANIFEST" "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/$MANIFEST"
+        $lines = Get-Content "$MANIFEST"
+        $URL = $lines[0]
+        $split = -split $lines[1]
+        $HASH = $split[0]
+        $FILE = $split[1]
+        curl --fail --retry 3 -L -o "$FILE" "$URL"
+        $filehash = Get-FileHash "$FILE" -Algorithm SHA512
+        if ( $filehash.hash -ne "$HASH" ) {
+          exit 1
+        }
+        echo "archive=$FILE" >> $env:GITHUB_ENV
+
+    - name: Extract archived prebuilt vcpkg packages
+      working-directory: ${{ github.workspace }}/deps
+      run: 7z x -y -ovcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }} ${{ env.archive }}
+
+    - name: Cache Qt
+      id: qt-cache
+      uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/deps/Qt/6.6.3/msvc2019_64
+        key: qt-cache-6.6.3-msvc2019_64-v1
+
+    - name: Download aqt
+      if: steps.qt-cache.outputs.cache-hit != 'true'
+      working-directory: ${{ github.workspace }}/deps/Qt
+      run: >
+        curl --fail --retry 3 -L
+        -o aqt_x64.exe
+        https://github.com/miurahr/aqtinstall/releases/download/v3.1.15/aqt_x64.exe
+
+    - name: Install Qt with aqt
+      if: steps.qt-cache.outputs.cache-hit != 'true'
+      working-directory: ${{ github.workspace }}/deps/Qt
+      run: .\aqt_x64.exe install-qt windows desktop 6.6.3 win64_msvc2019_64
+
+    - uses: ilammy/msvc-dev-cmd@v1
+
+    - uses: seanmiddleditch/gha-setup-ninja@master
+
+    - name: Configure OpenMW
+      run: >
+        cmake
+        -S .
+        -B ${{ github.workspace }}/build
+        -G Ninja
+        -D CMAKE_BUILD_TYPE=RelWithDebInfo
+        -D CMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/deps/vcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }}/scripts/buildsystems/vcpkg.cmake'
+        -D CMAKE_PREFIX_PATH='${{ github.workspace }}/deps/Qt/6.6.3/msvc2019_64'
+        -D LuaJit_INCLUDE_DIR='${{ github.workspace }}/deps/vcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }}/installed/x64-windows/include/luajit'
+        -D LuaJit_LIBRARY='${{ github.workspace }}/deps/vcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }}/installed/x64-windows/lib/lua51.lib'
+        -D BUILD_BENCHMARKS=ON
+        -D BUILD_COMPONENTS_TESTS=ON
+        -D BUILD_OPENMW_TESTS=ON
+        -D BUILD_OPENCS_TESTS=ON
+        -D OPENMW_USE_SYSTEM_SQLITE3=OFF
+        -D OPENMW_USE_SYSTEM_YAML_CPP=OFF
+        -D OPENMW_LTO_BUILD=ON
+
+    - name: Build OpenMW
+      run: cmake --build ${{ github.workspace }}/build
+
+    - name: Install OpenMW
+      run: cmake --install ${{ github.workspace }}/build --prefix ${{ github.workspace }}/install
+
+    - name: Copy missing DLLs
+      run: |
+        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }}/installed/x64-windows/bin/Release/MyGUIEngine.dll ${{ github.workspace }}/install
+        cp -Filter *.dll -Recurse ${{ github.workspace }}/deps/vcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }}/installed/x64-windows/bin/osgPlugins-3.6.5 ${{ github.workspace }}/install
+        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ matrix.image }}-${{ env.VCPKG_DEPS_TAG }}/installed/x64-windows/bin/*.dll ${{ github.workspace }}/install
+
+    - name: Copy Qt DLLs
+      working-directory: ${{ github.workspace }}/deps/Qt/6.6.3/msvc2019_64
+      run: |
+        cp bin/Qt6Core.dll ${{ github.workspace }}/install
+        cp bin/Qt6Gui.dll ${{ github.workspace }}/install
+        cp bin/Qt6Network.dll ${{ github.workspace }}/install
+        cp bin/Qt6OpenGL.dll ${{ github.workspace }}/install
+        cp bin/Qt6OpenGLWidgets.dll ${{ github.workspace }}/install
+        cp bin/Qt6Widgets.dll ${{ github.workspace }}/install
+        cp bin/Qt6Svg.dll ${{ github.workspace }}/install
+        mkdir ${{ github.workspace }}/install/styles
+        cp plugins/styles/qwindowsvistastyle.dll ${{ github.workspace }}/install/styles
+        mkdir ${{ github.workspace }}/install/platforms
+        cp plugins/platforms/qwindows.dll ${{ github.workspace }}/install/platforms
+        mkdir ${{ github.workspace }}/install/imageformats
+        cp plugins/imageformats/qsvg.dll ${{ github.workspace }}/install/imageformats
+        mkdir ${{ github.workspace }}/install/iconengines
+        cp plugins/iconengines/qsvgicon.dll ${{ github.workspace }}/install/iconengines
+
+    - name: Move pdb files
+      run: |
+        robocopy install pdb *.pdb /MOVE
+        if ($lastexitcode -lt 8) {
+          $global:LASTEXITCODE = $null
+        }
+
+    - name: Remove extra pdb files
+      shell: bash
+      run: |
+        rm -rf install/bin
+        rm -rf install/_deps
+
+    - name: Generate CI-ID.txt
+      shell: bash
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        job_url=$(gh run --repo ${{ github.repository }} view ${{ github.run_id }} --json jobs --jq '.jobs[] | select(.name == "windows-${{ matrix.image }}") | .url')
+        printf "Ref ${{ github.ref }}\nJob ${job_url}\nCommit ${{ github.sha }}\n" > install/CI-ID.txt
+        cp install/CI-ID.txt pdb/CI-ID.txt
+
+    - name: Store OpenMW archived pdb files
+      uses: actions/upload-artifact@v4
+      with:
+        name: openmw-windows-${{ matrix.image }}-pdb-${{ github.sha }}
+        path: ${{ github.workspace }}/pdb/*
+
+    - name: Store OpenMW build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: openmw-windows-${{ matrix.image }}-${{ github.sha }}
+        path: ${{ github.workspace }}/install/*
+
+    - name: Add install directory to PATH
+      shell: bash
+      run: echo '${{ github.workspace }}/install' >> ${GITHUB_PATH}
+
+    - name: Run components tests
+      run: build/components-tests.exe
+
+    - name: Run OpenMW tests
+      run: build/openmw-tests.exe
+
+    - name: Run OpenMW-CS tests
+      run: build/openmw-cs-tests.exe
+
+    - name: Run detournavigator navmeshtilescache benchmark
+      run: build/openmw_detournavigator_navmeshtilescache_benchmark.exe
+
+    - name: Run settings access benchmark
+      run: build/openmw_settings_access_benchmark.exe
+
+    - name: Run esm refid benchmark
+      run: build/openmw_esm_refid_benchmark.exe
diff --git a/.gitignore b/.gitignore
index f25adf58e6..39033bd725 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ Doxygen
 .idea
 cmake-build-*
 files/windows/*.aps
+.cache/clangd
 ## qt-creator
 CMakeLists.txt.user*
 .vs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6201785e8c..f1da3eb43c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,11 +22,11 @@ variables:
   # These can be specified per job or per pipeline
   ARTIFACT_COMPRESSION_LEVEL: "fast"
   CACHE_COMPRESSION_LEVEL: "fast"
+  FF_TIMESTAMPS: "true"
 
 .Ubuntu_Image:
   tags:
-    - docker
-    - linux
+    - saas-linux-medium-amd64
   image: ubuntu:22.04
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
@@ -70,15 +70,16 @@ Ubuntu_GCC_preprocess:
     - df -h
     - du -sh .
     - cmake --install .
-    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw_test_suite --gtest_output="xml:openmw_tests.xml"; fi
-    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw-cs-tests --gtest_output="xml:openmw_cs_tests.xml"; fi
+    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./components-tests --gtest_output="xml:components-tests.xml"; fi
+    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw-tests --gtest_output="xml:openmw-tests.xml"; fi
+    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw-cs-tests --gtest_output="xml:openmw-cs-tests.xml"; fi
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_detournavigator_navmeshtilescache_benchmark; fi
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_esm_refid_benchmark; fi
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_settings_access_benchmark; fi
     - ccache -s
     - df -h
     - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then gcovr --xml-pretty --exclude-unreachable-branches --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
-    - ls | grep -v -e '^extern$' -e '^install$' -e '^openmw_tests.xml$' -e '^openmw_cs_tests.xml$' | xargs -I '{}' rm -rf './{}'
+    - ls | grep -v -e '^extern$' -e '^install$' -e '^components-tests.xml$' -e '^openmw-tests.xml$' -e '^openmw-cs-tests.xml$' | xargs -I '{}' rm -rf './{}'
     - cd ..
     - df -h
     - du -sh build/
@@ -91,8 +92,7 @@ Ubuntu_GCC_preprocess:
 
 Coverity:
   tags:
-    - docker
-    - linux
+    - saas-linux-medium-amd64
   image: ubuntu:22.04
   stage: build
   rules:
@@ -116,6 +116,7 @@ Coverity:
   script:
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
+    - export COVERITY_NO_LOG_ENVIRONMENT_VARIABLES=1
     - mkdir -pv "${CCACHE_DIR}"
     - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_script.linux.sh
@@ -142,7 +143,7 @@ Ubuntu_GCC:
   variables:
     CC: gcc
     CXX: g++
-    CCACHE_SIZE: 4G
+    CCACHE_SIZE: 3G
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
   timeout: 2h
 
@@ -172,6 +173,20 @@ Clang_Format:
     - CI/check_file_names.sh
     - CI/check_clang_format.sh
 
+Lupdate:
+  extends: .Ubuntu_Image
+  stage: checks
+  cache:
+    key: Ubuntu_lupdate.ubuntu_22.04.v1
+    paths:
+      - apt-cache/
+  variables:
+    LUPDATE: lupdate
+  before_script:
+    - CI/install_debian_deps.sh openmw-qt-translations
+  script:
+    - CI/check_qt_translations.sh
+
 Teal:
   stage: checks
   extends: .Ubuntu_Image
@@ -181,8 +196,9 @@ Teal:
   script:
     - CI/teal_ci.sh
   artifacts:
+    when: always
     paths:
-      - teal_declarations.zip
+      - teal_declarations
 
 Ubuntu_GCC_Debug:
   extends: .Ubuntu
@@ -193,9 +209,10 @@ Ubuntu_GCC_Debug:
   variables:
     CC: gcc
     CXX: g++
-    CCACHE_SIZE: 4G
+    CCACHE_SIZE: 3G
     CMAKE_BUILD_TYPE: Debug
     CMAKE_CXX_FLAGS_DEBUG: -O0
+    BUILD_SHARED_LIBS: 1
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
   timeout: 2h
 
@@ -408,7 +425,7 @@ Ubuntu_Clang_Tidy_other:
   needs:
     - Ubuntu_Clang_Tidy_components
   variables:
-    BUILD_TARGETS: bsatool esmtool openmw-launcher openmw-iniimporter openmw-essimporter openmw-wizard niftest openmw_test_suite openmw-navmeshtool openmw-bulletobjecttool
+    BUILD_TARGETS: bsatool esmtool openmw-launcher openmw-iniimporter openmw-essimporter openmw-wizard niftest components-tests openmw-tests openmw-cs-tests openmw-navmeshtool openmw-bulletobjecttool
   timeout: 3h
 
 .Ubuntu_Clang_tests:
@@ -445,6 +462,7 @@ Ubuntu_Clang_tests_Debug:
   stage: test
   variables:
     PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+    EXAMPLE_SUITE_REVISION: f51b832e033429a7cdc520e0e48d7dfdb9141caa
   cache:
     paths:
       - .cache/pip
@@ -484,7 +502,6 @@ Ubuntu_GCC_integration_tests_asan:
     paths:
     - ccache/
   script:
-    - rm -fr build  # remove the build directory
     - CI/before_install.osx.sh
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
@@ -492,7 +509,7 @@ Ubuntu_GCC_integration_tests_asan:
     - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_script.osx.sh
     - cd build; make -j $(sysctl -n hw.logicalcpu) package
-    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME##*/}_${CI_JOB_ID}.dmg"; done
+    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
     - |
       if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
         artifactDirectory="${CI_PROJECT_NAMESPACE//[\"<>|$'\t'\/\\?*]/_}/${CI_COMMIT_REF_NAME//[\"<>|$'\t'\/\\?*]/_}/${CI_COMMIT_SHORT_SHA//[\"<>|$'\t'\/\\?*]/_}-${CI_JOB_ID//[\"<>|$'\t'\/\\?*]/_}/"
@@ -504,21 +521,59 @@ Ubuntu_GCC_integration_tests_asan:
   artifacts:
     paths:
       - build/OpenMW-*.dmg
-      - "build/**/*.log"
 
-macOS13_Xcode14_arm64:
+macOS14_Xcode15_arm64:
   extends: .MacOS
-  image: macos-12-xcode-14
+  image: macos-14-xcode-15
   tags:
     - saas-macos-medium-m1
   cache:
-    key: macOS12_Xcode14_arm64.v4
+    key: macOS14_Xcode15_arm64.v1
   variables:
     CCACHE_SIZE: 3G
 
+.Compress_And_Upload_Symbols_Base:
+  extends: .Ubuntu_Image
+  stage: build
+  variables:
+    GIT_STRATEGY: none
+  script:
+    - apt-get update
+    - apt-get install -y curl gcab unzip
+    - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o awscli-exe-linux-x86_64.zip
+    - unzip -d awscli-exe-linux-x86_64 awscli-exe-linux-x86_64.zip
+    - pushd awscli-exe-linux-x86_64
+    - ./aws/install
+    - popd
+    - aws --version
+    - unzip -d sym_store *sym_store.zip
+    - shopt -s globstar
+    - |
+      for file in sym_store/**/*.exe; do
+        if [[ -f "$file" ]]; then
+          gcab --create --zip --nopath "${file%.exe}.ex_" "$file"
+        fi
+      done
+    - |
+      for file in sym_store/**/*.dll; do
+        if [[ -f "$file" ]]; then
+          gcab --create --zip --nopath "${file%.dll}.dl_" "$file"
+        fi
+      done
+    - |
+      for file in sym_store/**/*.pdb; do
+        if [[ -f "$file" ]]; then
+          gcab --create --zip --nopath "${file%.pdb}.pd_" "$file"
+        fi
+      done
+    - |
+      if [[ -v AWS_ACCESS_KEY_ID ]]; then
+          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp --recursive --exclude '*' --include '*.ex_' --include '*.dl_' --include '*.pd_' sym_store s3://openmw-sym
+      fi
+
 .Windows_Ninja_Base:
   tags:
-    - windows
+    - saas-windows-medium-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
   before_script:
@@ -555,60 +610,53 @@ macOS13_Xcode14_arm64:
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - New-Item -Type File -Force -Path MSVC2019_64_Ninja\.cmake\api\v1\query\codemodel-v2
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C $multiview -E
+    - New-Item -Type File -Force -Path MSVC2022_64_Ninja\.cmake\api\v1\query\codemodel-v2
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2022 -k -V -N -b -t -C $multiview -E
     - Get-Volume
-    - cd MSVC2019_64_Ninja
+    - cd MSVC2022_64_Ninja
     - .\ActivateMSVC.ps1
-    - cmake --build . --config $config
-    - ccache --show-stats
+    - cmake --build . --config $config --target $targets
+    - ccache --show-stats -v
     - cd $config
     - echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
     - $artifactDirectory = "$(Make-SafeFileName("${CI_PROJECT_NAMESPACE}"))/$(Make-SafeFileName("${CI_COMMIT_REF_NAME}"))/$(Make-SafeFileName("${CI_COMMIT_SHORT_SHA}-${CI_JOB_ID}"))/"
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       if (Get-ChildItem -Recurse *.pdb) {
-        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
+        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
         if (Test-Path env:AWS_ACCESS_KEY_ID) {
-          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
+          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
         }
         Push-Location ..
-        ..\CI\Store-Symbols.ps1
-        if (Test-Path env:AWS_ACCESS_KEY_ID) {
-          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp --recursive --exclude * --include *.ex_ --include *.dl_ --include *.pd_ .\SymStore s3://openmw-sym
-        }
-        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
+        ..\CI\Store-Symbols.ps1 -SkipCompress
+        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
         Pop-Location
         Get-ChildItem -Recurse *.pdb | Remove-Item
       }
-    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
     - |
       if (Test-Path env:AWS_ACCESS_KEY_ID) {
-        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
+        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
       }
     - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
   after_script:
     - Get-Volume
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: ninja-v7
+    key: ninja-2022-v11
     paths:
     - ccache
     - deps
-    - MSVC2019_64_Ninja/deps/Qt
+    - MSVC2022_64_Ninja/deps/Qt
   artifacts:
     when: always
     paths:
     - "*.zip"
     - "*.log"
-    - MSVC2019_64_Ninja/*.log
-    - MSVC2019_64_Ninja/*/*.log
-    - MSVC2019_64_Ninja/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*/*/*/*.log
+    - MSVC2022_64_Ninja/*.log
+    - MSVC2022_64_Ninja/**/*.log
+  variables:
+    targets: all
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
   timeout: 2h
 
@@ -618,6 +666,13 @@ macOS13_Xcode14_arm64:
   variables:
     config: "Release"
 
+.Windows_Compress_And_Upload_Symbols_Ninja_Release:
+  extends:
+    - .Compress_And_Upload_Symbols_Base
+  needs:
+    - job: "Windows_Ninja_Release"
+      artifacts: true
+
 .Windows_Ninja_Release_MultiView:
   extends:
     - .Windows_Ninja_Base
@@ -625,23 +680,53 @@ macOS13_Xcode14_arm64:
     multiview: "-M"
     config: "Release"
 
+.Windows_Compress_And_Upload_Symbols_Ninja_Release_MultiView:
+  extends:
+    - .Compress_And_Upload_Symbols_Base
+  needs:
+    - job: "Windows_Ninja_Release_MultiView"
+      artifacts: true
+
 .Windows_Ninja_Debug:
   extends:
     - .Windows_Ninja_Base
   variables:
     config: "Debug"
 
+.Windows_Compress_And_Upload_Symbols_Ninja_Debug:
+  extends:
+    - .Compress_And_Upload_Symbols_Base
+  needs:
+    - job: "Windows_Ninja_Debug"
+      artifacts: true
+
 .Windows_Ninja_RelWithDebInfo:
   extends:
     - .Windows_Ninja_Base
   variables:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
-    # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    # executables: "components-tests.exe,openmw-tests.exe,openmw-cs-tests.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+
+.Windows_Compress_And_Upload_Symbols_Ninja_RelWithDebInfo:
+  extends:
+    - .Compress_And_Upload_Symbols_Base
+  needs:
+    - job: "Windows_Ninja_RelWithDebInfo"
+      artifacts: true
+
+.Windows_Ninja_CacheInit:
+  # currently, Windows jobs for all configs share the same cache key as we only cache the dependencies
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    config: "RelWithDebInfo"
+    targets: "get-version"
+  when: manual
 
 .Windows_MSBuild_Base:
   tags:
-    - windows
+    - saas-windows-medium-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
   before_script:
@@ -651,7 +736,6 @@ macOS13_Xcode14_arm64:
   - choco source disable -n=chocolatey
   - choco install git --force --params "/GitAndUnixToolsOnPath" -y
   - choco install 7zip -y
-  - choco install ccache -y
   - choco install vswhere -y
   - choco install python -y
   - choco install awscli -y
@@ -674,62 +758,50 @@ macOS13_Xcode14_arm64:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}
     - echo "started by ${GITLAB_USER_NAME}"
-    - $env:CCACHE_BASEDIR = Get-Location
-    - $env:CCACHE_DIR = "$(Get-Location)\ccache"
-    - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - New-Item -Type File -Force -Path MSVC2019_64\.cmake\api\v1\query\codemodel-v2
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview -E
-    - cd MSVC2019_64
+    - New-Item -Type File -Force -Path MSVC2022_64\.cmake\api\v1\query\codemodel-v2
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2022 -k -V -b -t -C $multiview -E
+    - cd MSVC2022_64
     - Get-Volume
-    - cmake --build . --config $config
-    - ccache --show-stats
+    - cmake --build . --config $config --target $targets
     - cd $config
     - echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
     - $artifactDirectory = "$(Make-SafeFileName("${CI_PROJECT_NAMESPACE}"))/$(Make-SafeFileName("${CI_COMMIT_REF_NAME}"))/$(Make-SafeFileName("${CI_COMMIT_SHORT_SHA}-${CI_JOB_ID}"))/"
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       if (Get-ChildItem -Recurse *.pdb) {
-        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
+        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
         if (Test-Path env:AWS_ACCESS_KEY_ID) {
-          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
+          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
         }
         Push-Location ..
-        ..\CI\Store-Symbols.ps1
-        if (Test-Path env:AWS_ACCESS_KEY_ID) {
-          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp --recursive --exclude * --include *.ex_ --include *.dl_ --include *.pd_ .\SymStore s3://openmw-sym
-        }
-        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
+        ..\CI\Store-Symbols.ps1 -SkipCompress
+        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
         Pop-Location
         Get-ChildItem -Recurse *.pdb | Remove-Item
       }
-    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
     - |
       if (Test-Path env:AWS_ACCESS_KEY_ID) {
-        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
+        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
       }
     - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
   after_script:
     - Get-Volume
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: msbuild-v7
+    key: msbuild-2022-v11
     paths:
-    - ccache
     - deps
-    - MSVC2019_64/deps/Qt
+    - MSVC2022_64/deps/Qt
   artifacts:
     when: always
     paths:
     - "*.zip"
     - "*.log"
-    - MSVC2019_64/*.log
-    - MSVC2019_64/*/*.log
-    - MSVC2019_64/*/*/*.log
-    - MSVC2019_64/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*/*/*/*.log
+    - MSVC2022_64/*.log
+    - MSVC2022_64/**/*.log
+  variables:
+    targets: ALL_BUILD
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
   timeout: 2h
 
@@ -739,27 +811,61 @@ macOS13_Xcode14_arm64:
   variables:
     config: "Release"
 
+.Windows_Compress_And_Upload_Symbols_MSBuild_Release:
+  extends:
+    - .Compress_And_Upload_Symbols_Base
+  needs:
+    - job: "Windows_MSBuild_Release"
+      artifacts: true
+
 .Windows_MSBuild_Debug:
   extends:
     - .Windows_MSBuild_Base
   variables:
     config: "Debug"
 
+.Windows_Compress_And_Upload_Symbols_MSBuild_Debug:
+  extends:
+    - .Compress_And_Upload_Symbols_Base
+  needs:
+    - job: "Windows_MSBuild_Debug"
+      artifacts: true
+
 Windows_MSBuild_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
-    # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    # executables: "components-tests.exe,openmw-tests.exe,openmw-cs-tests.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
   # temporarily enabled while we're linking these on the downloads page
   rules:
     # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule"
 
+Windows_Compress_And_Upload_Symbols_MSBuild_RelWithDebInfo:
+  extends:
+    - .Compress_And_Upload_Symbols_Base
+  needs:
+    - job: "Windows_MSBuild_RelWithDebInfo"
+      artifacts: true
+  # temporarily enabled while we're linking the above on the downloads page
+  rules:
+    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
+    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule"
+
+Windows_MSBuild_CacheInit:
+  # currently, Windows jobs for all configs share the same cache key as we only cache the dependencies
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    config: "RelWithDebInfo"
+    targets: "get-version"
+  when: manual
+
 .Ubuntu_AndroidNDK_arm64-v8a:
   tags:
-    - linux
+    - saas-linux-medium-amd64
   image: psi29a/android-ndk:focal-ndk22
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index e0b39ec495..962b34f516 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -4,7 +4,10 @@ sphinx:
   configuration: docs/source/conf.py
 
 python:
-  version: 3.8
   install:
     - requirements: docs/requirements.txt
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.8"
diff --git a/AUTHORS.md b/AUTHORS.md
index 99080fdebd..e5caf5fa58 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -15,6 +15,7 @@ Programmers
     Nicolay Korslund - Project leader 2008-2010
     scrawl - Top contributor
 
+    AbduSharif
     Adam Hogan (aurix)
     Aesylwinn
     aegis
@@ -60,6 +61,7 @@ Programmers
     Cory F. Cohen (cfcohen)
     Cris Mihalache (Mirceam)
     crussell187
+    Sam Hellawell (cykoder)
     Dan Vukelich (sanchezman)
     darkf
     Dave Corley (S3ctor)
@@ -79,6 +81,7 @@ Programmers
     Eduard Cot (trombonecot)
     Eli2
     Emanuel Guével (potatoesmaster)
+    Epoch
     Eris Caffee (eris)
     eroen
     escondida
@@ -96,6 +99,7 @@ Programmers
     gugus/gus
     guidoj
     Haoda Wang (h313)
+    holorat
     hristoast
     Internecine
     Ivan Beloborodov (myrix)
@@ -140,6 +144,8 @@ Programmers
     Lordrea
     Łukasz Gołębiewski (lukago)
     Lukasz Gromanowski (lgro)
+    Mads Sandvei (Foal)
+    Maksim Eremenko (Max Yari)
     Marc Bouvier (CramitDeFrog)
     Marcin Hulist (Gohan)
     Mark Siewert (mark76)
@@ -150,6 +156,7 @@ Programmers
     Mateusz Malisz (malice)
     Max Henzerling (SaintMercury)
     megaton
+    Mehdi Yousfi-Monod (mym)
     Michael Hogan (Xethik)
     Michael Mc Donnell
     Michael Papageorgiou (werdanith)
@@ -186,6 +193,7 @@ Programmers
     pkubik
     PLkolek
     PlutonicOverkill
+    Qlonever
     Radu-Marius Popovici (rpopovici)
     Rafael Moura (dhustkoder)
     Randy Davin (Kindi)
@@ -225,6 +233,7 @@ Programmers
     thegriglat
     Thomas Luppi (Digmaster)
     tlmullis
+    trav
     tri4ng1e
     Thoronador
     Tobias Tribble (zackhasacat)
@@ -244,6 +253,7 @@ Programmers
     xyzz
     Yohaulticetl
     Yuri Krupenin
+    Yury Stepovikov
     zelurker
 
 Documentation
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ee31b6762..452e64f7a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,80 +2,247 @@
 ------
 
     Bug #2623: Snowy Granius doesn't prioritize conjuration spells
+    Bug #3438: NPCs can't hit bull netch with melee weapons
     Bug #3842: Body part skeletons override the main skeleton
     Bug #4127: Weapon animation looks choppy
     Bug #4204: Dead slaughterfish doesn't float to water surface after loading saved game
     Bug #4207: RestoreHealth/Fatigue spells have a huge priority even if a success chance is near 0
     Bug #4382: Sound output device does not change when it should
+    Bug #4508: Can't stack enchantment buffs from different instances of the same self-cast generic magic apparel
     Bug #4610: Casting a Bound Weapon spell cancels the casting animation by equipping the weapon prematurely
+    Bug #4683: Disposition decrease when player commits crime is not implemented properly
+    Bug #4742: Actors with wander never stop walking after Loopgroup Walkforward
+    Bug #4743: PlayGroup doesn't play non-looping animations correctly
     Bug #4754: Stack of ammunition cannot be equipped partially
     Bug #4816: GetWeaponDrawn returns 1 before weapon is attached
+    Bug #4822: Non-weapon equipment and body parts can't inherit time from parent animation
+    Bug #4898: Odd/Incorrect lighting on meshes
     Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses
+    Bug #5062: Root bone rotations for NPC animation don't work the same as for creature animation
+    Bug #5065: Actors with scripted animation still try to wander and turn around without moving
+    Bug #5066: Quirks with starting and stopping scripted animations
     Bug #5129: Stuttering animation on Centurion Archer
+    Bug #5280: Unskinned shapes in skinned equipment are rendered in the wrong place
     Bug #5371: Keyframe animation tracks are used for any file that begins with an X
+    Bug #5413: Enemies do a battlecry everytime the player summons a creature
     Bug #5714: Touch spells cast using ExplodeSpell don't always explode
+    Bug #5755: Reset friendly hit counter
     Bug #5849: Paralysis breaks landing
     Bug #5870: Disposing of actors who were selected in the console doesn't deselect them like vanilla
     Bug #5883: Immobile creatures don't cause water ripples
     Bug #5977: Fatigueless NPCs' corpse underwater changes animation on game load
     Bug #6025: Subrecords cannot overlap records
     Bug #6027: Collisionshape becomes spiderweb-like when the mesh is too complex
+    Bug #6097: Level Progress Tooltip Sometimes Not Updated
+    Bug #6146: Lua command `actor:setEquipment` doesn't trigger mwscripts when equipping or unequipping a scripted item
+    Bug #6156: 1ft Charm or Sound magic effect vfx doesn't work properly
+    Bug #6190: Unintuitive sun specularity time of day dependence
     Bug #6222: global map cell size can crash openmw if set to too high a value
+    Bug #6240: State sharing sometimes prevents the use of the same texture file for different purposes in shaders
     Bug #6313: Followers with high Fight can turn hostile
+    Bug #6402: The sound of a thunderstorm does not stop playing after entering the premises
     Bug #6427: Enemy health bar disappears before damaging effect ends
     Bug #6550: Cloned body parts don't inherit texture effects
+    Bug #6574: Crash at far away from world origin coordinates
     Bug #6645: Enemy block sounds align with animation instead of blocked hits
     Bug #6657: Distant terrain tiles become black when using FWIW mod
     Bug #6661: Saved games that have no preview screenshot cause issues or crashes
+    Bug #6665: The kobolds in the skyrim: home of the nords mod are oversized
     Bug #6716: mwscript comparison operator handling is too restrictive
+    Bug #6723: "Turn to movement direction" makes the player rotate wildly with COLLADA
+    Bug #6754: Beast to Non-beast transformation mod is not working on OpenMW
+    Bug #6758: Main menu background video can be stopped by opening the options menu
     Bug #6807: Ultimate Galleon is not working properly
+    Bug #6846: Launcher only works with default config paths
     Bug #6893: Lua: Inconsistent behavior with actors affected by Disable and SetDelete commands
     Bug #6894: Added item combines with equipped stack instead of creating a new unequipped stack
+    Bug #6932: Creatures flee from my followers and we have to chase after them
     Bug #6939: OpenMW-CS: ID columns are too short
     Bug #6949: Sun Damage effect doesn't work in quasi exteriors
     Bug #6964: Nerasa Dralor Won't Follow
     Bug #6973: Fade in happens after the scene load and is shown
     Bug #6974: Only harmful effects are reflected
     Bug #6977: Sun damage implementation does not match research
+    Bug #6985: Issues with Magic Cards numbers readability
     Bug #6986: Sound magic effect does not make noise
     Bug #6987: Set/Mod Blindness should not darken the screen
     Bug #6992: Crossbow reloading doesn't look the same as in Morrowind
     Bug #6993: Shooting your last round of ammunition causes the attack animation to cancel
     Bug #7009: Falling actors teleport to the ground without receiving any damage on cell loading
+    Bug #7013: Local map rendering in some cells is broken
     Bug #7034: Misc items defined in one content file are not treated as keys if another content file uses them as such
+    Bug #7040: Incorrect rendering order for Rebirth's Stormfang
     Bug #7042: Weapon follow animations that immediately follow the hit animations cause multiple hits
     Bug #7044: Changing a class' services does not affect autocalculated NPCs
+    Bug #7051: Collada animated character models are optimized out of the collision box instance with object paging
+    Bug #7053: Running into objects doesn't trigger GetCollidingPC
     Bug #7054: Quests aren't sorted by name
     Bug #7064: NPCs don't report crime if the player is casting offensive spells on them while sneaking
     Bug #7077: OpenMW fails to load certain particle effects in .osgt format
     Bug #7084: Resurrecting an actor doesn't take into account base record changes
     Bug #7088: Deleting last save game of last character doesn't clear character name/details
     Bug #7092: BSA archives from higher priority directories don't take priority
+    Bug #7102: Some HQ Creatures mod models can hit the 8 texture slots limit with 0.48
+    Bug #7103: Multiple paths pointing to the same plugin but with different cases lead to automatically removed config entries
     Bug #7122: Teleportation to underwater should cancel active water walking effect
     Bug #7131: MyGUI log spam when post processing HUD is open
     Bug #7134: Saves with an invalid last generated RefNum can be loaded
+    Bug #7145: Normals passed to post-processing shaders are broken
+    Bug #7146: Debug draw for normals is wrong
     Bug #7163: Myar Aranath: Wheat breaks the GUI
+    Bug #7168: Fix average scene luminance
     Bug #7172: Current music playlist continues playing indefinitely if next playlist is empty
+    Bug #7202: Post-processing normals for terrain, water randomly stop rendering
+    Bug #7204: Missing actor scripts freeze the game
     Bug #7229: Error marker loading failure is not handled
     Bug #7243: Supporting loading external files from VFS from esm files
     Bug #7284: "Your weapon has no effect." message doesn't always show when the player character attempts to attack
+    Bug #7292: Weather settings for disabling or enabling snow and rain ripples don't work
     Bug #7298: Water ripples from projectiles sometimes are not spawned
     Bug #7307: Alchemy "Magic Effect" search string does not match on tool tip for effects related to attributes
+    Bug #7309: Sunlight scattering is visible in inappropriate situations
     Bug #7322: Shadows don't cover groundcover depending on the view angle and perspective with compute scene bounds = primitives
+    Bug #7351: Unsupported MSAA level fallback wrecks GL context extension checks
+    Bug #7353: Normal Map Crashes with Starwind Assets in TES3MP and OpenMW
+    Bug #7354: Disabling post processing in-game causes a crash
+    Bug #7364: Post processing is not reflected in savegame previews
+    Bug #7380: NiZBufferProperty issue
     Bug #7413: Generated wilderness cells don't spawn fish
     Bug #7415: Unbreakable lock discrepancies
+    Bug #7416: Modpccrimelevel is different from vanilla
     Bug #7428: AutoCalc flag is not used to calculate enchantment costs
+    Bug #7447: OpenMW-CS: Dragging a cell of a different type (from the initial type) into the 3D view crashes OpenMW-CS
     Bug #7450: Evading obstacles does not work for actors missing certain animations
     Bug #7459: Icons get stacked on the cursor when picking up multiple items simultaneously
+    Bug #7469: Reloading lua with a orphaned lua UI element causes crash
     Bug #7472: Crash when enchanting last projectiles
+    Bug #7475: Equipping a constant effect item doesn't update the magic menu
+    Bug #7502: Data directories dialog (0.48.0) forces adding subdirectory instead of intended directory
     Bug #7505: Distant terrain does not support sample size greater than cell size
+    Bug #7535: Bookart paths for textures in OpenMW vs vanilla Morrowind
+    Bug #7548: Actors cannot open doors that were teleported from a different cell
     Bug #7553: Faction reaction loading is incorrect
+    Bug #7557: Terrain::ChunkManager::createChunk is called twice for the same position, lod on initial loading
+    Bug #7573: Drain Fatigue can't bring fatigue below zero by default
+    Bug #7582: Skill specializations are hardcoded in character creation
+    Bug #7585: Difference in interior lighting between OpenMW with legacy lighting method enabled and vanilla Morrowind
+    Bug #7587: Quick load related crash
+    Bug #7603: Scripts menu size is not updated properly
+    Bug #7604: Goblins Grunt becomes idle once injured
+    Bug #7609: ForceGreeting should not open dialogue for werewolves
+    Bug #7611: Beast races' idle animations slide after turning or jumping in place
+    Bug #7617: The death prompt asks the player if they wanted to load the character's last created save
+    Bug #7619: Long map notes may get cut off
+    Bug #7623: Incorrect placement of the script info in the engraved ring of healing tooltip
+    Bug #7627: Сrash at the start
+    Bug #7630: Charm can be cast on creatures
+    Bug #7631: Cannot trade with/talk to Creeper or Mudcrab Merchant when they're fleeing
+    Bug #7633: Groundcover should ignore non-geometry Drawables
+    Bug #7636: Animations bug out when switching between 1st and 3rd person, while playing a scripted animation
+    Bug #7637: Actors can sometimes move while playing scripted animations
+    Bug #7639: NPCs don't use hand-to-hand if their other melee skills were damaged during combat
+    Bug #7641: loopgroup loops the animation one time too many for actors
+    Bug #7642: Items in repair and recharge menus aren't sorted alphabetically
+    Bug #7643: Can't enchant items with constant effect on self magic effects for non-player character
+    Bug #7646: Follower voices pain sounds when attacked with magic
+    Bug #7647: NPC walk cycle bugs after greeting player
+    Bug #7654: Tooltips for enchantments with invalid effects cause crashes
+    Bug #7660: Some inconsistencies regarding Invisibility breaking
+    Bug #7661: Player followers should stop attacking newly recruited actors
+    Bug #7665: Alchemy menu is missing the ability to deselect and choose different qualities of an apparatus
+    Bug #7675: Successful lock spell doesn't produce a sound
+    Bug #7676: Incorrect magic effect order in alchemy
+    Bug #7679: Scene luminance value flashes when toggling shaders
+    Bug #7685: Corky sometimes doesn't follow Llovyn Andus
+    Bug #7696: Freeze in CompositeMapRenderer::drawImplementation
+    Bug #7707: (OpenCS): New landscape records do not contain appropriate flags
+    Bug #7712: Casting doesn't support spells and enchantments with no effects
+    Bug #7721: CS: Special Chars Not Allowed in IDs
+    Bug #7723: Assaulting vampires and werewolves shouldn't be a crime
+    Bug #7724: Guards don't help vs werewolves
+    Bug #7728: Fatal Error at Startup
+    Bug #7733: Launcher shows incorrect data paths when there's two plugins with the same name
+    Bug #7737: OSG stats are missing some data on loading screens
+    Bug #7742: Governing attribute training limit should use the modified attribute
+    Bug #7744: Player base record cannot have weapons in the inventory
+    Bug #7753: Editor: Actors Don't Scale According to Their Race
+    Bug #7758: Water walking is not taken into account to compute path cost on the water
+    Bug #7761: Rain and ambient loop sounds are mutually exclusive
+    Bug #7763: Bullet shape loading problems, assorted
+    Bug #7765: OpenMW-CS: Touch Record option is broken
+    Bug #7769: Sword of the Perithia: Broken NPCs
+    Bug #7770: Sword of the Perithia: Script execution failure
+    Bug #7780: Non-ASCII texture paths in NIF files don't work
+    Bug #7785: OpenMW-CS initialising Skill and Attribute fields to 0 instead of -1 on non-FortifyStat spells
+    Bug #7787: Crashing when loading a saved game (not always though)
+    Bug #7794: Fleeing NPCs name tooltip doesn't appear
+    Bug #7796: Absorbed enchantments don't restore magicka
+    Bug #7823: Game crashes when launching it.
+    Bug #7832: Ingredient tooltips show magnitude for Fortify Maximum Magicka effect
+    Bug #7840: First run of the launcher doesn't save viewing distance as the default value
+    Bug #7841: Editor: "Dirty" water heights are saved in modified CELLs
+    Bug #7859: AutoCalc flag is not used to calculate potion value
+    Bug #7861: OpenMW-CS: Incorrect DIAL's type in INFO records
+    Bug #7872: Region sounds use wrong odds
+    Bug #7886: Equip and unequip animations can't share the animation track section
+    Bug #7887: Editor: Mismatched reported script data size and actual data size causes a crash during save
+    Bug #7891: Launcher Reverts 8k Shadows to default
+    Bug #7896: Editor: Loading cellrefs incorrectly transforms Refnums, causing load failures
+    Bug #7898: Editor: Invalid reference scales are allowed
+    Bug #7899: Editor: Doors can't be unlocked
+    Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport
+    Bug #7908: Key bindings names in the settings menu are layout-specific
+    Bug #7912: Lua: castRenderingRay fails to hit height map
+    Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones
+    Bug #7950: Crash in MWPhysics::PhysicsTaskScheduler::removeCollisionObject
+    Bug #7970: Difference of GetPCSleep (?) behavior between vanilla and OpenMW
+    Bug #7980: Paralyzed NPCs' lips move
+    Bug #7993: Cannot load Bloodmoon without Tribunal
+    Bug #7997: Can toggle perspective when paralyzed
+    Bug #8002: Portable light sources held by creatures do not emit lighting
+    Bug #8005: F3 stats bars are sorted not according to their place in the timeline
+    Bug #8018: Potion effects should never explode and always apply on self
+    Bug #8021: Player's scale doesn't reset when starting a new game
+    Bug #8048: Actors can generate negative collision extents and have no collision
+    Bug #8063: menu_background.bik video with audio freezes the game forever
+    Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting
+    Bug #8085: Don't search in scripts or shaders directories for "Select directories you wish to add" menu in launcher
+    Bug #8097: GetEffect doesn't detect 0 magnitude spells
+    Bug #8099: Reaching Lua memory limit leads to a crash
+    Bug #8124: Normal weapon resistance is applied twice for NPCs
+    Bug #8132: Actors without hello responses turn to face the player
+    Bug #8171: Items with more than 100% health can be repaired
+    Bug #8172: Openmw-cs crashes when viewing `Dantooine, Sea`
+    Bug #8187: Intervention effects should use Chebyshev distance to determine the closest marker
+    Bug #8189: The import tab in the launcher doesn't remember the checkbox selection
+    Bug #8191: NiRollController does not work for sheath meshes
+    Bug #8206: Moving away from storm wind origin should make you faster
+    Bug #8207: Using hand-to-hand while sneaking plays the critical hit sound when the target is not getting hurt
+    Bug #8208: The launcher's view distance option's minimum value isn't capped to Vanilla's minimum
+    Bug #8223: Ghosts don't move while spellcasting
+    Bug #8231: AGOP doesn't like NiCollisionSwitch
+    Bug #8237: Non-bipedal creatures should *not* use spellcast equip/unequip animations
+    Feature #1415: Infinite fall failsafe
+    Feature #2566: Handle NAM9 records for manual cell references
+    Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking
     Feature #3537: Shader-based water ripples
+    Feature #5173: Support for NiFogProperty
     Feature #5492: Let rain and snow collide with statics
+    Feature #5926: Refraction based on water depth
+    Feature #5944: Option to use camera as sound listener
+    Feature #6009: Animation blending - smooth animation transitions with modding support
+    Feature #6152: Playing music via lua scripts
+    Feature #6188: Specular lighting from point light sources
+    Feature #6411: Support translations in openmw-launcher
     Feature #6447: Add LOD support to Object Paging
     Feature #6491: Add support for Qt6
+    Feature #6505: UTF-8 support in Lua scripts
     Feature #6556: Lua API for sounds
+    Feature #6679: Design a custom Input Action API
     Feature #6726: Lua API for creating new objects
+    Feature #6727: Lua API for records of all object types
+    Feature #6823: Animation layering for osgAnimation formats
+    Feature #6864: Lua file access API
     Feature #6922: Improve launcher appearance
     Feature #6933: Support high-resolution cursor textures
     Feature #6945: Support S3TC-compressed and BGR/BGRA NiPixelData
@@ -84,21 +251,75 @@
     Feature #6995: Localize the "show effect duration" option
     Feature #7058: Implement TestModels (T3D) console command
     Feature #7087: Block resolution change in the Windowed Fullscreen mode
+    Feature #7091: Allow passing `initData` to the :addScript call
     Feature #7125: Remembering console commands between sessions
     Feature #7129: Add support for non-adaptive VSync
     Feature #7130: Ability to set MyGUI logging verbosity
+    Feature #7142: MWScript Lua API
     Feature #7148: Optimize string literal lookup in mwscript
+    Feature #7160: Editor: Moving the Response column of Topicinfos in a better place
+    Feature #7161: OpenMW-CS: Make adding and filtering TopicInfos easier
+    Feature #7180: Rename water_nm file and move it to the vfs
     Feature #7194: Ori to show texture paths
     Feature #7214: Searching in the in-game console
-    Feature #7284: Searching in the console with regex and toggleable case-sensitivity 
+    Feature #7245: Expose the argument `cancelOther` of `AiSequence::stack` to Lua
+    Feature #7248: Searching in the console with regex and toggleable case-sensitivity
+    Feature #7318: Ability to disable water culling
+    Feature #7468: Factions API for Lua
     Feature #7477: NegativeLight Magic Effect flag
     Feature #7499: OpenMW-CS: Generate record filters by drag & dropping cell content to the filters field
+    Feature #7538: Lua API for advancing skills
     Feature #7546: Start the game on Fredas
+    Feature #7554: Controller binding for tab for menu navigation
+    Feature #7568: Uninterruptable scripted music
+    Feature #7590: [Lua] Ability to deserialize YAML data from scripts
+    Feature #7606: Launcher: allow Shift-select in Archives tab
+    Feature #7608: Make the missing dependencies warning when loading a savegame more helpful
+    Feature #7618: Show the player character's health in the save details
+    Feature #7625: Add some missing console error outputs
+    Feature #7634: Support NiParticleBomb
+    Feature #7648: Lua Save game API
+    Feature #7652: Sort inactive post processing shaders list properly
+    Feature #7698: Implement sAbsorb, sDamage, sDrain, sFortify and sRestore
+    Feature #7709: Improve resolution selection in Launcher
+    Feature #7777: Support external Bethesda material files (BGSM/BGEM)
+    Feature #7788: [Lua] Add ignore option to nearby.castRenderingRay
+    Feature #7792: Support Timescale Clouds
+    Feature #7795: Support MaxNumberRipples INI setting
+    Feature #7805: Lua Menu context
+    Feature #7860: Lua: Expose NPC AI settings (fight, alarm, flee)
+    Feature #7875: Disable MyGUI windows snapping
+    Feature #7914: Do not allow to move GUI windows out of screen
+    Feature #7916: Expose all AiWander options to Lua, extend other packages as well
+    Feature #7923: Don't show non-existent higher ranks for factions with fewer than 9 ranks
+    Feature #7932: Support two-channel normal maps
+    Feature #7936: Scalable icons in Qt applications
+    Feature #7953: Allow to change SVG icons colors depending on color scheme
+    Feature #7964: Add Lua read access to MW Dialogue records
+    Feature #7971: Make save's Time Played value display hours instead of days
+    Feature #7985: Support dark mode on Windows
+    Feature #8038: (Lua) Containers should have respawning/organic flags
+    Feature #8067: Support Game Mode on macOS
+    Feature #8078: OpenMW-CS Terrain Equalize Tool
+    Feature #8087: Creature movement flags are not exposed
+    Feature #8092: Lua - Vector swizzling
+    Feature #8109: Expose commitCrime to Lua API
+    Feature #8130: Launcher: Add the ability to open a selected data directory in the file browser
+    Feature #8145: Starter spell flag is not exposed
+    Task #5859: User openmw-cs.cfg has comment talking about settings.cfg
     Task #5896: Do not use deprecated MyGUI properties
+    Task #6085: Replace boost::filesystem with std::filesystem
+    Task #6149: Dehardcode Lua API_REVISION
+    Task #6624: Drop support for saves made prior to 0.45
+    Task #7048: Get rid of std::bind
     Task #7113: Move from std::atoi to std::from_char
     Task #7117: Replace boost::scoped_array with std::vector
     Task #7151: Do not use std::strerror to get errno error message
+    Task #7182: FFMpeg 5.1.1+ support
     Task #7394: Drop support for --fs-strict
+    Task #7720: Drop 360-degree screenshot support
+    Task #8141: Merge Instance Drop Modes
+    Task #8214: Drop script blacklisting functionality
 
 0.48.0
 ------
@@ -312,7 +533,6 @@
     Feature #6700: Support windowed fullscreen
     Feature #6706: Save the size of the Options window
     Feature #6721: OpenMW-CS: Add option to open records in new window
-    Feature #6823: Animation layering for osgAnimation formats
     Feature #6867: Add a way to localize hardcoded strings in GUI
     Feature #6888: Add switch for armor degradation fix
     Feature #6925: Allow to use a mouse wheel to rotate a head in the race selection menu
diff --git a/CI/Store-Symbols.ps1 b/CI/Store-Symbols.ps1
index 6328a2a2f6..53751213b8 100644
--- a/CI/Store-Symbols.ps1
+++ b/CI/Store-Symbols.ps1
@@ -1,12 +1,23 @@
+param (
+    [switch] $SkipCompress
+)
+
+$ErrorActionPreference = "Stop"
+
 if (-Not (Test-Path CMakeCache.txt))
 {
     Write-Error "This script must be run from the build directory."
 }
 
-if (-Not (Test-Path .cmake\api\v1\reply))
+if (-Not (Test-Path .cmake\api\v1\reply\index-*.json) -Or -Not ((Get-Content -Raw .cmake\api\v1\reply\index-*.json | ConvertFrom-Json).reply.PSObject.Properties.Name -contains "codemodel-v2"))
 {
+    Write-Output "Running CMake query..."
     New-Item -Type File -Force .cmake\api\v1\query\codemodel-v2
     cmake .
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Command exited with code $LASTEXITCODE"
+    }
+    Write-Output "Done."
 }
 
 try
@@ -43,10 +54,31 @@ finally
 if (-not (Test-Path symstore-venv))
 {
     python -m venv symstore-venv
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Command exited with code $LASTEXITCODE"
+    }
 }
-if (-not (Test-Path symstore-venv\Scripts\symstore.exe))
+$symstoreVersion = "0.3.4"
+if (-not (Test-Path symstore-venv\Scripts\symstore.exe) -or -not ((symstore-venv\Scripts\pip show symstore | Select-String '(?<=Version: ).*').Matches.Value -eq $symstoreVersion))
 {
-    symstore-venv\Scripts\pip install symstore==0.3.3
+    symstore-venv\Scripts\pip install symstore==$symstoreVersion
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Command exited with code $LASTEXITCODE"
+    }
 }
+
 $artifacts = $artifacts | Where-Object { Test-Path $_ }
-symstore-venv\Scripts\symstore --compress .\SymStore @artifacts
+
+Write-Output "Storing symbols..."
+
+$optionalArgs = @()
+if (-not $SkipCompress) {
+    $optionalArgs += "--compress"
+}
+
+symstore-venv\Scripts\symstore $optionalArgs --skip-published .\SymStore @artifacts
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "Command exited with code $LASTEXITCODE"
+}
+
+Write-Output "Done."
diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
deleted file mode 100755
index eff3fd7196..0000000000
--- a/CI/before_install.linux.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash -ex
-
-#sudo ln -sf /usr/bin/clang-6 /usr/local/bin/clang
-#sudo ln -sf /usr/bin/clang++-6 /usr/local/bin/clang++
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index a467b589da..0120c55202 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,41 +1,30 @@
 #!/bin/sh -ex
 
 export HOMEBREW_NO_EMOJI=1
-
-brew uninstall --ignore-dependencies python@3.8 || true
-brew uninstall --ignore-dependencies python@3.9 || true
-brew uninstall --ignore-dependencies qt@6 || true
-brew uninstall --ignore-dependencies jpeg || true
+export HOMEBREW_NO_INSTALL_CLEANUP=1
+export HOMEBREW_AUTOREMOVE=1
 
 brew tap --repair
 brew update --quiet
 
-# Some of these tools can come from places other than brew, so check before installing
-brew reinstall xquartz fontconfig freetype harfbuzz brotli
-
-# Fix: can't open file: @loader_path/libbrotlicommon.1.dylib (No such file or directory)
-BREW_LIB_PATH="$(brew --prefix)/lib"
-install_name_tool -change "@loader_path/libbrotlicommon.1.dylib" "${BREW_LIB_PATH}/libbrotlicommon.1.dylib" ${BREW_LIB_PATH}/libbrotlidec.1.dylib
-install_name_tool -change "@loader_path/libbrotlicommon.1.dylib" "${BREW_LIB_PATH}/libbrotlicommon.1.dylib" ${BREW_LIB_PATH}/libbrotlienc.1.dylib
+brew install curl xquartz gd fontconfig freetype harfbuzz brotli
 
 command -v ccache >/dev/null 2>&1 || brew install ccache
 command -v cmake >/dev/null 2>&1 || brew install cmake
 command -v qmake >/dev/null 2>&1 || brew install qt@5
 export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
 
-
 # Install deps
-brew install icu4c yaml-cpp sqlite
+brew install openal-soft icu4c yaml-cpp sqlite
 
 ccache --version
 cmake --version
 qmake --version
 
 if [[ "${MACOS_AMD64}" ]]; then
-    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20221113.zip -o ~/openmw-deps.zip
+    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802.zip -o ~/openmw-deps.zip
+    unzip -o ~/openmw-deps.zip -d /tmp > /dev/null
 else
-    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20230722_arm64.zip -o ~/openmw-deps.zip
+    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240818-arm64.tar.xz -o ~/openmw-deps.tar.xz
+    tar xf ~/openmw-deps.tar.xz -C /tmp > /dev/null
 fi
-
-unzip -o ~/openmw-deps.zip -d /tmp > /dev/null
-
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 0edd38628f..2589c2807e 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -7,14 +7,6 @@ free -m
 # Silence a git warning
 git config --global advice.detachedHead false
 
-BUILD_UNITTESTS=OFF
-BUILD_BENCHMARKS=OFF
-
-if [[ "${BUILD_TESTS_ONLY}" ]]; then
-    BUILD_UNITTESTS=ON
-    BUILD_BENCHMARKS=ON
-fi
-
 # setup our basic cmake build options
 declare -a CMAKE_CONF_OPTS=(
     -DCMAKE_C_COMPILER="${CC:-/usr/bin/cc}"
@@ -22,7 +14,7 @@ declare -a CMAKE_CONF_OPTS=(
     -DCMAKE_C_COMPILER_LAUNCHER=ccache
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
     -DCMAKE_INSTALL_PREFIX=install
-    -DBUILD_SHARED_LIBS=OFF
+    -DBUILD_SHARED_LIBS="${BUILD_SHARED_LIBS:-OFF}"
     -DUSE_SYSTEM_TINYXML=ON
     -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
     -DOPENMW_CXX_FLAGS="-Werror -Werror=implicit-fallthrough"  # flags specific to OpenMW project
@@ -46,14 +38,14 @@ fi
 
 if [[ $CI_CLANG_TIDY ]]; then
     CMAKE_CONF_OPTS+=(
-          -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*"
-          -DBUILD_UNITTESTS=ON
-          -DBUILD_OPENCS_TESTS=ON
-          -DBUILD_BENCHMARKS=ON
+        -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*"
+        -DBUILD_COMPONENTS_TESTS=ON
+        -DBUILD_OPENMW_TESTS=ON
+        -DBUILD_OPENCS_TESTS=ON
+        -DBUILD_BENCHMARKS=ON
     )
 fi
 
-
 if [[ "${CMAKE_BUILD_TYPE}" ]]; then
     CMAKE_CONF_OPTS+=(
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -103,9 +95,10 @@ if [[ "${BUILD_TESTS_ONLY}" ]]; then
         -DBUILD_NAVMESHTOOL=OFF \
         -DBUILD_BULLETOBJECTTOOL=OFF \
         -DBUILD_NIFTEST=OFF \
-        -DBUILD_UNITTESTS=${BUILD_UNITTESTS} \
-        -DBUILD_OPENCS_TESTS=${BUILD_UNITTESTS} \
-        -DBUILD_BENCHMARKS=${BUILD_BENCHMARKS} \
+        -DBUILD_COMPONENTS_TESTS=ON \
+        -DBUILD_OPENMW_TESTS=ON \
+        -DBUILD_OPENCS_TESTS=ON \
+        -DBUILD_BENCHMARKS=ON \
         ..
 elif [[ "${BUILD_OPENMW_ONLY}" ]]; then
     ${ANALYZE} cmake \
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 2996a3d772..940c72c806 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -14,16 +14,6 @@ MISSINGTOOLS=0
 command -v 7z >/dev/null 2>&1 || { echo "Error: 7z (7zip) is not on the path."; MISSINGTOOLS=1; }
 command -v cmake >/dev/null 2>&1 || { echo "Error: cmake (CMake) is not on the path."; MISSINGTOOLS=1; }
 
-MISSINGPYTHON=0
-if ! command -v python >/dev/null 2>&1; then
-	echo "Warning: Python is not on the path, automatic Qt installation impossible."
-	MISSINGPYTHON=1
-elif ! python --version >/dev/null 2>&1; then
-	echo "Warning: Python is (probably) fake stub Python that comes bundled with newer versions of Windows, automatic Qt installation impossible."
-	echo "If you think you have Python installed, try changing the order of your PATH environment variable in Advanced System Settings."
-	MISSINGPYTHON=1
-fi
-
 if [ $MISSINGTOOLS -ne 0 ]; then
 	wrappedExit 1
 fi
@@ -54,7 +44,6 @@ function unixPathAsWindows {
 	fi
 }
 
-APPVEYOR=${APPVEYOR:-}
 CI=${CI:-}
 STEP=${STEP:-}
 
@@ -72,10 +61,8 @@ PDBS=""
 PLATFORM=""
 CONFIGURATIONS=()
 TEST_FRAMEWORK=""
-GOOGLE_INSTALL_ROOT=""
 INSTALL_PREFIX="."
 BUILD_BENCHMARKS=""
-OSG_MULTIVIEW_BUILD=""
 USE_WERROR=""
 USE_CLANG_TIDY=""
 
@@ -144,9 +131,6 @@ while [ $# -gt 0 ]; do
 			b )
 				BUILD_BENCHMARKS=true ;;
 
-			M )
-				OSG_MULTIVIEW_BUILD=true ;;
-
 			E )
 				USE_WERROR=true ;;
 
@@ -221,16 +205,8 @@ if [ -z $VERBOSE ]; then
 	STRIP="> /dev/null 2>&1"
 fi
 
-if [ -z $APPVEYOR ]; then
-	echo "Running prebuild outside of Appveyor."
-
-	DIR=$(windowsPathAsUnix "${BASH_SOURCE[0]}")
-	cd $(dirname "$DIR")/..
-else
-	echo "Running prebuild in Appveyor."
-
-	cd "$APPVEYOR_BUILD_FOLDER"
-fi
+DIR=$(windowsPathAsUnix "${BASH_SOURCE[0]}")
+cd $(dirname "$DIR")/..
 
 run_cmd() {
 	CMD="$1"
@@ -241,13 +217,7 @@ run_cmd() {
 		eval $CMD $@ > output.log 2>&1 || RET=$?
 
 		if [ $RET -ne 0 ]; then
-			if [ -z $APPVEYOR ]; then
-				echo "Command $CMD failed, output can be found in $(real_pwd)/output.log"
-			else
-				echo
-				echo "Command $CMD failed;"
-				cat output.log
-			fi
+			echo "Command $CMD failed, output can be found in $(real_pwd)/output.log"
 		else
 			rm output.log
 		fi
@@ -304,6 +274,20 @@ download() {
 	fi
 }
 
+MANIFEST_FILE=""
+download_from_manifest() {
+	if [ $# -ne 1 ]; then
+		echo "Invalid parameters to download_from_manifest."
+		return 1
+	fi
+	{ read -r URL && read -r HASH FILE; } < $1
+	if [ -z $SKIP_DOWNLOAD ]; then
+		download "${FILE:?}" "${URL:?}" "${FILE:?}"
+	fi
+	echo "${HASH:?}  ${FILE:?}" | sha512sum --check
+	MANIFEST_FILE="${FILE:?}"
+}
+
 real_pwd() {
 	if type cygpath >/dev/null 2>&1; then
 		cygpath -am "$PWD"
@@ -357,6 +341,26 @@ add_qt_style_dlls() {
 	QT_STYLES[$CONFIG]="${QT_STYLES[$CONFIG]} $@"
 }
 
+declare -A QT_IMAGEFORMATS
+QT_IMAGEFORMATS["Release"]=""
+QT_IMAGEFORMATS["Debug"]=""
+QT_IMAGEFORMATS["RelWithDebInfo"]=""
+add_qt_image_dlls() {
+	local CONFIG=$1
+	shift
+	QT_IMAGEFORMATS[$CONFIG]="${QT_IMAGEFORMATS[$CONFIG]} $@"
+}
+
+declare -A QT_ICONENGINES
+QT_ICONENGINES["Release"]=""
+QT_ICONENGINES["Debug"]=""
+QT_ICONENGINES["RelWithDebInfo"]=""
+add_qt_icon_dlls() {
+	local CONFIG=$1
+	shift
+	QT_ICONENGINES[$CONFIG]="${QT_ICONENGINES[$CONFIG]} $@"
+}
+
 if [ -z $PLATFORM ]; then
 	PLATFORM="$(uname -m)"
 fi
@@ -368,38 +372,20 @@ fi
 case $VS_VERSION in
 	17|17.0|2022 )
 		GENERATOR="Visual Studio 17 2022"
-		TOOLSET="vc143"
+		MSVC_TOOLSET="vc143"
 		MSVC_REAL_VER="17"
-		MSVC_VER="14.3"
 		MSVC_DISPLAY_YEAR="2022"
 
-		OSG_MSVC_YEAR="2019"
-		MYGUI_MSVC_YEAR="2019"
-		LUA_MSVC_YEAR="2019"
 		QT_MSVC_YEAR="2019"
-		BULLET_MSVC_YEAR="2019"
-
-		BOOST_VER="1.80.0"
-		BOOST_VER_URL="1_80_0"
-		BOOST_VER_SDK="108000"
 		;;
 
 	16|16.0|2019 )
 		GENERATOR="Visual Studio 16 2019"
-		TOOLSET="vc142"
+		MSVC_TOOLSET="vc142"
 		MSVC_REAL_VER="16"
-		MSVC_VER="14.2"
 		MSVC_DISPLAY_YEAR="2019"
 
-		OSG_MSVC_YEAR="2019"
-		MYGUI_MSVC_YEAR="2019"
-		LUA_MSVC_YEAR="2019"
 		QT_MSVC_YEAR="2019"
-		BULLET_MSVC_YEAR="2019"
-
-		BOOST_VER="1.80.0"
-		BOOST_VER_URL="1_80_0"
-		BOOST_VER_SDK="108000"
 		;;
 
 	15|15.0|2017 )
@@ -534,42 +520,37 @@ if [ -n "$SINGLE_CONFIG" ]; then
 	add_cmake_opts "-DCMAKE_BUILD_TYPE=${CONFIGURATIONS[0]}"
 fi
 
-if ! [ -z $UNITY_BUILD ]; then
+if [[ -n "$UNITY_BUILD" ]]; then
 	add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
 fi
 
-if ! [ -z $USE_CCACHE ]; then
-	add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+if [ -n "$USE_CCACHE" ]; then
+	if [ -n "$NMAKE" ] || [ -n "$NINJA" ]; then
+		add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPRECOMPILE_HEADERS_WITH_MSVC=OFF"
+	else
+		echo "Ignoring -C (CCache) as it is incompatible with Visual Studio CMake generators"
+	fi
 fi
 
 # turn on LTO by default
 add_cmake_opts "-DOPENMW_LTO_BUILD=True"
 
-if ! [ -z "$USE_WERROR" ]; then
+if [[ -n "$USE_WERROR" ]]; then
   add_cmake_opts "-DOPENMW_MSVC_WERROR=ON"
 fi
 
-if ! [ -z "$USE_CLANG_TIDY" ]; then
+if [[ -n "$USE_CLANG_TIDY" ]]; then
   add_cmake_opts "-DCMAKE_CXX_CLANG_TIDY=\"clang-tidy --warnings-as-errors=*\""
 fi
 
-BULLET_VER="2.89"
-FFMPEG_VER="4.2.2"
-ICU_VER="70_1"
-LUAJIT_VER="v2.1.0-beta3-452-g7a0cf5fd"
-LZ4_VER="1.9.2"
-OPENAL_VER="1.23.0"
-QT_VER="5.15.2"
-
-OSG_ARCHIVE_NAME="OSGoS 3.6.5"
-OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}"
-OSG_ARCHIVE_REPO_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main"
-if ! [ -z $OSG_MULTIVIEW_BUILD ]; then
-	OSG_ARCHIVE_NAME="OSG-3.6-multiview"
-	OSG_ARCHIVE="OSG-3.6-multiview-d2ee5aa8-msvc${OSG_MSVC_YEAR}-win${BITS}"
-	OSG_ARCHIVE_REPO_URL="https://gitlab.com/madsbuvi/openmw-deps/-/raw/openmw-vr-ovr_multiview"
-fi
+QT_VER='6.6.3'
+AQT_VERSION='v3.1.15'
 
+VCPKG_TAG="2024-11-10"
+VCPKG_PATH="vcpkg-x64-${VS_VERSION:?}-${VCPKG_TAG:?}"
+VCPKG_PDB_PATH="vcpkg-x64-${VS_VERSION:?}-pdb-${VCPKG_TAG:?}"
+VCPKG_MANIFEST="${VCPKG_PATH:?}.txt"
+VCPKG_PDB_MANIFEST="${VCPKG_PDB_PATH:?}.txt"
 
 echo
 echo "==================================="
@@ -577,7 +558,6 @@ echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}"
 echo "==================================="
 echo
 
-# cd OpenMW/AppVeyor-test
 mkdir -p deps
 cd deps
 
@@ -587,75 +567,17 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	echo "Downloading dependency packages."
 	echo
 
-	# Boost
-	if [ -z $APPVEYOR ]; then
-		download "Boost ${BOOST_VER}" \
-			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/boost_${BOOST_VER_URL}-msvc-${MSVC_VER}-${BITS}.exe" \
-			"boost-${BOOST_VER}-msvc${MSVC_VER}-win${BITS}.exe"
+	DEPS_BASE_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows"
+
+	download "${VCPKG_MANIFEST:?}" \
+		"${DEPS_BASE_URL}/${VCPKG_MANIFEST:?}" \
+		"${VCPKG_MANIFEST:?}"
+
+	if [ -n "${VCPKG_PDB_MANIFEST:?}" ]; then
+		download "${VCPKG_PDB_PATH:?}" \
+			"${DEPS_BASE_URL}/${VCPKG_PDB_MANIFEST:?}" \
+			"${VCPKG_PDB_MANIFEST:?}"
 	fi
-
-	# Bullet
-	download "Bullet ${BULLET_VER}" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z" \
-		"Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z"
-
-	# FFmpeg
-	download "FFmpeg ${FFMPEG_VER}" \
-	  "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/ffmpeg-${FFMPEG_VER}-win${BITS}.zip" \
-		"ffmpeg-${FFMPEG_VER}-win${BITS}.zip" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/ffmpeg-${FFMPEG_VER}-dev-win${BITS}.zip" \
-		"ffmpeg-${FFMPEG_VER}-dev-win${BITS}.zip"
-
-	# MyGUI
-	download "MyGUI 3.4.2" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/MyGUI-3.4.2-msvc${MYGUI_MSVC_YEAR}-win${BITS}.7z" \
-		"MyGUI-3.4.2-msvc${MYGUI_MSVC_YEAR}-win${BITS}.7z"
-
-	if [ -n "$PDBS" ]; then
-		download "MyGUI symbols" \
-			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/MyGUI-3.4.2-msvc${MYGUI_MSVC_YEAR}-win${BITS}-sym.7z" \
-			"MyGUI-3.4.2-msvc${MYGUI_MSVC_YEAR}-win${BITS}-sym.7z"
-	fi
-
-	# OpenAL
-	download "OpenAL-Soft ${OPENAL_VER}" \
-	  "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OpenAL-Soft-${OPENAL_VER}.zip" \
-		"OpenAL-Soft-${OPENAL_VER}.zip"
-
-	# OSGoS
-	download "${OSG_ARCHIVE_NAME}" \
-		"${OSG_ARCHIVE_REPO_URL}/windows/${OSG_ARCHIVE}.7z" \
-		"${OSG_ARCHIVE}.7z"
-
-	if [ -n "$PDBS" ]; then
-		download "${OSG_ARCHIVE_NAME} symbols" \
-			"${OSG_ARCHIVE_REPO_URL}/windows/${OSG_ARCHIVE}-sym.7z" \
-			"${OSG_ARCHIVE}-sym.7z"
-	fi
-
-	# SDL2
-	download "SDL 2.24.0" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-devel-2.24.0-VC.zip" \
-		"SDL2-devel-2.24.0-VC.zip"
-
-	# LZ4
-	download "LZ4 ${LZ4_VER}" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/lz4_win${BITS}_v${LZ4_VER//./_}.7z" \
-		"lz4_win${BITS}_v${LZ4_VER//./_}.7z"
-
-	# LuaJIT
-	download "LuaJIT ${LUAJIT_VER}" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/LuaJIT-${LUAJIT_VER}-msvc${LUA_MSVC_YEAR}-win${BITS}.7z" \
-		"LuaJIT-${LUAJIT_VER}-msvc${LUA_MSVC_YEAR}-win${BITS}.7z"
-
-	# ICU
-	download "ICU ${ICU_VER/_/.}"\
-		"https://github.com/unicode-org/icu/releases/download/release-${ICU_VER/_/-}/icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip" \
-		"icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip"
-
-	download "zlib 1.2.11"\
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/zlib-1.2.11-msvc2017-win64.7z" \
-		"zlib-1.2.11-msvc2017-win64.7z"
 fi
 
 cd .. #/..
@@ -691,186 +613,47 @@ echo "Extracting dependencies, this might take a while..."
 echo "---------------------------------------------------"
 echo
 
-
-if [ -z $APPVEYOR ]; then
-	printf "Boost ${BOOST_VER}... "
-else
-	printf "Boost ${BOOST_VER} AppVeyor... "
-fi
+cd $DEPS
+echo
+printf "vcpkg packages ${VCPKG_TAG:?}... "
 {
-	if [ -z $APPVEYOR ]; then
-		cd $DEPS_INSTALL
-
-		BOOST_SDK="$(real_pwd)/Boost"
-
-		# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
-		# We work around this by installing to root of the current working drive and then move it to our deps
-		# get the current working drive's root, we'll install to that temporarily
-		CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')Boost_temp"
-		CWD_DRIVE_ROOT_BASH=$(windowsPathAsUnix "$CWD_DRIVE_ROOT")
-		if [ -d CWD_DRIVE_ROOT_BASH ]; then
-			printf "Cannot continue, ${CWD_DRIVE_ROOT_BASH} aka ${CWD_DRIVE_ROOT} already exists. Please remove before re-running. ";
-			wrappedExit 1;
-		fi
-
-		if [ -d ${BOOST_SDK} ] && grep "BOOST_VERSION ${BOOST_VER_SDK}" Boost/boost/version.hpp > /dev/null; then
-			printf "Exists. "
-		elif [ -z $SKIP_EXTRACT ]; then
-			rm -rf Boost
-			CI_EXTRA_INNO_OPTIONS=""
-			[ -n "$CI" ] && CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG='boost_install.log'"
-			"${DEPS}/boost-${BOOST_VER}-msvc${MSVC_VER}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
-			mv "${CWD_DRIVE_ROOT_BASH}" "${BOOST_SDK}"
-		fi
-		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}"
-		add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
-		echo Done.
+	if [[ -d "${VCPKG_PATH:?}" ]]; then
+		printf "Exists. "
 	else
-		# Appveyor has all the boost we need already
-		BOOST_SDK="c:/Libraries/boost_${BOOST_VER_URL}"
+		download_from_manifest "${VCPKG_MANIFEST:?}"
+		eval 7z x -y -o"${VCPKG_PATH:?}" "${MANIFEST_FILE:?}" ${STRIP}
+	fi
+	if [ -n "${PDBS}" ]; then
+		if [[ -d "${VCPKG_PDB_PATH:?}" ]]; then
+			printf "PDB exists. "
+		else
+			download_from_manifest "${VCPKG_PDB_MANIFEST:?}"
+			eval 7z x -y -o"${VCPKG_PDB_PATH:?}" "${MANIFEST_FILE:?}" ${STRIP}
+		fi
+	fi
 
-		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.1"
-		add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
+	add_cmake_opts -DCMAKE_TOOLCHAIN_FILE="$(real_pwd)/${VCPKG_PATH:?}/scripts/buildsystems/vcpkg.cmake"
+	add_cmake_opts -DLuaJit_INCLUDE_DIR="$(real_pwd)/${VCPKG_PATH:?}/installed/x64-windows/include/luajit"
+	add_cmake_opts -DLuaJit_LIBRARY="$(real_pwd)/${VCPKG_PATH:?}/installed/x64-windows/lib/lua51.lib"
 
-		echo Done.
-	fi
-}
-cd $DEPS
-echo
-printf "Bullet ${BULLET_VER}... "
-{
-	cd $DEPS_INSTALL
-	if [ -d Bullet ]; then
-		printf -- "Exists. (No version checking) "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf Bullet
-		eval 7z x -y "${DEPS}/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z" $STRIP
-		mv "Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt" Bullet
-	fi
-	add_cmake_opts -DBULLET_ROOT="$(real_pwd)/Bullet"
-	echo Done.
-}
-cd $DEPS
-echo
-printf "FFmpeg ${FFMPEG_VER}... "
-{
-	cd $DEPS_INSTALL
-	if [ -d FFmpeg ] && grep "${FFMPEG_VER}" FFmpeg/README.txt > /dev/null; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf FFmpeg
-		eval 7z x -y "${DEPS}/ffmpeg-${FFMPEG_VER}-win${BITS}.zip" $STRIP
-		eval 7z x -y "${DEPS}/ffmpeg-${FFMPEG_VER}-dev-win${BITS}.zip" $STRIP
-		mv "ffmpeg-${FFMPEG_VER}-win${BITS}-shared" FFmpeg
-		cp -r "ffmpeg-${FFMPEG_VER}-win${BITS}-dev/"* FFmpeg/
-		rm -rf "ffmpeg-${FFMPEG_VER}-win${BITS}-dev"
-	fi
-	export FFMPEG_HOME="$(real_pwd)/FFmpeg"
-	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/FFmpeg/bin/"{avcodec-58,avformat-58,avutil-56,swresample-3,swscale-5}.dll
-	done
-	if [ $BITS -eq 32 ]; then
-		add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
-	fi
-	echo Done.
-}
-cd $DEPS
-echo
-printf "MyGUI 3.4.2... "
-{
-	cd $DEPS_INSTALL
-	if [ -d MyGUI ] && \
-		grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
-		grep "MYGUI_VERSION_MINOR 4" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
-		grep "MYGUI_VERSION_PATCH 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
-	then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf MyGUI
-		eval 7z x -y "${DEPS}/MyGUI-3.4.2-msvc${MYGUI_MSVC_YEAR}-win${BITS}.7z" $STRIP
-		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/MyGUI-3.4.2-msvc${MYGUI_MSVC_YEAR}-win${BITS}-sym.7z" $STRIP
-		mv "MyGUI-3.4.2-msvc${MYGUI_MSVC_YEAR}-win${BITS}" MyGUI
-	fi
-	export MYGUI_HOME="$(real_pwd)/MyGUI"
 	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
-		if [ $CONFIGURATION == "Debug" ]; then
-			SUFFIX="_d"
-			MYGUI_CONFIGURATION="Debug"
+		if [[ ${CONFIGURATION:?} == "Debug" ]]; then
+			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/x64-windows/debug/bin"
+
+			add_runtime_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/Debug/MyGUIEngine_d.dll"
 		else
-			SUFFIX=""
-			MYGUI_CONFIGURATION="RelWithDebInfo"
-		fi
-		add_runtime_dlls $CONFIGURATION "$(pwd)/MyGUI/bin/${MYGUI_CONFIGURATION}/MyGUIEngine${SUFFIX}.dll"
-	done
-	echo Done.
-}
-cd $DEPS
-echo
-printf "OpenAL-Soft ${OPENAL_VER}... "
-{
-	if [ -d openal-soft-${OPENAL_VER}-bin ]; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf openal-soft-${OPENAL_VER}-bin
-		eval 7z x -y OpenAL-Soft-${OPENAL_VER}.zip $STRIP
-	fi
-	OPENAL_SDK="$(real_pwd)/openal-soft-${OPENAL_VER}-bin"
-	add_cmake_opts -DOPENAL_INCLUDE_DIR="${OPENAL_SDK}/include/AL" \
-		-DOPENAL_LIBRARY="${OPENAL_SDK}/libs/Win${BITS}/OpenAL32.lib"
-	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/openal-soft-${OPENAL_VER}-bin/bin/WIN${BITS}/soft_oal.dll:OpenAL32.dll"
-	done
-	echo Done.
-}
-cd $DEPS
-echo
-printf "${OSG_ARCHIVE_NAME}... "
-{
-	cd $DEPS_INSTALL
-	if [ -d OSG ] && \
-		grep "OPENSCENEGRAPH_MAJOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
-		grep "OPENSCENEGRAPH_MINOR_VERSION    6" OSG/include/osg/Version > /dev/null && \
-		grep "OPENSCENEGRAPH_PATCH_VERSION    5" OSG/include/osg/Version > /dev/null
-	then
-	printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf OSG
-		eval 7z x -y "${DEPS}/${OSG_ARCHIVE}.7z" $STRIP
-		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/${OSG_ARCHIVE}-sym.7z" $STRIP
-		mv "${OSG_ARCHIVE}" OSG
-	fi
-	OSG_SDK="$(real_pwd)/OSG"
-	add_cmake_opts -DOSG_DIR="$OSG_SDK"
-	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
-		if [ $CONFIGURATION == "Debug" ]; then
-			SUFFIX="d"
-			SUFFIX_UPCASE="D"
-		else
-			SUFFIX=""
-			SUFFIX_UPCASE=""
+			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/x64-windows/bin"
+
+			add_runtime_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/Release/MyGUIEngine.dll"
 		fi
 
-		if ! [ -z $OSG_MULTIVIEW_BUILD ]; then
-			add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{ot21-OpenThreads,libpng16}${SUFFIX}.dll \
-				"$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${SUFFIX}.dll
-		else
-			add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,icuuc58,libpng16}${SUFFIX}.dll \
-				"$(pwd)/OSG/bin/libxml2"${SUFFIX_UPCASE}.dll \
-				"$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${SUFFIX}.dll
-			add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/icudt58.dll"
-			if [ $CONFIGURATION == "Debug" ]; then
-				add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_system-vc141-mt-gd-1_63,collada-dom2.4-dp-vc141-mt-d}.dll
-			else
-				add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_system-vc141-mt-1_63,collada-dom2.4-dp-vc141-mt}.dll
-			fi
-		fi
-		add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_"{bmp,dae,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll
-		add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX}.dll
+		add_osg_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/osgPlugins-3.6.5/*.dll"
+		add_runtime_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/*.dll"
 	done
+
 	echo Done.
 }
+
 cd $DEPS
 echo
 printf "Qt ${QT_VER}... "
@@ -889,30 +672,11 @@ printf "Qt ${QT_VER}... "
 	if [ -d "Qt/${QT_VER}" ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		if [ $MISSINGPYTHON -ne 0 ]; then
-			echo "Can't be automatically installed without Python."
-			wrappedExit 1
-		fi
-
 		pushd "$DEPS" > /dev/null
-		if ! [ -d 'aqt-venv' ]; then
-			echo "  Creating Virtualenv for aqt..."
-			run_cmd python -m venv aqt-venv
-		fi
-		if [ -d 'aqt-venv/bin' ]; then
-			VENV_BIN_DIR='bin'
-		elif [ -d 'aqt-venv/Scripts' ]; then
-			VENV_BIN_DIR='Scripts'
-		else
-			echo "Error: Failed to create virtualenv in expected location."
-			wrappedExit 1
-		fi
-
-		# check version
-		aqt-venv/${VENV_BIN_DIR}/pip list | grep 'aqtinstall\s*1.1.3' || [ $? -ne 0 ]
-		if [ $? -eq 0 ]; then
-			echo "  Installing aqt wheel into virtualenv..."
-			run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==1.1.3
+		if ! [ -f "aqt_x64-${AQT_VERSION}.exe" ]; then
+			download "aqt ${AQT_VERSION}"\
+				"https://github.com/miurahr/aqtinstall/releases/download/${AQT_VERSION}/aqt_x64.exe" \
+				"aqt_x64-${AQT_VERSION}.exe"
 		fi
 		popd > /dev/null
 
@@ -921,7 +685,7 @@ printf "Qt ${QT_VER}... "
 		mkdir Qt
 		cd Qt
 
-		run_cmd "${DEPS}/aqt-venv/${VENV_BIN_DIR}/aqt" install ${QT_VER} windows desktop "win${BITS}_msvc${QT_MSVC_YEAR}${SUFFIX}"
+		run_cmd "${DEPS}/aqt_x64-${AQT_VERSION}.exe" install-qt windows desktop ${QT_VER} "win${BITS}_msvc${QT_MSVC_YEAR}${SUFFIX}"
 
 		printf "  Cleaning up extraneous data... "
 		rm -rf Qt/{aqtinstall.log,Tools}
@@ -929,129 +693,39 @@ printf "Qt ${QT_VER}... "
 		echo Done.
 	fi
 
+	QT_MAJOR_VER=$(echo "${QT_VER}" | awk -F '[.]' '{printf "%d", $1}')
+	QT_MINOR_VER=$(echo "${QT_VER}" | awk -F '[.]' '{printf "%d", $2}')
+
 	cd $QT_SDK
-	add_cmake_opts -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
-		-DCMAKE_PREFIX_PATH="$QT_SDK"
 	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
 		if [ $CONFIGURATION == "Debug" ]; then
 			DLLSUFFIX="d"
 		else
 			DLLSUFFIX=""
 		fi
-		if [ "${QT_VER:0:1}" -eq "6" ]; then
-			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_VER:0:1}"{Core,Gui,Network,OpenGL,OpenGLWidgets,Widgets}${DLLSUFFIX}.dll
+
+		if [ "${QT_MAJOR_VER}" -eq 6 ]; then
+			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_MAJOR_VER}"{Core,Gui,Network,OpenGL,OpenGLWidgets,Widgets,Svg}${DLLSUFFIX}.dll
+
+			# Since Qt 6.7.0 plugin is called "qmodernwindowsstyle"
+			if [ "${QT_MINOR_VER}" -ge 7 ]; then
+				add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qmodernwindowsstyle${DLLSUFFIX}.dll"
+			else
+				add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
+			fi
 		else
-			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_VER:0:1}"{Core,Gui,Network,OpenGL,Widgets}${DLLSUFFIX}.dll
+			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_MAJOR_VER}"{Core,Gui,Network,OpenGL,Widgets,Svg}${DLLSUFFIX}.dll
+			add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
 		fi
+
 		add_qt_platform_dlls $CONFIGURATION "$(pwd)/plugins/platforms/qwindows${DLLSUFFIX}.dll"
-		add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
-	done
-	echo Done.
-}
-cd $DEPS
-echo
-printf "SDL 2.24.0... "
-{
-	if [ -d SDL2-2.24.0 ]; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf SDL2-2.24.0
-		eval 7z x -y SDL2-devel-2.24.0-VC.zip $STRIP
-	fi
-	export SDL2DIR="$(real_pwd)/SDL2-2.24.0"
-	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/SDL2-2.24.0/lib/x${ARCHSUFFIX}/SDL2.dll"
-	done
-	echo Done.
-}
-cd $DEPS
-echo
-printf "LZ4 ${LZ4_VER}... "
-{
-	if [ -d LZ4_${LZ4_VER} ]; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf LZ4_${LZ4_VER}
-		eval 7z x -y lz4_win${BITS}_v${LZ4_VER//./_}.7z -o$(real_pwd)/LZ4_${LZ4_VER} $STRIP
-	fi
-	export LZ4DIR="$(real_pwd)/LZ4_${LZ4_VER}"
-	add_cmake_opts -DLZ4_INCLUDE_DIR="${LZ4DIR}/include" \
-		-DLZ4_LIBRARY="${LZ4DIR}/lib/liblz4.lib"
-	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
-		if [ $CONFIGURATION == "Debug" ]; then
-			LZ4_CONFIGURATION="Debug"
-		else
-			SUFFIX=""
-			LZ4_CONFIGURATION="Release"
-		fi
-		add_runtime_dlls $CONFIGURATION "$(pwd)/LZ4_${LZ4_VER}/bin/${LZ4_CONFIGURATION}/liblz4.dll"
-	done
-	echo Done.
-}
-cd $DEPS
-echo
-printf "LuaJIT ${LUAJIT_VER}... "
-{
-	if [ -d LuaJIT ]; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf LuaJIT
-		eval 7z x -y LuaJIT-${LUAJIT_VER}-msvc${LUA_MSVC_YEAR}-win${BITS}.7z -o$(real_pwd)/LuaJIT $STRIP
-	fi
-	export LUAJIT_DIR="$(real_pwd)/LuaJIT"
-	add_cmake_opts -DLuaJit_INCLUDE_DIR="${LUAJIT_DIR}/include" \
-		-DLuaJit_LIBRARY="${LUAJIT_DIR}/lib/lua51.lib"
-	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $CONFIGURATION "$(pwd)/LuaJIT/bin/lua51.dll"
+		add_qt_image_dlls $CONFIGURATION "$(pwd)/plugins/imageformats/qsvg${DLLSUFFIX}.dll"
+		add_qt_icon_dlls $CONFIGURATION "$(pwd)/plugins/iconengines/qsvgicon${DLLSUFFIX}.dll"
 	done
 	echo Done.
 }
 
-cd $DEPS
-echo
-printf "ICU ${ICU_VER/_/.}... "
-{
-	if [ -d ICU-${ICU_VER} ]; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf ICU-${ICU_VER}
-		eval 7z x -y icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip -o$(real_pwd)/ICU-${ICU_VER} $STRIP
-	fi
-	ICU_ROOT="$(real_pwd)/ICU-${ICU_VER}"
-	add_cmake_opts -DICU_ROOT="${ICU_ROOT}" \
-		-DICU_INCLUDE_DIR="${ICU_ROOT}/include" \
-		-DICU_I18N_LIBRARY="${ICU_ROOT}/lib${BITS}/icuin.lib " \
-		-DICU_UC_LIBRARY="${ICU_ROOT}/lib${BITS}/icuuc.lib " \
-		-DICU_DEBUG=ON
-
-	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icudt${ICU_VER/_*/}.dll"
-		add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icuin${ICU_VER/_*/}.dll"
-		add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icuuc${ICU_VER/_*/}.dll"
-	done
-	echo Done.
-}
-
-cd $DEPS
-echo
-printf "zlib 1.2.11... "
-{
-	if [ -d zlib-1.2.11-msvc2017-win64 ]; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf zlib-1.2.11-msvc2017-win64
-		eval 7z x -y zlib-1.2.11-msvc2017-win64.7z $STRIP
-	fi
-	add_cmake_opts -DZLIB_ROOT="$(real_pwd)/zlib-1.2.11-msvc2017-win64"
-	for config in ${CONFIGURATIONS[@]}; do
-		if [ $config == "Debug" ]; then
-			add_runtime_dlls $config "$(pwd)/zlib-1.2.11-msvc2017-win64/bin/zlibd.dll"
-		else
-			add_runtime_dlls $config "$(pwd)/zlib-1.2.11-msvc2017-win64/bin/zlib.dll"
-		fi
-	done
-	echo Done.
-}
+add_cmake_opts -DCMAKE_PREFIX_PATH="\"${QT_SDK}\""
 
 echo
 cd $DEPS_INSTALL/..
@@ -1137,6 +811,20 @@ fi
 			cp "$DLL" "${DLL_PREFIX}styles"
 		done
 		echo
+		echo "- Qt Image Format DLLs..."
+		mkdir -p ${DLL_PREFIX}imageformats
+		for DLL in ${QT_IMAGEFORMATS[$CONFIGURATION]}; do
+			echo "    $(basename $DLL)"
+			cp "$DLL" "${DLL_PREFIX}imageformats"
+		done
+		echo
+		echo "- Qt Icon Engine DLLs..."
+		mkdir -p ${DLL_PREFIX}iconengines
+		for DLL in ${QT_ICONENGINES[$CONFIGURATION]}; do
+			echo "    $(basename $DLL)"
+			cp "$DLL" "${DLL_PREFIX}iconengines"
+		done
+		echo
 	done
 #fi
 
@@ -1145,8 +833,9 @@ if [ "${BUILD_BENCHMARKS}" ]; then
 fi
 
 if [ -n "${TEST_FRAMEWORK}" ]; then
-	add_cmake_opts -DBUILD_UNITTESTS=ON
+	add_cmake_opts -DBUILD_COMPONENTS_TESTS=ON
 	add_cmake_opts -DBUILD_OPENCS_TESTS=ON
+	add_cmake_opts -DBUILD_OPENMW_TESTS=ON
 fi
 
 if [ -n "$ACTIVATE_MSVC" ]; then
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index c956f27514..9f7a5bde8f 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -1,30 +1,46 @@
 #!/bin/sh -e
 
-export CXX=clang++
-export CC=clang
-
 # Silence a git warning
 git config --global advice.detachedHead false
 
+rm -fr build
+mkdir build
+cd build
+
 DEPENDENCIES_ROOT="/tmp/openmw-deps"
 
 QT_PATH=$(brew --prefix qt@5)
 ICU_PATH=$(brew --prefix icu4c)
+OPENAL_PATH=$(brew --prefix openal-soft)
 CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
-mkdir build
-cd build
+
+declare -a CMAKE_CONF_OPTS=(
+-D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH;$OPENAL_PATH"
+-D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
+-D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
+-D CMAKE_CXX_FLAGS="-stdlib=libc++"
+-D CMAKE_C_COMPILER="clang"
+-D CMAKE_CXX_COMPILER="clang++"
+-D CMAKE_OSX_DEPLOYMENT_TARGET="13.6"
+-D OPENMW_USE_SYSTEM_RECASTNAVIGATION=TRUE
+-D Boost_INCLUDE_DIR="$DEPENDENCIES_ROOT/include"
+-D OSGPlugins_LIB_DIR="$DEPENDENCIES_ROOT/lib/osgPlugins-3.6.5"
+-D ICU_ROOT="$ICU_PATH"
+-D OPENMW_OSX_DEPLOYMENT=TRUE
+)
+
+if [[ "${CMAKE_BUILD_TYPE}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    )
+else
+    CMAKE_CONF_OPTS+=(
+        -D CMAKE_BUILD_TYPE=RelWithDebInfo
+    )
+fi
 
 cmake \
--D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \
--D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
--D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
--D CMAKE_CXX_FLAGS="-stdlib=libc++" \
--D CMAKE_C_FLAGS_RELEASE="-g -O0" \
--D CMAKE_CXX_FLAGS_RELEASE="-g -O0" \
--D CMAKE_OSX_DEPLOYMENT_TARGET="11" \
--D CMAKE_BUILD_TYPE=RELEASE \
--D OPENMW_OSX_DEPLOYMENT=TRUE \
--D OPENMW_USE_SYSTEM_RECASTNAVIGATION=TRUE \
+"${CMAKE_CONF_OPTS[@]}" \
 -D BUILD_OPENMW=TRUE \
 -D BUILD_OPENCS=TRUE \
 -D BUILD_ESMTOOL=TRUE \
@@ -33,6 +49,5 @@ cmake \
 -D BUILD_NIFTEST=TRUE \
 -D BUILD_NAVMESHTOOL=TRUE \
 -D BUILD_BULLETOBJECTTOOL=TRUE \
--D ICU_ROOT="$ICU_PATH" \
 -G"Unix Makefiles" \
 ..
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
deleted file mode 100644
index eac969b0d4..0000000000
--- a/CI/build.msvc.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-
-APPVEYOR=""
-CI=""
-
-PACKAGE=""
-PLATFORM=""
-CONFIGURATION=""
-VS_VERSION=""
-
-if [ -z $PLATFORM ]; then
-	PLATFORM=`uname -m`
-fi
-
-if [ -z $CONFIGURATION ]; then
-	CONFIGURATION="Debug"
-fi
-
-case $VS_VERSION in
-	14|14.0|2015 )
-		GENERATOR="Visual Studio 14 2015"
-		MSVC_YEAR="2015"
-		MSVC_VER="14.0"
-		;;
-
-#	12|2013|
-	* )
-		GENERATOR="Visual Studio 12 2013"
-		MSVC_YEAR="2013"
-		MVSC_VER="12.0"
-		;;
-esac
-
-case $PLATFORM in
-	x64|x86_64|x86-64|win64|Win64 )
-		BITS=64
-		;;
-
-	x32|x86|i686|i386|win32|Win32 )
-		BITS=32
-		;;
-esac
-
-case $CONFIGURATION in
-	debug|Debug|DEBUG )
-		CONFIGURATION=Debug
-		;;
-
-	release|Release|RELEASE )
-		CONFIGURATION=Release
-		;;
-
-	relwithdebinfo|RelWithDebInfo|RELWITHDEBINFO )
-		CONFIGURATION=RelWithDebInfo
-		;;
-esac
-
-if [ -z $APPVEYOR ]; then
-	echo "Running ${BITS}-bit MSVC${MSVC_YEAR} ${CONFIGURATION} build outside of Appveyor."
-
-	DIR=$(echo "$0" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
-	cd $(dirname "$DIR")/..
-else
-	echo "Running ${BITS}-bit MSVC${MSVC_YEAR} ${CONFIGURATION} build in Appveyor."
-
-	cd $APPVEYOR_BUILD_FOLDER
-fi
-
-BUILD_DIR="MSVC${MSVC_YEAR}_${BITS}"
-cd ${BUILD_DIR}
-
-which msbuild > /dev/null
-if [ $? -ne 0 ]; then
-	msbuild() {
-		/c/Program\ Files\ \(x86\)/MSBuild/${MSVC_VER}/Bin/MSBuild.exe "$@"
-	}
-fi
-
-if [ -z $APPVEYOR ]; then
-	msbuild OpenMW.sln //t:Build //p:Configuration=${CONFIGURATION} //m:8
-else
-	msbuild OpenMW.sln //t:Build //p:Configuration=${CONFIGURATION} //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-fi
-
-RET=$?
-if [ $RET -eq 0 ] && [ ! -z $PACKAGE ]; then
-	msbuild PACKAGE.vcxproj //t:Build //m:8
-	RET=$?
-fi
-
-exit $RET
diff --git a/CI/check_qt_translations.sh b/CI/check_qt_translations.sh
new file mode 100755
index 0000000000..1fc2e19002
--- /dev/null
+++ b/CI/check_qt_translations.sh
@@ -0,0 +1,11 @@
+#!/bin/bash -ex
+
+set -o pipefail
+
+LUPDATE="${LUPDATE:-lupdate}"
+
+${LUPDATE:?} -locations none apps/wizard -ts files/lang/wizard_*.ts
+${LUPDATE:?} -locations none apps/launcher -ts files/lang/launcher_*.ts
+${LUPDATE:?} -locations none components/contentselector components/process -ts files/lang/components_*.ts
+
+! (git diff --name-only | grep -q "^") || (echo -e "\033[0;31mBuild a 'translations' CMake target to update Qt localization for these files:\033[0;0m"; git diff --name-only | xargs -i echo -e "\033[0;31m{}\033[0;0m"; exit -1)
diff --git a/CI/check_tabs.sh b/CI/check_tabs.sh
deleted file mode 100755
index 1e88b57fd4..0000000000
--- a/CI/check_tabs.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-OUTPUT=$(grep -nRP '\t' --include=\*.{cpp,hpp,c,h} --exclude=ui_\* apps components)
-
-if [[ $OUTPUT ]] ; then
-    echo "Error: Tab characters found!"
-    echo $OUTPUT
-    exit 1
-fi
diff --git a/CI/deploy.osx.sh b/CI/deploy.osx.sh
deleted file mode 100755
index 88804d8587..0000000000
--- a/CI/deploy.osx.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# This script expect the following environment variables to be set:
-# - OSX_DEPLOY_KEY: private SSH key, must be encoded like this before adding it to Travis secrets: https://github.com/travis-ci/travis-ci/issues/7715#issuecomment-433301692
-# - OSX_DEPLOY_HOST: string specifying SSH of the following format: ssh-user@ssh-host
-# - OSX_DEPLOY_PORT: SSH port, it can't be a part of the host string because scp doesn't accept hosts with ports
-# - OSX_DEPLOY_HOST_FINGERPRINT: fingerprint of the host, can be obtained by using ssh-keygen -F [host]:port & putting it in double quotes when adding to Travis secrets
-
-SSH_KEY_PATH="$HOME/.ssh/openmw_deploy"
-REMOTE_PATH="\$HOME/nightly"
-
-echo "$OSX_DEPLOY_KEY" > "$SSH_KEY_PATH"
-chmod 600 "$SSH_KEY_PATH"
-echo "$OSX_DEPLOY_HOST_FINGERPRINT" >> "$HOME/.ssh/known_hosts"
-
-cd build || exit 1
-
-DATE=$(date +'%d%m%Y')
-SHORT_COMMIT=$(git rev-parse --short "${TRAVIS_COMMIT}")
-TARGET_FILENAME="OpenMW-${DATE}-${SHORT_COMMIT}.dmg"
-
-if ! ssh -p "$OSX_DEPLOY_PORT" -i "$SSH_KEY_PATH" "$OSX_DEPLOY_HOST" "ls \"$REMOTE_PATH\"" | grep "$SHORT_COMMIT" > /dev/null; then
-    scp -P "$OSX_DEPLOY_PORT" -i "$SSH_KEY_PATH" ./*.dmg "$OSX_DEPLOY_HOST:$REMOTE_PATH/$TARGET_FILENAME"
-else
-    echo "An existing nightly build for commit ${SHORT_COMMIT} has been found, skipping upload."
-fi
diff --git a/CI/file_name_exceptions.txt b/CI/file_name_exceptions.txt
index 5035d73f27..14d106169b 100644
--- a/CI/file_name_exceptions.txt
+++ b/CI/file_name_exceptions.txt
@@ -8,26 +8,26 @@ apps/openmw/mwsound/sound_buffer.cpp
 apps/openmw/mwsound/sound_buffer.hpp
 apps/openmw/mwsound/sound_decoder.hpp
 apps/openmw/mwsound/sound_output.hpp
-apps/openmw_test_suite/esm/test_fixed_string.cpp
-apps/openmw_test_suite/files/conversion_tests.cpp
-apps/openmw_test_suite/lua/test_async.cpp
-apps/openmw_test_suite/lua/test_configuration.cpp
-apps/openmw_test_suite/lua/test_l10n.cpp
-apps/openmw_test_suite/lua/test_lua.cpp
-apps/openmw_test_suite/lua/test_scriptscontainer.cpp
-apps/openmw_test_suite/lua/test_serialization.cpp
-apps/openmw_test_suite/lua/test_storage.cpp
-apps/openmw_test_suite/lua/test_ui_content.cpp
-apps/openmw_test_suite/lua/test_utilpackage.cpp
-apps/openmw_test_suite/misc/test_endianness.cpp
-apps/openmw_test_suite/misc/test_resourcehelpers.cpp
-apps/openmw_test_suite/misc/test_stringops.cpp
-apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
-apps/openmw_test_suite/mwscript/test_scripts.cpp
-apps/openmw_test_suite/mwscript/test_utils.hpp
-apps/openmw_test_suite/mwworld/test_store.cpp
-apps/openmw_test_suite/openmw_test_suite.cpp
-apps/openmw_test_suite/testing_util.hpp
+apps/components_tests/esm/test_fixed_string.cpp
+apps/components_tests/files/conversion_tests.cpp
+apps/components_tests/lua/test_async.cpp
+apps/components_tests/lua/test_configuration.cpp
+apps/components_tests/lua/test_l10n.cpp
+apps/components_tests/lua/test_lua.cpp
+apps/components_tests/lua/test_scriptscontainer.cpp
+apps/components_tests/lua/test_serialization.cpp
+apps/components_tests/lua/test_storage.cpp
+apps/components_tests/lua/test_ui_content.cpp
+apps/components_tests/lua/test_utilpackage.cpp
+apps/components_tests/lua/test_inputactions.cpp
+apps/components_tests/lua/test_yaml.cpp
+apps/components_tests/misc/test_endianness.cpp
+apps/components_tests/misc/test_resourcehelpers.cpp
+apps/components_tests/misc/test_stringops.cpp
+apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
+apps/openmw_tests/mwscript/test_scripts.cpp
+apps/openmw_tests/mwscript/test_utils.hpp
+apps/openmw_tests/mwworld/test_store.cpp
 components/bsa/bsa_file.cpp
 components/bsa/bsa_file.hpp
 components/crashcatcher/windows_crashcatcher.cpp
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 4417a04317..d29f16f55f 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -33,9 +33,10 @@ declare -rA GROUPED_DEPS=(
     libboost-system-dev libboost-iostreams-dev
 
     libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
-    libsdl2-dev libqt5opengl5-dev libopenal-dev libunshield-dev libtinyxml-dev
-    libbullet-dev liblz4-dev libpng-dev libjpeg-dev libluajit-5.1-dev
-    librecast-dev libsqlite3-dev ca-certificates libicu-dev libyaml-cpp-dev
+    libsdl2-dev libqt5opengl5-dev qttools5-dev qttools5-dev-tools libopenal-dev
+    libunshield-dev libtinyxml-dev libbullet-dev liblz4-dev libpng-dev libjpeg-dev
+    libluajit-5.1-dev librecast-dev libsqlite3-dev ca-certificates libicu-dev
+    libyaml-cpp-dev libqt5svg5 libqt5svg5-dev
   "
 
   # These dependencies can alternatively be built and linked statically.
@@ -86,7 +87,7 @@ declare -rA GROUPED_DEPS=(
     libswresample3
     libswscale5
     libtinyxml2.6.2v5
-    libyaml-cpp0.7
+    libyaml-cpp0.8
     python3-pip
     xvfb
   "
@@ -99,6 +100,12 @@ declare -rA GROUPED_DEPS=(
     clang-format-14
     git-core
   "
+
+  [openmw-qt-translations]="
+    qttools5-dev
+    qttools5-dev-tools
+    git-core
+  "
 )
 
 if [[ $# -eq 0 ]]; then
@@ -122,4 +129,7 @@ mkdir -pv "$APT_CACHE_DIR"
 apt-get update -yqq
 apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends software-properties-common gnupg >/dev/null
 add-apt-repository -y ppa:openmw/openmw
+add-apt-repository -y ppa:openmw/openmw-daily
+add-apt-repository -y ppa:openmw/staging
 apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}" >/dev/null
+apt list --installed
diff --git a/CI/org.openmw.OpenMW.devel.yaml b/CI/org.openmw.OpenMW.devel.yaml
index 9e8fb9eeb9..9f4d921cf1 100644
--- a/CI/org.openmw.OpenMW.devel.yaml
+++ b/CI/org.openmw.OpenMW.devel.yaml
@@ -125,8 +125,8 @@ modules:
       - "-DMYGUI_BUILD_PLUGINS=0"
     sources:
       - type: archive
-        url: https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.2.tar.gz
-        sha256: 1cc45fb96c9438e3476778449af0378443d84794a458978a29c75306e45dd45a
+        url: https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.3.tar.gz
+        sha256: 33c91b531993047e77cace36d6fea73634b8c17bd0ed193d4cd12ac7c6328abd
 
   - name: libunshield
     buildsystem: cmake-ninja
diff --git a/CI/run_integration_tests.sh b/CI/run_integration_tests.sh
index d7b025df52..e79408926a 100755
--- a/CI/run_integration_tests.sh
+++ b/CI/run_integration_tests.sh
@@ -1,6 +1,12 @@
 #!/bin/bash -ex
 
-git clone --depth=1 https://gitlab.com/OpenMW/example-suite.git
+mkdir example-suite
+cd example-suite
+git init
+git remote add origin https://gitlab.com/OpenMW/example-suite.git
+git fetch --depth=1 origin ${EXAMPLE_SUITE_REVISION}
+git checkout FETCH_HEAD
+cd ..
 
 xvfb-run --auto-servernum --server-args='-screen 0 640x480x24x60' \
     scripts/integration_tests.py --omw build/install/bin/openmw --workdir integration_tests_output example-suite/
diff --git a/CI/teal_ci.sh b/CI/teal_ci.sh
index 5ea312e88c..6f5953f1be 100755
--- a/CI/teal_ci.sh
+++ b/CI/teal_ci.sh
@@ -1,14 +1,15 @@
-set -e
+#!/bin/bash -e
 
 docs/source/install_luadocumentor_in_docker.sh
 PATH=$PATH:~/luarocks/bin
 
 pushd .
 echo "Install Teal Cyan"
-git clone https://github.com/teal-language/cyan.git --depth 1
+git clone https://github.com/teal-language/cyan.git
 cd cyan
-luarocks make cyan-dev-1.rockspec
+git checkout v0.4.0
+luarocks make cyan-0.4.0-1.rockspec
 popd
 
+cyan version
 scripts/generate_teal_declarations.sh ./teal_declarations
-zip teal_declarations.zip -r teal_declarations
diff --git a/CI/ubuntu_gcc_preprocess.sh b/CI/ubuntu_gcc_preprocess.sh
index 05d7528e41..d519d178aa 100755
--- a/CI/ubuntu_gcc_preprocess.sh
+++ b/CI/ubuntu_gcc_preprocess.sh
@@ -31,7 +31,8 @@ cmake \
     -D BUILD_OPENCS=ON \
     -D BUILD_OPENCS_TESTS=ON \
     -D BUILD_OPENMW=ON \
-    -D BUILD_UNITTESTS=ON \
+    -D BUILD_OPENMW_TESTS=ON \
+    -D BUILD_COMPONENTS_TESTS=ON \
     -D BUILD_WIZARD=ON \
     "${SRC}"
 cmake --build . --parallel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9865e6569..80a50297ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,14 @@ if(OPENMW_GL4ES_MANUAL_INIT)
     add_definitions(-DOPENMW_GL4ES_MANUAL_INIT)
 endif()
 
+if (APPLE OR WIN32)
+    set(DEPLOY_QT_TRANSLATIONS_DEFAULT ON)
+else ()
+    set(DEPLOY_QT_TRANSLATIONS_DEFAULT OFF)
+endif ()
+
+option(DEPLOY_QT_TRANSLATIONS "Deploy standard Qt translations to resources folder. Needed when OpenMW applications are deployed with Qt libraries" ${DEPLOY_QT_TRANSLATIONS_DEFAULT})
+
 # Apps and tools
 option(BUILD_OPENMW             "Build OpenMW" ON)
 option(BUILD_LAUNCHER           "Build Launcher" ON)
@@ -31,11 +39,13 @@ option(BUILD_ESMTOOL            "Build ESM inspector" ON)
 option(BUILD_NIFTEST            "Build nif file tester" ON)
 option(BUILD_DOCS               "Build documentation." OFF )
 option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
-option(BUILD_UNITTESTS          "Enable Unittests with Google C++ Unittest" OFF)
+option(BUILD_COMPONENTS_TESTS   "Build components library tests" OFF)
 option(BUILD_BENCHMARKS         "Build benchmarks with Google Benchmark" OFF)
 option(BUILD_NAVMESHTOOL        "Build navmesh tool" ON)
 option(BUILD_BULLETOBJECTTOOL   "Build Bullet object tool" ON)
 option(BUILD_OPENCS_TESTS       "Build OpenMW Construction Set tests" OFF)
+option(BUILD_OPENMW_TESTS       "Build OpenMW tests" OFF)
+option(PRECOMPILE_HEADERS_WITH_MSVC "Precompile most common used headers with MSVC (alternative to ccache)" ON)
 
 set(OpenGL_GL_PREFERENCE LEGACY)  # Use LEGACY as we use GL2; GLNVD is for GL3 and up.
 
@@ -54,6 +64,7 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF()
 
 if (APPLE)
+    set(CMAKE_FIND_FRAMEWORK LAST) # prefer dylibs over frameworks
     set(APP_BUNDLE_NAME "${CMAKE_PROJECT_NAME}.app")
 
     set(APP_BUNDLE_DIR "${OpenMW_BINARY_DIR}/${APP_BUNDLE_NAME}")
@@ -71,6 +82,8 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 49)
 set(OPENMW_VERSION_RELEASE 0)
+set(OPENMW_LUA_API_REVISION 68)
+set(OPENMW_POSTPROCESSING_API_REVISION 2)
 
 set(OPENMW_VERSION_COMMITHASH "")
 set(OPENMW_VERSION_TAGHASH "")
@@ -78,7 +91,7 @@ set(OPENMW_VERSION_COMMITDATE "")
 
 set(OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
 
-set(OPENMW_DOC_BASEURL "https://openmw.readthedocs.io/en/stable/")
+set(OPENMW_DOC_BASEURL "https://openmw.readthedocs.io/en/")
 
 set(GIT_CHECKOUT FALSE)
 if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
@@ -111,8 +124,6 @@ include(WholeArchive)
 
 configure_file ("${OpenMW_SOURCE_DIR}/docs/mainpage.hpp.cmake" "${OpenMW_BINARY_DIR}/docs/mainpage.hpp")
 
-option(BOOST_STATIC "Link static build of Boost into the binaries" FALSE)
-option(SDL2_STATIC "Link static build of SDL into the binaries" FALSE)
 option(QT_STATIC "Link static build of Qt into the binaries" FALSE)
 
 option(OPENMW_USE_SYSTEM_BULLET "Use system provided bullet physics library" ON)
@@ -142,7 +153,7 @@ option(MYGUI_STATIC "Link static build of Mygui into the binaries" ${_mygui_stat
 option(OPENMW_USE_SYSTEM_RECASTNAVIGATION "Use system provided recastnavigation library" OFF)
 if(OPENMW_USE_SYSTEM_RECASTNAVIGATION)
     set(_recastnavigation_static_default OFF)
-    find_package(RecastNavigation REQUIRED)
+    find_package(RecastNavigation REQUIRED CONFIG)
 else()
     set(_recastnavigation_static_default ON)
 endif()
@@ -156,13 +167,6 @@ option(OPENMW_USE_SYSTEM_GOOGLETEST "Use system Google Test library." OFF)
 option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time" FALSE)
 option(OPENMW_LTO_BUILD "Build OpenMW with Link-Time Optimization (Needs ~2GB of RAM)" OFF)
 
-# what is necessary to build documentation
-IF( BUILD_DOCS )
-    # Builds the documentation.
-    FIND_PACKAGE( Sphinx REQUIRED )
-    FIND_PACKAGE( Doxygen REQUIRED )
-ENDIF()
-
 # OS X deployment
 option(OPENMW_OSX_DEPLOYMENT OFF)
 
@@ -178,6 +182,24 @@ if (MSVC)
     # there should be no relevant downsides to having it on:
     # https://docs.microsoft.com/en-us/cpp/build/reference/bigobj-increase-number-of-sections-in-dot-obj-file
     add_compile_options(/bigobj)
+
+    add_compile_options(/Zc:__cplusplus)
+
+    if (CMAKE_CXX_COMPILER_LAUNCHER OR CMAKE_C_COMPILER_LAUNCHER)
+        if (CMAKE_GENERATOR MATCHES "Visual Studio")
+            message(STATUS "A compiler launcher was specified, but will be unused by the current generator (${CMAKE_GENERATOR})")
+        else()
+            foreach (config_lower ${CMAKE_CONFIGURATION_TYPES})
+                string(TOUPPER "${config_lower}" config)
+                if (CMAKE_C_COMPILER_LAUNCHER STREQUAL "ccache")
+                    string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_${config} "${CMAKE_C_FLAGS_${config}}")
+                endif()
+                if (CMAKE_CXX_COMPILER_LAUNCHER STREQUAL "ccache")
+                    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_${config} "${CMAKE_CXX_FLAGS_${config}}")
+                endif()
+            endforeach()
+        endif()
+    endif()
 endif()
 
 # Set up common paths
@@ -205,7 +227,7 @@ else()
 endif(APPLE)
 
 if (WIN32)
-    option(USE_DEBUG_CONSOLE "whether a debug console should be enabled for debug builds, if false debug output is redirected to Visual Studio output" ON)
+    option(USE_DEBUG_CONSOLE "Whether a console should be displayed if OpenMW isn't launched from the command line. Does not affect the Release configuration." ON)
 endif()
 
 if(MSVC)
@@ -213,16 +235,25 @@ if(MSVC)
 endif()
 
 # Dependencies
-find_package(OpenGL REQUIRED)
+if (APPLE)
+    # Force CMake to use the installed version of OpenGL on macOS
+    set(_SAVE_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
+    set(CMAKE_FIND_FRAMEWORK ONLY)
+    find_package(OpenGL REQUIRED)
+    set(CMAKE_FIND_FRAMEWORK ${_SAVE_CMAKE_FIND_FRAMEWORK})
+    unset(_SAVE_CMAKE_FIND_FRAMEWORK)
+else()
+    find_package(OpenGL REQUIRED)
+endif()
 
 find_package(LZ4 REQUIRED)
 
 if (USE_QT)
     find_package(QT REQUIRED COMPONENTS Core NAMES Qt6 Qt5)
     if (QT_VERSION_MAJOR VERSION_EQUAL 5)
-        find_package(Qt5 5.15 COMPONENTS Core Widgets Network OpenGL REQUIRED)
+        find_package(Qt5 5.15 COMPONENTS Core Widgets Network OpenGL LinguistTools Svg REQUIRED)
     else()
-        find_package(Qt6 COMPONENTS Core Widgets Network OpenGL OpenGLWidgets REQUIRED)
+        find_package(Qt6 COMPONENTS Core Widgets Network OpenGL OpenGLWidgets LinguistTools Svg REQUIRED)
     endif()
     message(STATUS "Using Qt${QT_VERSION}")
 endif()
@@ -276,7 +307,7 @@ if (OPENMW_USE_SYSTEM_YAML_CPP)
     find_package(yaml-cpp REQUIRED)
 endif()
 
-if ((BUILD_UNITTESTS OR BUILD_OPENCS_TESTS) AND OPENMW_USE_SYSTEM_GOOGLETEST)
+if ((BUILD_COMPONENTS_TESTS OR BUILD_OPENCS_TESTS OR BUILD_OPENMW_TESTS) AND OPENMW_USE_SYSTEM_GOOGLETEST)
     find_package(GTest 1.10 REQUIRED)
     find_package(GMock 1.10 REQUIRED)
 endif()
@@ -293,8 +324,8 @@ find_package(FFmpeg REQUIRED COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE SWRESAMP
 if(FFmpeg_FOUND)
     SET(FFVER_OK TRUE)
 
-    # Can not detect FFmpeg version on Windows for now
-    if (NOT WIN32)
+    # Can not detect FFmpeg version on Windows or Android for now
+    if (NOT WIN32 AND NOT ANDROID)
         if(FFmpeg_AVFORMAT_VERSION VERSION_LESS "57.56.100")
             message(STATUS "libavformat is too old! (${FFmpeg_AVFORMAT_VERSION}, wanted 57.56.100)")
             set(FFVER_OK FALSE)
@@ -346,11 +377,6 @@ endif()
 
 # Platform specific
 if (WIN32)
-    if(NOT MINGW)
-    set(Boost_USE_STATIC_LIBS   ON)
-    add_definitions(-DBOOST_ALL_NO_LIB)
-    endif(NOT MINGW)
-
     # Suppress WinMain(), provided by SDL
     add_definitions(-DSDL_MAIN_HANDLED)
 
@@ -433,32 +459,14 @@ if(HAVE_MULTIVIEW)
     add_definitions(-DOSG_HAS_MULTIVIEW)
 endif(HAVE_MULTIVIEW)
 
-set(BOOST_COMPONENTS system program_options iostreams)
-if(WIN32)
-    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
-    if(MSVC)
-        # boost-zlib is not present (nor needed) in vcpkg version of boost.
-        # there, it is part of boost-iostreams instead.
-        set(BOOST_OPTIONAL_COMPONENTS zlib)
-    endif(MSVC)
-endif(WIN32)
+set(BOOST_COMPONENTS iostreams program_options system)
 
-IF(BOOST_STATIC)
-    set(Boost_USE_STATIC_LIBS   ON)
-endif()
-
-set(Boost_NO_BOOST_CMAKE ON)
-
-find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
-
-if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0)
-    find_package(Boost 1.77.0 REQUIRED COMPONENTS atomic)
-endif()
+find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
 
 if(OPENMW_USE_SYSTEM_MYGUI)
-    find_package(MyGUI 3.4.2 REQUIRED)
+    find_package(MyGUI 3.4.3 REQUIRED)
 endif()
-find_package(SDL2 2.0.9 REQUIRED)
+find_package(SDL2 2.0.10 REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)
 
@@ -471,7 +479,7 @@ else(USE_LUAJIT)
     find_package(Lua REQUIRED)
     add_compile_definitions(NO_LUAJIT)
 endif(USE_LUAJIT)
-if (NOT WIN32)
+if (NOT WIN32 AND NOT ANDROID)
     include(cmake/CheckLuaCustomAllocator.cmake)
 endif()
 
@@ -482,8 +490,6 @@ set(SOL_CONFIG_DIR ${OpenMW_SOURCE_DIR}/extern/sol_config)
 include_directories(
     BEFORE SYSTEM
     "."
-    ${SDL2_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIR}
     ${MyGUI_INCLUDE_DIRS}
     ${OPENAL_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
@@ -494,7 +500,7 @@ include_directories(
     ${ICU_INCLUDE_DIRS}
 )
 
-link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ${COLLADA_DOM_LIBRARY_DIRS})
+link_directories(${COLLADA_DOM_LIBRARY_DIRS})
 
 if(MYGUI_STATIC)
     add_definitions(-DMYGUI_STATIC)
@@ -536,14 +542,19 @@ pack_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg
 configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml
     "${OpenMW_BINARY_DIR}" "openmw.appdata.xml")
 
-if (NOT APPLE)
+if (APPLE)
+    configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
+        "${OpenMW_BINARY_DIR}/openmw.cfg")
+elseif (WIN32)
+    configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
+        "${OpenMW_BINARY_DIR}" "openmw.cfg")
+    configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
+        "${OpenMW_BINARY_DIR}" "openmw.cfg.install")
+else ()
     configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
         "${OpenMW_BINARY_DIR}" "openmw.cfg")
     configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
         "${OpenMW_BINARY_DIR}" "openmw.cfg.install")
-else ()
-    configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
-        "${OpenMW_BINARY_DIR}/openmw.cfg")
 endif ()
 
 pack_resource_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg
@@ -582,7 +593,6 @@ endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     set(OPENMW_CXX_FLAGS "-Wall -Wextra -Wundef -Wextra-semi -Wno-unused-parameter -pedantic -Wno-long-long -Wnon-virtual-dtor -Wunused ${OPENMW_CXX_FLAGS}")
-    add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS=ON )
 
     if (APPLE)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
@@ -617,7 +627,7 @@ endif()
 add_subdirectory (components)
 
 # Apps and tools
-if (BUILD_OPENMW)
+if (BUILD_OPENMW OR BUILD_OPENMW_TESTS)
     add_subdirectory( apps/openmw )
 endif()
 
@@ -651,11 +661,10 @@ endif()
 
 if (BUILD_NIFTEST)
     add_subdirectory(apps/niftest)
-endif(BUILD_NIFTEST)
+endif()
 
-# UnitTests
-if (BUILD_UNITTESTS)
-    add_subdirectory( apps/openmw_test_suite )
+if (BUILD_COMPONENTS_TESTS)
+    add_subdirectory(apps/components_tests)
 endif()
 
 if (BUILD_BENCHMARKS)
@@ -667,13 +676,17 @@ if (BUILD_NAVMESHTOOL)
 endif()
 
 if (BUILD_BULLETOBJECTTOOL)
-    add_subdirectory( apps/bulletobjecttool )
+    add_subdirectory(apps/bulletobjecttool)
 endif()
 
 if (BUILD_OPENCS_TESTS)
     add_subdirectory(apps/opencs_tests)
 endif()
 
+if (BUILD_OPENMW_TESTS)
+    add_subdirectory(apps/openmw_tests)
+endif()
+
 if (WIN32)
     if (MSVC)
         foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
@@ -685,9 +698,8 @@ if (WIN32)
         if (USE_DEBUG_CONSOLE AND BUILD_OPENMW)
             set_target_properties(openmw PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
             set_target_properties(openmw PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
-            set_target_properties(openmw PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_CONSOLE>)
         elseif (BUILD_OPENMW)
-            # Turn off debug console, debug output will be written to visual studio output instead
+            # Turn off implicit console, you won't see stdout unless launching OpenMW from a command line shell or look at openmw.log
             set_target_properties(openmw PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
             set_target_properties(openmw PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS")
         endif()
@@ -710,67 +722,74 @@ if (WIN32)
             )
 
         foreach(d ${WARNINGS_DISABLE})
-            set(WARNINGS "${WARNINGS} /wd${d}")
+            list(APPEND WARNINGS "/wd${d}")
         endforeach(d)
 
         if(OPENMW_MSVC_WERROR)
-            set(WARNINGS "${WARNINGS} /WX")
+            list(APPEND WARNINGS "/WX")
         endif()
 
-        set_target_properties(components PROPERTIES COMPILE_FLAGS "${WARNINGS}")
-        set_target_properties(osg-ffmpeg-videoplayer PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+        target_compile_options(components PRIVATE ${WARNINGS})
+        target_compile_options(osg-ffmpeg-videoplayer PRIVATE ${WARNINGS})
 
         if (MSVC_VERSION GREATER_EQUAL 1915 AND MSVC_VERSION LESS 1920)
             target_compile_definitions(components INTERFACE _ENABLE_EXTENDED_ALIGNED_STORAGE)
         endif()
 
         if (BUILD_BSATOOL)
-            set_target_properties(bsatool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(bsatool PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_ESMTOOL)
-            set_target_properties(esmtool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(esmtool PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_ESSIMPORTER)
-            set_target_properties(openmw-essimporter PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw-essimporter PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_LAUNCHER)
-            set_target_properties(openmw-launcher PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw-launcher PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_MWINIIMPORTER)
-            set_target_properties(openmw-iniimporter PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw-iniimporter PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_OPENCS)
-            set_target_properties(openmw-cs PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw-cs PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_OPENMW)
-            set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_WIZARD)
-            set_target_properties(openmw-wizard PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw-wizard PRIVATE ${WARNINGS})
         endif()
 
-        if (BUILD_UNITTESTS)
-            set_target_properties(openmw_test_suite PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+        if (BUILD_COMPONENTS_TESTS)
+            target_compile_options(components-tests PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_BENCHMARKS)
-            set_target_properties(openmw_detournavigator_navmeshtilescache_benchmark PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_NAVMESHTOOL)
-            set_target_properties(openmw-navmeshtool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw-navmeshtool PRIVATE ${WARNINGS})
         endif()
 
         if (BUILD_BULLETOBJECTTOOL)
-            set(WARNINGS "${WARNINGS} ${MT_BUILD}")
-            set_target_properties(openmw-bulletobjecttool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+            target_compile_options(openmw-bulletobjecttool PRIVATE ${WARNINGS} ${MT_BUILD})
+        endif()
+
+        if (BUILD_OPENCS_TESTS)
+            target_compile_options(openmw-cs-tests PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_OPENMW_TESTS)
+            target_compile_options(openmw-tests PRIVATE ${WARNINGS})
         endif()
     endif(MSVC)
 
@@ -802,6 +821,18 @@ if (OPENMW_OSX_DEPLOYMENT AND APPLE)
     get_filename_component(QT_QMACSTYLE_PLUGIN_NAME "${QT_QMACSTYLE_PLUGIN_PATH}" NAME)
     configure_file("${QT_QMACSTYLE_PLUGIN_PATH}" "${APP_BUNDLE_DIR}/Contents/PlugIns/${QT_QMACSTYLE_PLUGIN_GROUP}/${QT_QMACSTYLE_PLUGIN_NAME}" COPYONLY)
 
+    get_property(QT_QSVG_PLUGIN_PATH TARGET Qt${QT_VERSION_MAJOR}::QSvgPlugin PROPERTY LOCATION_RELEASE)
+    get_filename_component(QT_QSVG_PLUGIN_DIR "${QT_QSVG_PLUGIN_PATH}" DIRECTORY)
+    get_filename_component(QT_QSVG_PLUGIN_GROUP "${QT_QSVG_PLUGIN_DIR}" NAME)
+    get_filename_component(QT_QSVG_PLUGIN_NAME "${QT_QSVG_PLUGIN_PATH}" NAME)
+    configure_file("${QT_QSVG_PLUGIN_PATH}" "${APP_BUNDLE_DIR}/Contents/PlugIns/${QT_QSVG_PLUGIN_GROUP}/${QT_QSVG_PLUGIN_NAME}" COPYONLY)
+
+    get_property(QT_QSVG_ICON_PLUGIN_PATH TARGET Qt${QT_VERSION_MAJOR}::QSvgIconPlugin PROPERTY LOCATION_RELEASE)
+    get_filename_component(QT_QSVG_ICON_PLUGIN_DIR "${QT_QSVG_ICON_PLUGIN_PATH}" DIRECTORY)
+    get_filename_component(QT_QSVG_ICON_PLUGIN_GROUP "${QT_QSVG_ICON_PLUGIN_DIR}" NAME)
+    get_filename_component(QT_QSVG_ICON_PLUGIN_NAME "${QT_QSVG_ICON_PLUGIN_PATH}" NAME)
+    configure_file("${QT_QSVG_ICON_PLUGIN_PATH}" "${APP_BUNDLE_DIR}/Contents/PlugIns/${QT_QSVG_ICON_PLUGIN_GROUP}/${QT_QSVG_ICON_PLUGIN_NAME}" COPYONLY)
+
     configure_file("${OpenMW_SOURCE_DIR}/files/mac/qt.conf" "${APP_BUNDLE_DIR}/Contents/Resources/qt.conf" COPYONLY)
 
     if (BUILD_OPENCS)
@@ -809,6 +840,8 @@ if (OPENMW_OSX_DEPLOYMENT AND APPLE)
         set(OPENCS_BUNDLE_NAME "${OPENCS_BUNDLE_NAME_TMP}.app")
         configure_file("${QT_COCOA_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_COCOA_PLUGIN_GROUP}/${QT_COCOA_PLUGIN_NAME}" COPYONLY)
         configure_file("${QT_QMACSTYLE_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_QMACSTYLE_PLUGIN_GROUP}/${QT_QMACSTYLE_PLUGIN_NAME}" COPYONLY)
+        configure_file("${QT_QSVG_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_QSVG_PLUGIN_GROUP}/${QT_QSVG_PLUGIN_NAME}" COPYONLY)
+        configure_file("${QT_QSVG_ICON_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_QSVG_ICON_PLUGIN_GROUP}/${QT_QSVG_ICON_PLUGIN_NAME}" COPYONLY)
         configure_file("${OpenMW_SOURCE_DIR}/files/mac/qt.conf" "${OPENCS_BUNDLE_NAME}/Contents/Resources/qt.conf" COPYONLY)
     endif ()
 
@@ -877,6 +910,11 @@ if (OPENMW_OSX_DEPLOYMENT AND APPLE)
     install_plugins_for_bundle("${APP_BUNDLE_NAME}" PLUGINS)
     install_plugins_for_bundle("${OPENCS_BUNDLE_NAME}" OPENCS_PLUGINS)
 
+    INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "/${INSTALLED_OPENMW_APP}/..")
+    INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "/${INSTALLED_OPENMW_APP}/..")
+    INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "/${INSTALLED_OPENMW_APP}/..")
+    INSTALL(FILES "${OpenMW_SOURCE_DIR}/AUTHORS.md" DESTINATION "/${INSTALLED_OPENMW_APP}/..")
+
     set(PLUGINS ${PLUGINS} "${INSTALLED_OPENMW_APP}/Contents/PlugIns/${QT_COCOA_PLUGIN_GROUP}/${QT_COCOA_PLUGIN_NAME}")
     set(PLUGINS ${PLUGINS} "${INSTALLED_OPENMW_APP}/Contents/PlugIns/${QT_QMACSTYLE_PLUGIN_GROUP}/${QT_QMACSTYLE_PLUGIN_NAME}")
     set(OPENCS_PLUGINS ${OPENCS_PLUGINS} "${INSTALLED_OPENCS_APP}/Contents/PlugIns/${QT_COCOA_PLUGIN_GROUP}/${QT_COCOA_PLUGIN_NAME}")
@@ -928,6 +966,7 @@ elseif(NOT APPLE)
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "." RENAME "LICENSE.txt")
+        INSTALL(FILES "${OpenMW_SOURCE_DIR}/AUTHORS.md" DESTINATION "." RENAME "AUTHORS.txt")
         INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION ".")
         INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION ".")
 
@@ -1041,7 +1080,6 @@ elseif(NOT APPLE)
         # Install global configuration files
         INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
         INSTALL(FILES "${INSTALL_SOURCE}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" COMPONENT "openmw")
-        INSTALL(FILES "${INSTALL_SOURCE}/resources/version" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
         INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
 
         IF(BUILD_OPENCS)
@@ -1053,12 +1091,17 @@ elseif(NOT APPLE)
     endif(WIN32)
 endif(OPENMW_OSX_DEPLOYMENT AND APPLE)
 
-# Doxygen Target -- simply run 'make doc' or 'make doc_pages'
-# output directory for 'make doc'       is "${OpenMW_BINARY_DIR}/docs/Doxygen"
-# output directory for 'make doc_pages' is "${DOXYGEN_PAGES_OUTPUT_DIR}" if defined
-#                                       or "${OpenMW_BINARY_DIR}/docs/Pages" otherwise
-find_package(Doxygen)
-if (DOXYGEN_FOUND)
+# what is necessary to build documentation
+if ( BUILD_DOCS )
+    # Builds the documentation.
+    FIND_PACKAGE( Sphinx REQUIRED )
+    FIND_PACKAGE( Doxygen REQUIRED )
+
+    # Doxygen Target -- simply run 'make doc' or 'make doc_pages'
+    # output directory for 'make doc'       is "${OpenMW_BINARY_DIR}/docs/Doxygen"
+    # output directory for 'make doc_pages' is "${DOXYGEN_PAGES_OUTPUT_DIR}" if defined
+    #                                       or "${OpenMW_BINARY_DIR}/docs/Pages" otherwise
+
     # determine output directory for doc_pages
     if (NOT DEFINED DOXYGEN_PAGES_OUTPUT_DIR)
         set(DOXYGEN_PAGES_OUTPUT_DIR "${OpenMW_BINARY_DIR}/docs/Pages")
@@ -1075,3 +1118,78 @@ if (DOXYGEN_FOUND)
         WORKING_DIRECTORY ${OpenMW_BINARY_DIR}
         COMMENT "Generating documentation for the github-pages at ${DOXYGEN_PAGES_OUTPUT_DIR}" VERBATIM)
 endif ()
+
+# Qt localization
+if (USE_QT)
+    file(GLOB LAUNCHER_TS_FILES ${CMAKE_SOURCE_DIR}/files/lang/launcher_*.ts)
+    file(GLOB WIZARD_TS_FILES ${CMAKE_SOURCE_DIR}/files/lang/wizard_*.ts)
+    file(GLOB COMPONENTS_TS_FILES ${CMAKE_SOURCE_DIR}/files/lang/components_*.ts)
+    get_target_property(QT_LUPDATE_EXECUTABLE Qt::lupdate IMPORTED_LOCATION)
+    add_custom_target(translations
+    COMMAND ${QT_LUPDATE_EXECUTABLE} -locations none ${CMAKE_SOURCE_DIR}/components/contentselector ${CMAKE_SOURCE_DIR}/components/process -ts ${COMPONENTS_TS_FILES}
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/components
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+
+    COMMAND ${QT_LUPDATE_EXECUTABLE} -locations none ${CMAKE_SOURCE_DIR}/apps/wizard -ts ${WIZARD_TS_FILES}
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/apps/wizard
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+
+    COMMAND ${QT_LUPDATE_EXECUTABLE} -locations none ${CMAKE_SOURCE_DIR}/apps/launcher -ts ${LAUNCHER_TS_FILES}
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/apps/launcher
+    VERBATIM
+    COMMAND_EXPAND_LISTS)
+
+    if (BUILD_LAUNCHER OR BUILD_WIZARD)
+        if (APPLE)
+            set(QT_OPENMW_TRANSLATIONS_PATH "${APP_BUNDLE_DIR}/Contents/Resources/resources/translations")
+        else ()
+            get_generator_is_multi_config(multi_config)
+            if (multi_config)
+                set(QT_OPENMW_TRANSLATIONS_PATH "${OpenMW_BINARY_DIR}/$<CONFIG>/resources/translations")
+            else ()
+                set(QT_OPENMW_TRANSLATIONS_PATH "${OpenMW_BINARY_DIR}/resources/translations")
+            endif ()
+        endif ()
+
+        file(GLOB TS_FILES ${COMPONENTS_TS_FILES})
+
+        if (BUILD_LAUNCHER)
+            set(TS_FILES ${TS_FILES} ${LAUNCHER_TS_FILES})
+        endif ()
+
+        if (BUILD_WIZARD)
+            set(TS_FILES ${TS_FILES} ${WIZARD_TS_FILES})
+        endif ()
+
+        qt_add_translation(QM_FILES ${TS_FILES} OPTIONS -silent)
+
+        if (DEPLOY_QT_TRANSLATIONS)
+            # Once we set a Qt 6.2.0 as a minimum required version, we may use "qtpaths --qt-query" instead.
+            get_target_property(QT_QMAKE_EXECUTABLE Qt::qmake IMPORTED_LOCATION)
+            execute_process(COMMAND "${QT_QMAKE_EXECUTABLE}" -query QT_INSTALL_TRANSLATIONS
+                OUTPUT_VARIABLE QT_TRANSLATIONS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+            foreach(QM_FILE ${QM_FILES})
+                get_filename_component(QM_BASENAME ${QM_FILE} NAME)
+                string(REGEX REPLACE "[^_]+_(.*)\\.qm" "\\1" LANG_NAME ${QM_BASENAME})
+                if (EXISTS "${QT_TRANSLATIONS_DIR}/qtbase_${LANG_NAME}.qm")
+                    set(QM_FILES ${QM_FILES} "${QT_TRANSLATIONS_DIR}/qtbase_${LANG_NAME}.qm")
+                elseif (EXISTS "${QT_TRANSLATIONS_DIR}/qt_${LANG_NAME}.qm")
+                    set(QM_FILES ${QM_FILES} "${QT_TRANSLATIONS_DIR}/qt_${LANG_NAME}.qm")
+                else ()
+                    message(FATAL_ERROR "Qt translations for '${LANG_NAME}' locale are not found in the '${QT_TRANSLATIONS_DIR}' folder.")
+                endif ()
+            endforeach(QM_FILE)
+
+            list(REMOVE_DUPLICATES QM_FILES)
+        endif ()
+
+        add_custom_target(qm-files
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${QT_OPENMW_TRANSLATIONS_PATH}
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QM_FILES} ${QT_OPENMW_TRANSLATIONS_PATH}
+            DEPENDS ${QM_FILES}
+            COMMENT "Copy *.qm files to resources folder")
+    endif ()
+endif()
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4cdb164a3b..8aeb455543 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,37 +8,37 @@ https://gitlab.com/OpenMW/openmw/issues
 Currently, we are focused on completing the MW game experience and general polishing. Features out of this scope may be approved in some cases, but you should probably start a discussion first.
 
 Note:
-* Tasks set to 'openmw-future' are usually out of the current scope of the project and can't be started yet.
-* Bugs that are not 'Confirmed' should be confirmed first.
+* Issues that have the 'Future' label are usually out of the current scope of the project. Corresponding submissions are unlikely to be merged or even properly reviewed.
+* Newly reported bugs should be attempted to be reproduced on the latest code and on the latest available stable release. Both can be found [here](https://openmw.org/downloads/).
 * Often, it's best to start a discussion about possible solutions before you jump into coding, especially for larger features.
 
-Aside from coding, you can also help by triaging the issues list. Check for bugs that are 'Unconfirmed' and try to confirm them on your end, working out any details that may be necessary. Check for bugs that do not conform to [Bug reporting guidelines](https://wiki.openmw.org/index.php?title=Bug_Reporting_Guidelines) and improve them to do so!
+Aside from coding, you can also help by triaging the issues list. Check for unconfirmed bugs and try to reproduce them on your end, working out any details that may be necessary. Check for bugs that do not conform to [Bug Reporting Guidelines](https://wiki.openmw.org/index.php?title=Bug_Reporting_Guidelines) and improve them to do so!
 
 There are various [Tools](https://wiki.openmw.org/index.php?title=Tools) to facilitate testing/development.
 
-Pull Request Guidelines
+Merge request guidelines
 =======================
 
-To facilitate the review process, your pull request description should include the following, if applicable:
+To facilitate the review process, your merge request description should include the following, if applicable:
 
-* A link back to the bug report or forum discussion that prompted the change. Note: when linking bugs, use the syntax ```[Bug #xyz](https://gitlab.com/OpenMW/openmw/issues/#xyz)``` to create a clickable link. Writing only 'Bug #xyz' will unfortunately create a link to the Github pull request with that number instead.
+* A link back to the bug report or discussion that prompted the change.
 * Summary of the changes made.
 * Reasoning / motivation behind the change.
 * What testing you have carried out to verify the change.
 
 Furthermore, we advise to:
 
-* Avoid stuffing unrelated commits into one pull request. As a rule of thumb, each feature and each bugfix should go into a separate PR, unless they are closely related or dependent upon each other. Small pull requests are easier to review, and are less likely to require further changes before we can merge them. A "mega" pull request with lots of unrelated commits in it is likely to get held up in review for a long time.
-* Feel free to submit incomplete pull requests. Even if the work can not be merged yet, pull requests are a great place to collect early feedback. Just make sure to mark it as *[Incomplete]* or *[Do not merge yet]* in the title.
+* Avoid stuffing unrelated commits into one merge request. As a rule of thumb, each feature and each bugfix should go into a separate MR, unless they are closely related or dependent upon each other. Small merge requests are easier to review and are less likely to require further changes before we can merge them. A "mega" merge request with lots of unrelated commits in it is likely to get held up in review for a long time.
+* Feel free to submit incomplete merge requests. Even if the work cannot be merged yet, merge requests are a great place to collect early feedback. Just make sure to mark it as [draft](https://docs.gitlab.com/ee/user/project/merge_requests/drafts/).
 * If you plan on contributing often, please read the [Developer Reference](https://wiki.openmw.org/index.php?title=Developer_Reference) on our wiki, especially the [Policies and Standards](https://wiki.openmw.org/index.php?title=Policies_and_Standards).
 * Make sure each of your changes has a clear objective. Unnecessary changes may lead to merge conflicts, clutter the commit history and slow down review. Code formatting 'fixes' should be avoided, unless you were already changing that particular line anyway.
-* Reference the bug / feature ticket(s) in your commit message (e.g. 'Bug #123') to make it easier to keep track of what we changed for what reason. Our bugtracker will show those commits next to the ticket. If your commit message includes 'Fixes #123', that bug/feature will automatically be set to 'Closed' when your commit is merged.
-* When pulling changes from master, prefer rebase over merge. Consider using a merge if there are conflicts or for long-running PRs.
+* Reference the bug / feature ticket(s) in your commit message or merge request description (e.g. 'Bug #123') to make it easier to keep track of what we changed for what reason. Our bugtracker will show those commits next to the ticket. If your merge request's description includes 'Fixes #123', that issue will automatically be closed when your commit is merged.
+* When pulling changes from master, prefer rebase over merge. Consider using a merge if there are conflicts or for long-running MRs.
 
 Guidelines for original engine "fixes"
 =================================
 
-From time to time you may be tempted to "fix" what you think was a "bug" in the original game engine.
+From time to time, you may be tempted to "fix" what you think was a "bug" in the original game engine.
 
 Unfortunately, the definition of what is a "bug" is not so clear. Consider that your "bug" is actually a feature unless proven otherwise:
 
@@ -52,56 +52,62 @@ OpenMW, in its default configuration, is meant to be a faithful reimplementation
 That said, we may sometimes evaluate such issues on an individual basis. Common exceptions to the above would be:
 
 * Issues so glaring that they would severely limit the capabilities of the engine in the future (for example, the scripting engine not being allowed to access objects in remote cells).
-* Bugs where the intent is very obvious, and that have little to no balancing impact (e.g. the bug were being tired made it easier to repair items, instead of harder).
+* Bugs where the intent is very obvious, and that have little to no balancing impact (e.g. the bug where being tired made it easier to repair items, instead of harder).
 * Bugs that were fixed in an official patch for Morrowind.
 
 Feature additions policy
 =====================
 
-We get it, you have waited so long for feature XYZ to be available in Morrowind and now that OpenMW is here you can not wait to implement your ingenious idea and share it with the world.
+We get it: you have waited so long for feature XYZ to be available in Morrowind, and now that OpenMW is here, you cannot wait to implement your ingenious idea and share it with the world.
 
 Unfortunately, since maintaining features comes at a cost and our resources are limited, we have to be a little selective in what features we allow into the main repository. Generally:
 
 * Features should be as generic and non-redundant as possible.
 * Any feature that is also possible with modding should be done as a mod instead.
-* In the future, OpenMW plans to expand the scope of what is possible with modding, e.g. by moving certain game logic into editable scripts.
-* Currently, modders can edit OpenMW's GUI skins and layout XML files, although there are still a few missing hooks (e.g. scripting support) in order to make this into a powerful way of modding.
-* If a feature introduces new game UI strings, that reduces its chance of being accepted because we do not currently have any way of localizing these to the user's Morrowind installation language.
+* Through moving certain game logic into built-in scripting, OpenMW will expand the scope of what is possible with modding.
+* Modders can edit OpenMW's GUI skins and layout XML files as well as create new widgets through the Lua API, but it is expected that existing C++ widgets will also be recreated through built-in scripting.
+* If a feature introduces new game UI strings, you will need to become acquainted with OpenMW's YAML localisation system and expose them. Read about it [here](https://openmw.readthedocs.io/en/latest/reference/modding/localisation.html).
 
 If you are in doubt of your feature being within our scope, it is probably best to start a forum discussion first. See the [settings documentation](https://openmw.readthedocs.io/en/stable/reference/modding/settings/index.html) and [Features list](https://wiki.openmw.org/index.php?title=Features) for some examples of features that were deemed acceptable.
 
-Reviewing pull requests
+Reviewing merge requests
 =======================
 
-We welcome any help in reviewing open PRs. You don't need to be a developer to comment on new features. We also encourage ["junior" developers to review senior's work](https://pagefault.blog/2018/04/08/why-junior-devs-should-review-seniors-commits/).
+We welcome any help in reviewing open MRs. You don't need to be a developer to comment on new features. We also encourage ["junior" developers to review senior's work](https://pagefault.blog/2018/04/08/why-junior-devs-should-review-seniors-commits/).
 
-This review process is divided into two sections because complaining about code or style issues hardly makes sense until the functionality of the PR is deemed OK. Anyone can help with the Functionality Review while most parts of the Code Review require you to have programming experience.
+This review process is divided into two sections because complaining about code or style issues hardly makes sense until the functionality of the MR is deemed OK. Anyone can help with the **functionality review** while most parts of the **code review** require you to have programming experience.
 
-In addition to the checklist below, make sure to check that the Pull Request Guidelines (first half of this document) were followed.
+In addition to the checklist below, make sure to check that the **merge request guidelines** (first half of this document) were followed.
 
-First review
+Functionality review
 ============
 
 1. Ask for missing information or clarifications. Compare against the project's design goals and roadmap.
-2. Check if the automated tests are passing. If they are not, make the PR author aware of the issue and potentially link to the error line on Travis CI or Appveyor. If the error appears unrelated to the PR and/or the master branch is failing with the same error, our CI has broken and needs to be fixed independently of any open PRs. Raise this issue on the forums, bug tracker or with the relevant maintainer. The PR can be merged in this case as long as you've built it yourself to make sure it does build.
-3. Make sure that the new code has been tested thoroughly, either by asking the author or, preferably, testing yourself. In a complex project like OpenMW, it is easy to make mistakes, typos, etc. Therefore, prefer testing all code changes, no matter how trivial they look. When you have tested a PR that no one has tested so far, post a comment letting us know.
-4. On long running PRs, request the author to update its description with the current state or a checklist of things left to do.
+2. Check if the automated tests are passing. If they are not, make the MR author aware of the issue and potentially quote the error line. If the error appears unrelated to the MR and/or the master branch is failing with the same error, our CI might be broken and needs to be fixed independently of any open MRs. Raise this issue on one of the following resources:
+   * Our [forums](https://forum.openmw.org/)
+   * [Discord](https://discord.com/servers/openmw-260439894298460160)
+   * [IRC](https://web.libera.chat/#openmw)
+   * [Issue tracker](https://gitlab.com/OpenMW/openmw/-/issues)
 
-Code Review
+3. Make sure that the new code has been tested thoroughly, either by asking the author or, preferably, testing yourself. In a complex project like OpenMW, it is easy to make mistakes, typos, etc. Therefore, prefer testing all code changes, no matter how trivial they look. When you have tested a MR that no one has tested so far, post a comment letting us know.
+4. On long-running MRs, request the author to update its description with the current state or a checklist of things left to do.
+
+Code review
 ===========
 
 1. Carefully review each line for issues the author may not have thought of, paying special attention to 'special' cases. Often, people build their code with a particular mindset and forget about other configurations or unexpected interactions.
 2. If any changes are workarounds for an issue in an upstream library, make sure the issue was reported upstream so we can eventually drop the workaround when the issue is fixed and the new version of that library is a build dependency.
-3. Make sure PRs do not turn into arguments about hardly related issues. If the PR author disagrees with an established part of the project (e.g. supported build environments), they should open a forum discussion or bug report and in the meantime adjust the PR to adhere to the established way, rather than leaving the PR hanging on a dispute.
+3. Make sure MRs do not turn into arguments about hardly related issues. If the MR author disagrees with an established part of the project (e.g. supported build environments), they should open a forum discussion or bug report and in the meantime adjust the MR to adhere to the established way, rather than leaving the MR hanging on a dispute.
 4. Check if the code matches our style guidelines.
 5. Check to make sure the commit history is clean. Squashing should be considered if the review process has made the commit history particularly long. Commits that don't build should be avoided because they are a nuisance for ```git bisect```.
 
 Merging
 =======
 
-To be able to merge PRs, commit privileges are required. If you do not have the privileges, just ping someone that does have them with a short comment like "Looks good to me @user".
+To be able to merge MRs, commit privileges are required. If you do not have the privileges, just ping someone that does have them with a short comment like "Looks good to me @user".
 
-The person to merge the PR may either use github's Merge button or if using the command line, use the ```--no-ff``` flag (so a merge commit is created, just like with Github's merge button) and include the pull request number in the commit description.
+In general case, you should not merge MRs prematurely even if you are sure they just work or if they receive a senior member's approval.
+The rule of thumb is to give at least 24 hours to a couple days of a window for reviews to come through. For more technically involved MRs, 24 hours might not be enough.
 
 Dealing with regressions
 ========================
diff --git a/README.md b/README.md
index 95ca19685d..bca5851c7b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Font Licenses:
 Current Status
 --------------
 
-The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/issues?label_name%5B%5D=1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://wiki.openmw.org/index.php?title=Features), such as improved graphics and user interfaces.
+The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/-/issues/?milestone_title=openmw-1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://wiki.openmw.org/index.php?title=Features), such as improved graphics and user interfaces.
 
 Pre-existing modifications created for the original Morrowind engine can be hit-and-miss. The OpenMW script compiler performs more thorough error-checking than Morrowind does, meaning that a mod created for Morrowind may not necessarily run in OpenMW. Some mods also rely on quirky behaviour or engine bugs in order to work. We are considering such compatibility issues on a case-by-case basis - in some cases adding a workaround to OpenMW may be feasible, in other cases fixing the mod will be the only option. If you know of any mods that work or don't work, feel free to add them to the [Mod status](https://wiki.openmw.org/index.php?title=Mod_status) wiki page.
 
@@ -74,10 +74,6 @@ Command line options
                                             1 - show warning but consider script as
                                             correctly compiled anyway
                                             2 - treat warnings as errors
-      --script-blacklist arg                ignore the specified script (if the use
-                                            of the blacklist is enabled)
-      --script-blacklist-use [=arg(=1)] (=1)
-                                            enable script blacklisting
       --load-savegame arg                   load a save game file on game startup
                                             (specify an absolute filename or a
                                             filename relative to the current
diff --git a/apps/benchmarks/detournavigator/CMakeLists.txt b/apps/benchmarks/detournavigator/CMakeLists.txt
index 2b3a6abe51..ffe7818a5a 100644
--- a/apps/benchmarks/detournavigator/CMakeLists.txt
+++ b/apps/benchmarks/detournavigator/CMakeLists.txt
@@ -5,7 +5,7 @@ if (UNIX AND NOT APPLE)
     target_link_libraries(openmw_detournavigator_navmeshtilescache_benchmark ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE <algorithm>)
 endif()
 
diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 3be1c8762a..26873d9a03 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -5,6 +5,7 @@
 #include <components/esm3/loadland.hpp>
 
 #include <algorithm>
+#include <iterator>
 #include <random>
 
 namespace
@@ -24,29 +25,25 @@ namespace
         PreparedNavMeshData mValue;
     };
 
-    template <typename Random>
-    osg::Vec2i generateVec2i(int max, Random& random)
+    osg::Vec2i generateVec2i(int max, auto& random)
     {
         std::uniform_int_distribution<int> distribution(0, max);
         return osg::Vec2i(distribution(random), distribution(random));
     }
 
-    template <typename Random>
-    osg::Vec3f generateAgentHalfExtents(float min, float max, Random& random)
+    osg::Vec3f generateAgentHalfExtents(float min, float max, auto& random)
     {
         std::uniform_int_distribution<int> distribution(min, max);
         return osg::Vec3f(distribution(random), distribution(random), distribution(random));
     }
 
-    template <typename OutputIterator, typename Random>
-    void generateVertices(OutputIterator out, std::size_t number, Random& random)
+    void generateVertices(std::output_iterator<int> auto out, std::size_t number, auto& random)
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         std::generate_n(out, 3 * (number - number % 3), [&] { return distribution(random); });
     }
 
-    template <typename OutputIterator, typename Random>
-    void generateIndices(OutputIterator out, int max, std::size_t number, Random& random)
+    void generateIndices(std::output_iterator<int> auto out, int max, std::size_t number, auto& random)
     {
         std::uniform_int_distribution<int> distribution(0, max);
         std::generate_n(out, number - number % 3, [&] { return distribution(random); });
@@ -70,21 +67,18 @@ namespace
         return AreaType_null;
     }
 
-    template <typename Random>
-    AreaType generateAreaType(Random& random)
+    AreaType generateAreaType(auto& random)
     {
         std::uniform_int_distribution<int> distribution(0, 4);
         return toAreaType(distribution(random));
     }
 
-    template <typename OutputIterator, typename Random>
-    void generateAreaTypes(OutputIterator out, std::size_t triangles, Random& random)
+    void generateAreaTypes(std::output_iterator<AreaType> auto out, std::size_t triangles, auto& random)
     {
         std::generate_n(out, triangles, [&] { return generateAreaType(random); });
     }
 
-    template <typename OutputIterator, typename Random>
-    void generateWater(OutputIterator out, std::size_t count, Random& random)
+    void generateWater(std::output_iterator<CellWater> auto out, std::size_t count, auto& random)
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         std::generate_n(out, count, [&] {
@@ -92,8 +86,7 @@ namespace
         });
     }
 
-    template <class Random>
-    Mesh generateMesh(std::size_t triangles, Random& random)
+    Mesh generateMesh(std::size_t triangles, auto& random)
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         std::vector<float> vertices;
@@ -109,8 +102,7 @@ namespace
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
     }
 
-    template <class Random>
-    Heightfield generateHeightfield(Random& random)
+    Heightfield generateHeightfield(auto& random)
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         Heightfield result;
@@ -127,8 +119,7 @@ namespace
         return result;
     }
 
-    template <class Random>
-    FlatHeightfield generateFlatHeightfield(Random& random)
+    FlatHeightfield generateFlatHeightfield(auto& random)
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         FlatHeightfield result;
@@ -138,8 +129,7 @@ namespace
         return result;
     }
 
-    template <class Random>
-    Key generateKey(std::size_t triangles, Random& random)
+    Key generateKey(std::size_t triangles, auto& random)
     {
         const CollisionShapeType agentShapeType = CollisionShapeType::Aabb;
         const osg::Vec3f agentHalfExtents = generateAgentHalfExtents(0.5, 1.5, random);
@@ -158,14 +148,12 @@ namespace
 
     constexpr std::size_t trianglesPerTile = 239;
 
-    template <typename OutputIterator, typename Random>
-    void generateKeys(OutputIterator out, std::size_t count, Random& random)
+    void generateKeys(std::output_iterator<Key> auto out, std::size_t count, auto& random)
     {
         std::generate_n(out, count, [&] { return generateKey(trianglesPerTile, random); });
     }
 
-    template <typename OutputIterator, typename Random>
-    void fillCache(OutputIterator out, Random& random, NavMeshTilesCache& cache)
+    void fillCache(std::output_iterator<Key> auto out, auto& random, NavMeshTilesCache& cache)
     {
         std::size_t size = cache.getStats().mNavMeshCacheSize;
 
@@ -194,7 +182,7 @@ namespace
         for (auto _ : state)
         {
             const auto& key = keys[n++ % keys.size()];
-            const auto result = cache.get(key.mAgentBounds, key.mTilePosition, key.mRecastMesh);
+            auto result = cache.get(key.mAgentBounds, key.mTilePosition, key.mRecastMesh);
             benchmark::DoNotOptimize(result);
         }
     }
@@ -253,7 +241,7 @@ namespace
         while (state.KeepRunning())
         {
             const auto& key = keys[n++ % keys.size()];
-            const auto result = cache.set(
+            auto result = cache.set(
                 key.mAgentBounds, key.mTilePosition, key.mRecastMesh, std::make_unique<PreparedNavMeshData>());
             benchmark::DoNotOptimize(result);
         }
diff --git a/apps/benchmarks/esm/CMakeLists.txt b/apps/benchmarks/esm/CMakeLists.txt
index 74870ceda1..9b5afd649d 100644
--- a/apps/benchmarks/esm/CMakeLists.txt
+++ b/apps/benchmarks/esm/CMakeLists.txt
@@ -5,7 +5,7 @@ if (UNIX AND NOT APPLE)
     target_link_libraries(openmw_esm_refid_benchmark ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw_esm_refid_benchmark PRIVATE <algorithm>)
 endif()
 
diff --git a/apps/benchmarks/settings/CMakeLists.txt b/apps/benchmarks/settings/CMakeLists.txt
index ccdd51eeac..51e2d2b0fd 100644
--- a/apps/benchmarks/settings/CMakeLists.txt
+++ b/apps/benchmarks/settings/CMakeLists.txt
@@ -8,7 +8,7 @@ if (UNIX AND NOT APPLE)
     target_link_libraries(openmw_settings_access_benchmark ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw_settings_access_benchmark PRIVATE <algorithm>)
 endif()
 
diff --git a/apps/benchmarks/settings/access.cpp b/apps/benchmarks/settings/access.cpp
index aecac2dac8..7660d0d55e 100644
--- a/apps/benchmarks/settings/access.cpp
+++ b/apps/benchmarks/settings/access.cpp
@@ -38,7 +38,7 @@ namespace
     {
         for (auto _ : state)
         {
-            static const float v = Settings::Manager::getFloat("sky blending start", "Fog");
+            static float v = Settings::Manager::getFloat("sky blending start", "Fog");
             benchmark::DoNotOptimize(v);
         }
     }
@@ -47,8 +47,8 @@ namespace
     {
         for (auto _ : state)
         {
-            static const float v1 = Settings::Manager::getFloat("near clip", "Camera");
-            static const bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing");
+            static float v1 = Settings::Manager::getFloat("near clip", "Camera");
+            static bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing");
             benchmark::DoNotOptimize(v1);
             benchmark::DoNotOptimize(v2);
         }
@@ -58,9 +58,9 @@ namespace
     {
         for (auto _ : state)
         {
-            static const float v1 = Settings::Manager::getFloat("near clip", "Camera");
-            static const bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing");
-            static const int v3 = Settings::Manager::getInt("reflection detail", "Water");
+            static float v1 = Settings::Manager::getFloat("near clip", "Camera");
+            static bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing");
+            static int v3 = Settings::Manager::getInt("reflection detail", "Water");
             benchmark::DoNotOptimize(v1);
             benchmark::DoNotOptimize(v2);
             benchmark::DoNotOptimize(v3);
@@ -71,7 +71,8 @@ namespace
     {
         for (auto _ : state)
         {
-            benchmark::DoNotOptimize(Settings::fog().mSkyBlendingStart.get());
+            float v = Settings::fog().mSkyBlendingStart.get();
+            benchmark::DoNotOptimize(v);
         }
     }
 
@@ -79,8 +80,10 @@ namespace
     {
         for (auto _ : state)
         {
-            benchmark::DoNotOptimize(Settings::postProcessing().mTransparentPostpass.get());
-            benchmark::DoNotOptimize(Settings::camera().mNearClip.get());
+            bool v1 = Settings::postProcessing().mTransparentPostpass.get();
+            float v2 = Settings::camera().mNearClip.get();
+            benchmark::DoNotOptimize(v1);
+            benchmark::DoNotOptimize(v2);
         }
     }
 
@@ -88,9 +91,12 @@ namespace
     {
         for (auto _ : state)
         {
-            benchmark::DoNotOptimize(Settings::postProcessing().mTransparentPostpass.get());
-            benchmark::DoNotOptimize(Settings::camera().mNearClip.get());
-            benchmark::DoNotOptimize(Settings::water().mReflectionDetail.get());
+            bool v1 = Settings::postProcessing().mTransparentPostpass.get();
+            float v2 = Settings::camera().mNearClip.get();
+            int v3 = Settings::water().mReflectionDetail.get();
+            benchmark::DoNotOptimize(v1);
+            benchmark::DoNotOptimize(v2);
+            benchmark::DoNotOptimize(v3);
         }
     }
 
diff --git a/apps/bsatool/CMakeLists.txt b/apps/bsatool/CMakeLists.txt
index a567499ac6..b2ad8f16b2 100644
--- a/apps/bsatool/CMakeLists.txt
+++ b/apps/bsatool/CMakeLists.txt
@@ -9,7 +9,7 @@ openmw_add_executable(bsatool
 )
 
 target_link_libraries(bsatool
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    Boost::program_options
     components
 )
 
@@ -18,7 +18,7 @@ if (BUILD_WITH_CODE_COVERAGE)
     target_link_libraries(bsatool gcov)
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(bsatool PRIVATE
         <filesystem>
         <fstream>
diff --git a/apps/bsatool/bsatool.cpp b/apps/bsatool/bsatool.cpp
index e2029f3245..171e5606c4 100644
--- a/apps/bsatool/bsatool.cpp
+++ b/apps/bsatool/bsatool.cpp
@@ -194,7 +194,8 @@ int extract(std::unique_ptr<File>& bsa, Arguments& info)
     // Get a stream for the file to extract
     for (auto it = bsa->getList().rbegin(); it != bsa->getList().rend(); ++it)
     {
-        if (Misc::StringUtils::ciEqual(Misc::StringUtils::stringToU8String(it->name()), archivePath))
+        auto streamPath = Misc::StringUtils::stringToU8String(it->name());
+        if (Misc::StringUtils::ciEqual(streamPath, archivePath) || Misc::StringUtils::ciEqual(streamPath, extractPath))
         {
             stream = bsa->getFile(&*it);
             break;
@@ -320,21 +321,27 @@ int main(int argc, char** argv)
 
         // Open file
 
+        // TODO: add a version argument for this mode after compressed BSA writing is a thing
+        if (info.mode == "create")
+            return call<Bsa::BSAFile>(info);
+
         Bsa::BsaVersion bsaVersion = Bsa::BSAFile::detectVersion(info.filename);
 
         switch (bsaVersion)
         {
-            case Bsa::BSAVER_COMPRESSED:
-                return call<Bsa::CompressedBSAFile>(info);
-            case Bsa::BSAVER_BA2_GNRL:
-                return call<Bsa::BA2GNRLFile>(info);
-            case Bsa::BSAVER_BA2_DX10:
-                return call<Bsa::BA2DX10File>(info);
-            case Bsa::BSAVER_UNCOMPRESSED:
+            case Bsa::BsaVersion::Unknown:
+                break;
+            case Bsa::BsaVersion::Uncompressed:
                 return call<Bsa::BSAFile>(info);
-            default:
-                throw std::runtime_error("Unrecognised BSA archive");
+            case Bsa::BsaVersion::Compressed:
+                return call<Bsa::CompressedBSAFile>(info);
+            case Bsa::BsaVersion::BA2GNRL:
+                return call<Bsa::BA2GNRLFile>(info);
+            case Bsa::BsaVersion::BA2DX10:
+                return call<Bsa::BA2DX10File>(info);
         }
+
+        throw std::runtime_error("Unrecognised BSA archive");
     }
     catch (std::exception& e)
     {
diff --git a/apps/bulletobjecttool/CMakeLists.txt b/apps/bulletobjecttool/CMakeLists.txt
index 6e6e1cdbb3..c29915b139 100644
--- a/apps/bulletobjecttool/CMakeLists.txt
+++ b/apps/bulletobjecttool/CMakeLists.txt
@@ -6,7 +6,7 @@ source_group(apps\\bulletobjecttool FILES ${BULLETMESHTOOL})
 openmw_add_executable(openmw-bulletobjecttool ${BULLETMESHTOOL})
 
 target_link_libraries(openmw-bulletobjecttool
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    Boost::program_options
     components
 )
 
@@ -19,7 +19,7 @@ if (WIN32)
     install(TARGETS openmw-bulletobjecttool RUNTIME DESTINATION ".")
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw-bulletobjecttool PRIVATE
         <string>
         <vector>
diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index 2610061af6..190eb3364d 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -12,6 +12,7 @@
 #include <components/files/multidircollection.hpp>
 #include <components/misc/strings/conversion.hpp>
 #include <components/platform/platform.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/bulletshape.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/foreachbulletobject.hpp>
@@ -76,10 +77,6 @@ namespace
             bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")->multitoken()->composing(),
             "set fallback BSA archives (later archives have higher priority)");
 
-        addOption("resources",
-            bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
-            "set resources directory");
-
         addOption("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
             "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
 
@@ -124,14 +121,14 @@ namespace
 
         if (variables.find("help") != variables.end())
         {
-            getRawStdout() << desc << std::endl;
+            Debug::getRawStdout() << desc << std::endl;
             return 0;
         }
 
         Files::ConfigurationManager config;
         config.readConfiguration(variables, desc);
 
-        setupLogging(config.getLogPath(), applicationName);
+        Debug::setupLogging(config.getLogPath(), applicationName);
 
         const std::string encoding(variables["encoding"].as<std::string>());
         Log(Debug::Info) << ToUTF8::encodingUsingMessage(encoding);
@@ -145,13 +142,14 @@ namespace
 
         config.filterOutNonExistingPaths(dataDirs);
 
-        const auto resDir = variables["resources"].as<Files::MaybeQuotedPath>();
-        const auto v = Version::getOpenmwVersion(resDir);
-        Log(Debug::Info) << v.describe();
+        const auto& resDir = variables["resources"].as<Files::MaybeQuotedPath>();
+        Log(Debug::Info) << Version::getOpenmwVersionDescription();
         dataDirs.insert(dataDirs.begin(), resDir / "vfs");
-        const auto fileCollections = Files::Collections(dataDirs);
-        const auto archives = variables["fallback-archive"].as<StringsVector>();
-        const auto contentFiles = variables["content"].as<StringsVector>();
+        const Files::Collections fileCollections(dataDirs);
+        const auto& archives = variables["fallback-archive"].as<StringsVector>();
+        StringsVector contentFiles{ "builtin.omwscripts" };
+        const auto& configContentFiles = variables["content"].as<StringsVector>();
+        contentFiles.insert(contentFiles.end(), configContentFiles.begin(), configContentFiles.end());
 
         Fallback::Map::init(variables["fallback"].as<Fallback::FallbackMap>().mMap);
 
@@ -173,10 +171,12 @@ namespace
         const EsmLoader::EsmData esmData
             = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
 
-        Resource::ImageManager imageManager(&vfs);
-        Resource::NifFileManager nifFileManager(&vfs);
-        Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager);
-        Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager);
+        constexpr double expiryDelay = 0;
+        Resource::ImageManager imageManager(&vfs, expiryDelay);
+        Resource::NifFileManager nifFileManager(&vfs, &encoder.getStatelessEncoder());
+        Resource::BgsmFileManager bgsmFileManager(&vfs, expiryDelay);
+        Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager, &bgsmFileManager, expiryDelay);
+        Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager, expiryDelay);
 
         Resource::forEachBulletObject(
             readers, vfs, bulletShapeManager, esmData, [](const ESM::Cell& cell, const Resource::BulletObject& object) {
@@ -202,5 +202,5 @@ namespace
 
 int main(int argc, char* argv[])
 {
-    return wrapApplication(runBulletObjectTool, argc, argv, applicationName);
+    return Debug::wrapApplication(runBulletObjectTool, argc, argv, applicationName);
 }
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/components_tests/CMakeLists.txt
similarity index 75%
rename from apps/openmw_test_suite/CMakeLists.txt
rename to apps/components_tests/CMakeLists.txt
index 4f93319c96..22bb542538 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/components_tests/CMakeLists.txt
@@ -2,19 +2,7 @@ include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
 include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS})
 
 file(GLOB UNITTEST_SRC_FILES
-    testing_util.hpp
-
-    ../openmw/mwworld/store.cpp
-    ../openmw/mwworld/esmstore.cpp
-    ../openmw/mwworld/timestamp.cpp
-
-    mwworld/test_store.cpp
-    mwworld/testduration.cpp
-    mwworld/testtimestamp.cpp
-
-    mwdialogue/test_keywordsearch.cpp
-
-    mwscript/test_scripts.cpp
+    main.cpp
 
     esm/test_fixed_string.cpp
     esm/variant.cpp
@@ -28,14 +16,17 @@ file(GLOB UNITTEST_SRC_FILES
     lua/test_l10n.cpp
     lua/test_storage.cpp
     lua/test_async.cpp
+    lua/test_inputactions.cpp
+    lua/test_yaml.cpp
 
     lua/test_ui_content.cpp
 
-    misc/test_stringops.cpp
+    misc/compression.cpp
+    misc/progressreporter.cpp
     misc/test_endianness.cpp
     misc/test_resourcehelpers.cpp
-    misc/progressreporter.cpp
-    misc/compression.cpp
+    misc/test_stringops.cpp
+    misc/testmathutil.cpp
 
     nifloader/testbulletnifloader.cpp
 
@@ -64,9 +55,6 @@ file(GLOB UNITTEST_SRC_FILES
     shader/parselinks.cpp
     shader/shadermanager.cpp
 
-    ../openmw/options.cpp
-    openmw/options.cpp
-
     sqlite3/db.cpp
     sqlite3/request.cpp
     sqlite3/statement.cpp
@@ -90,25 +78,37 @@ file(GLOB UNITTEST_SRC_FILES
     esm3/testsaveload.cpp
     esm3/testesmwriter.cpp
     esm3/testinfoorder.cpp
+    esm3/testcstringids.cpp
 
     nifosg/testnifloader.cpp
 
     esmterrain/testgridsampling.cpp
+
+    resource/testobjectcache.cpp
+
+    vfs/testpathutil.cpp
+
+    sceneutil/osgacontroller.cpp
 )
 
-source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
+source_group(apps\\components-tests FILES ${UNITTEST_SRC_FILES})
 
-openmw_add_executable(openmw_test_suite openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
+openmw_add_executable(components-tests ${UNITTEST_SRC_FILES})
+
+target_link_libraries(components-tests
+    GTest::GTest
+    GMock::GMock
+    components
+)
 
-target_link_libraries(openmw_test_suite GTest::GTest GMock::GMock components)
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
-    target_link_libraries(openmw_test_suite ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(components-tests ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 if (BUILD_WITH_CODE_COVERAGE)
-    target_compile_options(openmw_test_suite PRIVATE --coverage)
-    target_link_libraries(openmw_test_suite gcov)
+    target_compile_options(components-tests PRIVATE --coverage)
+    target_link_libraries(components-tests gcov)
 endif()
 
 file(DOWNLOAD
@@ -117,12 +117,12 @@ file(DOWNLOAD
     EXPECTED_HASH SHA512=6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6
 )
 
-target_compile_definitions(openmw_test_suite
+target_compile_definitions(components-tests
     PRIVATE OPENMW_DATA_DIR=u8"${CMAKE_CURRENT_BINARY_DIR}/data"
             OPENMW_PROJECT_SOURCE_DIR=u8"${PROJECT_SOURCE_DIR}")
 
-if (MSVC)
-    target_precompile_headers(openmw_test_suite PRIVATE
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
+    target_precompile_headers(components-tests PRIVATE
         <boost/program_options/options_description.hpp>
 
         <gtest/gtest.h>
diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/components_tests/detournavigator/asyncnavmeshupdater.cpp
similarity index 53%
rename from apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
rename to apps/components_tests/detournavigator/asyncnavmeshupdater.cpp
index 9d8a5d85de..ea9efc3df2 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/components_tests/detournavigator/asyncnavmeshupdater.cpp
@@ -33,7 +33,8 @@ namespace
     {
         const ObjectId id(&shape);
         osg::ref_ptr<Resource::BulletShape> bulletShape(new Resource::BulletShape);
-        bulletShape->mFileName = "test.nif";
+        constexpr VFS::Path::NormalizedView test("test.nif");
+        bulletShape->mFileName = test;
         bulletShape->mFileHash = "test_hash";
         ObjectTransform objectTransform;
         std::fill(std::begin(objectTransform.mPosition.pos), std::end(objectTransform.mPosition.pos), 0.1f);
@@ -52,7 +53,7 @@ namespace
         OffMeshConnectionsManager mOffMeshConnectionsManager{ mSettings.mRecast };
         const AgentBounds mAgentBounds{ CollisionShapeType::Aabb, { 29, 29, 66 } };
         const TilePosition mPlayerTile{ 0, 0 };
-        const std::string mWorldspace = "sys::default";
+        const ESM::RefId mWorldspace = ESM::RefId::stringRefId("sys::default");
         const btBoxShape mBox{ btVector3(100, 100, 20) };
         Loading::Listener mListener;
     };
@@ -266,20 +267,11 @@ namespace
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(WaitConditionType::allJobsDone, &mListener);
         updater.stop();
-        const std::set<TilePosition> present{
-            TilePosition(-2, 0),
-            TilePosition(-1, -1),
-            TilePosition(-1, 0),
-            TilePosition(-1, 1),
-            TilePosition(0, -2),
-            TilePosition(0, -1),
-            TilePosition(0, 0),
-            TilePosition(0, 1),
-            TilePosition(0, 2),
-            TilePosition(1, -1),
-            TilePosition(1, 0),
-        };
+
+        std::size_t present = 0;
+
         for (int x = -5; x <= 5; ++x)
+        {
             for (int y = -5; y <= 5; ++y)
             {
                 const TilePosition tilePosition(x, y);
@@ -289,14 +281,323 @@ namespace
                     recastMesh->getMeshSources(), [&](const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
                 if (std::holds_alternative<MeshSource>(objects))
                     continue;
-                EXPECT_EQ(dbPtr
-                              ->findTile(mWorldspace, tilePosition,
-                                  serialize(mSettings.mRecast, mAgentBounds, *recastMesh,
-                                      std::get<std::vector<DbRefGeometryObject>>(objects)))
-                              .has_value(),
-                    present.find(tilePosition) != present.end())
-                    << tilePosition.x() << " " << tilePosition.y()
-                    << " present=" << (present.find(tilePosition) != present.end());
+                present += dbPtr
+                               ->findTile(mWorldspace, tilePosition,
+                                   serialize(mSettings.mRecast, mAgentBounds, *recastMesh,
+                                       std::get<std::vector<DbRefGeometryObject>>(objects)))
+                               .has_value();
             }
+        }
+
+        EXPECT_EQ(present, 11);
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, next_tile_id_should_be_updated_on_duplicate)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace, nullptr);
+        addHeightFieldPlane(mRecastMeshManager);
+        addObject(mBox, mRecastMeshManager);
+        auto db = std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max());
+        NavMeshDb* const dbPtr = db.get();
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
+
+        const TileId nextTileId(dbPtr->getMaxTileId() + 1);
+        ASSERT_EQ(dbPtr->insertTile(nextTileId, mWorldspace, TilePosition{}, TileVersion{ 1 }, {}, {}), 1);
+
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(1, mSettings);
+        const TilePosition tilePosition{ 0, 0 };
+        const std::map<TilePosition, ChangeType> changedTiles{ { tilePosition, ChangeType::add } };
+
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(WaitConditionType::allJobsDone, &mListener);
+
+        const AgentBounds agentBounds{ CollisionShapeType::Cylinder, { 29, 29, 66 } };
+        updater.post(agentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(WaitConditionType::allJobsDone, &mListener);
+
+        updater.stop();
+
+        const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
+        ASSERT_NE(recastMesh, nullptr);
+        ShapeId nextShapeId{ 1 };
+        const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
+            [&](const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
+        const auto tile = dbPtr->findTile(
+            mWorldspace, tilePosition, serialize(mSettings.mRecast, agentBounds, *recastMesh, objects));
+        ASSERT_TRUE(tile.has_value());
+        EXPECT_EQ(tile->mTileId, 2);
+        EXPECT_EQ(tile->mVersion, navMeshFormatVersion);
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, repeated_tile_updates_should_be_delayed)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace, nullptr);
+
+        mSettings.mMaxTilesNumber = 9;
+        mSettings.mMinUpdateInterval = std::chrono::milliseconds(250);
+
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(1, mSettings);
+
+        std::map<TilePosition, ChangeType> changedTiles;
+
+        for (int x = -3; x <= 3; ++x)
+            for (int y = -3; y <= 3; ++y)
+                changedTiles.emplace(TilePosition{ x, y }, ChangeType::update);
+
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+
+        updater.wait(WaitConditionType::allJobsDone, &mListener);
+
+        {
+            const AsyncNavMeshUpdaterStats stats = updater.getStats();
+            EXPECT_EQ(stats.mJobs, 0);
+            EXPECT_EQ(stats.mWaiting.mDelayed, 0);
+        }
+
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+
+        {
+            const AsyncNavMeshUpdaterStats stats = updater.getStats();
+            EXPECT_EQ(stats.mJobs, 49);
+            EXPECT_EQ(stats.mWaiting.mDelayed, 49);
+        }
+
+        updater.wait(WaitConditionType::allJobsDone, &mListener);
+
+        {
+            const AsyncNavMeshUpdaterStats stats = updater.getStats();
+            EXPECT_EQ(stats.mJobs, 0);
+            EXPECT_EQ(stats.mWaiting.mDelayed, 0);
+        }
+    }
+
+    struct DetourNavigatorSpatialJobQueueTest : Test
+    {
+        const AgentBounds mAgentBounds{ CollisionShapeType::Aabb, osg::Vec3f(1, 1, 1) };
+        const std::shared_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItemPtr;
+        const std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem = mNavMeshCacheItemPtr;
+        const ESM::RefId mWorldspace = ESM::RefId::stringRefId("worldspace");
+        const TilePosition mChangedTile{ 0, 0 };
+        const std::chrono::steady_clock::time_point mProcessTime{};
+        const TilePosition mPlayerTile{ 0, 0 };
+        const int mMaxTiles = 9;
+    };
+
+    TEST_F(DetourNavigatorSpatialJobQueueTest, should_store_multiple_jobs_per_tile)
+    {
+        std::list<Job> jobs;
+        SpatialJobQueue queue;
+
+        const ESM::RefId worldspace1 = ESM::RefId::stringRefId("worldspace1");
+        const ESM::RefId worldspace2 = ESM::RefId::stringRefId("worldspace2");
+
+        queue.push(jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, worldspace1, mChangedTile, ChangeType::remove, mProcessTime));
+        queue.push(jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, worldspace2, mChangedTile, ChangeType::update, mProcessTime));
+
+        ASSERT_EQ(queue.size(), 2);
+
+        const auto job1 = queue.pop(mChangedTile);
+        ASSERT_TRUE(job1.has_value());
+        EXPECT_EQ((*job1)->mWorldspace, worldspace1);
+
+        const auto job2 = queue.pop(mChangedTile);
+        ASSERT_TRUE(job2.has_value());
+        EXPECT_EQ((*job2)->mWorldspace, worldspace2);
+
+        EXPECT_EQ(queue.size(), 0);
+    }
+
+    struct DetourNavigatorJobQueueTest : DetourNavigatorSpatialJobQueueTest
+    {
+    };
+
+    TEST_F(DetourNavigatorJobQueueTest, pop_should_return_nullptr_from_empty)
+    {
+        JobQueue queue;
+        ASSERT_FALSE(queue.hasJob());
+        ASSERT_FALSE(queue.pop(mPlayerTile).has_value());
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, push_on_change_type_remove_should_add_to_removing)
+    {
+        const std::chrono::steady_clock::time_point processTime{};
+
+        std::list<Job> jobs;
+        const JobIt job = jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, mChangedTile, ChangeType::remove, processTime);
+
+        JobQueue queue;
+        queue.push(job);
+
+        EXPECT_EQ(queue.getStats().mRemoving, 1);
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, pop_should_return_last_removing)
+    {
+        std::list<Job> jobs;
+        JobQueue queue;
+
+        queue.push(jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, TilePosition(0, 0),
+            ChangeType::remove, mProcessTime));
+        queue.push(jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, TilePosition(1, 0),
+            ChangeType::remove, mProcessTime));
+
+        ASSERT_TRUE(queue.hasJob());
+        const auto job = queue.pop(mPlayerTile);
+        ASSERT_TRUE(job.has_value());
+        EXPECT_EQ((*job)->mChangedTile, TilePosition(1, 0));
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, push_on_change_type_not_remove_should_add_to_updating)
+    {
+        std::list<Job> jobs;
+        const JobIt job = jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, mChangedTile, ChangeType::update, mProcessTime);
+
+        JobQueue queue;
+        queue.push(job);
+
+        EXPECT_EQ(queue.getStats().mUpdating, 1);
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, pop_should_return_nearest_to_player_tile)
+    {
+        std::list<Job> jobs;
+
+        JobQueue queue;
+        queue.push(jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, TilePosition(0, 0),
+            ChangeType::update, mProcessTime));
+        queue.push(jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, TilePosition(1, 0),
+            ChangeType::update, mProcessTime));
+
+        ASSERT_TRUE(queue.hasJob());
+        const auto job = queue.pop(TilePosition(1, 0));
+        ASSERT_TRUE(job.has_value());
+        EXPECT_EQ((*job)->mChangedTile, TilePosition(1, 0));
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, push_on_processing_time_more_than_now_should_add_to_delayed)
+    {
+        const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        const std::chrono::steady_clock::time_point processTime = now + std::chrono::seconds(1);
+
+        std::list<Job> jobs;
+        const JobIt job = jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, mChangedTile, ChangeType::update, processTime);
+
+        JobQueue queue;
+        queue.push(job, now);
+
+        EXPECT_EQ(queue.getStats().mDelayed, 1);
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, pop_should_return_when_delayed_job_is_ready)
+    {
+        const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        const std::chrono::steady_clock::time_point processTime = now + std::chrono::seconds(1);
+
+        std::list<Job> jobs;
+        const JobIt job = jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, mChangedTile, ChangeType::update, processTime);
+
+        JobQueue queue;
+        queue.push(job, now);
+
+        ASSERT_FALSE(queue.hasJob(now));
+        ASSERT_FALSE(queue.pop(mPlayerTile, now).has_value());
+
+        ASSERT_TRUE(queue.hasJob(processTime));
+        EXPECT_TRUE(queue.pop(mPlayerTile, processTime).has_value());
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, update_should_move_ready_delayed_to_updating)
+    {
+        const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        const std::chrono::steady_clock::time_point processTime = now + std::chrono::seconds(1);
+
+        std::list<Job> jobs;
+        const JobIt job = jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, mChangedTile, ChangeType::update, processTime);
+
+        JobQueue queue;
+        queue.push(job, now);
+
+        ASSERT_EQ(queue.getStats().mDelayed, 1);
+
+        queue.update(mPlayerTile, mMaxTiles, processTime);
+
+        EXPECT_EQ(queue.getStats().mDelayed, 0);
+        EXPECT_EQ(queue.getStats().mUpdating, 1);
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, update_should_move_ready_delayed_to_removing_when_out_of_range)
+    {
+        const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        const std::chrono::steady_clock::time_point processTime = now + std::chrono::seconds(1);
+
+        std::list<Job> jobs;
+        const JobIt job = jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, mChangedTile, ChangeType::update, processTime);
+
+        JobQueue queue;
+        queue.push(job, now);
+
+        ASSERT_EQ(queue.getStats().mDelayed, 1);
+
+        queue.update(TilePosition(10, 10), mMaxTiles, processTime);
+
+        EXPECT_EQ(queue.getStats().mDelayed, 0);
+        EXPECT_EQ(queue.getStats().mRemoving, 1);
+        EXPECT_EQ(job->mChangeType, ChangeType::remove);
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, update_should_move_updating_to_removing_when_out_of_range)
+    {
+        std::list<Job> jobs;
+
+        JobQueue queue;
+        queue.push(jobs.emplace(
+            jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, mChangedTile, ChangeType::update, mProcessTime));
+        queue.push(jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, TilePosition(10, 10),
+            ChangeType::update, mProcessTime));
+
+        ASSERT_EQ(queue.getStats().mUpdating, 2);
+
+        queue.update(TilePosition(10, 10), mMaxTiles);
+
+        EXPECT_EQ(queue.getStats().mUpdating, 1);
+        EXPECT_EQ(queue.getStats().mRemoving, 1);
+    }
+
+    TEST_F(DetourNavigatorJobQueueTest, clear_should_remove_all)
+    {
+        const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        const std::chrono::steady_clock::time_point processTime = now + std::chrono::seconds(1);
+
+        std::list<Job> jobs;
+        const JobIt removing = jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace,
+            TilePosition(0, 0), ChangeType::remove, mProcessTime);
+        const JobIt updating = jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace,
+            TilePosition(1, 0), ChangeType::update, mProcessTime);
+        const JobIt delayed = jobs.emplace(jobs.end(), mAgentBounds, mNavMeshCacheItem, mWorldspace, TilePosition(2, 0),
+            ChangeType::update, processTime);
+
+        JobQueue queue;
+        queue.push(removing);
+        queue.push(updating);
+        queue.push(delayed, now);
+
+        ASSERT_EQ(queue.getStats().mRemoving, 1);
+        ASSERT_EQ(queue.getStats().mUpdating, 1);
+        ASSERT_EQ(queue.getStats().mDelayed, 1);
+
+        queue.clear();
+
+        EXPECT_EQ(queue.getStats().mRemoving, 0);
+        EXPECT_EQ(queue.getStats().mUpdating, 0);
+        EXPECT_EQ(queue.getStats().mDelayed, 0);
     }
 }
diff --git a/apps/openmw_test_suite/detournavigator/generate.hpp b/apps/components_tests/detournavigator/generate.hpp
similarity index 100%
rename from apps/openmw_test_suite/detournavigator/generate.hpp
rename to apps/components_tests/detournavigator/generate.hpp
diff --git a/apps/components_tests/detournavigator/gettilespositions.cpp b/apps/components_tests/detournavigator/gettilespositions.cpp
new file mode 100644
index 0000000000..729d11ddb5
--- /dev/null
+++ b/apps/components_tests/detournavigator/gettilespositions.cpp
@@ -0,0 +1,165 @@
+#include <components/detournavigator/debug.hpp>
+#include <components/detournavigator/gettilespositions.hpp>
+#include <components/detournavigator/settings.hpp>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace
+{
+    using namespace testing;
+    using namespace DetourNavigator;
+
+    struct CollectTilesPositions
+    {
+        std::vector<TilePosition>& mTilesPositions;
+
+        void operator()(const TilePosition& value) { mTilesPositions.push_back(value); }
+    };
+
+    struct DetourNavigatorGetTilesPositionsTest : Test
+    {
+        RecastSettings mSettings;
+        std::vector<TilePosition> mTilesPositions;
+        CollectTilesPositions mCollect{ mTilesPositions };
+
+        DetourNavigatorGetTilesPositionsTest()
+        {
+            mSettings.mBorderSize = 0;
+            mSettings.mCellSize = 0.5;
+            mSettings.mRecastScaleFactor = 1;
+            mSettings.mTileSize = 64;
+        }
+    };
+
+    TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_in_single_tile_should_return_one_tile)
+    {
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(2, 2), osg::Vec2f(31, 31), mSettings), mCollect);
+
+        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
+    }
+
+    TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_x_bounds_in_two_tiles_should_return_two_tiles)
+    {
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(32, 31), mSettings), mCollect);
+
+        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(1, 0)));
+    }
+
+    TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_y_bounds_in_two_tiles_should_return_two_tiles)
+    {
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31, 32), mSettings), mCollect);
+
+        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(0, 1)));
+    }
+
+    TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_works_only_for_x_and_y_coordinates)
+    {
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31, 31), mSettings), mCollect);
+
+        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
+    }
+
+    TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_should_work_with_negative_coordinates)
+    {
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(-31, -31), osg::Vec2f(31, 31), mSettings), mCollect);
+
+        EXPECT_THAT(mTilesPositions,
+            ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(0, -1), TilePosition(0, 0)));
+    }
+
+    TEST_F(DetourNavigatorGetTilesPositionsTest, border_size_should_extend_tile_bounds)
+    {
+        mSettings.mBorderSize = 1;
+
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31.5, 31.5), mSettings), mCollect);
+
+        EXPECT_THAT(mTilesPositions,
+            ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(-1, 1), TilePosition(0, -1),
+                TilePosition(0, 0), TilePosition(0, 1), TilePosition(1, -1), TilePosition(1, 0), TilePosition(1, 1)));
+    }
+
+    TEST_F(DetourNavigatorGetTilesPositionsTest, should_apply_recast_scale_factor)
+    {
+        mSettings.mRecastScaleFactor = 0.5;
+
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(32, 32), mSettings), mCollect);
+
+        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
+    }
+
+    struct TilesPositionsRangeParams
+    {
+        TilesPositionsRange mA;
+        TilesPositionsRange mB;
+        TilesPositionsRange mResult;
+    };
+
+    struct DetourNavigatorGetIntersectionTest : TestWithParam<TilesPositionsRangeParams>
+    {
+    };
+
+    TEST_P(DetourNavigatorGetIntersectionTest, should_return_expected_result)
+    {
+        EXPECT_EQ(getIntersection(GetParam().mA, GetParam().mB), GetParam().mResult);
+        EXPECT_EQ(getIntersection(GetParam().mB, GetParam().mA), GetParam().mResult);
+    }
+
+    const TilesPositionsRangeParams getIntersectionParams[] = {
+        { .mA = TilesPositionsRange{}, .mB = TilesPositionsRange{}, .mResult = TilesPositionsRange{} },
+        {
+            .mA = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 2, 2 } },
+            .mB = TilesPositionsRange{ .mBegin = TilePosition{ 1, 1 }, .mEnd = TilePosition{ 3, 3 } },
+            .mResult = TilesPositionsRange{ .mBegin = TilePosition{ 1, 1 }, .mEnd = TilePosition{ 2, 2 } },
+        },
+        {
+            .mA = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 1, 1 } },
+            .mB = TilesPositionsRange{ .mBegin = TilePosition{ 2, 2 }, .mEnd = TilePosition{ 3, 3 } },
+            .mResult = TilesPositionsRange{},
+        },
+        {
+            .mA = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 1, 1 } },
+            .mB = TilesPositionsRange{ .mBegin = TilePosition{ 1, 1 }, .mEnd = TilePosition{ 2, 2 } },
+            .mResult = TilesPositionsRange{ .mBegin = TilePosition{ 1, 1 }, .mEnd = TilePosition{ 1, 1 } },
+        },
+        {
+            .mA = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 1, 1 } },
+            .mB = TilesPositionsRange{ .mBegin = TilePosition{ 0, 2 }, .mEnd = TilePosition{ 3, 3 } },
+            .mResult = TilesPositionsRange{},
+        },
+        {
+            .mA = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 1, 1 } },
+            .mB = TilesPositionsRange{ .mBegin = TilePosition{ 2, 0 }, .mEnd = TilePosition{ 3, 3 } },
+            .mResult = TilesPositionsRange{},
+        },
+    };
+
+    INSTANTIATE_TEST_SUITE_P(
+        GetIntersectionParams, DetourNavigatorGetIntersectionTest, ValuesIn(getIntersectionParams));
+
+    struct DetourNavigatorGetUnionTest : TestWithParam<TilesPositionsRangeParams>
+    {
+    };
+
+    TEST_P(DetourNavigatorGetUnionTest, should_return_expected_result)
+    {
+        EXPECT_EQ(getUnion(GetParam().mA, GetParam().mB), GetParam().mResult);
+        EXPECT_EQ(getUnion(GetParam().mB, GetParam().mA), GetParam().mResult);
+    }
+
+    const TilesPositionsRangeParams getUnionParams[] = {
+        { .mA = TilesPositionsRange{}, .mB = TilesPositionsRange{}, .mResult = TilesPositionsRange{} },
+        {
+            .mA = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 2, 2 } },
+            .mB = TilesPositionsRange{ .mBegin = TilePosition{ 1, 1 }, .mEnd = TilePosition{ 3, 3 } },
+            .mResult = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 3, 3 } },
+        },
+        {
+            .mA = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 1, 1 } },
+            .mB = TilesPositionsRange{ .mBegin = TilePosition{ 1, 1 }, .mEnd = TilePosition{ 2, 2 } },
+            .mResult = TilesPositionsRange{ .mBegin = TilePosition{ 0, 0 }, .mEnd = TilePosition{ 2, 2 } },
+        },
+    };
+
+    INSTANTIATE_TEST_SUITE_P(GetUnionParams, DetourNavigatorGetUnionTest, ValuesIn(getUnionParams));
+}
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/components_tests/detournavigator/navigator.cpp
similarity index 68%
rename from apps/openmw_test_suite/detournavigator/navigator.cpp
rename to apps/components_tests/detournavigator/navigator.cpp
index a93693c08b..2927869782 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/components_tests/detournavigator/navigator.cpp
@@ -39,37 +39,44 @@ namespace
     using namespace DetourNavigator;
     using namespace DetourNavigator::Tests;
 
+    constexpr int heightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
+
     struct DetourNavigatorNavigatorTest : Test
     {
         Settings mSettings = makeSettings();
-        std::unique_ptr<Navigator> mNavigator;
-        const osg::Vec3f mPlayerPosition;
-        const std::string mWorldspace;
+        std::unique_ptr<Navigator> mNavigator = std::make_unique<NavigatorImpl>(
+            mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max()));
+        const osg::Vec3f mPlayerPosition{ 256, 256, 0 };
+        const ESM::RefId mWorldspace = ESM::RefId::stringRefId("sys::default");
         const AgentBounds mAgentBounds{ CollisionShapeType::Aabb, { 29, 29, 66 } };
-        osg::Vec3f mStart;
-        osg::Vec3f mEnd;
+        osg::Vec3f mStart{ 52, 460, 1 };
+        osg::Vec3f mEnd{ 460, 52, 1 };
         std::deque<osg::Vec3f> mPath;
-        std::back_insert_iterator<std::deque<osg::Vec3f>> mOut;
+        std::back_insert_iterator<std::deque<osg::Vec3f>> mOut{ mPath };
         AreaCosts mAreaCosts;
         Loading::Listener mListener;
         const osg::Vec2i mCellPosition{ 0, 0 };
-        const int mHeightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
         const float mEndTolerance = 0;
         const btTransform mTransform{ btMatrix3x3::getIdentity(), btVector3(256, 256, 0) };
         const ObjectTransform mObjectTransform{ ESM::Position{ { 256, 256, 0 }, { 0, 0, 0 } }, 0.0f };
-
-        DetourNavigatorNavigatorTest()
-            : mPlayerPosition(256, 256, 0)
-            , mWorldspace("sys::default")
-            , mStart(52, 460, 1)
-            , mEnd(460, 52, 1)
-            , mOut(mPath)
-        {
-            mNavigator.reset(new NavigatorImpl(
-                mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
-        }
     };
 
+    constexpr std::array<float, 5 * 5> defaultHeightfieldData{ {
+        0, 0, 0, 0, 0, // row 0
+        0, -25, -25, -25, -25, // row 1
+        0, -25, -100, -100, -100, // row 2
+        0, -25, -100, -100, -100, // row 3
+        0, -25, -100, -100, -100, // row 4
+    } };
+
+    constexpr std::array<btScalar, 5 * 5> defaultHeightfieldDataScalar{ {
+        0, 0, 0, 0, 0, // row 0
+        0, -25, -25, -25, -25, // row 1
+        0, -25, -100, -100, -100, // row 2
+        0, -25, -100, -100, -100, // row 3
+        0, -25, -100, -100, -100, // row 4
+    } };
+
     template <std::size_t size>
     std::unique_ptr<btHeightfieldTerrainShape> makeSquareHeightfieldTerrainShape(
         const std::array<btScalar, size>& values, btScalar heightScale = 1, int upAxis = 2,
@@ -113,7 +120,7 @@ namespace
         {
         }
 
-        T& shape() { return static_cast<T&>(*mInstance->mCollisionShape); }
+        T& shape() const { return static_cast<T&>(*mInstance->mCollisionShape); }
         const osg::ref_ptr<const Resource::BulletShapeInstance>& instance() const { return mInstance; }
 
     private:
@@ -150,15 +157,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_find_path_should_return_path)
     {
-        constexpr std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         auto updateGuard = mNavigator->makeUpdateGuard();
@@ -177,21 +177,32 @@ namespace
             << mPath;
     }
 
+    TEST_F(DetourNavigatorNavigatorTest, find_path_to_the_start_position_should_contain_single_point)
+    {
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        auto updateGuard = mNavigator->makeUpdateGuard();
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, updateGuard.get());
+        mNavigator->update(mPlayerPosition, updateGuard.get());
+        updateGuard.reset();
+        mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
+
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mStart, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath, ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125))) << mPath;
+    }
+
     TEST_F(DetourNavigatorNavigatorTest, add_object_should_change_navmesh)
     {
         mSettings.mWaitUntilMinDistanceToPlayer = 0;
         mNavigator.reset(new NavigatorImpl(
             mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
 
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(
@@ -235,15 +246,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_changed_object_should_change_navmesh)
     {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(
@@ -288,14 +292,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, for_overlapping_heightfields_objects_should_use_higher)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData1{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        CollisionShapeInstance heightfield1(makeSquareHeightfieldTerrainShape(heightfieldData1));
+        CollisionShapeInstance heightfield1(makeSquareHeightfieldTerrainShape(defaultHeightfieldDataScalar));
         heightfield1.shape().setLocalScaling(btVector3(128, 128, 1));
 
         const std::array<btScalar, 5 * 5> heightfieldData2{ {
@@ -328,15 +325,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, only_one_heightfield_per_cell_is_allowed)
     {
-        const std::array<float, 5 * 5> heightfieldData1{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface1 = makeSquareHeightfieldSurface(heightfieldData1);
-        const int cellSize1 = mHeightfieldTileSize * (surface1.mSize - 1);
+        const HeightfieldSurface surface1 = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize1 = heightfieldTileSize * (surface1.mSize - 1);
 
         const std::array<float, 5 * 5> heightfieldData2{ {
             -25, -25, -25, -25, -25, // row 0
@@ -346,7 +336,7 @@ namespace
             -25, -25, -25, -25, -25, // row 4
         } };
         const HeightfieldSurface surface2 = makeSquareHeightfieldSurface(heightfieldData2);
-        const int cellSize2 = mHeightfieldTileSize * (surface2.mSize - 1);
+        const int cellSize2 = heightfieldTileSize * (surface2.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addHeightfield(mCellPosition, cellSize1, surface1, nullptr);
@@ -366,14 +356,8 @@ namespace
     {
         osg::ref_ptr<Resource::BulletShape> bulletShape(new Resource::BulletShape);
 
-        std::array<btScalar, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        std::unique_ptr<btHeightfieldTerrainShape> shapePtr = makeSquareHeightfieldTerrainShape(heightfieldData);
+        std::unique_ptr<btHeightfieldTerrainShape> shapePtr
+            = makeSquareHeightfieldTerrainShape(defaultHeightfieldDataScalar);
         shapePtr->setLocalScaling(btVector3(128, 128, 1));
         bulletShape->mCollisionShape.reset(shapePtr.release());
 
@@ -419,7 +403,7 @@ namespace
             0, -50, -100, -100, -100, // row 4
         } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addWater(mCellPosition, cellSize, 300, nullptr);
@@ -453,7 +437,7 @@ namespace
             0, 0, 0, 0, 0, 0, 0, // row 6
         } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addWater(mCellPosition, cellSize, -25, nullptr);
@@ -487,7 +471,7 @@ namespace
             0, 0, 0, 0, 0, 0, 0, // row 6
         } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
@@ -520,7 +504,7 @@ namespace
             0, 0, 0, 0, 0, 0, 0, // row 6
         } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addWater(mCellPosition, cellSize, -25, nullptr);
@@ -542,14 +526,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_object_remove_and_update_then_find_path_should_return_path)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        CollisionShapeInstance heightfield(makeSquareHeightfieldTerrainShape(heightfieldData));
+        CollisionShapeInstance heightfield(makeSquareHeightfieldTerrainShape(defaultHeightfieldDataScalar));
         heightfield.shape().setLocalScaling(btVector3(128, 128, 1));
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
@@ -579,15 +556,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_heightfield_remove_and_update_then_find_path_should_return_path)
     {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
@@ -623,7 +593,7 @@ namespace
             0, -25, -100, -100, -100, -100, // row 5
         } };
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
@@ -649,15 +619,8 @@ namespace
         mNavigator.reset(new NavigatorImpl(
             mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
 
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
         const btVector3 shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         std::vector<CollisionShapeInstance<btBoxShape>> boxes;
@@ -745,15 +708,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_raycast_should_return_position)
     {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
@@ -771,15 +727,8 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest,
         update_for_oscillating_object_that_does_not_change_navmesh_should_not_trigger_navmesh_update)
     {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         CollisionShapeInstance oscillatingBox(std::make_unique<btBoxShape>(btVector3(20, 20, 20)));
         const btVector3 oscillatingBoxShapePosition(288, 288, 400);
@@ -819,7 +768,7 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest, should_provide_path_over_flat_heightfield)
     {
         const HeightfieldPlane plane{ 100 };
-        const int cellSize = mHeightfieldTileSize * 4;
+        const int cellSize = heightfieldTileSize * 4;
 
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addHeightfield(mCellPosition, cellSize, plane, nullptr);
@@ -837,15 +786,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, for_not_reachable_destination_find_path_should_provide_partial_path)
     {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
@@ -870,15 +812,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, end_tolerance_should_extent_available_destinations)
     {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, -25, -25, -25, -25, // row 1
-            0, -25, -100, -100, -100, // row 2
-            0, -25, -100, -100, -100, // row 3
-            0, -25, -100, -100, -100, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
@@ -924,16 +859,29 @@ namespace
         EXPECT_EQ(mNavigator->getNavMesh(mAgentBounds)->lockConst()->getVersion(), version);
     }
 
+    std::pair<TilePosition, TilePosition> getMinMax(const RecastMeshTiles& tiles)
+    {
+        const auto lessByX = [](const auto& l, const auto& r) { return l.first.x() < r.first.x(); };
+        const auto lessByY = [](const auto& l, const auto& r) { return l.first.y() < r.first.y(); };
+
+        const auto [minX, maxX] = std::ranges::minmax_element(tiles, lessByX);
+        const auto [minY, maxY] = std::ranges::minmax_element(tiles, lessByY);
+
+        return { TilePosition(minX->first.x(), minY->first.y()), TilePosition(maxX->first.x(), maxY->first.y()) };
+    }
+
     TEST_F(DetourNavigatorNavigatorTest, update_for_very_big_object_should_be_limited)
     {
-        const float size = static_cast<float>(2 * static_cast<std::int64_t>(std::numeric_limits<int>::max()) - 1);
+        const float size = static_cast<float>((1 << 22) - 1);
         CollisionShapeInstance bigBox(std::make_unique<btBoxShape>(btVector3(size, size, 1)));
         const ObjectTransform objectTransform{
             .mPosition = ESM::Position{ .pos = { 0, 0, 0 }, .rot{ 0, 0, 0 } },
             .mScale = 1.0f,
         };
+        const std::optional<CellGridBounds> cellGridBounds = std::nullopt;
+        const osg::Vec3f playerPosition(32, 1024, 0);
 
-        mNavigator->updateBounds(mPlayerPosition, nullptr);
+        mNavigator->updateBounds(mWorldspace, cellGridBounds, playerPosition, nullptr);
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->addObject(ObjectId(&bigBox.shape()), ObjectShapes(bigBox.instance(), objectTransform),
             btTransform::getIdentity(), nullptr);
@@ -943,7 +891,8 @@ namespace
         std::mutex mutex;
 
         std::thread thread([&] {
-            mNavigator->update(mPlayerPosition, nullptr);
+            auto guard = mNavigator->makeUpdateGuard();
+            mNavigator->update(playerPosition, guard.get());
             std::lock_guard lock(mutex);
             updated = true;
             updateFinished.notify_all();
@@ -951,7 +900,7 @@ namespace
 
         {
             std::unique_lock lock(mutex);
-            updateFinished.wait_for(lock, std::chrono::seconds(3), [&] { return updated; });
+            updateFinished.wait_for(lock, std::chrono::seconds(10), [&] { return updated; });
             ASSERT_TRUE(updated);
         }
 
@@ -959,14 +908,69 @@ namespace
 
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(mNavigator->getRecastMeshTiles().size(), 509);
+        const auto recastMeshTiles = mNavigator->getRecastMeshTiles();
+        ASSERT_EQ(recastMeshTiles.size(), 1033);
+        EXPECT_EQ(getMinMax(recastMeshTiles), std::pair(TilePosition(-18, -17), TilePosition(18, 19)));
 
         const auto navMesh = mNavigator->getNavMesh(mAgentBounds);
         ASSERT_NE(navMesh, nullptr);
 
         std::size_t usedNavMeshTiles = 0;
         navMesh->lockConst()->forEachUsedTile([&](const auto&...) { ++usedNavMeshTiles; });
-        EXPECT_EQ(usedNavMeshTiles, 509);
+        EXPECT_EQ(usedNavMeshTiles, 1024);
+    }
+
+    TEST_F(DetourNavigatorNavigatorTest, update_should_be_limited_by_cell_grid_bounds)
+    {
+        const float size = static_cast<float>((1 << 22) - 1);
+        CollisionShapeInstance bigBox(std::make_unique<btBoxShape>(btVector3(size, size, 1)));
+        const ObjectTransform objectTransform{
+            .mPosition = ESM::Position{ .pos = { 0, 0, 0 }, .rot{ 0, 0, 0 } },
+            .mScale = 1.0f,
+        };
+        const CellGridBounds cellGridBounds{
+            .mCenter = osg::Vec2i(0, 0),
+            .mHalfSize = 1,
+        };
+        const osg::Vec3f playerPosition(32, 1024, 0);
+
+        mNavigator->updateBounds(mWorldspace, cellGridBounds, playerPosition, nullptr);
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        mNavigator->addObject(ObjectId(&bigBox.shape()), ObjectShapes(bigBox.instance(), objectTransform),
+            btTransform::getIdentity(), nullptr);
+
+        bool updated = false;
+        std::condition_variable updateFinished;
+        std::mutex mutex;
+
+        std::thread thread([&] {
+            auto guard = mNavigator->makeUpdateGuard();
+            mNavigator->update(playerPosition, guard.get());
+            std::lock_guard lock(mutex);
+            updated = true;
+            updateFinished.notify_all();
+        });
+
+        {
+            std::unique_lock lock(mutex);
+            updateFinished.wait_for(lock, std::chrono::seconds(10), [&] { return updated; });
+            ASSERT_TRUE(updated);
+        }
+
+        thread.join();
+
+        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
+
+        const auto recastMeshTiles = mNavigator->getRecastMeshTiles();
+        ASSERT_EQ(recastMeshTiles.size(), 854);
+        EXPECT_EQ(getMinMax(recastMeshTiles), std::pair(TilePosition(-12, -12), TilePosition(18, 19)));
+
+        const auto navMesh = mNavigator->getNavMesh(mAgentBounds);
+        ASSERT_NE(navMesh, nullptr);
+
+        std::size_t usedNavMeshTiles = 0;
+        navMesh->lockConst()->forEachUsedTile([&](const auto&...) { ++usedNavMeshTiles; });
+        EXPECT_EQ(usedNavMeshTiles, 854);
     }
 
     struct DetourNavigatorNavigatorNotSupportedAgentBoundsTest : TestWithParam<AgentBounds>
@@ -1000,4 +1004,286 @@ namespace
 
     INSTANTIATE_TEST_SUITE_P(NotSupportedAgentBounds, DetourNavigatorNavigatorNotSupportedAgentBoundsTest,
         ValuesIn(notSupportedAgentBounds));
+
+    TEST_F(DetourNavigatorNavigatorTest, find_nearest_nav_mesh_position_should_return_nav_mesh_position)
+    {
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        auto updateGuard = mNavigator->makeUpdateGuard();
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, updateGuard.get());
+        mNavigator->update(mPlayerPosition, updateGuard.get());
+        updateGuard.reset();
+        mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
+
+        const osg::Vec3f position(250, 250, 0);
+        const osg::Vec3f searchAreaHalfExtents(1000, 1000, 1000);
+        EXPECT_THAT(findNearestNavMeshPosition(*mNavigator, mAgentBounds, position, searchAreaHalfExtents, Flag_walk),
+            Optional(Vec3fEq(250, 250, -62.5186)));
+    }
+
+    TEST_F(DetourNavigatorNavigatorTest, find_nearest_nav_mesh_position_should_return_nullopt_when_too_far)
+    {
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        auto updateGuard = mNavigator->makeUpdateGuard();
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, updateGuard.get());
+        mNavigator->update(mPlayerPosition, updateGuard.get());
+        updateGuard.reset();
+        mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
+
+        const osg::Vec3f position(250, 250, 250);
+        const osg::Vec3f searchAreaHalfExtents(100, 100, 100);
+        EXPECT_EQ(findNearestNavMeshPosition(*mNavigator, mAgentBounds, position, searchAreaHalfExtents, Flag_walk),
+            std::nullopt);
+    }
+
+    TEST_F(DetourNavigatorNavigatorTest, find_nearest_nav_mesh_position_should_return_nullopt_when_flags_do_not_match)
+    {
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(defaultHeightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        auto updateGuard = mNavigator->makeUpdateGuard();
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, updateGuard.get());
+        mNavigator->update(mPlayerPosition, updateGuard.get());
+        updateGuard.reset();
+        mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
+
+        const osg::Vec3f position(250, 250, 0);
+        const osg::Vec3f searchAreaHalfExtents(1000, 1000, 1000);
+        EXPECT_EQ(findNearestNavMeshPosition(*mNavigator, mAgentBounds, position, searchAreaHalfExtents, Flag_swim),
+            std::nullopt);
+    }
+
+    struct DetourNavigatorUpdateTest : TestWithParam<std::function<void(Navigator&)>>
+    {
+    };
+
+    std::vector<TilePosition> getUsedTiles(const NavMeshCacheItem& navMesh)
+    {
+        std::vector<TilePosition> result;
+        navMesh.forEachUsedTile([&](const TilePosition& position, const auto&...) { result.push_back(position); });
+        return result;
+    }
+
+    TEST_P(DetourNavigatorUpdateTest, update_should_change_covered_area_when_player_moves)
+    {
+        Loading::Listener listener;
+        Settings settings = makeSettings();
+        settings.mMaxTilesNumber = 5;
+        NavigatorImpl navigator(settings, nullptr);
+        const AgentBounds agentBounds{ CollisionShapeType::Aabb, { 29, 29, 66 } };
+        ASSERT_TRUE(navigator.addAgent(agentBounds));
+
+        GetParam()(navigator);
+
+        {
+            auto updateGuard = navigator.makeUpdateGuard();
+            navigator.update(osg::Vec3f(3000, 3000, 0), updateGuard.get());
+        }
+
+        navigator.wait(WaitConditionType::allJobsDone, &listener);
+
+        {
+            const auto navMesh = navigator.getNavMesh(agentBounds);
+            ASSERT_NE(navMesh, nullptr);
+
+            const TilePosition expectedTiles[] = { { 3, 4 }, { 4, 3 }, { 4, 4 }, { 4, 5 }, { 5, 4 } };
+            const auto usedTiles = getUsedTiles(*navMesh->lockConst());
+            EXPECT_THAT(usedTiles, UnorderedElementsAreArray(expectedTiles)) << usedTiles;
+        }
+
+        {
+            auto updateGuard = navigator.makeUpdateGuard();
+            navigator.update(osg::Vec3f(4000, 3000, 0), updateGuard.get());
+        }
+
+        navigator.wait(WaitConditionType::allJobsDone, &listener);
+
+        {
+            const auto navMesh = navigator.getNavMesh(agentBounds);
+            ASSERT_NE(navMesh, nullptr);
+
+            const TilePosition expectedTiles[] = { { 4, 4 }, { 5, 3 }, { 5, 4 }, { 5, 5 }, { 6, 4 } };
+            const auto usedTiles = getUsedTiles(*navMesh->lockConst());
+            EXPECT_THAT(usedTiles, UnorderedElementsAreArray(expectedTiles)) << usedTiles;
+        }
+    }
+
+    TEST_P(DetourNavigatorUpdateTest, update_should_change_covered_area_when_player_moves_without_waiting_for_all)
+    {
+        Loading::Listener listener;
+        Settings settings = makeSettings();
+        settings.mMaxTilesNumber = 1;
+        settings.mWaitUntilMinDistanceToPlayer = 1;
+        NavigatorImpl navigator(settings, nullptr);
+        const AgentBounds agentBounds{ CollisionShapeType::Aabb, { 29, 29, 66 } };
+        ASSERT_TRUE(navigator.addAgent(agentBounds));
+
+        GetParam()(navigator);
+
+        {
+            auto updateGuard = navigator.makeUpdateGuard();
+            navigator.update(osg::Vec3f(3000, 3000, 0), updateGuard.get());
+        }
+
+        navigator.wait(WaitConditionType::requiredTilesPresent, &listener);
+
+        {
+            const auto navMesh = navigator.getNavMesh(agentBounds);
+            ASSERT_NE(navMesh, nullptr);
+
+            const TilePosition expectedTile(4, 4);
+            const auto usedTiles = getUsedTiles(*navMesh->lockConst());
+            EXPECT_THAT(usedTiles, Contains(expectedTile)) << usedTiles;
+        }
+
+        {
+            auto updateGuard = navigator.makeUpdateGuard();
+            navigator.update(osg::Vec3f(6000, 3000, 0), updateGuard.get());
+        }
+
+        navigator.wait(WaitConditionType::requiredTilesPresent, &listener);
+
+        {
+            const auto navMesh = navigator.getNavMesh(agentBounds);
+            ASSERT_NE(navMesh, nullptr);
+
+            const TilePosition expectedTile(8, 4);
+            const auto usedTiles = getUsedTiles(*navMesh->lockConst());
+            EXPECT_THAT(usedTiles, Contains(expectedTile)) << usedTiles;
+        }
+    }
+
+    TEST_P(DetourNavigatorUpdateTest, update_should_change_covered_area_when_player_moves_with_db)
+    {
+        Loading::Listener listener;
+        Settings settings = makeSettings();
+        settings.mMaxTilesNumber = 1;
+        settings.mWaitUntilMinDistanceToPlayer = 1;
+        NavigatorImpl navigator(settings, std::make_unique<NavMeshDb>(":memory:", settings.mMaxDbFileSize));
+        const AgentBounds agentBounds{ CollisionShapeType::Aabb, { 29, 29, 66 } };
+        ASSERT_TRUE(navigator.addAgent(agentBounds));
+
+        GetParam()(navigator);
+
+        {
+            auto updateGuard = navigator.makeUpdateGuard();
+            navigator.update(osg::Vec3f(3000, 3000, 0), updateGuard.get());
+        }
+
+        navigator.wait(WaitConditionType::requiredTilesPresent, &listener);
+
+        {
+            const auto navMesh = navigator.getNavMesh(agentBounds);
+            ASSERT_NE(navMesh, nullptr);
+
+            const TilePosition expectedTile(4, 4);
+            const auto usedTiles = getUsedTiles(*navMesh->lockConst());
+            EXPECT_THAT(usedTiles, Contains(expectedTile)) << usedTiles;
+        }
+
+        {
+            auto updateGuard = navigator.makeUpdateGuard();
+            navigator.update(osg::Vec3f(6000, 3000, 0), updateGuard.get());
+        }
+
+        navigator.wait(WaitConditionType::requiredTilesPresent, &listener);
+
+        {
+            const auto navMesh = navigator.getNavMesh(agentBounds);
+            ASSERT_NE(navMesh, nullptr);
+
+            const TilePosition expectedTile(8, 4);
+            const auto usedTiles = getUsedTiles(*navMesh->lockConst());
+            EXPECT_THAT(usedTiles, Contains(expectedTile)) << usedTiles;
+        }
+    }
+
+    struct AddHeightfieldSurface
+    {
+        static constexpr std::size_t sSize = 65;
+        static constexpr float sHeights[sSize * sSize]{};
+
+        void operator()(Navigator& navigator) const
+        {
+            const osg::Vec2i cellPosition(0, 0);
+            const HeightfieldSurface surface{
+                .mHeights = sHeights,
+                .mSize = sSize,
+                .mMinHeight = -1,
+                .mMaxHeight = 1,
+            };
+            const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+            navigator.addHeightfield(cellPosition, cellSize, surface, nullptr);
+        }
+    };
+
+    struct AddHeightfieldPlane
+    {
+        void operator()(Navigator& navigator) const
+        {
+            const osg::Vec2i cellPosition(0, 0);
+            const HeightfieldPlane plane{ .mHeight = 0 };
+            const int cellSize = 8192;
+            navigator.addHeightfield(cellPosition, cellSize, plane, nullptr);
+        }
+    };
+
+    struct AddWater
+    {
+        void operator()(Navigator& navigator) const
+        {
+            const osg::Vec2i cellPosition(0, 0);
+            const float level = 0;
+            const int cellSize = 8192;
+            navigator.addWater(cellPosition, cellSize, level, nullptr);
+        }
+    };
+
+    struct AddObject
+    {
+        const float mSize = 8192;
+        CollisionShapeInstance<btBoxShape> mBox{ std::make_unique<btBoxShape>(btVector3(mSize, mSize, 1)) };
+        const ObjectTransform mTransform{
+            .mPosition = ESM::Position{ .pos = { 0, 0, 0 }, .rot{ 0, 0, 0 } },
+            .mScale = 1.0f,
+        };
+
+        void operator()(Navigator& navigator) const
+        {
+            navigator.addObject(ObjectId(&mBox.shape()), ObjectShapes(mBox.instance(), mTransform),
+                btTransform::getIdentity(), nullptr);
+        }
+    };
+
+    struct AddAll
+    {
+        AddHeightfieldSurface mAddHeightfieldSurface;
+        AddHeightfieldPlane mAddHeightfieldPlane;
+        AddWater mAddWater;
+        AddObject mAddObject;
+
+        void operator()(Navigator& navigator) const
+        {
+            mAddHeightfieldSurface(navigator);
+            mAddHeightfieldPlane(navigator);
+            mAddWater(navigator);
+            mAddObject(navigator);
+        }
+    };
+
+    const std::function<void(Navigator&)> addNavMeshData[] = {
+        AddHeightfieldSurface{},
+        AddHeightfieldPlane{},
+        AddWater{},
+        AddObject{},
+        AddAll{},
+    };
+
+    INSTANTIATE_TEST_SUITE_P(DifferentNavMeshData, DetourNavigatorUpdateTest, ValuesIn(addNavMeshData));
 }
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/components_tests/detournavigator/navmeshdb.cpp
similarity index 92%
rename from apps/openmw_test_suite/detournavigator/navmeshdb.cpp
rename to apps/components_tests/detournavigator/navmeshdb.cpp
index 4cf88f5711..cd74983b0e 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
+++ b/apps/components_tests/detournavigator/navmeshdb.cpp
@@ -8,7 +8,6 @@
 #include <gtest/gtest.h>
 
 #include <limits>
-#include <numeric>
 #include <random>
 
 namespace
@@ -19,7 +18,7 @@ namespace
 
     struct Tile
     {
-        std::string mWorldspace;
+        ESM::RefId mWorldspace;
         TilePosition mTilePosition;
         std::vector<std::byte> mInput;
         std::vector<std::byte> mData;
@@ -39,12 +38,12 @@ namespace
 
         Tile insertTile(TileId tileId, TileVersion version)
         {
-            std::string worldspace = "sys::default";
+            const ESM::RefId worldspace = ESM::RefId::stringRefId("sys::default");
             const TilePosition tilePosition{ 3, 4 };
             std::vector<std::byte> input = generateData();
             std::vector<std::byte> data = generateData();
             EXPECT_EQ(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), 1);
-            return { std::move(worldspace), tilePosition, std::move(input), std::move(data) };
+            return { worldspace, tilePosition, std::move(input), std::move(data) };
         }
     };
 
@@ -89,7 +88,7 @@ namespace
     {
         const TileId tileId{ 53 };
         const TileVersion version{ 1 };
-        const std::string worldspace = "sys::default";
+        const ESM::RefId worldspace = ESM::RefId::stringRefId("sys::default");
         const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> input = generateData();
         const std::vector<std::byte> data = generateData();
@@ -101,7 +100,7 @@ namespace
     {
         const TileId tileId{ 53 };
         const TileVersion version{ 1 };
-        const std::string worldspace = "sys::default";
+        const ESM::RefId worldspace = ESM::RefId::stringRefId("sys::default");
         const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> input = generateData();
         const std::vector<std::byte> data = generateData();
@@ -113,7 +112,7 @@ namespace
     TEST_F(DetourNavigatorNavMeshDbTest, delete_tiles_at_should_remove_all_tiles_with_given_worldspace_and_position)
     {
         const TileVersion version{ 1 };
-        const std::string worldspace = "sys::default";
+        const ESM::RefId worldspace = ESM::RefId::stringRefId("sys::default");
         const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> input1 = generateData();
         const std::vector<std::byte> input2 = generateData();
@@ -130,7 +129,7 @@ namespace
         const TileId leftTileId{ 53 };
         const TileId removedTileId{ 54 };
         const TileVersion version{ 1 };
-        const std::string worldspace = "sys::default";
+        const ESM::RefId worldspace = ESM::RefId::stringRefId("sys::default");
         const TilePosition tilePosition{ 3, 4 };
         const std::vector<std::byte> leftInput = generateData();
         const std::vector<std::byte> removedInput = generateData();
@@ -148,7 +147,7 @@ namespace
     {
         TileId tileId{ 1 };
         const TileVersion version{ 1 };
-        const std::string worldspace = "sys::default";
+        const ESM::RefId worldspace = ESM::RefId::stringRefId("sys::default");
         const std::vector<std::byte> input = generateData();
         const std::vector<std::byte> data = generateData();
         for (int x = -2; x <= 2; ++x)
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/components_tests/detournavigator/navmeshtilescache.cpp
similarity index 100%
rename from apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
rename to apps/components_tests/detournavigator/navmeshtilescache.cpp
diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/components_tests/detournavigator/operators.hpp
similarity index 82%
rename from apps/openmw_test_suite/detournavigator/operators.hpp
rename to apps/components_tests/detournavigator/operators.hpp
index 4e42af78e4..4c043027eb 100644
--- a/apps/openmw_test_suite/detournavigator/operators.hpp
+++ b/apps/components_tests/detournavigator/operators.hpp
@@ -42,12 +42,24 @@ namespace testing
                        << ", " << value.y() << ", " << value.z() << ')';
     }
 
+    template <>
+    inline testing::Message& Message::operator<<(const osg::Vec2i& value)
+    {
+        return (*this) << "{" << value.x() << ", " << value.y() << '}';
+    }
+
     template <>
     inline testing::Message& Message::operator<<(const Wrapper<osg::Vec3f>& value)
     {
         return (*this) << value.mValue;
     }
 
+    template <>
+    inline testing::Message& Message::operator<<(const Wrapper<osg::Vec2i>& value)
+    {
+        return (*this) << value.mValue;
+    }
+
     template <>
     inline testing::Message& Message::operator<<(const Wrapper<float>& value)
     {
@@ -72,6 +84,12 @@ namespace testing
         return writeRange(*this, value, 1);
     }
 
+    template <>
+    inline testing::Message& Message::operator<<(const std::vector<osg::Vec2i>& value)
+    {
+        return writeRange(*this, value, 1);
+    }
+
     template <>
     inline testing::Message& Message::operator<<(const std::vector<float>& value)
     {
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/components_tests/detournavigator/recastmeshbuilder.cpp
similarity index 100%
rename from apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
rename to apps/components_tests/detournavigator/recastmeshbuilder.cpp
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp b/apps/components_tests/detournavigator/recastmeshobject.cpp
similarity index 100%
rename from apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
rename to apps/components_tests/detournavigator/recastmeshobject.cpp
diff --git a/apps/openmw_test_suite/detournavigator/settings.hpp b/apps/components_tests/detournavigator/settings.hpp
similarity index 97%
rename from apps/openmw_test_suite/detournavigator/settings.hpp
rename to apps/components_tests/detournavigator/settings.hpp
index dc37dc7550..1ebbc5ba7b 100644
--- a/apps/openmw_test_suite/detournavigator/settings.hpp
+++ b/apps/components_tests/detournavigator/settings.hpp
@@ -39,7 +39,7 @@ namespace DetourNavigator
             result.mDetour.mMaxPolygonPathSize = 1024;
             result.mDetour.mMaxSmoothPathSize = 1024;
             result.mDetour.mMaxPolys = 4096;
-            result.mMaxTilesNumber = 512;
+            result.mMaxTilesNumber = 1024;
             result.mMinUpdateInterval = std::chrono::milliseconds(50);
             result.mWriteToNavMeshDb = true;
             return result;
diff --git a/apps/openmw_test_suite/detournavigator/settingsutils.cpp b/apps/components_tests/detournavigator/settingsutils.cpp
similarity index 100%
rename from apps/openmw_test_suite/detournavigator/settingsutils.cpp
rename to apps/components_tests/detournavigator/settingsutils.cpp
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/components_tests/detournavigator/tilecachedrecastmeshmanager.cpp
similarity index 80%
rename from apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
rename to apps/components_tests/detournavigator/tilecachedrecastmeshmanager.cpp
index df695ec254..e1805e993c 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/components_tests/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -21,6 +21,7 @@ namespace
         const ObjectTransform mObjectTransform{ ESM::Position{ { 0, 0, 0 }, { 0, 0, 0 } }, 0.0f };
         const osg::ref_ptr<const Resource::BulletShape> mShape = new Resource::BulletShape;
         const osg::ref_ptr<const Resource::BulletShapeInstance> mInstance = new Resource::BulletShapeInstance(mShape);
+        const ESM::RefId mWorldspace = ESM::RefId::stringRefId("worldspace");
 
         DetourNavigatorTileCachedRecastMeshManagerTest()
         {
@@ -34,7 +35,7 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_empty_should_return_nullptr)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_for_empty_should_return_zero)
@@ -65,14 +66,14 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_add_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(
             ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
-                ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
+                ASSERT_NE(manager.getMesh(mWorldspace, TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_return_add_changed_tiles)
@@ -145,25 +146,25 @@ namespace
         get_mesh_after_add_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(
         DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_after_add_object_should_return_nullptr_for_unused_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(1, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
@@ -172,10 +173,10 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const TilesPositionsRange range{
             .mBegin = TilePosition(-1, -1),
-            .mEnd = TilePosition(1, 1),
+            .mEnd = TilePosition(2, 2),
         };
         manager.setRange(range, nullptr);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(
@@ -183,23 +184,23 @@ namespace
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(1, -1)), nullptr);
 
         manager.updateObject(ObjectId(&boxShape), btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(
         DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_nullptr_for_unused_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(
@@ -207,48 +208,48 @@ namespace
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(-1, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(-1, 0)), nullptr);
 
         manager.updateObject(ObjectId(&boxShape), btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(1, -1)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
         get_mesh_for_removed_object_should_return_nullptr_for_all_previously_used_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
         manager.removeObject(ObjectId(&boxShape), nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
-        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(-1, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(-1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(0, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh(mWorldspace, TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
         get_mesh_for_not_changed_object_after_update_should_return_recast_mesh_for_same_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, 0)), nullptr);
 
         manager.updateObject(ObjectId(&boxShape), btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh(mWorldspace, TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
@@ -293,7 +294,7 @@ namespace
         get_revision_after_update_not_changed_object_should_return_same_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
@@ -339,19 +340,19 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_not_max_int_should_add_new_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         manager.addWater(cellPosition, cellSize, 0.0f, nullptr);
         for (int x = -1; x < 12; ++x)
             for (int y = -1; y < 12; ++y)
-                ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
+                ASSERT_NE(manager.getMesh(mWorldspace, TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_max_int_should_not_add_new_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(
@@ -361,7 +362,7 @@ namespace
         manager.addWater(cellPosition, cellSize, 0.0f, nullptr);
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr,
+                ASSERT_EQ(manager.getMesh(mWorldspace, TilePosition(x, y)) != nullptr,
                     -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
@@ -390,20 +391,20 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_remove_empty_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         manager.addWater(cellPosition, cellSize, 0.0f, nullptr);
         manager.removeWater(cellPosition, nullptr);
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
+                ASSERT_EQ(manager.getMesh(mWorldspace, TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_leave_not_empty_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(
@@ -414,14 +415,14 @@ namespace
         manager.removeWater(cellPosition, nullptr);
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr,
+                ASSERT_EQ(manager.getMesh(mWorldspace, TilePosition(x, y)) != nullptr,
                     -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_object_should_not_remove_tile_with_water)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         const btBoxShape boxShape(btVector3(20, 20, 100));
@@ -432,24 +433,25 @@ namespace
         manager.removeObject(ObjectId(&boxShape), nullptr);
         for (int x = -1; x < 12; ++x)
             for (int y = -1; y < 12; ++y)
-                ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
+                ASSERT_NE(manager.getMesh(mWorldspace, TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, set_new_worldspace_should_remove_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        manager.setWorldspace("worldspace", nullptr);
+        manager.setWorldspace(mWorldspace, nullptr);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(nullptr, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(
             ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr));
-        manager.setWorldspace("other", nullptr);
+        const ESM::RefId otherWorldspace(ESM::FormId::fromUint32(0x1));
+        manager.setWorldspace(ESM::FormId::fromUint32(0x1), nullptr);
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
-                ASSERT_EQ(manager.getMesh("other", TilePosition(x, y)), nullptr);
+                ASSERT_EQ(manager.getMesh(otherWorldspace, TilePosition(x, y)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, set_bounds_should_add_changed_tiles)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, set_range_should_add_changed_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
@@ -470,4 +472,35 @@ namespace
             ElementsAre(
                 std::pair(TilePosition(-1, -1), ChangeType::add), std::pair(TilePosition(0, 0), ChangeType::remove)));
     }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, set_range_should_remove_cached_recast_meshes_outside_range)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+
+        manager.setWorldspace(mWorldspace, nullptr);
+
+        const btBoxShape boxShape(btVector3(100, 100, 20));
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
+        const TilesPositionsRange range1{
+            .mBegin = TilePosition(0, 0),
+            .mEnd = TilePosition(1, 1),
+        };
+        manager.setRange(range1, nullptr);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, nullptr);
+
+        const TilePosition tilePosition(0, 0);
+
+        ASSERT_EQ(manager.getCachedMesh(mWorldspace, tilePosition), nullptr);
+        ASSERT_NE(manager.getMesh(mWorldspace, tilePosition), nullptr);
+        ASSERT_NE(manager.getCachedMesh(mWorldspace, tilePosition), nullptr);
+
+        const TilesPositionsRange range2{
+            .mBegin = TilePosition(-1, -1),
+            .mEnd = TilePosition(0, 0),
+        };
+        manager.takeChangedTiles(nullptr);
+        manager.setRange(range2, nullptr);
+
+        ASSERT_EQ(manager.getCachedMesh(mWorldspace, tilePosition), nullptr);
+    }
 }
diff --git a/apps/openmw_test_suite/esm/test_fixed_string.cpp b/apps/components_tests/esm/test_fixed_string.cpp
similarity index 100%
rename from apps/openmw_test_suite/esm/test_fixed_string.cpp
rename to apps/components_tests/esm/test_fixed_string.cpp
diff --git a/apps/openmw_test_suite/esm/testrefid.cpp b/apps/components_tests/esm/testrefid.cpp
similarity index 99%
rename from apps/openmw_test_suite/esm/testrefid.cpp
rename to apps/components_tests/esm/testrefid.cpp
index 168f9e0b9e..1911cd1a5a 100644
--- a/apps/openmw_test_suite/esm/testrefid.cpp
+++ b/apps/components_tests/esm/testrefid.cpp
@@ -1,6 +1,7 @@
-#include "components/esm/refid.hpp"
-#include "components/esm3/esmreader.hpp"
-#include "components/esm3/esmwriter.hpp"
+#include <components/esm/refid.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/testing/expecterror.hpp>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -9,8 +10,6 @@
 #include <map>
 #include <string>
 
-#include "../testing_util.hpp"
-
 MATCHER(IsPrint, "")
 {
     return std::isprint(arg) != 0;
diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/components_tests/esm/variant.cpp
similarity index 100%
rename from apps/openmw_test_suite/esm/variant.cpp
rename to apps/components_tests/esm/variant.cpp
diff --git a/apps/openmw_test_suite/esm3/readerscache.cpp b/apps/components_tests/esm3/readerscache.cpp
similarity index 100%
rename from apps/openmw_test_suite/esm3/readerscache.cpp
rename to apps/components_tests/esm3/readerscache.cpp
diff --git a/apps/components_tests/esm3/testcstringids.cpp b/apps/components_tests/esm3/testcstringids.cpp
new file mode 100644
index 0000000000..239b205965
--- /dev/null
+++ b/apps/components_tests/esm3/testcstringids.cpp
@@ -0,0 +1,57 @@
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loaddial.hpp>
+
+#include <gtest/gtest.h>
+
+namespace ESM
+{
+    namespace
+    {
+        TEST(Esm3CStringIdTest, dialNameShouldBeNullTerminated)
+        {
+            std::unique_ptr<std::istream> stream;
+
+            {
+                auto ostream = std::make_unique<std::stringstream>();
+
+                ESMWriter writer;
+                writer.setFormatVersion(DefaultFormatVersion);
+                writer.save(*ostream);
+
+                Dialogue record;
+                record.blank();
+                record.mStringId = "topic name";
+                record.mId = RefId::stringRefId(record.mStringId);
+                record.mType = Dialogue::Topic;
+                writer.startRecord(Dialogue::sRecordId);
+                record.save(writer);
+                writer.endRecord(Dialogue::sRecordId);
+
+                stream = std::move(ostream);
+            }
+
+            ESMReader reader;
+            reader.open(std::move(stream), "stream");
+            ASSERT_TRUE(reader.hasMoreRecs());
+            ASSERT_EQ(reader.getRecName(), Dialogue::sRecordId);
+            reader.getRecHeader();
+            while (reader.hasMoreSubs())
+            {
+                reader.getSubName();
+                if (reader.retSubName().toInt() == SREC_NAME)
+                {
+                    reader.getSubHeader();
+                    auto size = reader.getSubSize();
+                    std::string buffer(size, '1');
+                    reader.getExact(buffer.data(), size);
+                    ASSERT_EQ(buffer[size - 1], '\0');
+                    return;
+                }
+                else
+                    reader.skipHSub();
+            }
+            ASSERT_FALSE(true);
+        }
+    }
+}
diff --git a/apps/openmw_test_suite/esm3/testesmwriter.cpp b/apps/components_tests/esm3/testesmwriter.cpp
similarity index 99%
rename from apps/openmw_test_suite/esm3/testesmwriter.cpp
rename to apps/components_tests/esm3/testesmwriter.cpp
index 9e9ae9947e..c481684c8d 100644
--- a/apps/openmw_test_suite/esm3/testesmwriter.cpp
+++ b/apps/components_tests/esm3/testesmwriter.cpp
@@ -57,7 +57,7 @@ namespace ESM
 
         // If this test failed probably there is a change in RefId format and CurrentSaveGameFormatVersion should be
         // incremented, current version should be handled.
-        TEST_P(Esm3EsmWriterRefIdSizeTest, writeHRefIdShouldProduceCertainNubmerOfBytes)
+        TEST_P(Esm3EsmWriterRefIdSizeTest, writeHRefIdShouldProduceCertainNumberOfBytes)
         {
             const auto [refId, size] = GetParam();
 
diff --git a/apps/openmw_test_suite/esm3/testinfoorder.cpp b/apps/components_tests/esm3/testinfoorder.cpp
similarity index 100%
rename from apps/openmw_test_suite/esm3/testinfoorder.cpp
rename to apps/components_tests/esm3/testinfoorder.cpp
diff --git a/apps/components_tests/esm3/testsaveload.cpp b/apps/components_tests/esm3/testsaveload.cpp
new file mode 100644
index 0000000000..41a79313cc
--- /dev/null
+++ b/apps/components_tests/esm3/testsaveload.cpp
@@ -0,0 +1,762 @@
+#include <components/esm/fourcc.hpp>
+#include <components/esm3/aipackage.hpp>
+#include <components/esm3/aisequence.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadinfo.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/player.hpp>
+#include <components/esm3/quickkeys.hpp>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <array>
+#include <iterator>
+#include <limits>
+#include <memory>
+#include <numeric>
+#include <random>
+
+namespace ESM
+{
+    namespace
+    {
+        auto tie(const ContItem& value)
+        {
+            return std::tie(value.mCount, value.mItem);
+        }
+
+        auto tie(const ESM::Region::SoundRef& value)
+        {
+            return std::tie(value.mSound, value.mChance);
+        }
+
+        auto tie(const ESM::QuickKeys::QuickKey& value)
+        {
+            return std::tie(value.mType, value.mId);
+        }
+    }
+
+    inline bool operator==(const ESM::ContItem& lhs, const ESM::ContItem& rhs)
+    {
+        return tie(lhs) == tie(rhs);
+    }
+
+    inline std::ostream& operator<<(std::ostream& stream, const ESM::ContItem& value)
+    {
+        return stream << "ESM::ContItem {.mCount = " << value.mCount << ", .mItem = '" << value.mItem << "'}";
+    }
+
+    inline bool operator==(const ESM::Region::SoundRef& lhs, const ESM::Region::SoundRef& rhs)
+    {
+        return tie(lhs) == tie(rhs);
+    }
+
+    inline std::ostream& operator<<(std::ostream& stream, const ESM::Region::SoundRef& value)
+    {
+        return stream << "ESM::Region::SoundRef {.mSound = '" << value.mSound << "', .mChance = " << value.mChance
+                      << "}";
+    }
+
+    inline bool operator==(const ESM::QuickKeys::QuickKey& lhs, const ESM::QuickKeys::QuickKey& rhs)
+    {
+        return tie(lhs) == tie(rhs);
+    }
+
+    inline std::ostream& operator<<(std::ostream& stream, const ESM::QuickKeys::QuickKey& value)
+    {
+        return stream << "ESM::QuickKeys::QuickKey {.mType = '" << static_cast<std::uint32_t>(value.mType)
+                      << "', .mId = " << value.mId << "}";
+    }
+
+    namespace
+    {
+        using namespace ::testing;
+
+        std::vector<ESM::FormatVersion> getFormats()
+        {
+            std::vector<ESM::FormatVersion> result({
+                CurrentContentFormatVersion,
+                MaxLimitedSizeStringsFormatVersion,
+                MaxStringRefIdFormatVersion,
+            });
+            for (ESM::FormatVersion v = result.back() + 1; v <= ESM::CurrentSaveGameFormatVersion; ++v)
+                result.push_back(v);
+            return result;
+        }
+
+        constexpr std::uint32_t fakeRecordId = fourCC("FAKE");
+
+        template <class T>
+        concept HasSave = requires(T v, ESMWriter& w)
+        {
+            v.save(w);
+        };
+
+        template <class T>
+        concept NotHasSave = !HasSave<T>;
+
+        template <HasSave T>
+        auto save(const T& record, ESMWriter& writer)
+        {
+            record.save(writer);
+        }
+
+        void save(const CellRef& record, ESMWriter& writer)
+        {
+            record.save(writer, true);
+        }
+
+        template <NotHasSave T>
+        auto save(const T& record, ESMWriter& writer)
+        {
+            writer.writeComposite(record);
+        }
+
+        template <typename T>
+        std::unique_ptr<std::istream> makeEsmStream(const T& record, FormatVersion formatVersion)
+        {
+            ESMWriter writer;
+            auto stream = std::make_unique<std::stringstream>();
+            writer.setFormatVersion(formatVersion);
+            writer.save(*stream);
+            writer.startRecord(fakeRecordId);
+            save(record, writer);
+            writer.endRecord(fakeRecordId);
+            return stream;
+        }
+
+        template <class T>
+        concept HasLoad = requires(T v, ESMReader& r)
+        {
+            v.load(r);
+        };
+
+        template <class T>
+        concept HasLoadWithDelete = requires(T v, ESMReader& r, bool& d)
+        {
+            v.load(r, d);
+        };
+
+        template <class T>
+        concept NotHasLoad = !HasLoad<T> && !HasLoadWithDelete<T>;
+
+        template <HasLoad T>
+        void load(ESMReader& reader, T& record)
+        {
+            record.load(reader);
+        }
+
+        template <HasLoadWithDelete T>
+        void load(ESMReader& reader, T& record)
+        {
+            bool deleted = false;
+            record.load(reader, deleted);
+        }
+
+        void load(ESMReader& reader, CellRef& record)
+        {
+            bool deleted = false;
+            record.load(reader, deleted, true);
+        }
+
+        template <NotHasLoad T>
+        void load(ESMReader& reader, T& record)
+        {
+            reader.getComposite(record);
+        }
+
+        void load(ESMReader& reader, Land& record)
+        {
+            bool deleted = false;
+            record.load(reader, deleted);
+            if (deleted)
+                return;
+            record.mLandData = std::make_unique<LandRecordData>();
+            reader.restoreContext(record.mContext);
+            loadLandRecordData(record.mDataTypes, reader, *record.mLandData);
+        }
+
+        template <typename T>
+        void saveAndLoadRecord(const T& record, FormatVersion formatVersion, T& result)
+        {
+            ESMReader reader;
+            reader.open(makeEsmStream(record, formatVersion), "stream");
+            ASSERT_TRUE(reader.hasMoreRecs());
+            ASSERT_EQ(reader.getRecName().toInt(), fakeRecordId);
+            reader.getRecHeader();
+            load(reader, result);
+        }
+
+        struct Esm3SaveLoadRecordTest : public TestWithParam<FormatVersion>
+        {
+            std::minstd_rand mRandom;
+            std::uniform_int_distribution<short> mRefIdDistribution{ 'a', 'z' };
+
+            std::string generateRandomString(std::size_t size)
+            {
+                std::string value;
+                while (value.size() < size)
+                    value.push_back(static_cast<char>(mRefIdDistribution(mRandom)));
+                return value;
+            }
+
+            RefId generateRandomRefId(std::size_t size = 33) { return RefId::stringRefId(generateRandomString(size)); }
+
+            template <class T, std::size_t n>
+            void generateArray(T (&dst)[n])
+            {
+                for (auto& v : dst)
+                    v = std::uniform_real_distribution<float>{ -1.0f, 1.0f }(mRandom);
+            }
+
+            void generateBytes(auto iterator, std::size_t count)
+            {
+                std::uniform_int_distribution<unsigned short> distribution{ 0,
+                    std::numeric_limits<unsigned char>::max() };
+                std::generate_n(iterator, count, [&] { return static_cast<unsigned char>(distribution(mRandom)); });
+            }
+
+            void generateStrings(auto iterator, std::size_t count)
+            {
+                std::uniform_int_distribution<std::size_t> distribution{ 1, 13 };
+                std::generate_n(iterator, count, [&] { return generateRandomString(distribution(mRandom)); });
+            }
+        };
+
+        TEST_F(Esm3SaveLoadRecordTest, headerShouldNotChange)
+        {
+            const std::string author = generateRandomString(33);
+            const std::string description = generateRandomString(257);
+
+            auto stream = std::make_unique<std::stringstream>();
+
+            ESMWriter writer;
+            writer.setAuthor(author);
+            writer.setDescription(description);
+            writer.setFormatVersion(CurrentSaveGameFormatVersion);
+            writer.save(*stream);
+            writer.close();
+
+            ESMReader reader;
+            reader.open(std::move(stream), "stream");
+            EXPECT_EQ(reader.getAuthor(), author);
+            EXPECT_EQ(reader.getDesc(), description);
+        }
+
+        TEST_F(Esm3SaveLoadRecordTest, containerContItemShouldSupportRefIdLongerThan32)
+        {
+            Container record;
+            record.blank();
+            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 42, .mItem = generateRandomRefId(33) });
+            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 13, .mItem = generateRandomRefId(33) });
+            Container result;
+            saveAndLoadRecord(record, CurrentSaveGameFormatVersion, result);
+            EXPECT_EQ(result.mInventory.mList, record.mInventory.mList);
+        }
+
+        TEST_F(Esm3SaveLoadRecordTest, regionSoundRefShouldSupportRefIdLongerThan32)
+        {
+            Region record;
+            record.blank();
+            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(33), .mChance = 42 });
+            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(33), .mChance = 13 });
+            Region result;
+            saveAndLoadRecord(record, CurrentSaveGameFormatVersion, result);
+            EXPECT_EQ(result.mSoundList, record.mSoundList);
+        }
+
+        TEST_F(Esm3SaveLoadRecordTest, scriptSoundRefShouldSupportRefIdLongerThan32)
+        {
+            Script record;
+            record.blank();
+            record.mId = generateRandomRefId(33);
+            record.mNumShorts = 42;
+            Script result;
+            saveAndLoadRecord(record, CurrentSaveGameFormatVersion, result);
+            EXPECT_EQ(result.mId, record.mId);
+            EXPECT_EQ(result.mNumShorts, record.mNumShorts);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, playerShouldNotChange)
+        {
+            // Player state is not saved to vanilla ESM format.
+            if (GetParam() == CurrentContentFormatVersion)
+                return;
+            std::minstd_rand random;
+            Player record{};
+            record.mObject.blank();
+            record.mBirthsign = generateRandomRefId();
+            record.mObject.mRef.mRefID = generateRandomRefId();
+            std::generate_n(std::inserter(record.mPreviousItems, record.mPreviousItems.end()), 2,
+                [&] { return std::make_pair(generateRandomRefId(), generateRandomRefId()); });
+            record.mCellId = ESM::RefId::esm3ExteriorCell(0, 0);
+            generateArray(record.mLastKnownExteriorPosition);
+            record.mHasMark = true;
+            record.mMarkedCell = ESM::RefId::esm3ExteriorCell(0, 0);
+            generateArray(record.mMarkedPosition.pos);
+            generateArray(record.mMarkedPosition.rot);
+            record.mCurrentCrimeId = 42;
+            record.mPaidCrimeId = 13;
+            Player result;
+            saveAndLoadRecord(record, GetParam(), result);
+            EXPECT_EQ(record.mObject.mRef.mRefID, result.mObject.mRef.mRefID);
+            EXPECT_EQ(record.mBirthsign, result.mBirthsign);
+            EXPECT_EQ(record.mPreviousItems, result.mPreviousItems);
+            EXPECT_EQ(record.mPreviousItems, result.mPreviousItems);
+            EXPECT_EQ(record.mCellId, result.mCellId);
+            EXPECT_THAT(record.mLastKnownExteriorPosition, ElementsAreArray(result.mLastKnownExteriorPosition));
+            EXPECT_EQ(record.mHasMark, result.mHasMark);
+            EXPECT_EQ(record.mMarkedCell, result.mMarkedCell);
+            EXPECT_THAT(record.mMarkedPosition.pos, ElementsAreArray(result.mMarkedPosition.pos));
+            EXPECT_THAT(record.mMarkedPosition.rot, ElementsAreArray(result.mMarkedPosition.rot));
+            EXPECT_EQ(record.mCurrentCrimeId, result.mCurrentCrimeId);
+            EXPECT_EQ(record.mPaidCrimeId, result.mPaidCrimeId);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, cellRefShouldNotChange)
+        {
+            CellRef record;
+            record.blank();
+            record.mRefNum.mIndex = std::numeric_limits<unsigned>::max();
+            record.mRefNum.mContentFile = std::numeric_limits<int>::max();
+            record.mRefID = generateRandomRefId();
+            record.mScale = 2;
+            record.mOwner = generateRandomRefId();
+            record.mGlobalVariable = generateRandomString(100);
+            record.mSoul = generateRandomRefId();
+            record.mFaction = generateRandomRefId();
+            record.mFactionRank = std::numeric_limits<int>::max();
+            record.mChargeInt = std::numeric_limits<int>::max();
+            record.mEnchantmentCharge = std::numeric_limits<float>::max();
+            record.mCount = std::numeric_limits<int>::max();
+            record.mTeleport = true;
+            generateArray(record.mDoorDest.pos);
+            generateArray(record.mDoorDest.rot);
+            record.mDestCell = generateRandomString(100);
+            record.mLockLevel = 0;
+            record.mIsLocked = true;
+            record.mKey = generateRandomRefId();
+            record.mTrap = generateRandomRefId();
+            record.mReferenceBlocked = std::numeric_limits<signed char>::max();
+            generateArray(record.mPos.pos);
+            generateArray(record.mPos.rot);
+            CellRef result;
+            saveAndLoadRecord(record, GetParam(), result);
+            EXPECT_EQ(record.mRefNum.mIndex, result.mRefNum.mIndex);
+            EXPECT_EQ(record.mRefNum.mContentFile, result.mRefNum.mContentFile);
+            EXPECT_EQ(record.mRefID, result.mRefID);
+            EXPECT_EQ(record.mScale, result.mScale);
+            EXPECT_EQ(record.mOwner, result.mOwner);
+            EXPECT_EQ(record.mGlobalVariable, result.mGlobalVariable);
+            EXPECT_EQ(record.mSoul, result.mSoul);
+            EXPECT_EQ(record.mFaction, result.mFaction);
+            EXPECT_EQ(record.mFactionRank, result.mFactionRank);
+            EXPECT_EQ(record.mChargeInt, result.mChargeInt);
+            EXPECT_EQ(record.mEnchantmentCharge, result.mEnchantmentCharge);
+            EXPECT_EQ(record.mCount, result.mCount);
+            EXPECT_EQ(record.mTeleport, result.mTeleport);
+            EXPECT_EQ(record.mDoorDest, result.mDoorDest);
+            EXPECT_EQ(record.mDestCell, result.mDestCell);
+            EXPECT_EQ(record.mLockLevel, result.mLockLevel);
+            EXPECT_EQ(record.mIsLocked, result.mIsLocked);
+            EXPECT_EQ(record.mKey, result.mKey);
+            EXPECT_EQ(record.mTrap, result.mTrap);
+            EXPECT_EQ(record.mReferenceBlocked, result.mReferenceBlocked);
+            EXPECT_EQ(record.mPos, result.mPos);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, creatureStatsShouldNotChange)
+        {
+            CreatureStats record;
+            record.blank();
+            record.mLastHitAttemptObject = generateRandomRefId();
+            record.mLastHitObject = generateRandomRefId();
+            CreatureStats result;
+            saveAndLoadRecord(record, GetParam(), result);
+            EXPECT_EQ(record.mLastHitAttemptObject, result.mLastHitAttemptObject);
+            EXPECT_EQ(record.mLastHitObject, result.mLastHitObject);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, containerShouldNotChange)
+        {
+            Container record;
+            record.blank();
+            record.mId = generateRandomRefId();
+            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 42, .mItem = generateRandomRefId(32) });
+            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 13, .mItem = generateRandomRefId(32) });
+            Container result;
+            saveAndLoadRecord(record, GetParam(), result);
+            EXPECT_EQ(result.mId, record.mId);
+            EXPECT_EQ(result.mInventory.mList, record.mInventory.mList);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, regionShouldNotChange)
+        {
+            Region record;
+            record.blank();
+            record.mId = generateRandomRefId();
+            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(32), .mChance = 42 });
+            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(32), .mChance = 13 });
+            Region result;
+            saveAndLoadRecord(record, GetParam(), result);
+            EXPECT_EQ(result.mId, record.mId);
+            EXPECT_EQ(result.mSoundList, record.mSoundList);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, scriptShouldNotChange)
+        {
+            Script record;
+            record.blank();
+            record.mId = generateRandomRefId(32);
+            record.mNumShorts = 3;
+            record.mNumFloats = 4;
+            record.mNumLongs = 5;
+            generateStrings(
+                std::back_inserter(record.mVarNames), record.mNumShorts + record.mNumFloats + record.mNumLongs);
+            generateBytes(std::back_inserter(record.mScriptData), 13);
+            record.mScriptText = generateRandomString(17);
+
+            Script result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mId, record.mId);
+            EXPECT_EQ(result.mNumShorts, record.mNumShorts);
+            EXPECT_EQ(result.mNumFloats, record.mNumFloats);
+            EXPECT_EQ(result.mNumShorts, record.mNumShorts);
+            EXPECT_EQ(result.mVarNames, record.mVarNames);
+            EXPECT_EQ(result.mScriptData, record.mScriptData);
+            EXPECT_EQ(result.mScriptText, record.mScriptText);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, quickKeysShouldNotChange)
+        {
+            const QuickKeys record {
+                .mKeys = {
+                    {
+                        .mType = QuickKeys::Type::Magic,
+                        .mId = generateRandomRefId(32),
+                    },
+                    {
+                        .mType = QuickKeys::Type::MagicItem,
+                        .mId = generateRandomRefId(32),
+                    },
+                },
+            };
+            QuickKeys result;
+            saveAndLoadRecord(record, GetParam(), result);
+            EXPECT_EQ(result.mKeys, record.mKeys);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, dialogueShouldNotChange)
+        {
+            Dialogue record;
+            record.blank();
+            record.mStringId = generateRandomString(32);
+            record.mId = ESM::RefId::stringRefId(record.mStringId);
+            Dialogue result;
+            saveAndLoadRecord(record, GetParam(), result);
+            EXPECT_EQ(result.mId, record.mId);
+            EXPECT_EQ(result.mStringId, record.mStringId);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, aiSequenceAiWanderShouldNotChange)
+        {
+            AiSequence::AiWander record;
+            record.mData.mDistance = 1;
+            record.mData.mDuration = 2;
+            record.mData.mTimeOfDay = 3;
+            constexpr std::uint8_t idle[8] = { 4, 5, 6, 7, 8, 9, 10, 11 };
+            static_assert(std::size(idle) == std::size(record.mData.mIdle));
+            std::copy(std::begin(idle), std::end(idle), record.mData.mIdle);
+            record.mData.mShouldRepeat = 12;
+            record.mDurationData.mRemainingDuration = 13;
+            record.mStoredInitialActorPosition = true;
+            constexpr float initialActorPosition[3] = { 15, 16, 17 };
+            static_assert(std::size(initialActorPosition) == std::size(record.mInitialActorPosition.mValues));
+            std::copy(
+                std::begin(initialActorPosition), std::end(initialActorPosition), record.mInitialActorPosition.mValues);
+
+            AiSequence::AiWander result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mData.mDistance, record.mData.mDistance);
+            EXPECT_EQ(result.mData.mDuration, record.mData.mDuration);
+            EXPECT_EQ(result.mData.mTimeOfDay, record.mData.mTimeOfDay);
+            EXPECT_THAT(result.mData.mIdle, ElementsAreArray(record.mData.mIdle));
+            EXPECT_EQ(result.mData.mShouldRepeat, record.mData.mShouldRepeat);
+            EXPECT_EQ(result.mDurationData.mRemainingDuration, record.mDurationData.mRemainingDuration);
+            EXPECT_EQ(result.mStoredInitialActorPosition, record.mStoredInitialActorPosition);
+            EXPECT_THAT(result.mInitialActorPosition.mValues, ElementsAreArray(record.mInitialActorPosition.mValues));
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, aiSequenceAiTravelShouldNotChange)
+        {
+            AiSequence::AiTravel record;
+            record.mData.mX = 1;
+            record.mData.mY = 2;
+            record.mData.mZ = 3;
+            record.mHidden = true;
+            record.mRepeat = true;
+
+            AiSequence::AiTravel result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mData.mX, record.mData.mX);
+            EXPECT_EQ(result.mData.mY, record.mData.mY);
+            EXPECT_EQ(result.mData.mZ, record.mData.mZ);
+            EXPECT_EQ(result.mHidden, record.mHidden);
+            EXPECT_EQ(result.mRepeat, record.mRepeat);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, aiSequenceAiEscortShouldNotChange)
+        {
+            AiSequence::AiEscort record;
+            record.mData.mX = 1;
+            record.mData.mY = 2;
+            record.mData.mZ = 3;
+            record.mData.mDuration = 4;
+            record.mTargetActorId = 5;
+            record.mTargetId = generateRandomRefId(32);
+            record.mCellId = generateRandomString(257);
+            record.mRemainingDuration = 6;
+            record.mRepeat = true;
+
+            AiSequence::AiEscort result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mData.mX, record.mData.mX);
+            EXPECT_EQ(result.mData.mY, record.mData.mY);
+            EXPECT_EQ(result.mData.mZ, record.mData.mZ);
+            if (GetParam() <= MaxOldAiPackageFormatVersion)
+                EXPECT_EQ(result.mData.mDuration, record.mRemainingDuration);
+            else
+                EXPECT_EQ(result.mData.mDuration, record.mData.mDuration);
+            EXPECT_EQ(result.mTargetActorId, record.mTargetActorId);
+            EXPECT_EQ(result.mTargetId, record.mTargetId);
+            EXPECT_EQ(result.mCellId, record.mCellId);
+            EXPECT_EQ(result.mRemainingDuration, record.mRemainingDuration);
+            EXPECT_EQ(result.mRepeat, record.mRepeat);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, aiDataShouldNotChange)
+        {
+            AIData record = {
+                .mHello = 1,
+                .mFight = 2,
+                .mFlee = 3,
+                .mAlarm = 4,
+                .mServices = 5,
+            };
+
+            AIData result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mHello, record.mHello);
+            EXPECT_EQ(result.mFight, record.mFight);
+            EXPECT_EQ(result.mFlee, record.mFlee);
+            EXPECT_EQ(result.mAlarm, record.mAlarm);
+            EXPECT_EQ(result.mServices, record.mServices);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, enamShouldNotChange)
+        {
+            EffectList record;
+            record.mList.emplace_back(IndexedENAMstruct{ {
+                                                             .mEffectID = 1,
+                                                             .mSkill = 2,
+                                                             .mAttribute = 3,
+                                                             .mRange = 4,
+                                                             .mArea = 5,
+                                                             .mDuration = 6,
+                                                             .mMagnMin = 7,
+                                                             .mMagnMax = 8,
+                                                         },
+                0 });
+
+            EffectList result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mList.size(), record.mList.size());
+            EXPECT_EQ(result.mList[0].mData.mEffectID, record.mList[0].mData.mEffectID);
+            EXPECT_EQ(result.mList[0].mData.mSkill, record.mList[0].mData.mSkill);
+            EXPECT_EQ(result.mList[0].mData.mAttribute, record.mList[0].mData.mAttribute);
+            EXPECT_EQ(result.mList[0].mData.mRange, record.mList[0].mData.mRange);
+            EXPECT_EQ(result.mList[0].mData.mArea, record.mList[0].mData.mArea);
+            EXPECT_EQ(result.mList[0].mData.mDuration, record.mList[0].mData.mDuration);
+            EXPECT_EQ(result.mList[0].mData.mMagnMin, record.mList[0].mData.mMagnMin);
+            EXPECT_EQ(result.mList[0].mData.mMagnMax, record.mList[0].mData.mMagnMax);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, weaponShouldNotChange)
+        {
+            Weapon record = {
+                .mData = {
+                    .mWeight = 0,
+                    .mValue = 1,
+                    .mType = 2,
+                    .mHealth = 3,
+                    .mSpeed = 4,
+                    .mReach = 5,
+                    .mEnchant = 6,
+                    .mChop = { 7, 8 },
+                    .mSlash = { 9, 10 },
+                    .mThrust = { 11, 12 },
+                    .mFlags = 13,
+                },
+                .mRecordFlags = 0,
+                .mId = generateRandomRefId(32),
+                .mEnchant = generateRandomRefId(32),
+                .mScript = generateRandomRefId(32),
+                .mName = generateRandomString(32),
+                .mModel = generateRandomString(32),
+                .mIcon = generateRandomString(32),
+            };
+
+            Weapon result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mData.mWeight, record.mData.mWeight);
+            EXPECT_EQ(result.mData.mValue, record.mData.mValue);
+            EXPECT_EQ(result.mData.mType, record.mData.mType);
+            EXPECT_EQ(result.mData.mHealth, record.mData.mHealth);
+            EXPECT_EQ(result.mData.mSpeed, record.mData.mSpeed);
+            EXPECT_EQ(result.mData.mReach, record.mData.mReach);
+            EXPECT_EQ(result.mData.mEnchant, record.mData.mEnchant);
+            EXPECT_EQ(result.mData.mChop, record.mData.mChop);
+            EXPECT_EQ(result.mData.mSlash, record.mData.mSlash);
+            EXPECT_EQ(result.mData.mThrust, record.mData.mThrust);
+            EXPECT_EQ(result.mData.mFlags, record.mData.mFlags);
+            EXPECT_EQ(result.mId, record.mId);
+            EXPECT_EQ(result.mEnchant, record.mEnchant);
+            EXPECT_EQ(result.mScript, record.mScript);
+            EXPECT_EQ(result.mName, record.mName);
+            EXPECT_EQ(result.mModel, record.mModel);
+            EXPECT_EQ(result.mIcon, record.mIcon);
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, infoShouldNotChange)
+        {
+            DialInfo record = {
+                .mData = {
+                    .mType = ESM::Dialogue::Topic,
+                    .mDisposition = 1,
+                    .mRank = 2,
+                    .mGender = ESM::DialInfo::NA,
+                    .mPCrank = 3,
+                },
+                .mSelects = {
+                    ESM::DialogueCondition{
+                        .mVariable = {},
+                        .mValue = 42,
+                        .mIndex = 0,
+                        .mFunction = ESM::DialogueCondition::Function_Level,
+                        .mComparison = ESM::DialogueCondition::Comp_Eq
+                    },
+                    ESM::DialogueCondition{
+                        .mVariable = generateRandomString(32),
+                        .mValue = 0,
+                        .mIndex = 1,
+                        .mFunction = ESM::DialogueCondition::Function_NotLocal,
+                        .mComparison = ESM::DialogueCondition::Comp_Eq
+                    },
+                },
+                .mId = generateRandomRefId(32),
+                .mPrev = generateRandomRefId(32),
+                .mNext = generateRandomRefId(32),
+                .mActor = generateRandomRefId(32),
+                .mRace = generateRandomRefId(32),
+                .mClass = generateRandomRefId(32),
+                .mFaction = generateRandomRefId(32),
+                .mPcFaction = generateRandomRefId(32),
+                .mCell = generateRandomRefId(32),
+                .mSound = generateRandomString(32),
+                .mResponse = generateRandomString(32),
+                .mResultScript = generateRandomString(32),
+                .mFactionLess = false,
+                .mQuestStatus = ESM::DialInfo::QS_None,
+            };
+
+            DialInfo result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mData.mType, record.mData.mType);
+            EXPECT_EQ(result.mData.mDisposition, record.mData.mDisposition);
+            EXPECT_EQ(result.mData.mRank, record.mData.mRank);
+            EXPECT_EQ(result.mData.mGender, record.mData.mGender);
+            EXPECT_EQ(result.mData.mPCrank, record.mData.mPCrank);
+            EXPECT_EQ(result.mId, record.mId);
+            EXPECT_EQ(result.mPrev, record.mPrev);
+            EXPECT_EQ(result.mNext, record.mNext);
+            EXPECT_EQ(result.mActor, record.mActor);
+            EXPECT_EQ(result.mRace, record.mRace);
+            EXPECT_EQ(result.mClass, record.mClass);
+            EXPECT_EQ(result.mFaction, record.mFaction);
+            EXPECT_EQ(result.mPcFaction, record.mPcFaction);
+            EXPECT_EQ(result.mCell, record.mCell);
+            EXPECT_EQ(result.mSound, record.mSound);
+            EXPECT_EQ(result.mResponse, record.mResponse);
+            EXPECT_EQ(result.mResultScript, record.mResultScript);
+            EXPECT_EQ(result.mFactionLess, record.mFactionLess);
+            EXPECT_EQ(result.mQuestStatus, record.mQuestStatus);
+            EXPECT_EQ(result.mSelects.size(), record.mSelects.size());
+            for (size_t i = 0; i < result.mSelects.size(); ++i)
+            {
+                const auto& resultS = result.mSelects[i];
+                const auto& recordS = record.mSelects[i];
+                EXPECT_EQ(resultS.mVariable, recordS.mVariable);
+                EXPECT_EQ(resultS.mValue, recordS.mValue);
+                EXPECT_EQ(resultS.mIndex, recordS.mIndex);
+                EXPECT_EQ(resultS.mFunction, recordS.mFunction);
+                EXPECT_EQ(resultS.mComparison, recordS.mComparison);
+            }
+        }
+
+        TEST_P(Esm3SaveLoadRecordTest, landShouldNotChange)
+        {
+            LandRecordData data;
+            std::iota(data.mHeights.begin(), data.mHeights.end(), 1);
+            std::for_each(data.mHeights.begin(), data.mHeights.end(), [](float& v) { v *= Land::sHeightScale; });
+            data.mMinHeight = *std::min_element(data.mHeights.begin(), data.mHeights.end());
+            data.mMaxHeight = *std::max_element(data.mHeights.begin(), data.mHeights.end());
+            std::iota(data.mNormals.begin(), data.mNormals.end(), 2);
+            std::iota(data.mTextures.begin(), data.mTextures.end(), 3);
+            std::iota(data.mColours.begin(), data.mColours.end(), 4);
+            data.mDataLoaded = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_VCLR | Land::DATA_VTEX;
+
+            Land record;
+            record.mFlags = Land::Flag_HeightsNormals | Land::Flag_Colors | Land::Flag_Textures;
+            record.mX = 2;
+            record.mY = 3;
+            record.mDataTypes = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_WNAM | Land::DATA_VCLR | Land::DATA_VTEX;
+            generateWnam(data.mHeights, record.mWnam);
+            record.mLandData = std::make_unique<LandRecordData>(data);
+
+            Land result;
+            saveAndLoadRecord(record, GetParam(), result);
+
+            EXPECT_EQ(result.mFlags, record.mFlags);
+            EXPECT_EQ(result.mX, record.mX);
+            EXPECT_EQ(result.mY, record.mY);
+            EXPECT_EQ(result.mDataTypes, record.mDataTypes);
+            EXPECT_EQ(result.mWnam, record.mWnam);
+            EXPECT_EQ(result.mLandData->mHeights, record.mLandData->mHeights);
+            EXPECT_EQ(result.mLandData->mMinHeight, record.mLandData->mMinHeight);
+            EXPECT_EQ(result.mLandData->mMaxHeight, record.mLandData->mMaxHeight);
+            EXPECT_EQ(result.mLandData->mNormals, record.mLandData->mNormals);
+            EXPECT_EQ(result.mLandData->mTextures, record.mLandData->mTextures);
+            EXPECT_EQ(result.mLandData->mColours, record.mLandData->mColours);
+            EXPECT_EQ(result.mLandData->mDataLoaded, record.mLandData->mDataLoaded);
+        }
+
+        INSTANTIATE_TEST_SUITE_P(FormatVersions, Esm3SaveLoadRecordTest, ValuesIn(getFormats()));
+    }
+}
diff --git a/apps/openmw_test_suite/esm4/includes.cpp b/apps/components_tests/esm4/includes.cpp
similarity index 100%
rename from apps/openmw_test_suite/esm4/includes.cpp
rename to apps/components_tests/esm4/includes.cpp
diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/components_tests/esmloader/esmdata.cpp
similarity index 100%
rename from apps/openmw_test_suite/esmloader/esmdata.cpp
rename to apps/components_tests/esmloader/esmdata.cpp
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/components_tests/esmloader/load.cpp
similarity index 100%
rename from apps/openmw_test_suite/esmloader/load.cpp
rename to apps/components_tests/esmloader/load.cpp
diff --git a/apps/openmw_test_suite/esmloader/record.cpp b/apps/components_tests/esmloader/record.cpp
similarity index 100%
rename from apps/openmw_test_suite/esmloader/record.cpp
rename to apps/components_tests/esmloader/record.cpp
diff --git a/apps/openmw_test_suite/esmterrain/testgridsampling.cpp b/apps/components_tests/esmterrain/testgridsampling.cpp
similarity index 100%
rename from apps/openmw_test_suite/esmterrain/testgridsampling.cpp
rename to apps/components_tests/esmterrain/testgridsampling.cpp
diff --git a/apps/openmw_test_suite/files/conversion_tests.cpp b/apps/components_tests/files/conversion_tests.cpp
similarity index 100%
rename from apps/openmw_test_suite/files/conversion_tests.cpp
rename to apps/components_tests/files/conversion_tests.cpp
diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/components_tests/files/hash.cpp
similarity index 84%
rename from apps/openmw_test_suite/files/hash.cpp
rename to apps/components_tests/files/hash.cpp
index 6ad19713dc..793965112b 100644
--- a/apps/openmw_test_suite/files/hash.cpp
+++ b/apps/components_tests/files/hash.cpp
@@ -1,5 +1,7 @@
 #include <components/files/constrainedfilestream.hpp>
+#include <components/files/conversion.hpp>
 #include <components/files/hash.hpp>
+#include <components/testing/util.hpp>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -10,8 +12,6 @@
 #include <sstream>
 #include <string>
 
-#include "../testing_util.hpp"
-
 namespace
 {
     using namespace testing;
@@ -35,7 +35,8 @@ namespace
         std::fill_n(std::back_inserter(content), 1, 'a');
         std::istringstream stream(content);
         stream.exceptions(std::ios::failbit | std::ios::badbit);
-        EXPECT_THAT(getHash(fileName, stream), ElementsAre(9607679276477937801ull, 16624257681780017498ull));
+        EXPECT_THAT(getHash(Files::pathToUnicodeString(fileName), stream),
+            ElementsAre(9607679276477937801ull, 16624257681780017498ull));
     }
 
     TEST_P(FilesGetHash, shouldReturnHashForStringStream)
@@ -44,7 +45,7 @@ namespace
         std::string content;
         std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
         std::istringstream stream(content);
-        EXPECT_EQ(getHash(fileName, stream), GetParam().mHash);
+        EXPECT_EQ(getHash(Files::pathToUnicodeString(fileName), stream), GetParam().mHash);
     }
 
     TEST_P(FilesGetHash, shouldReturnHashForConstrainedFileStream)
@@ -57,7 +58,7 @@ namespace
         std::fstream(file, std::ios_base::out | std::ios_base::binary)
             .write(content.data(), static_cast<std::streamsize>(content.size()));
         const auto stream = Files::openConstrainedFileStream(file, 0, content.size());
-        EXPECT_EQ(getHash(file, *stream), GetParam().mHash);
+        EXPECT_EQ(getHash(Files::pathToUnicodeString(file), *stream), GetParam().mHash);
     }
 
     INSTANTIATE_TEST_SUITE_P(Params, FilesGetHash,
diff --git a/apps/openmw_test_suite/fx/lexer.cpp b/apps/components_tests/fx/lexer.cpp
similarity index 100%
rename from apps/openmw_test_suite/fx/lexer.cpp
rename to apps/components_tests/fx/lexer.cpp
diff --git a/apps/openmw_test_suite/fx/technique.cpp b/apps/components_tests/fx/technique.cpp
similarity index 81%
rename from apps/openmw_test_suite/fx/technique.cpp
rename to apps/components_tests/fx/technique.cpp
index e59cca43cf..ad57074b18 100644
--- a/apps/openmw_test_suite/fx/technique.cpp
+++ b/apps/components_tests/fx/technique.cpp
@@ -1,17 +1,17 @@
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <components/files/configurationmanager.hpp>
 #include <components/fx/technique.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/settings/settings.hpp>
-
-#include "../testing_util.hpp"
+#include <components/testing/util.hpp>
 
 namespace
 {
+    constexpr VFS::Path::NormalizedView techniquePropertiesPath("shaders/technique_properties.omwfx");
 
-    TestingOpenMW::VFSTestFile technique_properties(R"(
+    TestingOpenMW::VFSTestFile techniqueProperties(R"(
     fragment main {}
     vertex main {}
     technique {
@@ -27,7 +27,9 @@ namespace
     }
 )");
 
-    TestingOpenMW::VFSTestFile rendertarget_properties{ R"(
+    constexpr VFS::Path::NormalizedView rendertargetPropertiesPath("shaders/rendertarget_properties.omwfx");
+
+    TestingOpenMW::VFSTestFile rendertargetProperties{ R"(
     render_target rendertarget {
         width_ratio = 0.5;
         height_ratio = 0.5;
@@ -53,7 +55,9 @@ namespace
     technique { passes = downsample2x, main; }
 )" };
 
-    TestingOpenMW::VFSTestFile uniform_properties{ R"(
+    constexpr VFS::Path::NormalizedView uniformPropertiesPath("shaders/uniform_properties.omwfx");
+
+    TestingOpenMW::VFSTestFile uniformProperties{ R"(
     uniform_vec4 uVec4 {
         default = vec4(0,0,0,0);
         min = vec4(0,1,0,0);
@@ -67,13 +71,17 @@ namespace
     technique { passes = main; }
 )" };
 
-    TestingOpenMW::VFSTestFile missing_sampler_source{ R"(
+    constexpr VFS::Path::NormalizedView missingSamplerSourcePath("shaders/missing_sampler_source.omwfx");
+
+    TestingOpenMW::VFSTestFile missingSamplerSource{ R"(
     sampler_1d mysampler1d { }
     fragment main { }
     technique { passes = main; }
 )" };
 
-    TestingOpenMW::VFSTestFile repeated_shared_block{ R"(
+    constexpr VFS::Path::NormalizedView repeatedSharedBlockPath("shaders/repeated_shared_block.omwfx");
+
+    TestingOpenMW::VFSTestFile repeatedSharedBlock{ R"(
     shared {
         float myfloat = 1.0;
     }
@@ -93,13 +101,13 @@ namespace
 
         TechniqueTest()
             : mVFS(TestingOpenMW::createTestVFS({
-                { "shaders/technique_properties.omwfx", &technique_properties },
-                { "shaders/rendertarget_properties.omwfx", &rendertarget_properties },
-                { "shaders/uniform_properties.omwfx", &uniform_properties },
-                { "shaders/missing_sampler_source.omwfx", &missing_sampler_source },
-                { "shaders/repeated_shared_block.omwfx", &repeated_shared_block },
+                { techniquePropertiesPath, &techniqueProperties },
+                { rendertargetPropertiesPath, &rendertargetProperties },
+                { uniformPropertiesPath, &uniformProperties },
+                { missingSamplerSourcePath, &missingSamplerSource },
+                { repeatedSharedBlockPath, &repeatedSharedBlock },
             }))
-            , mImageManager(mVFS.get())
+            , mImageManager(mVFS.get(), 0)
         {
         }
 
diff --git a/apps/components_tests/lua/test_async.cpp b/apps/components_tests/lua/test_async.cpp
new file mode 100644
index 0000000000..46120ad88a
--- /dev/null
+++ b/apps/components_tests/lua/test_async.cpp
@@ -0,0 +1,57 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <components/lua/asyncpackage.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/testing/expecterror.hpp>
+
+namespace
+{
+    using namespace testing;
+
+    struct LuaCoroutineCallbackTest : Test
+    {
+        void SetUp() override
+        {
+            mLua.protectedCall([&](LuaUtil::LuaView& view) {
+                sol::table hiddenData(view.sol(), sol::create);
+                hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{};
+                view.sol()["async"] = LuaUtil::getAsyncPackageInitializer(
+                    view.sol(), []() { return 0.; }, []() { return 0.; })(hiddenData);
+                view.sol()["pass"] = [&](const sol::table& t) { mCb = LuaUtil::Callback::fromLua(t); };
+            });
+        }
+
+        LuaUtil::LuaState mLua{ nullptr, nullptr };
+        LuaUtil::Callback mCb;
+    };
+
+    TEST_F(LuaCoroutineCallbackTest, CoroutineCallbacks)
+    {
+        internal::CaptureStdout();
+        mLua.protectedCall([&](LuaUtil::LuaView& view) {
+            view.sol().safe_script(R"X(
+                local s = 'test'
+                coroutine.wrap(function()
+                    pass(async:callback(function(v) print(s) end))
+                end)()
+            )X");
+            view.sol().collect_garbage();
+            mCb.call();
+        });
+        EXPECT_THAT(internal::GetCapturedStdout(), "test\n");
+    }
+
+    TEST_F(LuaCoroutineCallbackTest, ErrorInCoroutineCallbacks)
+    {
+        mLua.protectedCall([&](LuaUtil::LuaView& view) {
+            view.sol().safe_script(R"X(
+                coroutine.wrap(function()
+                    pass(async:callback(function() error('COROUTINE CALLBACK') end))
+                end)()
+            )X");
+            view.sol().collect_garbage();
+        });
+        EXPECT_ERROR(mCb.call(), "COROUTINE CALLBACK");
+    }
+}
diff --git a/apps/openmw_test_suite/lua/test_configuration.cpp b/apps/components_tests/lua/test_configuration.cpp
similarity index 94%
rename from apps/openmw_test_suite/lua/test_configuration.cpp
rename to apps/components_tests/lua/test_configuration.cpp
index 49fc93a3d8..2cde0309d6 100644
--- a/apps/openmw_test_suite/lua/test_configuration.cpp
+++ b/apps/components_tests/lua/test_configuration.cpp
@@ -1,4 +1,4 @@
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <fstream>
@@ -9,8 +9,8 @@
 #include <components/esm3/readerscache.hpp>
 #include <components/lua/configuration.hpp>
 #include <components/lua/serialization.hpp>
-
-#include "../testing_util.hpp"
+#include <components/testing/expecterror.hpp>
+#include <components/testing/util.hpp>
 
 namespace
 {
@@ -44,7 +44,7 @@ namespace
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[1]), "PLAYER : my_mod/player.lua");
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[2]), "CUSTOM : my_mod/some_other_script.lua");
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[3]), "PLAYER NPC CREATURE : my_mod/some_other_script.lua");
-        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[4]), ": my_mod/player.LUA");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[4]), ": my_mod/player.lua");
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[5]), "CUSTOM CREATURE : my_mod/creature.lua");
 
         LuaUtil::ScriptsConfiguration conf;
@@ -54,7 +54,7 @@ namespace
         // cfg.mScripts[1] is overridden by cfg.mScripts[4]
         // cfg.mScripts[2] is overridden by cfg.mScripts[3]
         EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "PLAYER NPC CREATURE : my_mod/some_other_script.lua");
-        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[2]), ": my_mod/player.LUA");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[2]), ": my_mod/player.lua");
         EXPECT_EQ(LuaUtil::scriptCfgToString(conf[3]), "CUSTOM CREATURE : my_mod/creature.lua");
 
         EXPECT_THAT(asVector(conf.getGlobalConf()), ElementsAre(Pair(0, "")));
@@ -89,7 +89,7 @@ namespace
     {
         ESM::LuaScriptsCfg cfg;
         ESM::LuaScriptCfg& script1 = cfg.mScripts.emplace_back();
-        script1.mScriptPath = "Script1.lua";
+        script1.mScriptPath = VFS::Path::Normalized("Script1.lua");
         script1.mInitializationData = "data1";
         script1.mFlags = ESM::LuaScriptCfg::sPlayer;
         script1.mTypes.push_back(ESM::REC_CREA);
@@ -98,12 +98,12 @@ namespace
         script1.mRefs.push_back({ true, 2, 4, "" });
 
         ESM::LuaScriptCfg& script2 = cfg.mScripts.emplace_back();
-        script2.mScriptPath = "Script2.lua";
+        script2.mScriptPath = VFS::Path::Normalized("Script2.lua");
         script2.mFlags = ESM::LuaScriptCfg::sCustom;
         script2.mTypes.push_back(ESM::REC_CONT);
 
         ESM::LuaScriptCfg& script1Extra = cfg.mScripts.emplace_back();
-        script1Extra.mScriptPath = "script1.LUA";
+        script1Extra.mScriptPath = VFS::Path::Normalized("script1.LUA");
         script1Extra.mFlags = ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sMerge;
         script1Extra.mTypes.push_back(ESM::REC_NPC_);
         script1Extra.mRecords.push_back({ false, ESM::RefId::stringRefId("rat"), "" });
@@ -115,8 +115,8 @@ namespace
         conf.init(cfg);
         ASSERT_EQ(conf.size(), 2);
         EXPECT_EQ(LuaUtil::scriptCfgToString(conf[0]),
-            "CUSTOM PLAYER CREATURE NPC : Script1.lua ; data 5 bytes ; 3 records ; 4 objects");
-        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "CUSTOM CONTAINER : Script2.lua");
+            "CUSTOM PLAYER CREATURE NPC : script1.lua ; data 5 bytes ; 3 records ; 4 objects");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "CUSTOM CONTAINER : script2.lua");
 
         EXPECT_THAT(asVector(conf.getPlayerConf()), ElementsAre(Pair(0, "data1")));
         EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, ESM::RefId::stringRefId("something"), ESM::RefNum())),
@@ -139,7 +139,7 @@ namespace
             ElementsAre(Pair(0, "data1"), Pair(1, "")));
 
         ESM::LuaScriptCfg& script3 = cfg.mScripts.emplace_back();
-        script3.mScriptPath = "script1.lua";
+        script3.mScriptPath = VFS::Path::Normalized("script1.lua");
         script3.mFlags = ESM::LuaScriptCfg::sGlobal;
         EXPECT_ERROR(conf.init(cfg), "Flags mismatch for script1.lua");
     }
@@ -168,13 +168,13 @@ namespace
         }
         {
             ESM::LuaScriptCfg& script = cfg.mScripts.emplace_back();
-            script.mScriptPath = "test_global.lua";
+            script.mScriptPath = VFS::Path::Normalized("test_global.lua");
             script.mFlags = ESM::LuaScriptCfg::sGlobal;
             script.mInitializationData = luaData;
         }
         {
             ESM::LuaScriptCfg& script = cfg.mScripts.emplace_back();
-            script.mScriptPath = "test_local.lua";
+            script.mScriptPath = VFS::Path::Normalized("test_local.lua");
             script.mFlags = ESM::LuaScriptCfg::sMerge;
             script.mTypes.push_back(ESM::REC_DOOR);
             script.mTypes.push_back(ESM::REC_MISC);
diff --git a/apps/components_tests/lua/test_inputactions.cpp b/apps/components_tests/lua/test_inputactions.cpp
new file mode 100644
index 0000000000..cad17a5b99
--- /dev/null
+++ b/apps/components_tests/lua/test_inputactions.cpp
@@ -0,0 +1,64 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <components/lua/inputactions.hpp>
+#include <components/lua/scriptscontainer.hpp>
+#include <components/testing/util.hpp>
+
+namespace
+{
+    using namespace testing;
+    using namespace TestingOpenMW;
+
+    TEST(LuaInputActionsTest, MultiTree)
+    {
+        {
+            LuaUtil::InputAction::MultiTree tree;
+            auto a = tree.insert();
+            auto b = tree.insert();
+            auto c = tree.insert();
+            auto d = tree.insert();
+            EXPECT_TRUE(tree.multiEdge(c, { a, b }));
+            EXPECT_TRUE(tree.multiEdge(a, { d }));
+            EXPECT_FALSE(tree.multiEdge(d, { c }));
+        }
+
+        {
+            LuaUtil::InputAction::MultiTree tree;
+            auto a = tree.insert();
+            auto b = tree.insert();
+            auto c = tree.insert();
+            EXPECT_TRUE(tree.multiEdge(b, { a }));
+            EXPECT_TRUE(tree.multiEdge(c, { a, b }));
+        }
+    }
+
+    TEST(LuaInputActionsTest, Registry)
+    {
+        sol::state lua;
+        LuaUtil::InputAction::Registry registry;
+        LuaUtil::InputAction::Info a({ "a", LuaUtil::InputAction::Type::Boolean, "test", "a_name", "a_description",
+            sol::make_object(lua, false) });
+        registry.insert(a);
+        LuaUtil::InputAction::Info b({ "b", LuaUtil::InputAction::Type::Boolean, "test", "b_name", "b_description",
+            sol::make_object(lua, false) });
+        registry.insert(b);
+        LuaUtil::Callback bindA({ lua.load("return function() return true end")(), sol::table(lua, sol::create) });
+        LuaUtil::Callback bindBToA(
+            { lua.load("return function(_, _, aValue) return aValue end")(), sol::table(lua, sol::create) });
+        EXPECT_TRUE(registry.bind("a", bindA, {}));
+        EXPECT_TRUE(registry.bind("b", bindBToA, { "a" }));
+        registry.update(1.0);
+        sol::object bValue = registry.valueOfType("b", LuaUtil::InputAction::Type::Boolean);
+        EXPECT_TRUE(bValue.is<bool>());
+        LuaUtil::Callback badA(
+            { lua.load("return function() return 'not_a_bool' end")(), sol::table(lua, sol::create) });
+        EXPECT_TRUE(registry.bind("a", badA, {}));
+        testing::internal::CaptureStderr();
+        registry.update(1.0);
+        sol::object aValue = registry.valueOfType("a", LuaUtil::InputAction::Type::Boolean);
+        EXPECT_TRUE(aValue.is<bool>());
+        bValue = registry.valueOfType("b", LuaUtil::InputAction::Type::Boolean);
+        EXPECT_TRUE(bValue.is<bool>() && bValue.as<bool>() == aValue.as<bool>());
+    }
+}
diff --git a/apps/components_tests/lua/test_l10n.cpp b/apps/components_tests/lua/test_l10n.cpp
new file mode 100644
index 0000000000..b48028a730
--- /dev/null
+++ b/apps/components_tests/lua/test_l10n.cpp
@@ -0,0 +1,174 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <components/files/fixedpath.hpp>
+#include <components/l10n/manager.hpp>
+#include <components/lua/l10n.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/testing/util.hpp>
+
+namespace
+{
+    using namespace testing;
+    using namespace TestingOpenMW;
+
+    template <typename T>
+    T get(sol::state_view& lua, const std::string& luaCode)
+    {
+        return lua.safe_script("return " + luaCode).get<T>();
+    }
+
+    constexpr VFS::Path::NormalizedView test1EnPath("l10n/test1/en.yaml");
+    constexpr VFS::Path::NormalizedView test1EnUsPath("l10n/test1/en_us.yaml");
+    constexpr VFS::Path::NormalizedView test1DePath("l10n/test1/de.yaml");
+    constexpr VFS::Path::NormalizedView test2EnPath("l10n/test2/en.yaml");
+    constexpr VFS::Path::NormalizedView test3EnPath("l10n/test3/en.yaml");
+    constexpr VFS::Path::NormalizedView test3DePath("l10n/test3/de.yaml");
+
+    VFSTestFile invalidScript("not a script");
+    VFSTestFile incorrectScript(
+        "return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    VFSTestFile emptyScript("");
+
+    VFSTestFile test1En(R"X(
+good_morning: "Good morning."
+you_have_arrows: |-
+  {count, plural,
+    =0{You have no arrows.}
+    one{You have one arrow.}
+    other{You have {count} arrows.}
+  }
+pc_must_come: |-
+  {PCGender, select,
+     male {He is}
+     female {She is}
+     other {They are}
+  } coming with us.
+quest_completion: "The quest is {done, number, percent} complete."
+ordinal: "You came in {num, ordinal} place."
+spellout: "There {num, plural, one{is {num, spellout} thing} other{are {num, spellout} things}}."
+duration: "It took {num, duration}"
+numbers: "{int} and {double, number, integer} are integers, but {double} is a double"
+rounding: "{value, number, :: .00}"
+)X");
+
+    VFSTestFile test1De(R"X(
+good_morning: "Guten Morgen."
+you_have_arrows: |-
+  {count, plural,
+    one{Du hast ein Pfeil.}
+    other{Du hast {count} Pfeile.}
+  }
+"Hello {name}!": "Hallo {name}!"
+)X");
+
+    VFSTestFile test1EnUS(R"X(
+currency: "You have {money, number, currency}"
+)X");
+
+    VFSTestFile test2En(R"X(
+good_morning: "Morning!"
+you_have_arrows: "Arrows count: {count}"
+)X");
+
+    struct LuaL10nTest : Test
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            { test1EnPath, &test1En },
+            { test1EnUsPath, &test1EnUS },
+            { test1DePath, &test1De },
+            { test2EnPath, &test2En },
+            { test3EnPath, &test1En },
+            { test3DePath, &test1De },
+        });
+
+        LuaUtil::ScriptsConfiguration mCfg;
+    };
+
+    TEST_F(LuaL10nTest, L10n)
+    {
+        LuaUtil::LuaState lua{ mVFS.get(), &mCfg };
+        lua.protectedCall([&](LuaUtil::LuaView& view) {
+            sol::state_view& l = view.sol();
+            internal::CaptureStdout();
+            l10n::Manager l10nManager(mVFS.get());
+            l10nManager.setPreferredLocales({ "de", "en" });
+            EXPECT_THAT(internal::GetCapturedStdout(), "Preferred locales: gmst de en\n");
+
+            l["l10n"] = LuaUtil::initL10nLoader(l, &l10nManager);
+
+            internal::CaptureStdout();
+            l.safe_script("t1 = l10n('Test1')");
+            EXPECT_THAT(internal::GetCapturedStdout(),
+                "Language file \"l10n/Test1/de.yaml\" is enabled\n"
+                "Language file \"l10n/Test1/en.yaml\" is enabled\n");
+
+            internal::CaptureStdout();
+            l.safe_script("t2 = l10n('Test2')");
+            {
+                std::string output = internal::GetCapturedStdout();
+                EXPECT_THAT(output, HasSubstr("Language file \"l10n/Test2/en.yaml\" is enabled"));
+            }
+
+            EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Guten Morgen.");
+            EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "Du hast ein Pfeil.");
+            EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "Du hast 5 Pfeile.");
+            EXPECT_EQ(get<std::string>(l, "t1('Hello {name}!', {name='World'})"), "Hallo World!");
+            EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
+            EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+
+            internal::CaptureStdout();
+            l10nManager.setPreferredLocales({ "en", "de" });
+            EXPECT_THAT(internal::GetCapturedStdout(),
+                "Preferred locales: gmst en de\n"
+                "Language file \"l10n/Test1/en.yaml\" is enabled\n"
+                "Language file \"l10n/Test1/de.yaml\" is enabled\n"
+                "Language file \"l10n/Test2/en.yaml\" is enabled\n");
+
+            EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Good morning.");
+            EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "You have one arrow.");
+            EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "You have 5 arrows.");
+            EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"male\"})"), "He is coming with us.");
+            EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"female\"})"), "She is coming with us.");
+            EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"blah\"})"), "They are coming with us.");
+            EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"other\"})"), "They are coming with us.");
+            EXPECT_EQ(get<std::string>(l, "t1('quest_completion', {done=0.1})"), "The quest is 10% complete.");
+            EXPECT_EQ(get<std::string>(l, "t1('quest_completion', {done=1})"), "The quest is 100% complete.");
+            EXPECT_EQ(get<std::string>(l, "t1('ordinal', {num=1})"), "You came in 1st place.");
+            EXPECT_EQ(get<std::string>(l, "t1('ordinal', {num=100})"), "You came in 100th place.");
+            EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=1})"), "There is one thing.");
+            EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=100})"), "There are one hundred things.");
+            EXPECT_EQ(get<std::string>(l, "t1('duration', {num=100})"), "It took 1:40");
+            EXPECT_EQ(get<std::string>(l, "t1('numbers', {int=123, double=123.456})"),
+                "123 and 123 are integers, but 123.456 is a double");
+            EXPECT_EQ(get<std::string>(l, "t1('rounding', {value=123.456789})"), "123.46");
+            // Check that failed messages display the key instead of an empty string
+            EXPECT_EQ(get<std::string>(l, "t1('{mismatched_braces')"), "{mismatched_braces");
+            EXPECT_EQ(get<std::string>(l, "t1('{unknown_arg}')"), "{unknown_arg}");
+            EXPECT_EQ(get<std::string>(l, "t1('{num, integer}', {num=1})"), "{num, integer}");
+            // Doesn't give a valid currency symbol with `en`. Not that openmw is designed for real world currency.
+            l10nManager.setPreferredLocales({ "en-US", "de" });
+            EXPECT_EQ(get<std::string>(l, "t1('currency', {money=10000.10})"), "You have $10,000.10");
+            // Note: Not defined in English localisation file, so we fall back to the German before falling back to the
+            // key
+            EXPECT_EQ(get<std::string>(l, "t1('Hello {name}!', {name='World'})"), "Hallo World!");
+            EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
+            EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+
+            // Test that locales with variants and country codes fall back to more generic locales
+            internal::CaptureStdout();
+            l10nManager.setPreferredLocales({ "en-GB-oed", "de" });
+            EXPECT_THAT(internal::GetCapturedStdout(),
+                "Preferred locales: gmst en_GB_OED de\n"
+                "Language file \"l10n/Test1/en.yaml\" is enabled\n"
+                "Language file \"l10n/Test1/de.yaml\" is enabled\n"
+                "Language file \"l10n/Test2/en.yaml\" is enabled\n");
+            EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+
+            // Test setting fallback language
+            l.safe_script("t3 = l10n('Test3', 'de')");
+            l10nManager.setPreferredLocales({ "en" });
+            EXPECT_EQ(get<std::string>(l, "t3('Hello {name}!', {name='World'})"), "Hallo World!");
+        });
+    }
+}
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/components_tests/lua/test_lua.cpp
similarity index 59%
rename from apps/openmw_test_suite/lua/test_lua.cpp
rename to apps/components_tests/lua/test_lua.cpp
index 90c987522d..5f1e11c435 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/components_tests/lua/test_lua.cpp
@@ -1,14 +1,16 @@
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <components/lua/luastate.hpp>
-
-#include "../testing_util.hpp"
+#include <components/testing/expecterror.hpp>
+#include <components/testing/util.hpp>
 
 namespace
 {
     using namespace testing;
 
+    constexpr VFS::Path::NormalizedView counterPath("aaa/counter.lua");
+
     TestingOpenMW::VFSTestFile counterFile(R"X(
 x = 42
 return {
@@ -17,8 +19,12 @@ return {
 }
 )X");
 
+    constexpr VFS::Path::NormalizedView invalidPath("invalid.lua");
+
     TestingOpenMW::VFSTestFile invalidScriptFile("Invalid script");
 
+    constexpr VFS::Path::NormalizedView testsPath("bbb/tests.lua");
+
     TestingOpenMW::VFSTestFile testsFile(R"X(
 return {
     -- should work
@@ -51,6 +57,11 @@ return {
 }
 )X");
 
+    constexpr VFS::Path::NormalizedView metaIndexErrorPath("metaindexerror.lua");
+
+    TestingOpenMW::VFSTestFile metaIndexErrorFile(
+        "return setmetatable({}, { __index = function(t, key) error('meta index error') end })");
+
     std::string genBigScript()
     {
         std::stringstream buf;
@@ -63,14 +74,24 @@ return {
         return buf.str();
     }
 
+    constexpr VFS::Path::NormalizedView bigPath("big.lua");
+
     TestingOpenMW::VFSTestFile bigScriptFile(genBigScript());
+
+    constexpr VFS::Path::NormalizedView requireBigPath("requirebig.lua");
+
     TestingOpenMW::VFSTestFile requireBigScriptFile("local x = require('big') ; return {x}");
 
     struct LuaStateTest : Test
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "aaa/counter.lua", &counterFile },
-            { "bbb/tests.lua", &testsFile }, { "invalid.lua", &invalidScriptFile }, { "big.lua", &bigScriptFile },
-            { "requireBig.lua", &requireBigScriptFile } });
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
+            { counterPath, &counterFile },
+            { testsPath, &testsFile },
+            { invalidPath, &invalidScriptFile },
+            { bigPath, &bigScriptFile },
+            { requireBigPath, &requireBigScriptFile },
+            { metaIndexErrorPath, &metaIndexErrorFile },
+        });
 
         LuaUtil::ScriptsConfiguration mCfg;
         LuaUtil::LuaState mLua{ mVFS.get(), &mCfg };
@@ -78,13 +99,14 @@ return {
 
     TEST_F(LuaStateTest, Sandbox)
     {
-        sol::table script1 = mLua.runInNewSandbox("aaa/counter.lua");
+        const VFS::Path::Normalized path(counterPath);
+        sol::table script1 = mLua.runInNewSandbox(path);
 
         EXPECT_EQ(LuaUtil::call(script1["get"]).get<int>(), 42);
         LuaUtil::call(script1["inc"], 3);
         EXPECT_EQ(LuaUtil::call(script1["get"]).get<int>(), 45);
 
-        sol::table script2 = mLua.runInNewSandbox("aaa/counter.lua");
+        sol::table script2 = mLua.runInNewSandbox(path);
         EXPECT_EQ(LuaUtil::call(script2["get"]).get<int>(), 42);
         LuaUtil::call(script2["inc"], 1);
         EXPECT_EQ(LuaUtil::call(script2["get"]).get<int>(), 43);
@@ -94,37 +116,39 @@ return {
 
     TEST_F(LuaStateTest, ToString)
     {
-        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.sol(), 3.14)), "3.14");
-        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.sol(), true)), "true");
+        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.unsafeState(), 3.14)), "3.14");
+        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.unsafeState(), true)), "true");
         EXPECT_EQ(LuaUtil::toString(sol::nil), "nil");
-        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.sol(), "something")), "\"something\"");
+        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.unsafeState(), "something")), "\"something\"");
     }
 
     TEST_F(LuaStateTest, Cast)
     {
-        EXPECT_EQ(LuaUtil::cast<int>(sol::make_object(mLua.sol(), 3.14)), 3);
-        EXPECT_ERROR(
-            LuaUtil::cast<int>(sol::make_object(mLua.sol(), "3.14")), "Value \"\"3.14\"\" can not be casted to int");
-        EXPECT_ERROR(LuaUtil::cast<std::string_view>(sol::make_object(mLua.sol(), sol::nil)),
+        EXPECT_EQ(LuaUtil::cast<int>(sol::make_object(mLua.unsafeState(), 3.14)), 3);
+        EXPECT_ERROR(LuaUtil::cast<int>(sol::make_object(mLua.unsafeState(), "3.14")),
+            "Value \"\"3.14\"\" can not be casted to int");
+        EXPECT_ERROR(LuaUtil::cast<std::string_view>(sol::make_object(mLua.unsafeState(), sol::nil)),
             "Value \"nil\" can not be casted to string");
-        EXPECT_ERROR(LuaUtil::cast<std::string>(sol::make_object(mLua.sol(), sol::nil)),
+        EXPECT_ERROR(LuaUtil::cast<std::string>(sol::make_object(mLua.unsafeState(), sol::nil)),
             "Value \"nil\" can not be casted to string");
-        EXPECT_ERROR(LuaUtil::cast<sol::table>(sol::make_object(mLua.sol(), sol::nil)),
+        EXPECT_ERROR(LuaUtil::cast<sol::table>(sol::make_object(mLua.unsafeState(), sol::nil)),
             "Value \"nil\" can not be casted to sol::table");
-        EXPECT_ERROR(LuaUtil::cast<sol::function>(sol::make_object(mLua.sol(), "3.14")),
+        EXPECT_ERROR(LuaUtil::cast<sol::function>(sol::make_object(mLua.unsafeState(), "3.14")),
             "Value \"\"3.14\"\" can not be casted to sol::function");
-        EXPECT_ERROR(LuaUtil::cast<sol::protected_function>(sol::make_object(mLua.sol(), "3.14")),
+        EXPECT_ERROR(LuaUtil::cast<sol::protected_function>(sol::make_object(mLua.unsafeState(), "3.14")),
             "Value \"\"3.14\"\" can not be casted to sol::function");
     }
 
     TEST_F(LuaStateTest, ErrorHandling)
     {
-        EXPECT_ERROR(mLua.runInNewSandbox("invalid.lua"), "[string \"invalid.lua\"]:1:");
+        const VFS::Path::Normalized path("invalid.lua");
+        EXPECT_ERROR(mLua.runInNewSandbox(path), "[string \"invalid.lua\"]:1:");
     }
 
     TEST_F(LuaStateTest, CustomRequire)
     {
-        sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+        const VFS::Path::Normalized path("bbb/tests.lua");
+        sol::table script = mLua.runInNewSandbox(path);
 
         EXPECT_FLOAT_EQ(
             LuaUtil::call(script["sin"], 1).get<float>(), -LuaUtil::call(script["requireMathSin"], -1).get<float>());
@@ -132,7 +156,7 @@ return {
         EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 43);
         EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 44);
         {
-            sol::table script2 = mLua.runInNewSandbox("bbb/tests.lua");
+            sol::table script2 = mLua.runInNewSandbox(path);
             EXPECT_EQ(LuaUtil::call(script2["useCounter"]).get<int>(), 43);
         }
         EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 45);
@@ -142,7 +166,8 @@ return {
 
     TEST_F(LuaStateTest, ReadOnly)
     {
-        sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+        const VFS::Path::Normalized path("bbb/tests.lua");
+        sol::table script = mLua.runInNewSandbox(path);
 
         // rawset itself is allowed
         EXPECT_EQ(LuaUtil::call(script["callRawset"]).get<int>(), 3);
@@ -158,46 +183,51 @@ return {
 
     TEST_F(LuaStateTest, Print)
     {
+        const VFS::Path::Normalized path("bbb/tests.lua");
         {
-            sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+            sol::table script = mLua.runInNewSandbox(path);
             testing::internal::CaptureStdout();
             LuaUtil::call(script["print"], 1, 2, 3);
             std::string output = testing::internal::GetCapturedStdout();
-            EXPECT_EQ(output, "[bbb/tests.lua]:\t1\t2\t3\n");
+            EXPECT_EQ(output, "unnamed:\t1\t2\t3\n");
         }
         {
-            sol::table script = mLua.runInNewSandbox("bbb/tests.lua", "prefix");
+            sol::table script = mLua.runInNewSandbox(path, "prefix");
             testing::internal::CaptureStdout();
             LuaUtil::call(script["print"]); // print with no arguments
             std::string output = testing::internal::GetCapturedStdout();
-            EXPECT_EQ(output, "prefix[bbb/tests.lua]:\n");
+            EXPECT_EQ(output, "prefix:\n");
         }
     }
 
     TEST_F(LuaStateTest, UnsafeFunction)
     {
-        sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+        const VFS::Path::Normalized path("bbb/tests.lua");
+        sol::table script = mLua.runInNewSandbox(path);
         EXPECT_ERROR(LuaUtil::call(script["callLoadstring"]), "a nil value");
     }
 
     TEST_F(LuaStateTest, ProvideAPI)
     {
         LuaUtil::LuaState lua(mVFS.get(), &mCfg);
+        lua.protectedCall([&](LuaUtil::LuaView& view) {
+            sol::table api1 = LuaUtil::makeReadOnly(view.sol().create_table_with("name", "api1"));
+            sol::table api2 = LuaUtil::makeReadOnly(view.sol().create_table_with("name", "api2"));
 
-        sol::table api1 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api1"));
-        sol::table api2 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api2"));
+            const VFS::Path::Normalized path("bbb/tests.lua");
 
-        sol::table script1 = lua.runInNewSandbox("bbb/tests.lua", "", { { "test.api", api1 } });
+            sol::table script1 = lua.runInNewSandbox(path, "", { { "test.api", api1 } });
 
-        lua.addCommonPackage("sqrlib", lua.sol().create_table_with("sqr", [](int x) { return x * x; }));
+            lua.addCommonPackage("sqrlib", view.sol().create_table_with("sqr", [](int x) { return x * x; }));
 
-        sol::table script2 = lua.runInNewSandbox("bbb/tests.lua", "", { { "test.api", api2 } });
+            sol::table script2 = lua.runInNewSandbox(path, "", { { "test.api", api2 } });
 
-        EXPECT_ERROR(LuaUtil::call(script1["sqr"], 3), "module not found: sqrlib");
-        EXPECT_EQ(LuaUtil::call(script2["sqr"], 3).get<int>(), 9);
+            EXPECT_ERROR(LuaUtil::call(script1["sqr"], 3), "module not found: sqrlib");
+            EXPECT_EQ(LuaUtil::call(script2["sqr"], 3).get<int>(), 9);
 
-        EXPECT_EQ(LuaUtil::call(script1["apiName"]).get<std::string>(), "api1");
-        EXPECT_EQ(LuaUtil::call(script2["apiName"]).get<std::string>(), "api2");
+            EXPECT_EQ(LuaUtil::call(script1["apiName"]).get<std::string>(), "api1");
+            EXPECT_EQ(LuaUtil::call(script2["apiName"]).get<std::string>(), "api2");
+        });
     }
 
     TEST_F(LuaStateTest, GetLuaVersion)
@@ -209,18 +239,27 @@ return {
     {
         auto getMem = [&] {
             for (int i = 0; i < 5; ++i)
-                lua_gc(mLua.sol(), LUA_GCCOLLECT, 0);
+                lua_gc(mLua.unsafeState(), LUA_GCCOLLECT, 0);
             return mLua.getTotalMemoryUsage();
         };
         int64_t memWithScript;
+        const VFS::Path::Normalized path("requireBig.lua");
         {
-            sol::object s = mLua.runInNewSandbox("requireBig.lua");
+            sol::object s = mLua.runInNewSandbox(path);
             memWithScript = getMem();
         }
         for (int i = 0; i < 100; ++i) // run many times to make small memory leaks visible
-            mLua.runInNewSandbox("requireBig.lua");
+            mLua.runInNewSandbox(path);
         int64_t memWithoutScript = getMem();
         // At this moment all instances of the script should be garbage-collected.
         EXPECT_LT(memWithoutScript, memWithScript);
     }
+
+    TEST_F(LuaStateTest, SafeIndexMetamethod)
+    {
+        const VFS::Path::Normalized path("metaIndexError.lua");
+        sol::table t = mLua.runInNewSandbox(path);
+        // without safe get we crash here
+        EXPECT_ERROR(LuaUtil::safeGet(t, "any key"), "meta index error");
+    }
 }
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/components_tests/lua/test_scriptscontainer.cpp
similarity index 50%
rename from apps/openmw_test_suite/lua/test_scriptscontainer.cpp
rename to apps/components_tests/lua/test_scriptscontainer.cpp
index dc99caefda..4f3cca1b87 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/components_tests/lua/test_scriptscontainer.cpp
@@ -1,4 +1,4 @@
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <components/esm/luascripts.hpp>
@@ -6,19 +6,31 @@
 #include <components/lua/asyncpackage.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/lua/scriptscontainer.hpp>
+#include <components/lua/scripttracker.hpp>
 
-#include "../testing_util.hpp"
+#include <components/testing/util.hpp>
 
 namespace
 {
     using namespace testing;
     using namespace TestingOpenMW;
 
+    constexpr VFS::Path::NormalizedView invalidPath("invalid.lua");
+
     VFSTestFile invalidScript("not a script");
+
+    constexpr VFS::Path::NormalizedView incorrectPath("incorrect.lua");
+
     VFSTestFile incorrectScript(
         "return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+
+    constexpr VFS::Path::NormalizedView emptyPath("empty.lua");
+
     VFSTestFile emptyScript("");
 
+    constexpr VFS::Path::NormalizedView test1Path("test1.lua");
+    constexpr VFS::Path::NormalizedView test2Path("test2.lua");
+
     VFSTestFile testScript(R"X(
 return {
     engineHandlers = {
@@ -33,6 +45,8 @@ return {
 }
 )X");
 
+    constexpr VFS::Path::NormalizedView stopEventPath("stopevent.lua");
+
     VFSTestFile stopEventScript(R"X(
 return {
     eventHandlers = {
@@ -44,6 +58,9 @@ return {
 }
 )X");
 
+    constexpr VFS::Path::NormalizedView loadSave1Path("loadsave1.lua");
+    constexpr VFS::Path::NormalizedView loadSave2Path("loadsave2.lua");
+
     VFSTestFile loadSaveScript(R"X(
 x = 0
 y = 0
@@ -70,6 +87,8 @@ return {
 }
 )X");
 
+    constexpr VFS::Path::NormalizedView testInterfacePath("testinterface.lua");
+
     VFSTestFile interfaceScript(R"X(
 return {
     interfaceName = "TestInterface",
@@ -80,6 +99,8 @@ return {
 }
 )X");
 
+    constexpr VFS::Path::NormalizedView overrideInterfacePath("overrideinterface.lua");
+
     VFSTestFile overrideInterfaceScript(R"X(
 local old = nil
 local interface = {
@@ -104,6 +125,8 @@ return {
 }
 )X");
 
+    constexpr VFS::Path::NormalizedView useInterfacePath("useinterface.lua");
+
     VFSTestFile useInterfaceScript(R"X(
 local interfaces = require('openmw.interfaces')
 return {
@@ -113,22 +136,72 @@ return {
         end,
     },
 }
+)X");
+
+    constexpr VFS::Path::NormalizedView unloadPath("unload.lua");
+
+    VFSTestFile unloadScript(R"X(
+x = 0
+y = 0
+z = 0
+return {
+    engineHandlers = {
+        onSave = function(state)
+            print('saving', x, y, z)
+            return {x = x, y = y}
+        end,
+        onLoad = function(state)
+            x, y = state.x, state.y
+            print('loaded', x, y, z)
+        end
+    },
+    eventHandlers = {
+        Set = function(eventData)
+            x, y, z = eventData.x, eventData.y, eventData.z
+        end
+    }
+}
+)X");
+
+    constexpr VFS::Path::NormalizedView customDataPath("customdata.lua");
+
+    VFSTestFile customDataScript(R"X(
+data = nil
+return {
+    engineHandlers = {
+        onSave = function()
+            return data
+        end,
+        onLoad = function(state)
+            data = state
+        end,
+        onInit = function(state)
+            data = state
+        end
+    },
+    eventHandlers = {
+        WakeUp = function()
+        end
+    }
+}
 )X");
 
     struct LuaScriptsContainerTest : Test
     {
         std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
-            { "invalid.lua", &invalidScript },
-            { "incorrect.lua", &incorrectScript },
-            { "empty.lua", &emptyScript },
-            { "test1.lua", &testScript },
-            { "test2.lua", &testScript },
-            { "stopEvent.lua", &stopEventScript },
-            { "loadSave1.lua", &loadSaveScript },
-            { "loadSave2.lua", &loadSaveScript },
-            { "testInterface.lua", &interfaceScript },
-            { "overrideInterface.lua", &overrideInterfaceScript },
-            { "useInterface.lua", &useInterfaceScript },
+            { invalidPath, &invalidScript },
+            { incorrectPath, &incorrectScript },
+            { emptyPath, &emptyScript },
+            { test1Path, &testScript },
+            { test2Path, &testScript },
+            { stopEventPath, &stopEventScript },
+            { loadSave1Path, &loadSaveScript },
+            { loadSave2Path, &loadSaveScript },
+            { testInterfacePath, &interfaceScript },
+            { overrideInterfacePath, &overrideInterfaceScript },
+            { useInterfacePath, &useInterfaceScript },
+            { unloadPath, &unloadScript },
+            { customDataPath, &customDataScript },
         });
 
         LuaUtil::ScriptsConfiguration mCfg;
@@ -149,42 +222,54 @@ CUSTOM, NPC: loadSave2.lua
 CUSTOM, PLAYER: testInterface.lua
 CUSTOM, PLAYER: overrideInterface.lua
 CUSTOM, PLAYER: useInterface.lua
+CUSTOM: unload.lua
+CUSTOM: customdata.lua
 )X");
             mCfg.init(std::move(cfg));
         }
+
+        int getId(VFS::Path::NormalizedView path) const
+        {
+            const std::optional<int> id = mCfg.findId(path);
+            if (!id.has_value())
+                throw std::invalid_argument("Script id is not found: " + std::string(path.value()));
+            return *id;
+        }
     };
 
-    TEST_F(LuaScriptsContainerTest, VerifyStructure)
+    TEST_F(LuaScriptsContainerTest, addCustomScriptShouldNotStartInvalidScript)
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
-        {
-            testing::internal::CaptureStdout();
-            EXPECT_FALSE(scripts.addCustomScript(*mCfg.findId("invalid.lua")));
-            std::string output = testing::internal::GetCapturedStdout();
-            EXPECT_THAT(output, HasSubstr("Can't start Test[invalid.lua]"));
-        }
-        {
-            testing::internal::CaptureStdout();
-            EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("incorrect.lua")));
-            std::string output = testing::internal::GetCapturedStdout();
-            EXPECT_THAT(output, HasSubstr("Not supported handler 'incorrectHandler' in Test[incorrect.lua]"));
-            EXPECT_THAT(output, HasSubstr("Not supported section 'incorrectSection' in Test[incorrect.lua]"));
-        }
-        {
-            testing::internal::CaptureStdout();
-            EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("empty.lua")));
-            EXPECT_FALSE(scripts.addCustomScript(*mCfg.findId("empty.lua"))); // already present
-            EXPECT_EQ(internal::GetCapturedStdout(), "");
-        }
+        testing::internal::CaptureStdout();
+        EXPECT_FALSE(scripts.addCustomScript(getId(invalidPath)));
+        std::string output = testing::internal::GetCapturedStdout();
+        EXPECT_THAT(output, HasSubstr("Can't start Test[invalid.lua]"));
+    }
+
+    TEST_F(LuaScriptsContainerTest, addCustomScriptShouldNotSuportScriptsWithInvalidHandlerAndSection)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        testing::internal::CaptureStdout();
+        EXPECT_TRUE(scripts.addCustomScript(getId(incorrectPath)));
+        std::string output = testing::internal::GetCapturedStdout();
+        EXPECT_THAT(output, HasSubstr("Not supported handler 'incorrectHandler' in Test[incorrect.lua]"));
+        EXPECT_THAT(output, HasSubstr("Not supported section 'incorrectSection' in Test[incorrect.lua]"));
+    }
+
+    TEST_F(LuaScriptsContainerTest, addCustomScriptShouldReturnFalseForDuplicates)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        EXPECT_TRUE(scripts.addCustomScript(getId(emptyPath)));
+        EXPECT_FALSE(scripts.addCustomScript(getId(emptyPath)));
     }
 
     TEST_F(LuaScriptsContainerTest, CallHandler)
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
         testing::internal::CaptureStdout();
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test1.lua")));
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("stopEvent.lua")));
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test2.lua")));
+        EXPECT_TRUE(scripts.addCustomScript(getId(test1Path)));
+        EXPECT_TRUE(scripts.addCustomScript(getId(stopEventPath)));
+        EXPECT_TRUE(scripts.addCustomScript(getId(test2Path)));
         scripts.update(1.5f);
         EXPECT_EQ(internal::GetCapturedStdout(),
             "Test[test1.lua]:\t update 1.5\n"
@@ -194,12 +279,14 @@ CUSTOM, PLAYER: useInterface.lua
     TEST_F(LuaScriptsContainerTest, CallEvent)
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test1.lua")));
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("stopEvent.lua")));
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test2.lua")));
 
-        std::string X0 = LuaUtil::serialize(mLua.sol().create_table_with("x", 0.5));
-        std::string X1 = LuaUtil::serialize(mLua.sol().create_table_with("x", 1.5));
+        EXPECT_TRUE(scripts.addCustomScript(getId(test1Path)));
+        EXPECT_TRUE(scripts.addCustomScript(getId(stopEventPath)));
+        EXPECT_TRUE(scripts.addCustomScript(getId(test2Path)));
+
+        sol::state_view sol = mLua.unsafeState();
+        std::string X0 = LuaUtil::serialize(sol.create_table_with("x", 0.5));
+        std::string X1 = LuaUtil::serialize(sol.create_table_with("x", 1.5));
 
         {
             testing::internal::CaptureStdout();
@@ -211,7 +298,7 @@ CUSTOM, PLAYER: useInterface.lua
             scripts.receiveEvent("Event1", X1);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test2.lua]:\t event1 1.5\n"
-                "Test[stopEvent.lua]:\t event1 1.5\n"
+                "Test[stopevent.lua]:\t event1 1.5\n"
                 "Test[test1.lua]:\t event1 1.5\n");
         }
         {
@@ -226,7 +313,7 @@ CUSTOM, PLAYER: useInterface.lua
             scripts.receiveEvent("Event1", X0);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test2.lua]:\t event1 0.5\n"
-                "Test[stopEvent.lua]:\t event1 0.5\n");
+                "Test[stopevent.lua]:\t event1 0.5\n");
         }
         {
             testing::internal::CaptureStdout();
@@ -240,10 +327,13 @@ CUSTOM, PLAYER: useInterface.lua
     TEST_F(LuaScriptsContainerTest, RemoveScript)
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test1.lua")));
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("stopEvent.lua")));
-        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test2.lua")));
-        std::string X = LuaUtil::serialize(mLua.sol().create_table_with("x", 0.5));
+
+        EXPECT_TRUE(scripts.addCustomScript(getId(test1Path)));
+        EXPECT_TRUE(scripts.addCustomScript(getId(stopEventPath)));
+        EXPECT_TRUE(scripts.addCustomScript(getId(test2Path)));
+
+        sol::state_view sol = mLua.unsafeState();
+        std::string X = LuaUtil::serialize(sol.create_table_with("x", 0.5));
 
         {
             testing::internal::CaptureStdout();
@@ -253,11 +343,11 @@ CUSTOM, PLAYER: useInterface.lua
                 "Test[test1.lua]:\t update 1.5\n"
                 "Test[test2.lua]:\t update 1.5\n"
                 "Test[test2.lua]:\t event1 0.5\n"
-                "Test[stopEvent.lua]:\t event1 0.5\n");
+                "Test[stopevent.lua]:\t event1 0.5\n");
         }
         {
             testing::internal::CaptureStdout();
-            int stopEventScriptId = *mCfg.findId("stopEvent.lua");
+            const int stopEventScriptId = getId(stopEventPath);
             EXPECT_TRUE(scripts.hasScript(stopEventScriptId));
             scripts.removeScript(stopEventScriptId);
             EXPECT_FALSE(scripts.hasScript(stopEventScriptId));
@@ -271,7 +361,7 @@ CUSTOM, PLAYER: useInterface.lua
         }
         {
             testing::internal::CaptureStdout();
-            scripts.removeScript(*mCfg.findId("test1.lua"));
+            scripts.removeScript(getId(test1Path));
             scripts.update(1.5f);
             scripts.receiveEvent("Event1", X);
             EXPECT_EQ(internal::GetCapturedStdout(),
@@ -288,19 +378,19 @@ CUSTOM, PLAYER: useInterface.lua
         scripts.addAutoStartedScripts();
         scripts.update(1.5f);
         EXPECT_EQ(internal::GetCapturedStdout(),
-            "Test[overrideInterface.lua]:\toverride\n"
-            "Test[overrideInterface.lua]:\tinit\n"
-            "Test[overrideInterface.lua]:\tNEW FN\t4.5\n"
-            "Test[testInterface.lua]:\tFN\t4.5\n");
+            "Test[overrideinterface.lua]:\toverride\n"
+            "Test[overrideinterface.lua]:\tinit\n"
+            "Test[overrideinterface.lua]:\tNEW FN\t4.5\n"
+            "Test[testinterface.lua]:\tFN\t4.5\n");
     }
 
     TEST_F(LuaScriptsContainerTest, Interface)
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
         scripts.setAutoStartConf(mCfg.getLocalConf(ESM::REC_CREA, ESM::RefId(), ESM::RefNum()));
-        int addIfaceId = *mCfg.findId("testInterface.lua");
-        int overrideIfaceId = *mCfg.findId("overrideInterface.lua");
-        int useIfaceId = *mCfg.findId("useInterface.lua");
+        const int addIfaceId = getId(testInterfacePath);
+        const int overrideIfaceId = getId(overrideInterfacePath);
+        const int useIfaceId = getId(useInterfacePath);
 
         testing::internal::CaptureStdout();
         scripts.addAutoStartedScripts();
@@ -315,11 +405,11 @@ CUSTOM, PLAYER: useInterface.lua
         scripts.removeScript(overrideIfaceId);
         scripts.update(1.5f);
         EXPECT_EQ(internal::GetCapturedStdout(),
-            "Test[overrideInterface.lua]:\toverride\n"
-            "Test[overrideInterface.lua]:\tinit\n"
-            "Test[overrideInterface.lua]:\tNEW FN\t4.5\n"
-            "Test[testInterface.lua]:\tFN\t4.5\n"
-            "Test[testInterface.lua]:\tFN\t3.5\n");
+            "Test[overrideinterface.lua]:\toverride\n"
+            "Test[overrideinterface.lua]:\tinit\n"
+            "Test[overrideinterface.lua]:\tNEW FN\t4.5\n"
+            "Test[testinterface.lua]:\tFN\t4.5\n"
+            "Test[testinterface.lua]:\tFN\t3.5\n");
     }
 
     TEST_F(LuaScriptsContainerTest, LoadSave)
@@ -332,10 +422,11 @@ CUSTOM, PLAYER: useInterface.lua
         scripts3.setAutoStartConf(mCfg.getPlayerConf());
 
         scripts1.addAutoStartedScripts();
-        EXPECT_TRUE(scripts1.addCustomScript(*mCfg.findId("test1.lua")));
+        EXPECT_TRUE(scripts1.addCustomScript(getId(test1Path)));
 
-        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with("n", 1, "x", 0.5, "y", 3.5)));
-        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with("n", 2, "x", 2.5, "y", 1.5)));
+        sol::state_view sol = mLua.unsafeState();
+        scripts1.receiveEvent("Set", LuaUtil::serialize(sol.create_table_with("n", 1, "x", 0.5, "y", 3.5)));
+        scripts1.receiveEvent("Set", LuaUtil::serialize(sol.create_table_with("n", 2, "x", 2.5, "y", 1.5)));
 
         ESM::LuaScripts data;
         scripts1.save(data);
@@ -346,23 +437,23 @@ CUSTOM, PLAYER: useInterface.lua
             scripts2.receiveEvent("Print", "");
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test1.lua]:\tload\n"
-                "Test[loadSave2.lua]:\t0.5\t3.5\n"
-                "Test[loadSave1.lua]:\t2.5\t1.5\n"
+                "Test[loadsave2.lua]:\t0.5\t3.5\n"
+                "Test[loadsave1.lua]:\t2.5\t1.5\n"
                 "Test[test1.lua]:\tprint\n");
-            EXPECT_FALSE(scripts2.hasScript(*mCfg.findId("testInterface.lua")));
+            EXPECT_FALSE(scripts2.hasScript(getId(testInterfacePath)));
         }
         {
             testing::internal::CaptureStdout();
             scripts3.load(data);
             scripts3.receiveEvent("Print", "");
             EXPECT_EQ(internal::GetCapturedStdout(),
-                "Ignoring Test[loadSave1.lua]; this script is not allowed here\n"
+                "Ignoring Test[loadsave1.lua]; this script is not allowed here\n"
                 "Test[test1.lua]:\tload\n"
-                "Test[overrideInterface.lua]:\toverride\n"
-                "Test[overrideInterface.lua]:\tinit\n"
-                "Test[loadSave2.lua]:\t0.5\t3.5\n"
+                "Test[overrideinterface.lua]:\toverride\n"
+                "Test[overrideinterface.lua]:\tinit\n"
+                "Test[loadsave2.lua]:\t0.5\t3.5\n"
                 "Test[test1.lua]:\tprint\n");
-            EXPECT_TRUE(scripts3.hasScript(*mCfg.findId("testInterface.lua")));
+            EXPECT_TRUE(scripts3.hasScript(getId(testInterfacePath)));
         }
     }
 
@@ -370,8 +461,8 @@ CUSTOM, PLAYER: useInterface.lua
     {
         using TimerType = LuaUtil::ScriptsContainer::TimerType;
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
-        int test1Id = *mCfg.findId("test1.lua");
-        int test2Id = *mCfg.findId("test2.lua");
+        const int test1Id = getId(test1Path);
+        const int test2Id = getId(test2Path);
 
         testing::internal::CaptureStdout();
         EXPECT_TRUE(scripts.addCustomScript(test1Id));
@@ -379,10 +470,10 @@ CUSTOM, PLAYER: useInterface.lua
         EXPECT_EQ(internal::GetCapturedStdout(), "");
 
         int counter1 = 0, counter2 = 0, counter3 = 0, counter4 = 0;
-        sol::function fn1 = sol::make_object(mLua.sol(), [&]() { counter1++; });
-        sol::function fn2 = sol::make_object(mLua.sol(), [&]() { counter2++; });
-        sol::function fn3 = sol::make_object(mLua.sol(), [&](int d) { counter3 += d; });
-        sol::function fn4 = sol::make_object(mLua.sol(), [&](int d) { counter4 += d; });
+        sol::function fn1 = sol::make_object(mLua.unsafeState(), [&]() { counter1++; });
+        sol::function fn2 = sol::make_object(mLua.unsafeState(), [&]() { counter2++; });
+        sol::function fn3 = sol::make_object(mLua.unsafeState(), [&](int d) { counter3 += d; });
+        sol::function fn4 = sol::make_object(mLua.unsafeState(), [&](int d) { counter4 += d; });
 
         scripts.registerTimerCallback(test1Id, "A", fn3);
         scripts.registerTimerCallback(test1Id, "B", fn4);
@@ -391,12 +482,16 @@ CUSTOM, PLAYER: useInterface.lua
 
         scripts.processTimers(1, 2);
 
-        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 10, test1Id, "B", sol::make_object(mLua.sol(), 3));
-        scripts.setupSerializableTimer(TimerType::GAME_TIME, 10, test2Id, "B", sol::make_object(mLua.sol(), 4));
-        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 5, test1Id, "A", sol::make_object(mLua.sol(), 1));
-        scripts.setupSerializableTimer(TimerType::GAME_TIME, 5, test2Id, "A", sol::make_object(mLua.sol(), 2));
-        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 15, test1Id, "A", sol::make_object(mLua.sol(), 10));
-        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 15, test1Id, "B", sol::make_object(mLua.sol(), 20));
+        scripts.setupSerializableTimer(
+            TimerType::SIMULATION_TIME, 10, test1Id, "B", sol::make_object(mLua.unsafeState(), 3));
+        scripts.setupSerializableTimer(TimerType::GAME_TIME, 10, test2Id, "B", sol::make_object(mLua.unsafeState(), 4));
+        scripts.setupSerializableTimer(
+            TimerType::SIMULATION_TIME, 5, test1Id, "A", sol::make_object(mLua.unsafeState(), 1));
+        scripts.setupSerializableTimer(TimerType::GAME_TIME, 5, test2Id, "A", sol::make_object(mLua.unsafeState(), 2));
+        scripts.setupSerializableTimer(
+            TimerType::SIMULATION_TIME, 15, test1Id, "A", sol::make_object(mLua.unsafeState(), 10));
+        scripts.setupSerializableTimer(
+            TimerType::SIMULATION_TIME, 15, test1Id, "B", sol::make_object(mLua.unsafeState(), 20));
 
         scripts.setupUnsavableTimer(TimerType::SIMULATION_TIME, 10, test2Id, fn2);
         scripts.setupUnsavableTimer(TimerType::GAME_TIME, 10, test1Id, fn2);
@@ -446,7 +541,8 @@ CUSTOM, PLAYER: useInterface.lua
 
     TEST_F(LuaScriptsContainerTest, CallbackWrapper)
     {
-        LuaUtil::Callback callback{ mLua.sol()["print"], mLua.newTable() };
+        sol::state_view view = mLua.unsafeState();
+        LuaUtil::Callback callback{ view["print"], sol::table(view, sol::create) };
         callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptDebugNameKey] = "some_script.lua";
         callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{ nullptr, 0 };
 
@@ -458,10 +554,99 @@ CUSTOM, PLAYER: useInterface.lua
         callback.call(1.5, 2.5);
         EXPECT_EQ(internal::GetCapturedStdout(), "1.5\t2.5\n");
 
+        const Debug::Level level = std::exchange(Log::sMinDebugLevel, Debug::All);
+
         testing::internal::CaptureStdout();
         callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = sol::nil;
         callback.call(1.5, 2.5);
         EXPECT_EQ(internal::GetCapturedStdout(), "Ignored callback to the removed script some_script.lua\n");
+
+        Log::sMinDebugLevel = level;
     }
 
+    TEST_F(LuaScriptsContainerTest, Unload)
+    {
+        LuaUtil::ScriptTracker tracker;
+        LuaUtil::ScriptsContainer scripts1(&mLua, "Test", &tracker, false);
+
+        EXPECT_TRUE(scripts1.addCustomScript(*mCfg.findId(unloadPath)));
+        EXPECT_EQ(tracker.size(), 1);
+
+        mLua.protectedCall([&](LuaUtil::LuaView& lua) {
+            scripts1.receiveEvent("Set", LuaUtil::serialize(lua.sol().create_table_with("x", 3, "y", 2, "z", 1)));
+            testing::internal::CaptureStdout();
+            for (int i = 0; i < 600; ++i)
+                tracker.unloadInactiveScripts(lua);
+            EXPECT_EQ(tracker.size(), 0);
+            scripts1.receiveEvent("Set", LuaUtil::serialize(lua.sol().create_table_with("x", 10, "y", 20, "z", 30)));
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                "Test[unload.lua]:\tsaving\t3\t2\t1\n"
+                "Test[unload.lua]:\tloaded\t3\t2\t0\n");
+        });
+        EXPECT_EQ(tracker.size(), 1);
+        ESM::LuaScripts data;
+        scripts1.save(data);
+        EXPECT_EQ(tracker.size(), 1);
+        mLua.protectedCall([&](LuaUtil::LuaView& lua) {
+            for (int i = 0; i < 600; ++i)
+                tracker.unloadInactiveScripts(lua);
+        });
+        EXPECT_EQ(tracker.size(), 0);
+        scripts1.load(data);
+        EXPECT_EQ(tracker.size(), 0);
+    }
+
+    TEST_F(LuaScriptsContainerTest, LoadOrderChange)
+    {
+        LuaUtil::ScriptTracker tracker;
+        LuaUtil::ScriptsContainer scripts1(&mLua, "Test", &tracker, false);
+        LuaUtil::BasicSerializer serializer1;
+        LuaUtil::BasicSerializer serializer2([](int contentFileIndex) -> int {
+            if (contentFileIndex == 12)
+                return 34;
+            else if (contentFileIndex == 37)
+                return 12;
+            return contentFileIndex;
+        });
+        scripts1.setSerializer(&serializer1);
+        scripts1.setSavedDataDeserializer(&serializer2);
+
+        mLua.protectedCall([&](LuaUtil::LuaView& lua) {
+            sol::object id1 = sol::make_object_userdata(lua.sol(), ESM::RefNum{ 42, 12 });
+            sol::object id2 = sol::make_object_userdata(lua.sol(), ESM::RefNum{ 13, 37 });
+            sol::table table = lua.newTable();
+            table[id1] = id2;
+            LuaUtil::BinaryData serialized = LuaUtil::serialize(table, &serializer1);
+
+            EXPECT_TRUE(scripts1.addCustomScript(*mCfg.findId(customDataPath), serialized));
+            EXPECT_EQ(tracker.size(), 1);
+            for (int i = 0; i < 600; ++i)
+                tracker.unloadInactiveScripts(lua);
+            EXPECT_EQ(tracker.size(), 0);
+            scripts1.receiveEvent("WakeUp", {});
+            EXPECT_EQ(tracker.size(), 1);
+        });
+
+        ESM::LuaScripts data1;
+        ESM::LuaScripts data2;
+        scripts1.save(data1);
+        scripts1.load(data1);
+        scripts1.save(data2);
+        EXPECT_NE(data1.mScripts[0].mData, data2.mScripts[0].mData);
+
+        mLua.protectedCall([&](LuaUtil::LuaView& lua) {
+            sol::object deserialized = LuaUtil::deserialize(lua.sol(), data2.mScripts[0].mData, &serializer1);
+            EXPECT_TRUE(deserialized.is<sol::table>());
+            sol::table table = deserialized;
+            for (const auto& [key, value] : table)
+            {
+                EXPECT_TRUE(key.is<ESM::RefNum>());
+                EXPECT_TRUE(value.is<ESM::RefNum>());
+                EXPECT_EQ(key.as<ESM::RefNum>(), (ESM::RefNum{ 42, 34 }));
+                EXPECT_EQ(value.as<ESM::RefNum>(), (ESM::RefNum{ 13, 12 }));
+                return;
+            }
+            EXPECT_FALSE(true);
+        });
+    }
 }
diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/components_tests/lua/test_serialization.cpp
similarity index 99%
rename from apps/openmw_test_suite/lua/test_serialization.cpp
rename to apps/components_tests/lua/test_serialization.cpp
index 56a6210b28..cff41dde9a 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/components_tests/lua/test_serialization.cpp
@@ -1,4 +1,4 @@
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <osg/Matrixf>
@@ -13,7 +13,7 @@
 #include <components/misc/color.hpp>
 #include <components/misc/endianness.hpp>
 
-#include "../testing_util.hpp"
+#include <components/testing/expecterror.hpp>
 
 namespace
 {
diff --git a/apps/components_tests/lua/test_storage.cpp b/apps/components_tests/lua/test_storage.cpp
new file mode 100644
index 0000000000..cf6db0ca64
--- /dev/null
+++ b/apps/components_tests/lua/test_storage.cpp
@@ -0,0 +1,128 @@
+#include <filesystem>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <components/lua/asyncpackage.hpp>
+#include <components/lua/storage.hpp>
+
+namespace
+{
+    using namespace testing;
+
+    template <typename T>
+    T get(sol::state_view& lua, std::string luaCode)
+    {
+        return lua.safe_script("return " + luaCode).get<T>();
+    }
+
+    TEST(LuaUtilStorageTest, Subscribe)
+    {
+        // Note: LuaUtil::Callback can be used only if Lua is initialized via LuaUtil::LuaState
+        LuaUtil::LuaState luaState{ nullptr, nullptr };
+        luaState.protectedCall([](LuaUtil::LuaView& view) {
+            sol::state_view& lua = view.sol();
+            LuaUtil::LuaStorage::initLuaBindings(view);
+            LuaUtil::LuaStorage storage;
+            storage.setActive(true);
+
+            sol::table callbackHiddenData(lua, sol::create);
+            callbackHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{};
+            LuaUtil::getAsyncPackageInitializer(
+                lua.lua_state(), []() { return 0.0; }, []() { return 0.0; })(callbackHiddenData);
+            lua["async"] = LuaUtil::AsyncPackageId{ nullptr, 0, callbackHiddenData };
+
+            lua["mutable"] = storage.getMutableSection(lua, "test");
+            lua["ro"] = storage.getReadOnlySection(lua, "test");
+
+            lua.safe_script(R"(
+                callbackCalls = {}
+                ro:subscribe(async:callback(function(section, key)
+                    table.insert(callbackCalls, section .. '_' .. (key or '*'))
+                end))
+            )");
+
+            lua.safe_script("mutable:set('x', 5)");
+            EXPECT_EQ(get<int>(lua, "mutable:get('x')"), 5);
+            EXPECT_EQ(get<int>(lua, "ro:get('x')"), 5);
+
+            EXPECT_THROW(lua.safe_script("ro:set('y', 3)"), std::exception);
+
+            lua.safe_script("t1 = mutable:asTable()");
+            lua.safe_script("t2 = ro:asTable()");
+            EXPECT_EQ(get<int>(lua, "t1.x"), 5);
+            EXPECT_EQ(get<int>(lua, "t2.x"), 5);
+
+            lua.safe_script("mutable:reset()");
+            EXPECT_TRUE(get<bool>(lua, "ro:get('x') == nil"));
+
+            lua.safe_script("mutable:reset({x=4, y=7})");
+            EXPECT_EQ(get<int>(lua, "ro:get('x')"), 4);
+            EXPECT_EQ(get<int>(lua, "ro:get('y')"), 7);
+
+            EXPECT_THAT(get<std::string>(lua, "table.concat(callbackCalls, ', ')"), "test_x, test_*, test_*");
+        });
+    }
+
+    TEST(LuaUtilStorageTest, Table)
+    {
+        LuaUtil::LuaState luaState{ nullptr, nullptr };
+        luaState.protectedCall([](LuaUtil::LuaView& view) {
+            LuaUtil::LuaStorage::initLuaBindings(view);
+            LuaUtil::LuaStorage storage;
+            auto& lua = view.sol();
+            storage.setActive(true);
+            lua["mutable"] = storage.getMutableSection(lua, "test");
+            lua["ro"] = storage.getReadOnlySection(lua, "test");
+
+            lua.safe_script("mutable:set('x', { y = 'abc', z = 7 })");
+            EXPECT_EQ(get<int>(lua, "mutable:get('x').z"), 7);
+            EXPECT_THROW(lua.safe_script("mutable:get('x').z = 3"), std::exception);
+            EXPECT_NO_THROW(lua.safe_script("mutable:getCopy('x').z = 3"));
+            EXPECT_EQ(get<int>(lua, "mutable:get('x').z"), 7);
+            EXPECT_EQ(get<int>(lua, "ro:get('x').z"), 7);
+            EXPECT_EQ(get<std::string>(lua, "ro:get('x').y"), "abc");
+        });
+    }
+
+    TEST(LuaUtilStorageTest, Saving)
+    {
+        LuaUtil::LuaState luaState{ nullptr, nullptr };
+        luaState.protectedCall([](LuaUtil::LuaView& view) {
+            LuaUtil::LuaStorage::initLuaBindings(view);
+            LuaUtil::LuaStorage storage;
+            auto& lua = view.sol();
+            storage.setActive(true);
+
+            lua["permanent"] = storage.getMutableSection(lua, "permanent");
+            lua["temporary"] = storage.getMutableSection(lua, "temporary");
+            lua.safe_script("temporary:removeOnExit()");
+            lua.safe_script("permanent:set('x', 1)");
+            lua.safe_script("temporary:set('y', 2)");
+
+            const auto tmpFile = std::filesystem::temp_directory_path() / "test_storage.bin";
+            storage.save(lua, tmpFile);
+            EXPECT_EQ(get<int>(lua, "permanent:get('x')"), 1);
+            EXPECT_EQ(get<int>(lua, "temporary:get('y')"), 2);
+
+            storage.clearTemporaryAndRemoveCallbacks();
+            lua["permanent"] = storage.getMutableSection(lua, "permanent");
+            lua["temporary"] = storage.getMutableSection(lua, "temporary");
+            EXPECT_EQ(get<int>(lua, "permanent:get('x')"), 1);
+            EXPECT_TRUE(get<bool>(lua, "temporary:get('y') == nil"));
+
+            lua.safe_script("permanent:set('x', 3)");
+            lua.safe_script("permanent:set('z', 4)");
+
+            LuaUtil::LuaStorage storage2;
+            storage2.setActive(true);
+            storage2.load(lua, tmpFile);
+            lua["permanent"] = storage2.getMutableSection(lua, "permanent");
+            lua["temporary"] = storage2.getMutableSection(lua, "temporary");
+
+            EXPECT_EQ(get<int>(lua, "permanent:get('x')"), 1);
+            EXPECT_TRUE(get<bool>(lua, "permanent:get('z') == nil"));
+            EXPECT_TRUE(get<bool>(lua, "temporary:get('y') == nil"));
+        });
+    }
+
+}
diff --git a/apps/openmw_test_suite/lua/test_ui_content.cpp b/apps/components_tests/lua/test_ui_content.cpp
similarity index 90%
rename from apps/openmw_test_suite/lua/test_ui_content.cpp
rename to apps/components_tests/lua/test_ui_content.cpp
index 01a5cdd370..fcdfd8a1b3 100644
--- a/apps/openmw_test_suite/lua/test_ui_content.cpp
+++ b/apps/components_tests/lua/test_ui_content.cpp
@@ -14,7 +14,8 @@ namespace
         sol::protected_function mNew;
         LuaUiContentTest()
         {
-            mLuaState.addInternalLibSearchPath("resources/lua_libs");
+            mLuaState.addInternalLibSearchPath(
+                std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "components" / "lua_ui");
             mNew = LuaUi::loadContentConstructor(&mLuaState);
         }
 
@@ -26,7 +27,7 @@ namespace
             return LuaUi::ContentView(result.get<sol::table>());
         }
 
-        sol::table makeTable() { return sol::table(mLuaState.sol(), sol::create); }
+        sol::table makeTable() { return sol::table(mLuaState.unsafeState(), sol::create); }
 
         sol::table makeTable(std::string name)
         {
@@ -38,13 +39,14 @@ namespace
 
     TEST_F(LuaUiContentTest, ProtectedMetatable)
     {
-        mLuaState.sol()["makeContent"] = mNew;
-        mLuaState.sol()["M"] = makeContent(makeTable()).getMetatable();
+        sol::state_view sol = mLuaState.unsafeState();
+        sol["makeContent"] = mNew;
+        sol["M"] = makeContent(makeTable()).getMetatable();
         std::string testScript = R"(
             assert(not pcall(function() setmetatable(makeContent{}, {}) end), 'Metatable is not protected')
             assert(getmetatable(makeContent{}) == false, 'Metatable is not protected')
         )";
-        EXPECT_NO_THROW(mLuaState.sol().safe_script(testScript));
+        EXPECT_NO_THROW(sol.safe_script(testScript));
     }
 
     TEST_F(LuaUiContentTest, Create)
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/components_tests/lua/test_utilpackage.cpp
similarity index 88%
rename from apps/openmw_test_suite/lua/test_utilpackage.cpp
rename to apps/components_tests/lua/test_utilpackage.cpp
index 26bdf3408b..a61c0e0306 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/components_tests/lua/test_utilpackage.cpp
@@ -1,10 +1,9 @@
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
-
-#include "../testing_util.hpp"
+#include <components/testing/expecterror.hpp>
 
 namespace
 {
@@ -50,6 +49,10 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "ediv0.x == math.huge and ediv0.y ~= ediv0.y"));
         EXPECT_TRUE(get<bool>(lua, "util.vector2(1, 2):emul(util.vector2(3, 4)) == util.vector2(3, 8)"));
         EXPECT_TRUE(get<bool>(lua, "util.vector2(4, 6):ediv(util.vector2(2, 3)) == util.vector2(2, 2)"));
+        lua.safe_script("swizzle = util.vector2(1, 2)");
+        EXPECT_TRUE(get<bool>(lua, "swizzle.xx == util.vector2(1, 1) and swizzle.yy == util.vector2(2, 2)"));
+        EXPECT_TRUE(get<bool>(lua, "swizzle.y0 == util.vector2(2, 0) and swizzle.x1 == util.vector2(1, 1)"));
+        EXPECT_TRUE(get<bool>(lua, "swizzle['01'] == util.vector2(0, 1) and swizzle['0y'] == util.vector2(0, 2)"));
     }
 
     TEST(LuaUtilPackageTest, Vector3)
@@ -83,6 +86,12 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "ediv0.z == math.huge"));
         EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3):emul(util.vector3(3, 4, 5)) == util.vector3(3, 8, 15)"));
         EXPECT_TRUE(get<bool>(lua, "util.vector3(4, 6, 8):ediv(util.vector3(2, 3, 4)) == util.vector3(2, 2, 2)"));
+        lua.safe_script("swizzle = util.vector3(1, 2, 3)");
+        EXPECT_TRUE(get<bool>(lua, "swizzle.xxx == util.vector3(1, 1, 1)"));
+        EXPECT_TRUE(get<bool>(lua, "swizzle.xyz == swizzle.zyx.zyx"));
+        EXPECT_TRUE(get<bool>(lua, "swizzle.xy0 == util.vector3(1, 2, 0) and swizzle.x11 == util.vector3(1, 1, 1)"));
+        EXPECT_TRUE(
+            get<bool>(lua, "swizzle['001'] == util.vector3(0, 0, 1) and swizzle['0yx'] == util.vector3(0, 2, 1)"));
     }
 
     TEST(LuaUtilPackageTest, Vector4)
@@ -117,6 +126,14 @@ namespace
             get<bool>(lua, "util.vector4(1, 2, 3, 4):emul(util.vector4(3, 4, 5, 6)) == util.vector4(3, 8, 15, 24)"));
         EXPECT_TRUE(
             get<bool>(lua, "util.vector4(4, 6, 8, 9):ediv(util.vector4(2, 3, 4, 3)) == util.vector4(2, 2, 2, 3)"));
+        lua.safe_script("swizzle = util.vector4(1, 2, 3, 4)");
+        EXPECT_TRUE(get<bool>(lua, "swizzle.wwww == util.vector4(4, 4, 4, 4)"));
+        EXPECT_TRUE(get<bool>(lua, "swizzle.xyzw == util.vector4(1, 2, 3, 4)"));
+        EXPECT_TRUE(get<bool>(lua, "swizzle.xyzw == swizzle.wzyx.wzyx"));
+        EXPECT_TRUE(
+            get<bool>(lua, "swizzle.xyz0 == util.vector4(1, 2, 3, 0) and swizzle.w110 == util.vector4(4, 1, 1, 0)"));
+        EXPECT_TRUE(get<bool>(
+            lua, "swizzle['0001'] == util.vector4(0, 0, 0, 1) and swizzle['0yx1'] == util.vector4(0, 2, 1, 1)"));
     }
 
     TEST(LuaUtilPackageTest, Color)
diff --git a/apps/components_tests/lua/test_yaml.cpp b/apps/components_tests/lua/test_yaml.cpp
new file mode 100644
index 0000000000..fa28889440
--- /dev/null
+++ b/apps/components_tests/lua/test_yaml.cpp
@@ -0,0 +1,357 @@
+#include <gtest/gtest.h>
+
+#include <sol/object.hpp>
+#include <sol/state.hpp>
+#include <sol/table.hpp>
+
+#include <yaml-cpp/yaml.h>
+
+#include <components/lua/yamlloader.hpp>
+
+namespace
+{
+    template <typename T>
+    bool checkNumber(sol::state_view& lua, const std::string& inputData, T requiredValue)
+    {
+        sol::object result = LuaUtil::loadYaml(inputData, lua);
+        if (result.get_type() != sol::type::number)
+            return false;
+
+        return result.as<T>() == requiredValue;
+    }
+
+    bool checkBool(sol::state_view& lua, const std::string& inputData, bool requiredValue)
+    {
+        sol::object result = LuaUtil::loadYaml(inputData, lua);
+        if (result.get_type() != sol::type::boolean)
+            return false;
+
+        return result.as<bool>() == requiredValue;
+    }
+
+    bool checkNil(sol::state_view& lua, const std::string& inputData)
+    {
+        sol::object result = LuaUtil::loadYaml(inputData, lua);
+        return result == sol::nil;
+    }
+
+    bool checkNan(sol::state_view& lua, const std::string& inputData)
+    {
+        sol::object result = LuaUtil::loadYaml(inputData, lua);
+        if (result.get_type() != sol::type::number)
+            return false;
+
+        return std::isnan(result.as<double>());
+    }
+
+    bool checkString(sol::state_view& lua, const std::string& inputData, const std::string& requiredValue)
+    {
+        sol::object result = LuaUtil::loadYaml(inputData, lua);
+        if (result.get_type() != sol::type::string)
+            return false;
+
+        return result.as<std::string>() == requiredValue;
+    }
+
+    bool checkString(sol::state_view& lua, const std::string& inputData)
+    {
+        sol::object result = LuaUtil::loadYaml(inputData, lua);
+        if (result.get_type() != sol::type::string)
+            return false;
+
+        return result.as<std::string>() == inputData;
+    }
+
+    TEST(LuaUtilYamlLoader, ScalarTypeDeduction)
+    {
+        sol::state lua;
+
+        ASSERT_TRUE(checkNil(lua, "null"));
+        ASSERT_TRUE(checkNil(lua, "Null"));
+        ASSERT_TRUE(checkNil(lua, "NULL"));
+        ASSERT_TRUE(checkNil(lua, "~"));
+        ASSERT_TRUE(checkNil(lua, ""));
+        ASSERT_FALSE(checkNil(lua, "NUll"));
+        ASSERT_TRUE(checkString(lua, "NUll"));
+        ASSERT_TRUE(checkString(lua, "'null'", "null"));
+
+        ASSERT_TRUE(checkNumber(lua, "017", 17));
+        ASSERT_TRUE(checkNumber(lua, "-017", -17));
+        ASSERT_TRUE(checkNumber(lua, "+017", 17));
+        ASSERT_TRUE(checkNumber(lua, "17", 17));
+        ASSERT_TRUE(checkNumber(lua, "-17", -17));
+        ASSERT_TRUE(checkNumber(lua, "+17", 17));
+        ASSERT_TRUE(checkNumber(lua, "0o17", 15));
+        ASSERT_TRUE(checkString(lua, "-0o17"));
+        ASSERT_TRUE(checkString(lua, "+0o17"));
+        ASSERT_TRUE(checkString(lua, "0b1"));
+        ASSERT_TRUE(checkString(lua, "1:00"));
+        ASSERT_TRUE(checkString(lua, "'17'", "17"));
+        ASSERT_TRUE(checkNumber(lua, "0x17", 23));
+        ASSERT_TRUE(checkString(lua, "'-0x17'", "-0x17"));
+        ASSERT_TRUE(checkString(lua, "'+0x17'", "+0x17"));
+
+        ASSERT_TRUE(checkNumber(lua, "2.1e-05", 2.1e-5));
+        ASSERT_TRUE(checkNumber(lua, "-2.1e-05", -2.1e-5));
+        ASSERT_TRUE(checkNumber(lua, "+2.1e-05", 2.1e-5));
+        ASSERT_TRUE(checkNumber(lua, "2.1e+5", 210000));
+        ASSERT_TRUE(checkNumber(lua, "-2.1e+5", -210000));
+        ASSERT_TRUE(checkNumber(lua, "+2.1e+5", 210000));
+        ASSERT_TRUE(checkNumber(lua, "0.27", 0.27));
+        ASSERT_TRUE(checkNumber(lua, "-0.27", -0.27));
+        ASSERT_TRUE(checkNumber(lua, "+0.27", 0.27));
+        ASSERT_TRUE(checkNumber(lua, "2.7", 2.7));
+        ASSERT_TRUE(checkNumber(lua, "-2.7", -2.7));
+        ASSERT_TRUE(checkNumber(lua, "+2.7", 2.7));
+        ASSERT_TRUE(checkNumber(lua, ".27", 0.27));
+        ASSERT_TRUE(checkNumber(lua, "-.27", -0.27));
+        ASSERT_TRUE(checkNumber(lua, "+.27", 0.27));
+        ASSERT_TRUE(checkNumber(lua, "27.", 27.0));
+        ASSERT_TRUE(checkNumber(lua, "-27.", -27.0));
+        ASSERT_TRUE(checkNumber(lua, "+27.", 27.0));
+
+        ASSERT_TRUE(checkNan(lua, ".nan"));
+        ASSERT_TRUE(checkNan(lua, ".NaN"));
+        ASSERT_TRUE(checkNan(lua, ".NAN"));
+        ASSERT_FALSE(checkNan(lua, "nan"));
+        ASSERT_FALSE(checkNan(lua, ".nAn"));
+        ASSERT_TRUE(checkString(lua, "'.nan'", ".nan"));
+        ASSERT_TRUE(checkString(lua, ".nAn"));
+
+        ASSERT_TRUE(checkNumber(lua, "1.7976931348623157E+308", std::numeric_limits<double>::max()));
+        ASSERT_TRUE(checkNumber(lua, "-1.7976931348623157E+308", std::numeric_limits<double>::lowest()));
+        ASSERT_TRUE(checkNumber(lua, "2.2250738585072014e-308", std::numeric_limits<double>::min()));
+        ASSERT_TRUE(checkNumber(lua, ".inf", std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, "+.inf", std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, "-.inf", -std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, ".Inf", std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, "+.Inf", std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, "-.Inf", -std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, ".INF", std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, "+.INF", std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkNumber(lua, "-.INF", -std::numeric_limits<double>::infinity()));
+        ASSERT_TRUE(checkString(lua, ".INf"));
+        ASSERT_TRUE(checkString(lua, "-.INf"));
+        ASSERT_TRUE(checkString(lua, "+.INf"));
+
+        ASSERT_TRUE(checkBool(lua, "true", true));
+        ASSERT_TRUE(checkBool(lua, "false", false));
+        ASSERT_TRUE(checkBool(lua, "True", true));
+        ASSERT_TRUE(checkBool(lua, "False", false));
+        ASSERT_TRUE(checkBool(lua, "TRUE", true));
+        ASSERT_TRUE(checkBool(lua, "FALSE", false));
+        ASSERT_TRUE(checkString(lua, "y"));
+        ASSERT_TRUE(checkString(lua, "n"));
+        ASSERT_TRUE(checkString(lua, "On"));
+        ASSERT_TRUE(checkString(lua, "Off"));
+        ASSERT_TRUE(checkString(lua, "YES"));
+        ASSERT_TRUE(checkString(lua, "NO"));
+        ASSERT_TRUE(checkString(lua, "TrUe"));
+        ASSERT_TRUE(checkString(lua, "FaLsE"));
+        ASSERT_TRUE(checkString(lua, "'true'", "true"));
+    }
+
+    TEST(LuaUtilYamlLoader, DepthLimit)
+    {
+        sol::state lua;
+
+        const std::string input = R"(
+            array1: &array1_alias
+              [
+                 <: *array1_alias,
+                 foo
+              ]
+            )";
+
+        bool depthExceptionThrown = false;
+        try
+        {
+            YAML::Node root = YAML::Load(input);
+            sol::object result = LuaUtil::loadYaml(input, lua);
+        }
+        catch (const std::runtime_error& e)
+        {
+            ASSERT_EQ(std::string(e.what()), "Maximum layers depth exceeded, probably caused by a circular reference");
+            depthExceptionThrown = true;
+        }
+
+        ASSERT_TRUE(depthExceptionThrown);
+    }
+
+    TEST(LuaUtilYamlLoader, Collections)
+    {
+        sol::state lua;
+
+        sol::object map = LuaUtil::loadYaml("{ x: , y: 2, 4: 5 }", lua);
+        ASSERT_EQ(map.as<sol::table>()["x"], sol::nil);
+        ASSERT_EQ(map.as<sol::table>()["y"], 2);
+        ASSERT_EQ(map.as<sol::table>()[4], 5);
+
+        sol::object array = LuaUtil::loadYaml("[ 3, 4 ]", lua);
+        ASSERT_EQ(array.as<sol::table>()[1], 3);
+
+        sol::object emptyTable = LuaUtil::loadYaml("{}", lua);
+        ASSERT_TRUE(emptyTable.as<sol::table>().empty());
+
+        sol::object emptyArray = LuaUtil::loadYaml("[]", lua);
+        ASSERT_TRUE(emptyArray.as<sol::table>().empty());
+
+        ASSERT_THROW(LuaUtil::loadYaml("{ null: 1 }", lua), std::runtime_error);
+        ASSERT_THROW(LuaUtil::loadYaml("{ .nan: 1 }", lua), std::runtime_error);
+
+        const std::string scalarArrayInput = R"(
+            - First Scalar
+            - 1
+            - true)";
+
+        sol::object scalarArray = LuaUtil::loadYaml(scalarArrayInput, lua);
+        ASSERT_EQ(scalarArray.as<sol::table>()[1], std::string("First Scalar"));
+        ASSERT_EQ(scalarArray.as<sol::table>()[2], 1);
+        ASSERT_EQ(scalarArray.as<sol::table>()[3], true);
+
+        const std::string scalarMapWithCommentsInput = R"(
+            string: 'str' # String value
+            integer: 65 # Integer value
+            float: 0.278 # Float value
+            bool: false # Boolean value)";
+
+        sol::object scalarMapWithComments = LuaUtil::loadYaml(scalarMapWithCommentsInput, lua);
+        ASSERT_EQ(scalarMapWithComments.as<sol::table>()["string"], std::string("str"));
+        ASSERT_EQ(scalarMapWithComments.as<sol::table>()["integer"], 65);
+        ASSERT_EQ(scalarMapWithComments.as<sol::table>()["float"], 0.278);
+        ASSERT_EQ(scalarMapWithComments.as<sol::table>()["bool"], false);
+
+        const std::string mapOfArraysInput = R"(
+            x:
+            - 2
+            - 7
+            - true
+            y:
+            - aaa
+            - false
+            - 1)";
+
+        sol::object mapOfArrays = LuaUtil::loadYaml(mapOfArraysInput, lua);
+        ASSERT_EQ(mapOfArrays.as<sol::table>()["x"][3], true);
+        ASSERT_EQ(mapOfArrays.as<sol::table>()["y"][1], std::string("aaa"));
+
+        const std::string arrayOfMapsInput = R"(
+            -
+              name: Name1
+              hr:   65
+              avg:  0.278
+            -
+              name: Name2
+              hr:   63
+              avg:  0.288)";
+
+        sol::object arrayOfMaps = LuaUtil::loadYaml(arrayOfMapsInput, lua);
+        ASSERT_EQ(arrayOfMaps.as<sol::table>()[1]["avg"], 0.278);
+        ASSERT_EQ(arrayOfMaps.as<sol::table>()[2]["name"], std::string("Name2"));
+
+        const std::string arrayOfArraysInput = R"(
+            - [Name1, 65, 0.278]
+            - [Name2  , 63, 0.288])";
+
+        sol::object arrayOfArrays = LuaUtil::loadYaml(arrayOfArraysInput, lua);
+        ASSERT_EQ(arrayOfArrays.as<sol::table>()[1][2], 65);
+        ASSERT_EQ(arrayOfArrays.as<sol::table>()[2][1], std::string("Name2"));
+
+        const std::string mapOfMapsInput = R"(
+            Name1: {hr: 65, avg: 0.278}
+            Name2 : {
+                hr: 63,
+                avg: 0.288,
+             })";
+
+        sol::object mapOfMaps = LuaUtil::loadYaml(mapOfMapsInput, lua);
+        ASSERT_EQ(mapOfMaps.as<sol::table>()["Name1"]["hr"], 65);
+        ASSERT_EQ(mapOfMaps.as<sol::table>()["Name2"]["avg"], 0.288);
+    }
+
+    TEST(LuaUtilYamlLoader, Structures)
+    {
+        sol::state lua;
+
+        const std::string twoDocumentsInput
+            = "---\n"
+              "    - First Scalar\n"
+              "    - 2\n"
+              "    - true\n"
+              "\n"
+              "---\n"
+              "    - Second Scalar\n"
+              "    - 3\n"
+              "    - false";
+
+        sol::object twoDocuments = LuaUtil::loadYaml(twoDocumentsInput, lua);
+        ASSERT_EQ(twoDocuments.as<sol::table>()[1][1], std::string("First Scalar"));
+        ASSERT_EQ(twoDocuments.as<sol::table>()[2][3], false);
+
+        const std::string anchorInput = R"(---
+            x:
+            - Name1
+            # Following node labeled as "a"
+            - &a Value1
+            y:
+            - *a # Subsequent occurrence
+            - Name2)";
+
+        sol::object anchor = LuaUtil::loadYaml(anchorInput, lua);
+        ASSERT_EQ(anchor.as<sol::table>()["y"][1], std::string("Value1"));
+
+        const std::string compoundKeyInput = R"(
+            ? - String1
+              - String2
+            : - 1
+
+            ? [ String3,
+                String4 ]
+            : [ 2, 3, 4 ])";
+
+        ASSERT_THROW(LuaUtil::loadYaml(compoundKeyInput, lua), std::runtime_error);
+
+        const std::string compactNestedMappingInput = R"(
+            - item    : Item1
+              quantity: 2
+            - item    : Item2
+              quantity: 4
+            - item    : Item3
+              quantity: 11)";
+
+        sol::object compactNestedMapping = LuaUtil::loadYaml(compactNestedMappingInput, lua);
+        ASSERT_EQ(compactNestedMapping.as<sol::table>()[2]["quantity"], 4);
+    }
+
+    TEST(LuaUtilYamlLoader, Scalars)
+    {
+        sol::state lua;
+
+        const std::string literalScalarInput = R"(--- |
+              a
+              b
+              c)";
+
+        ASSERT_TRUE(checkString(lua, literalScalarInput, "a\nb\nc"));
+
+        const std::string foldedScalarInput = R"(--- >
+              a
+              b
+              c)";
+
+        ASSERT_TRUE(checkString(lua, foldedScalarInput, "a b c"));
+
+        const std::string multiLinePlanarScalarsInput = R"(
+            plain:
+              This unquoted scalar
+              spans many lines.
+
+            quoted: "So does this
+              quoted scalar.\n")";
+
+        sol::object multiLinePlanarScalars = LuaUtil::loadYaml(multiLinePlanarScalarsInput, lua);
+        ASSERT_TRUE(
+            multiLinePlanarScalars.as<sol::table>()["plain"] == std::string("This unquoted scalar spans many lines."));
+        ASSERT_TRUE(multiLinePlanarScalars.as<sol::table>()["quoted"] == std::string("So does this quoted scalar.\n"));
+    }
+}
diff --git a/apps/openmw_test_suite/openmw_test_suite.cpp b/apps/components_tests/main.cpp
similarity index 62%
rename from apps/openmw_test_suite/openmw_test_suite.cpp
rename to apps/components_tests/main.cpp
index a2b9f1ae73..dcfb2e9ba9 100644
--- a/apps/openmw_test_suite/openmw_test_suite.cpp
+++ b/apps/components_tests/main.cpp
@@ -1,20 +1,16 @@
-#include <gtest/gtest.h>
+#include <components/debug/debugging.hpp>
+#include <components/misc/strings/conversion.hpp>
+#include <components/settings/parser.hpp>
+#include <components/settings/values.hpp>
 
-#include "components/misc/strings/conversion.hpp"
-#include "components/settings/parser.hpp"
-#include "components/settings/values.hpp"
+#include <gtest/gtest.h>
 
 #include <filesystem>
 
-#ifdef WIN32
-// we cannot use GTEST_API_ before main if we're building standalone exe application,
-// and we're linking GoogleTest / GoogleMock as DLLs and not linking gtest_main / gmock_main
 int main(int argc, char** argv)
 {
-#else
-GTEST_API_ int main(int argc, char** argv)
-{
-#endif
+    Log::sMinDebugLevel = Debug::getDebugLevel();
+
     const std::filesystem::path settingsDefaultPath = std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "files"
         / Misc::StringUtils::stringToU8String("settings-default.cfg");
 
diff --git a/apps/openmw_test_suite/misc/compression.cpp b/apps/components_tests/misc/compression.cpp
similarity index 100%
rename from apps/openmw_test_suite/misc/compression.cpp
rename to apps/components_tests/misc/compression.cpp
diff --git a/apps/openmw_test_suite/misc/progressreporter.cpp b/apps/components_tests/misc/progressreporter.cpp
similarity index 100%
rename from apps/openmw_test_suite/misc/progressreporter.cpp
rename to apps/components_tests/misc/progressreporter.cpp
diff --git a/apps/openmw_test_suite/misc/test_endianness.cpp b/apps/components_tests/misc/test_endianness.cpp
similarity index 100%
rename from apps/openmw_test_suite/misc/test_endianness.cpp
rename to apps/components_tests/misc/test_endianness.cpp
diff --git a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp b/apps/components_tests/misc/test_resourcehelpers.cpp
similarity index 70%
rename from apps/openmw_test_suite/misc/test_resourcehelpers.cpp
rename to apps/components_tests/misc/test_resourcehelpers.cpp
index 0db147d8a3..05079ae875 100644
--- a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
+++ b/apps/components_tests/misc/test_resourcehelpers.cpp
@@ -1,5 +1,6 @@
-#include "../testing_util.hpp"
-#include "components/misc/resourcehelpers.hpp"
+#include <components/misc/resourcehelpers.hpp>
+#include <components/testing/util.hpp>
+
 #include <gtest/gtest.h>
 
 namespace
@@ -7,27 +8,24 @@ namespace
     using namespace Misc::ResourceHelpers;
     TEST(CorrectSoundPath, wav_files_not_overridden_with_mp3_in_vfs_are_not_corrected)
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/bar.wav", nullptr } });
-        EXPECT_EQ(correctSoundPath("sound/bar.wav", mVFS.get()), "sound/bar.wav");
+        constexpr VFS::Path::NormalizedView path("sound/bar.wav");
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { path, nullptr } });
+        EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/bar.wav");
     }
 
     TEST(CorrectSoundPath, wav_files_overridden_with_mp3_in_vfs_are_corrected)
     {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/foo.mp3", nullptr } });
-        EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
+        constexpr VFS::Path::NormalizedView mp3("sound/foo.mp3");
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { mp3, nullptr } });
+        constexpr VFS::Path::NormalizedView wav("sound/foo.wav");
+        EXPECT_EQ(correctSoundPath(wav, *mVFS), "sound/foo.mp3");
     }
 
     TEST(CorrectSoundPath, corrected_path_does_not_check_existence_in_vfs)
     {
         std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
-        EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
-    }
-
-    TEST(CorrectSoundPath, correct_path_normalize_paths)
-    {
-        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
-        EXPECT_EQ(correctSoundPath("sound\\foo.wav", mVFS.get()), "sound/foo.mp3");
-        EXPECT_EQ(correctSoundPath("SOUND\\foo.WAV", mVFS.get()), "sound/foo.mp3");
+        constexpr VFS::Path::NormalizedView path("sound/foo.wav");
+        EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/foo.mp3");
     }
 
     namespace
diff --git a/apps/openmw_test_suite/misc/test_stringops.cpp b/apps/components_tests/misc/test_stringops.cpp
similarity index 100%
rename from apps/openmw_test_suite/misc/test_stringops.cpp
rename to apps/components_tests/misc/test_stringops.cpp
diff --git a/apps/components_tests/misc/testmathutil.cpp b/apps/components_tests/misc/testmathutil.cpp
new file mode 100644
index 0000000000..c4b545c2f4
--- /dev/null
+++ b/apps/components_tests/misc/testmathutil.cpp
@@ -0,0 +1,194 @@
+#include <components/misc/mathutil.hpp>
+
+#include <osg/io_utils>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <iomanip>
+#include <limits>
+
+MATCHER_P2(Vec3fEq, other, precision, "")
+{
+    return std::abs(arg.x() - other.x()) < precision && std::abs(arg.y() - other.y()) < precision
+        && std::abs(arg.z() - other.z()) < precision;
+}
+
+namespace testing
+{
+    template <>
+    inline testing::Message& Message::operator<<(const osg::Vec3f& value)
+    {
+        return (*this) << std::setprecision(std::numeric_limits<float>::max_exponent10) << "osg::Vec3f(" << value.x()
+                       << ", " << value.y() << ", " << value.z() << ')';
+    }
+
+    template <>
+    inline testing::Message& Message::operator<<(const osg::Quat& value)
+    {
+        return (*this) << std::setprecision(std::numeric_limits<float>::max_exponent10) << "osg::Quat(" << value.x()
+                       << ", " << value.y() << ", " << value.z() << ", " << value.w() << ')';
+    }
+}
+
+namespace Misc
+{
+    namespace
+    {
+        using namespace testing;
+
+        struct MiscToEulerAnglesXZQuatTest : TestWithParam<std::pair<osg::Quat, osg::Vec3f>>
+        {
+        };
+
+        TEST_P(MiscToEulerAnglesXZQuatTest, shouldReturnValueCloseTo)
+        {
+            const osg::Vec3f result = toEulerAnglesXZ(GetParam().first);
+            EXPECT_THAT(result, Vec3fEq(GetParam().second, 1e-6))
+                << "toEulerAnglesXZ(" << GetParam().first << ") = " << result;
+        }
+
+        const std::pair<osg::Quat, osg::Vec3f> eulerAnglesXZQuat[] = {
+            {
+                osg::Quat(1, 0, 0, 0),
+                osg::Vec3f(0, 0, osg::PI),
+            },
+            {
+                osg::Quat(0, 1, 0, 0),
+                osg::Vec3f(0, 0, 0),
+            },
+            {
+                osg::Quat(0, 0, 1, 0),
+                osg::Vec3f(0, 0, osg::PI),
+            },
+            {
+                osg::Quat(0, 0, 0, 1),
+                osg::Vec3f(0, 0, 0),
+            },
+            {
+                osg::Quat(-0.5, -0.5, -0.5, -0.5),
+                osg::Vec3f(-osg::PI_2f, 0, 0),
+            },
+            {
+                osg::Quat(0.5, -0.5, -0.5, -0.5),
+                osg::Vec3f(0, 0, -osg::PI_2f),
+            },
+            {
+                osg::Quat(0.5, 0.5, -0.5, -0.5),
+                osg::Vec3f(osg::PI_2f, 0, 0),
+            },
+            {
+                osg::Quat(0.5, 0.5, 0.5, -0.5),
+                osg::Vec3f(0, 0, osg::PI_2f),
+            },
+            {
+                osg::Quat(0.5, 0.5, 0.5, 0.5),
+                osg::Vec3f(-osg::PI_2f, 0, 0),
+            },
+            {
+                // normalized osg::Quat(0.1, 0.2, 0.3, 0.4)
+                osg::Quat(0.18257418583505536, 0.36514837167011072, 0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(-0.72972762584686279296875f, 0, -1.10714876651763916015625f),
+            },
+            {
+                osg::Quat(-0.18257418583505536, 0.36514837167011072, 0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(-0.13373161852359771728515625f, 0, -1.2277724742889404296875f),
+            },
+            {
+                osg::Quat(0.18257418583505536, -0.36514837167011072, 0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(0.13373161852359771728515625f, 0, -1.2277724742889404296875f),
+            },
+            {
+                osg::Quat(0.18257418583505536, 0.36514837167011072, -0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(0.13373161852359771728515625f, 0, 1.2277724742889404296875f),
+            },
+            {
+                osg::Quat(0.18257418583505536, 0.36514837167011072, 0.54772255750516607, -0.73029674334022143),
+                osg::Vec3f(-0.13373161852359771728515625, 0, 1.2277724742889404296875f),
+            },
+            {
+                osg::Quat(0.246736, -0.662657, -0.662667, 0.246739),
+                osg::Vec3f(-osg::PI_2f, 0, 2.5199801921844482421875f),
+            },
+        };
+
+        INSTANTIATE_TEST_SUITE_P(FromQuat, MiscToEulerAnglesXZQuatTest, ValuesIn(eulerAnglesXZQuat));
+
+        struct MiscToEulerAnglesZYXQuatTest : TestWithParam<std::pair<osg::Quat, osg::Vec3f>>
+        {
+        };
+
+        TEST_P(MiscToEulerAnglesZYXQuatTest, shouldReturnValueCloseTo)
+        {
+            const osg::Vec3f result = toEulerAnglesZYX(GetParam().first);
+            EXPECT_THAT(result, Vec3fEq(GetParam().second, std::numeric_limits<float>::epsilon()))
+                << "toEulerAnglesZYX(" << GetParam().first << ") = " << result;
+        }
+
+        const std::pair<osg::Quat, osg::Vec3f> eulerAnglesZYXQuat[] = {
+            {
+                osg::Quat(1, 0, 0, 0),
+                osg::Vec3f(osg::PI, 0, 0),
+            },
+            {
+                osg::Quat(0, 1, 0, 0),
+                osg::Vec3f(osg::PI, 0, osg::PI),
+            },
+            {
+                osg::Quat(0, 0, 1, 0),
+                osg::Vec3f(0, 0, osg::PI),
+            },
+            {
+                osg::Quat(0, 0, 0, 1),
+                osg::Vec3f(0, 0, 0),
+            },
+            {
+                osg::Quat(-0.5, -0.5, -0.5, -0.5),
+                osg::Vec3f(0, -osg::PI_2f, -osg::PI_2f),
+            },
+            {
+                osg::Quat(0.5, -0.5, -0.5, -0.5),
+                osg::Vec3f(osg::PI_2f, 0, -osg::PI_2f),
+            },
+            {
+                osg::Quat(0.5, 0.5, -0.5, -0.5),
+                osg::Vec3f(0, osg::PI_2f, -osg::PI_2f),
+            },
+            {
+                osg::Quat(0.5, 0.5, 0.5, -0.5),
+                osg::Vec3f(osg::PI_2f, 0, osg::PI_2f),
+            },
+            {
+                osg::Quat(0.5, 0.5, 0.5, 0.5),
+                osg::Vec3f(0, -osg::PI_2f, -osg::PI_2f),
+            },
+            {
+                // normalized osg::Quat(0.1, 0.2, 0.3, 0.4)
+                osg::Quat(0.18257418583505536, 0.36514837167011072, 0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(0.1973955929279327392578125f, -0.8232119083404541015625f, -1.37340080738067626953125f),
+            },
+            {
+                osg::Quat(-0.18257418583505536, 0.36514837167011072, 0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(0.78539812564849853515625f, -0.339836895465850830078125f, -1.428899288177490234375f),
+            },
+            {
+                osg::Quat(0.18257418583505536, -0.36514837167011072, 0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(-0.78539812564849853515625f, 0.339836895465850830078125f, -1.428899288177490234375f),
+            },
+            {
+                osg::Quat(0.18257418583505536, 0.36514837167011072, -0.54772255750516607, 0.73029674334022143),
+                osg::Vec3f(-0.78539812564849853515625f, -0.339836895465850830078125f, 1.428899288177490234375f),
+            },
+            {
+                osg::Quat(0.18257418583505536, 0.36514837167011072, 0.54772255750516607, -0.73029674334022143),
+                osg::Vec3f(0.78539812564849853515625f, 0.339836895465850830078125f, 1.428899288177490234375f),
+            },
+            {
+                osg::Quat(0.246736, -0.662657, 0.246739, -0.662667),
+                osg::Vec3f(0.06586204469203948974609375f, -osg::PI_2f, 0.64701664447784423828125f),
+            },
+        };
+
+        INSTANTIATE_TEST_SUITE_P(FromQuat, MiscToEulerAnglesZYXQuatTest, ValuesIn(eulerAnglesZYXQuat));
+    }
+}
diff --git a/apps/components_tests/nif/node.hpp b/apps/components_tests/nif/node.hpp
new file mode 100644
index 0000000000..4e21698501
--- /dev/null
+++ b/apps/components_tests/nif/node.hpp
@@ -0,0 +1,71 @@
+#ifndef OPENMW_TEST_SUITE_NIF_NODE_H
+#define OPENMW_TEST_SUITE_NIF_NODE_H
+
+#include <components/nif/data.hpp>
+#include <components/nif/node.hpp>
+
+namespace Nif::Testing
+{
+    inline void init(NiTransform& value)
+    {
+        value = NiTransform::getIdentity();
+    }
+
+    inline void init(Extra& value)
+    {
+        value.mNext = ExtraPtr(nullptr);
+    }
+
+    inline void init(NiObjectNET& value)
+    {
+        value.mExtra = ExtraPtr(nullptr);
+        value.mExtraList = ExtraList();
+        value.mController = NiTimeControllerPtr(nullptr);
+    }
+
+    inline void init(NiAVObject& value)
+    {
+        init(static_cast<NiObjectNET&>(value));
+        value.mFlags = 0;
+        init(value.mTransform);
+    }
+
+    inline void init(NiGeometry& value)
+    {
+        init(static_cast<NiAVObject&>(value));
+        value.mData = NiGeometryDataPtr(nullptr);
+        value.mSkin = NiSkinInstancePtr(nullptr);
+    }
+
+    inline void init(NiTriShape& value)
+    {
+        init(static_cast<NiGeometry&>(value));
+        value.recType = RC_NiTriShape;
+    }
+
+    inline void init(NiTriStrips& value)
+    {
+        init(static_cast<NiGeometry&>(value));
+        value.recType = RC_NiTriStrips;
+    }
+
+    inline void init(NiSkinInstance& value)
+    {
+        value.mData = NiSkinDataPtr(nullptr);
+        value.mRoot = NiAVObjectPtr(nullptr);
+        value.mPartitions = NiSkinPartitionPtr(nullptr);
+    }
+
+    inline void init(NiTimeController& value)
+    {
+        value.mNext = NiTimeControllerPtr(nullptr);
+        value.mFlags = 0;
+        value.mFrequency = 0;
+        value.mPhase = 0;
+        value.mTimeStart = 0;
+        value.mTimeStop = 0;
+        value.mTarget = NiObjectNETPtr(nullptr);
+    }
+}
+
+#endif
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/components_tests/nifloader/testbulletnifloader.cpp
similarity index 61%
rename from apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
rename to apps/components_tests/nifloader/testbulletnifloader.cpp
index 25df366d23..c6df103858 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/components_tests/nifloader/testbulletnifloader.cpp
@@ -144,6 +144,12 @@ namespace Resource
         return stream << "}}";
     }
 
+    static std::ostream& operator<<(std::ostream& stream, const ScaledTriangleMeshShape& value)
+    {
+        return stream << "Resource::ScaledTriangleMeshShape {" << value.getLocalScaling() << ", "
+                      << value.getChildShape() << "}";
+    }
+
     static bool operator==(const CollisionBox& l, const CollisionBox& r)
     {
         const auto tie = [](const CollisionBox& v) { return std::tie(v.mExtents, v.mCenter); };
@@ -169,6 +175,10 @@ static std::ostream& operator<<(std::ostream& stream, const btCollisionShape& va
             if (const auto casted = dynamic_cast<const Resource::TriangleMeshShape*>(&value))
                 return stream << *casted;
             break;
+        case SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE:
+            if (const auto casted = dynamic_cast<const Resource::ScaledTriangleMeshShape*>(&value))
+                return stream << *casted;
+            break;
     }
     return stream << "btCollisionShape {" << value.getShapeType() << "}";
 }
@@ -249,6 +259,12 @@ static bool operator==(const btBvhTriangleMeshShape& lhs, const btBvhTriangleMes
         && lhs.getOwnsBvh() == rhs.getOwnsBvh() && isNear(getTriangles(lhs), getTriangles(rhs));
 }
 
+static bool operator==(const btScaledBvhTriangleMeshShape& lhs, const btScaledBvhTriangleMeshShape& rhs)
+{
+    return isNear(lhs.getLocalScaling(), rhs.getLocalScaling())
+        && compareObjects(lhs.getChildShape(), rhs.getChildShape());
+}
+
 static bool operator==(const btCollisionShape& lhs, const btCollisionShape& rhs)
 {
     if (lhs.getShapeType() != rhs.getShapeType())
@@ -264,6 +280,11 @@ static bool operator==(const btCollisionShape& lhs, const btCollisionShape& rhs)
                 if (const auto rhsCasted = dynamic_cast<const Resource::TriangleMeshShape*>(&rhs))
                     return *lhsCasted == *rhsCasted;
             return false;
+        case SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE:
+            if (const auto lhsCasted = dynamic_cast<const Resource::ScaledTriangleMeshShape*>(&lhs))
+                if (const auto rhsCasted = dynamic_cast<const Resource::ScaledTriangleMeshShape*>(&rhs))
+                    return *lhsCasted == *rhsCasted;
+            return false;
     }
     return false;
 }
@@ -274,19 +295,22 @@ namespace
     using namespace Nif::Testing;
     using NifBullet::BulletNifLoader;
 
-    void copy(const btTransform& src, Nif::Transformation& dst)
+    constexpr VFS::Path::NormalizedView testNif("test.nif");
+    constexpr VFS::Path::NormalizedView xtestNif("xtest.nif");
+
+    void copy(const btTransform& src, Nif::NiTransform& dst)
     {
-        dst.pos = osg::Vec3f(src.getOrigin().x(), src.getOrigin().y(), src.getOrigin().z());
+        dst.mTranslation = osg::Vec3f(src.getOrigin().x(), src.getOrigin().y(), src.getOrigin().z());
         for (int row = 0; row < 3; ++row)
             for (int column = 0; column < 3; ++column)
-                dst.rotation.mValues[row][column] = src.getBasis().getRow(row)[column];
+                dst.mRotation.mValues[row][column] = src.getBasis().getRow(row)[column];
     }
 
     struct TestBulletNifLoader : Test
     {
         BulletNifLoader mLoader;
-        Nif::Node mNode;
-        Nif::Node mNode2;
+        Nif::NiAVObject mNode;
+        Nif::NiAVObject mNode2;
         Nif::NiNode mNiNode;
         Nif::NiNode mNiNode2;
         Nif::NiNode mNiNode3;
@@ -300,7 +324,7 @@ namespace
         Nif::NiStringExtraData mNiStringExtraData;
         Nif::NiStringExtraData mNiStringExtraData2;
         Nif::NiIntegerExtraData mNiIntegerExtraData;
-        Nif::Controller mController;
+        Nif::NiTimeController mController;
         btTransform mTransform{ btMatrix3x3(btQuaternion(btVector3(1, 0, 0), 0.5f)), btVector3(1, 2, 3) };
         btTransform mTransformScale2{ btMatrix3x3(btQuaternion(btVector3(1, 0, 0), 0.5f)), btVector3(2, 4, 6) };
         btTransform mTransformScale3{ btMatrix3x3(btQuaternion(btVector3(1, 0, 0), 0.5f)), btVector3(3, 6, 9) };
@@ -323,29 +347,29 @@ namespace
             init(mController);
 
             mNiTriShapeData.recType = Nif::RC_NiTriShapeData;
-            mNiTriShapeData.vertices = { osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0) };
+            mNiTriShapeData.mVertices = { osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0) };
             mNiTriShapeData.mNumTriangles = 1;
-            mNiTriShapeData.triangles = { 0, 1, 2 };
-            mNiTriShape.data = Nif::NiGeometryDataPtr(&mNiTriShapeData);
+            mNiTriShapeData.mTriangles = { 0, 1, 2 };
+            mNiTriShape.mData = Nif::NiGeometryDataPtr(&mNiTriShapeData);
 
             mNiTriShapeData2.recType = Nif::RC_NiTriShapeData;
-            mNiTriShapeData2.vertices = { osg::Vec3f(0, 0, 1), osg::Vec3f(1, 0, 1), osg::Vec3f(1, 1, 1) };
+            mNiTriShapeData2.mVertices = { osg::Vec3f(0, 0, 1), osg::Vec3f(1, 0, 1), osg::Vec3f(1, 1, 1) };
             mNiTriShapeData2.mNumTriangles = 1;
-            mNiTriShapeData2.triangles = { 0, 1, 2 };
-            mNiTriShape2.data = Nif::NiGeometryDataPtr(&mNiTriShapeData2);
+            mNiTriShapeData2.mTriangles = { 0, 1, 2 };
+            mNiTriShape2.mData = Nif::NiGeometryDataPtr(&mNiTriShapeData2);
 
             mNiTriStripsData.recType = Nif::RC_NiTriStripsData;
-            mNiTriStripsData.vertices
+            mNiTriStripsData.mVertices
                 = { osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0), osg::Vec3f(0, 1, 0) };
             mNiTriStripsData.mNumTriangles = 2;
-            mNiTriStripsData.strips = { { 0, 1, 2, 3 } };
-            mNiTriStrips.data = Nif::NiGeometryDataPtr(&mNiTriStripsData);
+            mNiTriStripsData.mStrips = { { 0, 1, 2, 3 } };
+            mNiTriStrips.mData = Nif::NiGeometryDataPtr(&mNiTriStripsData);
         }
     };
 
     TEST_F(TestBulletNifLoader, for_zero_num_roots_should_return_default)
     {
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mHash = mHash;
 
         const auto result = mLoader.load(file);
@@ -359,7 +383,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, should_ignore_nullptr_root)
     {
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(nullptr);
         file.mHash = mHash;
 
@@ -372,7 +396,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_default_root_nif_node_should_return_default)
     {
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNode);
         file.mHash = mHash;
 
@@ -387,7 +411,7 @@ namespace
     {
         mNode.recType = Nif::RC_RootCollisionNode;
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNode);
         file.mHash = mHash;
 
@@ -400,7 +424,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_default_root_nif_node_and_filename_starting_with_x_should_return_default)
     {
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNode);
         file.mHash = mHash;
 
@@ -411,43 +435,94 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
+    TEST_F(TestBulletNifLoader, for_root_bounding_box_should_return_shape_with_bounding_box_data)
+    {
+        mNode.mName = "Bounding Box";
+        mNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
+        mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);
+
+        Nif::NIFFile file(testNif);
+        file.mRoots.push_back(&mNode);
+        file.mHash = mHash;
+
+        const auto result = mLoader.load(file);
+
+        Resource::BulletShape expected;
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, for_child_bounding_box_should_return_shape_with_bounding_box_data)
+    {
+        mNode.mName = "Bounding Box";
+        mNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
+        mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);
+        mNode.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode) };
+
+        Nif::NIFFile file(testNif);
+        file.mRoots.push_back(&mNiNode);
+        file.mHash = mHash;
+
+        const auto result = mLoader.load(file);
+
+        Resource::BulletShape expected;
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, for_root_with_bounds_and_child_bounding_box_should_use_bounding_box)
+    {
+        mNode.mName = "Bounding Box";
+        mNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
+        mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);
+        mNode.mParents.push_back(&mNiNode);
+
+        mNiNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNiNode.mBounds.mBox.mExtents = osg::Vec3f(4, 5, 6);
+        mNiNode.mBounds.mBox.mCenter = osg::Vec3f(-4, -5, -6);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode) };
+
+        Nif::NIFFile file(testNif);
+        file.mRoots.push_back(&mNiNode);
+        file.mHash = mHash;
+
+        const auto result = mLoader.load(file);
+
+        Resource::BulletShape expected;
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
+
+        EXPECT_EQ(*result, expected);
+    }
+
     TEST_F(
-        TestBulletNifLoader, for_root_nif_node_with_bounding_box_should_return_shape_with_compound_shape_and_box_inside)
+        TestBulletNifLoader, for_root_and_two_children_where_both_with_bounds_but_one_is_bounding_box_use_bounding_box)
     {
-        mNode.hasBounds = true;
-        mNode.flags |= Nif::Node::Flag_BBoxCollision;
-        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
-        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
+        mNode.mName = "Bounding Box";
+        mNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
+        mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);
+        mNode.mParents.push_back(&mNiNode);
 
-        Nif::NIFFile file("test.nif");
-        file.mRoots.push_back(&mNode);
-        file.mHash = mHash;
+        mNode2.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode2.mBounds.mBox.mExtents = osg::Vec3f(4, 5, 6);
+        mNode2.mBounds.mBox.mCenter = osg::Vec3f(-4, -5, -6);
+        mNode2.mParents.push_back(&mNiNode);
 
-        const auto result = mLoader.load(file);
+        mNiNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNiNode.mBounds.mBox.mExtents = osg::Vec3f(7, 8, 9);
+        mNiNode.mBounds.mBox.mCenter = osg::Vec3f(-7, -8, -9);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode), Nif::NiAVObjectPtr(&mNode2) };
 
-        Resource::BulletShape expected;
-        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
-        std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
-        std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape.reset(shape.release());
-
-        EXPECT_EQ(*result, expected);
-    }
-
-    TEST_F(TestBulletNifLoader, for_child_nif_node_with_bounding_box)
-    {
-        mNode.hasBounds = true;
-        mNode.flags |= Nif::Node::Flag_BBoxCollision;
-        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
-        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode) }));
-
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -456,109 +531,30 @@ namespace
         Resource::BulletShape expected;
         expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
         expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
-        std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
-        std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape.reset(shape.release());
 
         EXPECT_EQ(*result, expected);
     }
 
     TEST_F(TestBulletNifLoader,
-        for_root_and_child_nif_node_with_bounding_box_but_root_without_flag_should_use_child_bounds)
+        for_root_and_two_children_where_both_with_bounds_but_second_is_bounding_box_use_bounding_box)
     {
-        mNode.hasBounds = true;
-        mNode.flags |= Nif::Node::Flag_BBoxCollision;
-        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
-        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parents.push_back(&mNiNode);
+        mNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
+        mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);
+        mNode.mParents.push_back(&mNiNode);
 
-        mNiNode.hasBounds = true;
-        mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNiNode.bounds.box.extents = osg::Vec3f(4, 5, 6);
-        mNiNode.bounds.box.center = osg::Vec3f(-4, -5, -6);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode) }));
+        mNode2.mName = "Bounding Box";
+        mNode2.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode2.mBounds.mBox.mExtents = osg::Vec3f(4, 5, 6);
+        mNode2.mBounds.mBox.mCenter = osg::Vec3f(-4, -5, -6);
+        mNode2.mParents.push_back(&mNiNode);
 
-        Nif::NIFFile file("test.nif");
-        file.mRoots.push_back(&mNiNode);
-        file.mHash = mHash;
+        mNiNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNiNode.mBounds.mBox.mExtents = osg::Vec3f(7, 8, 9);
+        mNiNode.mBounds.mBox.mCenter = osg::Vec3f(-7, -8, -9);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode), Nif::NiAVObjectPtr(&mNode2) };
 
-        const auto result = mLoader.load(file);
-
-        Resource::BulletShape expected;
-        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
-        std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
-        std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape.reset(shape.release());
-
-        EXPECT_EQ(*result, expected);
-    }
-
-    TEST_F(TestBulletNifLoader,
-        for_root_and_two_children_where_both_with_bounds_but_only_first_with_flag_should_use_first_bounds)
-    {
-        mNode.hasBounds = true;
-        mNode.flags |= Nif::Node::Flag_BBoxCollision;
-        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
-        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parents.push_back(&mNiNode);
-
-        mNode2.hasBounds = true;
-        mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
-        mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
-        mNode2.parents.push_back(&mNiNode);
-
-        mNiNode.hasBounds = true;
-        mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNiNode.bounds.box.extents = osg::Vec3f(7, 8, 9);
-        mNiNode.bounds.box.center = osg::Vec3f(-7, -8, -9);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2) }));
-
-        Nif::NIFFile file("test.nif");
-        file.mRoots.push_back(&mNiNode);
-        file.mHash = mHash;
-
-        const auto result = mLoader.load(file);
-
-        Resource::BulletShape expected;
-        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
-        std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
-        std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape.reset(shape.release());
-
-        EXPECT_EQ(*result, expected);
-    }
-
-    TEST_F(TestBulletNifLoader,
-        for_root_and_two_children_where_both_with_bounds_but_only_second_with_flag_should_use_second_bounds)
-    {
-        mNode.hasBounds = true;
-        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
-        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parents.push_back(&mNiNode);
-
-        mNode2.hasBounds = true;
-        mNode2.flags |= Nif::Node::Flag_BBoxCollision;
-        mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
-        mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
-        mNode2.parents.push_back(&mNiNode);
-
-        mNiNode.hasBounds = true;
-        mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNiNode.bounds.box.extents = osg::Vec3f(7, 8, 9);
-        mNiNode.bounds.box.center = osg::Vec3f(-7, -8, -9);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2) }));
-
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -567,38 +563,30 @@ namespace
         Resource::BulletShape expected;
         expected.mCollisionBox.mExtents = osg::Vec3f(4, 5, 6);
         expected.mCollisionBox.mCenter = osg::Vec3f(-4, -5, -6);
-        std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(4, 5, 6)));
-        std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-4, -5, -6)), box.release());
-        expected.mCollisionShape.reset(shape.release());
 
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader,
-        for_root_nif_node_with_bounds_but_without_flag_should_return_shape_with_bounds_but_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader, for_root_nif_node_with_bounds_should_return_shape_with_null_collision_shape)
     {
-        mNode.hasBounds = true;
-        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
-        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
+        mNode.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
+        mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNode);
         file.mHash = mHash;
 
         const auto result = mLoader.load(file);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
 
         EXPECT_EQ(*result, expected);
     }
 
     TEST_F(TestBulletNifLoader, for_tri_shape_root_node_should_return_static_shape)
     {
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiTriShape);
         file.mHash = mHash;
 
@@ -608,7 +596,9 @@ namespace
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
 
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        auto triShape = std::make_unique<Resource::TriangleMeshShape>(triangles.release(), true);
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(triShape.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -616,33 +606,38 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader,
-        for_tri_shape_root_node_with_bounds_should_return_static_shape_with_bounds_but_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader, for_tri_shape_root_node_with_bounds_should_return_static_shape)
     {
-        mNiTriShape.hasBounds = true;
-        mNiTriShape.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
-        mNiTriShape.bounds.box.extents = osg::Vec3f(1, 2, 3);
-        mNiTriShape.bounds.box.center = osg::Vec3f(-1, -2, -3);
+        mNiTriShape.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNiTriShape.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
+        mNiTriShape.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiTriShape);
         file.mHash = mHash;
 
         const auto result = mLoader.load(file);
 
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+
+        std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
+        auto triShape = std::make_unique<Resource::TriangleMeshShape>(triangles.release(), true);
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(triShape.release(), btVector3(1, 1, 1)));
+
         Resource::BulletShape expected;
-        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionShape.reset(compound.release());
 
         EXPECT_EQ(*result, expected);
     }
 
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_should_return_static_shape)
     {
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -652,7 +647,9 @@ namespace
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
 
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        auto triShape = std::make_unique<Resource::TriangleMeshShape>(triangles.release(), true);
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(triShape.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -662,12 +659,12 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_nested_tri_shape_child_should_return_static_shape)
     {
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiNode2) }));
-        mNiNode2.parents.push_back(&mNiNode);
-        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
-        mNiTriShape.parents.push_back(&mNiNode2);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiNode2) };
+        mNiNode2.mParents.push_back(&mNiNode);
+        mNiNode2.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
+        mNiTriShape.mParents.push_back(&mNiNode2);
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -677,7 +674,9 @@ namespace
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
 
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        auto triShape = std::make_unique<Resource::TriangleMeshShape>(triangles.release(), true);
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(triShape.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -687,12 +686,11 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_two_tri_shape_children_should_return_static_shape_with_all_meshes)
     {
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiTriShape2.parents.push_back(&mNiNode);
-        mNiNode.children
-            = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape), Nif::NodePtr(&mNiTriShape2) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiTriShape2.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape), Nif::NiAVObjectPtr(&mNiTriShape2) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -703,9 +701,13 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles2(new btTriangleMesh(false));
         triangles2->addTriangle(btVector3(0, 0, 1), btVector3(1, 0, 1), btVector3(1, 1, 1));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        auto triShape = std::make_unique<Resource::TriangleMeshShape>(triangles.release(), true);
+        auto triShape2 = std::make_unique<Resource::TriangleMeshShape>(triangles2.release(), true);
+
         compound->addChildShape(
-            btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles2.release(), true));
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(triShape.release(), btVector3(1, 1, 1)));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(triShape2.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -716,11 +718,11 @@ namespace
     TEST_F(TestBulletNifLoader,
         for_tri_shape_child_node_and_filename_starting_with_x_and_not_empty_skin_should_return_static_shape)
     {
-        mNiTriShape.skin = Nif::NiSkinInstancePtr(&mNiSkinInstance);
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mSkin = Nif::NiSkinInstancePtr(&mNiSkinInstance);
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -729,7 +731,9 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        auto triShape = std::make_unique<Resource::TriangleMeshShape>(triangles.release(), true);
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(triShape.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -739,10 +743,10 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_tri_shape_root_node_and_filename_starting_with_x_should_return_animated_shape)
     {
-        copy(mTransform, mNiTriShape.trafo);
-        mNiTriShape.trafo.scale = 3;
+        copy(mTransform, mNiTriShape.mTransform);
+        mNiTriShape.mTransform.mScale = 3;
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiTriShape);
         file.mHash = mHash;
 
@@ -751,9 +755,8 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
-        mesh->setLocalScaling(btVector3(3, 3, 3));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(mTransform, mesh.release());
+        shape->addChildShape(mTransform, new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(3, 3, 3)));
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = { { -1, 0 } };
@@ -763,13 +766,13 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_and_filename_starting_with_x_should_return_animated_shape)
     {
-        copy(mTransform, mNiTriShape.trafo);
-        mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
-        mNiNode.trafo.scale = 4;
+        copy(mTransform, mNiTriShape.mTransform);
+        mNiTriShape.mTransform.mScale = 3;
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
+        mNiNode.mTransform.mScale = 4;
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -778,9 +781,9 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
-        mesh->setLocalScaling(btVector3(12, 12, 12));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(mTransformScale4, mesh.release());
+        shape->addChildShape(
+            mTransformScale4, new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(12, 12, 12)));
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = { { -1, 0 } };
@@ -791,20 +794,17 @@ namespace
     TEST_F(
         TestBulletNifLoader, for_two_tri_shape_children_nodes_and_filename_starting_with_x_should_return_animated_shape)
     {
-        copy(mTransform, mNiTriShape.trafo);
-        mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parents.push_back(&mNiNode);
+        copy(mTransform, mNiTriShape.mTransform);
+        mNiTriShape.mTransform.mScale = 3;
+        mNiTriShape.mParents.push_back(&mNiNode);
 
-        copy(mTransform, mNiTriShape2.trafo);
-        mNiTriShape2.trafo.scale = 3;
-        mNiTriShape2.parents.push_back(&mNiNode);
+        copy(mTransform, mNiTriShape2.mTransform);
+        mNiTriShape2.mTransform.mScale = 3;
+        mNiTriShape2.mParents.push_back(&mNiNode);
 
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
-            Nif::NodePtr(&mNiTriShape),
-            Nif::NodePtr(&mNiTriShape2),
-        }));
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape), Nif::NiAVObjectPtr(&mNiTriShape2) };
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -813,16 +813,14 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
-        mesh->setLocalScaling(btVector3(3, 3, 3));
 
         std::unique_ptr<btTriangleMesh> triangles2(new btTriangleMesh(false));
         triangles2->addTriangle(btVector3(0, 0, 1), btVector3(1, 0, 1), btVector3(1, 1, 1));
         std::unique_ptr<Resource::TriangleMeshShape> mesh2(new Resource::TriangleMeshShape(triangles2.release(), true));
-        mesh2->setLocalScaling(btVector3(3, 3, 3));
 
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(mTransform, mesh.release());
-        shape->addChildShape(mTransform, mesh2.release());
+        shape->addChildShape(mTransform, new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(3, 3, 3)));
+        shape->addChildShape(mTransform, new Resource::ScaledTriangleMeshShape(mesh2.release(), btVector3(3, 3, 3)));
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = { { -1, 0 } };
@@ -833,15 +831,15 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_controller_should_return_animated_shape)
     {
         mController.recType = Nif::RC_NiKeyframeController;
-        mController.flags |= Nif::Controller::Flag_Active;
-        copy(mTransform, mNiTriShape.trafo);
-        mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiTriShape.controller = Nif::ControllerPtr(&mController);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
-        mNiNode.trafo.scale = 4;
+        mController.mFlags |= Nif::NiTimeController::Flag_Active;
+        copy(mTransform, mNiTriShape.mTransform);
+        mNiTriShape.mTransform.mScale = 3;
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiTriShape.mController = Nif::NiTimeControllerPtr(&mController);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
+        mNiNode.mTransform.mScale = 4;
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -850,9 +848,9 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
-        mesh->setLocalScaling(btVector3(12, 12, 12));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(mTransformScale4, mesh.release());
+        shape->addChildShape(
+            mTransformScale4, new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(12, 12, 12)));
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = { { -1, 0 } };
@@ -863,21 +861,21 @@ namespace
     TEST_F(TestBulletNifLoader, for_two_tri_shape_children_nodes_where_one_with_controller_should_return_animated_shape)
     {
         mController.recType = Nif::RC_NiKeyframeController;
-        mController.flags |= Nif::Controller::Flag_Active;
-        copy(mTransform, mNiTriShape.trafo);
-        mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parents.push_back(&mNiNode);
-        copy(mTransform, mNiTriShape2.trafo);
-        mNiTriShape2.trafo.scale = 3;
-        mNiTriShape2.parents.push_back(&mNiNode);
-        mNiTriShape2.controller = Nif::ControllerPtr(&mController);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
-            Nif::NodePtr(&mNiTriShape),
-            Nif::NodePtr(&mNiTriShape2),
-        }));
-        mNiNode.trafo.scale = 4;
+        mController.mFlags |= Nif::NiTimeController::Flag_Active;
+        copy(mTransform, mNiTriShape.mTransform);
+        mNiTriShape.mTransform.mScale = 3;
+        mNiTriShape.mParents.push_back(&mNiNode);
+        copy(mTransform, mNiTriShape2.mTransform);
+        mNiTriShape2.mTransform.mScale = 3;
+        mNiTriShape2.mParents.push_back(&mNiNode);
+        mNiTriShape2.mController = Nif::NiTimeControllerPtr(&mController);
+        mNiNode.mChildren = Nif::NiAVObjectList{
+            Nif::NiAVObjectPtr(&mNiTriShape),
+            Nif::NiAVObjectPtr(&mNiTriShape2),
+        };
+        mNiNode.mTransform.mScale = 4;
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -886,16 +884,16 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
-        mesh->setLocalScaling(btVector3(12, 12, 12));
 
         std::unique_ptr<btTriangleMesh> triangles2(new btTriangleMesh(false));
         triangles2->addTriangle(btVector3(0, 0, 1), btVector3(1, 0, 1), btVector3(1, 1, 1));
         std::unique_ptr<Resource::TriangleMeshShape> mesh2(new Resource::TriangleMeshShape(triangles2.release(), true));
-        mesh2->setLocalScaling(btVector3(12, 12, 12));
 
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(mTransformScale4, mesh.release());
-        shape->addChildShape(mTransformScale4, mesh2.release());
+        shape->addChildShape(
+            mTransformScale4, new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(12, 12, 12)));
+        shape->addChildShape(
+            mTransformScale4, new Resource::ScaledTriangleMeshShape(mesh2.release(), btVector3(12, 12, 12)));
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = { { -1, 1 } };
@@ -905,10 +903,10 @@ namespace
 
     TEST_F(TestBulletNifLoader, should_add_static_mesh_to_existing_compound_mesh)
     {
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiNode);
         file.mRoots.push_back(&mNiTriShape2);
         file.mHash = mHash;
@@ -917,14 +915,17 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
 
         std::unique_ptr<btTriangleMesh> triangles2(new btTriangleMesh(false));
         triangles2->addTriangle(btVector3(0, 0, 1), btVector3(1, 0, 1), btVector3(1, 1, 1));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh2(new Resource::TriangleMeshShape(triangles2.release(), true));
 
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
         compound->addChildShape(
-            btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles2.release(), true));
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh2.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -936,11 +937,11 @@ namespace
     TEST_F(
         TestBulletNifLoader, for_root_avoid_node_and_tri_shape_child_node_should_return_shape_with_null_collision_shape)
     {
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
         mNiNode.recType = Nif::RC_AvoidNode;
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -948,9 +949,11 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
 
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
         Resource::BulletShape expected;
         expected.mAvoidCollisionShape.reset(compound.release());
 
@@ -959,11 +962,11 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_empty_data_should_return_shape_with_null_collision_shape)
     {
-        mNiTriShape.data = Nif::NiGeometryDataPtr(nullptr);
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mData = Nif::NiGeometryDataPtr(nullptr);
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -977,12 +980,12 @@ namespace
     TEST_F(TestBulletNifLoader,
         for_tri_shape_child_node_with_empty_data_triangles_should_return_shape_with_null_collision_shape)
     {
-        auto data = static_cast<Nif::NiTriShapeData*>(mNiTriShape.data.getPtr());
-        data->triangles.clear();
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        auto data = static_cast<Nif::NiTriShapeData*>(mNiTriShape.mData.getPtr());
+        data->mTriangles.clear();
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -994,15 +997,15 @@ namespace
     }
 
     TEST_F(TestBulletNifLoader,
-        for_tri_shape_child_node_with_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
+        for_root_node_with_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
     {
-        mNiStringExtraData.string = "NCC__";
+        mNiStringExtraData.mData = "NCC__";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
-        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -1010,8 +1013,10 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -1022,16 +1027,16 @@ namespace
     }
 
     TEST_F(TestBulletNifLoader,
-        for_tri_shape_child_node_with_not_first_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
+        for_root_node_with_not_first_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
     {
-        mNiStringExtraData.next = Nif::ExtraPtr(&mNiStringExtraData2);
-        mNiStringExtraData2.string = "NCC__";
+        mNiStringExtraData.mNext = Nif::ExtraPtr(&mNiStringExtraData2);
+        mNiStringExtraData2.mData = "NCC__";
         mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
-        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -1039,8 +1044,10 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -1049,16 +1056,16 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader,
-        for_tri_shape_child_node_with_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
+    TEST_F(
+        TestBulletNifLoader, for_root_node_with_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
     {
-        mNiStringExtraData.string = "NC___";
+        mNiStringExtraData.mData = "NC___";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
-        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -1066,8 +1073,10 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -1077,16 +1086,16 @@ namespace
     }
 
     TEST_F(TestBulletNifLoader,
-        for_tri_shape_child_node_with_not_first_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
+        for_root_node_with_not_first_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
     {
-        mNiStringExtraData.next = Nif::ExtraPtr(&mNiStringExtraData2);
-        mNiStringExtraData2.string = "NC___";
+        mNiStringExtraData.mNext = Nif::ExtraPtr(&mNiStringExtraData2);
+        mNiStringExtraData2.mData = "NC___";
         mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
-        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -1094,8 +1103,10 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -1104,6 +1115,33 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
+    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_should_ignore_extra_data)
+    {
+        mNiStringExtraData.mData = "NC___";
+        mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
+        mNiTriShape.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
+
+        Nif::NIFFile file(testNif);
+        file.mRoots.push_back(&mNiNode);
+        file.mHash = mHash;
+
+        const auto result = mLoader.load(file);
+
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
+        std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
+
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(compound.release());
+
+        EXPECT_EQ(*result, expected);
+    }
+
     TEST_F(TestBulletNifLoader, for_empty_root_collision_node_without_nc_should_return_shape_with_cameraonly_collision)
     {
         Nif::NiTriShape niTriShape;
@@ -1111,16 +1149,16 @@ namespace
         init(niTriShape);
         init(emptyCollisionNode);
 
-        niTriShape.data = Nif::NiGeometryDataPtr(&mNiTriShapeData);
-        niTriShape.parents.push_back(&mNiNode);
+        niTriShape.mData = Nif::NiGeometryDataPtr(&mNiTriShapeData);
+        niTriShape.mParents.push_back(&mNiNode);
 
         emptyCollisionNode.recType = Nif::RC_RootCollisionNode;
-        emptyCollisionNode.parents.push_back(&mNiNode);
+        emptyCollisionNode.mParents.push_back(&mNiNode);
 
-        mNiNode.children = Nif::NodeList(
-            std::vector<Nif::NodePtr>({ Nif::NodePtr(&niTriShape), Nif::NodePtr(&emptyCollisionNode) }));
+        mNiNode.mChildren
+            = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&niTriShape), Nif::NiAVObjectPtr(&emptyCollisionNode) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -1128,8 +1166,10 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -1138,38 +1178,19 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader,
-        for_tri_shape_child_node_with_extra_data_string_mrk_should_return_shape_with_null_collision_shape)
-    {
-        mNiStringExtraData.string = "MRK";
-        mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
-        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
-
-        Nif::NIFFile file("test.nif");
-        file.mRoots.push_back(&mNiNode);
-        file.mHash = mHash;
-
-        const auto result = mLoader.load(file);
-
-        Resource::BulletShape expected;
-
-        EXPECT_EQ(*result, expected);
-    }
-
     TEST_F(TestBulletNifLoader, bsx_editor_marker_flag_disables_collision_for_markers)
     {
-        mNiIntegerExtraData.data = 32; // BSX flag "editor marker"
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiTriShape.mName = "EditorMarker";
+        mNiIntegerExtraData.mData = 34; // BSXFlags "has collision" | "editor marker"
         mNiIntegerExtraData.recType = Nif::RC_BSXFlags;
-        mNiTriShape.extralist.push_back(Nif::ExtraPtr(&mNiIntegerExtraData));
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiTriShape.name = "EditorMarker";
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiNode.mExtraList.push_back(Nif::ExtraPtr(&mNiIntegerExtraData));
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
+        file.mVersion = Nif::NIFStream::generateVersion(10, 0, 1, 0);
 
         const auto result = mLoader.load(file);
 
@@ -1178,54 +1199,29 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader,
-        for_tri_shape_child_node_with_extra_data_string_mrk_and_other_collision_node_should_return_shape_with_triangle_mesh_shape_with_all_meshes)
+    TEST_F(TestBulletNifLoader, mrk_editor_marker_flag_disables_collision_for_markers)
     {
-        mNiStringExtraData.string = "MRK";
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiTriShape.mName = "Tri EditorMarker";
+        mNiStringExtraData.mData = "MRK";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
-        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parents.push_back(&mNiNode2);
-        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
-        mNiNode2.recType = Nif::RC_RootCollisionNode;
-        mNiNode2.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiNode2) }));
-        mNiNode.recType = Nif::RC_NiNode;
+        mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
         const auto result = mLoader.load(file);
 
-        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
-        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
-        std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
-
         Resource::BulletShape expected;
-        expected.mCollisionShape.reset(compound.release());
-
-        EXPECT_EQ(*result, expected);
-    }
-
-    TEST_F(TestBulletNifLoader, should_ignore_tri_shape_data_with_mismatching_data_rec_type)
-    {
-        mNiTriShape.data = Nif::NiGeometryDataPtr(&mNiTriStripsData);
-
-        Nif::NIFFile file("test.nif");
-        file.mRoots.push_back(&mNiTriShape);
-        file.mHash = mHash;
-
-        const auto result = mLoader.load(file);
-
-        const Resource::BulletShape expected;
 
         EXPECT_EQ(*result, expected);
     }
 
     TEST_F(TestBulletNifLoader, for_tri_strips_root_node_should_return_static_shape)
     {
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiTriStrips);
         file.mHash = mHash;
 
@@ -1234,8 +1230,10 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         triangles->addTriangle(btVector3(1, 0, 0), btVector3(0, 1, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -1243,26 +1241,11 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, should_ignore_tri_strips_data_with_mismatching_data_rec_type)
-    {
-        mNiTriStrips.data = Nif::NiGeometryDataPtr(&mNiTriShapeData);
-
-        Nif::NIFFile file("test.nif");
-        file.mRoots.push_back(&mNiTriStrips);
-        file.mHash = mHash;
-
-        const auto result = mLoader.load(file);
-
-        const Resource::BulletShape expected;
-
-        EXPECT_EQ(*result, expected);
-    }
-
     TEST_F(TestBulletNifLoader, should_ignore_tri_strips_data_with_empty_strips)
     {
-        mNiTriStripsData.strips.clear();
+        mNiTriStripsData.mStrips.clear();
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiTriStrips);
         file.mHash = mHash;
 
@@ -1275,9 +1258,9 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_static_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
-        mNiTriStripsData.strips.front() = { 0, 1 };
+        mNiTriStripsData.mStrips.front() = { 0, 1 };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiTriStrips);
         file.mHash = mHash;
 
@@ -1290,12 +1273,12 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_avoid_collision_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
         mNiNode.recType = Nif::RC_AvoidNode;
-        mNiTriStripsData.strips.front() = { 0, 1 };
+        mNiTriStripsData.mStrips.front() = { 0, 1 };
 
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&mNiTriStrips);
         file.mHash = mHash;
 
@@ -1308,11 +1291,11 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_animated_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
-        mNiTriStripsData.strips.front() = { 0, 1 };
-        mNiTriStrips.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriStrips) }));
+        mNiTriStripsData.mStrips.front() = { 0, 1 };
+        mNiTriStrips.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriStrips) };
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiNode);
         file.mHash = mHash;
 
@@ -1325,11 +1308,11 @@ namespace
 
     TEST_F(TestBulletNifLoader, should_not_add_static_mesh_with_no_triangles_to_compound_shape)
     {
-        mNiTriStripsData.strips.front() = { 0, 1 };
-        mNiTriShape.parents.push_back(&mNiNode);
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
+        mNiTriStripsData.mStrips.front() = { 0, 1 };
+        mNiTriShape.mParents.push_back(&mNiNode);
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiNode);
         file.mRoots.push_back(&mNiTriStrips);
         file.mHash = mHash;
@@ -1338,9 +1321,10 @@ namespace
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
-
+        std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
-        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(
+            btTransform::getIdentity(), new Resource::ScaledTriangleMeshShape(mesh.release(), btVector3(1, 1, 1)));
 
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(compound.release());
@@ -1351,15 +1335,15 @@ namespace
 
     TEST_F(TestBulletNifLoader, should_handle_node_with_multiple_parents)
     {
-        copy(mTransform, mNiTriShape.trafo);
-        mNiTriShape.trafo.scale = 4;
-        mNiTriShape.parents = { &mNiNode, &mNiNode2 };
-        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
-        mNiNode.trafo.scale = 2;
-        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({ Nif::NodePtr(&mNiTriShape) }));
-        mNiNode2.trafo.scale = 3;
+        copy(mTransform, mNiTriShape.mTransform);
+        mNiTriShape.mTransform.mScale = 4;
+        mNiTriShape.mParents = { &mNiNode, &mNiNode2 };
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
+        mNiNode.mTransform.mScale = 2;
+        mNiNode2.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
+        mNiNode2.mTransform.mScale = 3;
 
-        Nif::NIFFile file("xtest.nif");
+        Nif::NIFFile file(xtestNif);
         file.mRoots.push_back(&mNiNode);
         file.mRoots.push_back(&mNiNode2);
         file.mHash = mHash;
@@ -1369,18 +1353,42 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles1(new btTriangleMesh(false));
         triangles1->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<Resource::TriangleMeshShape> mesh1(new Resource::TriangleMeshShape(triangles1.release(), true));
-        mesh1->setLocalScaling(btVector3(8, 8, 8));
         std::unique_ptr<btTriangleMesh> triangles2(new btTriangleMesh(false));
         triangles2->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         std::unique_ptr<Resource::TriangleMeshShape> mesh2(new Resource::TriangleMeshShape(triangles2.release(), true));
-        mesh2->setLocalScaling(btVector3(12, 12, 12));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
-        shape->addChildShape(mTransformScale2, mesh1.release());
-        shape->addChildShape(mTransformScale3, mesh2.release());
+        shape->addChildShape(
+            mTransformScale2, new Resource::ScaledTriangleMeshShape(mesh1.release(), btVector3(8, 8, 8)));
+        shape->addChildShape(
+            mTransformScale3, new Resource::ScaledTriangleMeshShape(mesh2.release(), btVector3(12, 12, 12)));
         Resource::BulletShape expected;
         expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = { { -1, 0 } };
 
         EXPECT_EQ(*result, expected);
     }
+
+    TEST_F(TestBulletNifLoader, dont_assign_invalid_bounding_box_extents)
+    {
+        copy(mTransform, mNiTriShape.mTransform);
+        mNiTriShape.mTransform.mScale = 10;
+        mNiTriShape.mParents.push_back(&mNiNode);
+
+        mNiTriShape2.mName = "Bounding Box";
+        mNiTriShape2.mBounds.mType = Nif::BoundingVolume::Type::BOX_BV;
+        mNiTriShape2.mBounds.mBox.mExtents = osg::Vec3f(-1, -2, -3);
+        mNiTriShape2.mParents.push_back(&mNiNode);
+
+        mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape), Nif::NiAVObjectPtr(&mNiTriShape2) };
+
+        Nif::NIFFile file(testNif);
+        file.mRoots.push_back(&mNiNode);
+
+        const auto result = mLoader.load(file);
+
+        const bool extentsUnassigned
+            = std::ranges::all_of(result->mCollisionBox.mExtents._v, [](float extent) { return extent == 0.f; });
+
+        EXPECT_EQ(extentsUnassigned, true);
+    }
 }
diff --git a/apps/openmw_test_suite/nifosg/testnifloader.cpp b/apps/components_tests/nifosg/testnifloader.cpp
similarity index 66%
rename from apps/openmw_test_suite/nifosg/testnifloader.cpp
rename to apps/components_tests/nifosg/testnifloader.cpp
index 5c9caf4799..6a2cad445b 100644
--- a/apps/openmw_test_suite/nifosg/testnifloader.cpp
+++ b/apps/components_tests/nifosg/testnifloader.cpp
@@ -3,6 +3,7 @@
 #include <components/nif/node.hpp>
 #include <components/nif/property.hpp>
 #include <components/nifosg/nifloader.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/sceneutil/serialize.hpp>
 #include <components/vfs/manager.hpp>
@@ -25,10 +26,13 @@ namespace
     using namespace NifOsg;
     using namespace Nif::Testing;
 
+    constexpr VFS::Path::NormalizedView testNif("test.nif");
+
     struct BaseNifOsgLoaderTest
     {
         VFS::Manager mVfs;
-        Resource::ImageManager mImageManager{ &mVfs };
+        Resource::ImageManager mImageManager{ &mVfs, 0 };
+        Resource::BgsmFileManager mMaterialManager{ &mVfs, 0 };
         const osgDB::ReaderWriter* mReaderWriter = osgDB::Registry::instance()->getReaderWriterForExtension("osgt");
         osg::ref_ptr<osgDB::Options> mOptions = new osgDB::Options;
 
@@ -66,11 +70,11 @@ namespace
 
     TEST_F(NifOsgLoaderTest, shouldLoadFileWithDefaultNode)
     {
-        Nif::Node node;
+        Nif::NiAVObject node;
         init(node);
-        Nif::NIFFile file("test.nif");
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&node);
-        auto result = Loader::load(file, &mImageManager);
+        auto result = Loader::load(file, &mImageManager, &mMaterialManager);
         EXPECT_EQ(serialize(*result), R"(
 osg::Group {
   UniqueID 1
@@ -108,7 +112,7 @@ osg::Group {
 )");
     }
 
-    std::string formatOsgNodeForShaderProperty(std::string_view shaderPrefix)
+    std::string formatOsgNodeForBSShaderProperty(std::string_view shaderPrefix)
     {
         std::ostringstream oss;
         oss << R"(
@@ -165,6 +169,73 @@ osg::Group {
         return oss.str();
     }
 
+    std::string formatOsgNodeForBSLightingShaderProperty(std::string_view shaderPrefix)
+    {
+        std::ostringstream oss;
+        oss << R"(
+osg::Group {
+  UniqueID 1
+  DataVariance STATIC
+  UserDataContainer TRUE {
+    osg::DefaultUserDataContainer {
+      UniqueID 2
+      UDC_UserObjects 1 {
+        osg::StringValueObject {
+          UniqueID 3
+          Name "fileHash"
+        }
+      }
+    }
+  }
+  Children 1 {
+    osg::Group {
+      UniqueID 4
+      DataVariance STATIC
+      UserDataContainer TRUE {
+        osg::DefaultUserDataContainer {
+          UniqueID 5
+          UDC_UserObjects 3 {
+            osg::UIntValueObject {
+              UniqueID 6
+              Name "recIndex"
+              Value 4294967295
+            }
+            osg::StringValueObject {
+              UniqueID 7
+              Name "shaderPrefix"
+              Value ")"
+            << shaderPrefix << R"("
+            }
+            osg::BoolValueObject {
+              UniqueID 8
+              Name "shaderRequired"
+              Value TRUE
+            }
+          }
+        }
+      }
+      StateSet TRUE {
+        osg::StateSet {
+          UniqueID 9
+          ModeList 1 {
+            GL_DEPTH_TEST ON
+          }
+          AttributeList 1 {
+            osg::Depth {
+              UniqueID 10
+              Function LEQUAL
+            }
+            Value OFF
+          }
+        }
+      }
+    }
+  }
+}
+)";
+        return oss.str();
+    }
+
     struct ShaderPrefixParams
     {
         unsigned int mShaderType;
@@ -183,18 +254,18 @@ osg::Group {
 
     TEST_P(NifOsgLoaderBSShaderPrefixTest, shouldAddShaderPrefix)
     {
-        Nif::Node node;
+        Nif::NiAVObject node;
         init(node);
         Nif::BSShaderPPLightingProperty property;
         property.recType = Nif::RC_BSShaderPPLightingProperty;
-        property.textureSet = nullptr;
-        property.controller = nullptr;
-        property.type = GetParam().mShaderType;
-        node.props.push_back(Nif::RecordPtrT<Nif::Property>(&property));
-        Nif::NIFFile file("test.nif");
+        property.mTextureSet = nullptr;
+        property.mController = nullptr;
+        property.mType = GetParam().mShaderType;
+        node.mProperties.push_back(Nif::RecordPtrT<Nif::NiProperty>(&property));
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&node);
-        auto result = Loader::load(file, &mImageManager);
-        EXPECT_EQ(serialize(*result), formatOsgNodeForShaderProperty(GetParam().mExpectedShaderPrefix));
+        auto result = Loader::load(file, &mImageManager, &mMaterialManager);
+        EXPECT_EQ(serialize(*result), formatOsgNodeForBSShaderProperty(GetParam().mExpectedShaderPrefix));
     }
 
     INSTANTIATE_TEST_SUITE_P(Params, NifOsgLoaderBSShaderPrefixTest, ValuesIn(NifOsgLoaderBSShaderPrefixTest::sParams));
@@ -211,18 +282,20 @@ osg::Group {
 
     TEST_P(NifOsgLoaderBSLightingShaderPrefixTest, shouldAddShaderPrefix)
     {
-        Nif::Node node;
+        Nif::NiAVObject node;
         init(node);
         Nif::BSLightingShaderProperty property;
         property.recType = Nif::RC_BSLightingShaderProperty;
         property.mTextureSet = nullptr;
-        property.controller = nullptr;
-        property.type = GetParam().mShaderType;
-        node.props.push_back(Nif::RecordPtrT<Nif::Property>(&property));
-        Nif::NIFFile file("test.nif");
+        property.mController = nullptr;
+        property.mType = GetParam().mShaderType;
+        property.mShaderFlags1 |= Nif::BSShaderFlags1::BSSFlag1_DepthTest;
+        property.mShaderFlags2 |= Nif::BSShaderFlags2::BSSFlag2_DepthWrite;
+        node.mProperties.push_back(Nif::RecordPtrT<Nif::NiProperty>(&property));
+        Nif::NIFFile file(testNif);
         file.mRoots.push_back(&node);
-        auto result = Loader::load(file, &mImageManager);
-        EXPECT_EQ(serialize(*result), formatOsgNodeForShaderProperty(GetParam().mExpectedShaderPrefix));
+        auto result = Loader::load(file, &mImageManager, &mMaterialManager);
+        EXPECT_EQ(serialize(*result), formatOsgNodeForBSLightingShaderProperty(GetParam().mExpectedShaderPrefix));
     }
 
     INSTANTIATE_TEST_SUITE_P(
diff --git a/apps/components_tests/resource/testobjectcache.cpp b/apps/components_tests/resource/testobjectcache.cpp
new file mode 100644
index 0000000000..e2f5799edb
--- /dev/null
+++ b/apps/components_tests/resource/testobjectcache.cpp
@@ -0,0 +1,377 @@
+#include <components/resource/objectcache.hpp>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <osg/Object>
+
+namespace Resource
+{
+    namespace
+    {
+        using namespace ::testing;
+
+        TEST(ResourceGenericObjectCacheTest, getRefFromObjectCacheShouldReturnNullptrByDefault)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+            EXPECT_EQ(cache->getRefFromObjectCache(42), nullptr);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, getRefFromObjectCacheOrNoneShouldReturnNulloptByDefault)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(42), std::nullopt);
+        }
+
+        struct Object : osg::Object
+        {
+            Object() = default;
+
+            Object(const Object& other, const osg::CopyOp& copyOp = osg::CopyOp())
+                : osg::Object(other, copyOp)
+            {
+            }
+
+            META_Object(ResourceTest, Object)
+        };
+
+        TEST(ResourceGenericObjectCacheTest, shouldStoreValues)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+            const int key = 42;
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            EXPECT_EQ(cache->getRefFromObjectCache(key), value);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, shouldStoreNullptrValues)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+            const int key = 42;
+            cache->addEntryToObjectCache(key, nullptr);
+            EXPECT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(nullptr));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, updateShouldExtendLifetimeForItemsWithZeroTimestamp)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const int key = 42;
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value, 0);
+            value = nullptr;
+
+            const double referenceTime = 1000;
+            const double expiryDelay = 1;
+            cache->update(referenceTime, expiryDelay);
+            EXPECT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, addEntryToObjectCacheShouldReplaceExistingItemByKey)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const int key = 42;
+            osg::ref_ptr<Object> value1(new Object);
+            osg::ref_ptr<Object> value2(new Object);
+            cache->addEntryToObjectCache(key, value1);
+            ASSERT_EQ(cache->getRefFromObjectCache(key), value1);
+            cache->addEntryToObjectCache(key, value2);
+            EXPECT_EQ(cache->getRefFromObjectCache(key), value2);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, addEntryToObjectCacheShouldMarkLifetime)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const double referenceTime = 1;
+            const double expiryDelay = 2;
+
+            const int key = 42;
+            cache->addEntryToObjectCache(key, nullptr, referenceTime + expiryDelay);
+
+            cache->update(referenceTime, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+
+            cache->update(referenceTime + expiryDelay, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+
+            cache->update(referenceTime + 2 * expiryDelay, expiryDelay);
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(key), std::nullopt);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, updateShouldRemoveExpiredItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const double referenceTime = 1;
+            const double expiryDelay = 1;
+
+            const int key = 42;
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            value = nullptr;
+
+            cache->update(referenceTime, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+            ASSERT_EQ(cache->getStats().mExpired, 0);
+
+            cache->update(referenceTime + expiryDelay, expiryDelay);
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(key), std::nullopt);
+            ASSERT_EQ(cache->getStats().mExpired, 1);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, updateShouldKeepExternallyReferencedItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const double referenceTime = 1;
+            const double expiryDelay = 1;
+
+            const int key = 42;
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+
+            cache->update(referenceTime, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+
+            cache->update(referenceTime + expiryDelay, expiryDelay);
+            EXPECT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(value));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, updateShouldKeepNotExpiredItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const double referenceTime = 1;
+            const double expiryDelay = 2;
+
+            const int key = 42;
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            value = nullptr;
+
+            cache->update(referenceTime + expiryDelay, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+
+            cache->update(referenceTime + expiryDelay / 2, expiryDelay);
+            EXPECT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, updateShouldKeepNotExpiredNullptrItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const double referenceTime = 1;
+            const double expiryDelay = 2;
+
+            const int key = 42;
+            cache->addEntryToObjectCache(key, nullptr);
+
+            cache->update(referenceTime + expiryDelay, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+
+            cache->update(referenceTime + expiryDelay / 2, expiryDelay);
+            EXPECT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, getRefFromObjectCacheOrNoneShouldNotExtendItemLifetime)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const double referenceTime = 1;
+            const double expiryDelay = 2;
+
+            const int key = 42;
+            cache->addEntryToObjectCache(key, nullptr);
+
+            cache->update(referenceTime, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+
+            cache->update(referenceTime + expiryDelay / 2, expiryDelay);
+            ASSERT_THAT(cache->getRefFromObjectCacheOrNone(key), Optional(_));
+
+            cache->update(referenceTime + expiryDelay, expiryDelay);
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(key), std::nullopt);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, lowerBoundShouldSupportHeterogeneousLookup)
+        {
+            osg::ref_ptr<GenericObjectCache<std::string>> cache(new GenericObjectCache<std::string>);
+            cache->addEntryToObjectCache("a", nullptr);
+            cache->addEntryToObjectCache("c", nullptr);
+            EXPECT_THAT(cache->lowerBound(std::string_view("b")), Optional(Pair("c", _)));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, shouldSupportRemovingItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+            const int key = 42;
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            ASSERT_EQ(cache->getRefFromObjectCache(key), value);
+            cache->removeFromObjectCache(key);
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(key), std::nullopt);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, clearShouldRemoveAllItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            const int key1 = 42;
+            const int key2 = 13;
+            osg::ref_ptr<Object> value1(new Object);
+            osg::ref_ptr<Object> value2(new Object);
+            cache->addEntryToObjectCache(key1, value1);
+            cache->addEntryToObjectCache(key2, value2);
+
+            ASSERT_EQ(cache->getRefFromObjectCache(key1), value1);
+            ASSERT_EQ(cache->getRefFromObjectCache(key2), value2);
+
+            cache->clear();
+
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(key1), std::nullopt);
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(key2), std::nullopt);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, callShouldIterateOverAllItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            osg::ref_ptr<Object> value1(new Object);
+            osg::ref_ptr<Object> value2(new Object);
+            osg::ref_ptr<Object> value3(new Object);
+            cache->addEntryToObjectCache(1, value1);
+            cache->addEntryToObjectCache(2, value2);
+            cache->addEntryToObjectCache(3, value3);
+
+            std::vector<std::pair<int, osg::Object*>> actual;
+            cache->call([&](int key, osg::Object* value) { actual.emplace_back(key, value); });
+
+            EXPECT_THAT(actual, ElementsAre(Pair(1, value1.get()), Pair(2, value2.get()), Pair(3, value3.get())));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, getStatsShouldReturnNumberOrAddedItems)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            osg::ref_ptr<Object> value1(new Object);
+            osg::ref_ptr<Object> value2(new Object);
+            cache->addEntryToObjectCache(13, value1);
+            cache->addEntryToObjectCache(42, value2);
+
+            const CacheStats stats = cache->getStats();
+
+            EXPECT_EQ(stats.mSize, 2);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, getStatsShouldReturnNumberOrGetsAndHits)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            {
+                const CacheStats stats = cache->getStats();
+
+                EXPECT_EQ(stats.mGet, 0);
+                EXPECT_EQ(stats.mHit, 0);
+            }
+
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(13, value);
+            cache->getRefFromObjectCache(13);
+            cache->getRefFromObjectCache(42);
+
+            {
+                const CacheStats stats = cache->getStats();
+
+                EXPECT_EQ(stats.mGet, 2);
+                EXPECT_EQ(stats.mHit, 1);
+            }
+        }
+
+        TEST(ResourceGenericObjectCacheTest, lowerBoundShouldReturnFirstNotLessThatGivenKey)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            osg::ref_ptr<Object> value1(new Object);
+            osg::ref_ptr<Object> value2(new Object);
+            osg::ref_ptr<Object> value3(new Object);
+            cache->addEntryToObjectCache(1, value1);
+            cache->addEntryToObjectCache(2, value2);
+            cache->addEntryToObjectCache(4, value3);
+
+            EXPECT_THAT(cache->lowerBound(3), Optional(Pair(4, value3)));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, lowerBoundShouldReturnNulloptWhenKeyIsGreaterThanAnyOther)
+        {
+            osg::ref_ptr<GenericObjectCache<int>> cache(new GenericObjectCache<int>);
+
+            osg::ref_ptr<Object> value1(new Object);
+            osg::ref_ptr<Object> value2(new Object);
+            osg::ref_ptr<Object> value3(new Object);
+            cache->addEntryToObjectCache(1, value1);
+            cache->addEntryToObjectCache(2, value2);
+            cache->addEntryToObjectCache(3, value3);
+
+            EXPECT_EQ(cache->lowerBound(4), std::nullopt);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, addEntryToObjectCacheShouldSupportHeterogeneousLookup)
+        {
+            osg::ref_ptr<GenericObjectCache<std::string>> cache(new GenericObjectCache<std::string>);
+            const std::string key = "key";
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(std::string_view("key"), value);
+            EXPECT_EQ(cache->getRefFromObjectCache(key), value);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, addEntryToObjectCacheShouldKeyMoving)
+        {
+            osg::ref_ptr<GenericObjectCache<std::string>> cache(new GenericObjectCache<std::string>);
+            std::string key(128, 'a');
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(std::move(key), value);
+            EXPECT_EQ(key, "");
+            EXPECT_EQ(cache->getRefFromObjectCache(std::string(128, 'a')), value);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, removeFromObjectCacheShouldSupportHeterogeneousLookup)
+        {
+            osg::ref_ptr<GenericObjectCache<std::string>> cache(new GenericObjectCache<std::string>);
+            const std::string key = "key";
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            ASSERT_EQ(cache->getRefFromObjectCache(key), value);
+            cache->removeFromObjectCache(std::string_view("key"));
+            EXPECT_EQ(cache->getRefFromObjectCacheOrNone(key), std::nullopt);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, getRefFromObjectCacheShouldSupportHeterogeneousLookup)
+        {
+            osg::ref_ptr<GenericObjectCache<std::string>> cache(new GenericObjectCache<std::string>);
+            const std::string key = "key";
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            EXPECT_EQ(cache->getRefFromObjectCache(std::string_view("key")), value);
+        }
+
+        TEST(ResourceGenericObjectCacheTest, getRefFromObjectCacheOrNoneShouldSupportHeterogeneousLookup)
+        {
+            osg::ref_ptr<GenericObjectCache<std::string>> cache(new GenericObjectCache<std::string>);
+            const std::string key = "key";
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            EXPECT_THAT(cache->getRefFromObjectCacheOrNone(std::string_view("key")), Optional(value));
+        }
+
+        TEST(ResourceGenericObjectCacheTest, checkInObjectCacheShouldSupportHeterogeneousLookup)
+        {
+            osg::ref_ptr<GenericObjectCache<std::string>> cache(new GenericObjectCache<std::string>);
+            const std::string key = "key";
+            osg::ref_ptr<Object> value(new Object);
+            cache->addEntryToObjectCache(key, value);
+            EXPECT_TRUE(cache->checkInObjectCache(std::string_view("key"), 0));
+        }
+    }
+}
diff --git a/apps/components_tests/sceneutil/osgacontroller.cpp b/apps/components_tests/sceneutil/osgacontroller.cpp
new file mode 100644
index 0000000000..309de4a878
--- /dev/null
+++ b/apps/components_tests/sceneutil/osgacontroller.cpp
@@ -0,0 +1,131 @@
+#include <components/sceneutil/osgacontroller.hpp>
+
+#include <gtest/gtest.h>
+#include <osgAnimation/Channel>
+
+#include <filesystem>
+#include <fstream>
+
+namespace
+{
+    using namespace SceneUtil;
+
+    static const std::string ROOT_BONE_NAME = "bip01";
+
+    // Creates a merged anim track with a single root channel with two start/end matrix transforms
+    osg::ref_ptr<Resource::Animation> createMergedAnimationTrack(std::string name, osg::Matrixf startTransform,
+        osg::Matrixf endTransform, float startTime = 0.0f, float endTime = 1.0f)
+    {
+        osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
+        mergedAnimationTrack->setName(name);
+
+        osgAnimation::MatrixKeyframeContainer* cbCntr = new osgAnimation::MatrixKeyframeContainer;
+        cbCntr->push_back(osgAnimation::MatrixKeyframe(startTime, startTransform));
+        cbCntr->push_back(osgAnimation::MatrixKeyframe(endTime, endTransform));
+
+        osg::ref_ptr<osgAnimation::MatrixLinearChannel> rootChannel = new osgAnimation::MatrixLinearChannel;
+        rootChannel->setName("transform");
+        rootChannel->setTargetName(ROOT_BONE_NAME);
+        rootChannel->getOrCreateSampler()->setKeyframeContainer(cbCntr);
+        mergedAnimationTrack->addChannel(rootChannel);
+        return mergedAnimationTrack;
+    }
+
+    TEST(OsgAnimationControllerTest, getTranslationShouldReturnSampledChannelTranslationForBip01)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" }); // should sample this
+        emulatedAnimations.push_back({ 1.1f, 2.0f, "test2" }); // should ignore this
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform2 = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+        endTransform2.setTrans(2.0f, 2.0f, 2.0f);
+        controller.addMergedAnimationTrack(
+            createMergedAnimationTrack("test2", endTransform, endTransform2, 0.1f, 0.9f));
+
+        // should be halfway between 0,0,0 and 1,1,1
+        osg::Vec3f translation = controller.getTranslation(0.5f);
+        EXPECT_EQ(translation, osg::Vec3f(0.5f, 0.5f, 0.5f));
+    }
+
+    TEST(OsgAnimationControllerTest, getTranslationShouldReturnZeroVectorIfNotFound)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" });
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+
+        // Has no emulated animation at time so will return 0,0,0
+        osg::Vec3f translation = controller.getTranslation(100.0f);
+        EXPECT_EQ(translation, osg::Vec3f(0.0f, 0.0f, 0.0f));
+    }
+
+    TEST(OsgAnimationControllerTest, getTranslationShouldReturnZeroVectorIfNoMergedTracks)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" });
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        // Has no merged tracks so will return 0,0,0
+        osg::Vec3f translation = controller.getTranslation(0.5);
+        EXPECT_EQ(translation, osg::Vec3f(0.0f, 0.0f, 0.0f));
+    }
+
+    TEST(OsgAnimationControllerTest, getTransformShouldReturnIdentityIfNotFound)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" });
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+
+        // Has no emulated animation at time so will return identity
+        EXPECT_EQ(controller.getTransformForNode(100.0f, ROOT_BONE_NAME), osg::Matrixf::identity());
+
+        // Has no bone animation at time so will return identity
+        EXPECT_EQ(controller.getTransformForNode(0.5f, "wrongbone"), osg::Matrixf::identity());
+    }
+
+    TEST(OsgAnimationControllerTest, getTransformShouldReturnSampledAnimMatrixAtTime)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" }); // should sample this
+        emulatedAnimations.push_back({ 1.1f, 2.0f, "test2" }); // should ignore this
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+        osg::Matrixf endTransform2 = osg::Matrixf::identity();
+        endTransform2.setTrans(2.0f, 2.0f, 2.0f);
+        controller.addMergedAnimationTrack(
+            createMergedAnimationTrack("test2", endTransform, endTransform2, 0.1f, 0.9f));
+
+        EXPECT_EQ(controller.getTransformForNode(0.0f, ROOT_BONE_NAME), startTransform); // start of test1
+        EXPECT_EQ(controller.getTransformForNode(1.0f, ROOT_BONE_NAME), endTransform); // end of test1
+        EXPECT_EQ(controller.getTransformForNode(1.1f, ROOT_BONE_NAME), endTransform); // start of test2
+        EXPECT_EQ(controller.getTransformForNode(2.0f, ROOT_BONE_NAME), endTransform2); // end of test2
+    }
+}
diff --git a/apps/openmw_test_suite/serialization/binaryreader.cpp b/apps/components_tests/serialization/binaryreader.cpp
similarity index 100%
rename from apps/openmw_test_suite/serialization/binaryreader.cpp
rename to apps/components_tests/serialization/binaryreader.cpp
diff --git a/apps/openmw_test_suite/serialization/binarywriter.cpp b/apps/components_tests/serialization/binarywriter.cpp
similarity index 100%
rename from apps/openmw_test_suite/serialization/binarywriter.cpp
rename to apps/components_tests/serialization/binarywriter.cpp
diff --git a/apps/openmw_test_suite/serialization/format.hpp b/apps/components_tests/serialization/format.hpp
similarity index 100%
rename from apps/openmw_test_suite/serialization/format.hpp
rename to apps/components_tests/serialization/format.hpp
diff --git a/apps/openmw_test_suite/serialization/integration.cpp b/apps/components_tests/serialization/integration.cpp
similarity index 100%
rename from apps/openmw_test_suite/serialization/integration.cpp
rename to apps/components_tests/serialization/integration.cpp
diff --git a/apps/openmw_test_suite/serialization/sizeaccumulator.cpp b/apps/components_tests/serialization/sizeaccumulator.cpp
similarity index 100%
rename from apps/openmw_test_suite/serialization/sizeaccumulator.cpp
rename to apps/components_tests/serialization/sizeaccumulator.cpp
diff --git a/apps/openmw_test_suite/settings/parser.cpp b/apps/components_tests/settings/parser.cpp
similarity index 99%
rename from apps/openmw_test_suite/settings/parser.cpp
rename to apps/components_tests/settings/parser.cpp
index 3712ca6513..af514dbdd7 100644
--- a/apps/openmw_test_suite/settings/parser.cpp
+++ b/apps/components_tests/settings/parser.cpp
@@ -1,11 +1,10 @@
 #include <components/settings/parser.hpp>
+#include <components/testing/util.hpp>
 
 #include <fstream>
 
 #include <gtest/gtest.h>
 
-#include "../testing_util.hpp"
-
 namespace
 {
     using namespace testing;
diff --git a/apps/openmw_test_suite/settings/shadermanager.cpp b/apps/components_tests/settings/shadermanager.cpp
similarity index 98%
rename from apps/openmw_test_suite/settings/shadermanager.cpp
rename to apps/components_tests/settings/shadermanager.cpp
index c252e08fc6..c3ba5084c2 100644
--- a/apps/openmw_test_suite/settings/shadermanager.cpp
+++ b/apps/components_tests/settings/shadermanager.cpp
@@ -1,12 +1,11 @@
 #include <components/settings/shadermanager.hpp>
+#include <components/testing/util.hpp>
 
 #include <filesystem>
 #include <fstream>
 
 #include <gtest/gtest.h>
 
-#include "../testing_util.hpp"
-
 namespace
 {
     using namespace testing;
diff --git a/apps/openmw_test_suite/settings/testvalues.cpp b/apps/components_tests/settings/testvalues.cpp
similarity index 75%
rename from apps/openmw_test_suite/settings/testvalues.cpp
rename to apps/components_tests/settings/testvalues.cpp
index 81af308795..236417b559 100644
--- a/apps/openmw_test_suite/settings/testvalues.cpp
+++ b/apps/components_tests/settings/testvalues.cpp
@@ -59,6 +59,33 @@ namespace Settings
             EXPECT_EQ(values.mCamera.mFieldOfView.get(), 1);
         }
 
+        TEST_F(SettingsValuesTest, constructorWithDefaultShouldDoLookup)
+        {
+            Manager::mUserSettings[std::make_pair("category", "value")] = "13";
+            Index index;
+            SettingValue<int> value{ index, "category", "value", 42 };
+            EXPECT_EQ(value.get(), 13);
+            value.reset();
+            EXPECT_EQ(value.get(), 42);
+        }
+
+        TEST_F(SettingsValuesTest, constructorWithDefaultShouldSanitize)
+        {
+            Manager::mUserSettings[std::make_pair("category", "value")] = "2";
+            Index index;
+            SettingValue<int> value{ index, "category", "value", -1, Settings::makeClampSanitizerInt(0, 1) };
+            EXPECT_EQ(value.get(), 1);
+            value.reset();
+            EXPECT_EQ(value.get(), 0);
+        }
+
+        TEST_F(SettingsValuesTest, constructorWithDefaultShouldFallbackToDefault)
+        {
+            Index index;
+            const SettingValue<int> value{ index, "category", "value", 42 };
+            EXPECT_EQ(value.get(), 42);
+        }
+
         TEST_F(SettingsValuesTest, moveConstructorShouldSetDefaults)
         {
             Index index;
@@ -79,6 +106,13 @@ namespace Settings
             EXPECT_EQ(values.mCamera.mFieldOfView.get(), 1);
         }
 
+        TEST_F(SettingsValuesTest, moveConstructorShouldThrowOnMissingSetting)
+        {
+            Index index;
+            SettingValue<int> defaultValue{ index, "category", "value", 42 };
+            EXPECT_THROW([&] { SettingValue<int> value(std::move(defaultValue)); }(), std::runtime_error);
+        }
+
         TEST_F(SettingsValuesTest, findShouldThrowExceptionOnTypeMismatch)
         {
             Index index;
diff --git a/apps/openmw_test_suite/shader/parsedefines.cpp b/apps/components_tests/shader/parsedefines.cpp
similarity index 100%
rename from apps/openmw_test_suite/shader/parsedefines.cpp
rename to apps/components_tests/shader/parsedefines.cpp
diff --git a/apps/openmw_test_suite/shader/parsefors.cpp b/apps/components_tests/shader/parsefors.cpp
similarity index 100%
rename from apps/openmw_test_suite/shader/parsefors.cpp
rename to apps/components_tests/shader/parsefors.cpp
diff --git a/apps/openmw_test_suite/shader/parselinks.cpp b/apps/components_tests/shader/parselinks.cpp
similarity index 100%
rename from apps/openmw_test_suite/shader/parselinks.cpp
rename to apps/components_tests/shader/parselinks.cpp
diff --git a/apps/openmw_test_suite/shader/shadermanager.cpp b/apps/components_tests/shader/shadermanager.cpp
similarity index 99%
rename from apps/openmw_test_suite/shader/shadermanager.cpp
rename to apps/components_tests/shader/shadermanager.cpp
index 3d7eaecf00..5b11d31a44 100644
--- a/apps/openmw_test_suite/shader/shadermanager.cpp
+++ b/apps/components_tests/shader/shadermanager.cpp
@@ -1,12 +1,11 @@
 #include <components/files/conversion.hpp>
 #include <components/shader/shadermanager.hpp>
+#include <components/testing/util.hpp>
 
 #include <fstream>
 
 #include <gtest/gtest.h>
 
-#include "../testing_util.hpp"
-
 namespace
 {
     using namespace testing;
diff --git a/apps/openmw_test_suite/sqlite3/db.cpp b/apps/components_tests/sqlite3/db.cpp
similarity index 100%
rename from apps/openmw_test_suite/sqlite3/db.cpp
rename to apps/components_tests/sqlite3/db.cpp
diff --git a/apps/openmw_test_suite/sqlite3/request.cpp b/apps/components_tests/sqlite3/request.cpp
similarity index 98%
rename from apps/openmw_test_suite/sqlite3/request.cpp
rename to apps/components_tests/sqlite3/request.cpp
index 23efe9dc2e..c299493952 100644
--- a/apps/openmw_test_suite/sqlite3/request.cpp
+++ b/apps/components_tests/sqlite3/request.cpp
@@ -151,7 +151,7 @@ namespace
         const std::int64_t value = 1099511627776;
         EXPECT_EQ(execute(*mDb, insert, value), 1);
         Statement select(*mDb, GetAll("ints"));
-        std::vector<std::tuple<int>> result;
+        std::vector<std::tuple<std::int64_t>> result;
         request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
         EXPECT_THAT(result, ElementsAre(std::tuple(value)));
     }
@@ -205,7 +205,7 @@ namespace
         const std::int64_t value = 1099511627776;
         EXPECT_EQ(execute(*mDb, insert, value), 1);
         Statement select(*mDb, GetExact<std::int64_t>("ints"));
-        std::vector<std::tuple<int>> result;
+        std::vector<std::tuple<std::int64_t>> result;
         request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), value);
         EXPECT_THAT(result, ElementsAre(std::tuple(value)));
     }
diff --git a/apps/openmw_test_suite/sqlite3/statement.cpp b/apps/components_tests/sqlite3/statement.cpp
similarity index 100%
rename from apps/openmw_test_suite/sqlite3/statement.cpp
rename to apps/components_tests/sqlite3/statement.cpp
diff --git a/apps/openmw_test_suite/sqlite3/transaction.cpp b/apps/components_tests/sqlite3/transaction.cpp
similarity index 100%
rename from apps/openmw_test_suite/sqlite3/transaction.cpp
rename to apps/components_tests/sqlite3/transaction.cpp
diff --git a/apps/openmw_test_suite/toutf8/data/french-utf8.txt b/apps/components_tests/toutf8/data/french-utf8.txt
similarity index 100%
rename from apps/openmw_test_suite/toutf8/data/french-utf8.txt
rename to apps/components_tests/toutf8/data/french-utf8.txt
diff --git a/apps/openmw_test_suite/toutf8/data/french-win1252.txt b/apps/components_tests/toutf8/data/french-win1252.txt
similarity index 100%
rename from apps/openmw_test_suite/toutf8/data/french-win1252.txt
rename to apps/components_tests/toutf8/data/french-win1252.txt
diff --git a/apps/openmw_test_suite/toutf8/data/russian-utf8.txt b/apps/components_tests/toutf8/data/russian-utf8.txt
similarity index 100%
rename from apps/openmw_test_suite/toutf8/data/russian-utf8.txt
rename to apps/components_tests/toutf8/data/russian-utf8.txt
diff --git a/apps/openmw_test_suite/toutf8/data/russian-win1251.txt b/apps/components_tests/toutf8/data/russian-win1251.txt
similarity index 100%
rename from apps/openmw_test_suite/toutf8/data/russian-win1251.txt
rename to apps/components_tests/toutf8/data/russian-win1251.txt
diff --git a/apps/openmw_test_suite/toutf8/toutf8.cpp b/apps/components_tests/toutf8/toutf8.cpp
similarity index 97%
rename from apps/openmw_test_suite/toutf8/toutf8.cpp
rename to apps/components_tests/toutf8/toutf8.cpp
index f189294cf2..704ee6742d 100644
--- a/apps/openmw_test_suite/toutf8/toutf8.cpp
+++ b/apps/components_tests/toutf8/toutf8.cpp
@@ -26,7 +26,7 @@ namespace
     {
         std::ifstream file;
         file.exceptions(std::ios::failbit | std::ios::badbit);
-        file.open(std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "apps" / "openmw_test_suite" / "toutf8" / "data"
+        file.open(std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "apps" / "components_tests" / "toutf8" / "data"
             / Misc::StringUtils::stringToU8String(fileName));
         std::stringstream buffer;
         buffer << file.rdbuf();
@@ -47,7 +47,7 @@ namespace
     {
         std::string input;
         for (int c = 1; c <= std::numeric_limits<char>::max(); ++c)
-            input.push_back(c);
+            input.push_back(static_cast<char>(c));
         Utf8Encoder encoder(FromType::CP437);
         const std::string_view result = encoder.getUtf8(input);
         EXPECT_EQ(result.data(), input.data());
@@ -99,7 +99,7 @@ namespace
     {
         std::string input;
         for (int c = 1; c <= std::numeric_limits<char>::max(); ++c)
-            input.push_back(c);
+            input.push_back(static_cast<char>(c));
         Utf8Encoder encoder(FromType::CP437);
         const std::string_view result = encoder.getLegacyEnc(input);
         EXPECT_EQ(result.data(), input.data());
diff --git a/apps/components_tests/vfs/testpathutil.cpp b/apps/components_tests/vfs/testpathutil.cpp
new file mode 100644
index 0000000000..3819f9905a
--- /dev/null
+++ b/apps/components_tests/vfs/testpathutil.cpp
@@ -0,0 +1,201 @@
+#include <components/vfs/pathutil.hpp>
+
+#include <gtest/gtest.h>
+
+#include <sstream>
+
+namespace VFS::Path
+{
+    namespace
+    {
+        using namespace testing;
+
+        TEST(NormalizedTest, shouldSupportDefaultConstructor)
+        {
+            const Normalized value;
+            EXPECT_EQ(value.value(), "");
+        }
+
+        TEST(NormalizedTest, shouldSupportConstructorFromString)
+        {
+            const std::string string("Foo\\Bar/baz");
+            const Normalized value(string);
+            EXPECT_EQ(value.value(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedTest, shouldSupportConstructorFromConstCharPtr)
+        {
+            const char* const ptr = "Foo\\Bar/baz";
+            const Normalized value(ptr);
+            EXPECT_EQ(value.value(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedTest, shouldSupportConstructorFromStringView)
+        {
+            const std::string_view view = "Foo\\Bar/baz";
+            const Normalized value(view);
+            EXPECT_EQ(value.view(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedTest, shouldSupportConstructorFromNormalizedView)
+        {
+            const NormalizedView view("foo/bar/baz");
+            const Normalized value(view);
+            EXPECT_EQ(value.view(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedTest, supportMovingValueOut)
+        {
+            Normalized value("Foo\\Bar/baz");
+            EXPECT_EQ(std::move(value).value(), "foo/bar/baz");
+            EXPECT_EQ(value.value(), "");
+        }
+
+        TEST(NormalizedTest, isNotEqualToNotNormalized)
+        {
+            const Normalized value("Foo\\Bar/baz");
+            EXPECT_NE(value.value(), "Foo\\Bar/baz");
+        }
+
+        TEST(NormalizedTest, shouldSupportOperatorLeftShiftToOStream)
+        {
+            const Normalized value("Foo\\Bar/baz");
+            std::stringstream stream;
+            stream << value;
+            EXPECT_EQ(stream.str(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedTest, shouldSupportOperatorDivEqual)
+        {
+            Normalized value("foo/bar");
+            value /= NormalizedView("baz");
+            EXPECT_EQ(value.value(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedTest, shouldSupportOperatorDivEqualWithStringView)
+        {
+            Normalized value("foo/bar");
+            value /= std::string_view("BAZ");
+            EXPECT_EQ(value.value(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedTest, changeExtensionShouldReplaceAfterLastDot)
+        {
+            Normalized value("foo/bar.a");
+            ASSERT_TRUE(value.changeExtension("so"));
+            EXPECT_EQ(value.value(), "foo/bar.so");
+        }
+
+        TEST(NormalizedTest, changeExtensionShouldNormalizeExtension)
+        {
+            Normalized value("foo/bar.a");
+            ASSERT_TRUE(value.changeExtension("SO"));
+            EXPECT_EQ(value.value(), "foo/bar.so");
+        }
+
+        TEST(NormalizedTest, changeExtensionShouldIgnorePathWithoutADot)
+        {
+            Normalized value("foo/bar");
+            ASSERT_FALSE(value.changeExtension("so"));
+            EXPECT_EQ(value.value(), "foo/bar");
+        }
+
+        TEST(NormalizedTest, changeExtensionShouldIgnorePathWithDotBeforeSeparator)
+        {
+            Normalized value("foo.bar/baz");
+            ASSERT_FALSE(value.changeExtension("so"));
+            EXPECT_EQ(value.value(), "foo.bar/baz");
+        }
+
+        TEST(NormalizedTest, changeExtensionShouldThrowExceptionOnExtensionWithDot)
+        {
+            Normalized value("foo.a");
+            EXPECT_THROW(value.changeExtension(".so"), std::invalid_argument);
+        }
+
+        TEST(NormalizedTest, changeExtensionShouldThrowExceptionOnExtensionWithSeparator)
+        {
+            Normalized value("foo.a");
+            EXPECT_THROW(value.changeExtension("/so"), std::invalid_argument);
+        }
+
+        template <class T>
+        struct NormalizedOperatorsTest : Test
+        {
+        };
+
+        TYPED_TEST_SUITE_P(NormalizedOperatorsTest);
+
+        TYPED_TEST_P(NormalizedOperatorsTest, supportsEqual)
+        {
+            using Type0 = typename TypeParam::Type0;
+            using Type1 = typename TypeParam::Type1;
+            const Type0 normalized{ "a/foo/bar/baz" };
+            const Type1 otherEqual{ "a/foo/bar/baz" };
+            const Type1 otherNotEqual{ "b/foo/bar/baz" };
+            EXPECT_EQ(normalized, otherEqual);
+            EXPECT_EQ(otherEqual, normalized);
+            EXPECT_NE(normalized, otherNotEqual);
+            EXPECT_NE(otherNotEqual, normalized);
+        }
+
+        TYPED_TEST_P(NormalizedOperatorsTest, supportsLess)
+        {
+            using Type0 = typename TypeParam::Type0;
+            using Type1 = typename TypeParam::Type1;
+            const Type0 normalized{ "b/foo/bar/baz" };
+            const Type1 otherEqual{ "b/foo/bar/baz" };
+            const Type1 otherLess{ "a/foo/bar/baz" };
+            const Type1 otherGreater{ "c/foo/bar/baz" };
+            EXPECT_FALSE(normalized < otherEqual);
+            EXPECT_FALSE(otherEqual < normalized);
+            EXPECT_LT(otherLess, normalized);
+            EXPECT_FALSE(normalized < otherLess);
+            EXPECT_LT(normalized, otherGreater);
+            EXPECT_FALSE(otherGreater < normalized);
+        }
+
+        REGISTER_TYPED_TEST_SUITE_P(NormalizedOperatorsTest, supportsEqual, supportsLess);
+
+        template <class T0, class T1>
+        struct TypePair
+        {
+            using Type0 = T0;
+            using Type1 = T1;
+        };
+
+        using TypePairs = Types<TypePair<Normalized, Normalized>, TypePair<Normalized, const char*>,
+            TypePair<Normalized, std::string>, TypePair<Normalized, std::string_view>,
+            TypePair<Normalized, NormalizedView>, TypePair<NormalizedView, Normalized>,
+            TypePair<NormalizedView, const char*>, TypePair<NormalizedView, std::string>,
+            TypePair<NormalizedView, std::string_view>, TypePair<NormalizedView, NormalizedView>>;
+
+        INSTANTIATE_TYPED_TEST_SUITE_P(Typed, NormalizedOperatorsTest, TypePairs);
+
+        TEST(NormalizedViewTest, shouldSupportConstructorFromNormalized)
+        {
+            const Normalized value("Foo\\Bar/baz");
+            const NormalizedView view(value);
+            EXPECT_EQ(view.value(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedViewTest, shouldSupportConstexprConstructorFromNormalizedStringLiteral)
+        {
+            constexpr NormalizedView view("foo/bar/baz");
+            EXPECT_EQ(view.value(), "foo/bar/baz");
+        }
+
+        TEST(NormalizedViewTest, constructorShouldThrowExceptionOnNotNormalized)
+        {
+            EXPECT_THROW([] { NormalizedView("Foo\\Bar/baz"); }(), std::invalid_argument);
+        }
+
+        TEST(NormalizedView, shouldSupportOperatorDiv)
+        {
+            const NormalizedView a("foo/bar");
+            const NormalizedView b("baz");
+            const Normalized result = a / b;
+            EXPECT_EQ(result.value(), "foo/bar/baz");
+        }
+    }
+}
diff --git a/apps/esmtool/CMakeLists.txt b/apps/esmtool/CMakeLists.txt
index 6f7fa1a993..6dd592a4fe 100644
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@@ -16,7 +16,7 @@ openmw_add_executable(esmtool
 )
 
 target_link_libraries(esmtool
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    Boost::program_options
     components
 )
 
@@ -25,7 +25,7 @@ if (BUILD_WITH_CODE_COVERAGE)
     target_link_libraries(esmtool gcov)
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(esmtool PRIVATE
         <fstream>
         <string>
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 092be66e97..0473676f93 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -69,7 +69,7 @@ Allowed options)");
         addOption("name,n", bpo::value<std::string>(), "Show only the record with this name.  Only affects dump mode.");
         addOption("plain,p",
             "Print contents of dialogs, books and scripts. "
-            "(skipped by default)"
+            "(skipped by default) "
             "Only affects dump mode.");
         addOption("quiet,q", "Suppress all record information. Useful for speed tests.");
         addOption("loadcells,C", "Browse through contents of all cells.");
@@ -156,7 +156,7 @@ Allowed options)");
               return false;
               }*/
 
-        const auto inputFiles = variables["input-file"].as<Files::MaybeQuotedPathContainer>();
+        const auto& inputFiles = variables["input-file"].as<Files::MaybeQuotedPathContainer>();
         info.filename = inputFiles[0].u8string(); // This call to u8string is redundant, but required to build on
                                                   // MSVC 14.26 due to implementation bugs.
         if (inputFiles.size() > 1)
@@ -265,7 +265,7 @@ namespace
                 std::cout << "    Faction rank: " << ref.mFactionRank << '\n';
             std::cout << "    Enchantment charge: " << ref.mEnchantmentCharge << '\n';
             std::cout << "    Uses/health: " << ref.mChargeInt << '\n';
-            std::cout << "    Gold value: " << ref.mGoldValue << '\n';
+            std::cout << "    Count: " << ref.mCount << '\n';
             std::cout << "    Blocked: " << static_cast<int>(ref.mReferenceBlocked) << '\n';
             std::cout << "    Deleted: " << deleted << '\n';
             if (!ref.mKey.empty())
@@ -341,7 +341,7 @@ namespace
             {
                 std::cout << "Author: " << esm.getAuthor() << '\n'
                           << "Description: " << esm.getDesc() << '\n'
-                          << "File format version: " << esm.getFVer() << '\n';
+                          << "File format version: " << esm.esmVersionF() << '\n';
                 std::vector<ESM::Header::MasterData> masterData = esm.getGameFiles();
                 if (!masterData.empty())
                 {
@@ -390,7 +390,7 @@ namespace
 
                 if (!quiet && interested)
                 {
-                    std::cout << "\nRecord: " << n.toStringView() << " '" << record->getId() << "'\n"
+                    std::cout << "\nRecord: " << n.toStringView() << " " << record->getId() << "\n"
                               << "Record flags: " << recordFlags(record->getFlags()) << '\n';
                     record->print();
                 }
@@ -508,7 +508,7 @@ namespace
         ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(info.encoding));
         esm.setEncoder(&encoder);
         esm.setHeader(data.mHeader);
-        esm.setVersion(ESM::VER_13);
+        esm.setVersion(ESM::VER_130);
         esm.setRecordCount(recordCount);
 
         std::fstream save(info.outname, std::fstream::out | std::fstream::binary);
diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp
index d0a443de53..3d64563923 100644
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@@ -1,10 +1,13 @@
 #include "labels.hpp"
 
+#include <components/esm3/dialoguecondition.hpp>
+#include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadbody.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/esm3/loadlevlist.hpp>
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/loadmgef.hpp>
@@ -571,13 +574,14 @@ std::string_view enchantTypeLabel(int idx)
 
 std::string_view ruleFunction(int idx)
 {
-    if (idx >= 0 && idx <= 72)
+    if (idx >= ESM::DialogueCondition::Function_FacReactionLowest
+        && idx <= ESM::DialogueCondition::Function_PcWerewolfKills)
     {
         static constexpr std::string_view ruleFunctions[] = {
-            "Reaction Low",
-            "Reaction High",
+            "Lowest Faction Reaction",
+            "Highest Faction Reaction",
             "Rank Requirement",
-            "NPC? Reputation",
+            "NPC Reputation",
             "Health Percent",
             "Player Reputation",
             "NPC Level",
@@ -647,6 +651,7 @@ std::string_view ruleFunction(int idx)
             "Flee",
             "Should Attack",
             "Werewolf",
+            "Werewolf Kills",
         };
         return ruleFunctions[idx];
     }
@@ -762,18 +767,16 @@ std::string enchantmentFlags(int flags)
 std::string landFlags(std::uint32_t flags)
 {
     std::string properties;
-    // The ESM component says that this first four bits are used, but
-    // only the first three bits are used as far as I can tell.
-    // There's also no enumeration of the bit in the ESM component.
     if (flags == 0)
         properties += "[None] ";
-    if (flags & 0x00000001)
-        properties += "Unknown1 ";
-    if (flags & 0x00000004)
-        properties += "Unknown3 ";
-    if (flags & 0x00000002)
-        properties += "Unknown2 ";
-    if (flags & 0xFFFFFFF8)
+    if (flags & ESM::Land::Flag_HeightsNormals)
+        properties += "HeightsNormals ";
+    if (flags & ESM::Land::Flag_Colors)
+        properties += "Colors ";
+    if (flags & ESM::Land::Flag_Textures)
+        properties += "Textures ";
+    int unused = 0xFFFFFFFF ^ (ESM::Land::Flag_HeightsNormals | ESM::Land::Flag_Colors | ESM::Land::Flag_Textures);
+    if (flags & unused)
         properties += "Invalid ";
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
@@ -987,3 +990,16 @@ std::string recordFlags(uint32_t flags)
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
+
+std::string potionFlags(int flags)
+{
+    std::string properties;
+    if (flags == 0)
+        properties += "[None] ";
+    if (flags & ESM::Potion::Autocalc)
+        properties += "Autocalc ";
+    if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc))
+        properties += "Invalid ";
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    return properties;
+}
diff --git a/apps/esmtool/labels.hpp b/apps/esmtool/labels.hpp
index df6d419ca3..c3a78141b4 100644
--- a/apps/esmtool/labels.hpp
+++ b/apps/esmtool/labels.hpp
@@ -60,6 +60,7 @@ std::string itemListFlags(int flags);
 std::string lightFlags(int flags);
 std::string magicEffectFlags(int flags);
 std::string npcFlags(int flags);
+std::string potionFlags(int flags);
 std::string raceFlags(int flags);
 std::string spellFlags(int flags);
 std::string weaponFlags(int flags);
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 0c22114749..b9c64d964a 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -2,6 +2,7 @@
 #include "labels.hpp"
 
 #include <iostream>
+#include <numeric>
 #include <sstream>
 
 #include <components/esm3/cellstate.hpp>
@@ -57,112 +58,82 @@ namespace
             std::cout << "    Cell Name: " << p.mCellName << std::endl;
     }
 
-    std::string ruleString(const ESM::DialInfo::SelectStruct& ss)
+    std::string ruleString(const ESM::DialogueCondition& ss)
     {
-        std::string rule = ss.mSelectRule;
+        std::string_view type_str = "INVALID";
+        std::string_view func_str;
 
-        if (rule.length() < 5)
-            return "INVALID";
-
-        char type = rule[1];
-        char indicator = rule[2];
-
-        std::string type_str = "INVALID";
-        std::string func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1, 3));
-        int func = Misc::StringUtils::toNumeric<int>(rule.substr(2, 2), 0);
-
-        switch (type)
+        switch (ss.mFunction)
         {
-            case '1':
-                type_str = "Function";
-                func_str = std::string(ruleFunction(func));
+            case ESM::DialogueCondition::Function_Global:
+                type_str = "Global";
+                func_str = ss.mVariable;
                 break;
-            case '2':
-                if (indicator == 's')
-                    type_str = "Global short";
-                else if (indicator == 'l')
-                    type_str = "Global long";
-                else if (indicator == 'f')
-                    type_str = "Global float";
+            case ESM::DialogueCondition::Function_Local:
+                type_str = "Local";
+                func_str = ss.mVariable;
                 break;
-            case '3':
-                if (indicator == 's')
-                    type_str = "Local short";
-                else if (indicator == 'l')
-                    type_str = "Local long";
-                else if (indicator == 'f')
-                    type_str = "Local float";
+            case ESM::DialogueCondition::Function_Journal:
+                type_str = "Journal";
+                func_str = ss.mVariable;
                 break;
-            case '4':
-                if (indicator == 'J')
-                    type_str = "Journal";
+            case ESM::DialogueCondition::Function_Item:
+                type_str = "Item count";
+                func_str = ss.mVariable;
                 break;
-            case '5':
-                if (indicator == 'I')
-                    type_str = "Item type";
+            case ESM::DialogueCondition::Function_Dead:
+                type_str = "Dead";
+                func_str = ss.mVariable;
                 break;
-            case '6':
-                if (indicator == 'D')
-                    type_str = "NPC Dead";
+            case ESM::DialogueCondition::Function_NotId:
+                type_str = "Not ID";
+                func_str = ss.mVariable;
                 break;
-            case '7':
-                if (indicator == 'X')
-                    type_str = "Not ID";
+            case ESM::DialogueCondition::Function_NotFaction:
+                type_str = "Not Faction";
+                func_str = ss.mVariable;
                 break;
-            case '8':
-                if (indicator == 'F')
-                    type_str = "Not Faction";
+            case ESM::DialogueCondition::Function_NotClass:
+                type_str = "Not Class";
+                func_str = ss.mVariable;
                 break;
-            case '9':
-                if (indicator == 'C')
-                    type_str = "Not Class";
+            case ESM::DialogueCondition::Function_NotRace:
+                type_str = "Not Race";
+                func_str = ss.mVariable;
                 break;
-            case 'A':
-                if (indicator == 'R')
-                    type_str = "Not Race";
+            case ESM::DialogueCondition::Function_NotCell:
+                type_str = "Not Cell";
+                func_str = ss.mVariable;
                 break;
-            case 'B':
-                if (indicator == 'L')
-                    type_str = "Not Cell";
-                break;
-            case 'C':
-                if (indicator == 's')
-                    type_str = "Not Local";
+            case ESM::DialogueCondition::Function_NotLocal:
+                type_str = "Not Local";
+                func_str = ss.mVariable;
                 break;
             default:
+                type_str = "Function";
+                func_str = ruleFunction(ss.mFunction);
                 break;
         }
 
-        // Append the variable name to the function string if any.
-        if (type != '1')
-            func_str = rule.substr(5);
-
-        // In the previous switch, we assumed that the second char was X
-        // for all types not qual to one.  If this wasn't true, go back to
-        // the error message.
-        if (type != '1' && rule[3] != 'X')
-            func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1, 3));
-
-        char oper = rule[4];
-        std::string oper_str = "??";
-        switch (oper)
+        std::string_view oper_str = "??";
+        switch (ss.mComparison)
         {
-            case '0':
+            case ESM::DialogueCondition::Comp_Eq:
                 oper_str = "==";
                 break;
-            case '1':
+            case ESM::DialogueCondition::Comp_Ne:
                 oper_str = "!=";
                 break;
-            case '2':
+            case ESM::DialogueCondition::Comp_Gt:
                 oper_str = "> ";
                 break;
-            case '3':
+            case ESM::DialogueCondition::Comp_Ge:
                 oper_str = ">=";
                 break;
-            case '4':
+            case ESM::DialogueCondition::Comp_Ls:
                 oper_str = "< ";
                 break;
-            case '5':
+            case ESM::DialogueCondition::Comp_Le:
                 oper_str = "<=";
                 break;
             default:
@@ -170,7 +141,7 @@ namespace
         }
 
         std::ostringstream stream;
-        stream << ss.mValue;
+        std::visit([&](auto value) { stream << value; }, ss.mValue);
 
         std::string result
             = Misc::StringUtils::format("%-12s %-32s %2s %s", type_str, func_str, oper_str, stream.str());
@@ -180,22 +151,23 @@ namespace
     void printEffectList(const ESM::EffectList& effects)
     {
         int i = 0;
-        for (const ESM::ENAMstruct& effect : effects.mList)
+        for (const ESM::IndexedENAMstruct& effect : effects.mList)
         {
-            std::cout << "  Effect[" << i << "]: " << magicEffectLabel(effect.mEffectID) << " (" << effect.mEffectID
-                      << ")" << std::endl;
-            if (effect.mSkill != -1)
-                std::cout << "    Skill: " << skillLabel(effect.mSkill) << " (" << (int)effect.mSkill << ")"
+            std::cout << "  Effect[" << i << "]: " << magicEffectLabel(effect.mData.mEffectID) << " ("
+                      << effect.mData.mEffectID << ")" << std::endl;
+            if (effect.mData.mSkill != -1)
+                std::cout << "    Skill: " << skillLabel(effect.mData.mSkill) << " (" << (int)effect.mData.mSkill << ")"
                           << std::endl;
-            if (effect.mAttribute != -1)
-                std::cout << "    Attribute: " << attributeLabel(effect.mAttribute) << " (" << (int)effect.mAttribute
-                          << ")" << std::endl;
-            std::cout << "    Range: " << rangeTypeLabel(effect.mRange) << " (" << effect.mRange << ")" << std::endl;
+            if (effect.mData.mAttribute != -1)
+                std::cout << "    Attribute: " << attributeLabel(effect.mData.mAttribute) << " ("
+                          << (int)effect.mData.mAttribute << ")" << std::endl;
+            std::cout << "    Range: " << rangeTypeLabel(effect.mData.mRange) << " (" << effect.mData.mRange << ")"
+                      << std::endl;
             // Area is always zero if range type is "Self"
-            if (effect.mRange != ESM::RT_Self)
-                std::cout << "    Area: " << effect.mArea << std::endl;
-            std::cout << "    Duration: " << effect.mDuration << std::endl;
-            std::cout << "    Magnitude: " << effect.mMagnMin << "-" << effect.mMagnMax << std::endl;
+            if (effect.mData.mRange != ESM::RT_Self)
+                std::cout << "    Area: " << effect.mData.mArea << std::endl;
+            std::cout << "    Duration: " << effect.mData.mDuration << std::endl;
+            std::cout << "    Magnitude: " << effect.mData.mMagnMin << "-" << effect.mData.mMagnMax << std::endl;
             i++;
         }
     }
@@ -464,7 +436,8 @@ namespace EsmTool
     {
         std::cout << "  Name: " << mData.mName << std::endl;
         std::cout << "  Model: " << mData.mModel << std::endl;
-        std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
         std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
 
@@ -478,7 +451,7 @@ namespace EsmTool
             std::cout << "  Script: " << mData.mScript << std::endl;
         std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
         std::cout << "  Value: " << mData.mData.mValue << std::endl;
-        std::cout << "  AutoCalc: " << mData.mData.mAutoCalc << std::endl;
+        std::cout << "  Flags: " << potionFlags(mData.mData.mFlags) << std::endl;
         printEffectList(mData.mEffects);
         std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
@@ -516,7 +489,8 @@ namespace EsmTool
         std::cout << "  Name: " << mData.mName << std::endl;
         std::cout << "  Model: " << mData.mModel << std::endl;
         std::cout << "  Icon: " << mData.mIcon << std::endl;
-        std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
         std::cout << "  Type: " << apparatusTypeLabel(mData.mData.mType) << " (" << mData.mData.mType << ")"
                   << std::endl;
         std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
@@ -610,7 +584,6 @@ namespace EsmTool
         }
         else
             std::cout << "  Map Color: " << Misc::StringUtils::format("0x%08X", mData.mMapColor) << std::endl;
-        std::cout << "  Water Level Int: " << mData.mWaterInt << std::endl;
         std::cout << "  RefId counter: " << mData.mRefNumCounter << std::endl;
         std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
@@ -679,7 +652,8 @@ namespace EsmTool
     {
         std::cout << "  Name: " << mData.mName << std::endl;
         std::cout << "  Model: " << mData.mModel << std::endl;
-        std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
         std::cout << "  Flags: " << creatureFlags((int)mData.mFlags) << std::endl;
         std::cout << "  Blood Type: " << mData.mBloodType + 1 << std::endl;
         std::cout << "  Original: " << mData.mOriginal << std::endl;
@@ -690,14 +664,8 @@ namespace EsmTool
         std::cout << "  Level: " << mData.mData.mLevel << std::endl;
 
         std::cout << "  Attributes:" << std::endl;
-        std::cout << "    Strength: " << mData.mData.mStrength << std::endl;
-        std::cout << "    Intelligence: " << mData.mData.mIntelligence << std::endl;
-        std::cout << "    Willpower: " << mData.mData.mWillpower << std::endl;
-        std::cout << "    Agility: " << mData.mData.mAgility << std::endl;
-        std::cout << "    Speed: " << mData.mData.mSpeed << std::endl;
-        std::cout << "    Endurance: " << mData.mData.mEndurance << std::endl;
-        std::cout << "    Personality: " << mData.mData.mPersonality << std::endl;
-        std::cout << "    Luck: " << mData.mData.mLuck << std::endl;
+        for (size_t i = 0; i < mData.mData.mAttributes.size(); ++i)
+            std::cout << "    " << ESM::Attribute::indexToRefId(i) << ": " << mData.mData.mAttributes[i] << std::endl;
 
         std::cout << "  Health: " << mData.mData.mHealth << std::endl;
         std::cout << "  Magicka: " << mData.mData.mMana << std::endl;
@@ -725,9 +693,6 @@ namespace EsmTool
         std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
         std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
         std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
-        std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
-        std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
-        std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
         std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
 
         for (const ESM::AIPackage& package : mData.mAiPackage.mList)
@@ -753,7 +718,8 @@ namespace EsmTool
     {
         std::cout << "  Name: " << mData.mName << std::endl;
         std::cout << "  Model: " << mData.mModel << std::endl;
-        std::cout << "  Script: " << mData.mScript << std::endl;
+        if (!mData.mScript.empty())
+            std::cout << "  Script: " << mData.mScript << std::endl;
         std::cout << "  OpenSound: " << mData.mOpenSound << std::endl;
         std::cout << "  CloseSound: " << mData.mCloseSound << std::endl;
         std::cout << "  Deleted: " << mIsDeleted << std::endl;
@@ -845,10 +811,9 @@ namespace EsmTool
 
         std::cout << "  Quest Status: " << questStatusLabel(mData.mQuestStatus) << " (" << mData.mQuestStatus << ")"
                   << std::endl;
-        std::cout << "  Unknown1: " << mData.mData.mUnknown1 << std::endl;
-        std::cout << "  Unknown2: " << (int)mData.mData.mUnknown2 << std::endl;
+        std::cout << "  Type: " << dialogTypeLabel(mData.mData.mType) << std::endl;
 
-        for (const ESM::DialInfo::SelectStruct& rule : mData.mSelects)
+        for (const auto& rule : mData.mSelects)
             std::cout << "  Select Rule: " << ruleString(rule) << std::endl;
 
         if (!mData.mResultScript.empty())
@@ -902,10 +867,9 @@ namespace EsmTool
 
         if (const ESM::Land::LandData* data = mData.getLandData(mData.mDataTypes))
         {
-            std::cout << "  Height Offset: " << data->mHeightOffset << std::endl;
-            // Lots of missing members.
-            std::cout << "  Unknown1: " << data->mUnk1 << std::endl;
-            std::cout << "  Unknown2: " << static_cast<unsigned>(data->mUnk2) << std::endl;
+            std::cout << "  MinHeight: " << data->mMinHeight << std::endl;
+            std::cout << "  MaxHeight: " << data->mMaxHeight << std::endl;
+            std::cout << "  DataLoaded: " << data->mDataLoaded << std::endl;
         }
         mData.unloadData();
         std::cout << "  Deleted: " << mIsDeleted << std::endl;
@@ -1090,14 +1054,8 @@ namespace EsmTool
             std::cout << "  Rank: " << (int)mData.mNpdt.mRank << std::endl;
 
             std::cout << "  Attributes:" << std::endl;
-            std::cout << "    Strength: " << (int)mData.mNpdt.mStrength << std::endl;
-            std::cout << "    Intelligence: " << (int)mData.mNpdt.mIntelligence << std::endl;
-            std::cout << "    Willpower: " << (int)mData.mNpdt.mWillpower << std::endl;
-            std::cout << "    Agility: " << (int)mData.mNpdt.mAgility << std::endl;
-            std::cout << "    Speed: " << (int)mData.mNpdt.mSpeed << std::endl;
-            std::cout << "    Endurance: " << (int)mData.mNpdt.mEndurance << std::endl;
-            std::cout << "    Personality: " << (int)mData.mNpdt.mPersonality << std::endl;
-            std::cout << "    Luck: " << (int)mData.mNpdt.mLuck << std::endl;
+            for (size_t i = 0; i != mData.mNpdt.mAttributes.size(); i++)
+                std::cout << "    " << attributeLabel(i) << ": " << int(mData.mNpdt.mAttributes[i]) << std::endl;
 
             std::cout << "  Skills:" << std::endl;
             for (size_t i = 0; i != mData.mNpdt.mSkills.size(); i++)
@@ -1123,9 +1081,6 @@ namespace EsmTool
         std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
         std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
         std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
-        std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
-        std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
-        std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
         std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
 
         for (const ESM::AIPackage& package : mData.mAiPackage.mList)
@@ -1139,9 +1094,9 @@ namespace EsmTool
     {
         std::cout << "  Cell: " << mData.mCell << std::endl;
         std::cout << "  Coordinates: (" << mData.mData.mX << "," << mData.mData.mY << ")" << std::endl;
-        std::cout << "  Unknown S1: " << mData.mData.mS1 << std::endl;
-        if (static_cast<size_t>(mData.mData.mS2) != mData.mPoints.size())
-            std::cout << "  Reported Point Count: " << mData.mData.mS2 << std::endl;
+        std::cout << "  Granularity: " << mData.mData.mGranularity << std::endl;
+        if (mData.mData.mPoints != mData.mPoints.size())
+            std::cout << "  Reported Point Count: " << mData.mData.mPoints << std::endl;
         std::cout << "  Point Count: " << mData.mPoints.size() << std::endl;
         std::cout << "  Edge Count: " << mData.mEdges.size() << std::endl;
 
@@ -1152,7 +1107,6 @@ namespace EsmTool
             std::cout << "    Coordinates: (" << point.mX << "," << point.mY << "," << point.mZ << ")" << std::endl;
             std::cout << "    Auto-Generated: " << (int)point.mAutogenerated << std::endl;
             std::cout << "    Connections: " << (int)point.mConnectionNum << std::endl;
-            std::cout << "    Unknown: " << point.mUnknown << std::endl;
             i++;
         }
 
@@ -1160,7 +1114,7 @@ namespace EsmTool
         for (const ESM::Pathgrid::Edge& edge : mData.mEdges)
         {
             std::cout << "  Edge[" << i << "]: " << edge.mV0 << " -> " << edge.mV1 << std::endl;
-            if (edge.mV0 >= static_cast<size_t>(mData.mData.mS2) || edge.mV1 >= static_cast<size_t>(mData.mData.mS2))
+            if (edge.mV0 >= mData.mData.mPoints || edge.mV1 >= mData.mData.mPoints)
                 std::cout << "  BAD POINT IN EDGE!" << std::endl;
             i++;
         }
@@ -1175,19 +1129,23 @@ namespace EsmTool
         std::cout << "  Description: " << mData.mDescription << std::endl;
         std::cout << "  Flags: " << raceFlags(mData.mData.mFlags) << std::endl;
 
-        for (int i = 0; i < 2; ++i)
+        std::cout << "  Male:" << std::endl;
+        for (int j = 0; j < ESM::Attribute::Length; ++j)
         {
-            bool male = i == 0;
-
-            std::cout << (male ? "  Male:" : "  Female:") << std::endl;
-
-            for (int j = 0; j < ESM::Attribute::Length; ++j)
-                std::cout << "    " << ESM::Attribute::indexToRefId(j) << ": "
-                          << mData.mData.mAttributeValues[j].getValue(male) << std::endl;
-
-            std::cout << "    Height: " << mData.mData.mHeight.getValue(male) << std::endl;
-            std::cout << "    Weight: " << mData.mData.mWeight.getValue(male) << std::endl;
+            ESM::RefId id = ESM::Attribute::indexToRefId(j);
+            std::cout << "    " << id << ": " << mData.mData.getAttribute(id, true) << std::endl;
         }
+        std::cout << "    Height: " << mData.mData.mMaleHeight << std::endl;
+        std::cout << "    Weight: " << mData.mData.mMaleWeight << std::endl;
+
+        std::cout << "  Female:" << std::endl;
+        for (int j = 0; j < ESM::Attribute::Length; ++j)
+        {
+            ESM::RefId id = ESM::Attribute::indexToRefId(j);
+            std::cout << "    " << id << ": " << mData.mData.getAttribute(id, false) << std::endl;
+        }
+        std::cout << "    Height: " << mData.mData.mFemaleHeight << std::endl;
+        std::cout << "    Weight: " << mData.mData.mFemaleWeight << std::endl;
 
         for (const auto& bonus : mData.mData.mBonus)
             // Not all races have 7 skills.
@@ -1207,16 +1165,11 @@ namespace EsmTool
         std::cout << "  Name: " << mData.mName << std::endl;
 
         std::cout << "  Weather:" << std::endl;
-        std::cout << "    Clear: " << (int)mData.mData.mClear << std::endl;
-        std::cout << "    Cloudy: " << (int)mData.mData.mCloudy << std::endl;
-        std::cout << "    Foggy: " << (int)mData.mData.mFoggy << std::endl;
-        std::cout << "    Overcast: " << (int)mData.mData.mOvercast << std::endl;
-        std::cout << "    Rain: " << (int)mData.mData.mOvercast << std::endl;
-        std::cout << "    Thunder: " << (int)mData.mData.mThunder << std::endl;
-        std::cout << "    Ash: " << (int)mData.mData.mAsh << std::endl;
-        std::cout << "    Blight: " << (int)mData.mData.mBlight << std::endl;
-        std::cout << "    Snow: " << (int)mData.mData.mSnow << std::endl;
-        std::cout << "    Blizzard: " << (int)mData.mData.mBlizzard << std::endl;
+        std::array<std::string_view, 10> weathers
+            = { "Clear", "Cloudy", "Fog", "Overcast", "Rain", "Thunder", "Ash", "Blight", "Snow", "Blizzard" };
+        for (size_t i = 0; i < weathers.size(); ++i)
+            std::cout << "    " << weathers[i] << ": " << static_cast<unsigned>(mData.mData.mProbabilities[i])
+                      << std::endl;
         std::cout << "  Map Color: " << mData.mMapColor << std::endl;
         if (!mData.mSleepList.empty())
             std::cout << "  Sleep List: " << mData.mSleepList << std::endl;
@@ -1229,11 +1182,11 @@ namespace EsmTool
     {
         std::cout << "  Name: " << mData.mId << std::endl;
 
-        std::cout << "  Num Shorts: " << mData.mData.mNumShorts << std::endl;
-        std::cout << "  Num Longs: " << mData.mData.mNumLongs << std::endl;
-        std::cout << "  Num Floats: " << mData.mData.mNumFloats << std::endl;
-        std::cout << "  Script Data Size: " << mData.mData.mScriptDataSize << std::endl;
-        std::cout << "  Table Size: " << mData.mData.mStringTableSize << std::endl;
+        std::cout << "  Num Shorts: " << mData.mNumShorts << std::endl;
+        std::cout << "  Num Longs: " << mData.mNumLongs << std::endl;
+        std::cout << "  Num Floats: " << mData.mNumFloats << std::endl;
+        std::cout << "  Script Data Size: " << mData.mScriptData.size() << std::endl;
+        std::cout << "  Table Size: " << ESM::computeScriptStringTableSize(mData.mVarNames) << std::endl;
 
         for (const std::string& variable : mData.mVarNames)
             std::cout << "  Variable: " << variable << std::endl;
@@ -1351,28 +1304,26 @@ namespace EsmTool
     template <>
     void Record<CellState>::print()
     {
-        std::cout << "  Id:" << std::endl;
-        std::cout << "    CellId: " << mData.mCellState.mId << std::endl;
-        std::cout << "    Index:" << std::endl;
-        std::cout << "  WaterLevel: " << mData.mCellState.mWaterLevel << std::endl;
-        std::cout << "  HasFogOfWar: " << mData.mCellState.mHasFogOfWar << std::endl;
-        std::cout << "  LastRespawn:" << std::endl;
+        std::cout << "  Cell Id: \"" << mData.mCellState.mId.toString() << "\"" << std::endl;
+        std::cout << "  Water Level: " << mData.mCellState.mWaterLevel << std::endl;
+        std::cout << "  Has Fog Of War: " << mData.mCellState.mHasFogOfWar << std::endl;
+        std::cout << "  Last Respawn:" << std::endl;
         std::cout << "    Day:" << mData.mCellState.mLastRespawn.mDay << std::endl;
         std::cout << "    Hour:" << mData.mCellState.mLastRespawn.mHour << std::endl;
         if (mData.mCellState.mHasFogOfWar)
         {
-            std::cout << "  NorthMarkerAngle: " << mData.mFogState.mNorthMarkerAngle << std::endl;
+            std::cout << "  North Marker Angle: " << mData.mFogState.mNorthMarkerAngle << std::endl;
             std::cout << "  Bounds:" << std::endl;
-            std::cout << "    MinX: " << mData.mFogState.mBounds.mMinX << std::endl;
-            std::cout << "    MinY: " << mData.mFogState.mBounds.mMinY << std::endl;
-            std::cout << "    MaxX: " << mData.mFogState.mBounds.mMaxX << std::endl;
-            std::cout << "    MaxY: " << mData.mFogState.mBounds.mMaxY << std::endl;
+            std::cout << "    Min X: " << mData.mFogState.mBounds.mMinX << std::endl;
+            std::cout << "    Min Y: " << mData.mFogState.mBounds.mMinY << std::endl;
+            std::cout << "    Max X: " << mData.mFogState.mBounds.mMaxX << std::endl;
+            std::cout << "    Max Y: " << mData.mFogState.mBounds.mMaxY << std::endl;
             for (const ESM::FogTexture& fogTexture : mData.mFogState.mFogTextures)
             {
-                std::cout << "  FogTexture:" << std::endl;
+                std::cout << "  Fog Texture:" << std::endl;
                 std::cout << "    X: " << fogTexture.mX << std::endl;
                 std::cout << "    Y: " << fogTexture.mY << std::endl;
-                std::cout << "    ImageData: (" << fogTexture.mImageData.size() << ")" << std::endl;
+                std::cout << "    Image Data: (" << fogTexture.mImageData.size() << ")" << std::endl;
             }
         }
     }
@@ -1380,7 +1331,7 @@ namespace EsmTool
     template <>
     std::string Record<ESM::Cell>::getId() const
     {
-        return mData.mName;
+        return std::string(); // No ID for Cell record
     }
 
     template <>
@@ -1410,9 +1361,7 @@ namespace EsmTool
     template <>
     std::string Record<CellState>::getId() const
     {
-        std::ostringstream stream;
-        stream << mData.mCellState.mId;
-        return stream.str();
+        return std::string(); // No ID for CellState record
     }
 
 } // end namespace
diff --git a/apps/esmtool/tes4.cpp b/apps/esmtool/tes4.cpp
index 6791694a7c..5b657da573 100644
--- a/apps/esmtool/tes4.cpp
+++ b/apps/esmtool/tes4.cpp
@@ -562,7 +562,7 @@ namespace EsmTool
             {
                 std::cout << "Author: " << reader.getAuthor() << '\n'
                           << "Description: " << reader.getDesc() << '\n'
-                          << "File format version: " << reader.esmVersion() << '\n';
+                          << "File format version: " << reader.esmVersionF() << '\n';
 
                 if (const std::vector<ESM::MasterData>& masterData = reader.getGameFiles(); !masterData.empty())
                 {
diff --git a/apps/essimporter/CMakeLists.txt b/apps/essimporter/CMakeLists.txt
index c6c98791e3..217d3e7b50 100644
--- a/apps/essimporter/CMakeLists.txt
+++ b/apps/essimporter/CMakeLists.txt
@@ -34,7 +34,7 @@ openmw_add_executable(openmw-essimporter
 )
 
 target_link_libraries(openmw-essimporter
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    Boost::program_options
     components
 )
 
@@ -47,7 +47,7 @@ if (WIN32)
     INSTALL(TARGETS openmw-essimporter RUNTIME DESTINATION ".")
 endif(WIN32)
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw-essimporter PRIVATE
         <algorithm>
         <filesystem>
diff --git a/apps/essimporter/convertacdt.cpp b/apps/essimporter/convertacdt.cpp
index 8342310cf6..a737e0a3a2 100644
--- a/apps/essimporter/convertacdt.cpp
+++ b/apps/essimporter/convertacdt.cpp
@@ -85,7 +85,7 @@ namespace ESSImport
             Misc::StringUtils::lowerCaseInPlace(group);
 
             ESM::AnimationState::ScriptedAnimation scriptedAnim;
-            scriptedAnim.mGroup = group;
+            scriptedAnim.mGroup = std::move(group);
             scriptedAnim.mTime = anis.mTime;
             scriptedAnim.mAbsolute = true;
             // Neither loop count nor queueing seems to be supported by the ess format.
diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 4751fd9497..ebb0c9d281 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -1,6 +1,7 @@
 #include "converter.hpp"
 
 #include <algorithm>
+#include <cstdint>
 #include <stdexcept>
 
 #include <osgDB/WriteFile>
@@ -33,7 +34,7 @@ namespace
         objstate.mPosition = cellref.mPos;
         objstate.mRef.mRefNum = cellref.mRefNum;
         if (cellref.mDeleted)
-            objstate.mCount = 0;
+            objstate.mRef.mCount = 0;
         convertSCRI(cellref.mActorData.mSCRI, objstate.mLocals);
         objstate.mHasLocals = !objstate.mLocals.mVariables.empty();
 
@@ -90,14 +91,14 @@ namespace ESSImport
 
     struct MAPH
     {
-        unsigned int size;
-        unsigned int value;
+        uint32_t size;
+        uint32_t value;
     };
 
     void ConvertFMAP::read(ESM::ESMReader& esm)
     {
         MAPH maph;
-        esm.getHNTSized<8>(maph, "MAPH");
+        esm.getHNT("MAPH", maph.size, maph.value);
         std::vector<char> data;
         esm.getSubNameIs("MAPD");
         esm.getSubHeader();
@@ -231,7 +232,7 @@ namespace ESSImport
                 esm.skip(4);
             }
 
-            esm.getExact(nam8, 32);
+            esm.getT(nam8);
 
             newcell.mFogOfWar.reserve(16 * 16);
             for (int x = 0; x < 16; ++x)
@@ -278,7 +279,7 @@ namespace ESSImport
         while (esm.isNextSub("MPCD"))
         {
             float notepos[3];
-            esm.getHTSized<3 * sizeof(float)>(notepos);
+            esm.getHT(notepos);
 
             // Markers seem to be arranged in a 32*32 grid, notepos has grid-indices.
             // This seems to be the reason markers can't be placed everywhere in interior cells,
@@ -305,12 +306,12 @@ namespace ESSImport
             mMarkers.push_back(marker);
         }
 
-        newcell.mRefs = cellrefs;
+        newcell.mRefs = std::move(cellrefs);
 
         if (cell.isExterior())
-            mExtCells[std::make_pair(cell.mData.mX, cell.mData.mY)] = newcell;
+            mExtCells[std::make_pair(cell.mData.mX, cell.mData.mY)] = std::move(newcell);
         else
-            mIntCells[cell.mName] = newcell;
+            mIntCells[cell.mName] = std::move(newcell);
     }
 
     void ConvertCell::writeCell(const Cell& cell, ESM::ESMWriter& esm)
diff --git a/apps/essimporter/convertinventory.cpp b/apps/essimporter/convertinventory.cpp
index 2f03cfaf41..7025b0ae43 100644
--- a/apps/essimporter/convertinventory.cpp
+++ b/apps/essimporter/convertinventory.cpp
@@ -9,15 +9,14 @@ namespace ESSImport
 
     void convertInventory(const Inventory& inventory, ESM::InventoryState& state)
     {
-        int index = 0;
+        uint32_t index = 0;
         for (const auto& item : inventory.mItems)
         {
             ESM::ObjectState objstate;
             objstate.blank();
             objstate.mRef = item;
             objstate.mRef.mRefID = ESM::RefId::stringRefId(item.mId);
-            objstate.mCount = std::abs(item.mCount); // restocking items have negative count in the savefile
-                                                     // openmw handles them differently, so no need to set any flags
+            objstate.mRef.mCount = item.mCount;
             state.mItems.push_back(objstate);
             if (item.mRelativeEquipmentSlot != -1)
                 // Note we should really write the absolute slot here, which we do not know about
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index 785e988200..65519c6a6c 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_ACDT_H
 #define OPENMW_ESSIMPORT_ACDT_H
 
+#include <cstdint>
 #include <string>
 
 #include "importscri.hpp"
@@ -25,14 +26,12 @@ namespace ESSImport
     };
 
     /// Actor data, shared by (at least) REFR and CellRef
-#pragma pack(push)
-#pragma pack(1)
     struct ACDT
     {
         // Note, not stored at *all*:
         // - Level changes are lost on reload, except for the player (there it's in the NPC record).
         unsigned char mUnknown[12];
-        unsigned int mFlags;
+        uint32_t mFlags;
         float mBreathMeter; // Seconds left before drowning
         unsigned char mUnknown2[20];
         float mDynamic[3][2];
@@ -41,7 +40,7 @@ namespace ESSImport
         float mMagicEffects[27]; // Effect attributes:
                                  // https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attributes
         unsigned char mUnknown4[4];
-        unsigned int mGoldPool;
+        uint32_t mGoldPool;
         unsigned char mCountDown; // seen the same value as in ACSC.mCorpseClearCountdown, maybe
                                   // this one is for respawning?
         unsigned char mUnknown5[3];
@@ -60,7 +59,6 @@ namespace ESSImport
         unsigned char mUnknown[3];
         float mTime;
     };
-#pragma pack(pop)
 
     struct ActorData
     {
diff --git a/apps/essimporter/importcellref.cpp b/apps/essimporter/importcellref.cpp
index a900440a96..9e8e9a6948 100644
--- a/apps/essimporter/importcellref.cpp
+++ b/apps/essimporter/importcellref.cpp
@@ -1,9 +1,30 @@
 #include "importcellref.hpp"
 
 #include <components/esm3/esmreader.hpp>
+#include <components/misc/concepts.hpp>
+
+#include <cstdint>
 
 namespace ESSImport
 {
+    template <Misc::SameAsWithoutCvref<ACDT> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mUnknown, v.mFlags, v.mBreathMeter, v.mUnknown2, v.mDynamic, v.mUnknown3, v.mAttributes, v.mMagicEffects,
+            v.mUnknown4, v.mGoldPool, v.mCountDown, v.mUnknown5);
+    }
+
+    template <Misc::SameAsWithoutCvref<ACSC> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mUnknown1, v.mFlags, v.mUnknown2, v.mCorpseClearCountdown, v.mUnknown3);
+    }
+
+    template <Misc::SameAsWithoutCvref<ANIS> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mGroupIndex, v.mUnknown, v.mTime);
+    }
 
     void CellRef::load(ESM::ESMReader& esm)
     {
@@ -44,19 +65,9 @@ namespace ESSImport
         bool isDeleted = false;
         ESM::CellRef::loadData(esm, isDeleted);
 
-        mActorData.mHasACDT = false;
-        if (esm.isNextSub("ACDT"))
-        {
-            mActorData.mHasACDT = true;
-            esm.getHTSized<264>(mActorData.mACDT);
-        }
+        mActorData.mHasACDT = esm.getOptionalComposite("ACDT", mActorData.mACDT);
 
-        mActorData.mHasACSC = false;
-        if (esm.isNextSub("ACSC"))
-        {
-            mActorData.mHasACSC = true;
-            esm.getHTSized<112>(mActorData.mACSC);
-        }
+        mActorData.mHasACSC = esm.getOptionalComposite("ACSC", mActorData.mACSC);
 
         if (esm.isNextSub("ACSL"))
             esm.skipHSubSize(112);
@@ -122,23 +133,16 @@ namespace ESSImport
         }
 
         // FIXME: not all actors have this, add flag
-        if (esm.isNextSub("CHRD")) // npc only
-            esm.getHExact(mActorData.mSkills, 27 * 2 * sizeof(int));
+        esm.getHNOT("CHRD", mActorData.mSkills); // npc only
 
-        if (esm.isNextSub("CRED")) // creature only
-            esm.getHExact(mActorData.mCombatStats, 3 * 2 * sizeof(int));
+        esm.getHNOT("CRED", mActorData.mCombatStats); // creature only
 
         mActorData.mSCRI.load(esm);
 
         if (esm.isNextSub("ND3D"))
             esm.skipHSub();
 
-        mActorData.mHasANIS = false;
-        if (esm.isNextSub("ANIS"))
-        {
-            mActorData.mHasANIS = true;
-            esm.getHTSized<8>(mActorData.mANIS);
-        }
+        mActorData.mHasANIS = esm.getOptionalComposite("ANIS", mActorData.mANIS);
 
         if (esm.isNextSub("LVCR"))
         {
@@ -155,13 +159,13 @@ namespace ESSImport
         // DATA should occur for all references, except levelled creature spawners
         // I've seen DATA *twice* on a creature record, and with the exact same content too! weird
         // alarmvoi0000.ess
-        esm.getHNOTSized<24>(mPos, "DATA");
-        esm.getHNOTSized<24>(mPos, "DATA");
+        for (int i = 0; i < 2; ++i)
+            esm.getOptionalComposite("DATA", mPos);
 
         mDeleted = 0;
         if (esm.isNextSub("DELE"))
         {
-            unsigned int deleted;
+            uint32_t deleted;
             esm.getHT(deleted);
             mDeleted = ((deleted >> 24) & 0x2) != 0; // the other 3 bytes seem to be uninitialized garbage
         }
diff --git a/apps/essimporter/importcntc.cpp b/apps/essimporter/importcntc.cpp
index 41f4e50101..34c99babef 100644
--- a/apps/essimporter/importcntc.cpp
+++ b/apps/essimporter/importcntc.cpp
@@ -1,6 +1,7 @@
 #include "importcntc.hpp"
 
 #include <components/esm3/esmreader.hpp>
+#include <cstdint>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcntc.hpp b/apps/essimporter/importcntc.hpp
index 1bc7d94bd5..6ee843805e 100644
--- a/apps/essimporter/importcntc.hpp
+++ b/apps/essimporter/importcntc.hpp
@@ -14,7 +14,7 @@ namespace ESSImport
     /// Changed container contents
     struct CNTC
     {
-        int mIndex;
+        int32_t mIndex;
 
         Inventory mInventory;
 
diff --git a/apps/essimporter/importcrec.hpp b/apps/essimporter/importcrec.hpp
index 77933eafe8..5217f4edc4 100644
--- a/apps/essimporter/importcrec.hpp
+++ b/apps/essimporter/importcrec.hpp
@@ -3,6 +3,7 @@
 
 #include "importinventory.hpp"
 #include <components/esm3/aipackage.hpp>
+#include <cstdint>
 
 namespace ESM
 {
@@ -15,7 +16,7 @@ namespace ESSImport
     /// Creature changes
     struct CREC
     {
-        int mIndex;
+        int32_t mIndex;
 
         Inventory mInventory;
         ESM::AIPackageList mAiPackages;
diff --git a/apps/essimporter/importdial.cpp b/apps/essimporter/importdial.cpp
index 6c45f9d059..43905738a1 100644
--- a/apps/essimporter/importdial.cpp
+++ b/apps/essimporter/importdial.cpp
@@ -8,11 +8,11 @@ namespace ESSImport
     void DIAL::load(ESM::ESMReader& esm)
     {
         // See ESM::Dialogue::Type enum, not sure why we would need this here though
-        int type = 0;
+        int32_t type = 0;
         esm.getHNOT(type, "DATA");
 
         // Deleted dialogue in a savefile. No clue what this means...
-        int deleted = 0;
+        int32_t deleted = 0;
         esm.getHNOT(deleted, "DELE");
 
         mIndex = 0;
diff --git a/apps/essimporter/importdial.hpp b/apps/essimporter/importdial.hpp
index 9a1e882332..b8b6fd536a 100644
--- a/apps/essimporter/importdial.hpp
+++ b/apps/essimporter/importdial.hpp
@@ -1,5 +1,8 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTDIAL_H
 #define OPENMW_ESSIMPORT_IMPORTDIAL_H
+
+#include <cstdint>
+
 namespace ESM
 {
     class ESMReader;
@@ -10,7 +13,7 @@ namespace ESSImport
 
     struct DIAL
     {
-        int mIndex; // Journal index
+        int32_t mIndex; // Journal index
 
         void load(ESM::ESMReader& esm);
     };
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 76b685c8a3..5cc9a8259b 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -135,7 +135,7 @@ namespace ESSImport
                 sub.mFileOffset = esm.getFileOffset();
                 sub.mName = esm.retSubName().toString();
                 sub.mData.resize(esm.getSubSize());
-                esm.getExact(&sub.mData[0], sub.mData.size());
+                esm.getExact(sub.mData.data(), sub.mData.size());
                 rec.mSubrecords.push_back(sub);
             }
             file.mRecords.push_back(rec);
diff --git a/apps/essimporter/importgame.cpp b/apps/essimporter/importgame.cpp
index 5295d2a1e8..8161a20031 100644
--- a/apps/essimporter/importgame.cpp
+++ b/apps/essimporter/importgame.cpp
@@ -9,17 +9,17 @@ namespace ESSImport
     {
         esm.getSubNameIs("GMDT");
         esm.getSubHeader();
-        if (esm.getSubSize() == 92)
-        {
-            esm.getExact(&mGMDT, 92);
-            mGMDT.mSecundaPhase = 0;
-        }
-        else if (esm.getSubSize() == 96)
-        {
-            esm.getTSized<96>(mGMDT);
-        }
-        else
-            esm.fail("unexpected subrecord size for GAME.GMDT");
+        bool hasSecundaPhase = esm.getSubSize() == 96;
+        esm.getT(mGMDT.mCellName);
+        esm.getT(mGMDT.mFogColour);
+        esm.getT(mGMDT.mFogDensity);
+        esm.getT(mGMDT.mCurrentWeather);
+        esm.getT(mGMDT.mNextWeather);
+        esm.getT(mGMDT.mWeatherTransition);
+        esm.getT(mGMDT.mTimeOfNextTransition);
+        esm.getT(mGMDT.mMasserPhase);
+        if (hasSecundaPhase)
+            esm.getT(mGMDT.mSecundaPhase);
 
         mGMDT.mWeatherTransition &= (0x000000ff);
         mGMDT.mSecundaPhase &= (0x000000ff);
diff --git a/apps/essimporter/importgame.hpp b/apps/essimporter/importgame.hpp
index 8b26b9d8bd..276060ae4c 100644
--- a/apps/essimporter/importgame.hpp
+++ b/apps/essimporter/importgame.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_ESSIMPORT_GAME_H
 #define OPENMW_ESSIMPORT_GAME_H
 
+#include <cstdint>
+
 namespace ESM
 {
     class ESMReader;
@@ -15,12 +17,12 @@ namespace ESSImport
         struct GMDT
         {
             char mCellName[64]{};
-            int mFogColour{ 0 };
+            int32_t mFogColour{ 0 };
             float mFogDensity{ 0.f };
-            int mCurrentWeather{ 0 }, mNextWeather{ 0 };
-            int mWeatherTransition{ 0 }; // 0-100 transition between weathers, top 3 bytes may be garbage
+            int32_t mCurrentWeather{ 0 }, mNextWeather{ 0 };
+            int32_t mWeatherTransition{ 0 }; // 0-100 transition between weathers, top 3 bytes may be garbage
             float mTimeOfNextTransition{ 0.f }; // weather changes when gamehour == timeOfNextTransition
-            int mMasserPhase{ 0 }, mSecundaPhase{ 0 }; // top 3 bytes may be garbage
+            int32_t mMasserPhase{ 0 }, mSecundaPhase{ 0 }; // top 3 bytes may be garbage
         };
 
         GMDT mGMDT;
diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index 9d71c04f2a..f1db301bd0 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -12,7 +12,7 @@ namespace ESSImport
         while (esm.isNextSub("NPCO"))
         {
             ContItem contItem;
-            esm.getHTSized<36>(contItem);
+            esm.getHT(contItem.mCount, contItem.mItem.mData);
 
             InventoryItem item;
             item.mId = contItem.mItem.toString();
@@ -28,7 +28,7 @@ namespace ESSImport
                 bool newStack = esm.isNextSub("XIDX");
                 if (newStack)
                 {
-                    unsigned int idx;
+                    uint32_t idx;
                     esm.getHT(idx);
                     separateStacks = true;
                     item.mCount = 1;
@@ -40,7 +40,7 @@ namespace ESSImport
                 bool isDeleted = false;
                 item.ESM::CellRef::loadData(esm, isDeleted);
 
-                int charge = -1;
+                int32_t charge = -1;
                 esm.getHNOT(charge, "XHLT");
                 item.mChargeInt = charge;
 
@@ -60,7 +60,7 @@ namespace ESSImport
             // this is currently not handled properly.
 
             esm.getSubHeader();
-            int itemIndex; // index of the item in the NPCO list
+            int32_t itemIndex; // index of the item in the NPCO list
             esm.getT(itemIndex);
 
             if (itemIndex < 0 || itemIndex >= int(mItems.size()))
@@ -68,7 +68,7 @@ namespace ESSImport
 
             // appears to be a relative index for only the *possible* slots this item can be equipped in,
             // i.e. 0 most of the time
-            int slotIndex;
+            int32_t slotIndex;
             esm.getT(slotIndex);
 
             mItems[itemIndex].mRelativeEquipmentSlot = slotIndex;
diff --git a/apps/essimporter/importinventory.hpp b/apps/essimporter/importinventory.hpp
index 7a11b3f0a0..7261e64f68 100644
--- a/apps/essimporter/importinventory.hpp
+++ b/apps/essimporter/importinventory.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTINVENTORY_H
 #define OPENMW_ESSIMPORT_IMPORTINVENTORY_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
@@ -19,7 +20,7 @@ namespace ESSImport
 
     struct ContItem
     {
-        int mCount;
+        int32_t mCount;
         ESM::NAME32 mItem;
     };
 
@@ -28,8 +29,8 @@ namespace ESSImport
         struct InventoryItem : public ESM::CellRef
         {
             std::string mId;
-            int mCount;
-            int mRelativeEquipmentSlot;
+            int32_t mCount;
+            int32_t mRelativeEquipmentSlot;
             SCRI mSCRI;
         };
         std::vector<InventoryItem> mItems;
diff --git a/apps/essimporter/importklst.cpp b/apps/essimporter/importklst.cpp
index d4cfc7f769..2d5e09e913 100644
--- a/apps/essimporter/importklst.cpp
+++ b/apps/essimporter/importklst.cpp
@@ -10,7 +10,7 @@ namespace ESSImport
         while (esm.isNextSub("KNAM"))
         {
             std::string refId = esm.getHString();
-            int count;
+            int32_t count;
             esm.getHNT(count, "CNAM");
             mKillCounter[refId] = count;
         }
diff --git a/apps/essimporter/importklst.hpp b/apps/essimporter/importklst.hpp
index 7c1ff03bb6..9cdb2d701b 100644
--- a/apps/essimporter/importklst.hpp
+++ b/apps/essimporter/importklst.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_KLST_H
 #define OPENMW_ESSIMPORT_KLST_H
 
+#include <cstdint>
 #include <map>
 #include <string>
 
@@ -18,9 +19,9 @@ namespace ESSImport
         void load(ESM::ESMReader& esm);
 
         /// RefId, kill count
-        std::map<std::string, int> mKillCounter;
+        std::map<std::string, int32_t> mKillCounter;
 
-        int mWerewolfKills;
+        int32_t mWerewolfKills;
     };
 
 }
diff --git a/apps/essimporter/importnpcc.cpp b/apps/essimporter/importnpcc.cpp
index c115040074..c1a53b6cef 100644
--- a/apps/essimporter/importnpcc.cpp
+++ b/apps/essimporter/importnpcc.cpp
@@ -7,7 +7,7 @@ namespace ESSImport
 
     void NPCC::load(ESM::ESMReader& esm)
     {
-        esm.getHNTSized<8>(mNPDT, "NPDT");
+        esm.getHNT("NPDT", mNPDT.mDisposition, mNPDT.unknown, mNPDT.mReputation, mNPDT.unknown2, mNPDT.mIndex);
 
         while (esm.isNextSub("AI_W") || esm.isNextSub("AI_E") || esm.isNextSub("AI_T") || esm.isNextSub("AI_F")
             || esm.isNextSub("AI_A"))
diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp
index 762add1906..47925226e4 100644
--- a/apps/essimporter/importnpcc.hpp
+++ b/apps/essimporter/importnpcc.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESSIMPORT_NPCC_H
 
 #include <components/esm3/aipackage.hpp>
+#include <cstdint>
 
 #include "importinventory.hpp"
 
@@ -21,7 +22,7 @@ namespace ESSImport
             unsigned char unknown;
             unsigned char mReputation;
             unsigned char unknown2;
-            int mIndex;
+            int32_t mIndex;
         } mNPDT;
 
         Inventory mInventory;
diff --git a/apps/essimporter/importplayer.cpp b/apps/essimporter/importplayer.cpp
index 165926d15a..f4c280541d 100644
--- a/apps/essimporter/importplayer.cpp
+++ b/apps/essimporter/importplayer.cpp
@@ -19,7 +19,12 @@ namespace ESSImport
             mMNAM = esm.getHString();
         }
 
-        esm.getHNTSized<212>(mPNAM, "PNAM");
+        esm.getHNT("PNAM", mPNAM.mPlayerFlags, mPNAM.mLevelProgress, mPNAM.mSkillProgress, mPNAM.mSkillIncreases,
+            mPNAM.mTelekinesisRangeBonus, mPNAM.mVisionBonus, mPNAM.mDetectKeyMagnitude,
+            mPNAM.mDetectEnchantmentMagnitude, mPNAM.mDetectAnimalMagnitude, mPNAM.mMarkLocation.mX,
+            mPNAM.mMarkLocation.mY, mPNAM.mMarkLocation.mZ, mPNAM.mMarkLocation.mRotZ, mPNAM.mMarkLocation.mCellX,
+            mPNAM.mMarkLocation.mCellY, mPNAM.mUnknown3, mPNAM.mVerticalRotation.mData, mPNAM.mSpecIncreases,
+            mPNAM.mUnknown4);
 
         if (esm.isNextSub("SNAM"))
             esm.skipHSub();
@@ -50,12 +55,7 @@ namespace ESSImport
         if (esm.isNextSub("NAM3"))
             esm.skipHSub();
 
-        mHasENAM = false;
-        if (esm.isNextSub("ENAM"))
-        {
-            mHasENAM = true;
-            esm.getHTSized<8>(mENAM);
-        }
+        mHasENAM = esm.getHNOT("ENAM", mENAM.mCellX, mENAM.mCellY);
 
         if (esm.isNextSub("LNAM"))
             esm.skipHSub();
@@ -63,16 +63,12 @@ namespace ESSImport
         while (esm.isNextSub("FNAM"))
         {
             FNAM fnam;
-            esm.getHTSized<44>(fnam);
+            esm.getHT(
+                fnam.mRank, fnam.mUnknown1, fnam.mReputation, fnam.mFlags, fnam.mUnknown2, fnam.mFactionName.mData);
             mFactions.push_back(fnam);
         }
 
-        mHasAADT = false;
-        if (esm.isNextSub("AADT")) // Attack animation data?
-        {
-            mHasAADT = true;
-            esm.getHTSized<44>(mAADT);
-        }
+        mHasAADT = esm.getHNOT("AADT", mAADT.animGroupIndex, mAADT.mUnknown5); // Attack animation data?
 
         if (esm.isNextSub("KNAM"))
             esm.skipHSub(); // assigned Quick Keys, I think
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index 0fb820cb64..89957bf4b4 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_PLAYER_H
 #define OPENMW_ESSIMPORT_PLAYER_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
@@ -17,7 +18,7 @@ namespace ESSImport
     /// Other player data
     struct PCDT
     {
-        int mBounty;
+        int32_t mBounty;
         std::string mBirthsign;
 
         std::vector<std::string> mKnownDialogueTopics;
@@ -41,13 +42,11 @@ namespace ESSImport
             PlayerFlags_LevitationDisabled = 0x80000
         };
 
-#pragma pack(push)
-#pragma pack(1)
         struct FNAM
         {
             unsigned char mRank;
             unsigned char mUnknown1[3];
-            int mReputation;
+            int32_t mReputation;
             unsigned char mFlags; // 0x1: unknown, 0x2: expelled
             unsigned char mUnknown2[3];
             ESM::NAME32 mFactionName;
@@ -59,7 +58,7 @@ namespace ESSImport
             {
                 float mX, mY, mZ; // worldspace position
                 float mRotZ; // Z angle in radians
-                int mCellX, mCellY; // grid coordinates; for interior cells this is always (0, 0)
+                int32_t mCellX, mCellY; // grid coordinates; for interior cells this is always (0, 0)
             };
 
             struct Rotation
@@ -67,15 +66,15 @@ namespace ESSImport
                 float mData[3][3];
             };
 
-            int mPlayerFlags; // controls, camera and draw state
-            unsigned int mLevelProgress;
+            int32_t mPlayerFlags; // controls, camera and draw state
+            uint32_t mLevelProgress;
             float mSkillProgress[27]; // skill progress, non-uniform scaled
             unsigned char mSkillIncreases[8]; // number of skill increases for each attribute
-            int mTelekinesisRangeBonus; // in units; seems redundant
+            int32_t mTelekinesisRangeBonus; // in units; seems redundant
             float mVisionBonus; // range: <0.0, 1.0>; affected by light spells and Get/Mod/SetPCVisionBonus
-            int mDetectKeyMagnitude; // seems redundant
-            int mDetectEnchantmentMagnitude; // seems redundant
-            int mDetectAnimalMagnitude; // seems redundant
+            int32_t mDetectKeyMagnitude; // seems redundant
+            int32_t mDetectEnchantmentMagnitude; // seems redundant
+            int32_t mDetectAnimalMagnitude; // seems redundant
             MarkLocation mMarkLocation;
             unsigned char mUnknown3[4];
             Rotation mVerticalRotation;
@@ -85,16 +84,15 @@ namespace ESSImport
 
         struct ENAM
         {
-            int mCellX;
-            int mCellY;
+            int32_t mCellX;
+            int32_t mCellY;
         };
 
         struct AADT // 44 bytes
         {
-            int animGroupIndex; // See convertANIS() for the mapping.
+            int32_t animGroupIndex; // See convertANIS() for the mapping.
             unsigned char mUnknown5[40];
         };
-#pragma pack(pop)
 
         std::vector<FNAM> mFactions;
         PNAM mPNAM;
diff --git a/apps/essimporter/importproj.cpp b/apps/essimporter/importproj.cpp
index f9a92095e0..a09ade81dd 100644
--- a/apps/essimporter/importproj.cpp
+++ b/apps/essimporter/importproj.cpp
@@ -10,7 +10,9 @@ namespace ESSImport
         while (esm.isNextSub("PNAM"))
         {
             PNAM pnam;
-            esm.getHTSized<184>(pnam);
+            esm.getHT(pnam.mAttackStrength, pnam.mSpeed, pnam.mUnknown, pnam.mFlightTime, pnam.mSplmIndex,
+                pnam.mUnknown2, pnam.mVelocity.mValues, pnam.mPosition.mValues, pnam.mUnknown3, pnam.mActorId.mData,
+                pnam.mArrowId.mData, pnam.mBowId.mData);
             mProjectiles.push_back(pnam);
         }
     }
diff --git a/apps/essimporter/importproj.h b/apps/essimporter/importproj.h
index d1c544f66f..04c7b4003e 100644
--- a/apps/essimporter/importproj.h
+++ b/apps/essimporter/importproj.h
@@ -2,7 +2,9 @@
 #define OPENMW_ESSIMPORT_IMPORTPROJ_H
 
 #include <components/esm/esmcommon.hpp>
-#include <components/esm/util.hpp>
+#include <components/esm/vector3.hpp>
+
+#include <cstdint>
 #include <vector>
 
 namespace ESM
@@ -16,15 +18,13 @@ namespace ESSImport
     struct PROJ
     {
 
-#pragma pack(push)
-#pragma pack(1)
         struct PNAM // 184 bytes
         {
             float mAttackStrength;
             float mSpeed;
             unsigned char mUnknown[4 * 2];
             float mFlightTime;
-            int mSplmIndex; // reference to a SPLM record (0 for ballistic projectiles)
+            int32_t mSplmIndex; // reference to a SPLM record (0 for ballistic projectiles)
             unsigned char mUnknown2[4];
             ESM::Vector3 mVelocity;
             ESM::Vector3 mPosition;
@@ -35,7 +35,6 @@ namespace ESSImport
 
             bool isMagic() const { return mSplmIndex != 0; }
         };
-#pragma pack(pop)
 
         std::vector<PNAM> mProjectiles;
 
diff --git a/apps/essimporter/importscpt.cpp b/apps/essimporter/importscpt.cpp
index 746d0b90e7..bb62c61103 100644
--- a/apps/essimporter/importscpt.cpp
+++ b/apps/essimporter/importscpt.cpp
@@ -7,7 +7,8 @@ namespace ESSImport
 
     void SCPT::load(ESM::ESMReader& esm)
     {
-        esm.getHNTSized<52>(mSCHD, "SCHD");
+        esm.getHNT("SCHD", mSCHD.mName.mData, mSCHD.mNumShorts, mSCHD.mNumLongs, mSCHD.mNumFloats,
+            mSCHD.mScriptDataSize, mSCHD.mStringTableSize);
 
         mSCRI.load(esm);
 
diff --git a/apps/essimporter/importscpt.hpp b/apps/essimporter/importscpt.hpp
index 8f60532447..7c728ee97e 100644
--- a/apps/essimporter/importscpt.hpp
+++ b/apps/essimporter/importscpt.hpp
@@ -3,6 +3,8 @@
 
 #include "importscri.hpp"
 
+#include <cstdint>
+
 #include <components/esm/esmcommon.hpp>
 #include <components/esm3/loadscpt.hpp>
 
@@ -17,7 +19,11 @@ namespace ESSImport
     struct SCHD
     {
         ESM::NAME32 mName;
-        ESM::Script::SCHDstruct mData;
+        std::uint32_t mNumShorts;
+        std::uint32_t mNumLongs;
+        std::uint32_t mNumFloats;
+        std::uint32_t mScriptDataSize;
+        std::uint32_t mStringTableSize;
     };
 
     // A running global script
@@ -29,7 +35,7 @@ namespace ESSImport
         SCRI mSCRI;
 
         bool mRunning;
-        int mRefNum; // Targeted reference, -1: no reference
+        int32_t mRefNum; // Targeted reference, -1: no reference
 
         void load(ESM::ESMReader& esm);
     };
diff --git a/apps/essimporter/importscri.cpp b/apps/essimporter/importscri.cpp
index b6c1d4094c..c0425cef32 100644
--- a/apps/essimporter/importscri.cpp
+++ b/apps/essimporter/importscri.cpp
@@ -9,7 +9,7 @@ namespace ESSImport
     {
         mScript = esm.getHNOString("SCRI");
 
-        int numShorts = 0, numLongs = 0, numFloats = 0;
+        int32_t numShorts = 0, numLongs = 0, numFloats = 0;
         if (esm.isNextSub("SLCS"))
         {
             esm.getSubHeader();
@@ -23,7 +23,7 @@ namespace ESSImport
             esm.getSubHeader();
             for (int i = 0; i < numShorts; ++i)
             {
-                short val;
+                int16_t val;
                 esm.getT(val);
                 mShorts.push_back(val);
             }
@@ -35,7 +35,7 @@ namespace ESSImport
             esm.getSubHeader();
             for (int i = 0; i < numLongs; ++i)
             {
-                int val;
+                int32_t val;
                 esm.getT(val);
                 mLongs.push_back(val);
             }
diff --git a/apps/essimporter/importscri.hpp b/apps/essimporter/importscri.hpp
index 73d8942f81..0c83a4d3be 100644
--- a/apps/essimporter/importscri.hpp
+++ b/apps/essimporter/importscri.hpp
@@ -3,6 +3,7 @@
 
 #include <components/esm3/variant.hpp>
 
+#include <cstdint>
 #include <vector>
 
 namespace ESM
diff --git a/apps/essimporter/importsplm.cpp b/apps/essimporter/importsplm.cpp
index a0478f4d92..6019183f83 100644
--- a/apps/essimporter/importsplm.cpp
+++ b/apps/essimporter/importsplm.cpp
@@ -11,13 +11,15 @@ namespace ESSImport
         {
             ActiveSpell spell;
             esm.getHT(spell.mIndex);
-            esm.getHNTSized<160>(spell.mSPDT, "SPDT");
+            esm.getHNT("SPDT", spell.mSPDT.mType, spell.mSPDT.mId.mData, spell.mSPDT.mUnknown,
+                spell.mSPDT.mCasterId.mData, spell.mSPDT.mSourceId.mData, spell.mSPDT.mUnknown2);
             spell.mTarget = esm.getHNOString("TNAM");
 
             while (esm.isNextSub("NPDT"))
             {
                 ActiveEffect effect;
-                esm.getHTSized<56>(effect.mNPDT);
+                esm.getHT(effect.mNPDT.mAffectedActorId.mData, effect.mNPDT.mUnknown, effect.mNPDT.mMagnitude,
+                    effect.mNPDT.mSecondsActive, effect.mNPDT.mUnknown2);
 
                 // Effect-specific subrecords can follow:
                 // - INAM for disintegration and bound effects
diff --git a/apps/essimporter/importsplm.h b/apps/essimporter/importsplm.h
index 8187afb131..762e32d9da 100644
--- a/apps/essimporter/importsplm.h
+++ b/apps/essimporter/importsplm.h
@@ -2,6 +2,7 @@
 #define OPENMW_ESSIMPORT_IMPORTSPLM_H
 
 #include <components/esm/esmcommon.hpp>
+#include <cstdint>
 #include <vector>
 
 namespace ESM
@@ -15,11 +16,9 @@ namespace ESSImport
     struct SPLM
     {
 
-#pragma pack(push)
-#pragma pack(1)
         struct SPDT // 160 bytes
         {
-            int mType; // 1 = spell, 2 = enchantment, 3 = potion
+            int32_t mType; // 1 = spell, 2 = enchantment, 3 = potion
             ESM::NAME32 mId; // base ID of a spell/enchantment/potion
             unsigned char mUnknown[4 * 4];
             ESM::NAME32 mCasterId;
@@ -31,31 +30,29 @@ namespace ESSImport
         {
             ESM::NAME32 mAffectedActorId;
             unsigned char mUnknown[4 * 2];
-            int mMagnitude;
+            int32_t mMagnitude;
             float mSecondsActive;
             unsigned char mUnknown2[4 * 2];
         };
 
         struct INAM // 40 bytes
         {
-            int mUnknown;
+            int32_t mUnknown;
             unsigned char mUnknown2;
             ESM::FixedString<35> mItemId; // disintegrated item / bound item / item to re-equip after expiration
         };
 
         struct CNAM // 36 bytes
         {
-            int mUnknown; // seems to always be 0
+            int32_t mUnknown; // seems to always be 0
             ESM::NAME32 mSummonedOrCommandedActor[32];
         };
 
         struct VNAM // 4 bytes
         {
-            int mUnknown;
+            int32_t mUnknown;
         };
 
-#pragma pack(pop)
-
         struct ActiveEffect
         {
             NPDT mNPDT;
@@ -63,7 +60,7 @@ namespace ESSImport
 
         struct ActiveSpell
         {
-            int mIndex;
+            int32_t mIndex;
             SPDT mSPDT;
             std::string mTarget;
             std::vector<ActiveEffect> mActiveEffects;
diff --git a/apps/essimporter/main.cpp b/apps/essimporter/main.cpp
index 7d3ad10bb1..f0833e9d81 100644
--- a/apps/essimporter/main.cpp
+++ b/apps/essimporter/main.cpp
@@ -42,8 +42,8 @@ Allowed options)");
         Files::ConfigurationManager cfgManager(true);
         cfgManager.readConfiguration(variables, desc);
 
-        const auto essFile = variables["mwsave"].as<Files::MaybeQuotedPath>();
-        const auto outputFile = variables["output"].as<Files::MaybeQuotedPath>();
+        const auto& essFile = variables["mwsave"].as<Files::MaybeQuotedPath>();
+        const auto& outputFile = variables["output"].as<Files::MaybeQuotedPath>();
         std::string encoding = variables["encoding"].as<std::string>();
 
         ESSImport::Importer importer(essFile, outputFile, encoding);
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 87cee06e5d..3d9fc6edde 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -33,31 +33,21 @@ set(LAUNCHER_HEADER
     utils/openalutil.hpp
 )
 
-# Headers that must be pre-processed
-set(LAUNCHER_UI
-    ${CMAKE_SOURCE_DIR}/files/ui/datafilespage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/graphicspage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/mainwindow.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/importpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/settingspage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/directorypicker.ui
-)
-
 source_group(launcher FILES ${LAUNCHER} ${LAUNCHER_HEADER})
 
 set(QT_USE_QTGUI 1)
 
+set (LAUNCHER_RES ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
+
 # Set some platform specific settings
 if(WIN32)
+    set(LAUNCHER_RES ${LAUNCHER_RES} ${CMAKE_SOURCE_DIR}/files/windows/QWindowsVistaDark/dark.qrc)
     set(GUI_TYPE WIN32)
     set(QT_USE_QTMAIN TRUE)
 endif(WIN32)
 
-QT_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
-QT_WRAP_UI(UI_HDRS ${LAUNCHER_UI})
+QT_ADD_RESOURCES(RCC_SRCS ${LAUNCHER_RES})
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
 if(NOT WIN32)
     include_directories(${LIBUNSHIELD_INCLUDE_DIR})
 endif(NOT WIN32)
@@ -68,21 +58,21 @@ openmw_add_executable(openmw-launcher
     ${LAUNCHER}
     ${LAUNCHER_HEADER}
     ${RCC_SRCS}
-    ${MOC_SRCS}
-    ${UI_HDRS}
 )
 
+add_dependencies(openmw-launcher qm-files)
+
 if (WIN32)
     INSTALL(TARGETS openmw-launcher RUNTIME DESTINATION ".")
 endif (WIN32)
 
 target_link_libraries(openmw-launcher
-    ${SDL2_LIBRARY_ONLY}
+    SDL2::SDL2
     ${OPENAL_LIBRARY}
     components_qt
 )
 
-target_link_libraries(openmw-launcher Qt::Widgets Qt::Core)
+target_link_libraries(openmw-launcher Qt::Widgets Qt::Core Qt::Svg)
 
 if (BUILD_WITH_CODE_COVERAGE)
     target_compile_options(openmw-launcher PRIVATE --coverage)
@@ -91,9 +81,11 @@ endif()
 
 if(USE_QT)
     set_property(TARGET openmw-launcher PROPERTY AUTOMOC ON)
+    set_property(TARGET openmw-launcher PROPERTY AUTOUIC ON)
+    set_property(TARGET openmw-launcher PROPERTY AUTOUIC_SEARCH_PATHS ui)
 endif(USE_QT)
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw-launcher PRIVATE
         <boost/program_options/options_description.hpp>
 
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 756aaba131..9bb54fdb8e 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -1,9 +1,13 @@
 #include "datafilespage.hpp"
 #include "maindialog.hpp"
 
+#include <QClipboard>
 #include <QDebug>
+#include <QDesktopServices>
 #include <QFileDialog>
+#include <QList>
 #include <QMessageBox>
+#include <QPair>
 #include <QPushButton>
 
 #include <algorithm>
@@ -26,8 +30,9 @@
 #include <components/files/qtconversion.hpp>
 #include <components/misc/strings/conversion.hpp>
 #include <components/navmeshtool/protocol.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 #include <components/vfs/bsaarchive.hpp>
+#include <components/vfs/qtconversion.hpp>
 
 #include "utils/profilescombobox.hpp"
 #include "utils/textinputdialog.hpp"
@@ -40,17 +45,61 @@ namespace
 {
     void contentSubdirs(const QString& path, QStringList& dirs)
     {
-        QStringList fileFilter{ "*.esm", "*.esp", "*.omwaddon", "*.bsa", "*.ba2", "*.omwscripts" };
-        QStringList dirFilter{ "bookart", "icons", "meshes", "music", "sound", "textures" };
+        static const QStringList fileFilter{
+            "*.esm",
+            "*.esp",
+            "*.bsa",
+            "*.ba2",
+            "*.omwgame",
+            "*.omwaddon",
+            "*.omwscripts",
+        };
+
+        static const QStringList dirFilter{
+            "animations",
+            "bookart",
+            "fonts",
+            "icons",
+            "interface",
+            "l10n",
+            "meshes",
+            "music",
+            "mygui",
+            "scripts",
+            "shaders",
+            "sound",
+            "splash",
+            "strings",
+            "textures",
+            "trees",
+            "video",
+        };
 
         QDir currentDir(path);
         if (!currentDir.entryInfoList(fileFilter, QDir::Files).empty()
             || !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
+        {
             dirs.push_back(currentDir.canonicalPath());
+            return;
+        }
 
         for (const auto& subdir : currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
             contentSubdirs(subdir.canonicalFilePath(), dirs);
     }
+
+    QList<QPair<int, QListWidgetItem*>> sortedSelectedItems(QListWidget* list, bool reverse = false)
+    {
+        QList<QPair<int, QListWidgetItem*>> sortedItems;
+        for (QListWidgetItem* item : list->selectedItems())
+            sortedItems.append(qMakePair(list->row(item), item));
+
+        if (reverse)
+            std::sort(sortedItems.begin(), sortedItems.end(), [](auto a, auto b) { return a.first > b.first; });
+        else
+            std::sort(sortedItems.begin(), sortedItems.end(), [](auto a, auto b) { return a.first < b.first; });
+
+        return sortedItems;
+    }
 }
 
 namespace Launcher
@@ -96,28 +145,7 @@ namespace Launcher
 
         int getMaxNavMeshDbFileSizeMiB()
         {
-            return Settings::Manager::getUInt64("max navmeshdb file size", "Navigator") / (1024 * 1024);
-        }
-
-        std::optional<QString> findFirstPath(const QStringList& directories, const QString& fileName)
-        {
-            for (const QString& directoryPath : directories)
-            {
-                const QString filePath = QDir(directoryPath).absoluteFilePath(fileName);
-                if (QFile::exists(filePath))
-                    return filePath;
-            }
-            return std::nullopt;
-        }
-
-        QStringList findAllFilePaths(const QStringList& directories, const QStringList& fileNames)
-        {
-            QStringList result;
-            result.reserve(fileNames.size());
-            for (const QString& fileName : fileNames)
-                if (const auto filepath = findFirstPath(directories, fileName))
-                    result.append(*filepath);
-            return result;
+            return Settings::navigator().mMaxNavmeshdbFileSize / (1024 * 1024);
         }
     }
 }
@@ -134,14 +162,17 @@ Launcher::DataFilesPage::DataFilesPage(const Files::ConfigurationManager& cfg, C
     ui.setupUi(this);
     setObjectName("DataFilesPage");
     mSelector = new ContentSelectorView::ContentSelector(ui.contentSelectorWidget, /*showOMWScripts=*/true);
-    const QString encoding = mGameSettings.value("encoding", "win1252");
+    const QString encoding = mGameSettings.value("encoding", { "win1252" }).value;
     mSelector->setEncoding(encoding);
 
-    QStringList languages;
-    languages << tr("English") << tr("French") << tr("German") << tr("Italian") << tr("Polish") << tr("Russian")
-              << tr("Spanish");
+    QVector<std::pair<QString, QString>> languages = { { "English", tr("English") }, { "French", tr("French") },
+        { "German", tr("German") }, { "Italian", tr("Italian") }, { "Polish", tr("Polish") },
+        { "Russian", tr("Russian") }, { "Spanish", tr("Spanish") } };
 
-    mSelector->languageBox()->addItems(languages);
+    for (auto lang : languages)
+    {
+        mSelector->languageBox()->addItem(lang.second, lang.first);
+    }
 
     mNewProfileDialog = new TextInputDialog(tr("New Content List"), tr("Content List name:"), this);
     mCloneProfileDialog = new TextInputDialog(tr("Clone Content List"), tr("Content List name:"), this);
@@ -150,13 +181,17 @@ Launcher::DataFilesPage::DataFilesPage(const Files::ConfigurationManager& cfg, C
     connect(mCloneProfileDialog->lineEdit(), &LineEdit::textChanged, this, &DataFilesPage::updateCloneProfileOkButton);
     connect(ui.directoryAddSubdirsButton, &QPushButton::released, this, [this]() { this->addSubdirectories(true); });
     connect(ui.directoryInsertButton, &QPushButton::released, this, [this]() { this->addSubdirectories(false); });
-    connect(ui.directoryUpButton, &QPushButton::released, this, [this]() { this->moveDirectory(-1); });
-    connect(ui.directoryDownButton, &QPushButton::released, this, [this]() { this->moveDirectory(1); });
-    connect(ui.directoryRemoveButton, &QPushButton::released, this, [this]() { this->removeDirectory(); });
-    connect(ui.archiveUpButton, &QPushButton::released, this, [this]() { this->moveArchive(-1); });
-    connect(ui.archiveDownButton, &QPushButton::released, this, [this]() { this->moveArchive(1); });
+    connect(ui.directoryUpButton, &QPushButton::released, this,
+        [this]() { this->moveSources(ui.directoryListWidget, -1); });
+    connect(ui.directoryDownButton, &QPushButton::released, this,
+        [this]() { this->moveSources(ui.directoryListWidget, 1); });
+    connect(ui.directoryRemoveButton, &QPushButton::released, this, &DataFilesPage::removeDirectory);
     connect(
-        ui.directoryListWidget->model(), &QAbstractItemModel::rowsMoved, this, [this]() { this->sortDirectories(); });
+        ui.archiveUpButton, &QPushButton::released, this, [this]() { this->moveSources(ui.archiveListWidget, -1); });
+    connect(
+        ui.archiveDownButton, &QPushButton::released, this, [this]() { this->moveSources(ui.archiveListWidget, 1); });
+    connect(ui.directoryListWidget->model(), &QAbstractItemModel::rowsMoved, this, &DataFilesPage::sortDirectories);
+    connect(ui.archiveListWidget->model(), &QAbstractItemModel::rowsMoved, this, &DataFilesPage::sortArchives);
 
     buildView();
     loadSettings();
@@ -209,6 +244,55 @@ void Launcher::DataFilesPage::buildView()
         &DataFilesPage::readNavMeshToolStderr);
     connect(mNavMeshToolInvoker->getProcess(), qOverload<int, QProcess::ExitStatus>(&QProcess::finished), this,
         &DataFilesPage::navMeshToolFinished);
+
+    buildArchiveContextMenu();
+    buildDataFilesContextMenu();
+}
+
+void Launcher::DataFilesPage::slotCopySelectedItemsPaths()
+{
+    QClipboard* clipboard = QApplication::clipboard();
+    QStringList filepaths;
+
+    for (QListWidgetItem* item : ui.directoryListWidget->selectedItems())
+    {
+        QString path = qvariant_cast<Config::SettingValue>(item->data(Qt::UserRole)).originalRepresentation;
+        filepaths.push_back(path);
+    }
+
+    if (!filepaths.isEmpty())
+    {
+        clipboard->setText(filepaths.join("\n"));
+    }
+}
+
+void Launcher::DataFilesPage::slotOpenSelectedItemsPaths()
+{
+    QListWidgetItem* item = ui.directoryListWidget->currentItem();
+    QUrl confFolderUrl = QUrl::fromLocalFile(qvariant_cast<Config::SettingValue>(item->data(Qt::UserRole)).value);
+    QDesktopServices::openUrl(confFolderUrl);
+}
+
+void Launcher::DataFilesPage::buildArchiveContextMenu()
+{
+    connect(ui.archiveListWidget, &QListWidget::customContextMenuRequested, this,
+        &DataFilesPage::slotShowArchiveContextMenu);
+
+    mArchiveContextMenu = new QMenu(ui.archiveListWidget);
+    mArchiveContextMenu->addAction(tr("&Check Selected"), this, SLOT(slotCheckMultiSelectedItems()));
+    mArchiveContextMenu->addAction(tr("&Uncheck Selected"), this, SLOT(slotUncheckMultiSelectedItems()));
+}
+
+void Launcher::DataFilesPage::buildDataFilesContextMenu()
+{
+    connect(ui.directoryListWidget, &QListWidget::customContextMenuRequested, this,
+        &DataFilesPage::slotShowDataFilesContextMenu);
+
+    mDataFilesContextMenu = new QMenu(ui.directoryListWidget);
+    mDataFilesContextMenu->addAction(
+        tr("&Copy Path(s) to Clipboard"), this, &Launcher::DataFilesPage::slotCopySelectedItemsPaths);
+    mDataFilesContextMenu->addAction(
+        tr("&Open Path in File Explorer"), this, &Launcher::DataFilesPage::slotOpenSelectedItemsPaths);
 }
 
 bool Launcher::DataFilesPage::loadSettings()
@@ -227,9 +311,17 @@ bool Launcher::DataFilesPage::loadSettings()
     if (!currentProfile.isEmpty())
         addProfile(currentProfile, true);
 
-    const int index = mSelector->languageBox()->findText(mLauncherSettings.getLanguage());
-    if (index != -1)
-        mSelector->languageBox()->setCurrentIndex(index);
+    auto language = mLauncherSettings.getLanguage();
+
+    for (int i = 0; i < mSelector->languageBox()->count(); ++i)
+    {
+        QString languageItem = mSelector->languageBox()->itemData(i).toString();
+        if (language == languageItem)
+        {
+            mSelector->languageBox()->setCurrentIndex(i);
+            break;
+        }
+    }
 
     return true;
 }
@@ -240,101 +332,144 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
     ui.archiveListWidget->clear();
     ui.directoryListWidget->clear();
 
-    QStringList directories = mLauncherSettings.getDataDirectoryList(contentModelName);
-    if (directories.isEmpty())
-        directories = mGameSettings.getDataDirs();
+    QList<Config::SettingValue> directories = mGameSettings.getDataDirs();
+    QStringList contentModelDirectories = mLauncherSettings.getDataDirectoryList(contentModelName);
+    if (!contentModelDirectories.isEmpty())
+    {
+        directories.erase(std::remove_if(directories.begin(), directories.end(),
+                              [&](const Config::SettingValue& dir) { return mGameSettings.isUserSetting(dir); }),
+            directories.end());
+        for (const auto& dir : contentModelDirectories)
+            directories.push_back(mGameSettings.processPathSettingValue({ dir }));
+    }
 
     mDataLocal = mGameSettings.getDataLocal();
     if (!mDataLocal.isEmpty())
-        directories.insert(0, mDataLocal);
+        directories.insert(0, { mDataLocal });
 
-    const auto& globalDataDir = mGameSettings.getGlobalDataDir();
-    if (!globalDataDir.empty())
-        directories.insert(0, Files::pathToQString(globalDataDir));
+    const auto& resourcesVfs = mGameSettings.getResourcesVfs();
+    if (!resourcesVfs.isEmpty())
+        directories.insert(0, { resourcesVfs });
 
     std::unordered_set<QString> visitedDirectories;
-    for (const QString& currentDir : directories)
+    for (const Config::SettingValue& currentDir : directories)
     {
-        // normalize user supplied directories: resolve symlink, convert to native separator, make absolute
-        const QString canonicalDirPath = QDir(QDir::cleanPath(currentDir)).canonicalPath();
-
-        if (!visitedDirectories.insert(canonicalDirPath).second)
+        if (!visitedDirectories.insert(currentDir.value).second)
             continue;
 
         // add new achives files presents in current directory
-        addArchivesFromDir(currentDir);
+        addArchivesFromDir(currentDir.value);
 
-        QString tooltip;
+        QStringList tooltip;
 
         // add content files presents in current directory
-        mSelector->addFiles(currentDir, mNewDataDirs.contains(canonicalDirPath));
+        mSelector->addFiles(currentDir.value, mNewDataDirs.contains(currentDir.value));
 
         // add current directory to list
-        ui.directoryListWidget->addItem(currentDir);
+        ui.directoryListWidget->addItem(currentDir.originalRepresentation);
         auto row = ui.directoryListWidget->count() - 1;
         auto* item = ui.directoryListWidget->item(row);
+        item->setData(Qt::UserRole, QVariant::fromValue(currentDir));
 
-        // Display new content with green background
-        if (mNewDataDirs.contains(canonicalDirPath))
+        if (currentDir.value != currentDir.originalRepresentation)
+            tooltip << tr("Resolved as %1").arg(currentDir.value);
+
+        // Display new content with custom formatting
+        if (mNewDataDirs.contains(currentDir.value))
         {
-            tooltip += "Will be added to the current profile\n";
-            item->setBackground(Qt::green);
-            item->setForeground(Qt::black);
+            tooltip << tr("Will be added to the current profile");
+            QFont font = item->font();
+            font.setBold(true);
+            font.setItalic(true);
+            item->setFont(font);
         }
 
-        // deactivate data-local and global data directory: they are always included
-        if (currentDir == mDataLocal || Files::pathFromQString(currentDir) == globalDataDir)
+        // deactivate data-local and resources/vfs: they are always included
+        // same for ones from non-user config files
+        if (currentDir.value == mDataLocal || currentDir.value == resourcesVfs
+            || !mGameSettings.isUserSetting(currentDir))
         {
             auto flags = item->flags();
             item->setFlags(flags & ~(Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled));
+            if (currentDir.value == mDataLocal)
+                tooltip << tr("This is the data-local directory and cannot be disabled");
+            else if (currentDir.value == resourcesVfs)
+                tooltip << tr("This directory is part of OpenMW and cannot be disabled");
+            else
+                tooltip << tr("This directory is enabled in an openmw.cfg other than the user one");
         }
 
         // Add a "data file" icon if the directory contains a content file
-        if (mSelector->containsDataFiles(currentDir))
+        if (mSelector->containsDataFiles(currentDir.value))
         {
             item->setIcon(QIcon(":/images/openmw-plugin.png"));
-            tooltip += "Contains content file(s)";
+
+            tooltip << tr("Contains content file(s)");
         }
         else
         {
             // Pad to correct vertical alignment
             QPixmap pixmap(QSize(200, 200)); // Arbitrary big number, will be scaled down to widget size
-            pixmap.fill(ui.directoryListWidget->palette().base().color());
+            pixmap.fill(QColor(0, 0, 0, 0));
             auto emptyIcon = QIcon(pixmap);
             item->setIcon(emptyIcon);
         }
-        item->setToolTip(tooltip);
+        item->setToolTip(tooltip.join('\n'));
     }
     mSelector->sortFiles();
 
-    QStringList selectedArchives = mLauncherSettings.getArchiveList(contentModelName);
-    if (selectedArchives.isEmpty())
-        selectedArchives = mGameSettings.getArchiveList();
+    QList<Config::SettingValue> selectedArchives = mGameSettings.getArchiveList();
+    QStringList contentModelSelectedArchives = mLauncherSettings.getArchiveList(contentModelName);
+    if (!contentModelSelectedArchives.isEmpty())
+    {
+        selectedArchives.erase(std::remove_if(selectedArchives.begin(), selectedArchives.end(),
+                                   [&](const Config::SettingValue& dir) { return mGameSettings.isUserSetting(dir); }),
+            selectedArchives.end());
+        for (const auto& dir : contentModelSelectedArchives)
+            selectedArchives.push_back({ dir });
+    }
 
     // sort and tick BSA according to profile
     int row = 0;
     for (const auto& archive : selectedArchives)
     {
-        const auto match = ui.archiveListWidget->findItems(archive, Qt::MatchExactly);
+        const auto match = ui.archiveListWidget->findItems(archive.value, Qt::MatchFixedString);
         if (match.isEmpty())
             continue;
         const auto name = match[0]->text();
         const auto oldrow = ui.archiveListWidget->row(match[0]);
+        // entries may be duplicated, e.g. if a content list predated a BSA being added to a non-user config file
+        if (oldrow < row)
+            continue;
         ui.archiveListWidget->takeItem(oldrow);
         ui.archiveListWidget->insertItem(row, name);
         ui.archiveListWidget->item(row)->setCheckState(Qt::Checked);
+        ui.archiveListWidget->item(row)->setData(Qt::UserRole, QVariant::fromValue(archive));
+        if (!mGameSettings.isUserSetting(archive))
+        {
+            auto flags = ui.archiveListWidget->item(row)->flags();
+            ui.archiveListWidget->item(row)->setFlags(
+                flags & ~(Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled));
+            ui.archiveListWidget->item(row)->setToolTip(
+                tr("This archive is enabled in an openmw.cfg other than the user one"));
+        }
         row++;
     }
 
-    mSelector->setProfileContent(
-        findAllFilePaths(directories, mLauncherSettings.getContentListFiles(contentModelName)));
+    QStringList nonUserContent;
+    for (const auto& content : mGameSettings.getContentList())
+    {
+        if (!mGameSettings.isUserSetting(content))
+            nonUserContent.push_back(content.value);
+    }
+    mSelector->setNonUserContent(nonUserContent);
+    mSelector->setProfileContent(mLauncherSettings.getContentListFiles(contentModelName));
 }
 
 void Launcher::DataFilesPage::saveSettings(const QString& profile)
 {
-    if (const int value = ui.navMeshMaxSizeSpinBox->value(); value != getMaxNavMeshDbFileSizeMiB())
-        Settings::Manager::setUInt64(
-            "max navmeshdb file size", "Navigator", static_cast<std::uint64_t>(std::max(0, value)) * 1024 * 1024);
+    Settings::navigator().mMaxNavmeshdbFileSize.set(
+        static_cast<std::uint64_t>(std::max(0, ui.navMeshMaxSizeSpinBox->value())) * 1024 * 1024);
 
     QString profileName = profile;
 
@@ -355,47 +490,59 @@ void Launcher::DataFilesPage::saveSettings(const QString& profile)
     {
         fileNames.append(item->fileName());
     }
-    mLauncherSettings.setContentList(profileName, dirList, selectedArchivePaths(), fileNames);
+    QStringList dirNames;
+    for (const auto& dir : dirList)
+    {
+        if (mGameSettings.isUserSetting(dir))
+            dirNames.push_back(dir.originalRepresentation);
+    }
+    QStringList archiveNames;
+    for (const auto& archive : selectedArchivePaths())
+    {
+        if (mGameSettings.isUserSetting(archive))
+            archiveNames.push_back(archive.originalRepresentation);
+    }
+    mLauncherSettings.setContentList(profileName, dirNames, archiveNames, fileNames);
     mGameSettings.setContentList(dirList, selectedArchivePaths(), fileNames);
 
-    QString language(mSelector->languageBox()->currentText());
+    QString language(mSelector->languageBox()->currentData().toString());
 
     mLauncherSettings.setLanguage(language);
 
     if (language == QLatin1String("Polish"))
     {
-        mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1250"));
+        mGameSettings.setValue(QLatin1String("encoding"), { "win1250" });
     }
     else if (language == QLatin1String("Russian"))
     {
-        mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1251"));
+        mGameSettings.setValue(QLatin1String("encoding"), { "win1251" });
     }
     else
     {
-        mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1252"));
+        mGameSettings.setValue(QLatin1String("encoding"), { "win1252" });
     }
 }
 
-QStringList Launcher::DataFilesPage::selectedDirectoriesPaths() const
+QList<Config::SettingValue> Launcher::DataFilesPage::selectedDirectoriesPaths() const
 {
-    QStringList dirList;
+    QList<Config::SettingValue> dirList;
     for (int i = 0; i < ui.directoryListWidget->count(); ++i)
     {
         const QListWidgetItem* item = ui.directoryListWidget->item(i);
         if (item->flags() & Qt::ItemIsEnabled)
-            dirList.append(item->text());
+            dirList.append(qvariant_cast<Config::SettingValue>(item->data(Qt::UserRole)));
     }
     return dirList;
 }
 
-QStringList Launcher::DataFilesPage::selectedArchivePaths() const
+QList<Config::SettingValue> Launcher::DataFilesPage::selectedArchivePaths() const
 {
-    QStringList archiveList;
+    QList<Config::SettingValue> archiveList;
     for (int i = 0; i < ui.archiveListWidget->count(); ++i)
     {
         const QListWidgetItem* item = ui.archiveListWidget->item(i);
         if (item->checkState() == Qt::Checked)
-            archiveList.append(item->text());
+            archiveList.append(qvariant_cast<Config::SettingValue>(item->data(Qt::UserRole)));
     }
     return archiveList;
 }
@@ -549,7 +696,20 @@ void Launcher::DataFilesPage::on_cloneProfileAction_triggered()
     if (profile.isEmpty())
         return;
 
-    mLauncherSettings.setContentList(profile, selectedDirectoriesPaths(), selectedArchivePaths(), selectedFilePaths());
+    const auto& dirList = selectedDirectoriesPaths();
+    QStringList dirNames;
+    for (const auto& dir : dirList)
+    {
+        if (mGameSettings.isUserSetting(dir))
+            dirNames.push_back(dir.originalRepresentation);
+    }
+    QStringList archiveNames;
+    for (const auto& archive : selectedArchivePaths())
+    {
+        if (mGameSettings.isUserSetting(archive))
+            archiveNames.push_back(archive.originalRepresentation);
+    }
+    mLauncherSettings.setContentList(profile, dirNames, archiveNames, selectedFilePaths());
     addProfile(profile, true);
 }
 
@@ -587,41 +747,49 @@ void Launcher::DataFilesPage::updateCloneProfileOkButton(const QString& text)
     mCloneProfileDialog->setOkButtonEnabled(!text.isEmpty() && ui.profilesComboBox->findText(text) == -1);
 }
 
-QString Launcher::DataFilesPage::selectDirectory()
-{
-    QFileDialog fileDialog(this);
-    fileDialog.setFileMode(QFileDialog::Directory);
-    fileDialog.setOptions(QFileDialog::Option::ShowDirsOnly | QFileDialog::Option::ReadOnly);
-
-    if (fileDialog.exec() == QDialog::Rejected)
-        return {};
-
-    return QDir(fileDialog.selectedFiles()[0]).canonicalPath();
-}
-
 void Launcher::DataFilesPage::addSubdirectories(bool append)
 {
-    int selectedRow = append ? ui.directoryListWidget->count() : ui.directoryListWidget->currentRow();
+    int selectedRow = -1;
+    if (append)
+    {
+        selectedRow = ui.directoryListWidget->count();
+    }
+    else
+    {
+        const QList<QPair<int, QListWidgetItem*>> sortedItems = sortedSelectedItems(ui.directoryListWidget);
+        if (!sortedItems.isEmpty())
+            selectedRow = sortedItems.first().first;
+    }
 
     if (selectedRow == -1)
         return;
 
-    const auto rootDir = selectDirectory();
-    if (rootDir.isEmpty())
+    QString rootPath = QFileDialog::getExistingDirectory(
+        this, tr("Select Directory"), QDir::homePath(), QFileDialog::ShowDirsOnly | QFileDialog::Option::ReadOnly);
+
+    if (rootPath.isEmpty())
         return;
 
-    QStringList subdirs;
-    contentSubdirs(rootDir, subdirs);
+    const QDir rootDir(rootPath);
+    rootPath = rootDir.canonicalPath();
 
-    if (subdirs.empty())
+    QStringList subdirs;
+    contentSubdirs(rootPath, subdirs);
+
+    // Always offer to append the root directory just in case
+    if (subdirs.isEmpty() || subdirs[0] != rootPath)
+        subdirs.prepend(rootPath);
+    else if (subdirs.size() == 1)
     {
-        // we didn't find anything that looks like a content directory, add directory selected by user
-        if (ui.directoryListWidget->findItems(rootDir, Qt::MatchFixedString).isEmpty())
-        {
-            ui.directoryListWidget->addItem(rootDir);
-            mNewDataDirs.push_back(rootDir);
-            refreshDataFilesView();
-        }
+        // We didn't find anything else that looks like a content directory
+        // Automatically add the directory selected by user
+        if (!ui.directoryListWidget->findItems(rootPath, Qt::MatchFixedString).isEmpty())
+            return;
+        ui.directoryListWidget->insertItem(selectedRow, rootPath);
+        auto* item = ui.directoryListWidget->item(selectedRow);
+        item->setData(Qt::UserRole, QVariant::fromValue(Config::SettingValue{ rootPath }));
+        mNewDataDirs.push_back(rootPath);
+        refreshDataFilesView();
         return;
     }
 
@@ -649,8 +817,11 @@ void Launcher::DataFilesPage::addSubdirectories(bool append)
         const auto* dir = select.dirListWidget->item(i);
         if (dir->checkState() == Qt::Checked)
         {
-            ui.directoryListWidget->insertItem(selectedRow++, dir->text());
+            ui.directoryListWidget->insertItem(selectedRow, dir->text());
+            auto* item = ui.directoryListWidget->item(selectedRow);
+            item->setData(Qt::UserRole, QVariant::fromValue(Config::SettingValue{ dir->text() }));
             mNewDataDirs.push_back(dir->text());
+            ++selectedRow;
         }
     }
 
@@ -672,19 +843,19 @@ void Launcher::DataFilesPage::sortDirectories()
     }
 }
 
-void Launcher::DataFilesPage::moveDirectory(int step)
+void Launcher::DataFilesPage::sortArchives()
 {
-    int selectedRow = ui.directoryListWidget->currentRow();
-    int newRow = selectedRow + step;
-    if (selectedRow == -1 || newRow < 0 || newRow > ui.directoryListWidget->count() - 1)
-        return;
-
-    if (!(ui.directoryListWidget->item(newRow)->flags() & Qt::ItemIsEnabled))
-        return;
-
-    const auto item = ui.directoryListWidget->takeItem(selectedRow);
-    ui.directoryListWidget->insertItem(newRow, item);
-    ui.directoryListWidget->setCurrentRow(newRow);
+    // Ensure disabled entries (aka ones from non-user config files) are always at the top.
+    for (auto i = 1; i < ui.archiveListWidget->count(); ++i)
+    {
+        if (!(ui.archiveListWidget->item(i)->flags() & Qt::ItemIsEnabled)
+            && (ui.archiveListWidget->item(i - 1)->flags() & Qt::ItemIsEnabled))
+        {
+            const auto item = ui.archiveListWidget->takeItem(i);
+            ui.archiveListWidget->insertItem(i - 1, item);
+            ui.archiveListWidget->setCurrentRow(i);
+        }
+    }
 }
 
 void Launcher::DataFilesPage::removeDirectory()
@@ -694,17 +865,55 @@ void Launcher::DataFilesPage::removeDirectory()
     refreshDataFilesView();
 }
 
-void Launcher::DataFilesPage::moveArchive(int step)
+void Launcher::DataFilesPage::slotShowArchiveContextMenu(const QPoint& pos)
 {
-    int selectedRow = ui.archiveListWidget->currentRow();
-    int newRow = selectedRow + step;
-    if (selectedRow == -1 || newRow < 0 || newRow > ui.archiveListWidget->count() - 1)
-        return;
+    QPoint globalPos = ui.archiveListWidget->viewport()->mapToGlobal(pos);
+    mArchiveContextMenu->exec(globalPos);
+}
 
-    const auto* item = ui.archiveListWidget->takeItem(selectedRow);
+void Launcher::DataFilesPage::slotShowDataFilesContextMenu(const QPoint& pos)
+{
+    QPoint globalPos = ui.directoryListWidget->viewport()->mapToGlobal(pos);
+    mDataFilesContextMenu->exec(globalPos);
+}
 
-    addArchive(item->text(), item->checkState(), newRow);
-    ui.archiveListWidget->setCurrentRow(newRow);
+void Launcher::DataFilesPage::setCheckStateForMultiSelectedItems(bool checked)
+{
+    Qt::CheckState checkState = checked ? Qt::Checked : Qt::Unchecked;
+
+    for (QListWidgetItem* selectedItem : ui.archiveListWidget->selectedItems())
+    {
+        selectedItem->setCheckState(checkState);
+    }
+}
+
+void Launcher::DataFilesPage::slotUncheckMultiSelectedItems()
+{
+    setCheckStateForMultiSelectedItems(false);
+}
+
+void Launcher::DataFilesPage::slotCheckMultiSelectedItems()
+{
+    setCheckStateForMultiSelectedItems(true);
+}
+
+void Launcher::DataFilesPage::moveSources(QListWidget* sourceList, int step)
+{
+    const QList<QPair<int, QListWidgetItem*>> sortedItems = sortedSelectedItems(sourceList, step > 0);
+    for (const auto& i : sortedItems)
+    {
+        int selectedRow = sourceList->row(i.second);
+        int newRow = selectedRow + step;
+        if (selectedRow == -1 || newRow < 0 || newRow > sourceList->count() - 1)
+            break;
+
+        if (!(sourceList->item(newRow)->flags() & Qt::ItemIsEnabled))
+            break;
+
+        const auto item = sourceList->takeItem(selectedRow);
+        sourceList->insertItem(newRow, item);
+        sourceList->setCurrentRow(newRow);
+    }
 }
 
 void Launcher::DataFilesPage::addArchive(const QString& name, Qt::CheckState selected, int row)
@@ -713,10 +922,14 @@ void Launcher::DataFilesPage::addArchive(const QString& name, Qt::CheckState sel
         row = ui.archiveListWidget->count();
     ui.archiveListWidget->insertItem(row, name);
     ui.archiveListWidget->item(row)->setCheckState(selected);
+    ui.archiveListWidget->item(row)->setData(Qt::UserRole, QVariant::fromValue(Config::SettingValue{ name }));
     if (mKnownArchives.filter(name).isEmpty()) // XXX why contains doesn't work here ???
     {
-        ui.archiveListWidget->item(row)->setBackground(Qt::green);
-        ui.archiveListWidget->item(row)->setForeground(Qt::black);
+        auto item = ui.archiveListWidget->item(row);
+        QFont font = item->font();
+        font.setBold(true);
+        font.setItalic(true);
+        item->setFont(font);
     }
 }
 
@@ -725,19 +938,19 @@ void Launcher::DataFilesPage::addArchivesFromDir(const QString& path)
     QStringList archiveFilter{ "*.bsa", "*.ba2" };
     QDir dir(path);
 
-    std::unordered_set<QString> archives;
+    std::unordered_set<VFS::Path::Normalized, VFS::Path::Hash> archives;
     for (int i = 0; i < ui.archiveListWidget->count(); ++i)
-        archives.insert(ui.archiveListWidget->item(i)->text());
+        archives.insert(VFS::Path::normalizedFromQString(ui.archiveListWidget->item(i)->text()));
 
     for (const auto& fileinfo : dir.entryInfoList(archiveFilter))
     {
         const auto absPath = fileinfo.absoluteFilePath();
-        if (Bsa::BSAFile::detectVersion(Files::pathFromQString(absPath)) == Bsa::BSAVER_UNKNOWN)
+        if (Bsa::BSAFile::detectVersion(Files::pathFromQString(absPath)) == Bsa::BsaVersion::Unknown)
             continue;
 
         const auto fileName = fileinfo.fileName();
 
-        if (archives.insert(fileName).second)
+        if (archives.insert(VFS::Path::normalizedFromQString(fileName)).second)
             addArchive(fileName, Qt::Unchecked);
     }
 }
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 033c91f9c7..5d03cdf800 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -6,6 +6,7 @@
 #include <components/process/processinvoker.hpp>
 
 #include <QDir>
+#include <QMenu>
 #include <QStringList>
 #include <QWidget>
 
@@ -24,6 +25,7 @@ namespace ContentSelectorView
 namespace Config
 {
     class GameSettings;
+    struct SettingValue;
     class LauncherSettings;
 }
 
@@ -39,6 +41,8 @@ namespace Launcher
 
         ContentSelectorView::ContentSelector* mSelector;
         Ui::DataFilesPage ui;
+        QMenu* mArchiveContextMenu;
+        QMenu* mDataFilesContextMenu;
 
     public:
         explicit DataFilesPage(const Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
@@ -71,9 +75,14 @@ namespace Launcher
         void updateCloneProfileOkButton(const QString& text);
         void addSubdirectories(bool append);
         void sortDirectories();
+        void sortArchives();
         void removeDirectory();
-        void moveArchive(int step);
-        void moveDirectory(int step);
+        void moveSources(QListWidget* sourceList, int step);
+
+        void slotShowArchiveContextMenu(const QPoint& pos);
+        void slotShowDataFilesContextMenu(const QPoint& pos);
+        void slotCheckMultiSelectedItems();
+        void slotUncheckMultiSelectedItems();
 
         void on_newProfileAction_triggered();
         void on_cloneProfileAction_triggered();
@@ -121,6 +130,9 @@ namespace Launcher
         void addArchive(const QString& name, Qt::CheckState selected, int row = -1);
         void addArchivesFromDir(const QString& dir);
         void buildView();
+        void buildArchiveContextMenu();
+        void buildDataFilesContextMenu();
+        void setCheckStateForMultiSelectedItems(bool checked);
         void setProfile(int index, bool savePrevious);
         void setProfile(const QString& previous, const QString& current, bool savePrevious);
         void removeProfile(const QString& profile);
@@ -131,15 +143,16 @@ namespace Launcher
         void reloadCells(QStringList selectedFiles);
         void refreshDataFilesView();
         void updateNavMeshProgress(int minDataSize);
-        QString selectDirectory();
+        void slotCopySelectedItemsPaths();
+        void slotOpenSelectedItemsPaths();
 
         /**
          * Returns the file paths of all selected content files
          * @return the file paths of all selected content files
          */
         QStringList selectedFilePaths() const;
-        QStringList selectedArchivePaths() const;
-        QStringList selectedDirectoriesPaths() const;
+        QList<Config::SettingValue> selectedArchivePaths() const;
+        QList<Config::SettingValue> selectedDirectoriesPaths() const;
     };
 }
 #endif
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 5f37c0defe..735bcf1df1 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -2,6 +2,9 @@
 
 #include "sdlinit.hpp"
 
+#include <components/misc/display.hpp>
+#include <components/settings/values.hpp>
+
 #include <QMessageBox>
 #include <QScreen>
 
@@ -14,22 +17,6 @@
 #include <SDL_video.h>
 
 #include <array>
-#include <numeric>
-
-QString getAspect(int x, int y)
-{
-    int gcd = std::gcd(x, y);
-    if (gcd == 0)
-        return QString();
-
-    int xaspect = x / gcd;
-    int yaspect = y / gcd;
-    // special case: 8 : 5 is usually referred to as 16:10
-    if (xaspect == 8 && yaspect == 5)
-        return QString("16:10");
-
-    return QString(QString::number(xaspect) + ":" + QString::number(yaspect));
-}
 
 Launcher::GraphicsPage::GraphicsPage(QWidget* parent)
     : QWidget(parent)
@@ -47,7 +34,6 @@ Launcher::GraphicsPage::GraphicsPage(QWidget* parent)
     connect(standardRadioButton, &QRadioButton::toggled, this, &GraphicsPage::slotStandardToggled);
     connect(screenComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &GraphicsPage::screenChanged);
     connect(framerateLimitCheckBox, &QCheckBox::toggled, this, &GraphicsPage::slotFramerateLimitToggled);
-    connect(shadowDistanceCheckBox, &QCheckBox::toggled, this, &GraphicsPage::slotShadowDistLimitToggled);
 }
 
 bool Launcher::GraphicsPage::setupSDL()
@@ -94,32 +80,29 @@ bool Launcher::GraphicsPage::loadSettings()
 
     // Visuals
 
-    int vsync = Settings::Manager::getInt("vsync mode", "Video");
-    if (vsync < 0 || vsync > 2)
-        vsync = 0;
+    const int vsync = Settings::video().mVsyncMode;
 
     vSyncComboBox->setCurrentIndex(vsync);
 
-    size_t windowMode = static_cast<size_t>(Settings::Manager::getInt("window mode", "Video"));
-    if (windowMode > static_cast<size_t>(Settings::WindowMode::Windowed))
-        windowMode = 0;
-    windowModeComboBox->setCurrentIndex(windowMode);
-    slotFullScreenChanged(windowMode);
+    const Settings::WindowMode windowMode = Settings::video().mWindowMode;
 
-    if (Settings::Manager::getBool("window border", "Video"))
+    windowModeComboBox->setCurrentIndex(static_cast<int>(windowMode));
+    handleWindowModeChange(windowMode);
+
+    if (Settings::video().mWindowBorder)
         windowBorderCheckBox->setCheckState(Qt::Checked);
 
     // aaValue is the actual value (0, 1, 2, 4, 8, 16)
-    int aaValue = Settings::Manager::getInt("antialiasing", "Video");
+    const int aaValue = Settings::video().mAntialiasing;
     // aaIndex is the index into the allowed values in the pull down.
-    int aaIndex = antiAliasingComboBox->findText(QString::number(aaValue));
+    const int aaIndex = antiAliasingComboBox->findText(QString::number(aaValue));
     if (aaIndex != -1)
         antiAliasingComboBox->setCurrentIndex(aaIndex);
 
-    int width = Settings::Manager::getInt("resolution x", "Video");
-    int height = Settings::Manager::getInt("resolution y", "Video");
-    QString resolution = QString::number(width) + QString(" x ") + QString::number(height);
-    screenComboBox->setCurrentIndex(Settings::Manager::getInt("screen", "Video"));
+    const int width = Settings::video().mResolutionX;
+    const int height = Settings::video().mResolutionY;
+    QString resolution = QString::number(width) + QString(" × ") + QString::number(height);
+    screenComboBox->setCurrentIndex(Settings::video().mScreen);
 
     int resIndex = resolutionComboBox->findText(resolution, Qt::MatchStartsWith);
 
@@ -135,52 +118,13 @@ bool Launcher::GraphicsPage::loadSettings()
         customHeightSpinBox->setValue(height);
     }
 
-    float fpsLimit = Settings::Manager::getFloat("framerate limit", "Video");
+    const float fpsLimit = Settings::video().mFramerateLimit;
     if (fpsLimit != 0)
     {
         framerateLimitCheckBox->setCheckState(Qt::Checked);
         framerateLimitSpinBox->setValue(fpsLimit);
     }
 
-    // Lighting
-    int lightingMethod = 1;
-    if (Settings::Manager::getString("lighting method", "Shaders") == "legacy")
-        lightingMethod = 0;
-    else if (Settings::Manager::getString("lighting method", "Shaders") == "shaders")
-        lightingMethod = 2;
-    lightingMethodComboBox->setCurrentIndex(lightingMethod);
-
-    // Shadows
-    if (Settings::Manager::getBool("actor shadows", "Shadows"))
-        actorShadowsCheckBox->setCheckState(Qt::Checked);
-    if (Settings::Manager::getBool("player shadows", "Shadows"))
-        playerShadowsCheckBox->setCheckState(Qt::Checked);
-    if (Settings::Manager::getBool("terrain shadows", "Shadows"))
-        terrainShadowsCheckBox->setCheckState(Qt::Checked);
-    if (Settings::Manager::getBool("object shadows", "Shadows"))
-        objectShadowsCheckBox->setCheckState(Qt::Checked);
-    if (Settings::Manager::getBool("enable indoor shadows", "Shadows"))
-        indoorShadowsCheckBox->setCheckState(Qt::Checked);
-
-    shadowComputeSceneBoundsComboBox->setCurrentIndex(shadowComputeSceneBoundsComboBox->findText(
-        QString(tr(Settings::Manager::getString("compute scene bounds", "Shadows").c_str()))));
-
-    int shadowDistLimit = Settings::Manager::getInt("maximum shadow map distance", "Shadows");
-    if (shadowDistLimit > 0)
-    {
-        shadowDistanceCheckBox->setCheckState(Qt::Checked);
-        shadowDistanceSpinBox->setValue(shadowDistLimit);
-    }
-
-    float shadowFadeStart = Settings::Manager::getFloat("shadow fade start", "Shadows");
-    if (shadowFadeStart != 0)
-        fadeStartSpinBox->setValue(shadowFadeStart);
-
-    int shadowRes = Settings::Manager::getInt("shadow map resolution", "Shadows");
-    int shadowResIndex = shadowResolutionComboBox->findText(QString::number(shadowRes));
-    if (shadowResIndex != -1)
-        shadowResolutionComboBox->setCurrentIndex(shadowResIndex);
-
     return true;
 }
 
@@ -188,29 +132,16 @@ void Launcher::GraphicsPage::saveSettings()
 {
     // Visuals
 
-    // Ensure we only set the new settings if they changed. This is to avoid cluttering the
-    // user settings file (which by definition should only contain settings the user has touched)
-    int cVSync = vSyncComboBox->currentIndex();
-    if (cVSync != Settings::Manager::getInt("vsync mode", "Video"))
-        Settings::Manager::setInt("vsync mode", "Video", cVSync);
-
-    int cWindowMode = windowModeComboBox->currentIndex();
-    if (cWindowMode != Settings::Manager::getInt("window mode", "Video"))
-        Settings::Manager::setInt("window mode", "Video", cWindowMode);
-
-    bool cWindowBorder = windowBorderCheckBox->checkState();
-    if (cWindowBorder != Settings::Manager::getBool("window border", "Video"))
-        Settings::Manager::setBool("window border", "Video", cWindowBorder);
-
-    int cAAValue = antiAliasingComboBox->currentText().toInt();
-    if (cAAValue != Settings::Manager::getInt("antialiasing", "Video"))
-        Settings::Manager::setInt("antialiasing", "Video", cAAValue);
+    Settings::video().mVsyncMode.set(static_cast<SDLUtil::VSyncMode>(vSyncComboBox->currentIndex()));
+    Settings::video().mWindowMode.set(static_cast<Settings::WindowMode>(windowModeComboBox->currentIndex()));
+    Settings::video().mWindowBorder.set(windowBorderCheckBox->checkState() == Qt::Checked);
+    Settings::video().mAntialiasing.set(antiAliasingComboBox->currentText().toInt());
 
     int cWidth = 0;
     int cHeight = 0;
     if (standardRadioButton->isChecked())
     {
-        QRegularExpression resolutionRe("^(\\d+) x (\\d+)");
+        QRegularExpression resolutionRe("^(\\d+) × (\\d+)");
         QRegularExpressionMatch match = resolutionRe.match(resolutionComboBox->currentText().simplified());
         if (match.hasMatch())
         {
@@ -224,83 +155,18 @@ void Launcher::GraphicsPage::saveSettings()
         cHeight = customHeightSpinBox->value();
     }
 
-    if (cWidth != Settings::Manager::getInt("resolution x", "Video"))
-        Settings::Manager::setInt("resolution x", "Video", cWidth);
-
-    if (cHeight != Settings::Manager::getInt("resolution y", "Video"))
-        Settings::Manager::setInt("resolution y", "Video", cHeight);
-
-    int cScreen = screenComboBox->currentIndex();
-    if (cScreen != Settings::Manager::getInt("screen", "Video"))
-        Settings::Manager::setInt("screen", "Video", cScreen);
+    Settings::video().mResolutionX.set(cWidth);
+    Settings::video().mResolutionY.set(cHeight);
+    Settings::video().mScreen.set(screenComboBox->currentIndex());
 
     if (framerateLimitCheckBox->checkState() != Qt::Unchecked)
     {
-        float cFpsLimit = framerateLimitSpinBox->value();
-        if (cFpsLimit != Settings::Manager::getFloat("framerate limit", "Video"))
-            Settings::Manager::setFloat("framerate limit", "Video", cFpsLimit);
+        Settings::video().mFramerateLimit.set(framerateLimitSpinBox->value());
     }
-    else if (Settings::Manager::getFloat("framerate limit", "Video") != 0)
+    else if (Settings::video().mFramerateLimit != 0)
     {
-        Settings::Manager::setFloat("framerate limit", "Video", 0);
+        Settings::video().mFramerateLimit.set(0);
     }
-
-    // Lighting
-    static std::array<std::string, 3> lightingMethodMap = { "legacy", "shaders compatibility", "shaders" };
-    const std::string& cLightingMethod = lightingMethodMap[lightingMethodComboBox->currentIndex()];
-    if (cLightingMethod != Settings::Manager::getString("lighting method", "Shaders"))
-        Settings::Manager::setString("lighting method", "Shaders", cLightingMethod);
-
-    // Shadows
-    int cShadowDist = shadowDistanceCheckBox->checkState() != Qt::Unchecked ? shadowDistanceSpinBox->value() : 0;
-    if (Settings::Manager::getInt("maximum shadow map distance", "Shadows") != cShadowDist)
-        Settings::Manager::setInt("maximum shadow map distance", "Shadows", cShadowDist);
-    float cFadeStart = fadeStartSpinBox->value();
-    if (cShadowDist > 0 && Settings::Manager::getFloat("shadow fade start", "Shadows") != cFadeStart)
-        Settings::Manager::setFloat("shadow fade start", "Shadows", cFadeStart);
-
-    bool cActorShadows = actorShadowsCheckBox->checkState();
-    bool cObjectShadows = objectShadowsCheckBox->checkState();
-    bool cTerrainShadows = terrainShadowsCheckBox->checkState();
-    bool cPlayerShadows = playerShadowsCheckBox->checkState();
-    if (cActorShadows || cObjectShadows || cTerrainShadows || cPlayerShadows)
-    {
-        if (!Settings::Manager::getBool("enable shadows", "Shadows"))
-            Settings::Manager::setBool("enable shadows", "Shadows", true);
-        if (Settings::Manager::getBool("actor shadows", "Shadows") != cActorShadows)
-            Settings::Manager::setBool("actor shadows", "Shadows", cActorShadows);
-        if (Settings::Manager::getBool("player shadows", "Shadows") != cPlayerShadows)
-            Settings::Manager::setBool("player shadows", "Shadows", cPlayerShadows);
-        if (Settings::Manager::getBool("object shadows", "Shadows") != cObjectShadows)
-            Settings::Manager::setBool("object shadows", "Shadows", cObjectShadows);
-        if (Settings::Manager::getBool("terrain shadows", "Shadows") != cTerrainShadows)
-            Settings::Manager::setBool("terrain shadows", "Shadows", cTerrainShadows);
-    }
-    else
-    {
-        if (Settings::Manager::getBool("enable shadows", "Shadows"))
-            Settings::Manager::setBool("enable shadows", "Shadows", false);
-        if (Settings::Manager::getBool("actor shadows", "Shadows"))
-            Settings::Manager::setBool("actor shadows", "Shadows", false);
-        if (Settings::Manager::getBool("player shadows", "Shadows"))
-            Settings::Manager::setBool("player shadows", "Shadows", false);
-        if (Settings::Manager::getBool("object shadows", "Shadows"))
-            Settings::Manager::setBool("object shadows", "Shadows", false);
-        if (Settings::Manager::getBool("terrain shadows", "Shadows"))
-            Settings::Manager::setBool("terrain shadows", "Shadows", false);
-    }
-
-    bool cIndoorShadows = indoorShadowsCheckBox->checkState();
-    if (Settings::Manager::getBool("enable indoor shadows", "Shadows") != cIndoorShadows)
-        Settings::Manager::setBool("enable indoor shadows", "Shadows", cIndoorShadows);
-
-    int cShadowRes = shadowResolutionComboBox->currentText().toInt();
-    if (cShadowRes != Settings::Manager::getInt("shadow map resolution", "Shadows"))
-        Settings::Manager::setInt("shadow map resolution", "Shadows", cShadowRes);
-
-    auto cComputeSceneBounds = shadowComputeSceneBoundsComboBox->currentText().toStdString();
-    if (cComputeSceneBounds != Settings::Manager::getString("compute scene bounds", "Shadows"))
-        Settings::Manager::setString("compute scene bounds", "Shadows", cComputeSceneBounds);
 }
 
 QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
@@ -335,19 +201,8 @@ QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
             return result;
         }
 
-        QString resolution = QString::number(mode.w) + QString(" x ") + QString::number(mode.h);
-
-        QString aspect = getAspect(mode.w, mode.h);
-        if (aspect == QLatin1String("16:9") || aspect == QLatin1String("16:10"))
-        {
-            resolution.append(tr("\t(Wide ") + aspect + ")");
-        }
-        else if (aspect == QLatin1String("4:3"))
-        {
-            resolution.append(tr("\t(Standard 4:3)"));
-        }
-
-        result.append(resolution);
+        auto str = Misc::getResolutionText(mode.w, mode.h, "%i × %i (%i:%i)");
+        result.append(QString(str.c_str()));
     }
 
     result.removeDuplicates();
@@ -380,8 +235,12 @@ void Launcher::GraphicsPage::screenChanged(int screen)
 
 void Launcher::GraphicsPage::slotFullScreenChanged(int mode)
 {
-    if (mode == static_cast<int>(Settings::WindowMode::Fullscreen)
-        || mode == static_cast<int>(Settings::WindowMode::WindowedFullscreen))
+    handleWindowModeChange(static_cast<Settings::WindowMode>(mode));
+}
+
+void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode)
+{
+    if (mode == Settings::WindowMode::Fullscreen || mode == Settings::WindowMode::WindowedFullscreen)
     {
         standardRadioButton->toggle();
         customRadioButton->setEnabled(false);
@@ -418,9 +277,3 @@ void Launcher::GraphicsPage::slotFramerateLimitToggled(bool checked)
 {
     framerateLimitSpinBox->setEnabled(checked);
 }
-
-void Launcher::GraphicsPage::slotShadowDistLimitToggled(bool checked)
-{
-    shadowDistanceSpinBox->setEnabled(checked);
-    fadeStartSpinBox->setEnabled(checked);
-}
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index 92bdf35ac4..928ec9f1a2 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -3,7 +3,7 @@
 
 #include "ui_graphicspage.h"
 
-#include <components/settings/settings.hpp>
+#include <components/settings/windowmode.hpp>
 
 namespace Files
 {
@@ -31,7 +31,6 @@ namespace Launcher
         void slotFullScreenChanged(int state);
         void slotStandardToggled(bool checked);
         void slotFramerateLimitToggled(bool checked);
-        void slotShadowDistLimitToggled(bool checked);
 
     private:
         QVector<QStringList> mResolutionsPerScreen;
@@ -40,6 +39,7 @@ namespace Launcher
         static QRect getMaximumResolution();
 
         bool setupSDL();
+        void handleWindowModeChange(Settings::WindowMode state);
     };
 }
 #endif
diff --git a/apps/launcher/importpage.cpp b/apps/launcher/importpage.cpp
index fa91ad1654..3ad6e538da 100644
--- a/apps/launcher/importpage.cpp
+++ b/apps/launcher/importpage.cpp
@@ -37,9 +37,9 @@ Launcher::ImportPage::ImportPage(const Files::ConfigurationManager& cfg, Config:
     // Detect Morrowind configuration files
     QStringList iniPaths;
 
-    for (const QString& path : mGameSettings.getDataDirs())
+    for (const auto& path : mGameSettings.getDataDirs())
     {
-        QDir dir(path);
+        QDir dir(path.value);
         dir.setPath(dir.canonicalPath()); // Resolve symlinks
 
         if (dir.exists(QString("Morrowind.ini")))
@@ -104,9 +104,9 @@ void Launcher::ImportPage::on_importerButton_clicked()
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(
-                tr("<html><head/><body><p><b>Could not open or create %1 for writing </b></p> \
-                              <p>Please make sure you have the right permissions \
-                              and try again.</p></body></html>")
+                tr("<html><head/><body><p><b>Could not open or create %1 for writing </b></p>"
+                   "<p>Please make sure you have the right permissions "
+                   "and try again.</p></body></html>")
                     .arg(file.fileName()));
             msgBox.exec();
             return;
@@ -125,7 +125,7 @@ void Launcher::ImportPage::on_importerButton_clicked()
         arguments.append(QString("--fonts"));
 
     arguments.append(QString("--encoding"));
-    arguments.append(mGameSettings.value(QString("encoding"), QString("win1252")));
+    arguments.append(mGameSettings.value(QString("encoding"), { "win1252" }).value);
     arguments.append(QString("--ini"));
     arguments.append(settingsComboBox->currentText());
     arguments.append(QString("--cfg"));
@@ -220,9 +220,15 @@ void Launcher::ImportPage::resetProgressBar()
     progressBar->reset();
 }
 
-void Launcher::ImportPage::saveSettings() {}
+void Launcher::ImportPage::saveSettings()
+{
+    mLauncherSettings.setImportContentSetup(addonsCheckBox->isChecked());
+    mLauncherSettings.setImportFontSetup(fontsCheckBox->isChecked());
+}
 
 bool Launcher::ImportPage::loadSettings()
 {
+    addonsCheckBox->setChecked(mLauncherSettings.getImportContentSetup());
+    fontsCheckBox->setChecked(mLauncherSettings.getImportFontSetup());
     return true;
 }
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 4aac90fb6e..2ea152305f 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -1,13 +1,15 @@
 #include <iostream>
 
 #include <QDir>
-#include <QTranslator>
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 
 #include <components/debug/debugging.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/files/qtconversion.hpp>
+#include <components/l10n/qttranslations.hpp>
+#include <components/platform/application.hpp>
 #include <components/platform/platform.hpp>
 
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
@@ -28,23 +30,19 @@ int runLauncher(int argc, char* argv[])
     configurationManager.addCommonOptions(description);
     configurationManager.readConfiguration(variables, description, true);
 
-    setupLogging(configurationManager.getLogPath(), "Launcher");
+    Debug::setupLogging(configurationManager.getLogPath(), "Launcher");
 
     try
     {
-        QApplication app(argc, argv);
+        Platform::Application app(argc, argv);
 
-        // Internationalization
-        QString locale = QLocale::system().name().section('_', 0, 0);
+        QString resourcesPath(".");
+        if (!variables["resources"].empty())
+        {
+            resourcesPath = Files::pathToQString(variables["resources"].as<Files::MaybeQuotedPath>().u8string());
+        }
 
-        QTranslator appTranslator;
-        appTranslator.load(":/translations/" + locale + ".qm");
-        app.installTranslator(&appTranslator);
-
-        // Now we make sure the current dir is set to application path
-        QDir dir(QCoreApplication::applicationDirPath());
-
-        QDir::setCurrent(dir.absolutePath());
+        l10n::installQtTranslations(app, "launcher", resourcesPath);
 
         Launcher::MainDialog mainWin(configurationManager);
 
@@ -68,5 +66,5 @@ int runLauncher(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    return wrapApplication(runLauncher, argc, argv, "Launcher");
+    return Debug::wrapApplication(runLauncher, argc, argv, "Launcher");
 }
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 0caf7a576a..07face085f 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -1,13 +1,5 @@
 #include "maindialog.hpp"
 
-#include <components/debug/debuglog.hpp>
-#include <components/files/configurationmanager.hpp>
-#include <components/files/conversion.hpp>
-#include <components/files/qtconversion.hpp>
-#include <components/misc/helpviewer.hpp>
-#include <components/misc/utf8qtextstream.hpp>
-#include <components/version/version.hpp>
-
 #include <QCloseEvent>
 #include <QDir>
 #include <QMessageBox>
@@ -15,16 +7,26 @@
 #include <QTime>
 
 #include <components/debug/debugging.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
 #include <components/files/qtconfigpath.hpp>
 #include <components/files/qtconversion.hpp>
+#include <components/misc/helpviewer.hpp>
 #include <components/misc/utf8qtextstream.hpp>
+#include <components/settings/settings.hpp>
+#include <components/version/version.hpp>
 
 #include "datafilespage.hpp"
 #include "graphicspage.hpp"
 #include "importpage.hpp"
 #include "settingspage.hpp"
 
+namespace
+{
+    constexpr const char* toolBarStyle = "QToolBar { border: 0px; } QToolButton { min-width: 70px }";
+}
+
 using namespace Process;
 
 void cfgError(const QString& title, const QString& msg)
@@ -53,9 +55,11 @@ Launcher::MainDialog::MainDialog(const Files::ConfigurationManager& configuratio
         &MainDialog::wizardFinished);
 
     buttonBox->button(QDialogButtonBox::Close)->setText(tr("Close"));
-    buttonBox->button(QDialogButtonBox::Ok)->setText(tr(" Launch OpenMW "));
+    buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Launch OpenMW"));
     buttonBox->button(QDialogButtonBox::Help)->setText(tr("Help"));
 
+    buttonBox->button(QDialogButtonBox::Ok)->setMinimumWidth(160);
+
     // Order of buttons can be different on different setups,
     // so make sure that the Play button has a focus by default.
     buttonBox->button(QDialogButtonBox::Ok)->setFocus();
@@ -68,6 +72,15 @@ Launcher::MainDialog::MainDialog(const Files::ConfigurationManager& configuratio
     setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     createIcons();
+
+    QWidget* spacer = new QWidget();
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    toolBar->addWidget(spacer);
+
+    QLabel* logo = new QLabel(this);
+    logo->setPixmap(QIcon(":/images/openmw-header.png").pixmap(QSize(294, 64)));
+    toolBar->addWidget(logo);
+    toolBar->setStyleSheet(toolBarStyle);
 }
 
 Launcher::MainDialog::~MainDialog()
@@ -76,10 +89,22 @@ Launcher::MainDialog::~MainDialog()
     delete mWizardInvoker;
 }
 
+bool Launcher::MainDialog::event(QEvent* event)
+{
+    // Apply style sheet again if style was changed
+    if (event->type() == QEvent::PaletteChange)
+    {
+        if (toolBar != nullptr)
+            toolBar->setStyleSheet(toolBarStyle);
+    }
+
+    return QMainWindow::event(event);
+}
+
 void Launcher::MainDialog::createIcons()
 {
     if (!QIcon::hasThemeIcon("document-new"))
-        QIcon::setThemeName("tango");
+        QIcon::setThemeName("fallback");
 
     connect(dataAction, &QAction::triggered, this, &MainDialog::enableDataPage);
     connect(graphicsAction, &QAction::triggered, this, &MainDialog::enableGraphicsPage);
@@ -121,13 +146,14 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
     const auto& userConfigDir = mCfgMgr.getUserConfigPath();
     if (!exists(userConfigDir))
     {
-        if (!create_directories(userConfigDir))
+        std::error_code ec;
+        if (!create_directories(userConfigDir, ec))
         {
-            cfgError(tr("Error opening OpenMW configuration file"),
-                tr("<br><b>Could not create directory %0</b><br><br> \
-                        Please make sure you have the right permissions \
-                        and try again.<br>")
-                    .arg(Files::pathToQString(canonical(userConfigDir))));
+            cfgError(tr("Error creating OpenMW configuration directory: code %0").arg(ec.value()),
+                tr("<br><b>Could not create directory %0</b><br><br>"
+                   "%1<br>")
+                    .arg(Files::pathToQString(userConfigDir))
+                    .arg(QString(ec.message().c_str())));
             return FirstRunDialogResultFailure;
         }
     }
@@ -139,10 +165,10 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
         msgBox.setIcon(QMessageBox::Question);
         msgBox.setStandardButtons(QMessageBox::NoButton);
         msgBox.setText(
-            tr("<html><head/><body><p><b>Welcome to OpenMW!</b></p> \
-                          <p>It is recommended to run the Installation Wizard.</p> \
-                          <p>The Wizard will let you select an existing Morrowind installation, \
-                          or install Morrowind for OpenMW to use.</p></body></html>"));
+            tr("<html><head/><body><p><b>Welcome to OpenMW!</b></p>"
+               "<p>It is recommended to run the Installation Wizard.</p>"
+               "<p>The Wizard will let you select an existing Morrowind installation, "
+               "or install Morrowind for OpenMW to use.</p></body></html>"));
 
         QAbstractButton* wizardButton
             = msgBox.addButton(tr("Run &Installation Wizard"), QMessageBox::AcceptRole); // ActionRole doesn't work?!
@@ -174,14 +200,13 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
 void Launcher::MainDialog::setVersionLabel()
 {
     // Add version information to bottom of the window
-    Version::Version v = Version::getOpenmwVersion(mGameSettings.value("resources").toUtf8().constData());
-
-    QString revision(QString::fromUtf8(v.mCommitHash.c_str()));
-    QString tag(QString::fromUtf8(v.mTagHash.c_str()));
+    QString revision(QString::fromUtf8(Version::getCommitHash().data(), Version::getCommitHash().size()));
+    QString tag(QString::fromUtf8(Version::getTagHash().data(), Version::getTagHash().size()));
 
     versionLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-    if (!v.mVersion.empty() && (revision.isEmpty() || revision == tag))
-        versionLabel->setText(tr("OpenMW %1 release").arg(QString::fromUtf8(v.mVersion.c_str())));
+    if (!Version::getVersion().empty() && (revision.isEmpty() || revision == tag))
+        versionLabel->setText(
+            tr("OpenMW %1 release").arg(QString::fromUtf8(Version::getVersion().data(), Version::getVersion().size())));
     else
         versionLabel->setText(tr("OpenMW development (%1)").arg(revision.left(10)));
 
@@ -295,15 +320,15 @@ bool Launcher::MainDialog::setupLauncherSettings()
     if (!QFile::exists(path))
         return true;
 
-    Log(Debug::Verbose) << "Loading config file: " << path.toUtf8().constData();
+    Log(Debug::Info) << "Loading config file: " << path.toUtf8().constData();
 
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
         cfgError(tr("Error opening OpenMW configuration file"),
-            tr("<br><b>Could not open %0 for reading:</b><br><br>%1<br><br> \
-                     Please make sure you have the right permissions \
-                     and try again.<br>")
+            tr("<br><b>Could not open %0 for reading:</b><br><br>%1<br><br>"
+               "Please make sure you have the right permissions "
+               "and try again.<br>")
                 .arg(file.fileName())
                 .arg(file.errorString()));
         return false;
@@ -323,7 +348,7 @@ bool Launcher::MainDialog::setupGameSettings()
 
     QFile file;
 
-    auto loadFile = [&](const QString& path, bool (Config::GameSettings::*reader)(QTextStream&, bool),
+    auto loadFile = [&](const QString& path, bool (Config::GameSettings::*reader)(QTextStream&, const QString&, bool),
                         bool ignoreContent = false) -> std::optional<bool> {
         file.setFileName(path);
         if (file.exists())
@@ -331,16 +356,16 @@ bool Launcher::MainDialog::setupGameSettings()
             if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
             {
                 cfgError(tr("Error opening OpenMW configuration file"),
-                    tr("<br><b>Could not open %0 for reading</b><br><br> \
-                            Please make sure you have the right permissions \
-                            and try again.<br>")
+                    tr("<br><b>Could not open %0 for reading</b><br><br>"
+                       "Please make sure you have the right permissions "
+                       "and try again.<br>")
                         .arg(file.fileName()));
                 return {};
             }
             QTextStream stream(&file);
             Misc::ensureUtf8Encoding(stream);
 
-            (mGameSettings.*reader)(stream, ignoreContent);
+            (mGameSettings.*reader)(stream, QFileInfo(path).dir().path(), ignoreContent);
             file.close();
             return true;
         }
@@ -352,29 +377,24 @@ bool Launcher::MainDialog::setupGameSettings()
     if (!loadFile(Files::getUserConfigPathQString(mCfgMgr), &Config::GameSettings::readUserFile))
         return false;
 
-    // Now the rest - priority: user > local > global
-    if (auto result = loadFile(Files::getLocalConfigPathQString(mCfgMgr), &Config::GameSettings::readFile, true))
+    for (const auto& path : Files::getActiveConfigPathsQString(mCfgMgr))
     {
-        // Load global if local wasn't found
-        if (!*result && !loadFile(Files::getGlobalConfigPathQString(mCfgMgr), &Config::GameSettings::readFile, true))
+        Log(Debug::Info) << "Loading config file: " << path.toUtf8().constData();
+        if (!loadFile(path, &Config::GameSettings::readFile))
             return false;
     }
-    else
-        return false;
-    if (!loadFile(Files::getUserConfigPathQString(mCfgMgr), &Config::GameSettings::readFile))
-        return false;
 
     return true;
 }
 
 bool Launcher::MainDialog::setupGameData()
 {
-    QStringList dataDirs;
+    bool foundData = false;
 
     // Check if the paths actually contain data files
-    for (const QString& path3 : mGameSettings.getDataDirs())
+    for (const auto& path3 : mGameSettings.getDataDirs())
     {
-        QDir dir(path3);
+        QDir dir(path3.value);
         QStringList filters;
         filters << "*.esp"
                 << "*.esm"
@@ -382,18 +402,21 @@ bool Launcher::MainDialog::setupGameData()
                 << "*.omwaddon";
 
         if (!dir.entryList(filters).isEmpty())
-            dataDirs.append(path3);
+        {
+            foundData = true;
+            break;
+        }
     }
 
-    if (dataDirs.isEmpty())
+    if (!foundData)
     {
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error detecting Morrowind installation"));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::NoButton);
         msgBox.setText(
-            tr("<br><b>Could not find the Data Files location</b><br><br> \
-                                   The directory containing the data files was not found."));
+            tr("<br><b>Could not find the Data Files location</b><br><br>"
+               "The directory containing the data files was not found."));
 
         QAbstractButton* wizardButton = msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole);
         QAbstractButton* skipButton = msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
@@ -423,8 +446,8 @@ bool Launcher::MainDialog::setupGraphicsSettings()
     catch (std::exception& e)
     {
         cfgError(tr("Error reading OpenMW configuration files"),
-            tr("<br>The problem may be due to an incomplete installation of OpenMW.<br> \
-                     Reinstalling OpenMW may resolve the problem.<br>")
+            tr("<br>The problem may be due to an incomplete installation of OpenMW.<br>"
+               "Reinstalling OpenMW may resolve the problem.<br>")
                 + e.what());
         return false;
     }
@@ -461,13 +484,14 @@ bool Launcher::MainDialog::writeSettings()
 
     if (!exists(userPath))
     {
-        if (!create_directories(userPath))
+        std::error_code ec;
+        if (!create_directories(userPath, ec))
         {
-            cfgError(tr("Error creating OpenMW configuration directory"),
-                tr("<br><b>Could not create %0</b><br><br> \
-                         Please make sure you have the right permissions \
-                         and try again.<br>")
-                    .arg(Files::pathToQString(userPath)));
+            cfgError(tr("Error creating OpenMW configuration directory: code %0").arg(ec.value()),
+                tr("<br><b>Could not create directory %0</b><br><br>"
+                   "%1<br>")
+                    .arg(Files::pathToQString(userPath))
+                    .arg(QString(ec.message().c_str())));
             return false;
         }
     }
@@ -483,9 +507,9 @@ bool Launcher::MainDialog::writeSettings()
     {
         // File cannot be opened or created
         cfgError(tr("Error writing OpenMW configuration file"),
-            tr("<br><b>Could not open or create %0 for writing</b><br><br> \
-                     Please make sure you have the right permissions \
-                     and try again.<br>")
+            tr("<br><b>Could not open or create %0 for writing</b><br><br>"
+               "Please make sure you have the right permissions "
+               "and try again.<br>")
                 .arg(file.fileName()));
         return false;
     }
@@ -514,9 +538,9 @@ bool Launcher::MainDialog::writeSettings()
     {
         // File cannot be opened or created
         cfgError(tr("Error writing Launcher configuration file"),
-            tr("<br><b>Could not open or create %0 for writing</b><br><br> \
-                     Please make sure you have the right permissions \
-                     and try again.<br>")
+            tr("<br><b>Could not open or create %0 for writing</b><br><br>"
+               "Please make sure you have the right permissions "
+               "and try again.<br>")
                 .arg(file.fileName()));
         return false;
     }
@@ -566,8 +590,8 @@ void Launcher::MainDialog::play()
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<br><b>You do not have a game file selected.</b><br><br> \
-                          OpenMW will not start without a game file selected.<br>"));
+            tr("<br><b>You do not have a game file selected.</b><br><br>"
+               "OpenMW will not start without a game file selected.<br>"));
         msgBox.exec();
         return;
     }
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index cc68d52c77..5ceee966ba 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -60,6 +60,9 @@ namespace Launcher
         void play();
         void help();
 
+    protected:
+        bool event(QEvent* event) override;
+
     private slots:
         void wizardStarted();
         void wizardFinished(int exitCode, QProcess::ExitStatus exitStatus);
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index 07570272dd..dfddc45bc5 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -55,6 +55,20 @@ namespace
     {
         value.set(spinBox.value());
     }
+
+    int toIndex(Settings::HrtfMode value)
+    {
+        switch (value)
+        {
+            case Settings::HrtfMode::Auto:
+                return 0;
+            case Settings::HrtfMode::Disable:
+                return 1;
+            case Settings::HrtfMode::Enable:
+                return 2;
+        }
+        return 0;
+    }
 }
 
 Launcher::SettingsPage::SettingsPage(Config::GameSettings& gameSettings, QWidget* parent)
@@ -175,11 +189,15 @@ bool Launcher::SettingsPage::loadSettings()
             loadSettingBool(Settings::game().mWeaponSheathing, *weaponSheathingCheckBox);
             loadSettingBool(Settings::game().mShieldSheathing, *shieldSheathingCheckBox);
         }
+        loadSettingBool(Settings::game().mSmoothAnimTransitions, *smoothAnimTransitionsCheckBox);
         loadSettingBool(Settings::game().mTurnToMovementDirection, *turnToMovementDirectionCheckBox);
         loadSettingBool(Settings::game().mSmoothMovement, *smoothMovementCheckBox);
+        loadSettingBool(Settings::game().mPlayerMovementIgnoresAnimation, *playerMovementIgnoresAnimationCheckBox);
 
-        distantLandCheckBox->setCheckState(
-            Settings::terrain().mDistantTerrain && Settings::terrain().mObjectPaging ? Qt::Checked : Qt::Unchecked);
+        connect(distantLandCheckBox, &QCheckBox::toggled, this, &SettingsPage::slotDistantLandToggled);
+        bool distantLandEnabled = Settings::terrain().mDistantTerrain && Settings::terrain().mObjectPaging;
+        distantLandCheckBox->setCheckState(distantLandEnabled ? Qt::Checked : Qt::Unchecked);
+        slotDistantLandToggled(distantLandEnabled);
 
         loadSettingBool(Settings::terrain().mObjectPagingActiveGrid, *activeGridObjectPagingCheckBox);
         viewingDistanceComboBox->setValue(convertToCells(Settings::camera().mViewingDistance));
@@ -197,6 +215,60 @@ bool Launcher::SettingsPage::loadSettings()
         loadSettingBool(Settings::fog().mExponentialFog, *exponentialFogCheckBox);
         loadSettingBool(Settings::fog().mSkyBlending, *skyBlendingCheckBox);
         skyBlendingStartComboBox->setValue(Settings::fog().mSkyBlendingStart);
+
+        loadSettingBool(Settings::shadows().mActorShadows, *actorShadowsCheckBox);
+        loadSettingBool(Settings::shadows().mPlayerShadows, *playerShadowsCheckBox);
+        loadSettingBool(Settings::shadows().mTerrainShadows, *terrainShadowsCheckBox);
+        loadSettingBool(Settings::shadows().mObjectShadows, *objectShadowsCheckBox);
+        loadSettingBool(Settings::shadows().mEnableIndoorShadows, *indoorShadowsCheckBox);
+
+        const auto& boundMethod = Settings::shadows().mComputeSceneBounds.get();
+        if (boundMethod == "bounds")
+            shadowComputeSceneBoundsComboBox->setCurrentIndex(0);
+        else if (boundMethod == "primitives")
+            shadowComputeSceneBoundsComboBox->setCurrentIndex(1);
+        else
+            shadowComputeSceneBoundsComboBox->setCurrentIndex(2);
+
+        const int shadowDistLimit = Settings::shadows().mMaximumShadowMapDistance;
+        if (shadowDistLimit > 0)
+        {
+            shadowDistanceCheckBox->setCheckState(Qt::Checked);
+            shadowDistanceSpinBox->setValue(shadowDistLimit);
+            shadowDistanceSpinBox->setEnabled(true);
+            fadeStartSpinBox->setEnabled(true);
+        }
+
+        const float shadowFadeStart = Settings::shadows().mShadowFadeStart;
+        if (shadowFadeStart != 0)
+            fadeStartSpinBox->setValue(shadowFadeStart);
+
+        const int shadowRes = Settings::shadows().mShadowMapResolution;
+        int shadowResIndex = shadowResolutionComboBox->findText(QString::number(shadowRes));
+        if (shadowResIndex != -1)
+            shadowResolutionComboBox->setCurrentIndex(shadowResIndex);
+        else
+        {
+            shadowResolutionComboBox->addItem(QString::number(shadowRes));
+            shadowResolutionComboBox->setCurrentIndex(shadowResolutionComboBox->count() - 1);
+        }
+
+        connect(shadowDistanceCheckBox, &QCheckBox::toggled, this, &SettingsPage::slotShadowDistLimitToggled);
+
+        int lightingMethod = 1;
+        switch (Settings::shaders().mLightingMethod)
+        {
+            case SceneUtil::LightingMethod::FFP:
+                lightingMethod = 0;
+                break;
+            case SceneUtil::LightingMethod::PerObjectUniform:
+                lightingMethod = 1;
+                break;
+            case SceneUtil::LightingMethod::SingleUBO:
+                lightingMethod = 2;
+                break;
+        }
+        lightingMethodComboBox->setCurrentIndex(lightingMethod);
     }
 
     // Audio
@@ -210,11 +282,7 @@ bool Launcher::SettingsPage::loadSettings()
                 audioDeviceSelectorComboBox->setCurrentIndex(audioDeviceIndex);
             }
         }
-        const int hrtfEnabledIndex = Settings::sound().mHrtfEnable;
-        if (hrtfEnabledIndex >= -1 && hrtfEnabledIndex <= 1)
-        {
-            enableHRTFComboBox->setCurrentIndex(hrtfEnabledIndex + 1);
-        }
+        enableHRTFComboBox->setCurrentIndex(toIndex(Settings::sound().mHrtfEnable));
         const std::string& selectedHRTFProfile = Settings::sound().mHrtf;
         if (selectedHRTFProfile.empty() == false)
         {
@@ -224,6 +292,7 @@ bool Launcher::SettingsPage::loadSettings()
                 hrtfProfileSelectorComboBox->setCurrentIndex(hrtfProfileIndex);
             }
         }
+        loadSettingBool(Settings::sound().mCameraListener, *cameraListenerCheckBox);
     }
 
     // Interface Changes
@@ -251,7 +320,6 @@ bool Launcher::SettingsPage::loadSettings()
     // Miscellaneous
     {
         // Saves
-        loadSettingBool(Settings::saves().mTimeplayed, *timePlayedCheckbox);
         loadSettingInt(Settings::saves().mMaxQuicksaves, *maximumQuicksavesComboBox);
 
         // Other Settings
@@ -267,7 +335,7 @@ bool Launcher::SettingsPage::loadSettings()
     {
         loadSettingBool(Settings::input().mGrabCursor, *grabCursorCheckBox);
 
-        bool skipMenu = mGameSettings.value("skip-menu").toInt() == 1;
+        bool skipMenu = mGameSettings.value("skip-menu").value.toInt() == 1;
         if (skipMenu)
         {
             skipMenuCheckBox->setCheckState(Qt::Checked);
@@ -275,8 +343,8 @@ bool Launcher::SettingsPage::loadSettings()
         startDefaultCharacterAtLabel->setEnabled(skipMenu);
         startDefaultCharacterAtField->setEnabled(skipMenu);
 
-        startDefaultCharacterAtField->setText(mGameSettings.value("start"));
-        runScriptAfterStartupField->setText(mGameSettings.value("script-run"));
+        startDefaultCharacterAtField->setText(mGameSettings.value("start").value);
+        runScriptAfterStartupField->setText(mGameSettings.value("script-run").value);
     }
     return true;
 }
@@ -327,7 +395,9 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingBool(*weaponSheathingCheckBox, Settings::game().mWeaponSheathing);
         saveSettingBool(*shieldSheathingCheckBox, Settings::game().mShieldSheathing);
         saveSettingBool(*turnToMovementDirectionCheckBox, Settings::game().mTurnToMovementDirection);
+        saveSettingBool(*smoothAnimTransitionsCheckBox, Settings::game().mSmoothAnimTransitions);
         saveSettingBool(*smoothMovementCheckBox, Settings::game().mSmoothMovement);
+        saveSettingBool(*playerMovementIgnoresAnimationCheckBox, Settings::game().mPlayerMovementIgnoresAnimation);
 
         const bool wantDistantLand = distantLandCheckBox->checkState() == Qt::Checked;
         if (wantDistantLand != (Settings::terrain().mDistantTerrain && Settings::terrain().mObjectPaging))
@@ -347,6 +417,52 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingBool(*exponentialFogCheckBox, Settings::fog().mExponentialFog);
         saveSettingBool(*skyBlendingCheckBox, Settings::fog().mSkyBlending);
         Settings::fog().mSkyBlendingStart.set(skyBlendingStartComboBox->value());
+
+        static constexpr std::array<SceneUtil::LightingMethod, 3> lightingMethodMap = {
+            SceneUtil::LightingMethod::FFP,
+            SceneUtil::LightingMethod::PerObjectUniform,
+            SceneUtil::LightingMethod::SingleUBO,
+        };
+        Settings::shaders().mLightingMethod.set(lightingMethodMap[lightingMethodComboBox->currentIndex()]);
+
+        const int cShadowDist
+            = shadowDistanceCheckBox->checkState() != Qt::Unchecked ? shadowDistanceSpinBox->value() : 0;
+        Settings::shadows().mMaximumShadowMapDistance.set(cShadowDist);
+        const float cFadeStart = fadeStartSpinBox->value();
+        if (cShadowDist > 0)
+            Settings::shadows().mShadowFadeStart.set(cFadeStart);
+
+        const bool cActorShadows = actorShadowsCheckBox->checkState() != Qt::Unchecked;
+        const bool cObjectShadows = objectShadowsCheckBox->checkState() != Qt::Unchecked;
+        const bool cTerrainShadows = terrainShadowsCheckBox->checkState() != Qt::Unchecked;
+        const bool cPlayerShadows = playerShadowsCheckBox->checkState() != Qt::Unchecked;
+        if (cActorShadows || cObjectShadows || cTerrainShadows || cPlayerShadows)
+        {
+            Settings::shadows().mEnableShadows.set(true);
+            Settings::shadows().mActorShadows.set(cActorShadows);
+            Settings::shadows().mPlayerShadows.set(cPlayerShadows);
+            Settings::shadows().mObjectShadows.set(cObjectShadows);
+            Settings::shadows().mTerrainShadows.set(cTerrainShadows);
+        }
+        else
+        {
+            Settings::shadows().mEnableShadows.set(false);
+            Settings::shadows().mActorShadows.set(false);
+            Settings::shadows().mPlayerShadows.set(false);
+            Settings::shadows().mObjectShadows.set(false);
+            Settings::shadows().mTerrainShadows.set(false);
+        }
+
+        Settings::shadows().mEnableIndoorShadows.set(indoorShadowsCheckBox->checkState() != Qt::Unchecked);
+        Settings::shadows().mShadowMapResolution.set(shadowResolutionComboBox->currentText().toInt());
+
+        auto index = shadowComputeSceneBoundsComboBox->currentIndex();
+        if (index == 0)
+            Settings::shadows().mComputeSceneBounds.set("bounds");
+        else if (index == 1)
+            Settings::shadows().mComputeSceneBounds.set("primitives");
+        else
+            Settings::shadows().mComputeSceneBounds.set("none");
     }
 
     // Audio
@@ -356,12 +472,20 @@ void Launcher::SettingsPage::saveSettings()
         else
             Settings::sound().mDevice.set({});
 
-        Settings::sound().mHrtfEnable.set(enableHRTFComboBox->currentIndex() - 1);
+        static constexpr std::array<Settings::HrtfMode, 3> hrtfModes{
+            Settings::HrtfMode::Auto,
+            Settings::HrtfMode::Disable,
+            Settings::HrtfMode::Enable,
+        };
+        Settings::sound().mHrtfEnable.set(hrtfModes[enableHRTFComboBox->currentIndex()]);
 
         if (hrtfProfileSelectorComboBox->currentIndex() != 0)
             Settings::sound().mHrtf.set(hrtfProfileSelectorComboBox->currentText().toStdString());
         else
             Settings::sound().mHrtf.set({});
+
+        const bool cCameraListener = cameraListenerCheckBox->checkState() != Qt::Unchecked;
+        Settings::sound().mCameraListener.set(cCameraListener);
     }
 
     // Interface Changes
@@ -389,7 +513,6 @@ void Launcher::SettingsPage::saveSettings()
     // Miscellaneous
     {
         // Saves Settings
-        saveSettingBool(*timePlayedCheckbox, Settings::saves().mTimeplayed);
         saveSettingInt(*maximumQuicksavesComboBox, Settings::saves().mMaxQuicksaves);
 
         // Other Settings
@@ -402,17 +525,17 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingBool(*grabCursorCheckBox, Settings::input().mGrabCursor);
 
         int skipMenu = skipMenuCheckBox->checkState() == Qt::Checked;
-        if (skipMenu != mGameSettings.value("skip-menu").toInt())
-            mGameSettings.setValue("skip-menu", QString::number(skipMenu));
+        if (skipMenu != mGameSettings.value("skip-menu").value.toInt())
+            mGameSettings.setValue("skip-menu", { QString::number(skipMenu) });
 
         QString startCell = startDefaultCharacterAtField->text();
-        if (startCell != mGameSettings.value("start"))
+        if (startCell != mGameSettings.value("start").value)
         {
-            mGameSettings.setValue("start", startCell);
+            mGameSettings.setValue("start", { startCell });
         }
         QString scriptRun = runScriptAfterStartupField->text();
-        if (scriptRun != mGameSettings.value("script-run"))
-            mGameSettings.setValue("script-run", scriptRun);
+        if (scriptRun != mGameSettings.value("script-run").value)
+            mGameSettings.setValue("script-run", { scriptRun });
     }
 }
 
@@ -444,3 +567,15 @@ void Launcher::SettingsPage::slotSkyBlendingToggled(bool checked)
     skyBlendingStartComboBox->setEnabled(checked);
     skyBlendingStartLabel->setEnabled(checked);
 }
+
+void Launcher::SettingsPage::slotShadowDistLimitToggled(bool checked)
+{
+    shadowDistanceSpinBox->setEnabled(checked);
+    fadeStartSpinBox->setEnabled(checked);
+}
+
+void Launcher::SettingsPage::slotDistantLandToggled(bool checked)
+{
+    activeGridObjectPagingCheckBox->setEnabled(checked);
+    objectPagingMinSizeComboBox->setEnabled(checked);
+}
diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp
index 9f7d6b1f43..d2bb80d86a 100644
--- a/apps/launcher/settingspage.hpp
+++ b/apps/launcher/settingspage.hpp
@@ -32,6 +32,8 @@ namespace Launcher
         void slotAnimSourcesToggled(bool checked);
         void slotPostProcessToggled(bool checked);
         void slotSkyBlendingToggled(bool checked);
+        void slotShadowDistLimitToggled(bool checked);
+        void slotDistantLandToggled(bool checked);
 
     private:
         Config::GameSettings& mGameSettings;
diff --git a/files/ui/datafilespage.ui b/apps/launcher/ui/datafilespage.ui
similarity index 61%
rename from files/ui/datafilespage.ui
rename to apps/launcher/ui/datafilespage.ui
index 239df34961..65236ca5ca 100644
--- a/files/ui/datafilespage.ui
+++ b/apps/launcher/ui/datafilespage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>571</width>
-    <height>384</height>
+    <width>573</width>
+    <height>557</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -29,8 +29,14 @@
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="dataNoteLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: content files that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: content files that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
@@ -41,14 +47,120 @@
        <string>Data Directories</string>
       </attribute>
       <layout class="QGridLayout" name="dirTabLayout">
-       <item row="0" column="0" rowspan="26">
+       <item row="0" column="0">
         <widget class="QListWidget" name="directoryListWidget">
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
          <property name="dragDropMode">
           <enum>QAbstractItemView::InternalMove</enum>
          </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+         <property name="contextMenuPolicy">
+          <enum>Qt::CustomContextMenu</enum>
+         </property>
         </widget>
        </item>
-       <item row="32" column="0" colspan="2">
+       <item row="0" column="1">
+        <layout class="QVBoxLayout" name="directoryButtons">
+         <item>
+          <widget class="QPushButton" name="directoryAddSubdirsButton">
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>33</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Scan directories for likely data directories and append them at the end of the list.</string>
+           </property>
+           <property name="text">
+            <string>Append</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="directoryInsertButton">
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>33</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Scan directories for likely data directories and insert them above the selected position</string>
+           </property>
+           <property name="text">
+            <string>Insert Above</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="directoryUpButton">
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>33</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Move selected directory one position up</string>
+           </property>
+           <property name="text">
+            <string>Move Up</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="directoryDownButton">
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>33</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Move selected directory one position down</string>
+           </property>
+           <property name="text">
+            <string>Move Down</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="directoryRemoveButton">
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>33</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Remove selected directory</string>
+           </property>
+           <property name="text">
+            <string>Remove</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="directoryButtonsSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0" colspan="2">
         <widget class="QLabel" name="directoryNoteLabel">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
@@ -57,117 +169,7 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: directories that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QPushButton" name="directoryAddSubdirsButton">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Scan directories for likely data directories and append them at the end of the list.</string>
-         </property>
-         <property name="text">
-          <string>Append</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="QPushButton" name="directoryInsertButton">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Scan directories for likely data directories and insert them above the selected position</string>
-         </property>
-         <property name="text">
-          <string>Insert Above</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="1">
-        <widget class="QPushButton" name="directoryUpButton">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Move selected directory one position up</string>
-         </property>
-         <property name="text">
-          <string>Move Up</string>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="1">
-        <widget class="QPushButton" name="directoryDownButton">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Move selected directory one position down</string>
-         </property>
-         <property name="text">
-          <string>Move Down</string>
-         </property>
-        </widget>
-       </item>
-       <item row="16" column="1">
-        <widget class="QPushButton" name="directoryRemoveButton">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Remove selected directory</string>
-         </property>
-         <property name="text">
-          <string>Remove</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: directories that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
@@ -178,61 +180,90 @@
        <string>Archive Files</string>
       </attribute>
       <layout class="QGridLayout" name="archiveTabLayout">
-       <item row="0" column="0" rowspan="26">
+       <item row="0" column="0">
         <widget class="QListWidget" name="archiveListWidget">
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
+         <property name="contextMenuPolicy">
+          <enum>Qt::CustomContextMenu</enum>
+         </property>
          <property name="dragDropMode">
           <enum>QAbstractItemView::InternalMove</enum>
          </property>
+         <property name="defaultDropAction">
+          <enum>Qt::CopyAction</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="QPushButton" name="archiveUpButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>33</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Move selected archive one position up</string>
-         </property>
-         <property name="text">
-          <string>Move Up</string>
-         </property>
-        </widget>
+        <layout class="QVBoxLayout" name="archiveButtons">
+         <item>
+          <widget class="QPushButton" name="archiveUpButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>33</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>33</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Move selected archive one position up</string>
+           </property>
+           <property name="text">
+            <string>Move Up</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="archiveDownButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>33</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>33</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Move selected archive one position down</string>
+           </property>
+           <property name="text">
+            <string>Move Down</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="archiveButtonsSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </item>
-       <item row="27" column="0" colspan="2">
+       <item row="1" column="0" colspan="2">
         <widget class="QLabel" name="archiveNoteLabel">
          <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: archives that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QPushButton" name="archiveDownButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>33</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>33</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Move selected archive one position down</string>
-         </property>
-         <property name="text">
-          <string>Move Down</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: archives that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
@@ -286,7 +317,7 @@
        <item>
         <widget class="QCheckBox" name="navMeshRemoveUnusedTilesCheckBox">
          <property name="text">
-          <string>Remove unused tiles</string>
+          <string>Remove Unused Tiles</string>
          </property>
          <property name="checked">
           <bool>true</bool>
@@ -298,7 +329,7 @@
          <item>
           <widget class="QLabel" name="navMeshMaxSizeLabel">
            <property name="text">
-            <string>Max size</string>
+            <string>Max Size</string>
            </property>
           </widget>
          </item>
diff --git a/files/ui/directorypicker.ui b/apps/launcher/ui/directorypicker.ui
similarity index 100%
rename from files/ui/directorypicker.ui
rename to apps/launcher/ui/directorypicker.ui
diff --git a/apps/launcher/ui/graphicspage.ui b/apps/launcher/ui/graphicspage.ui
new file mode 100644
index 0000000000..b3e2b15e39
--- /dev/null
+++ b/apps/launcher/ui/graphicspage.ui
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GraphicsPage</class>
+ <widget class="QWidget" name="GraphicsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>650</width>
+    <height>358</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1">
+        <item row="5" column="0">
+         <widget class="QLabel" name="screenLabel">
+          <property name="text">
+           <string>Screen</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="windowModeLabel">
+          <property name="text">
+           <string>Window Mode</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1">
+         <layout class="QGridLayout" name="resolutionLayout">
+          <item row="1" column="2">
+           <layout class="QHBoxLayout" name="customResolutionLayout" stretch="1,0,1">
+            <item>
+             <widget class="QSpinBox" name="customWidthSpinBox">
+              <property name="minimum">
+               <number>800</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="multiplyLabel">
+              <property name="text">
+               <string> × </string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="customHeightSpinBox">
+              <property name="minimum">
+               <number>600</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="1">
+           <widget class="QRadioButton" name="customRadioButton">
+            <property name="text">
+             <string>Custom:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QRadioButton" name="standardRadioButton">
+            <property name="text">
+             <string>Standard:</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QComboBox" name="resolutionComboBox"/>
+          </item>
+         </layout>
+        </item>
+        <item row="4" column="1">
+         <widget class="QComboBox" name="antiAliasingComboBox">
+          <item>
+           <property name="text">
+            <string>0</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>2</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>4</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>8</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>16</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QCheckBox" name="framerateLimitCheckBox">
+          <property name="text">
+           <string>Framerate Limit</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QCheckBox" name="windowBorderCheckBox">
+          <property name="text">
+           <string>Window Border</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QComboBox" name="screenComboBox"/>
+        </item>
+        <item row="2" column="1">
+         <widget class="QComboBox" name="vSyncComboBox">
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <item>
+           <property name="text">
+            <string>Disabled</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Enabled</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Adaptive</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QComboBox" name="windowModeComboBox">
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <item>
+           <property name="text">
+            <string>Fullscreen</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Windowed Fullscreen</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Windowed</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="6" column="0">
+         <widget class="QLabel" name="resolutionLabel">
+          <property name="text">
+           <string>Resolution</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QDoubleSpinBox" name="framerateLimitSpinBox">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="suffix">
+           <string> FPS</string>
+          </property>
+          <property name="decimals">
+           <number>1</number>
+          </property>
+          <property name="minimum">
+           <double>1.000000000000000</double>
+          </property>
+          <property name="maximum">
+           <double>1000.000000000000000</double>
+          </property>
+          <property name="singleStep">
+           <double>15.000000000000000</double>
+          </property>
+          <property name="value">
+           <double>300.000000000000000</double>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="antiAliasingLabel">
+          <property name="text">
+           <string>Anti-Aliasing</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="vSyncLabel">
+          <property name="text">
+           <string>Vertical Synchronization</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="0">
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/files/ui/importpage.ui b/apps/launcher/ui/importpage.ui
similarity index 88%
rename from files/ui/importpage.ui
rename to apps/launcher/ui/importpage.ui
index 3e2b0c5e64..0b5d014afa 100644
--- a/files/ui/importpage.ui
+++ b/apps/launcher/ui/importpage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>514</width>
+    <width>515</width>
     <height>397</height>
    </rect>
   </property>
@@ -54,7 +54,7 @@
         <item row="0" column="0">
          <widget class="QLabel" name="importerLabel">
           <property name="text">
-           <string>File to import settings from:</string>
+           <string>File to Import Settings From:</string>
           </property>
          </widget>
         </item>
@@ -73,7 +73,7 @@
       <item>
        <widget class="QCheckBox" name="addonsCheckBox">
         <property name="text">
-         <string>Import add-on and plugin selection (creates a new Content List)</string>
+         <string>Import Add-on and Plugin Selection</string>
         </property>
         <property name="checked">
          <bool>true</bool>
@@ -88,7 +88,7 @@ so OpenMW provides another set of fonts to avoid these issues. These fonts use T
 to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</string>
         </property>
         <property name="text">
-         <string>Import bitmap fonts setup</string>
+         <string>Import Bitmap Fonts</string>
         </property>
         <property name="checked">
          <bool>true</bool>
@@ -129,16 +129,22 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         </property>
        </widget>
       </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/files/ui/mainwindow.ui b/apps/launcher/ui/mainwindow.ui
similarity index 85%
rename from files/ui/mainwindow.ui
rename to apps/launcher/ui/mainwindow.ui
index 54a369999d..b5ee65d17c 100644
--- a/files/ui/mainwindow.ui
+++ b/apps/launcher/ui/mainwindow.ui
@@ -6,21 +6,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>720</width>
-    <height>565</height>
+    <width>775</width>
+    <height>635</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>720</width>
-    <height>565</height>
+    <width>775</width>
+    <height>635</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>OpenMW Launcher</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../launcher/launcher.qrc">
+   <iconset resource="../../../files/launcher/launcher.qrc">
     <normaloff>:/images/openmw.png</normaloff>:/images/openmw.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -75,20 +75,6 @@
    <property name="layoutDirection">
     <enum>Qt::LeftToRight</enum>
    </property>
-   <property name="styleSheet">
-    <string notr="true">QToolBar {
-	background-attachment: fixed;
-	background-image: url(:/images/openmw-header.png);
-	background-repeat: none;
-	background-position: right;
-	border: 0px;
-}
-
-QToolButton {
-	min-width: 70px;
-}
-</string>
-   </property>
    <property name="movable">
     <bool>false</bool>
    </property>
@@ -120,7 +106,7 @@ QToolButton {
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../launcher/launcher.qrc">
+    <iconset resource="../../../files/launcher/launcher.qrc">
      <normaloff>:/images/openmw-plugin.png</normaloff>:/images/openmw-plugin.png</iconset>
    </property>
    <property name="text">
@@ -141,14 +127,14 @@ QToolButton {
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../launcher/launcher.qrc">
+    <iconset resource="../../../files/launcher/launcher.qrc">
      <normaloff>:/images/preferences-video.png</normaloff>:/images/preferences-video.png</iconset>
    </property>
    <property name="text">
-    <string>Graphics</string>
+    <string>Display</string>
    </property>
    <property name="toolTip">
-    <string>Allows to change graphics settings</string>
+    <string>Allows to change display settings</string>
    </property>
   </action>
   <action name="settingsAction">
@@ -156,7 +142,7 @@ QToolButton {
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../launcher/launcher.qrc">
+    <iconset resource="../../../files/launcher/launcher.qrc">
      <normaloff>:/images/preferences.png</normaloff>:/images/preferences.png</iconset>
    </property>
    <property name="text">
@@ -171,7 +157,7 @@ QToolButton {
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../launcher/launcher.qrc">
+    <iconset resource="../../../files/launcher/launcher.qrc">
      <normaloff>:/images/preferences-advanced.png</normaloff>:/images/preferences-advanced.png</iconset>
    </property>
    <property name="text">
@@ -183,7 +169,7 @@ QToolButton {
   </action>
  </widget>
  <resources>
-  <include location="../launcher/launcher.qrc"/>
+  <include location="../../../files/launcher/launcher.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/apps/launcher/ui/settingspage.ui b/apps/launcher/ui/settingspage.ui
new file mode 100644
index 0000000000..e792ac2843
--- /dev/null
+++ b/apps/launcher/ui/settingspage.ui
@@ -0,0 +1,1643 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SettingsPage</class>
+ <widget class="QWidget" name="SettingsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>741</width>
+    <height>503</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="pageVerticalLayout">
+   <item>
+    <widget class="QTabWidget" name="AdvancedTabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="Gameplay">
+      <attribute name="title">
+       <string>Gameplay</string>
+      </attribute>
+      <layout class="QVBoxLayout">
+       <item>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="10" column="0">
+          <widget class="QCheckBox" name="uncappedDamageFatigueCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Uncapped Damage Fatigue</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="0">
+          <widget class="QCheckBox" name="allowNPCToFollowOverWaterSurfaceCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Give actors an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Always Allow Actors to Follow over Water</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0">
+          <widget class="QCheckBox" name="permanentBarterDispositionChangeCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Permanent Barter Disposition Changes</string>
+           </property>
+          </widget>
+         </item>
+         <item row="10" column="1">
+          <widget class="QCheckBox" name="normaliseRaceSpeedCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don't use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Racial Variation in Speed Fix</string>
+           </property>
+          </widget>
+         </item>
+         <item row="9" column="1">
+          <widget class="QCheckBox" name="classicCalmSpellsCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Classic Calm Spells Behavior</string>
+           </property>
+          </widget>
+         </item>
+         <item row="12" column="1">
+          <widget class="QCheckBox" name="avoidCollisionsCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>NPCs Avoid Collisions</string>
+           </property>
+          </widget>
+         </item>
+         <item row="11" column="0">
+          <widget class="QCheckBox" name="rebalanceSoulGemValuesCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Soulgem Values Rebalance</string>
+           </property>
+          </widget>
+         </item>
+         <item row="13" column="0">
+          <widget class="QCheckBox" name="nightDaySwitchesCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Day Night Switch Nodes</string>
+           </property>
+          </widget>
+         </item>
+         <item row="9" column="0">
+          <widget class="QCheckBox" name="followersAttackOnSightCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Followers Defend Immediately</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="0">
+          <widget class="QCheckBox" name="enableNavigatorCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;When enabled, a navigation mesh is built in the background for world geometry to be used for pathfinding. When disabled only the path grid is used to build paths. Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn't know where to go when you stand behind that stone and cast a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Use Navigation Mesh for Pathfinding</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <widget class="QCheckBox" name="requireAppropriateAmmunitionCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Only Magical Ammo Bypass Resistance</string>
+           </property>
+          </widget>
+         </item>
+         <item row="13" column="1">
+          <widget class="QCheckBox" name="graphicHerbalismCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Graphic Herbalism</string>
+           </property>
+          </widget>
+         </item>
+         <item row="11" column="1">
+          <widget class="QCheckBox" name="swimUpwardCorrectionCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Swim Upward Correction</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="1">
+          <widget class="QCheckBox" name="enchantedWeaponsMagicalCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Enchanted Weapons Are Magical</string>
+           </property>
+          </widget>
+         </item>
+         <item row="12" column="0">
+          <widget class="QCheckBox" name="preventMerchantEquippingCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Merchant Equipping Fix</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="trainersTrainingSkillsBasedOnBaseSkillCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Trainers Choose Offered Skills by Base Value</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="1">
+          <widget class="QCheckBox" name="canLootDuringDeathAnimationCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor's script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Can Loot During Death Animation</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QCheckBox" name="stealingFromKnockedOutCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Steal from Knocked out Actors in Combat</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
+          <widget class="QCheckBox" name="classicReflectedAbsorbSpellsCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Classic Reflected Absorb Spells Behavior</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QCheckBox" name="unarmedCreatureAttacksDamageArmorCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Unarmed Creature Attacks Damage Armor</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QGridLayout" name="gridLayoutGameMechanics2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="unarmedFactorsStrengthLabel">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls the behavior of factoring of Strength attribute into hand-to-hand damage: damage is multiplied by Strength value divided by 40.&lt;/p&gt;&lt;p&gt;Can apply to all actors or only to non-werewolf actors.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Factor Strength into Hand-to-Hand Combat</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QComboBox" name="unarmedFactorsStrengthComboBox">
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Off</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Affect Werewolves</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Do Not Affect Werewolves</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="physicsThreadsLabel">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Background Physics Threads</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="physicsThreadsSpinBox"/>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="labelActorCollisionShapeType">
+           <property name="text">
+            <string>Actor Collision Shape Type</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QComboBox" name="actorCollisonShapeTypeComboBox">
+           <property name="toolTip">
+            <string>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency between available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</string>
+           </property>
+           <property name="currentText">
+            <string>Axis-Aligned Bounding Box</string>
+           </property>
+           <item>
+            <property name="text">
+             <string>Axis-Aligned Bounding Box</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Rotating Box</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Cylinder</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacerGameMechanics">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Visuals">
+      <attribute name="title">
+       <string>Visuals</string>
+      </attribute>
+      <layout class="QVBoxLayout">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <widget class="QTabWidget" name="tabWidget">
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <widget class="QWidget" name="animationsTab">
+            <attribute name="title">
+             <string>Animations</string>
+            </attribute>
+            <layout class="QHBoxLayout" name="horizontalAnimationLayout">
+             <item>
+              <layout class="QGridLayout" name="animationLayout" columnstretch="0,0">
+               <item row="0" column="1">
+                <widget class="QCheckBox" name="smoothMovementCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Smooth Movement</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QCheckBox" name="animSourcesCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Use Additional Animation Sources</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="1">
+                <spacer name="verticalSpacer_11">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="2" column="1">
+                <widget class="QCheckBox" name="turnToMovementDirectionCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character's body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Turn to Movement Direction</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0">
+                <widget class="QCheckBox" name="weaponSheathingCheckBox">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Weapon Sheathing</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="1">
+                <widget class="QCheckBox" name="shieldSheathingCheckBox">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Shield Sheathing</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QCheckBox" name="playerMovementIgnoresAnimationCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Player Movement Ignores Animation</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QCheckBox" name="magicItemAnimationsCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Use Magic Item Animation</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                 <widget class="QCheckBox" name="smoothAnimTransitionsCheckBox">
+                   <property name="toolTip">
+                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled - makes transitions between different animations/poses much smoother. Also allows to load animation blending config YAML files that can be bundled with animations in order to customise blending styles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                     <string>Smooth Animation Transitions</string>
+                   </property>
+                 </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="shadersTab">
+            <attribute name="title">
+             <string>Shaders</string>
+            </attribute>
+            <layout class="QHBoxLayout" name="horizontalShadersLayout">
+             <item>
+              <layout class="QGridLayout" name="shaderLayout">
+               <item row="0" column="0">
+                <layout class="QGridLayout" name="shadersLayout" columnstretch="0,0">
+                 <item row="1" column="0">
+                  <widget class="QCheckBox" name="autoUseObjectNormalMapsCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Auto Use Object Normal Maps</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="0">
+                  <widget class="QCheckBox" name="softParticlesCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Soft Particles</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="3" column="0">
+                  <widget class="QCheckBox" name="autoUseObjectSpecularMapsCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see 'specular map pattern', e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Auto Use Object Specular Maps</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QCheckBox" name="autoUseTerrainNormalMapsCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See 'auto use object normal maps'. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Auto Use Terrain Normal Maps</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="8" column="1">
+                  <spacer name="verticalSpacer_12">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>20</width>
+                     <height>40</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="1">
+                  <widget class="QCheckBox" name="autoUseTerrainSpecularMapsCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Auto Use Terrain Specular Maps</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="3" column="1">
+                  <widget class="QCheckBox" name="adjustCoverageForAlphaTestCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Adjust Coverage for Alpha Test</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="4" column="1">
+                  <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Use Anti-Aliased Alpha Testing</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="0">
+                  <widget class="QCheckBox" name="bumpMapLocalLightingCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Bump/Reflect Map Local Lighting</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="4" column="0">
+                  <widget class="QCheckBox" name="weatherParticleOcclusionCheckBox">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>Weather Particle Occlusion</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="fogTab">
+            <attribute name="title">
+             <string>Fog</string>
+            </attribute>
+            <layout class="QHBoxLayout" name="horizontalfogLayout">
+             <item>
+              <layout class="QGridLayout" name="fogLayout" columnstretch="0,0">
+               <item row="0" column="1">
+                <widget class="QCheckBox" name="exponentialFogCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Exponential Fog</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QDoubleSpinBox" name="skyBlendingStartComboBox">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="decimals">
+                  <number>3</number>
+                 </property>
+                 <property name="minimum">
+                  <double>0.000000000000000</double>
+                 </property>
+                 <property name="maximum">
+                  <double>1.000000000000000</double>
+                 </property>
+                 <property name="singleStep">
+                  <double>0.005000000000000</double>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="1">
+                <spacer name="verticalSpacer_13">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="0" column="0">
+                <widget class="QCheckBox" name="radialFogCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Radial Fog</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QLabel" name="skyBlendingStartLabel">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Sky Blending Start</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QCheckBox" name="skyBlendingCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Sky Blending</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="terrainTab">
+            <attribute name="title">
+             <string>Terrain</string>
+            </attribute>
+            <layout class="QHBoxLayout" name="horizontalTerrainLayout">
+             <item>
+              <layout class="QGridLayout" name="terrainLayout" columnstretch="0,0">
+               <item row="4" column="0">
+                <widget class="QLabel" name="objectPagingMinSizeLabel">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Object Paging Min Size</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="1">
+                <widget class="QDoubleSpinBox" name="objectPagingMinSizeComboBox">
+                 <property name="decimals">
+                  <number>3</number>
+                 </property>
+                 <property name="minimum">
+                  <double>0.000000000000000</double>
+                 </property>
+                 <property name="maximum">
+                  <double>0.250000000000000</double>
+                 </property>
+                 <property name="singleStep">
+                  <double>0.005000000000000</double>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QLabel" name="viewingDistanceLabel">
+                 <property name="text">
+                  <string>Viewing Distance</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QDoubleSpinBox" name="viewingDistanceComboBox">
+                 <property name="suffix">
+                  <string> cells</string>
+                 </property>
+                 <property name="decimals">
+                  <number>3</number>
+                 </property>
+                 <property name="minimum">
+                  <double>0.250000000000000</double>
+                 </property>
+                 <property name="singleStep">
+                  <double>0.125000000000000</double>
+                 </property>
+                </widget>
+               </item>
+               <item row="7" column="1">
+                <spacer name="verticalSpacer_15">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="3" column="0">
+                <widget class="QCheckBox" name="distantLandCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Distant Land</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                <widget class="QCheckBox" name="activeGridObjectPagingCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Active Grid Object Paging</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="postProcessingTab">
+            <attribute name="title">
+             <string>Post Processing</string>
+            </attribute>
+            <layout class="QHBoxLayout" name="horizontalPostProcessLayout">
+             <item>
+              <layout class="QGridLayout" name="postProcessLayout" columnstretch="0,0">
+               <item row="5" column="1">
+                <widget class="QDoubleSpinBox" name="postprocessHDRTimeComboBox">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="decimals">
+                  <number>3</number>
+                 </property>
+                 <property name="minimum">
+                  <double>0.010000000000000</double>
+                 </property>
+                 <property name="maximum">
+                  <double>10.000000000000000</double>
+                 </property>
+                 <property name="singleStep">
+                  <double>0.001000000000000</double>
+                 </property>
+                </widget>
+               </item>
+               <item row="7" column="1">
+                <spacer name="verticalSpacer_9">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="4" column="0">
+                <widget class="QCheckBox" name="postprocessTransparentPostpassCheckBox">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Transparent Postpass</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="0">
+                <widget class="QLabel" name="postprocessHDRTimeLabel">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Auto Exposure Speed</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QCheckBox" name="postprocessEnabledCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Enable Post Processing</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="shadowsTab">
+            <attribute name="title">
+             <string>Shadows</string>
+            </attribute>
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <item>
+              <layout class="QGridLayout" name="shadowsLayout" columnstretch="0,0">
+               <item row="5" column="1">
+                <widget class="QComboBox" name="shadowComputeSceneBoundsComboBox">
+                 <item>
+                  <property name="text">
+                   <string>Bounds</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Primitives</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>None</string>
+                  </property>
+                 </item>
+                </widget>
+               </item>
+               <item row="5" column="0">
+                <widget class="QLabel" name="shadowComputeSceneBoundsLabel">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Shadow Planes Computation Method</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="7" column="1">
+                <widget class="QSpinBox" name="shadowDistanceSpinBox">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="suffix">
+                  <string> unit(s)</string>
+                 </property>
+                 <property name="minimum">
+                  <number>512</number>
+                 </property>
+                 <property name="maximum">
+                  <number>81920</number>
+                 </property>
+                 <property name="singleStep">
+                  <number>128</number>
+                 </property>
+                 <property name="value">
+                  <number>8192</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QCheckBox" name="actorShadowsCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Enable Actor Shadows</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="1">
+                <widget class="QComboBox" name="shadowResolutionComboBox">
+                 <item>
+                  <property name="text">
+                   <string>512</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>1024</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>2048</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>4096</string>
+                  </property>
+                 </item>
+                </widget>
+               </item>
+               <item row="8" column="0">
+                <widget class="QLabel" name="fadeStartLabel">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Fade Start Multiplier</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QCheckBox" name="playerShadowsCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Enable Player Shadows</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="0">
+                <widget class="QLabel" name="shadowResolutionLabel">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Shadow Map Resolution</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="7" column="0">
+                <widget class="QCheckBox" name="shadowDistanceCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Shadow Distance Limit:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QCheckBox" name="objectShadowsCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Enable Object Shadows</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="8" column="1">
+                <widget class="QDoubleSpinBox" name="fadeStartSpinBox">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="decimals">
+                  <number>2</number>
+                 </property>
+                 <property name="minimum">
+                  <double>0.000000000000000</double>
+                 </property>
+                 <property name="maximum">
+                  <double>1.000000000000000</double>
+                 </property>
+                 <property name="singleStep">
+                  <double>0.010000000000000</double>
+                 </property>
+                 <property name="value">
+                  <double>0.900000000000000</double>
+                 </property>
+                </widget>
+               </item>
+               <item row="9" column="1">
+                <spacer name="verticalSpacer_8">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="0" column="1">
+                <widget class="QCheckBox" name="indoorShadowsCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind's data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Enable Indoor Shadows</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QCheckBox" name="terrainShadowsCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Enable Terrain Shadows</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="lightingTab">
+            <attribute name="title">
+             <string>Lighting</string>
+            </attribute>
+            <layout class="QHBoxLayout" name="horizontalLightingLayout">
+             <item>
+              <layout class="QGridLayout" name="lightingLayout" columnstretch="0,0">
+               <item row="2" column="1">
+                <spacer name="verticalSpacer_10">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="lightingMethodLabel">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
+&lt;p&gt; &quot;Legacy&quot; always uses 8 lights per object. It provides results most similar to Morrowind's lighting.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (compatibility)&quot; removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Lighting Method</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QComboBox" name="lightingMethodComboBox">
+                 <item>
+                  <property name="text">
+                   <string>Legacy</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Shaders (compatibility)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Shaders</string>
+                  </property>
+                 </item>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Audio">
+      <attribute name="title">
+       <string>Audio</string>
+      </attribute>
+      <layout class="QVBoxLayout">
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="audioDeviceSelectorLabel">
+           <property name="toolTip">
+            <string>Select your preferred audio device.</string>
+           </property>
+           <property name="text">
+            <string>Audio Device</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="audioDeviceSelectorComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>283</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Default</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="enableHRTFLabel">
+           <property name="toolTip">
+            <string>This setting controls HRTF, which simulates 3D sound on stereo systems.</string>
+           </property>
+           <property name="text">
+            <string>HRTF</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="enableHRTFComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>283</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Automatic</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Off</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>On</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="hrtfProfileSelectorLabel">
+           <property name="toolTip">
+            <string>Select your preferred HRTF profile.</string>
+           </property>
+           <property name="text">
+            <string>HRTF Profile</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="hrtfProfileSelectorComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>283</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Default</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="cameraListenerCheckBox">
+         <property name="toolTip">
+          <string>In third-person view, use the camera as the sound listener instead of the player character.</string>
+         </property>
+         <property name="text">
+          <string>Use the Camera as the Sound Listener</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Interface">
+      <attribute name="title">
+       <string>Interface</string>
+      </attribute>
+      <layout class="QVBoxLayout">
+       <item>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="1">
+          <widget class="QComboBox" name="showOwnedComboBox">
+           <property name="currentIndex">
+            <number>1</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Off</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Tooltip</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Crosshair</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Tooltip and Crosshair</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QDoubleSpinBox" name="scalingSpinBox">
+           <property name="decimals">
+            <number>2</number>
+           </property>
+           <property name="minimum">
+            <double>0.500000000000000</double>
+           </property>
+           <property name="maximum">
+            <double>8.000000000000000</double>
+           </property>
+           <property name="singleStep">
+            <double>0.250000000000000</double>
+           </property>
+           <property name="value">
+            <double>1.000000000000000</double>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QSpinBox" name="fontSizeSpinBox">
+           <property name="minimum">
+            <number>12</number>
+           </property>
+           <property name="maximum">
+            <number>18</number>
+           </property>
+           <property name="singleStep">
+            <number>1</number>
+           </property>
+           <property name="value">
+            <number>16</number>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="scalingLabel">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>GUI Scaling Factor</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="showEffectDurationCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Show Effect Duration</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="0">
+          <widget class="QCheckBox" name="changeDialogTopicsCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you're talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Change Dialogue Topic Color</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="fontSizeLabel">
+           <property name="toolTip">
+            <string>Size of characters in game texts.</string>
+           </property>
+           <property name="text">
+            <string>Font Size</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0">
+          <widget class="QCheckBox" name="useZoomOnMapCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Can Zoom on Maps</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
+          <widget class="QCheckBox" name="showProjectileDamageCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Show Projectile Damage</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QCheckBox" name="showMeleeInfoCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Show Melee Info</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <widget class="QCheckBox" name="stretchBackgroundCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Stretch Menu Background</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="showOwnedLabel">
+           <property name="text">
+            <string>Show Owned Objects</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QCheckBox" name="showEnchantChanceCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Show Enchant Chance</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Miscellaneous">
+      <attribute name="title">
+       <string>Miscellaneous</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
+       <item>
+        <widget class="QGroupBox" name="savesGroup">
+         <property name="title">
+          <string>Saves</string>
+         </property>
+         <layout class="QVBoxLayout" name="savesGroupVerticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="maximumQuicksavesLayout">
+            <item>
+             <widget class="QLabel" name="maximumQuicksavesLabel">
+              <property name="text">
+               <string>Maximum Quicksaves</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="maximumQuicksavesComboBox">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="screenshotsGroup">
+         <property name="title">
+          <string>Screenshots</string>
+         </property>
+         <layout class="QVBoxLayout" name="otherGroupVerticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="screenshotFormatLayout">
+            <item>
+             <widget class="QLabel" name="screenshotFormatLabel">
+              <property name="text">
+               <string>Screenshot Format</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="screenshotFormatComboBox">
+              <item>
+               <property name="text">
+                <string>JPG</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>PNG</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>TGA</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="notifyOnSavedScreenshotCheckBox">
+            <property name="text">
+             <string>Notify on Saved Screenshot</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Testing">
+      <attribute name="title">
+       <string>Testing</string>
+      </attribute>
+      <layout class="QVBoxLayout">
+       <item>
+        <widget class="QLabel" name="testingLabel">
+         <property name="text">
+          <string>These settings are intended for testing mods and will cause issues if used for normal gameplay.</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="testingLine">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="grabCursorCheckBox">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Grab Cursor</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="skipMenuCheckBox">
+         <property name="text">
+          <string>Skip Menu and Generate Default Character</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="startDefaultCharacterAtHorizontalLayout">
+         <item>
+          <spacer name="startDefaultCharacterAtHorizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="startDefaultCharacterAtLabel">
+           <property name="text">
+            <string>Start Default Character at</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="startDefaultCharacterAtField">
+           <property name="placeholderText">
+            <string>Default Cell</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Run Script After Startup:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="runScriptAfterStartupHorizontalLayout">
+         <item>
+          <widget class="QLineEdit" name="runScriptAfterStartupField"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="runScriptAfterStartupBrowseButton">
+           <property name="text">
+            <string>Browse…</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/apps/launcher/utils/lineedit.cpp b/apps/launcher/utils/lineedit.cpp
index 0741e84c12..ad3f82ec30 100644
--- a/apps/launcher/utils/lineedit.cpp
+++ b/apps/launcher/utils/lineedit.cpp
@@ -11,7 +11,7 @@ void LineEdit::setupClearButton()
     mClearButton = new QToolButton(this);
     mClearButton->setIcon(QIcon::fromTheme("edit-clear"));
     mClearButton->setCursor(Qt::ArrowCursor);
-    mClearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
+    mClearButton->setAutoRaise(true);
     mClearButton->hide();
     connect(mClearButton, &QToolButton::clicked, this, &LineEdit::clear);
     connect(this, &LineEdit::textChanged, this, &LineEdit::updateClearButton);
diff --git a/apps/launcher/utils/openalutil.cpp b/apps/launcher/utils/openalutil.cpp
index 1a332e9788..9a9ae9981b 100644
--- a/apps/launcher/utils/openalutil.cpp
+++ b/apps/launcher/utils/openalutil.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 #include <vector>
 
-#include <apps/openmw/mwsound/alext.h>
+#include "apps/openmw/mwsound/alext.h"
 
 #include "openalutil.hpp"
 
diff --git a/apps/mwiniimporter/CMakeLists.txt b/apps/mwiniimporter/CMakeLists.txt
index 704393cd0d..ed88ac0bc4 100644
--- a/apps/mwiniimporter/CMakeLists.txt
+++ b/apps/mwiniimporter/CMakeLists.txt
@@ -14,13 +14,11 @@ openmw_add_executable(openmw-iniimporter
 )
 
 target_link_libraries(openmw-iniimporter
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    Boost::program_options
     components
 )
 
 if (WIN32)
-    target_link_libraries(openmw-iniimporter
-    ${Boost_LOCALE_LIBRARY})
     INSTALL(TARGETS openmw-iniimporter RUNTIME DESTINATION ".")
 endif(WIN32)
 
@@ -33,7 +31,7 @@ if (BUILD_WITH_CODE_COVERAGE)
     target_link_libraries(openmw-iniimporter gcov)
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw-iniimporter PRIVATE
         <string>
         <vector>
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 7b3bcc3f1c..8c7c238b4a 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -584,7 +584,7 @@ void MwIniImporter::importGameFiles(
         reader.close();
     }
 
-    auto sortedFiles = dependencySort(unsortedFiles);
+    auto sortedFiles = dependencySort(std::move(unsortedFiles));
 
     // hard-coded dependency Morrowind - Tribunal - Bloodmoon
     if (findString(sortedFiles, "Morrowind.esm") != sortedFiles.end())
diff --git a/apps/navmeshtool/CMakeLists.txt b/apps/navmeshtool/CMakeLists.txt
index 9abd8dc283..090fc00f36 100644
--- a/apps/navmeshtool/CMakeLists.txt
+++ b/apps/navmeshtool/CMakeLists.txt
@@ -5,10 +5,22 @@ set(NAVMESHTOOL
 )
 source_group(apps\\navmeshtool FILES ${NAVMESHTOOL})
 
-openmw_add_executable(openmw-navmeshtool ${NAVMESHTOOL})
+add_library(openmw-navmeshtool-lib STATIC
+    ${NAVMESHTOOL}
+)
 
-target_link_libraries(openmw-navmeshtool
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+if (ANDROID)
+    add_library(openmw-navmeshtool SHARED
+        main.cpp
+    )
+else()
+    openmw_add_executable(openmw-navmeshtool ${NAVMESHTOOL})
+endif()
+
+target_link_libraries(openmw-navmeshtool openmw-navmeshtool-lib)
+
+target_link_libraries(openmw-navmeshtool-lib
+    Boost::program_options
     components
 )
 
@@ -21,7 +33,7 @@ if (WIN32)
     install(TARGETS openmw-navmeshtool RUNTIME DESTINATION ".")
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw-navmeshtool PRIVATE
         <algorithm>
         <memory>
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index e5126d9209..27f84104ac 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -19,6 +19,7 @@
 #include <components/files/conversion.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/platform/platform.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/niffilemanager.hpp>
@@ -88,10 +89,6 @@ namespace NavMeshTool
                     ->composing(),
                 "set fallback BSA archives (later archives have higher priority)");
 
-            addOption("resources",
-                bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
-                "set resources directory");
-
             addOption("content",
                 bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
                 "content file(s): esm/esp, or omwgame/omwaddon/omwscripts");
@@ -143,14 +140,14 @@ namespace NavMeshTool
 
             if (variables.find("help") != variables.end())
             {
-                getRawStdout() << desc << std::endl;
+                Debug::getRawStdout() << desc << std::endl;
                 return 0;
             }
 
             Files::ConfigurationManager config;
             config.readConfiguration(variables, desc);
 
-            setupLogging(config.getLogPath(), applicationName);
+            Debug::setupLogging(config.getLogPath(), applicationName);
 
             const std::string encoding(variables["encoding"].as<std::string>());
             Log(Debug::Info) << ToUTF8::encodingUsingMessage(encoding);
@@ -164,13 +161,14 @@ namespace NavMeshTool
 
             config.filterOutNonExistingPaths(dataDirs);
 
-            const auto resDir = variables["resources"].as<Files::MaybeQuotedPath>();
-            Version::Version v = Version::getOpenmwVersion(resDir);
-            Log(Debug::Info) << v.describe();
+            const auto& resDir = variables["resources"].as<Files::MaybeQuotedPath>();
+            Log(Debug::Info) << Version::getOpenmwVersionDescription();
             dataDirs.insert(dataDirs.begin(), resDir / "vfs");
-            const auto fileCollections = Files::Collections(dataDirs);
-            const auto archives = variables["fallback-archive"].as<StringsVector>();
-            const auto contentFiles = variables["content"].as<StringsVector>();
+            const Files::Collections fileCollections(dataDirs);
+            const auto& archives = variables["fallback-archive"].as<StringsVector>();
+            StringsVector contentFiles{ "builtin.omwscripts" };
+            const auto& configContentFiles = variables["content"].as<StringsVector>();
+            contentFiles.insert(contentFiles.end(), configContentFiles.begin(), configContentFiles.end());
             const std::size_t threadsNumber = variables["threads"].as<std::size_t>();
 
             if (threadsNumber < 1)
@@ -200,7 +198,7 @@ namespace NavMeshTool
                 Settings::game().mActorCollisionShapeType,
                 Settings::game().mDefaultActorPathfindHalfExtents,
             };
-            const std::uint64_t maxDbFileSize = Settings::Manager::getUInt64("max navmeshdb file size", "Navigator");
+            const std::uint64_t maxDbFileSize = Settings::navigator().mMaxNavmeshdbFileSize;
             const auto dbPath = Files::pathToUnicodeString(config.getUserDataPath() / "navmesh.db");
 
             Log(Debug::Info) << "Using navmeshdb at " << dbPath;
@@ -219,10 +217,13 @@ namespace NavMeshTool
             const EsmLoader::EsmData esmData
                 = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
 
-            Resource::ImageManager imageManager(&vfs);
-            Resource::NifFileManager nifFileManager(&vfs);
-            Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager);
-            Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager);
+            constexpr double expiryDelay = 0;
+
+            Resource::ImageManager imageManager(&vfs, expiryDelay);
+            Resource::NifFileManager nifFileManager(&vfs, &encoder.getStatelessEncoder());
+            Resource::BgsmFileManager bgsmFileManager(&vfs, expiryDelay);
+            Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager, &bgsmFileManager, expiryDelay);
+            Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager, expiryDelay);
             DetourNavigator::RecastGlobalAllocator::init();
             DetourNavigator::Settings navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
             navigatorSettings.mRecast.mSwimHeightScale
@@ -257,7 +258,11 @@ namespace NavMeshTool
     }
 }
 
+#ifdef ANDROID
+extern "C" int SDL_main(int argc, char* argv[])
+#else
 int main(int argc, char* argv[])
+#endif
 {
-    return wrapApplication(NavMeshTool::runNavMeshTool, argc, argv, NavMeshTool::applicationName);
+    return Debug::wrapApplication(NavMeshTool::runNavMeshTool, argc, argv, NavMeshTool::applicationName);
 }
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 384c965466..6a4a708ef9 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -59,7 +59,7 @@ namespace NavMeshTool
         void serializeToStderr(const T& value)
         {
             const std::vector<std::byte> data = serialize(value);
-            getLockedRawStderr()->write(
+            Debug::getLockedRawStderr()->write(
                 reinterpret_cast<const char*>(data.data()), static_cast<std::streamsize>(data.size()));
         }
 
@@ -106,8 +106,8 @@ namespace NavMeshTool
                 return DetourNavigator::resolveMeshSource(mDb, source, mNextShapeId);
             }
 
-            std::optional<NavMeshTileInfo> find(std::string_view worldspace, const TilePosition& tilePosition,
-                const std::vector<std::byte>& input) override
+            std::optional<NavMeshTileInfo> find(
+                ESM::RefId worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input) override
             {
                 std::optional<NavMeshTileInfo> result;
                 std::lock_guard lock(mMutex);
@@ -121,7 +121,7 @@ namespace NavMeshTool
                 return result;
             }
 
-            void ignore(std::string_view worldspace, const TilePosition& tilePosition) override
+            void ignore(ESM::RefId worldspace, const TilePosition& tilePosition) override
             {
                 if (mRemoveUnusedTiles)
                 {
@@ -131,7 +131,7 @@ namespace NavMeshTool
                 report();
             }
 
-            void identity(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId) override
+            void identity(ESM::RefId worldspace, const TilePosition& tilePosition, std::int64_t tileId) override
             {
                 if (mRemoveUnusedTiles)
                 {
@@ -142,7 +142,7 @@ namespace NavMeshTool
                 report();
             }
 
-            void insert(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t version,
+            void insert(ESM::RefId worldspace, const TilePosition& tilePosition, std::int64_t version,
                 const std::vector<std::byte>& input, PreparedNavMeshData& data) override
             {
                 {
@@ -158,7 +158,7 @@ namespace NavMeshTool
                 report();
             }
 
-            void update(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId,
+            void update(ESM::RefId worldspace, const TilePosition& tilePosition, std::int64_t tileId,
                 std::int64_t version, PreparedNavMeshData& data) override
             {
                 data.mUserId = static_cast<unsigned>(tileId);
@@ -217,7 +217,7 @@ namespace NavMeshTool
                 mDb.vacuum();
             }
 
-            void removeTilesOutsideRange(std::string_view worldspace, const TilesPositionsRange& range)
+            void removeTilesOutsideRange(ESM::RefId worldspace, const TilesPositionsRange& range)
             {
                 const std::lock_guard lock(mMutex);
                 mTransaction.commit();
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 8d2ac7382b..ec44d33e6c 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -103,8 +103,7 @@ namespace NavMeshTool
 
             Log(Debug::Debug) << "Loaded " << cellRefs.size() << " cell refs";
 
-            const auto getKey
-                = [](const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
+            const auto getKey = [](const EsmLoader::Record<CellRef>& v) -> ESM::RefNum { return v.mValue.mRefNum; };
             std::vector<CellRef> result = prepareRecords(cellRefs, getKey);
 
             Log(Debug::Debug) << "Prepared " << result.size() << " unique cell refs";
@@ -122,7 +121,7 @@ namespace NavMeshTool
 
             for (CellRef& cellRef : cellRefs)
             {
-                std::string model(getModel(esmData, cellRef.mRefId, cellRef.mType));
+                VFS::Path::Normalized model(getModel(esmData, cellRef.mRefId, cellRef.mType));
                 if (model.empty())
                     continue;
 
@@ -132,7 +131,7 @@ namespace NavMeshTool
                 osg::ref_ptr<const Resource::BulletShape> shape = [&] {
                     try
                     {
-                        return bulletShapeManager.getShape(Misc::ResourceHelpers::correctMeshPath(model, &vfs));
+                        return bulletShapeManager.getShape(Misc::ResourceHelpers::correctMeshPath(model));
                     }
                     catch (const std::exception& e)
                     {
@@ -220,7 +219,8 @@ namespace NavMeshTool
         void serializeToStderr(const T& value)
         {
             const std::vector<std::byte> data = serialize(value);
-            getRawStderr().write(reinterpret_cast<const char*>(data.data()), static_cast<std::streamsize>(data.size()));
+            Debug::getRawStderr().write(
+                reinterpret_cast<const char*>(data.data()), static_cast<std::streamsize>(data.size()));
         }
 
         std::string makeAddObjectErrorMessage(
@@ -235,8 +235,8 @@ namespace NavMeshTool
     }
 
     WorldspaceNavMeshInput::WorldspaceNavMeshInput(
-        std::string worldspace, const DetourNavigator::RecastSettings& settings)
-        : mWorldspace(std::move(worldspace))
+        ESM::RefId worldspace, const DetourNavigator::RecastSettings& settings)
+        : mWorldspace(worldspace)
         , mTileCachedRecastMeshManager(settings)
     {
         mAabb.m_min = btVector3(0, 0, 0);
@@ -249,7 +249,7 @@ namespace NavMeshTool
     {
         Log(Debug::Info) << "Processing " << esmData.mCells.size() << " cells...";
 
-        std::map<std::string_view, std::unique_ptr<WorldspaceNavMeshInput>> navMeshInputs;
+        std::unordered_map<ESM::RefId, std::unique_ptr<WorldspaceNavMeshInput>> navMeshInputs;
         WorldspaceData data;
 
         std::size_t objectsCounter = 0;
@@ -277,8 +277,7 @@ namespace NavMeshTool
 
             const osg::Vec2i cellPosition(cell.mData.mX, cell.mData.mY);
             const std::size_t cellObjectsBegin = data.mObjects.size();
-            const auto cellWorldspace = Misc::StringUtils::lowerCase(
-                (cell.isExterior() ? ESM::Cell::sDefaultWorldspaceId : cell.mId).serializeText());
+            const ESM::RefId cellWorldspace = cell.isExterior() ? ESM::Cell::sDefaultWorldspaceId : cell.mId;
             WorldspaceNavMeshInput& navMeshInput = [&]() -> WorldspaceNavMeshInput& {
                 auto it = navMeshInputs.find(cellWorldspace);
                 if (it == navMeshInputs.end())
diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
index b6ccce6733..7096cf95ed 100644
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -48,12 +48,12 @@ namespace NavMeshTool
 
     struct WorldspaceNavMeshInput
     {
-        std::string mWorldspace;
+        ESM::RefId mWorldspace;
         TileCachedRecastMeshManager mTileCachedRecastMeshManager;
         btAABB mAabb;
         bool mAabbInitialized = false;
 
-        explicit WorldspaceNavMeshInput(std::string worldspace, const DetourNavigator::RecastSettings& settings);
+        explicit WorldspaceNavMeshInput(ESM::RefId worldspace, const DetourNavigator::RecastSettings& settings);
     };
 
     class BulletObject
diff --git a/apps/niftest/CMakeLists.txt b/apps/niftest/CMakeLists.txt
index f112e087e3..cf37162f6e 100644
--- a/apps/niftest/CMakeLists.txt
+++ b/apps/niftest/CMakeLists.txt
@@ -17,6 +17,6 @@ if (BUILD_WITH_CODE_COVERAGE)
     target_link_libraries(niftest gcov)
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(niftest PRIVATE <filesystem>)
 endif()
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 06f2110e69..8634134665 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -8,6 +8,7 @@
 #include <utility>
 #include <vector>
 
+#include <components/bgsm/file.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
@@ -17,113 +18,213 @@
 #include <components/vfs/bsaarchive.hpp>
 #include <components/vfs/filesystemarchive.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 
 #include <boost/program_options.hpp>
 
 // Create local aliases for brevity
 namespace bpo = boost::program_options;
 
-/// See if the file has the named extension
-bool hasExtension(const std::filesystem::path& filename, const std::string& extensionToFind)
+enum class FileType
 {
-    const auto extension = Files::pathToUnicodeString(filename.extension());
-    return Misc::StringUtils::ciEqual(extension, extensionToFind);
+    BSA,
+    BA2,
+    BGEM,
+    BGSM,
+    NIF,
+    KF,
+    BTO,
+    BTR,
+    RDT,
+    PSA,
+    Unknown,
+};
+
+enum class FileClass
+{
+    Archive,
+    Material,
+    NIF,
+    Unknown,
+};
+
+std::pair<FileType, FileClass> classifyFile(const std::filesystem::path& filename)
+{
+    const std::string extension = Misc::StringUtils::lowerCase(Files::pathToUnicodeString(filename.extension()));
+    if (extension == ".bsa")
+        return { FileType::BSA, FileClass::Archive };
+    if (extension == ".ba2")
+        return { FileType::BA2, FileClass::Archive };
+    if (extension == ".bgem")
+        return { FileType::BGEM, FileClass::Material };
+    if (extension == ".bgsm")
+        return { FileType::BGSM, FileClass::Material };
+    if (extension == ".nif")
+        return { FileType::NIF, FileClass::NIF };
+    if (extension == ".kf")
+        return { FileType::KF, FileClass::NIF };
+    if (extension == ".bto")
+        return { FileType::BTO, FileClass::NIF };
+    if (extension == ".btr")
+        return { FileType::BTR, FileClass::NIF };
+    if (extension == ".rdt")
+        return { FileType::RDT, FileClass::NIF };
+    if (extension == ".psa")
+        return { FileType::PSA, FileClass::NIF };
+
+    return { FileType::Unknown, FileClass::Unknown };
 }
 
-/// See if the file has the "nif" extension.
-bool isNIF(const std::filesystem::path& filename)
+std::string getFileTypeName(FileType fileType)
 {
-    return hasExtension(filename, ".nif");
-}
-/// See if the file has the "bsa" extension.
-bool isBSA(const std::filesystem::path& filename)
-{
-    return hasExtension(filename, ".bsa");
-}
-
-std::unique_ptr<VFS::Archive> makeBsaArchive(const std::filesystem::path& path)
-{
-    switch (Bsa::BSAFile::detectVersion(path))
+    switch (fileType)
     {
-        case Bsa::BSAVER_UNKNOWN:
-            std::cerr << '"' << path << "\" is unknown BSA archive" << std::endl;
-            return nullptr;
-        case Bsa::BSAVER_COMPRESSED:
-            return std::make_unique<VFS::ArchiveSelector<Bsa::BSAVER_COMPRESSED>::type>(path);
-        case Bsa::BSAVER_BA2_GNRL:
-            return std::make_unique<VFS::ArchiveSelector<Bsa::BSAVER_BA2_GNRL>::type>(path);
-        case Bsa::BSAVER_BA2_DX10:
-            return std::make_unique<VFS::ArchiveSelector<Bsa::BSAVER_BA2_DX10>::type>(path);
-        case Bsa::BSAVER_UNCOMPRESSED:
-            return std::make_unique<VFS::ArchiveSelector<Bsa::BSAVER_UNCOMPRESSED>::type>(path);
+        case FileType::BSA:
+            return "BSA";
+        case FileType::BA2:
+            return "BA2";
+        case FileType::BGEM:
+            return "BGEM";
+        case FileType::BGSM:
+            return "BGSM";
+        case FileType::NIF:
+            return "NIF";
+        case FileType::KF:
+            return "KF";
+        case FileType::BTO:
+            return "BTO";
+        case FileType::BTR:
+            return "BTR";
+        case FileType::RDT:
+            return "RDT";
+        case FileType::PSA:
+            return "PSA";
+        case FileType::Unknown:
+        default:
+            return {};
     }
+}
 
-    std::cerr << '"' << path << "\" is unsupported BSA archive" << std::endl;
-
-    return nullptr;
+bool isBSA(const std::filesystem::path& path)
+{
+    return classifyFile(path).second == FileClass::Archive;
 }
 
 std::unique_ptr<VFS::Archive> makeArchive(const std::filesystem::path& path)
 {
     if (isBSA(path))
-        return makeBsaArchive(path);
+        return VFS::makeBsaArchive(path);
     if (std::filesystem::is_directory(path))
         return std::make_unique<VFS::FileSystemArchive>(path);
     return nullptr;
 }
 
+bool readFile(
+    const std::filesystem::path& source, const std::filesystem::path& path, const VFS::Manager* vfs, bool quiet)
+{
+    const auto [fileType, fileClass] = classifyFile(path);
+    if (fileClass != FileClass::NIF && fileClass != FileClass::Material)
+        return false;
+
+    const std::string pathStr = Files::pathToUnicodeString(path);
+    if (!quiet)
+    {
+        std::cout << "Reading " << getFileTypeName(fileType) << " file '" << pathStr << "'";
+        if (!source.empty())
+            std::cout << " from '" << Files::pathToUnicodeString(isBSA(source) ? source.filename() : source) << "'";
+        std::cout << std::endl;
+    }
+    const std::filesystem::path fullPath = !source.empty() ? source / path : path;
+    try
+    {
+        switch (fileClass)
+        {
+            case FileClass::NIF:
+            {
+                Nif::NIFFile file(VFS::Path::Normalized(Files::pathToUnicodeString(fullPath)));
+                Nif::Reader reader(file, nullptr);
+                if (vfs != nullptr)
+                    reader.parse(vfs->get(pathStr));
+                else
+                    reader.parse(Files::openConstrainedFileStream(fullPath));
+                break;
+            }
+            case FileClass::Material:
+            {
+                if (vfs != nullptr)
+                    Bgsm::parse(vfs->get(pathStr));
+                else
+                    Bgsm::parse(Files::openConstrainedFileStream(fullPath));
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    catch (std::exception& e)
+    {
+        std::cerr << "Failed to read '" << pathStr << "':" << std::endl << e.what() << std::endl;
+    }
+    return true;
+}
+
 /// Check all the nif files in a given VFS::Archive
 /// \note Can not read a bsa file inside of a bsa file.
-void readVFS(std::unique_ptr<VFS::Archive>&& anArchive, const std::filesystem::path& archivePath = {})
+void readVFS(std::unique_ptr<VFS::Archive>&& archive, const std::filesystem::path& archivePath, bool quiet)
 {
-    if (anArchive == nullptr)
+    if (archive == nullptr)
         return;
 
-    VFS::Manager myManager;
-    myManager.addArchive(std::move(anArchive));
-    myManager.buildIndex();
+    if (!quiet)
+        std::cout << "Reading data source '" << Files::pathToUnicodeString(archivePath) << "'" << std::endl;
 
-    for (const auto& name : myManager.getRecursiveDirectoryIterator(""))
+    VFS::Manager vfs;
+    vfs.addArchive(std::move(archive));
+    vfs.buildIndex();
+
+    for (const auto& name : vfs.getRecursiveDirectoryIterator())
     {
-        try
+        readFile(archivePath, name.value(), &vfs, quiet);
+    }
+
+    if (!archivePath.empty() && !isBSA(archivePath))
+    {
+        const Files::Collections fileCollections({ archivePath });
+        const Files::MultiDirCollection& bsaCol = fileCollections.getCollection(".bsa");
+        const Files::MultiDirCollection& ba2Col = fileCollections.getCollection(".ba2");
+        for (const Files::MultiDirCollection& collection : { bsaCol, ba2Col })
         {
-            if (isNIF(name))
+            for (auto& file : collection)
             {
-                //           std::cout << "Decoding: " << name << std::endl;
-                Nif::NIFFile file(archivePath / name);
-                Nif::Reader reader(file);
-                reader.parse(myManager.get(name));
-            }
-            else if (isBSA(name))
-            {
-                if (!archivePath.empty() && !isBSA(archivePath))
+                try
                 {
-                    //                     std::cout << "Reading BSA File: " << name << std::endl;
-                    readVFS(makeBsaArchive(archivePath / name), archivePath / name);
-                    //                     std::cout << "Done with BSA File: " << name << std::endl;
+                    readVFS(VFS::makeBsaArchive(file.second), file.second, quiet);
+                }
+                catch (const std::exception& e)
+                {
+                    std::cerr << "Failed to read archive file '" << Files::pathToUnicodeString(file.second)
+                              << "': " << e.what() << std::endl;
                 }
             }
         }
-        catch (std::exception& e)
-        {
-            std::cerr << "ERROR, an exception has occurred:  " << e.what() << std::endl;
-        }
     }
 }
 
-bool parseOptions(int argc, char** argv, std::vector<Files::MaybeQuotedPath>& files, bool& writeDebugLog,
-    std::vector<Files::MaybeQuotedPath>& archives)
+bool parseOptions(int argc, char** argv, Files::PathContainer& files, Files::PathContainer& archives,
+    bool& writeDebugLog, bool& quiet)
 {
-    bpo::options_description desc(R"(Ensure that OpenMW can use the provided NIF and BSA files
+    bpo::options_description desc(
+        R"(Ensure that OpenMW can use the provided NIF, KF, BTO/BTR, RDT, PSA, BGEM/BGSM and BSA/BA2 files
 
 Usages:
-  niftool <nif files, BSA files, or directories>
-      Scan the file or directories for nif errors.
+  niftest <nif files, kf files, bto/btr files, rdt files, psa files, bgem/bgsm files, BSA/BA2 files, or directories>
+      Scan the file or directories for NIF errors.
 
 Allowed options)");
     auto addOption = desc.add_options();
     addOption("help,h", "print help message.");
     addOption("write-debug-log,v", "write debug log for unsupported nif files");
+    addOption("quiet,q", "do not log read archives/files");
     addOption("archives", bpo::value<Files::MaybeQuotedPathContainer>(), "path to archive files to provide files");
     addOption("input-file", bpo::value<Files::MaybeQuotedPathContainer>(), "input file");
 
@@ -143,17 +244,18 @@ Allowed options)");
             return false;
         }
         writeDebugLog = variables.count("write-debug-log") > 0;
+        quiet = variables.count("quiet") > 0;
         if (variables.count("input-file"))
         {
-            files = variables["input-file"].as<Files::MaybeQuotedPathContainer>();
+            files = asPathContainer(variables["input-file"].as<Files::MaybeQuotedPathContainer>());
             if (const auto it = variables.find("archives"); it != variables.end())
-                archives = it->second.as<Files::MaybeQuotedPathContainer>();
+                archives = asPathContainer(it->second.as<Files::MaybeQuotedPathContainer>());
             return true;
         }
     }
     catch (std::exception& e)
     {
-        std::cout << "ERROR parsing arguments: " << e.what() << "\n\n" << desc << std::endl;
+        std::cout << "Error parsing arguments: " << e.what() << "\n\n" << desc << std::endl;
         return false;
     }
 
@@ -164,64 +266,63 @@ Allowed options)");
 
 int main(int argc, char** argv)
 {
-    std::vector<Files::MaybeQuotedPath> files;
+    Files::PathContainer files, sources;
     bool writeDebugLog = false;
-    std::vector<Files::MaybeQuotedPath> archives;
-    if (!parseOptions(argc, argv, files, writeDebugLog, archives))
+    bool quiet = false;
+    if (!parseOptions(argc, argv, files, sources, writeDebugLog, quiet))
         return 1;
 
     Nif::Reader::setLoadUnsupportedFiles(true);
     Nif::Reader::setWriteNifDebugLog(writeDebugLog);
 
     std::unique_ptr<VFS::Manager> vfs;
-    if (!archives.empty())
+    if (!sources.empty())
     {
         vfs = std::make_unique<VFS::Manager>();
-        for (const std::filesystem::path& path : archives)
+        for (const std::filesystem::path& path : sources)
         {
+            const std::string pathStr = Files::pathToUnicodeString(path);
+            if (!quiet)
+                std::cout << "Adding data source '" << pathStr << "'" << std::endl;
+
             try
             {
                 if (auto archive = makeArchive(path))
                     vfs->addArchive(std::move(archive));
                 else
-                    std::cerr << '"' << path << "\" is unsupported archive" << std::endl;
-                vfs->buildIndex();
+                    std::cerr << "Error: '" << pathStr << "' is not an archive or directory" << std::endl;
             }
             catch (std::exception& e)
             {
-                std::cerr << "ERROR, an exception has occurred:  " << e.what() << std::endl;
+                std::cerr << "Failed to add data source '" << pathStr << "':  " << e.what() << std::endl;
             }
         }
+
+        vfs->buildIndex();
     }
 
-    //     std::cout << "Reading Files" << std::endl;
     for (const auto& path : files)
     {
+        const std::string pathStr = Files::pathToUnicodeString(path);
         try
         {
-            if (isNIF(path))
+            const bool isFile = readFile({}, path, vfs.get(), quiet);
+            if (!isFile)
             {
-                // std::cout << "Decoding: " << name << std::endl;
-                Nif::NIFFile file(path);
-                Nif::Reader reader(file);
-                if (vfs != nullptr)
-                    reader.parse(vfs->get(Files::pathToUnicodeString(path)));
+                if (auto archive = makeArchive(path))
+                {
+                    readVFS(std::move(archive), path, quiet);
+                }
                 else
-                    reader.parse(Files::openConstrainedFileStream(path));
-            }
-            else if (auto archive = makeArchive(path))
-            {
-                readVFS(std::move(archive), path);
-            }
-            else
-            {
-                std::cerr << "ERROR:  \"" << Files::pathToUnicodeString(path)
-                          << "\" is not a nif file, bsa file, or directory!" << std::endl;
+                {
+                    std::cerr << "Error: '" << pathStr << "' is not a NIF file, material file, archive, or directory"
+                              << std::endl;
+                }
             }
         }
         catch (std::exception& e)
         {
-            std::cerr << "ERROR, an exception has occurred:  " << e.what() << std::endl;
+            std::cerr << "Failed to read '" << pathStr << "':  " << e.what() << std::endl;
         }
     }
     return 0;
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 20bd62d145..a131c56358 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -1,5 +1,4 @@
 set (OPENCS_SRC
-    ${CMAKE_SOURCE_DIR}/files/windows/opencs.rc
     )
 
 opencs_units (. editor)
@@ -9,7 +8,7 @@ opencs_units (model/doc
     )
 
 opencs_units (model/doc
-    savingstate savingstages blacklist messages
+    savingstate savingstages messages
     )
 
 opencs_hdrs (model/doc
@@ -26,12 +25,12 @@ opencs_units (model/world
 opencs_units (model/world
     universalid record commands columnbase columnimp scriptcontext cell refidcollection
     refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager scope
-    pathgrid landtexture land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
+    pathgrid land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
     idcompletionmanager metadata defaultgmsts infoselectwrapper commandmacro
     )
 
 opencs_hdrs (model/world
-    columnimp idcollection collection info subcellcollection
+    columnimp disabletag idcollection collection info subcellcollection
     )
 
 
@@ -43,7 +42,7 @@ opencs_units (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
     startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck magiceffectcheck
-    mergestages gmstcheck topicinfocheck journalcheck enchantmentcheck
+    mergestages gmstcheck topicinfocheck journalcheck enchantmentcheck effectlistcheck
     )
 
 opencs_hdrs (model/tools
@@ -71,7 +70,7 @@ opencs_units (view/world
     cellcreator pathgridcreator referenceablecreator startscriptcreator referencecreator scenesubview
     infocreator scriptedit dialoguesubview previewsubview regionmap dragrecordtable nestedtable
     dialoguespinbox recordbuttonbar tableeditidaction scripterrortable extendedcommandconfigurator
-    bodypartcreator landtexturecreator landcreator tableheadermouseeventhandler
+    bodypartcreator landcreator tableheadermouseeventhandler
     )
 
 opencs_units (view/world
@@ -116,7 +115,7 @@ opencs_units (view/prefs
 
 opencs_units (model/prefs
     state setting intsetting doublesetting boolsetting enumsetting coloursetting shortcut
-    shortcuteventhandler shortcutmanager shortcutsetting modifiersetting stringsetting
+    shortcuteventhandler shortcutmanager shortcutsetting modifiersetting stringsetting subcategory
     )
 
 opencs_units (model/prefs
@@ -138,27 +137,18 @@ set (OPENCS_RES ${CMAKE_SOURCE_DIR}/files/opencs/resources.qrc
                 ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc
     )
 
-set (OPENCS_UI
-    ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/filedialog.ui
-    )
-
 source_group (openmw-cs FILES main.cpp ${OPENCS_SRC} ${OPENCS_HDR})
 
 if(WIN32)
+    set(OPENCS_RES ${OPENCS_RES} ${CMAKE_SOURCE_DIR}/files/windows/QWindowsVistaDark/dark.qrc)
     set(QT_USE_QTMAIN TRUE)
+    set(OPENCS_RC_FILE ${CMAKE_SOURCE_DIR}/files/windows/opencs.rc)
+else(WIN32)
+    set(OPENCS_RC_FILE "")
 endif(WIN32)
 
-if (QT_VERSION_MAJOR VERSION_EQUAL 5)
-    qt5_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
-else ()
-    qt6_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
-endif()
 qt_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
 
-# for compiled .ui files
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 if(APPLE)
     set (OPENCS_MAC_ICON "${CMAKE_SOURCE_DIR}/files/mac/openmw-cs.icns")
     set (OPENCS_CFG "${OpenMW_BINARY_DIR}/defaults-cs.bin")
@@ -171,15 +161,13 @@ else()
     set (OPENCS_OPENMW_CFG "")
 endif(APPLE)
 
-add_library(openmw-cs-lib
+add_library(openmw-cs-lib STATIC
     ${OPENCS_SRC}
     ${OPENCS_UI_HDR}
     ${OPENCS_MOC_SRC}
     ${OPENCS_RES_SRC}
 )
 
-set_target_properties(openmw-cs-lib PROPERTIES OUTPUT_NAME openmw-cs)
-
 if(BUILD_OPENCS)
     openmw_add_executable(openmw-cs
         MACOSX_BUNDLE
@@ -187,14 +175,19 @@ if(BUILD_OPENCS)
         ${OPENCS_CFG}
         ${OPENCS_DEFAULT_FILTERS_FILE}
         ${OPENCS_OPENMW_CFG}
+        ${OPENCS_RC_FILE}
         main.cpp
     )
 
     target_link_libraries(openmw-cs openmw-cs-lib)
 
+    set_property(TARGET openmw-cs PROPERTY AUTOMOC ON)
+    set_property(TARGET openmw-cs PROPERTY AUTOUIC_SEARCH_PATHS ui)
+    set_property(TARGET openmw-cs PROPERTY AUTOUIC ON)
+
     if (BUILD_WITH_CODE_COVERAGE)
-        target_compile_options(openmw-cs-lib PRIVATE --coverage)
-        target_link_libraries(openmw-cs-lib gcov)
+        target_compile_options(openmw-cs PRIVATE --coverage)
+        target_link_libraries(openmw-cs gcov)
     endif()
 endif()
 
@@ -243,18 +236,18 @@ target_link_libraries(openmw-cs-lib
     ${OSGTEXT_LIBRARIES}
     ${OSG_LIBRARIES}
     ${EXTERN_OSGQT_LIBRARY}
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    Boost::program_options
     components_qt
 )
 
 if (QT_VERSION_MAJOR VERSION_EQUAL 6)
-    target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL Qt::OpenGLWidgets)
+    target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL Qt::OpenGLWidgets Qt::Svg)
 else()
-    target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL)
+    target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL Qt::Svg)
 endif()
 
 if (WIN32)
-    target_link_libraries(openmw-cs-lib ${Boost_LOCALE_LIBRARY})
+    target_sources(openmw-cs PRIVATE ${CMAKE_SOURCE_DIR}/files/windows/openmw-cs.exe.manifest)
 endif()
 
 if (WIN32 AND BUILD_OPENCS)
@@ -283,6 +276,8 @@ endif()
 
 if(USE_QT)
     set_property(TARGET openmw-cs-lib PROPERTY AUTOMOC ON)
+    set_property(TARGET openmw-cs-lib PROPERTY AUTOUIC_SEARCH_PATHS ui)
+    set_property(TARGET openmw-cs-lib PROPERTY AUTOUIC ON)
 endif(USE_QT)
 
 if (BUILD_WITH_CODE_COVERAGE)
@@ -290,7 +285,7 @@ if (BUILD_WITH_CODE_COVERAGE)
     target_link_libraries(openmw-cs-lib gcov)
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw-cs-lib PRIVATE
         <boost/program_options/options_description.hpp>
 
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 416d059735..4cab88e5f2 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -21,7 +21,7 @@
 #include <apps/opencs/view/tools/merge.hpp>
 
 #ifdef _WIN32
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 #endif
 
 #include <components/debug/debugging.hpp>
@@ -119,8 +119,6 @@ boost::program_options::variables_map CS::Editor::readConfiguration()
         boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(
             Files::MaybeQuotedPathContainer::value_type(), ""));
     addOption("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
-    addOption("resources",
-        boost::program_options::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"));
     addOption("fallback-archive",
         boost::program_options::value<std::vector<std::string>>()
             ->default_value(std::vector<std::string>(), "fallback-archive")
@@ -128,20 +126,13 @@ boost::program_options::variables_map CS::Editor::readConfiguration()
     addOption("fallback",
         boost::program_options::value<FallbackMap>()->default_value(FallbackMap(), "")->multitoken()->composing(),
         "fallback values");
-    addOption("script-blacklist",
-        boost::program_options::value<std::vector<std::string>>()
-            ->default_value(std::vector<std::string>(), "")
-            ->multitoken(),
-        "exclude specified script from the verifier (if the use of the blacklist is enabled)");
-    addOption("script-blacklist-use", boost::program_options::value<bool>()->implicit_value(true)->default_value(true),
-        "enable script blacklisting");
     Files::ConfigurationManager::addCommonOptions(desc);
 
     boost::program_options::notify(variables);
 
     mCfgMgr.readConfiguration(variables, desc, false);
     Settings::Manager::load(mCfgMgr, true);
-    setupLogging(mCfgMgr.getLogPath(), "OpenMW-CS");
+    Debug::setupLogging(mCfgMgr.getLogPath(), "OpenMW-CS");
 
     return variables;
 }
@@ -161,9 +152,6 @@ std::pair<Files::PathContainer, std::vector<std::string>> CS::Editor::readConfig
                                                      .u8string()); // This call to u8string is redundant, but required
                                                                    // to build on MSVC 14.26 due to implementation bugs.
 
-    if (variables["script-blacklist-use"].as<bool>())
-        mDocumentManager.setBlacklistedScripts(variables["script-blacklist"].as<std::vector<std::string>>());
-
     Files::PathContainer dataDirs, dataLocal;
     if (!variables["data"].empty())
     {
@@ -200,6 +188,8 @@ std::pair<Files::PathContainer, std::vector<std::string>> CS::Editor::readConfig
 
     dataDirs.insert(dataDirs.end(), dataLocal.begin(), dataLocal.end());
 
+    dataDirs.insert(dataDirs.begin(), mResources / "vfs");
+
     // iterate the data directories and add them to the file dialog for loading
     mFileDialog.addFiles(dataDirs);
 
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index ecab9614a1..f2e2156865 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -3,17 +3,17 @@
 #include <exception>
 #include <string>
 
-#include <QApplication>
 #include <QIcon>
 #include <QSurfaceFormat>
 
 #include <osg/DisplaySettings>
 
 #include <components/debug/debugging.hpp>
-#include <components/debug/debuglog.hpp>
+#include <components/platform/application.hpp>
 #include <components/platform/platform.hpp>
 
 #include "model/doc/messages.hpp"
+#include "model/world/disabletag.hpp"
 #include "model/world/universalid.hpp"
 
 #ifdef Q_OS_MAC
@@ -25,30 +25,6 @@ Q_DECLARE_METATYPE(std::string)
 class QEvent;
 class QObject;
 
-class Application : public QApplication
-{
-private:
-    bool notify(QObject* receiver, QEvent* event) override
-    {
-        try
-        {
-            return QApplication::notify(receiver, event);
-        }
-        catch (const std::exception& exception)
-        {
-            Log(Debug::Error) << "An exception has been caught: " << exception.what();
-        }
-
-        return false;
-    }
-
-public:
-    Application(int& argc, char* argv[])
-        : QApplication(argc, argv)
-    {
-    }
-};
-
 void setQSurfaceFormat()
 {
     osg::DisplaySettings* ds = osg::DisplaySettings::instance().get();
@@ -72,21 +48,21 @@ int runApplication(int argc, char* argv[])
 
     Q_INIT_RESOURCE(resources);
 
+#ifdef WIN32
+    Q_INIT_RESOURCE(dark);
+#endif
+
     qRegisterMetaType<std::string>("std::string");
     qRegisterMetaType<CSMWorld::UniversalId>("CSMWorld::UniversalId");
+    qRegisterMetaType<CSMWorld::DisableTag>("CSMWorld::DisableTag");
     qRegisterMetaType<CSMDoc::Message>("CSMDoc::Message");
 
     setQSurfaceFormat();
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
 
-    Application application(argc, argv);
+    Platform::Application application(argc, argv);
 
-#ifdef Q_OS_MAC
-    QDir dir(QCoreApplication::applicationDirPath());
-    QDir::setCurrent(dir.absolutePath());
-#endif
-
-    application.setWindowIcon(QIcon(":./openmw-cs.png"));
+    application.setWindowIcon(QIcon(":openmw-cs"));
 
     CS::Editor editor(argc, argv);
 #ifdef __linux__
@@ -104,5 +80,5 @@ int runApplication(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    return wrapApplication(&runApplication, argc, argv, "OpenMW-CS");
+    return Debug::wrapApplication(&runApplication, argc, argv, "OpenMW-CS");
 }
diff --git a/apps/opencs/model/doc/blacklist.cpp b/apps/opencs/model/doc/blacklist.cpp
deleted file mode 100644
index 9b422cb751..0000000000
--- a/apps/opencs/model/doc/blacklist.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "blacklist.hpp"
-
-#include <algorithm>
-#include <stddef.h>
-#include <utility>
-
-#include <apps/opencs/model/world/universalid.hpp>
-
-#include <components/misc/strings/lower.hpp>
-
-bool CSMDoc::Blacklist::isBlacklisted(const CSMWorld::UniversalId& id) const
-{
-    std::map<CSMWorld::UniversalId::Type, std::vector<std::string>>::const_iterator iter = mIds.find(id.getType());
-
-    if (iter == mIds.end())
-        return false;
-
-    return std::binary_search(iter->second.begin(), iter->second.end(), Misc::StringUtils::lowerCase(id.getId()));
-}
-
-void CSMDoc::Blacklist::add(CSMWorld::UniversalId::Type type, const std::vector<std::string>& ids)
-{
-    std::vector<std::string>& list = mIds[type];
-
-    size_t size = list.size();
-
-    list.resize(size + ids.size());
-
-    std::transform(ids.begin(), ids.end(), list.begin() + size,
-        [](const std::string& s) { return Misc::StringUtils::lowerCase(s); });
-    std::sort(list.begin(), list.end());
-}
diff --git a/apps/opencs/model/doc/blacklist.hpp b/apps/opencs/model/doc/blacklist.hpp
deleted file mode 100644
index e565aa252b..0000000000
--- a/apps/opencs/model/doc/blacklist.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CSM_DOC_BLACKLIST_H
-#define CSM_DOC_BLACKLIST_H
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "../world/universalid.hpp"
-
-namespace CSMDoc
-{
-    /// \brief ID blacklist sorted by UniversalId type
-    class Blacklist
-    {
-        std::map<CSMWorld::UniversalId::Type, std::vector<std::string>> mIds;
-
-    public:
-        bool isBlacklisted(const CSMWorld::UniversalId& id) const;
-
-        void add(CSMWorld::UniversalId::Type type, const std::vector<std::string>& ids);
-    };
-}
-
-#endif
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index f604608c7b..21e5ab306b 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2,7 +2,6 @@
 
 #include "state.hpp"
 
-#include <apps/opencs/model/doc/blacklist.hpp>
 #include <apps/opencs/model/doc/messages.hpp>
 #include <apps/opencs/model/doc/operationholder.hpp>
 #include <apps/opencs/model/doc/runner.hpp>
@@ -295,8 +294,7 @@ void CSMDoc::Document::createBase()
 
 CSMDoc::Document::Document(const Files::ConfigurationManager& configuration, std::vector<std::filesystem::path> files,
     bool new_, const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding,
-    const std::vector<std::string>& blacklistedScripts, const Files::PathContainer& dataPaths,
-    const std::vector<std::string>& archives)
+    const Files::PathContainer& dataPaths, const std::vector<std::string>& archives)
     : mSavePath(savePath)
     , mContentFiles(std::move(files))
     , mNew(new_)
@@ -339,8 +337,6 @@ CSMDoc::Document::Document(const Files::ConfigurationManager& configuration, std
             createBase();
     }
 
-    mBlacklist.add(CSMWorld::UniversalId::Type_Script, blacklistedScripts);
-
     addOptionalGmsts();
     addOptionalGlobals();
     addOptionalMagicEffects();
@@ -485,11 +481,6 @@ CSMTools::ReportModel* CSMDoc::Document::getReport(const CSMWorld::UniversalId&
     return mTools.getReport(id);
 }
 
-bool CSMDoc::Document::isBlacklisted(const CSMWorld::UniversalId& id) const
-{
-    return mBlacklist.isBlacklisted(id);
-}
-
 void CSMDoc::Document::startRunning(const std::string& profile, const std::string& startupInstruction)
 {
     std::vector<std::filesystem::path> contentFiles;
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index 4acdfafa41..60516cdc8c 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -19,7 +19,6 @@
 
 #include "../tools/tools.hpp"
 
-#include "blacklist.hpp"
 #include "operationholder.hpp"
 #include "runner.hpp"
 #include "saving.hpp"
@@ -61,7 +60,6 @@ namespace CSMDoc
         Saving mSavingOperation;
         OperationHolder mSaving;
         std::filesystem::path mResDir;
-        Blacklist mBlacklist;
         Runner mRunner;
         bool mDirty;
 
@@ -95,8 +93,7 @@ namespace CSMDoc
     public:
         Document(const Files::ConfigurationManager& configuration, std::vector<std::filesystem::path> files, bool new_,
             const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding,
-            const std::vector<std::string>& blacklistedScripts, const Files::PathContainer& dataPaths,
-            const std::vector<std::string>& archives);
+            const Files::PathContainer& dataPaths, const std::vector<std::string>& archives);
 
         ~Document() override = default;
 
@@ -136,8 +133,6 @@ namespace CSMDoc
         CSMTools::ReportModel* getReport(const CSMWorld::UniversalId& id);
         ///< The ownership of the returned report is not transferred.
 
-        bool isBlacklisted(const CSMWorld::UniversalId& id) const;
-
         void startRunning(const std::string& profile, const std::string& startupInstruction = "");
 
         void stopRunning();
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index 4052c8a789..72c315b004 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -61,8 +61,7 @@ void CSMDoc::DocumentManager::addDocument(
 CSMDoc::Document* CSMDoc::DocumentManager::makeDocument(
     const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_)
 {
-    return new Document(
-        mConfiguration, files, new_, savePath, mResDir, mEncoding, mBlacklistedScripts, mDataPaths, mArchives);
+    return new Document(mConfiguration, files, new_, savePath, mResDir, mEncoding, mDataPaths, mArchives);
 }
 
 void CSMDoc::DocumentManager::insertDocument(CSMDoc::Document* document)
@@ -102,11 +101,6 @@ void CSMDoc::DocumentManager::setEncoding(ToUTF8::FromType encoding)
     mEncoding = encoding;
 }
 
-void CSMDoc::DocumentManager::setBlacklistedScripts(const std::vector<std::string>& scriptIds)
-{
-    mBlacklistedScripts = scriptIds;
-}
-
 void CSMDoc::DocumentManager::documentLoaded(Document* document)
 {
     emit documentAdded(document);
diff --git a/apps/opencs/model/doc/documentmanager.hpp b/apps/opencs/model/doc/documentmanager.hpp
index 25f7d1d4f0..2c9ee1e98e 100644
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@@ -31,7 +31,6 @@ namespace CSMDoc
         QThread mLoaderThread;
         Loader mLoader;
         ToUTF8::FromType mEncoding;
-        std::vector<std::string> mBlacklistedScripts;
 
         std::filesystem::path mResDir;
 
@@ -64,8 +63,6 @@ namespace CSMDoc
 
         void setEncoding(ToUTF8::FromType encoding);
 
-        void setBlacklistedScripts(const std::vector<std::string>& scriptIds);
-
         /// Sets the file data that gets passed to newly created documents.
         void setFileData(const Files::PathContainer& dataPaths, const std::vector<std::string>& archives);
 
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 46dea447fe..5be733e0d1 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -17,13 +17,6 @@
 
 #include "document.hpp"
 
-CSMDoc::Loader::Stage::Stage()
-    : mFile(0)
-    , mRecordsLoaded(0)
-    , mRecordsLeft(false)
-{
-}
-
 CSMDoc::Loader::Loader()
     : mShouldStop(false)
 {
@@ -105,7 +98,7 @@ void CSMDoc::Loader::load()
 
         if (iter->second.mFile < size) // start loading the files
         {
-            std::filesystem::path path = document->getContentFiles()[iter->second.mFile];
+            const std::filesystem::path& path = document->getContentFiles()[iter->second.mFile];
 
             int steps = document->getData().startLoading(path, iter->second.mFile != editedIndex, /*project*/ false);
             iter->second.mRecordsLeft = true;
diff --git a/apps/opencs/model/doc/loader.hpp b/apps/opencs/model/doc/loader.hpp
index ccf493d19e..79b4524f4f 100644
--- a/apps/opencs/model/doc/loader.hpp
+++ b/apps/opencs/model/doc/loader.hpp
@@ -23,11 +23,9 @@ namespace CSMDoc
 
         struct Stage
         {
-            int mFile;
-            int mRecordsLoaded;
-            bool mRecordsLeft;
-
-            Stage();
+            int mFile = 0;
+            int mRecordsLoaded = 0;
+            bool mRecordsLeft = false;
         };
 
         QMutex mMutex;
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 0099cb2f94..d647d6b498 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -93,7 +93,6 @@ void CSMDoc::Runner::start(bool delayed)
         arguments << "--data=\"" + Files::pathToQString(mProjectPath.parent_path()) + "\"";
 
         arguments << "--replace=content";
-        arguments << "--content=builtin.omwscripts";
 
         for (const auto& mContentFile : mContentFiles)
         {
diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
index b2e4d4649a..868429f96c 100644
--- a/apps/opencs/model/doc/saving.cpp
+++ b/apps/opencs/model/doc/saving.cpp
@@ -25,6 +25,7 @@
 #include <components/esm3/loadsoun.hpp>
 #include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadsscr.hpp>
+#include <components/esm3/selectiongroup.hpp>
 
 #include "../world/data.hpp"
 #include "../world/idcollection.hpp"
@@ -52,6 +53,9 @@ CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectP
     appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::Script>>(
         mDocument.getData().getScripts(), mState, CSMWorld::Scope_Project));
 
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::SelectionGroup>>(
+        mDocument.getData().getSelectionGroups(), mState, CSMWorld::Scope_Project));
+
     appendStage(new CloseSaveStage(mState));
 
     // save content file
@@ -93,9 +97,6 @@ CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectP
     appendStage(
         new WriteCollectionStage<CSMWorld::IdCollection<ESM::BodyPart>>(mDocument.getData().getBodyParts(), mState));
 
-    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::SoundGenerator>>(
-        mDocument.getData().getSoundGens(), mState));
-
     appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::MagicEffect>>(
         mDocument.getData().getMagicEffects(), mState));
 
@@ -104,16 +105,21 @@ CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectP
 
     appendStage(new WriteRefIdCollectionStage(mDocument, mState));
 
+    // Can reference creatures so needs to load after them for TESCS compatibility
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::SoundGenerator>>(
+        mDocument.getData().getSoundGens(), mState));
+
     appendStage(new CollectionReferencesStage(mDocument, mState));
 
     appendStage(new WriteCellCollectionStage(mDocument, mState));
 
-    // Dialogue can reference objects and cells so must be written after these records for vanilla-compatible files
-
-    appendStage(new WriteDialogueCollectionStage(mDocument, mState, false));
+    // Dialogue can reference objects, cells, and journals so must be written after these records for vanilla-compatible
+    // files
 
     appendStage(new WriteDialogueCollectionStage(mDocument, mState, true));
 
+    appendStage(new WriteDialogueCollectionStage(mDocument, mState, false));
+
     appendStage(new WritePathgridCollectionStage(mDocument, mState));
 
     appendStage(new WriteLandTextureCollectionStage(mDocument, mState));
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 82135e0042..12fa6e811f 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -17,7 +17,6 @@
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/info.hpp>
 #include <apps/opencs/model/world/land.hpp>
-#include <apps/opencs/model/world/landtexture.hpp>
 #include <apps/opencs/model/world/metadata.hpp>
 #include <apps/opencs/model/world/pathgrid.hpp>
 #include <apps/opencs/model/world/record.hpp>
@@ -135,7 +134,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform(int stage, Messages& messages
     if (topic.mState == CSMWorld::RecordBase::State_Deleted)
     {
         // if the topic is deleted, we do not need to bother with INFO records.
-        ESM::Dialogue dialogue = topic.get();
+        const ESM::Dialogue& dialogue = topic.get();
         writer.startRecord(dialogue.sRecordId);
         dialogue.save(writer, true);
         writer.endRecord(dialogue.sRecordId);
@@ -187,6 +186,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform(int stage, Messages& messages
                 {
                     ESM::DialInfo info = record.get();
                     info.mId = record.get().mOriginalId;
+                    info.mData.mType = topic.get().mType;
 
                     if (iter == infos.begin())
                         info.mPrev = ESM::RefId();
@@ -304,9 +304,8 @@ void CSMDoc::WriteCellCollectionStage::writeReferences(
         {
             CSMWorld::CellRef refRecord = ref.get();
 
-            // Check for uninitialized content file
-            if (!refRecord.mRefNum.hasContentFile())
-                refRecord.mRefNum.mContentFile = 0;
+            // -1 is the current file, saved indices are 1-based
+            refRecord.mRefNum.mContentFile++;
 
             // recalculate the ref's cell location
             std::ostringstream stream;
@@ -498,11 +497,11 @@ int CSMDoc::WriteLandTextureCollectionStage::setup()
 void CSMDoc::WriteLandTextureCollectionStage::perform(int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::LandTexture>& landTexture = mDocument.getData().getLandTextures().getRecord(stage);
+    const CSMWorld::Record<ESM::LandTexture>& landTexture = mDocument.getData().getLandTextures().getRecord(stage);
 
     if (landTexture.isModified() || landTexture.mState == CSMWorld::RecordBase::State_Deleted)
     {
-        CSMWorld::LandTexture record = landTexture.get();
+        ESM::LandTexture record = landTexture.get();
         writer.startRecord(record.sRecordId);
         record.save(writer, landTexture.mState == CSMWorld::RecordBase::State_Deleted);
         writer.endRecord(record.sRecordId);
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index 5443db2854..6248b03bb4 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -452,7 +452,10 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
         return std::shared_ptr<Node>();
     }
 
-    return std::make_shared<TextNode>(columnId, text);
+    auto node = std::make_shared<TextNode>(columnId, text);
+    if (!node->isValid())
+        error();
+    return node;
 }
 
 std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
@@ -624,7 +627,7 @@ bool CSMFilter::Parser::parse(const std::string& filter, bool allowPredefined)
         }
 
         if (node)
-            mFilter = node;
+            mFilter = std::move(node);
         else
         {
             // Empty filter string equals to filter "true".
diff --git a/apps/opencs/model/filter/textnode.hpp b/apps/opencs/model/filter/textnode.hpp
index 14efa0a3a0..d629cbe336 100644
--- a/apps/opencs/model/filter/textnode.hpp
+++ b/apps/opencs/model/filter/textnode.hpp
@@ -34,6 +34,8 @@ namespace CSMFilter
         ///< Return a string that represents this node.
         ///
         /// \param numericColumns Use numeric IDs instead of string to represent columns.
+
+        bool isValid() { return mRegExp.isValid(); }
     };
 }
 
diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp
index c668bc0af4..44262e2012 100644
--- a/apps/opencs/model/prefs/boolsetting.cpp
+++ b/apps/opencs/model/prefs/boolsetting.cpp
@@ -11,9 +11,8 @@
 #include "state.hpp"
 
 CSMPrefs::BoolSetting::BoolSetting(
-    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, bool default_)
-    : Setting(parent, mutex, key, label)
-    , mDefault(default_)
+    Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
+    : TypedSetting(parent, mutex, key, label, index)
     , mWidget(nullptr)
 {
 }
@@ -24,10 +23,10 @@ CSMPrefs::BoolSetting& CSMPrefs::BoolSetting::setTooltip(const std::string& tool
     return *this;
 }
 
-std::pair<QWidget*, QWidget*> CSMPrefs::BoolSetting::makeWidgets(QWidget* parent)
+CSMPrefs::SettingWidgets CSMPrefs::BoolSetting::makeWidgets(QWidget* parent)
 {
-    mWidget = new QCheckBox(QString::fromUtf8(getLabel().c_str()), parent);
-    mWidget->setCheckState(mDefault ? Qt::Checked : Qt::Unchecked);
+    mWidget = new QCheckBox(getLabel(), parent);
+    mWidget->setCheckState(getValue() ? Qt::Checked : Qt::Unchecked);
 
     if (!mTooltip.empty())
     {
@@ -37,24 +36,19 @@ std::pair<QWidget*, QWidget*> CSMPrefs::BoolSetting::makeWidgets(QWidget* parent
 
     connect(mWidget, &QCheckBox::stateChanged, this, &BoolSetting::valueChanged);
 
-    return std::make_pair(static_cast<QWidget*>(nullptr), mWidget);
+    return SettingWidgets{ .mLabel = nullptr, .mInput = mWidget };
 }
 
 void CSMPrefs::BoolSetting::updateWidget()
 {
     if (mWidget)
     {
-        mWidget->setCheckState(
-            Settings::Manager::getBool(getKey(), getParent()->getKey()) ? Qt::Checked : Qt::Unchecked);
+        mWidget->setCheckState(getValue() ? Qt::Checked : Qt::Unchecked);
     }
 }
 
 void CSMPrefs::BoolSetting::valueChanged(int value)
 {
-    {
-        QMutexLocker lock(getMutex());
-        Settings::Manager::setBool(getKey(), getParent()->getKey(), value);
-    }
-
+    setValue(value != Qt::Unchecked);
     getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/boolsetting.hpp b/apps/opencs/model/prefs/boolsetting.hpp
index e75ea1a346..edabf85058 100644
--- a/apps/opencs/model/prefs/boolsetting.hpp
+++ b/apps/opencs/model/prefs/boolsetting.hpp
@@ -12,21 +12,21 @@ namespace CSMPrefs
 {
     class Category;
 
-    class BoolSetting : public Setting
+    class BoolSetting final : public TypedSetting<bool>
     {
         Q_OBJECT
 
         std::string mTooltip;
-        bool mDefault;
         QCheckBox* mWidget;
 
     public:
-        BoolSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label, bool default_);
+        explicit BoolSetting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
         BoolSetting& setTooltip(const std::string& tooltip);
 
         /// Return label, input widget.
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/category.cpp b/apps/opencs/model/prefs/category.cpp
index 5a82be08fc..3ae4826953 100644
--- a/apps/opencs/model/prefs/category.cpp
+++ b/apps/opencs/model/prefs/category.cpp
@@ -5,6 +5,7 @@
 
 #include "setting.hpp"
 #include "state.hpp"
+#include "subcategory.hpp"
 
 CSMPrefs::Category::Category(State* parent, const std::string& key)
     : mParent(parent)
@@ -23,6 +24,14 @@ CSMPrefs::State* CSMPrefs::Category::getState() const
 }
 
 void CSMPrefs::Category::addSetting(Setting* setting)
+{
+    if (!mIndex.emplace(setting->getKey(), setting).second)
+        throw std::logic_error("Category " + mKey + " already has setting: " + setting->getKey());
+
+    mSettings.push_back(setting);
+}
+
+void CSMPrefs::Category::addSubcategory(Subcategory* setting)
 {
     mSettings.push_back(setting);
 }
@@ -39,11 +48,12 @@ CSMPrefs::Category::Iterator CSMPrefs::Category::end()
 
 CSMPrefs::Setting& CSMPrefs::Category::operator[](const std::string& key)
 {
-    for (Iterator iter = mSettings.begin(); iter != mSettings.end(); ++iter)
-        if ((*iter)->getKey() == key)
-            return **iter;
+    const auto it = mIndex.find(key);
 
-    throw std::logic_error("Invalid user setting: " + key);
+    if (it != mIndex.end())
+        return *it->second;
+
+    throw std::logic_error("Invalid user setting in " + mKey + " category: " + key);
 }
 
 void CSMPrefs::Category::update()
diff --git a/apps/opencs/model/prefs/category.hpp b/apps/opencs/model/prefs/category.hpp
index 5c75f99067..ef67c82138 100644
--- a/apps/opencs/model/prefs/category.hpp
+++ b/apps/opencs/model/prefs/category.hpp
@@ -3,12 +3,14 @@
 
 #include <algorithm>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 namespace CSMPrefs
 {
     class State;
     class Setting;
+    class Subcategory;
 
     class Category
     {
@@ -20,6 +22,7 @@ namespace CSMPrefs
         State* mParent;
         std::string mKey;
         Container mSettings;
+        std::unordered_map<std::string, Setting*> mIndex;
 
     public:
         Category(State* parent, const std::string& key);
@@ -30,6 +33,8 @@ namespace CSMPrefs
 
         void addSetting(Setting* setting);
 
+        void addSubcategory(Subcategory* setting);
+
         Iterator begin();
 
         Iterator end();
diff --git a/apps/opencs/model/prefs/coloursetting.cpp b/apps/opencs/model/prefs/coloursetting.cpp
index 86f3a5d772..10ca9d7f68 100644
--- a/apps/opencs/model/prefs/coloursetting.cpp
+++ b/apps/opencs/model/prefs/coloursetting.cpp
@@ -14,9 +14,8 @@
 #include "state.hpp"
 
 CSMPrefs::ColourSetting::ColourSetting(
-    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, QColor default_)
-    : Setting(parent, mutex, key, label)
-    , mDefault(std::move(default_))
+    Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
+    : TypedSetting(parent, mutex, key, label, index)
     , mWidget(nullptr)
 {
 }
@@ -27,11 +26,11 @@ CSMPrefs::ColourSetting& CSMPrefs::ColourSetting::setTooltip(const std::string&
     return *this;
 }
 
-std::pair<QWidget*, QWidget*> CSMPrefs::ColourSetting::makeWidgets(QWidget* parent)
+CSMPrefs::SettingWidgets CSMPrefs::ColourSetting::makeWidgets(QWidget* parent)
 {
-    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+    QLabel* label = new QLabel(getLabel(), parent);
 
-    mWidget = new CSVWidget::ColorEditor(mDefault, parent);
+    mWidget = new CSVWidget::ColorEditor(toColor(), parent);
 
     if (!mTooltip.empty())
     {
@@ -42,24 +41,18 @@ std::pair<QWidget*, QWidget*> CSMPrefs::ColourSetting::makeWidgets(QWidget* pare
 
     connect(mWidget, &CSVWidget::ColorEditor::pickingFinished, this, &ColourSetting::valueChanged);
 
-    return std::make_pair(label, mWidget);
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::ColourSetting::updateWidget()
 {
     if (mWidget)
-    {
-        mWidget->setColor(QString::fromStdString(Settings::Manager::getString(getKey(), getParent()->getKey())));
-    }
+        mWidget->setColor(toColor());
 }
 
 void CSMPrefs::ColourSetting::valueChanged()
 {
     CSVWidget::ColorEditor& widget = dynamic_cast<CSVWidget::ColorEditor&>(*sender());
-    {
-        QMutexLocker lock(getMutex());
-        Settings::Manager::setString(getKey(), getParent()->getKey(), widget.color().name().toUtf8().data());
-    }
-
+    setValue(widget.color().name().toStdString());
     getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/coloursetting.hpp b/apps/opencs/model/prefs/coloursetting.hpp
index 0c22d9cc5d..85e43f28bd 100644
--- a/apps/opencs/model/prefs/coloursetting.hpp
+++ b/apps/opencs/model/prefs/coloursetting.hpp
@@ -6,6 +6,7 @@
 #include <QColor>
 
 #include <string>
+#include <string_view>
 #include <utility>
 
 class QMutex;
@@ -20,22 +21,22 @@ namespace CSVWidget
 namespace CSMPrefs
 {
     class Category;
-    class ColourSetting : public Setting
+
+    class ColourSetting final : public TypedSetting<std::string>
     {
         Q_OBJECT
 
         std::string mTooltip;
-        QColor mDefault;
         CSVWidget::ColorEditor* mWidget;
 
     public:
-        ColourSetting(
-            Category* parent, QMutex* mutex, const std::string& key, const std::string& label, QColor default_);
+        explicit ColourSetting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
         ColourSetting& setTooltip(const std::string& tooltip);
 
         /// Return label, input widget.
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/doublesetting.cpp b/apps/opencs/model/prefs/doublesetting.cpp
index 7e3aadb0c3..bbe573f800 100644
--- a/apps/opencs/model/prefs/doublesetting.cpp
+++ b/apps/opencs/model/prefs/doublesetting.cpp
@@ -15,12 +15,11 @@
 #include "state.hpp"
 
 CSMPrefs::DoubleSetting::DoubleSetting(
-    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, double default_)
-    : Setting(parent, mutex, key, label)
+    Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
+    : TypedSetting(parent, mutex, key, label, index)
     , mPrecision(2)
     , mMin(0)
     , mMax(std::numeric_limits<double>::max())
-    , mDefault(default_)
     , mWidget(nullptr)
 {
 }
@@ -56,14 +55,14 @@ CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setTooltip(const std::string&
     return *this;
 }
 
-std::pair<QWidget*, QWidget*> CSMPrefs::DoubleSetting::makeWidgets(QWidget* parent)
+CSMPrefs::SettingWidgets CSMPrefs::DoubleSetting::makeWidgets(QWidget* parent)
 {
-    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+    QLabel* label = new QLabel(getLabel(), parent);
 
     mWidget = new QDoubleSpinBox(parent);
     mWidget->setDecimals(mPrecision);
     mWidget->setRange(mMin, mMax);
-    mWidget->setValue(mDefault);
+    mWidget->setValue(getValue());
 
     if (!mTooltip.empty())
     {
@@ -74,23 +73,17 @@ std::pair<QWidget*, QWidget*> CSMPrefs::DoubleSetting::makeWidgets(QWidget* pare
 
     connect(mWidget, qOverload<double>(&QDoubleSpinBox::valueChanged), this, &DoubleSetting::valueChanged);
 
-    return std::make_pair(label, mWidget);
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::DoubleSetting::updateWidget()
 {
     if (mWidget)
-    {
-        mWidget->setValue(Settings::Manager::getFloat(getKey(), getParent()->getKey()));
-    }
+        mWidget->setValue(getValue());
 }
 
 void CSMPrefs::DoubleSetting::valueChanged(double value)
 {
-    {
-        QMutexLocker lock(getMutex());
-        Settings::Manager::setFloat(getKey(), getParent()->getKey(), value);
-    }
-
+    setValue(value);
     getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/doublesetting.hpp b/apps/opencs/model/prefs/doublesetting.hpp
index c951d2a88c..856cebcb46 100644
--- a/apps/opencs/model/prefs/doublesetting.hpp
+++ b/apps/opencs/model/prefs/doublesetting.hpp
@@ -9,7 +9,7 @@ namespace CSMPrefs
 {
     class Category;
 
-    class DoubleSetting : public Setting
+    class DoubleSetting final : public TypedSetting<double>
     {
         Q_OBJECT
 
@@ -17,12 +17,11 @@ namespace CSMPrefs
         double mMin;
         double mMax;
         std::string mTooltip;
-        double mDefault;
         QDoubleSpinBox* mWidget;
 
     public:
-        DoubleSetting(
-            Category* parent, QMutex* mutex, const std::string& key, const std::string& label, double default_);
+        explicit DoubleSetting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
         DoubleSetting& setPrecision(int precision);
 
@@ -36,7 +35,7 @@ namespace CSMPrefs
         DoubleSetting& setTooltip(const std::string& tooltip);
 
         /// Return label, input widget.
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/enumsetting.cpp b/apps/opencs/model/prefs/enumsetting.cpp
index a3ac9bce2b..aaa4c28c61 100644
--- a/apps/opencs/model/prefs/enumsetting.cpp
+++ b/apps/opencs/model/prefs/enumsetting.cpp
@@ -15,39 +15,10 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::EnumValue::EnumValue(const std::string& value, const std::string& tooltip)
-    : mValue(value)
-    , mTooltip(tooltip)
-{
-}
-
-CSMPrefs::EnumValue::EnumValue(const char* value)
-    : mValue(value)
-{
-}
-
-CSMPrefs::EnumValues& CSMPrefs::EnumValues::add(const EnumValues& values)
-{
-    mValues.insert(mValues.end(), values.mValues.begin(), values.mValues.end());
-    return *this;
-}
-
-CSMPrefs::EnumValues& CSMPrefs::EnumValues::add(const EnumValue& value)
-{
-    mValues.push_back(value);
-    return *this;
-}
-
-CSMPrefs::EnumValues& CSMPrefs::EnumValues::add(const std::string& value, const std::string& tooltip)
-{
-    mValues.emplace_back(value, tooltip);
-    return *this;
-}
-
-CSMPrefs::EnumSetting::EnumSetting(
-    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, const EnumValue& default_)
-    : Setting(parent, mutex, key, label)
-    , mDefault(default_)
+CSMPrefs::EnumSetting::EnumSetting(Category* parent, QMutex* mutex, std::string_view key, const QString& label,
+    std::span<const EnumValueView> values, Settings::Index& index)
+    : TypedSetting(parent, mutex, key, label, index)
+    , mValues(values)
     , mWidget(nullptr)
 {
 }
@@ -58,43 +29,28 @@ CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::setTooltip(const std::string& tool
     return *this;
 }
 
-CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValues(const EnumValues& values)
+CSMPrefs::SettingWidgets CSMPrefs::EnumSetting::makeWidgets(QWidget* parent)
 {
-    mValues.add(values);
-    return *this;
-}
-
-CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValue(const EnumValue& value)
-{
-    mValues.add(value);
-    return *this;
-}
-
-CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::addValue(const std::string& value, const std::string& tooltip)
-{
-    mValues.add(value, tooltip);
-    return *this;
-}
-
-std::pair<QWidget*, QWidget*> CSMPrefs::EnumSetting::makeWidgets(QWidget* parent)
-{
-    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+    QLabel* label = new QLabel(getLabel(), parent);
 
     mWidget = new QComboBox(parent);
 
-    size_t index = 0;
-
-    for (size_t i = 0; i < mValues.mValues.size(); ++i)
+    for (std::size_t i = 0; i < mValues.size(); ++i)
     {
-        if (mDefault.mValue == mValues.mValues[i].mValue)
-            index = i;
+        const EnumValueView& v = mValues[i];
 
-        mWidget->addItem(QString::fromUtf8(mValues.mValues[i].mValue.c_str()));
+        mWidget->addItem(QString::fromUtf8(v.mValue.data(), static_cast<int>(v.mValue.size())));
 
-        if (!mValues.mValues[i].mTooltip.empty())
-            mWidget->setItemData(i, QString::fromUtf8(mValues.mValues[i].mTooltip.c_str()), Qt::ToolTipRole);
+        if (!v.mTooltip.empty())
+            mWidget->setItemData(static_cast<int>(i),
+                QString::fromUtf8(v.mTooltip.data(), static_cast<int>(v.mTooltip.size())), Qt::ToolTipRole);
     }
 
+    const std::string value = getValue();
+    const std::size_t index = std::find_if(mValues.begin(), mValues.end(), [&](const EnumValueView& v) {
+        return v.mValue == value;
+    }) - mValues.begin();
+
     mWidget->setCurrentIndex(static_cast<int>(index));
 
     if (!mTooltip.empty())
@@ -105,26 +61,20 @@ std::pair<QWidget*, QWidget*> CSMPrefs::EnumSetting::makeWidgets(QWidget* parent
 
     connect(mWidget, qOverload<int>(&QComboBox::currentIndexChanged), this, &EnumSetting::valueChanged);
 
-    return std::make_pair(label, mWidget);
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::EnumSetting::updateWidget()
 {
     if (mWidget)
-    {
-        int index
-            = mWidget->findText(QString::fromStdString(Settings::Manager::getString(getKey(), getParent()->getKey())));
-
-        mWidget->setCurrentIndex(index);
-    }
+        mWidget->setCurrentIndex(mWidget->findText(QString::fromStdString(getValue())));
 }
 
 void CSMPrefs::EnumSetting::valueChanged(int value)
 {
-    {
-        QMutexLocker lock(getMutex());
-        Settings::Manager::setString(getKey(), getParent()->getKey(), mValues.mValues.at(value).mValue);
-    }
+    if (value < 0 || static_cast<std::size_t>(value) >= mValues.size())
+        throw std::logic_error("Invalid enum setting \"" + getKey() + "\" value index: " + std::to_string(value));
 
+    setValue(std::string(mValues[value].mValue));
     getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/enumsetting.hpp b/apps/opencs/model/prefs/enumsetting.hpp
index 57bd2115ce..00953f914e 100644
--- a/apps/opencs/model/prefs/enumsetting.hpp
+++ b/apps/opencs/model/prefs/enumsetting.hpp
@@ -1,10 +1,13 @@
 #ifndef CSM_PREFS_ENUMSETTING_H
 #define CSM_PREFS_ENUMSETTING_H
 
+#include <span>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
+#include "enumvalueview.hpp"
 #include "setting.hpp"
 
 class QComboBox;
@@ -13,50 +16,22 @@ namespace CSMPrefs
 {
     class Category;
 
-    struct EnumValue
-    {
-        std::string mValue;
-        std::string mTooltip;
-
-        EnumValue(const std::string& value, const std::string& tooltip = "");
-
-        EnumValue(const char* value);
-    };
-
-    struct EnumValues
-    {
-        std::vector<EnumValue> mValues;
-
-        EnumValues& add(const EnumValues& values);
-
-        EnumValues& add(const EnumValue& value);
-
-        EnumValues& add(const std::string& value, const std::string& tooltip);
-    };
-
-    class EnumSetting : public Setting
+    class EnumSetting final : public TypedSetting<std::string>
     {
         Q_OBJECT
 
         std::string mTooltip;
-        EnumValue mDefault;
-        EnumValues mValues;
+        std::span<const EnumValueView> mValues;
         QComboBox* mWidget;
 
     public:
-        EnumSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label,
-            const EnumValue& default_);
+        explicit EnumSetting(Category* parent, QMutex* mutex, std::string_view key, const QString& label,
+            std::span<const EnumValueView> values, Settings::Index& index);
 
         EnumSetting& setTooltip(const std::string& tooltip);
 
-        EnumSetting& addValues(const EnumValues& values);
-
-        EnumSetting& addValue(const EnumValue& value);
-
-        EnumSetting& addValue(const std::string& value, const std::string& tooltip);
-
         /// Return label, input widget.
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/enumvalueview.hpp b/apps/opencs/model/prefs/enumvalueview.hpp
new file mode 100644
index 0000000000..f46d250a81
--- /dev/null
+++ b/apps/opencs/model/prefs/enumvalueview.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_APPS_OPENCS_MODEL_PREFS_ENUMVALUEVIEW_H
+#define OPENMW_APPS_OPENCS_MODEL_PREFS_ENUMVALUEVIEW_H
+
+#include <string_view>
+
+namespace CSMPrefs
+{
+    struct EnumValueView
+    {
+        std::string_view mValue;
+        std::string_view mTooltip;
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/prefs/intsetting.cpp b/apps/opencs/model/prefs/intsetting.cpp
index 90cc77c788..a593b6f688 100644
--- a/apps/opencs/model/prefs/intsetting.cpp
+++ b/apps/opencs/model/prefs/intsetting.cpp
@@ -15,11 +15,10 @@
 #include "state.hpp"
 
 CSMPrefs::IntSetting::IntSetting(
-    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, int default_)
-    : Setting(parent, mutex, key, label)
+    Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
+    : TypedSetting(parent, mutex, key, label, index)
     , mMin(0)
     , mMax(std::numeric_limits<int>::max())
-    , mDefault(default_)
     , mWidget(nullptr)
 {
 }
@@ -49,13 +48,13 @@ CSMPrefs::IntSetting& CSMPrefs::IntSetting::setTooltip(const std::string& toolti
     return *this;
 }
 
-std::pair<QWidget*, QWidget*> CSMPrefs::IntSetting::makeWidgets(QWidget* parent)
+CSMPrefs::SettingWidgets CSMPrefs::IntSetting::makeWidgets(QWidget* parent)
 {
-    QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+    QLabel* label = new QLabel(getLabel(), parent);
 
     mWidget = new QSpinBox(parent);
     mWidget->setRange(mMin, mMax);
-    mWidget->setValue(mDefault);
+    mWidget->setValue(getValue());
 
     if (!mTooltip.empty())
     {
@@ -66,23 +65,17 @@ std::pair<QWidget*, QWidget*> CSMPrefs::IntSetting::makeWidgets(QWidget* parent)
 
     connect(mWidget, qOverload<int>(&QSpinBox::valueChanged), this, &IntSetting::valueChanged);
 
-    return std::make_pair(label, mWidget);
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::IntSetting::updateWidget()
 {
     if (mWidget)
-    {
-        mWidget->setValue(Settings::Manager::getInt(getKey(), getParent()->getKey()));
-    }
+        mWidget->setValue(getValue());
 }
 
 void CSMPrefs::IntSetting::valueChanged(int value)
 {
-    {
-        QMutexLocker lock(getMutex());
-        Settings::Manager::setInt(getKey(), getParent()->getKey(), value);
-    }
-
+    setValue(value);
     getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/intsetting.hpp b/apps/opencs/model/prefs/intsetting.hpp
index 8a655178a4..e2926456aa 100644
--- a/apps/opencs/model/prefs/intsetting.hpp
+++ b/apps/opencs/model/prefs/intsetting.hpp
@@ -12,18 +12,18 @@ namespace CSMPrefs
 {
     class Category;
 
-    class IntSetting : public Setting
+    class IntSetting final : public TypedSetting<int>
     {
         Q_OBJECT
 
         int mMin;
         int mMax;
         std::string mTooltip;
-        int mDefault;
         QSpinBox* mWidget;
 
     public:
-        IntSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label, int default_);
+        explicit IntSetting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
         // defaults to [0, std::numeric_limits<int>::max()]
         IntSetting& setRange(int min, int max);
@@ -35,7 +35,7 @@ namespace CSMPrefs
         IntSetting& setTooltip(const std::string& tooltip);
 
         /// Return label, input widget.
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/modifiersetting.cpp b/apps/opencs/model/prefs/modifiersetting.cpp
index 8752a4d51e..4bb7d64e60 100644
--- a/apps/opencs/model/prefs/modifiersetting.cpp
+++ b/apps/opencs/model/prefs/modifiersetting.cpp
@@ -19,21 +19,22 @@ class QWidget;
 
 namespace CSMPrefs
 {
-    ModifierSetting::ModifierSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)
-        : Setting(parent, mutex, key, label)
+    ModifierSetting::ModifierSetting(
+        Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
+        : TypedSetting(parent, mutex, key, label, index)
         , mButton(nullptr)
         , mEditorActive(false)
     {
     }
 
-    std::pair<QWidget*, QWidget*> ModifierSetting::makeWidgets(QWidget* parent)
+    SettingWidgets ModifierSetting::makeWidgets(QWidget* parent)
     {
         int modifier = 0;
         State::get().getShortcutManager().getModifier(getKey(), modifier);
 
         QString text = QString::fromUtf8(State::get().getShortcutManager().convertToString(modifier).c_str());
 
-        QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+        QLabel* label = new QLabel(getLabel(), parent);
         QPushButton* widget = new QPushButton(text, parent);
 
         widget->setCheckable(true);
@@ -46,14 +47,14 @@ namespace CSMPrefs
 
         connect(widget, &QPushButton::toggled, this, &ModifierSetting::buttonToggled);
 
-        return std::make_pair(label, widget);
+        return SettingWidgets{ .mLabel = label, .mInput = widget };
     }
 
     void ModifierSetting::updateWidget()
     {
         if (mButton)
         {
-            const std::string& shortcut = Settings::Manager::getString(getKey(), getParent()->getKey());
+            const std::string& shortcut = getValue();
 
             int modifier;
             State::get().getShortcutManager().convertFromString(shortcut, modifier);
@@ -131,15 +132,7 @@ namespace CSMPrefs
     void ModifierSetting::storeValue(int modifier)
     {
         State::get().getShortcutManager().setModifier(getKey(), modifier);
-
-        // Convert to string and assign
-        std::string value = State::get().getShortcutManager().convertToString(modifier);
-
-        {
-            QMutexLocker lock(getMutex());
-            Settings::Manager::setString(getKey(), getParent()->getKey(), value);
-        }
-
+        setValue(State::get().getShortcutManager().convertToString(modifier));
         getParent()->getState()->update(*this);
     }
 
diff --git a/apps/opencs/model/prefs/modifiersetting.hpp b/apps/opencs/model/prefs/modifiersetting.hpp
index ae984243ac..76a3a82e71 100644
--- a/apps/opencs/model/prefs/modifiersetting.hpp
+++ b/apps/opencs/model/prefs/modifiersetting.hpp
@@ -15,14 +15,16 @@ class QPushButton;
 namespace CSMPrefs
 {
     class Category;
-    class ModifierSetting : public Setting
+
+    class ModifierSetting final : public TypedSetting<std::string>
     {
         Q_OBJECT
 
     public:
-        ModifierSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label);
+        explicit ModifierSetting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/setting.cpp b/apps/opencs/model/prefs/setting.cpp
index efe360d1e8..3c2ac65c94 100644
--- a/apps/opencs/model/prefs/setting.cpp
+++ b/apps/opencs/model/prefs/setting.cpp
@@ -5,6 +5,7 @@
 #include <QMutexLocker>
 
 #include <components/settings/settings.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include "category.hpp"
 #include "state.hpp"
@@ -14,22 +15,17 @@ QMutex* CSMPrefs::Setting::getMutex()
     return mMutex;
 }
 
-CSMPrefs::Setting::Setting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)
+CSMPrefs::Setting::Setting(
+    Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
     : QObject(parent->getState())
     , mParent(parent)
     , mMutex(mutex)
     , mKey(key)
     , mLabel(label)
+    , mIndex(index)
 {
 }
 
-std::pair<QWidget*, QWidget*> CSMPrefs::Setting::makeWidgets(QWidget* parent)
-{
-    return std::pair<QWidget*, QWidget*>(0, 0);
-}
-
-void CSMPrefs::Setting::updateWidget() {}
-
 const CSMPrefs::Category* CSMPrefs::Setting::getParent() const
 {
     return mParent;
@@ -40,35 +36,6 @@ const std::string& CSMPrefs::Setting::getKey() const
     return mKey;
 }
 
-const std::string& CSMPrefs::Setting::getLabel() const
-{
-    return mLabel;
-}
-
-int CSMPrefs::Setting::toInt() const
-{
-    QMutexLocker lock(mMutex);
-    return Settings::Manager::getInt(mKey, mParent->getKey());
-}
-
-double CSMPrefs::Setting::toDouble() const
-{
-    QMutexLocker lock(mMutex);
-    return Settings::Manager::getFloat(mKey, mParent->getKey());
-}
-
-std::string CSMPrefs::Setting::toString() const
-{
-    QMutexLocker lock(mMutex);
-    return Settings::Manager::getString(mKey, mParent->getKey());
-}
-
-bool CSMPrefs::Setting::isTrue() const
-{
-    QMutexLocker lock(mMutex);
-    return Settings::Manager::getBool(mKey, mParent->getKey());
-}
-
 QColor CSMPrefs::Setting::toColor() const
 {
     // toString() handles lock
diff --git a/apps/opencs/model/prefs/setting.hpp b/apps/opencs/model/prefs/setting.hpp
index f63271b3f2..faadbcadd1 100644
--- a/apps/opencs/model/prefs/setting.hpp
+++ b/apps/opencs/model/prefs/setting.hpp
@@ -4,15 +4,26 @@
 #include <string>
 #include <utility>
 
+#include <QMutexLocker>
 #include <QObject>
 
+#include <components/settings/settingvalue.hpp>
+
+#include "category.hpp"
+
 class QWidget;
 class QColor;
 class QMutex;
+class QGridLayout;
+class QLabel;
 
 namespace CSMPrefs
 {
-    class Category;
+    struct SettingWidgets
+    {
+        QLabel* mLabel;
+        QWidget* mInput;
+    };
 
     class Setting : public QObject
     {
@@ -21,44 +32,82 @@ namespace CSMPrefs
         Category* mParent;
         QMutex* mMutex;
         std::string mKey;
-        std::string mLabel;
+        QString mLabel;
+        Settings::Index& mIndex;
 
     protected:
         QMutex* getMutex();
 
+        template <class T>
+        void resetValueImpl()
+        {
+            QMutexLocker lock(mMutex);
+            return mIndex.get<T>(mParent->getKey(), mKey).reset();
+        }
+
+        template <class T>
+        T getValueImpl() const
+        {
+            QMutexLocker lock(mMutex);
+            return mIndex.get<T>(mParent->getKey(), mKey).get();
+        }
+
+        template <class T>
+        void setValueImpl(const T& value)
+        {
+            QMutexLocker lock(mMutex);
+            return mIndex.get<T>(mParent->getKey(), mKey).set(value);
+        }
+
     public:
-        Setting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label);
+        explicit Setting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
         ~Setting() override = default;
 
-        /// Return label, input widget.
-        ///
-        /// \note first can be a 0-pointer, which means that the label is part of the input
-        /// widget.
-        virtual std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent);
+        virtual SettingWidgets makeWidgets(QWidget* parent) = 0;
 
         /// Updates the widget returned by makeWidgets() to the current setting.
         ///
         /// \note If make_widgets() has not been called yet then nothing happens.
-        virtual void updateWidget();
+        virtual void updateWidget() = 0;
+
+        virtual void reset() = 0;
 
         const Category* getParent() const;
 
         const std::string& getKey() const;
 
-        const std::string& getLabel() const;
+        const QString& getLabel() const { return mLabel; }
 
-        int toInt() const;
+        int toInt() const { return getValueImpl<int>(); }
 
-        double toDouble() const;
+        double toDouble() const { return getValueImpl<double>(); }
 
-        std::string toString() const;
+        std::string toString() const { return getValueImpl<std::string>(); }
 
-        bool isTrue() const;
+        bool isTrue() const { return getValueImpl<bool>(); }
 
         QColor toColor() const;
     };
 
+    template <class T>
+    class TypedSetting : public Setting
+    {
+    public:
+        using Setting::Setting;
+
+        void reset() final
+        {
+            resetValueImpl<T>();
+            updateWidget();
+        }
+
+        T getValue() const { return getValueImpl<T>(); }
+
+        void setValue(const T& value) { return setValueImpl(value); }
+    };
+
     // note: fullKeys have the format categoryKey/settingKey
     bool operator==(const Setting& setting, const std::string& fullKey);
     bool operator==(const std::string& fullKey, const Setting& setting);
diff --git a/apps/opencs/model/prefs/shortcutmanager.cpp b/apps/opencs/model/prefs/shortcutmanager.cpp
index a6f1da4f85..d6686d31d9 100644
--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@@ -43,7 +43,7 @@ namespace CSMPrefs
         mEventHandler->removeShortcut(shortcut);
     }
 
-    bool ShortcutManager::getSequence(const std::string& name, QKeySequence& sequence) const
+    bool ShortcutManager::getSequence(std::string_view name, QKeySequence& sequence) const
     {
         SequenceMap::const_iterator item = mSequences.find(name);
         if (item != mSequences.end())
@@ -56,7 +56,7 @@ namespace CSMPrefs
             return false;
     }
 
-    void ShortcutManager::setSequence(const std::string& name, const QKeySequence& sequence)
+    void ShortcutManager::setSequence(std::string_view name, const QKeySequence& sequence)
     {
         // Add to map/modify
         SequenceMap::iterator item = mSequences.find(name);
@@ -91,7 +91,7 @@ namespace CSMPrefs
             return false;
     }
 
-    void ShortcutManager::setModifier(const std::string& name, int modifier)
+    void ShortcutManager::setModifier(std::string_view name, int modifier)
     {
         // Add to map/modify
         ModifierMap::iterator item = mModifiers.find(name);
diff --git a/apps/opencs/model/prefs/shortcutmanager.hpp b/apps/opencs/model/prefs/shortcutmanager.hpp
index fc8db3f2b0..0cfe3ad86a 100644
--- a/apps/opencs/model/prefs/shortcutmanager.hpp
+++ b/apps/opencs/model/prefs/shortcutmanager.hpp
@@ -28,11 +28,11 @@ namespace CSMPrefs
         /// The shortcut class will do this automatically
         void removeShortcut(Shortcut* shortcut);
 
-        bool getSequence(const std::string& name, QKeySequence& sequence) const;
-        void setSequence(const std::string& name, const QKeySequence& sequence);
+        bool getSequence(std::string_view name, QKeySequence& sequence) const;
+        void setSequence(std::string_view name, const QKeySequence& sequence);
 
         bool getModifier(const std::string& name, int& modifier) const;
-        void setModifier(const std::string& name, int modifier);
+        void setModifier(std::string_view name, int modifier);
 
         std::string convertToString(const QKeySequence& sequence) const;
         std::string convertToString(int modifier) const;
@@ -49,9 +49,9 @@ namespace CSMPrefs
 
     private:
         // Need a multimap in case multiple shortcuts share the same name
-        typedef std::multimap<std::string, Shortcut*> ShortcutMap;
-        typedef std::map<std::string, QKeySequence> SequenceMap;
-        typedef std::map<std::string, int> ModifierMap;
+        typedef std::multimap<std::string, Shortcut*, std::less<>> ShortcutMap;
+        typedef std::map<std::string, QKeySequence, std::less<>> SequenceMap;
+        typedef std::map<std::string, int, std::less<>> ModifierMap;
         typedef std::map<int, std::string> NameMap;
         typedef std::map<std::string, int> KeyMap;
 
diff --git a/apps/opencs/model/prefs/shortcutsetting.cpp b/apps/opencs/model/prefs/shortcutsetting.cpp
index d8c71d7008..bdaf3a0fda 100644
--- a/apps/opencs/model/prefs/shortcutsetting.cpp
+++ b/apps/opencs/model/prefs/shortcutsetting.cpp
@@ -18,8 +18,9 @@
 
 namespace CSMPrefs
 {
-    ShortcutSetting::ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)
-        : Setting(parent, mutex, key, label)
+    ShortcutSetting::ShortcutSetting(
+        Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
+        : TypedSetting(parent, mutex, key, label, index)
         , mButton(nullptr)
         , mEditorActive(false)
         , mEditorPos(0)
@@ -30,14 +31,14 @@ namespace CSMPrefs
         }
     }
 
-    std::pair<QWidget*, QWidget*> ShortcutSetting::makeWidgets(QWidget* parent)
+    SettingWidgets ShortcutSetting::makeWidgets(QWidget* parent)
     {
         QKeySequence sequence;
         State::get().getShortcutManager().getSequence(getKey(), sequence);
 
         QString text = QString::fromUtf8(State::get().getShortcutManager().convertToString(sequence).c_str());
 
-        QLabel* label = new QLabel(QString::fromUtf8(getLabel().c_str()), parent);
+        QLabel* label = new QLabel(getLabel(), parent);
         QPushButton* widget = new QPushButton(text, parent);
 
         widget->setCheckable(true);
@@ -50,14 +51,14 @@ namespace CSMPrefs
 
         connect(widget, &QPushButton::toggled, this, &ShortcutSetting::buttonToggled);
 
-        return std::make_pair(label, widget);
+        return SettingWidgets{ .mLabel = label, .mInput = widget };
     }
 
     void ShortcutSetting::updateWidget()
     {
         if (mButton)
         {
-            const std::string& shortcut = Settings::Manager::getString(getKey(), getParent()->getKey());
+            const std::string shortcut = getValue();
 
             QKeySequence sequence;
             State::get().getShortcutManager().convertFromString(shortcut, sequence);
@@ -170,15 +171,7 @@ namespace CSMPrefs
     void ShortcutSetting::storeValue(const QKeySequence& sequence)
     {
         State::get().getShortcutManager().setSequence(getKey(), sequence);
-
-        // Convert to string and assign
-        std::string value = State::get().getShortcutManager().convertToString(sequence);
-
-        {
-            QMutexLocker lock(getMutex());
-            Settings::Manager::setString(getKey(), getParent()->getKey(), value);
-        }
-
+        setValue(State::get().getShortcutManager().convertToString(sequence));
         getParent()->getState()->update(*this);
     }
 
diff --git a/apps/opencs/model/prefs/shortcutsetting.hpp b/apps/opencs/model/prefs/shortcutsetting.hpp
index bef140dada..bcb7b89488 100644
--- a/apps/opencs/model/prefs/shortcutsetting.hpp
+++ b/apps/opencs/model/prefs/shortcutsetting.hpp
@@ -2,6 +2,7 @@
 #define CSM_PREFS_SHORTCUTSETTING_H
 
 #include <string>
+#include <string_view>
 #include <utility>
 
 #include <QKeySequence>
@@ -17,14 +18,16 @@ class QWidget;
 namespace CSMPrefs
 {
     class Category;
-    class ShortcutSetting : public Setting
+
+    class ShortcutSetting final : public TypedSetting<std::string>
     {
         Q_OBJECT
 
     public:
-        ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label);
+        explicit ShortcutSetting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 97f29bc8be..f0af163bf2 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -13,6 +13,7 @@
 #include <apps/opencs/model/prefs/enumsetting.hpp>
 #include <apps/opencs/model/prefs/setting.hpp>
 #include <apps/opencs/model/prefs/shortcutmanager.hpp>
+#include <apps/opencs/model/prefs/subcategory.hpp>
 
 #include <components/settings/categories.hpp>
 #include <components/settings/settings.hpp>
@@ -24,50 +25,42 @@
 #include "modifiersetting.hpp"
 #include "shortcutsetting.hpp"
 #include "stringsetting.hpp"
+#include "values.hpp"
 
 CSMPrefs::State* CSMPrefs::State::sThis = nullptr;
 
 void CSMPrefs::State::declare()
 {
     declareCategory("Windows");
-    declareInt("default-width", "Default window width", 800)
+    declareInt(mValues->mWindows.mDefaultWidth, "Default Window Width")
         .setTooltip("Newly opened top-level windows will open with this width.")
         .setMin(80);
-    declareInt("default-height", "Default window height", 600)
+    declareInt(mValues->mWindows.mDefaultHeight, "Default Window Height")
         .setTooltip("Newly opened top-level windows will open with this height.")
         .setMin(80);
-    declareBool("show-statusbar", "Show Status Bar", true)
+    declareBool(mValues->mWindows.mShowStatusbar, "Show Status Bar")
         .setTooltip(
-            "If a newly open top level window is showing status bars or not. "
+            "Whether a newly open top level window will show status bars. "
             " Note that this does not affect existing windows.");
-    declareSeparator();
-    declareBool("reuse", "Reuse Subviews", true)
+    declareBool(mValues->mWindows.mReuse, "Reuse Subviews")
         .setTooltip(
-            "When a new subview is requested and a matching subview already "
-            " exist, do not open a new subview and use the existing one instead.");
-    declareInt("max-subviews", "Maximum number of subviews per top-level window", 256)
+            "When a new subview is requested and a matching subview already exists, reuse the existing subview.");
+    declareInt(mValues->mWindows.mMaxSubviews, "Maximum Number of Subviews per Top-Level Window")
         .setTooltip(
             "If the maximum number is reached and a new subview is opened "
             "it will be placed into a new top-level window.")
         .setRange(1, 256);
-    declareBool("hide-subview", "Hide single subview", false)
+    declareBool(mValues->mWindows.mHideSubview, "Hide Single Subview")
         .setTooltip(
             "When a view contains only a single subview, hide the subview title "
             "bar and if this subview is closed also close the view (unless it is the last "
             "view for this document)");
-    declareInt("minimum-width", "Minimum subview width", 325)
+    declareInt(mValues->mWindows.mMinimumWidth, "Minimum Subview Width")
         .setTooltip("Minimum width of subviews.")
         .setRange(50, 10000);
-    declareSeparator();
-    EnumValue scrollbarOnly("Scrollbar Only",
-        "Simple addition of scrollbars, the view window "
-        "does not grow automatically.");
-    declareEnum("mainwindow-scrollbar", "Horizontal scrollbar mode for main window.", scrollbarOnly)
-        .addValue(scrollbarOnly)
-        .addValue("Grow Only", "The view window grows as subviews are added. No scrollbars.")
-        .addValue("Grow then Scroll", "The view window grows. The scrollbar appears once it cannot grow any further.");
+    declareEnum(mValues->mWindows.mMainwindowScrollbar, "Main Window Horizontal Scrollbar Mode");
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    declareBool("grow-limit", "Grow Limit Screen", false)
+    declareBool(mValues->mWindows.mGrowLimit, "Grow Limit Screen")
         .setTooltip(
             "When \"Grow then Scroll\" option is selected, the window size grows to"
             " the width of the virtual desktop. \nIf this option is selected the the window growth"
@@ -75,378 +68,345 @@ void CSMPrefs::State::declare()
 #endif
 
     declareCategory("Records");
-    EnumValue iconAndText("Icon and Text");
-    EnumValues recordValues;
-    recordValues.add(iconAndText).add("Icon Only").add("Text Only");
-    declareEnum("status-format", "Modification status display format", iconAndText).addValues(recordValues);
-    declareEnum("type-format", "ID type display format", iconAndText).addValues(recordValues);
+    declareEnum(mValues->mRecords.mStatusFormat, "Modification Status Display Format");
+    declareEnum(mValues->mRecords.mTypeFormat, "ID Type Display Format");
 
     declareCategory("ID Tables");
-    EnumValue inPlaceEdit("Edit in Place", "Edit the clicked cell");
-    EnumValue editRecord("Edit Record", "Open a dialogue subview for the clicked record");
-    EnumValue view("View", "Open a scene subview for the clicked record (not available everywhere)");
-    EnumValue editRecordAndClose("Edit Record and Close");
-    EnumValues doubleClickValues;
-    doubleClickValues.add(inPlaceEdit)
-        .add(editRecord)
-        .add(view)
-        .add("Revert")
-        .add("Delete")
-        .add(editRecordAndClose)
-        .add("View and Close", "Open a scene subview for the clicked record and close the table subview");
-    declareEnum("double", "Double Click", inPlaceEdit).addValues(doubleClickValues);
-    declareEnum("double-s", "Shift Double Click", editRecord).addValues(doubleClickValues);
-    declareEnum("double-c", "Control Double Click", view).addValues(doubleClickValues);
-    declareEnum("double-sc", "Shift Control Double Click", editRecordAndClose).addValues(doubleClickValues);
-    declareSeparator();
-    EnumValue jumpAndSelect("Jump and Select", "Scroll new record into view and make it the selection");
-    declareEnum("jump-to-added", "Action on adding or cloning a record", jumpAndSelect)
-        .addValue(jumpAndSelect)
-        .addValue("Jump Only", "Scroll new record into view")
-        .addValue("No Jump", "No special action");
-    declareBool("extended-config", "Manually specify affected record types for an extended delete/revert", false)
+    declareEnum(mValues->mIdTables.mDouble, "Double Click");
+    declareEnum(mValues->mIdTables.mDoubleS, "Shift Double Click");
+    declareEnum(mValues->mIdTables.mDoubleC, "Control Double Click");
+    declareEnum(mValues->mIdTables.mDoubleSc, "Shift Control Double Click");
+    declareEnum(mValues->mIdTables.mJumpToAdded, "Action on Adding or Cloning a Record");
+    declareBool(
+        mValues->mIdTables.mExtendedConfig, "Manually Specify Affected Record Types for an Extended Delete/Revert")
         .setTooltip(
             "Delete and revert commands have an extended form that also affects "
             "associated records.\n\n"
             "If this option is enabled, types of affected records are selected "
             "manually before a command execution.\nOtherwise, all associated "
             "records are deleted/reverted immediately.");
-    declareBool("subview-new-window", "Open Record in new window", false)
+    declareBool(mValues->mIdTables.mSubviewNewWindow, "Open Record in a New Window")
         .setTooltip(
             "When editing a record, open the view in a new window,"
             " rather than docked in the main view.");
+    declareInt(mValues->mIdTables.mFilterDelay, "Filter Apply Delay (ms)");
 
     declareCategory("ID Dialogues");
-    declareBool("toolbar", "Show toolbar", true);
+    declareBool(mValues->mIdDialogues.mToolbar, "Show Toolbar");
 
     declareCategory("Reports");
-    EnumValue actionNone("None");
-    EnumValue actionEdit("Edit", "Open a table or dialogue suitable for addressing the listed report");
-    EnumValue actionRemove("Remove", "Remove the report from the report table");
-    EnumValue actionEditAndRemove("Edit And Remove",
-        "Open a table or dialogue suitable for addressing the listed report, then remove the report from the report "
-        "table");
-    EnumValues reportValues;
-    reportValues.add(actionNone).add(actionEdit).add(actionRemove).add(actionEditAndRemove);
-    declareEnum("double", "Double Click", actionEdit).addValues(reportValues);
-    declareEnum("double-s", "Shift Double Click", actionRemove).addValues(reportValues);
-    declareEnum("double-c", "Control Double Click", actionEditAndRemove).addValues(reportValues);
-    declareEnum("double-sc", "Shift Control Double Click", actionNone).addValues(reportValues);
-    declareBool("ignore-base-records", "Ignore base records in verifier", false);
+    declareEnum(mValues->mReports.mDouble, "Double Click");
+    declareEnum(mValues->mReports.mDoubleS, "Shift Double Click");
+    declareEnum(mValues->mReports.mDoubleC, "Control Double Click");
+    declareEnum(mValues->mReports.mDoubleSc, "Shift Control Double Click");
+    declareBool(mValues->mReports.mIgnoreBaseRecords, "Ignore Base Records in Verifier");
 
     declareCategory("Search & Replace");
-    declareInt("char-before", "Characters before search string", 10)
-        .setTooltip("Maximum number of character to display in search result before the searched text");
-    declareInt("char-after", "Characters after search string", 10)
-        .setTooltip("Maximum number of character to display in search result after the searched text");
-    declareBool("auto-delete", "Delete row from result table after a successful replace", true);
+    declareInt(mValues->mSearchAndReplace.mCharBefore, "Max Characters Before the Search String")
+        .setTooltip("Maximum number of characters to display in the search result before the searched text");
+    declareInt(mValues->mSearchAndReplace.mCharAfter, "Max Characters After the Search String")
+        .setTooltip("Maximum number of characters to display in the search result after the searched text");
+    declareBool(mValues->mSearchAndReplace.mAutoDelete, "Delete Row from the Result Table After Replace");
 
     declareCategory("Scripts");
-    declareBool("show-linenum", "Show Line Numbers", true)
+    declareBool(mValues->mScripts.mShowLinenum, "Show Line Numbers")
         .setTooltip(
             "Show line numbers to the left of the script editor window."
             "The current row and column numbers of the text cursor are shown at the bottom.");
-    declareBool("wrap-lines", "Wrap Lines", false).setTooltip("Wrap lines longer than width of script editor.");
-    declareBool("mono-font", "Use monospace font", true);
-    declareInt("tab-width", "Tab Width", 4).setTooltip("Number of characters for tab width").setRange(1, 10);
-    EnumValue warningsNormal("Normal", "Report warnings as warning");
-    declareEnum("warnings", "Warning Mode", warningsNormal)
-        .addValue("Ignore", "Do not report warning")
-        .addValue(warningsNormal)
-        .addValue("Strict", "Promote warning to an error");
-    declareBool("toolbar", "Show toolbar", true);
-    declareInt("compile-delay", "Delay between updating of source errors", 100)
-        .setTooltip("Delay in milliseconds")
-        .setRange(0, 10000);
-    declareInt("error-height", "Initial height of the error panel", 100).setRange(100, 10000);
-    declareBool("highlight-occurrences", "Highlight other occurrences of selected names", true);
-    declareColour("colour-highlight", "Colour of highlighted occurrences", QColor("lightcyan"));
-    declareSeparator();
-    declareColour("colour-int", "Highlight Colour: Integer Literals", QColor("darkmagenta"));
-    declareColour("colour-float", "Highlight Colour: Float Literals", QColor("magenta"));
-    declareColour("colour-name", "Highlight Colour: Names", QColor("grey"));
-    declareColour("colour-keyword", "Highlight Colour: Keywords", QColor("red"));
-    declareColour("colour-special", "Highlight Colour: Special Characters", QColor("darkorange"));
-    declareColour("colour-comment", "Highlight Colour: Comments", QColor("green"));
-    declareColour("colour-id", "Highlight Colour: IDs", QColor("blue"));
+    declareBool(mValues->mScripts.mWrapLines, "Wrap Lines")
+        .setTooltip("Wrap lines that are longer than the width of the script editor.");
+    declareBool(mValues->mScripts.mMonoFont, "Use Monospace Font");
+    declareInt(mValues->mScripts.mTabWidth, "Tab Width")
+        .setTooltip("Number of characters for tab width")
+        .setRange(1, 10);
+    declareEnum(mValues->mScripts.mWarnings, "Warning Mode");
+    declareBool(mValues->mScripts.mToolbar, "Show Toolbar");
+    declareInt(mValues->mScripts.mCompileDelay, "Source Error Update Delay (ms)").setRange(0, 10000);
+    declareInt(mValues->mScripts.mErrorHeight, "Initial Error Panel Height").setRange(100, 10000);
+    declareBool(mValues->mScripts.mHighlightOccurrences, "Highlight Selected Name Occurrences");
+    declareColour(mValues->mScripts.mColourHighlight, "Highlight Colour: Selected Name Occurrences");
+    declareColour(mValues->mScripts.mColourInt, "Highlight Colour: Integer Literals");
+    declareColour(mValues->mScripts.mColourFloat, "Highlight Colour: Float Literals");
+    declareColour(mValues->mScripts.mColourName, "Highlight Colour: Names");
+    declareColour(mValues->mScripts.mColourKeyword, "Highlight Colour: Keywords");
+    declareColour(mValues->mScripts.mColourSpecial, "Highlight Colour: Special Characters");
+    declareColour(mValues->mScripts.mColourComment, "Highlight Colour: Comments");
+    declareColour(mValues->mScripts.mColourId, "Highlight Colour: IDs");
 
     declareCategory("General Input");
-    declareBool("cycle", "Cyclic next/previous", false)
+    declareBool(mValues->mGeneralInput.mCycle, "Cyclic Next/Previous")
         .setTooltip(
             "When using next/previous functions at the last/first item of a "
             "list go to the first/last item");
 
     declareCategory("3D Scene Input");
 
-    declareDouble("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
-    declareDouble("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
-    declareSeparator();
+    declareDouble(mValues->mSceneInput.mNaviWheelFactor, "Camera Zoom Sensitivity").setRange(-100.0, 100.0);
+    declareDouble(mValues->mSceneInput.mSNaviSensitivity, "Secondary Camera Movement Sensitivity")
+        .setRange(-1000.0, 1000.0);
 
-    declareDouble("p-navi-free-sensitivity", "Free Camera Sensitivity", 1 / 650.).setPrecision(5).setRange(0.0, 1.0);
-    declareBool("p-navi-free-invert", "Invert Free Camera Mouse Input", false);
-    declareDouble("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
-    declareDouble("navi-free-rot-speed", "Free Camera Rotational Speed", 3.14 / 2).setRange(0.001, 6.28);
-    declareDouble("navi-free-speed-mult", "Free Camera Speed Multiplier (from Modifier)", 8).setRange(0.001, 1000.0);
-    declareSeparator();
-
-    declareDouble("p-navi-orbit-sensitivity", "Orbit Camera Sensitivity", 1 / 650.).setPrecision(5).setRange(0.0, 1.0);
-    declareBool("p-navi-orbit-invert", "Invert Orbit Camera Mouse Input", false);
-    declareDouble("navi-orbit-rot-speed", "Orbital Camera Rotational Speed", 3.14 / 4).setRange(0.001, 6.28);
-    declareDouble("navi-orbit-speed-mult", "Orbital Camera Speed Multiplier (from Modifier)", 4)
+    declareDouble(mValues->mSceneInput.mPNaviFreeSensitivity, "Free Camera Sensitivity")
+        .setPrecision(5)
+        .setRange(0.0, 1.0);
+    declareBool(mValues->mSceneInput.mPNaviFreeInvert, "Invert Free Camera Mouse Input");
+    declareDouble(mValues->mSceneInput.mNaviFreeLinSpeed, "Free Camera Linear Speed").setRange(1.0, 10000.0);
+    declareDouble(mValues->mSceneInput.mNaviFreeRotSpeed, "Free Camera Rotational Speed").setRange(0.001, 6.28);
+    declareDouble(mValues->mSceneInput.mNaviFreeSpeedMult, "Free Camera Speed Multiplier (from Modifier)")
         .setRange(0.001, 1000.0);
-    declareBool("navi-orbit-const-roll", "Keep camera roll constant for orbital camera", true);
-    declareSeparator();
 
-    declareBool("context-select", "Context Sensitive Selection", false);
-    declareDouble("drag-factor", "Mouse sensitivity during drag operations", 1.0).setRange(0.001, 100.0);
-    declareDouble("drag-wheel-factor", "Mouse wheel sensitivity during drag operations", 1.0).setRange(0.001, 100.0);
-    declareDouble("drag-shift-factor", "Shift-acceleration factor during drag operations", 4.0)
+    declareDouble(mValues->mSceneInput.mPNaviOrbitSensitivity, "Orbit Camera Sensitivity")
+        .setPrecision(5)
+        .setRange(0.0, 1.0);
+    declareBool(mValues->mSceneInput.mPNaviOrbitInvert, "Invert Orbit Camera Mouse Input");
+    declareDouble(mValues->mSceneInput.mNaviOrbitRotSpeed, "Orbital Camera Rotational Speed").setRange(0.001, 6.28);
+    declareDouble(mValues->mSceneInput.mNaviOrbitSpeedMult, "Orbital Camera Speed Multiplier (from Modifier)")
+        .setRange(0.001, 1000.0);
+    declareBool(mValues->mSceneInput.mNaviOrbitConstRoll, "Keep Camera Roll Constant for Orbital Camera");
+
+    declareBool(mValues->mSceneInput.mContextSelect, "Context Sensitive Selection");
+    declareDouble(mValues->mSceneInput.mDragFactor, "Dragging Mouse Sensitivity").setRange(0.001, 100.0);
+    declareDouble(mValues->mSceneInput.mDragWheelFactor, "Dragging Mouse Wheel Sensitivity").setRange(0.001, 100.0);
+    declareDouble(mValues->mSceneInput.mDragShiftFactor, "Dragging Shift-Acceleration Factor")
         .setTooltip("Acceleration factor during drag operations while holding down shift")
         .setRange(0.001, 100.0);
-    declareDouble("rotate-factor", "Free rotation factor", 0.007).setPrecision(4).setRange(0.0001, 0.1);
+    declareDouble(mValues->mSceneInput.mRotateFactor, "Free rotation factor").setPrecision(4).setRange(0.0001, 0.1);
 
     declareCategory("Rendering");
-    declareInt("framerate-limit", "FPS limit", 60)
+    declareInt(mValues->mRendering.mFramerateLimit, "FPS Limit")
         .setTooltip("Framerate limit in 3D preview windows. Zero value means \"unlimited\".")
         .setRange(0, 10000);
-    declareInt("camera-fov", "Camera FOV", 90).setRange(10, 170);
-    declareBool("camera-ortho", "Orthographic projection for camera", false);
-    declareInt("camera-ortho-size", "Orthographic projection size parameter", 100)
+    declareInt(mValues->mRendering.mCameraFov, "Camera FOV").setRange(10, 170);
+    declareBool(mValues->mRendering.mCameraOrtho, "Orthographic Projection for Camera");
+    declareInt(mValues->mRendering.mCameraOrthoSize, "Orthographic Projection Size Parameter")
         .setTooltip("Size of the orthographic frustum, greater value will allow the camera to see more of the world.")
         .setRange(10, 10000);
-    declareDouble("object-marker-alpha", "Object Marker Transparency", 0.5).setPrecision(2).setRange(0, 1);
-    declareBool("scene-use-gradient", "Use Gradient Background", true);
-    declareColour("scene-day-background-colour", "Day Background Colour", QColor(110, 120, 128, 255));
-    declareColour("scene-day-gradient-colour", "Day Gradient  Colour", QColor(47, 51, 51, 255))
+    declareDouble(mValues->mRendering.mObjectMarkerAlpha, "Object Marker Transparency").setPrecision(2).setRange(0, 1);
+    declareBool(mValues->mRendering.mSceneUseGradient, "Use Gradient Background");
+    declareColour(mValues->mRendering.mSceneDayBackgroundColour, "Day Background Colour");
+    declareColour(mValues->mRendering.mSceneDayGradientColour, "Day Gradient  Colour")
         .setTooltip(
             "Sets the gradient color to use in conjunction with the day background color. Ignored if "
             "the gradient option is disabled.");
-    declareColour("scene-bright-background-colour", "Scene Bright Background Colour", QColor(79, 87, 92, 255));
-    declareColour("scene-bright-gradient-colour", "Scene Bright Gradient Colour", QColor(47, 51, 51, 255))
+    declareColour(mValues->mRendering.mSceneBrightBackgroundColour, "Scene Bright Background Colour");
+    declareColour(mValues->mRendering.mSceneBrightGradientColour, "Scene Bright Gradient Colour")
         .setTooltip(
             "Sets the gradient color to use in conjunction with the bright background color. Ignored if "
             "the gradient option is disabled.");
-    declareColour("scene-night-background-colour", "Scene Night Background Colour", QColor(64, 77, 79, 255));
-    declareColour("scene-night-gradient-colour", "Scene Night Gradient Colour", QColor(47, 51, 51, 255))
+    declareColour(mValues->mRendering.mSceneNightBackgroundColour, "Scene Night Background Colour");
+    declareColour(mValues->mRendering.mSceneNightGradientColour, "Scene Night Gradient Colour")
         .setTooltip(
             "Sets the gradient color to use in conjunction with the night background color. Ignored if "
             "the gradient option is disabled.");
-    declareBool("scene-day-night-switch-nodes", "Use Day/Night Switch Nodes", true);
+    declareBool(mValues->mRendering.mSceneDayNightSwitchNodes, "Use Day/Night Switch Nodes");
 
     declareCategory("Tooltips");
-    declareBool("scene", "Show Tooltips in 3D scenes", true);
-    declareBool("scene-hide-basic", "Hide basic  3D scenes tooltips", false);
-    declareInt("scene-delay", "Tooltip delay in milliseconds", 500).setMin(1);
-
-    EnumValue createAndInsert("Create cell and insert");
-    EnumValue showAndInsert("Show cell and insert");
-    EnumValue dontInsert("Discard");
-    EnumValue insertAnyway("Insert anyway");
-    EnumValues insertOutsideCell;
-    insertOutsideCell.add(createAndInsert).add(dontInsert).add(insertAnyway);
-    EnumValues insertOutsideVisibleCell;
-    insertOutsideVisibleCell.add(showAndInsert).add(dontInsert).add(insertAnyway);
-
-    EnumValue createAndLandEdit("Create cell and land, then edit");
-    EnumValue showAndLandEdit("Show cell and edit");
-    EnumValue dontLandEdit("Discard");
-    EnumValues landeditOutsideCell;
-    landeditOutsideCell.add(createAndLandEdit).add(dontLandEdit);
-    EnumValues landeditOutsideVisibleCell;
-    landeditOutsideVisibleCell.add(showAndLandEdit).add(dontLandEdit);
-
-    EnumValue SelectOnly("Select only");
-    EnumValue SelectAdd("Add to selection");
-    EnumValue SelectRemove("Remove from selection");
-    EnumValue selectInvert("Invert selection");
-    EnumValues primarySelectAction;
-    primarySelectAction.add(SelectOnly).add(SelectAdd).add(SelectRemove).add(selectInvert);
-    EnumValues secondarySelectAction;
-    secondarySelectAction.add(SelectOnly).add(SelectAdd).add(SelectRemove).add(selectInvert);
+    declareBool(mValues->mTooltips.mScene, "Show Tooltips in 3D Scenes");
+    declareBool(mValues->mTooltips.mSceneHideBasic, "Hide Basic 3D Scene Tooltips");
+    declareInt(mValues->mTooltips.mSceneDelay, "Tooltip Delay (ms)").setMin(1);
 
     declareCategory("3D Scene Editing");
-    declareDouble("gridsnap-movement", "Grid snap size", 16);
-    declareDouble("gridsnap-rotation", "Angle snap size", 15);
-    declareDouble("gridsnap-scale", "Scale snap size", 0.25);
-    declareInt("distance", "Drop Distance", 50)
+    declareDouble(mValues->mSceneEditing.mGridsnapMovement, "Grid Snap Size");
+    declareDouble(mValues->mSceneEditing.mGridsnapRotation, "Angle Snap Size");
+    declareDouble(mValues->mSceneEditing.mGridsnapScale, "Scale Snap Size");
+    declareInt(mValues->mSceneEditing.mDistance, "Drop Distance")
         .setTooltip(
-            "If an instance drop can not be placed against another object at the "
-            "insert point, it will be placed by this distance from the insert point instead");
-    declareEnum("outside-drop", "Handling drops outside of cells", createAndInsert).addValues(insertOutsideCell);
-    declareEnum("outside-visible-drop", "Handling drops outside of visible cells", showAndInsert)
-        .addValues(insertOutsideVisibleCell);
-    declareEnum("outside-landedit", "Handling terrain edit outside of cells", createAndLandEdit)
-        .setTooltip("Behavior of terrain editing, if land editing brush reaches an area without cell record.")
-        .addValues(landeditOutsideCell);
-    declareEnum("outside-visible-landedit", "Handling terrain edit outside of visible cells", showAndLandEdit)
-        .setTooltip("Behavior of terrain editing, if land editing brush reaches an area that is not currently visible.")
-        .addValues(landeditOutsideVisibleCell);
-    declareInt("texturebrush-maximumsize", "Maximum texture brush size", 50).setMin(1);
-    declareInt("shapebrush-maximumsize", "Maximum height edit brush size", 100)
+            "If the dropped instance cannot be placed against another object at the "
+            "insertion point, it will be placed at this distance from the insertion point.");
+    declareEnum(mValues->mSceneEditing.mOutsideDrop, "Instance Dropping Outside of Cells");
+    declareEnum(mValues->mSceneEditing.mOutsideVisibleDrop, "Instance Dropping Outside of Visible Cells");
+    declareEnum(mValues->mSceneEditing.mOutsideLandedit, "Terrain Editing Outside of Cells")
+        .setTooltip("Behaviour of terrain editing if land editing brush reaches an area without a cell record.");
+    declareEnum(mValues->mSceneEditing.mOutsideVisibleLandedit, "Terrain Editing Outside of Visible Cells")
+        .setTooltip(
+            "Behaviour of terrain editing if land editing brush reaches an area that is not currently visible.");
+    declareInt(mValues->mSceneEditing.mTexturebrushMaximumsize, "Maximum Texture Brush Size").setMin(1);
+    declareInt(mValues->mSceneEditing.mShapebrushMaximumsize, "Maximum Height Edit Brush Size")
         .setTooltip("Setting for the slider range of brush size in terrain height editing.")
         .setMin(1);
-    declareBool("landedit-post-smoothpainting", "Smooth land after painting height", false)
-        .setTooltip("Raise and lower tools will leave bumpy finish without this option");
-    declareDouble("landedit-post-smoothstrength", "Smoothing strength (post-edit)", 0.25)
+    declareBool(mValues->mSceneEditing.mLandeditPostSmoothpainting, "Smooth Land after Height Painting")
+        .setTooltip("Smooth the normally bumpy results of raise and lower tools.");
+    declareDouble(mValues->mSceneEditing.mLandeditPostSmoothstrength, "Post-Edit Smoothing Strength")
         .setTooltip(
-            "If smoothing land after painting height is used, this is the percentage of smooth applied afterwards. "
-            "Negative values may be used to roughen instead of smooth.")
+            "Smoothing strength for Smooth Land after Height Painting setting. "
+            "Negative values may be used to invert the effect and make the terrain rougher.")
         .setMin(-1)
         .setMax(1);
-    declareBool("open-list-view", "Open displays list view", false)
+    declareBool(mValues->mSceneEditing.mOpenListView, "Open Action Shows Instances Table")
         .setTooltip(
-            "When opening a reference from the scene view, it will open the"
-            " instance list view instead of the individual instance record view.");
-    declareEnum("primary-select-action", "Action for primary select", SelectOnly)
+            "Opening an instance from the scene view will open the instances table instead of the record view for that "
+            "instance.");
+    declareEnum(mValues->mSceneEditing.mPrimarySelectAction, "Primary Select Action")
         .setTooltip(
             "Selection can be chosen between select only, add to selection, remove from selection and invert "
-            "selection.")
-        .addValues(primarySelectAction);
-    declareEnum("secondary-select-action", "Action for secondary select", SelectAdd)
+            "selection.");
+    declareEnum(mValues->mSceneEditing.mSecondarySelectAction, "Secondary Select Action")
         .setTooltip(
             "Selection can be chosen between select only, add to selection, remove from selection and invert "
-            "selection.")
-        .addValues(secondarySelectAction);
+            "selection.");
 
     declareCategory("Key Bindings");
 
     declareSubcategory("Document");
-    declareShortcut("document-file-newgame", "New Game", QKeySequence(Qt::ControlModifier | Qt::Key_N));
-    declareShortcut("document-file-newaddon", "New Addon", QKeySequence());
-    declareShortcut("document-file-open", "Open", QKeySequence(Qt::ControlModifier | Qt::Key_O));
-    declareShortcut("document-file-save", "Save", QKeySequence(Qt::ControlModifier | Qt::Key_S));
-    declareShortcut("document-help-help", "Help", QKeySequence(Qt::Key_F1));
-    declareShortcut("document-help-tutorial", "Tutorial", QKeySequence());
-    declareShortcut("document-file-verify", "Verify", QKeySequence());
-    declareShortcut("document-file-merge", "Merge", QKeySequence());
-    declareShortcut("document-file-errorlog", "Open Load Error Log", QKeySequence());
-    declareShortcut("document-file-metadata", "Meta Data", QKeySequence());
-    declareShortcut("document-file-close", "Close Document", QKeySequence(Qt::ControlModifier | Qt::Key_W));
-    declareShortcut("document-file-exit", "Exit Application", QKeySequence(Qt::ControlModifier | Qt::Key_Q));
-    declareShortcut("document-edit-undo", "Undo", QKeySequence(Qt::ControlModifier | Qt::Key_Z));
-    declareShortcut("document-edit-redo", "Redo", QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Z));
-    declareShortcut("document-edit-preferences", "Open Preferences", QKeySequence());
-    declareShortcut("document-edit-search", "Search", QKeySequence(Qt::ControlModifier | Qt::Key_F));
-    declareShortcut("document-view-newview", "New View", QKeySequence());
-    declareShortcut("document-view-statusbar", "Toggle Status Bar", QKeySequence());
-    declareShortcut("document-view-filters", "Open Filter List", QKeySequence());
-    declareShortcut("document-world-regions", "Open Region List", QKeySequence());
-    declareShortcut("document-world-cells", "Open Cell List", QKeySequence());
-    declareShortcut("document-world-referencables", "Open Object List", QKeySequence());
-    declareShortcut("document-world-references", "Open Instance List", QKeySequence());
-    declareShortcut("document-world-lands", "Open Lands List", QKeySequence());
-    declareShortcut("document-world-landtextures", "Open Land Textures List", QKeySequence());
-    declareShortcut("document-world-pathgrid", "Open Pathgrid List", QKeySequence());
-    declareShortcut("document-world-regionmap", "Open Region Map", QKeySequence());
-    declareShortcut("document-mechanics-globals", "Open Global List", QKeySequence());
-    declareShortcut("document-mechanics-gamesettings", "Open Game Settings", QKeySequence());
-    declareShortcut("document-mechanics-scripts", "Open Script List", QKeySequence());
-    declareShortcut("document-mechanics-spells", "Open Spell List", QKeySequence());
-    declareShortcut("document-mechanics-enchantments", "Open Enchantment List", QKeySequence());
-    declareShortcut("document-mechanics-magiceffects", "Open Magic Effect List", QKeySequence());
-    declareShortcut("document-mechanics-startscripts", "Open Start Script List", QKeySequence());
-    declareShortcut("document-character-skills", "Open Skill List", QKeySequence());
-    declareShortcut("document-character-classes", "Open Class List", QKeySequence());
-    declareShortcut("document-character-factions", "Open Faction List", QKeySequence());
-    declareShortcut("document-character-races", "Open Race List", QKeySequence());
-    declareShortcut("document-character-birthsigns", "Open Birthsign List", QKeySequence());
-    declareShortcut("document-character-topics", "Open Topic List", QKeySequence());
-    declareShortcut("document-character-journals", "Open Journal List", QKeySequence());
-    declareShortcut("document-character-topicinfos", "Open Topic Info List", QKeySequence());
-    declareShortcut("document-character-journalinfos", "Open Journal Info List", QKeySequence());
-    declareShortcut("document-character-bodyparts", "Open Body Part List", QKeySequence());
-    declareShortcut("document-assets-reload", "Reload Assets", QKeySequence(Qt::Key_F5));
-    declareShortcut("document-assets-sounds", "Open Sound Asset List", QKeySequence());
-    declareShortcut("document-assets-soundgens", "Open Sound Generator List", QKeySequence());
-    declareShortcut("document-assets-meshes", "Open Mesh Asset List", QKeySequence());
-    declareShortcut("document-assets-icons", "Open Icon Asset List", QKeySequence());
-    declareShortcut("document-assets-music", "Open Music Asset List", QKeySequence());
-    declareShortcut("document-assets-soundres", "Open Sound File List", QKeySequence());
-    declareShortcut("document-assets-textures", "Open Texture Asset List", QKeySequence());
-    declareShortcut("document-assets-videos", "Open Video Asset List", QKeySequence());
-    declareShortcut("document-debug-run", "Run Debug", QKeySequence());
-    declareShortcut("document-debug-shutdown", "Stop Debug", QKeySequence());
-    declareShortcut("document-debug-profiles", "Debug Profiles", QKeySequence());
-    declareShortcut("document-debug-runlog", "Open Run Log", QKeySequence());
+    declareShortcut(mValues->mKeyBindings.mDocumentFileNewgame, "New Game");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileNewaddon, "New Addon");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileOpen, "Open");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileSave, "Save");
+    declareShortcut(mValues->mKeyBindings.mDocumentHelpHelp, "Help");
+    declareShortcut(mValues->mKeyBindings.mDocumentHelpTutorial, "Tutorial");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileVerify, "Verify");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileMerge, "Merge");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileErrorlog, "Open Load Error Log");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileMetadata, "Meta Data");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileClose, "Close Document");
+    declareShortcut(mValues->mKeyBindings.mDocumentFileExit, "Exit Application");
+    declareShortcut(mValues->mKeyBindings.mDocumentEditUndo, "Undo");
+    declareShortcut(mValues->mKeyBindings.mDocumentEditRedo, "Redo");
+    declareShortcut(mValues->mKeyBindings.mDocumentEditPreferences, "Open Preferences");
+    declareShortcut(mValues->mKeyBindings.mDocumentEditSearch, "Search");
+    declareShortcut(mValues->mKeyBindings.mDocumentViewNewview, "New View");
+    declareShortcut(mValues->mKeyBindings.mDocumentViewStatusbar, "Toggle Status Bar");
+    declareShortcut(mValues->mKeyBindings.mDocumentViewFilters, "Open Filter List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldRegions, "Open Region List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldCells, "Open Cell List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldReferencables, "Open Object List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldReferences, "Open Instance List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldLands, "Open Lands List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldLandtextures, "Open Land Textures List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldPathgrid, "Open Pathgrid List");
+    declareShortcut(mValues->mKeyBindings.mDocumentWorldRegionmap, "Open Region Map");
+    declareShortcut(mValues->mKeyBindings.mDocumentMechanicsGlobals, "Open Global List");
+    declareShortcut(mValues->mKeyBindings.mDocumentMechanicsGamesettings, "Open Game Settings");
+    declareShortcut(mValues->mKeyBindings.mDocumentMechanicsScripts, "Open Script List");
+    declareShortcut(mValues->mKeyBindings.mDocumentMechanicsSpells, "Open Spell List");
+    declareShortcut(mValues->mKeyBindings.mDocumentMechanicsEnchantments, "Open Enchantment List");
+    declareShortcut(mValues->mKeyBindings.mDocumentMechanicsMagiceffects, "Open Magic Effect List");
+    declareShortcut(mValues->mKeyBindings.mDocumentMechanicsStartscripts, "Open Start Script List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterSkills, "Open Skill List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterClasses, "Open Class List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterFactions, "Open Faction List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterRaces, "Open Race List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterBirthsigns, "Open Birthsign List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterTopics, "Open Topic List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterJournals, "Open Journal List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterTopicinfos, "Open Topic Info List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterJournalinfos, "Open Journal Info List");
+    declareShortcut(mValues->mKeyBindings.mDocumentCharacterBodyparts, "Open Body Part List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsReload, "Reload Assets");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsSounds, "Open Sound Asset List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsSoundgens, "Open Sound Generator List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsMeshes, "Open Mesh Asset List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsIcons, "Open Icon Asset List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsMusic, "Open Music Asset List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsSoundres, "Open Sound File List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsTextures, "Open Texture Asset List");
+    declareShortcut(mValues->mKeyBindings.mDocumentAssetsVideos, "Open Video Asset List");
+    declareShortcut(mValues->mKeyBindings.mDocumentDebugRun, "Run Debug");
+    declareShortcut(mValues->mKeyBindings.mDocumentDebugShutdown, "Stop Debug");
+    declareShortcut(mValues->mKeyBindings.mDocumentDebugProfiles, "Debug Profiles");
+    declareShortcut(mValues->mKeyBindings.mDocumentDebugRunlog, "Open Run Log");
 
     declareSubcategory("Table");
-    declareShortcut("table-edit", "Edit Record", QKeySequence());
-    declareShortcut("table-add", "Add Row/Record", QKeySequence(Qt::ShiftModifier | Qt::Key_A));
-    declareShortcut("table-clone", "Clone Record", QKeySequence(Qt::ShiftModifier | Qt::Key_D));
-    declareShortcut("touch-record", "Touch Record", QKeySequence());
-    declareShortcut("table-revert", "Revert Record", QKeySequence());
-    declareShortcut("table-remove", "Remove Row/Record", QKeySequence(Qt::Key_Delete));
-    declareShortcut("table-moveup", "Move Record Up", QKeySequence());
-    declareShortcut("table-movedown", "Move Record Down", QKeySequence());
-    declareShortcut("table-view", "View Record", QKeySequence(Qt::ShiftModifier | Qt::Key_C));
-    declareShortcut("table-preview", "Preview Record", QKeySequence(Qt::ShiftModifier | Qt::Key_V));
-    declareShortcut("table-extendeddelete", "Extended Record Deletion", QKeySequence());
-    declareShortcut("table-extendedrevert", "Extended Record Revertion", QKeySequence());
+    declareShortcut(mValues->mKeyBindings.mTableEdit, "Edit Record");
+    declareShortcut(mValues->mKeyBindings.mTableAdd, "Add Row/Record");
+    declareShortcut(mValues->mKeyBindings.mTableClone, "Clone Record");
+    declareShortcut(mValues->mKeyBindings.mTouchRecord, "Touch Record");
+    declareShortcut(mValues->mKeyBindings.mTableRevert, "Revert Record");
+    declareShortcut(mValues->mKeyBindings.mTableRemove, "Remove Row/Record");
+    declareShortcut(mValues->mKeyBindings.mTableMoveup, "Move Record Up");
+    declareShortcut(mValues->mKeyBindings.mTableMovedown, "Move Record Down");
+    declareShortcut(mValues->mKeyBindings.mTableView, "View Record");
+    declareShortcut(mValues->mKeyBindings.mTablePreview, "Preview Record");
+    declareShortcut(mValues->mKeyBindings.mTableExtendeddelete, "Extended Record Deletion");
+    declareShortcut(mValues->mKeyBindings.mTableExtendedrevert, "Extended Record Revertion");
 
     declareSubcategory("Report Table");
-    declareShortcut("reporttable-show", "Show Report", QKeySequence());
-    declareShortcut("reporttable-remove", "Remove Report", QKeySequence(Qt::Key_Delete));
-    declareShortcut("reporttable-replace", "Replace Report", QKeySequence());
-    declareShortcut("reporttable-refresh", "Refresh Report", QKeySequence());
+    declareShortcut(mValues->mKeyBindings.mReporttableShow, "Show Report");
+    declareShortcut(mValues->mKeyBindings.mReporttableRemove, "Remove Report");
+    declareShortcut(mValues->mKeyBindings.mReporttableReplace, "Replace Report");
+    declareShortcut(mValues->mKeyBindings.mReporttableRefresh, "Refresh Report");
 
     declareSubcategory("Scene");
-    declareShortcut("scene-navi-primary", "Camera Rotation From Mouse Movement", QKeySequence(Qt::LeftButton));
-    declareShortcut("scene-navi-secondary", "Camera Translation From Mouse Movement",
-        QKeySequence(Qt::ControlModifier | (int)Qt::LeftButton));
-    declareShortcut("scene-open-primary", "Primary Open", QKeySequence(Qt::ShiftModifier | (int)Qt::LeftButton));
-    declareShortcut("scene-edit-primary", "Primary Edit", QKeySequence(Qt::RightButton));
-    declareShortcut("scene-edit-secondary", "Secondary Edit", QKeySequence(Qt::ControlModifier | (int)Qt::RightButton));
-    declareShortcut("scene-select-primary", "Primary Select", QKeySequence(Qt::MiddleButton));
-    declareShortcut(
-        "scene-select-secondary", "Secondary Select", QKeySequence(Qt::ControlModifier | (int)Qt::MiddleButton));
-    declareShortcut(
-        "scene-select-tertiary", "Tertiary Select", QKeySequence(Qt::ShiftModifier | (int)Qt::MiddleButton));
-    declareModifier("scene-speed-modifier", "Speed Modifier", Qt::Key_Shift);
-    declareShortcut("scene-delete", "Delete Instance", QKeySequence(Qt::Key_Delete));
-    declareShortcut("scene-instance-drop-terrain", "Drop to terrain level", QKeySequence(Qt::Key_G));
-    declareShortcut("scene-instance-drop-collision", "Drop to collision", QKeySequence(Qt::Key_H));
-    declareShortcut("scene-instance-drop-terrain-separately", "Drop to terrain level separately", QKeySequence());
-    declareShortcut("scene-instance-drop-collision-separately", "Drop to collision separately", QKeySequence());
-    declareShortcut("scene-load-cam-cell", "Load Camera Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_5));
-    declareShortcut("scene-load-cam-eastcell", "Load East Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_6));
-    declareShortcut("scene-load-cam-northcell", "Load North Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_8));
-    declareShortcut("scene-load-cam-westcell", "Load West Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_4));
-    declareShortcut("scene-load-cam-southcell", "Load South Cell", QKeySequence(Qt::KeypadModifier | Qt::Key_2));
-    declareShortcut("scene-edit-abort", "Abort", QKeySequence(Qt::Key_Escape));
-    declareShortcut("scene-focus-toolbar", "Toggle Toolbar Focus", QKeySequence(Qt::Key_T));
-    declareShortcut("scene-render-stats", "Debug Rendering Stats", QKeySequence(Qt::Key_F3));
+    declareShortcut(mValues->mKeyBindings.mSceneNaviPrimary, "Camera Rotation From Mouse Movement");
+    declareShortcut(mValues->mKeyBindings.mSceneNaviSecondary, "Camera Translation From Mouse Movement");
+    declareShortcut(mValues->mKeyBindings.mSceneOpenPrimary, "Primary Open");
+    declareShortcut(mValues->mKeyBindings.mSceneEditPrimary, "Primary Edit");
+    declareShortcut(mValues->mKeyBindings.mSceneEditSecondary, "Secondary Edit");
+    declareShortcut(mValues->mKeyBindings.mSceneSelectPrimary, "Primary Select");
+    declareShortcut(mValues->mKeyBindings.mSceneSelectSecondary, "Secondary Select");
+    declareShortcut(mValues->mKeyBindings.mSceneSelectTertiary, "Tertiary Select");
+    declareModifier(mValues->mKeyBindings.mSceneSpeedModifier, "Speed Modifier");
+    declareShortcut(mValues->mKeyBindings.mSceneDelete, "Delete Instance");
+    declareShortcut(mValues->mKeyBindings.mSceneInstanceDrop, "Drop to Collision");
+    declareShortcut(mValues->mKeyBindings.mSceneLoadCamCell, "Load Camera Cell");
+    declareShortcut(mValues->mKeyBindings.mSceneLoadCamEastcell, "Load East Cell");
+    declareShortcut(mValues->mKeyBindings.mSceneLoadCamNorthcell, "Load North Cell");
+    declareShortcut(mValues->mKeyBindings.mSceneLoadCamWestcell, "Load West Cell");
+    declareShortcut(mValues->mKeyBindings.mSceneLoadCamSouthcell, "Load South Cell");
+    declareShortcut(mValues->mKeyBindings.mSceneEditAbort, "Abort");
+    declareShortcut(mValues->mKeyBindings.mSceneFocusToolbar, "Toggle Toolbar Focus");
+    declareShortcut(mValues->mKeyBindings.mSceneRenderStats, "Debug Rendering Stats");
+    declareShortcut(mValues->mKeyBindings.mSceneDuplicate, "Duplicate Instance");
+    declareShortcut(mValues->mKeyBindings.mSceneClearSelection, "Clear Selection");
+    declareShortcut(mValues->mKeyBindings.mSceneUnhideAll, "Unhide All Objects");
+    declareShortcut(mValues->mKeyBindings.mSceneToggleVisibility, "Toggle Selection Visibility");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup0, "Selection Group 0");
+    declareShortcut(mValues->mKeyBindings.mSceneSave0, "Save Group 0");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup1, "Select Group 1");
+    declareShortcut(mValues->mKeyBindings.mSceneSave1, "Save Group 1");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup2, "Select Group 2");
+    declareShortcut(mValues->mKeyBindings.mSceneSave2, "Save Group 2");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup3, "Select Group 3");
+    declareShortcut(mValues->mKeyBindings.mSceneSave3, "Save Group 3");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup4, "Select Group 4");
+    declareShortcut(mValues->mKeyBindings.mSceneSave4, "Save Group 4");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup5, "Selection Group 5");
+    declareShortcut(mValues->mKeyBindings.mSceneSave5, "Save Group 5");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup6, "Selection Group 6");
+    declareShortcut(mValues->mKeyBindings.mSceneSave6, "Save Group 6");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup7, "Selection Group 7");
+    declareShortcut(mValues->mKeyBindings.mSceneSave7, "Save Group 7");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup8, "Selection Group 8");
+    declareShortcut(mValues->mKeyBindings.mSceneSave8, "Save Group 8");
+    declareShortcut(mValues->mKeyBindings.mSceneGroup9, "Selection Group 9");
+    declareShortcut(mValues->mKeyBindings.mSceneSave9, "Save Group 9");
+    declareShortcut(mValues->mKeyBindings.mSceneAxisX, "X Axis Movement Lock");
+    declareShortcut(mValues->mKeyBindings.mSceneAxisY, "Y Axis Movement Lock");
+    declareShortcut(mValues->mKeyBindings.mSceneAxisZ, "Z Axis Movement Lock");
+    declareShortcut(mValues->mKeyBindings.mSceneMoveSubmode, "Move Object Submode");
+    declareShortcut(mValues->mKeyBindings.mSceneScaleSubmode, "Scale Object Submode");
+    declareShortcut(mValues->mKeyBindings.mSceneRotateSubmode, "Rotate Object Submode");
+    declareShortcut(mValues->mKeyBindings.mSceneCameraCycle, "Cycle Camera Mode");
 
     declareSubcategory("1st/Free Camera");
-    declareShortcut("free-forward", "Forward", QKeySequence(Qt::Key_W));
-    declareShortcut("free-backward", "Backward", QKeySequence(Qt::Key_S));
-    declareShortcut("free-left", "Left", QKeySequence(Qt::Key_A));
-    declareShortcut("free-right", "Right", QKeySequence(Qt::Key_D));
-    declareShortcut("free-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
-    declareShortcut("free-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
-    declareShortcut("free-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
+    declareShortcut(mValues->mKeyBindings.mFreeForward, "Forward");
+    declareShortcut(mValues->mKeyBindings.mFreeBackward, "Backward");
+    declareShortcut(mValues->mKeyBindings.mFreeLeft, "Left");
+    declareShortcut(mValues->mKeyBindings.mFreeRight, "Right");
+    declareShortcut(mValues->mKeyBindings.mFreeRollLeft, "Roll Left");
+    declareShortcut(mValues->mKeyBindings.mFreeRollRight, "Roll Right");
+    declareShortcut(mValues->mKeyBindings.mFreeSpeedMode, "Toggle Speed Mode");
 
     declareSubcategory("Orbit Camera");
-    declareShortcut("orbit-up", "Up", QKeySequence(Qt::Key_W));
-    declareShortcut("orbit-down", "Down", QKeySequence(Qt::Key_S));
-    declareShortcut("orbit-left", "Left", QKeySequence(Qt::Key_A));
-    declareShortcut("orbit-right", "Right", QKeySequence(Qt::Key_D));
-    declareShortcut("orbit-roll-left", "Roll Left", QKeySequence(Qt::Key_Q));
-    declareShortcut("orbit-roll-right", "Roll Right", QKeySequence(Qt::Key_E));
-    declareShortcut("orbit-speed-mode", "Toggle Speed Mode", QKeySequence(Qt::Key_F));
-    declareShortcut("orbit-center-selection", "Center On Selected", QKeySequence(Qt::Key_C));
+    declareShortcut(mValues->mKeyBindings.mOrbitUp, "Up");
+    declareShortcut(mValues->mKeyBindings.mOrbitDown, "Down");
+    declareShortcut(mValues->mKeyBindings.mOrbitLeft, "Left");
+    declareShortcut(mValues->mKeyBindings.mOrbitRight, "Right");
+    declareShortcut(mValues->mKeyBindings.mOrbitRollLeft, "Roll Left");
+    declareShortcut(mValues->mKeyBindings.mOrbitRollRight, "Roll Right");
+    declareShortcut(mValues->mKeyBindings.mOrbitSpeedMode, "Toggle Speed Mode");
+    declareShortcut(mValues->mKeyBindings.mOrbitCenterSelection, "Center On Selected");
 
     declareSubcategory("Script Editor");
-    declareShortcut("script-editor-comment", "Comment Selection", QKeySequence());
-    declareShortcut("script-editor-uncomment", "Uncomment Selection", QKeySequence());
+    declareShortcut(mValues->mKeyBindings.mScriptEditorComment, "Comment Selection");
+    declareShortcut(mValues->mKeyBindings.mScriptEditorUncomment, "Uncomment Selection");
 
     declareCategory("Models");
-    declareString("baseanim", "base animations", "meshes/base_anim.nif")
-        .setTooltip("3rd person base model with textkeys-data");
-    declareString("baseanimkna", "base animations, kna", "meshes/base_animkna.nif")
-        .setTooltip("3rd person beast race base model with textkeys-data");
-    declareString("baseanimfemale", "base animations, female", "meshes/base_anim_female.nif")
-        .setTooltip("3rd person female base model with textkeys-data");
-    declareString("wolfskin", "base animations, wolf", "meshes/wolf/skin.nif").setTooltip("3rd person werewolf skin");
+    declareString(mValues->mModels.mBaseanim, "Base Animations").setTooltip("Third person base model and animations");
+    declareString(mValues->mModels.mBaseanimkna, "Base Animations, Beast")
+        .setTooltip("Third person beast race base model and animations");
+    declareString(mValues->mModels.mBaseanimfemale, "Base Animations, Female")
+        .setTooltip("Third person female base model and animations");
+    declareString(mValues->mModels.mWolfskin, "Base Animations, Werewolf").setTooltip("Third person werewolf skin");
 }
 
 void CSMPrefs::State::declareCategory(const std::string& key)
@@ -463,71 +423,52 @@ void CSMPrefs::State::declareCategory(const std::string& key)
     }
 }
 
-CSMPrefs::IntSetting& CSMPrefs::State::declareInt(const std::string& key, const std::string& label, int default_)
+CSMPrefs::IntSetting& CSMPrefs::State::declareInt(Settings::SettingValue<int>& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    setDefault(key, std::to_string(default_));
-
-    default_ = Settings::Manager::getInt(key, mCurrentCategory->second.getKey());
-
-    CSMPrefs::IntSetting* setting = new CSMPrefs::IntSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
+    CSMPrefs::IntSetting* setting
+        = new CSMPrefs::IntSetting(&mCurrentCategory->second, &mMutex, value.mName, label, *mIndex);
 
     mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::DoubleSetting& CSMPrefs::State::declareDouble(
-    const std::string& key, const std::string& label, double default_)
+CSMPrefs::DoubleSetting& CSMPrefs::State::declareDouble(Settings::SettingValue<double>& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    std::ostringstream stream;
-    stream << default_;
-    setDefault(key, stream.str());
-
-    default_ = Settings::Manager::getFloat(key, mCurrentCategory->second.getKey());
-
     CSMPrefs::DoubleSetting* setting
-        = new CSMPrefs::DoubleSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
+        = new CSMPrefs::DoubleSetting(&mCurrentCategory->second, &mMutex, value.mName, label, *mIndex);
 
     mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::BoolSetting& CSMPrefs::State::declareBool(const std::string& key, const std::string& label, bool default_)
+CSMPrefs::BoolSetting& CSMPrefs::State::declareBool(Settings::SettingValue<bool>& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    setDefault(key, default_ ? "true" : "false");
-
-    default_ = Settings::Manager::getBool(key, mCurrentCategory->second.getKey());
-
     CSMPrefs::BoolSetting* setting
-        = new CSMPrefs::BoolSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
+        = new CSMPrefs::BoolSetting(&mCurrentCategory->second, &mMutex, value.mName, label, *mIndex);
 
     mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-CSMPrefs::EnumSetting& CSMPrefs::State::declareEnum(
-    const std::string& key, const std::string& label, EnumValue default_)
+CSMPrefs::EnumSetting& CSMPrefs::State::declareEnum(EnumSettingValue& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    setDefault(key, default_.mValue);
-
-    default_.mValue = Settings::Manager::getString(key, mCurrentCategory->second.getKey());
-
-    CSMPrefs::EnumSetting* setting
-        = new CSMPrefs::EnumSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
+    CSMPrefs::EnumSetting* setting = new CSMPrefs::EnumSetting(
+        &mCurrentCategory->second, &mMutex, value.getValue().mName, label, value.getEnumValues(), *mIndex);
 
     mCurrentCategory->second.addSetting(setting);
 
@@ -535,18 +476,13 @@ CSMPrefs::EnumSetting& CSMPrefs::State::declareEnum(
 }
 
 CSMPrefs::ColourSetting& CSMPrefs::State::declareColour(
-    const std::string& key, const std::string& label, QColor default_)
+    Settings::SettingValue<std::string>& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    setDefault(key, default_.name().toUtf8().data());
-
-    default_.setNamedColor(
-        QString::fromUtf8(Settings::Manager::getString(key, mCurrentCategory->second.getKey()).c_str()));
-
     CSMPrefs::ColourSetting* setting
-        = new CSMPrefs::ColourSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
+        = new CSMPrefs::ColourSetting(&mCurrentCategory->second, &mMutex, value.mName, label, *mIndex);
 
     mCurrentCategory->second.addSetting(setting);
 
@@ -554,39 +490,32 @@ CSMPrefs::ColourSetting& CSMPrefs::State::declareColour(
 }
 
 CSMPrefs::ShortcutSetting& CSMPrefs::State::declareShortcut(
-    const std::string& key, const std::string& label, const QKeySequence& default_)
+    Settings::SettingValue<std::string>& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    std::string seqStr = getShortcutManager().convertToString(default_);
-    setDefault(key, seqStr);
-
     // Setup with actual data
     QKeySequence sequence;
 
-    getShortcutManager().convertFromString(
-        Settings::Manager::getString(key, mCurrentCategory->second.getKey()), sequence);
-    getShortcutManager().setSequence(key, sequence);
+    getShortcutManager().convertFromString(value, sequence);
+    getShortcutManager().setSequence(value.mName, sequence);
 
-    CSMPrefs::ShortcutSetting* setting = new CSMPrefs::ShortcutSetting(&mCurrentCategory->second, &mMutex, key, label);
+    CSMPrefs::ShortcutSetting* setting
+        = new CSMPrefs::ShortcutSetting(&mCurrentCategory->second, &mMutex, value.mName, label, *mIndex);
     mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
 CSMPrefs::StringSetting& CSMPrefs::State::declareString(
-    const std::string& key, const std::string& label, std::string default_)
+    Settings::SettingValue<std::string>& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    setDefault(key, default_);
-
-    default_ = Settings::Manager::getString(key, mCurrentCategory->second.getKey());
-
     CSMPrefs::StringSetting* setting
-        = new CSMPrefs::StringSetting(&mCurrentCategory->second, &mMutex, key, label, default_);
+        = new CSMPrefs::StringSetting(&mCurrentCategory->second, &mMutex, value.mName, label, *mIndex);
 
     mCurrentCategory->second.addSetting(setting);
 
@@ -594,55 +523,31 @@ CSMPrefs::StringSetting& CSMPrefs::State::declareString(
 }
 
 CSMPrefs::ModifierSetting& CSMPrefs::State::declareModifier(
-    const std::string& key, const std::string& label, int default_)
+    Settings::SettingValue<std::string>& value, const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    std::string modStr = getShortcutManager().convertToString(default_);
-    setDefault(key, modStr);
-
     // Setup with actual data
     int modifier;
 
-    getShortcutManager().convertFromString(
-        Settings::Manager::getString(key, mCurrentCategory->second.getKey()), modifier);
-    getShortcutManager().setModifier(key, modifier);
+    getShortcutManager().convertFromString(value.get(), modifier);
+    getShortcutManager().setModifier(value.mName, modifier);
 
-    CSMPrefs::ModifierSetting* setting = new CSMPrefs::ModifierSetting(&mCurrentCategory->second, &mMutex, key, label);
+    CSMPrefs::ModifierSetting* setting
+        = new CSMPrefs::ModifierSetting(&mCurrentCategory->second, &mMutex, value.mName, label, *mIndex);
     mCurrentCategory->second.addSetting(setting);
 
     return *setting;
 }
 
-void CSMPrefs::State::declareSeparator()
+void CSMPrefs::State::declareSubcategory(const QString& label)
 {
     if (mCurrentCategory == mCategories.end())
         throw std::logic_error("no category for setting");
 
-    CSMPrefs::Setting* setting = new CSMPrefs::Setting(&mCurrentCategory->second, &mMutex, "", "");
-
-    mCurrentCategory->second.addSetting(setting);
-}
-
-void CSMPrefs::State::declareSubcategory(const std::string& label)
-{
-    if (mCurrentCategory == mCategories.end())
-        throw std::logic_error("no category for setting");
-
-    CSMPrefs::Setting* setting = new CSMPrefs::Setting(&mCurrentCategory->second, &mMutex, "", label);
-
-    mCurrentCategory->second.addSetting(setting);
-}
-
-void CSMPrefs::State::setDefault(const std::string& key, const std::string& default_)
-{
-    Settings::CategorySetting fullKey(mCurrentCategory->second.getKey(), key);
-
-    Settings::CategorySettingValueMap::iterator iter = Settings::Manager::mDefaultSettings.find(fullKey);
-
-    if (iter == Settings::Manager::mDefaultSettings.end())
-        Settings::Manager::mDefaultSettings.insert(std::make_pair(fullKey, default_));
+    mCurrentCategory->second.addSubcategory(
+        new CSMPrefs::Subcategory(&mCurrentCategory->second, &mMutex, label, *mIndex));
 }
 
 CSMPrefs::State::State(const Files::ConfigurationManager& configurationManager)
@@ -650,6 +555,8 @@ CSMPrefs::State::State(const Files::ConfigurationManager& configurationManager)
     , mDefaultConfigFile("defaults-cs.bin")
     , mConfigurationManager(configurationManager)
     , mCurrentCategory(mCategories.end())
+    , mIndex(std::make_unique<Settings::Index>())
+    , mValues(std::make_unique<Values>(*mIndex))
 {
     if (sThis)
         throw std::logic_error("An instance of CSMPRefs::State already exists");
@@ -709,27 +616,13 @@ CSMPrefs::State& CSMPrefs::State::get()
 
 void CSMPrefs::State::resetCategory(const std::string& category)
 {
-    for (Settings::CategorySettingValueMap::iterator i = Settings::Manager::mUserSettings.begin();
-         i != Settings::Manager::mUserSettings.end(); ++i)
-    {
-        // if the category matches
-        if (i->first.first == category)
-        {
-            // mark the setting as changed
-            Settings::Manager::mChangedSettings.insert(std::make_pair(i->first.first, i->first.second));
-            // reset the value to the default
-            i->second = Settings::Manager::mDefaultSettings[i->first];
-        }
-    }
-
     Collection::iterator container = mCategories.find(category);
     if (container != mCategories.end())
     {
-        Category settings = container->second;
-        for (Category::Iterator i = settings.begin(); i != settings.end(); ++i)
+        for (Setting* setting : container->second)
         {
-            (*i)->updateWidget();
-            update(**i);
+            setting->reset();
+            update(*setting);
         }
     }
 }
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index 354f4552e3..821322d586 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -17,6 +17,11 @@
 
 class QColor;
 
+namespace Settings
+{
+    class Index;
+}
+
 namespace CSMPrefs
 {
     class IntSetting;
@@ -27,6 +32,8 @@ namespace CSMPrefs
     class ModifierSetting;
     class Setting;
     class StringSetting;
+    class EnumSettingValue;
+    struct Values;
 
     /// \brief User settings state
     ///
@@ -50,43 +57,40 @@ namespace CSMPrefs
         Collection mCategories;
         Iterator mCurrentCategory;
         QMutex mMutex;
+        std::unique_ptr<Settings::Index> mIndex;
+        std::unique_ptr<Values> mValues;
 
-        // not implemented
-        State(const State&);
-        State& operator=(const State&);
-
-    private:
         void declare();
 
         void declareCategory(const std::string& key);
 
-        IntSetting& declareInt(const std::string& key, const std::string& label, int default_);
-        DoubleSetting& declareDouble(const std::string& key, const std::string& label, double default_);
+        IntSetting& declareInt(Settings::SettingValue<int>& value, const QString& label);
 
-        BoolSetting& declareBool(const std::string& key, const std::string& label, bool default_);
+        DoubleSetting& declareDouble(Settings::SettingValue<double>& value, const QString& label);
 
-        EnumSetting& declareEnum(const std::string& key, const std::string& label, EnumValue default_);
+        BoolSetting& declareBool(Settings::SettingValue<bool>& value, const QString& label);
 
-        ColourSetting& declareColour(const std::string& key, const std::string& label, QColor default_);
+        EnumSetting& declareEnum(EnumSettingValue& value, const QString& label);
 
-        ShortcutSetting& declareShortcut(
-            const std::string& key, const std::string& label, const QKeySequence& default_);
+        ColourSetting& declareColour(Settings::SettingValue<std::string>& value, const QString& label);
 
-        StringSetting& declareString(const std::string& key, const std::string& label, std::string default_);
+        ShortcutSetting& declareShortcut(Settings::SettingValue<std::string>& value, const QString& label);
 
-        ModifierSetting& declareModifier(const std::string& key, const std::string& label, int modifier_);
+        StringSetting& declareString(Settings::SettingValue<std::string>& value, const QString& label);
 
-        void declareSeparator();
+        ModifierSetting& declareModifier(Settings::SettingValue<std::string>& value, const QString& label);
 
-        void declareSubcategory(const std::string& label);
-
-        void setDefault(const std::string& key, const std::string& default_);
+        void declareSubcategory(const QString& label);
 
     public:
         State(const Files::ConfigurationManager& configurationManager);
 
+        State(const State&) = delete;
+
         ~State();
 
+        State& operator=(const State&) = delete;
+
         void save();
 
         Iterator begin();
diff --git a/apps/opencs/model/prefs/stringsetting.cpp b/apps/opencs/model/prefs/stringsetting.cpp
index 2a8fdd587a..4fa2955840 100644
--- a/apps/opencs/model/prefs/stringsetting.cpp
+++ b/apps/opencs/model/prefs/stringsetting.cpp
@@ -1,6 +1,7 @@
 
 #include "stringsetting.hpp"
 
+#include <QLabel>
 #include <QLineEdit>
 #include <QMutexLocker>
 
@@ -12,9 +13,8 @@
 #include "state.hpp"
 
 CSMPrefs::StringSetting::StringSetting(
-    Category* parent, QMutex* mutex, const std::string& key, const std::string& label, std::string_view default_)
-    : Setting(parent, mutex, key, label)
-    , mDefault(default_)
+    Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index)
+    : TypedSetting(parent, mutex, key, label, index)
     , mWidget(nullptr)
 {
 }
@@ -25,35 +25,33 @@ CSMPrefs::StringSetting& CSMPrefs::StringSetting::setTooltip(const std::string&
     return *this;
 }
 
-std::pair<QWidget*, QWidget*> CSMPrefs::StringSetting::makeWidgets(QWidget* parent)
+CSMPrefs::SettingWidgets CSMPrefs::StringSetting::makeWidgets(QWidget* parent)
 {
-    mWidget = new QLineEdit(QString::fromUtf8(mDefault.c_str()), parent);
+    QLabel* label = new QLabel(getLabel(), parent);
+
+    mWidget = new QLineEdit(QString::fromStdString(getValue()), parent);
+    mWidget->setMinimumWidth(300);
 
     if (!mTooltip.empty())
     {
         QString tooltip = QString::fromUtf8(mTooltip.c_str());
+        label->setToolTip(tooltip);
         mWidget->setToolTip(tooltip);
     }
 
     connect(mWidget, &QLineEdit::textChanged, this, &StringSetting::textChanged);
 
-    return std::make_pair(static_cast<QWidget*>(nullptr), mWidget);
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::StringSetting::updateWidget()
 {
     if (mWidget)
-    {
-        mWidget->setText(QString::fromStdString(Settings::Manager::getString(getKey(), getParent()->getKey())));
-    }
+        mWidget->setText(QString::fromStdString(getValue()));
 }
 
 void CSMPrefs::StringSetting::textChanged(const QString& text)
 {
-    {
-        QMutexLocker lock(getMutex());
-        Settings::Manager::setString(getKey(), getParent()->getKey(), text.toStdString());
-    }
-
+    setValue(text.toStdString());
     getParent()->getState()->update(*this);
 }
diff --git a/apps/opencs/model/prefs/stringsetting.hpp b/apps/opencs/model/prefs/stringsetting.hpp
index 4b5499ef86..0a7d2a4935 100644
--- a/apps/opencs/model/prefs/stringsetting.hpp
+++ b/apps/opencs/model/prefs/stringsetting.hpp
@@ -14,22 +14,22 @@ class QWidget;
 namespace CSMPrefs
 {
     class Category;
-    class StringSetting : public Setting
+
+    class StringSetting final : public TypedSetting<std::string>
     {
         Q_OBJECT
 
         std::string mTooltip;
-        std::string mDefault;
         QLineEdit* mWidget;
 
     public:
-        StringSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label,
-            std::string_view default_);
+        explicit StringSetting(
+            Category* parent, QMutex* mutex, std::string_view key, const QString& label, Settings::Index& index);
 
         StringSetting& setTooltip(const std::string& tooltip);
 
         /// Return label, input widget.
-        std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
+        SettingWidgets makeWidgets(QWidget* parent) override;
 
         void updateWidget() override;
 
diff --git a/apps/opencs/model/prefs/subcategory.cpp b/apps/opencs/model/prefs/subcategory.cpp
new file mode 100644
index 0000000000..815025daec
--- /dev/null
+++ b/apps/opencs/model/prefs/subcategory.cpp
@@ -0,0 +1,18 @@
+#include "subcategory.hpp"
+
+#include <QGridLayout>
+
+namespace CSMPrefs
+{
+    class Category;
+
+    Subcategory::Subcategory(Category* parent, QMutex* mutex, const QString& label, Settings::Index& index)
+        : Setting(parent, mutex, "", label, index)
+    {
+    }
+
+    SettingWidgets Subcategory::makeWidgets(QWidget* /*parent*/)
+    {
+        return SettingWidgets{ .mLabel = nullptr, .mInput = nullptr };
+    }
+}
diff --git a/apps/opencs/model/prefs/subcategory.hpp b/apps/opencs/model/prefs/subcategory.hpp
new file mode 100644
index 0000000000..4c661ad0fa
--- /dev/null
+++ b/apps/opencs/model/prefs/subcategory.hpp
@@ -0,0 +1,28 @@
+#ifndef OPENMW_APPS_OPENCS_MODEL_PREFS_SUBCATEGORY_H
+#define OPENMW_APPS_OPENCS_MODEL_PREFS_SUBCATEGORY_H
+
+#include "setting.hpp"
+
+#include <string>
+#include <utility>
+
+namespace CSMPrefs
+{
+    class Category;
+
+    class Subcategory final : public Setting
+    {
+        Q_OBJECT
+
+    public:
+        explicit Subcategory(Category* parent, QMutex* mutex, const QString& label, Settings::Index& index);
+
+        SettingWidgets makeWidgets(QWidget* parent) override;
+
+        void updateWidget() override {}
+
+        void reset() override {}
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/prefs/values.hpp b/apps/opencs/model/prefs/values.hpp
new file mode 100644
index 0000000000..1339fa62ed
--- /dev/null
+++ b/apps/opencs/model/prefs/values.hpp
@@ -0,0 +1,548 @@
+#ifndef OPENMW_APPS_OPENCS_MODEL_PREFS_VALUES_H
+#define OPENMW_APPS_OPENCS_MODEL_PREFS_VALUES_H
+
+#include "enumvalueview.hpp"
+
+#include <components/settings/sanitizer.hpp>
+#include <components/settings/settingvalue.hpp>
+
+#include <Qt>
+#include <QtGlobal>
+
+#include <array>
+#include <memory>
+#include <span>
+#include <string>
+#include <string_view>
+
+namespace CSMPrefs
+{
+    class EnumSanitizer final : public Settings::Sanitizer<std::string>
+    {
+    public:
+        explicit EnumSanitizer(std::span<const EnumValueView> values)
+            : mValues(values)
+        {
+        }
+
+        std::string apply(const std::string& value) const override
+        {
+            const auto hasValue = [&](const EnumValueView& v) { return v.mValue == value; };
+            if (std::find_if(mValues.begin(), mValues.end(), hasValue) == mValues.end())
+            {
+                std::ostringstream message;
+                message << "Invalid enum value: " << value;
+                throw std::runtime_error(message.str());
+            }
+            return value;
+        }
+
+    private:
+        std::span<const EnumValueView> mValues;
+    };
+
+    inline std::unique_ptr<Settings::Sanitizer<std::string>> makeEnumSanitizerString(
+        std::span<const EnumValueView> values)
+    {
+        return std::make_unique<EnumSanitizer>(values);
+    }
+
+    class EnumSettingValue
+    {
+    public:
+        explicit EnumSettingValue(Settings::Index& index, std::string_view category, std::string_view name,
+            std::span<const EnumValueView> values, std::size_t defaultValueIndex)
+            : mValue(
+                index, category, name, std::string(values[defaultValueIndex].mValue), makeEnumSanitizerString(values))
+            , mEnumValues(values)
+        {
+        }
+
+        Settings::SettingValue<std::string>& getValue() { return mValue; }
+
+        std::span<const EnumValueView> getEnumValues() const { return mEnumValues; }
+
+    private:
+        Settings::SettingValue<std::string> mValue;
+        std::span<const EnumValueView> mEnumValues;
+    };
+
+    struct WindowsCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Windows";
+
+        static constexpr std::array<EnumValueView, 3> sMainwindowScrollbarValues{
+            EnumValueView{
+                "Scrollbar Only", "Simple addition of scrollbars, the view window does not grow automatically." },
+            EnumValueView{ "Grow Only", "The view window grows as subviews are added. No scrollbars." },
+            EnumValueView{
+                "Grow then Scroll", "The view window grows. The scrollbar appears once it cannot grow any further." },
+        };
+
+        Settings::SettingValue<int> mDefaultWidth{ mIndex, sName, "default-width", 800 };
+        Settings::SettingValue<int> mDefaultHeight{ mIndex, sName, "default-height", 600 };
+        Settings::SettingValue<bool> mShowStatusbar{ mIndex, sName, "show-statusbar", true };
+        Settings::SettingValue<bool> mReuse{ mIndex, sName, "reuse", true };
+        Settings::SettingValue<int> mMaxSubviews{ mIndex, sName, "max-subviews", 256 };
+        Settings::SettingValue<bool> mHideSubview{ mIndex, sName, "hide-subview", false };
+        Settings::SettingValue<int> mMinimumWidth{ mIndex, sName, "minimum-width", 325 };
+        EnumSettingValue mMainwindowScrollbar{ mIndex, sName, "mainwindow-scrollbar", sMainwindowScrollbarValues, 0 };
+        Settings::SettingValue<bool> mGrowLimit{ mIndex, sName, "grow-limit", false };
+    };
+
+    struct RecordsCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Records";
+
+        static constexpr std::array<EnumValueView, 3> sRecordValues{
+            EnumValueView{ "Icon and Text", "" },
+            EnumValueView{ "Icon Only", "" },
+            EnumValueView{ "Text Only", "" },
+        };
+
+        EnumSettingValue mStatusFormat{ mIndex, sName, "status-format", sRecordValues, 0 };
+        EnumSettingValue mTypeFormat{ mIndex, sName, "type-format", sRecordValues, 0 };
+    };
+
+    struct IdTablesCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "ID Tables";
+
+        static constexpr std::array<EnumValueView, 7> sDoubleClickValues{
+            EnumValueView{ "Edit in Place", "Edit the clicked cell" },
+            EnumValueView{ "Edit Record", "Open a dialogue subview for the clicked record" },
+            EnumValueView{ "View", "Open a scene subview for the clicked record (not available everywhere)" },
+            EnumValueView{ "Revert", "" },
+            EnumValueView{ "Delete", "" },
+            EnumValueView{ "Edit Record and Close", "" },
+            EnumValueView{
+                "View and Close", "Open a scene subview for the clicked record and close the table subview" },
+        };
+
+        static constexpr std::array<EnumValueView, 3> sJumpAndSelectValues{
+            EnumValueView{ "Jump and Select", "Scroll new record into view and make it the selection" },
+            EnumValueView{ "Jump Only", "Scroll new record into view" },
+            EnumValueView{ "No Jump", "No special action" },
+        };
+
+        EnumSettingValue mDouble{ mIndex, sName, "double", sDoubleClickValues, 0 };
+        EnumSettingValue mDoubleS{ mIndex, sName, "double-s", sDoubleClickValues, 1 };
+        EnumSettingValue mDoubleC{ mIndex, sName, "double-c", sDoubleClickValues, 2 };
+        EnumSettingValue mDoubleSc{ mIndex, sName, "double-sc", sDoubleClickValues, 5 };
+        EnumSettingValue mJumpToAdded{ mIndex, sName, "jump-to-added", sJumpAndSelectValues, 0 };
+        Settings::SettingValue<bool> mExtendedConfig{ mIndex, sName, "extended-config", false };
+        Settings::SettingValue<bool> mSubviewNewWindow{ mIndex, sName, "subview-new-window", false };
+        Settings::SettingValue<int> mFilterDelay{ mIndex, sName, "filter-delay", 500 };
+    };
+
+    struct IdDialoguesCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "ID Dialogues";
+
+        Settings::SettingValue<bool> mToolbar{ mIndex, sName, "toolbar", true };
+    };
+
+    struct ReportsCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Reports";
+
+        static constexpr std::array<EnumValueView, 4> sReportValues{
+            EnumValueView{ "None", "" },
+            EnumValueView{ "Edit", "Open a table or dialogue suitable for addressing the listed report" },
+            EnumValueView{ "Remove", "Remove the report from the report table" },
+            EnumValueView{ "Edit And Remove",
+                "Open a table or dialogue suitable for addressing the listed report, then remove the report from the "
+                "report table" },
+        };
+
+        EnumSettingValue mDouble{ mIndex, sName, "double", sReportValues, 1 };
+        EnumSettingValue mDoubleS{ mIndex, sName, "double-s", sReportValues, 2 };
+        EnumSettingValue mDoubleC{ mIndex, sName, "double-c", sReportValues, 3 };
+        EnumSettingValue mDoubleSc{ mIndex, sName, "double-sc", sReportValues, 0 };
+        Settings::SettingValue<bool> mIgnoreBaseRecords{ mIndex, sName, "ignore-base-records", false };
+    };
+
+    struct SearchAndReplaceCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Search & Replace";
+
+        Settings::SettingValue<int> mCharBefore{ mIndex, sName, "char-before", 10 };
+        Settings::SettingValue<int> mCharAfter{ mIndex, sName, "char-after", 10 };
+        Settings::SettingValue<bool> mAutoDelete{ mIndex, sName, "auto-delete", true };
+    };
+
+    struct ScriptsCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Scripts";
+
+        static constexpr std::array<EnumValueView, 3> sWarningValues{
+            EnumValueView{ "Ignore", "Do not report warning" },
+            EnumValueView{ "Normal", "Report warnings as warning" },
+            EnumValueView{ "Strict", "Promote warning to an error" },
+        };
+
+        Settings::SettingValue<bool> mShowLinenum{ mIndex, sName, "show-linenum", true };
+        Settings::SettingValue<bool> mWrapLines{ mIndex, sName, "wrap-lines", false };
+        Settings::SettingValue<bool> mMonoFont{ mIndex, sName, "mono-font", true };
+        Settings::SettingValue<int> mTabWidth{ mIndex, sName, "tab-width", 4 };
+        EnumSettingValue mWarnings{ mIndex, sName, "warnings", sWarningValues, 1 };
+        Settings::SettingValue<bool> mToolbar{ mIndex, sName, "toolbar", true };
+        Settings::SettingValue<int> mCompileDelay{ mIndex, sName, "compile-delay", 100 };
+        Settings::SettingValue<int> mErrorHeight{ mIndex, sName, "error-height", 100 };
+        Settings::SettingValue<bool> mHighlightOccurrences{ mIndex, sName, "highlight-occurrences", true };
+        Settings::SettingValue<std::string> mColourHighlight{ mIndex, sName, "colour-highlight", "lightcyan" };
+        Settings::SettingValue<std::string> mColourInt{ mIndex, sName, "colour-int", "#aa55ff" };
+        Settings::SettingValue<std::string> mColourFloat{ mIndex, sName, "colour-float", "magenta" };
+        Settings::SettingValue<std::string> mColourName{ mIndex, sName, "colour-name", "grey" };
+        Settings::SettingValue<std::string> mColourKeyword{ mIndex, sName, "colour-keyword", "red" };
+        Settings::SettingValue<std::string> mColourSpecial{ mIndex, sName, "colour-special", "darkorange" };
+        Settings::SettingValue<std::string> mColourComment{ mIndex, sName, "colour-comment", "green" };
+        Settings::SettingValue<std::string> mColourId{ mIndex, sName, "colour-id", "#0055ff" };
+    };
+
+    struct GeneralInputCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "General Input";
+
+        Settings::SettingValue<bool> mCycle{ mIndex, sName, "cycle", false };
+    };
+
+    struct SceneInputCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "3D Scene Input";
+
+        Settings::SettingValue<double> mNaviWheelFactor{ mIndex, sName, "navi-wheel-factor", 8 };
+        Settings::SettingValue<double> mSNaviSensitivity{ mIndex, sName, "s-navi-sensitivity", 50 };
+        Settings::SettingValue<double> mPNaviFreeSensitivity{ mIndex, sName, "p-navi-free-sensitivity", 1 / 650.0 };
+        Settings::SettingValue<bool> mPNaviFreeInvert{ mIndex, sName, "p-navi-free-invert", false };
+        Settings::SettingValue<double> mNaviFreeLinSpeed{ mIndex, sName, "navi-free-lin-speed", 1000 };
+        Settings::SettingValue<double> mNaviFreeRotSpeed{ mIndex, sName, "navi-free-rot-speed", 3.14 / 2 };
+        Settings::SettingValue<double> mNaviFreeSpeedMult{ mIndex, sName, "navi-free-speed-mult", 8 };
+        Settings::SettingValue<double> mPNaviOrbitSensitivity{ mIndex, sName, "p-navi-orbit-sensitivity", 1 / 650.0 };
+        Settings::SettingValue<bool> mPNaviOrbitInvert{ mIndex, sName, "p-navi-orbit-invert", false };
+        Settings::SettingValue<double> mNaviOrbitRotSpeed{ mIndex, sName, "navi-orbit-rot-speed", 3.14 / 4 };
+        Settings::SettingValue<double> mNaviOrbitSpeedMult{ mIndex, sName, "navi-orbit-speed-mult", 4 };
+        Settings::SettingValue<bool> mNaviOrbitConstRoll{ mIndex, sName, "navi-orbit-const-roll", true };
+        Settings::SettingValue<bool> mContextSelect{ mIndex, sName, "context-select", false };
+        Settings::SettingValue<double> mDragFactor{ mIndex, sName, "drag-factor", 1 };
+        Settings::SettingValue<double> mDragWheelFactor{ mIndex, sName, "drag-wheel-factor", 1 };
+        Settings::SettingValue<double> mDragShiftFactor{ mIndex, sName, "drag-shift-factor", 4 };
+        Settings::SettingValue<double> mRotateFactor{ mIndex, sName, "rotate-factor", 0.007 };
+    };
+
+    struct RenderingCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Rendering";
+
+        Settings::SettingValue<int> mFramerateLimit{ mIndex, sName, "framerate-limit", 60 };
+        Settings::SettingValue<int> mCameraFov{ mIndex, sName, "camera-fov", 90 };
+        Settings::SettingValue<bool> mCameraOrtho{ mIndex, sName, "camera-ortho", false };
+        Settings::SettingValue<int> mCameraOrthoSize{ mIndex, sName, "camera-ortho-size", 100 };
+        Settings::SettingValue<double> mObjectMarkerAlpha{ mIndex, sName, "object-marker-alpha", 0.5 };
+        Settings::SettingValue<bool> mSceneUseGradient{ mIndex, sName, "scene-use-gradient", true };
+        Settings::SettingValue<std::string> mSceneDayBackgroundColour{ mIndex, sName, "scene-day-background-colour",
+            "#6e7880" };
+        Settings::SettingValue<std::string> mSceneDayGradientColour{ mIndex, sName, "scene-day-gradient-colour",
+            "#2f3333" };
+        Settings::SettingValue<std::string> mSceneBrightBackgroundColour{ mIndex, sName,
+            "scene-bright-background-colour", "#4f575c" };
+        Settings::SettingValue<std::string> mSceneBrightGradientColour{ mIndex, sName, "scene-bright-gradient-colour",
+            "#2f3333" };
+        Settings::SettingValue<std::string> mSceneNightBackgroundColour{ mIndex, sName, "scene-night-background-colour",
+            "#404d4f" };
+        Settings::SettingValue<std::string> mSceneNightGradientColour{ mIndex, sName, "scene-night-gradient-colour",
+            "#2f3333" };
+        Settings::SettingValue<bool> mSceneDayNightSwitchNodes{ mIndex, sName, "scene-day-night-switch-nodes", true };
+    };
+
+    struct TooltipsCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Tooltips";
+
+        Settings::SettingValue<bool> mScene{ mIndex, sName, "scene", true };
+        Settings::SettingValue<bool> mSceneHideBasic{ mIndex, sName, "scene-hide-basic", false };
+        Settings::SettingValue<int> mSceneDelay{ mIndex, sName, "scene-delay", 500 };
+    };
+
+    struct SceneEditingCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "3D Scene Editing";
+
+        static constexpr std::array<EnumValueView, 3> sInsertOutsideCellValues{
+            EnumValueView{ "Create cell and insert", "" },
+            EnumValueView{ "Discard", "" },
+            EnumValueView{ "Insert anyway", "" },
+        };
+
+        static constexpr std::array<EnumValueView, 3> sInsertOutsideVisibleCellValues{
+            EnumValueView{ "Show cell and insert", "" },
+            EnumValueView{ "Discard", "" },
+            EnumValueView{ "Insert anyway", "" },
+        };
+
+        static constexpr std::array<EnumValueView, 2> sLandEditOutsideCellValues{
+            EnumValueView{ "Create cell and land, then edit", "" },
+            EnumValueView{ "Discard", "" },
+        };
+
+        static constexpr std::array<EnumValueView, 2> sLandEditOutsideVisibleCellValues{
+            EnumValueView{ "Show cell and edit", "" },
+            EnumValueView{ "Discard", "" },
+        };
+
+        static constexpr std::array<EnumValueView, 4> sSelectAction{
+            EnumValueView{ "Select only", "" },
+            EnumValueView{ "Add to selection", "" },
+            EnumValueView{ "Remove from selection", "" },
+            EnumValueView{ "Invert selection", "" },
+        };
+
+        Settings::SettingValue<double> mGridsnapMovement{ mIndex, sName, "gridsnap-movement", 16 };
+        Settings::SettingValue<double> mGridsnapRotation{ mIndex, sName, "gridsnap-rotation", 15 };
+        Settings::SettingValue<double> mGridsnapScale{ mIndex, sName, "gridsnap-scale", 0.25 };
+        Settings::SettingValue<int> mDistance{ mIndex, sName, "distance", 50 };
+        EnumSettingValue mOutsideDrop{ mIndex, sName, "outside-drop", sInsertOutsideCellValues, 0 };
+        EnumSettingValue mOutsideVisibleDrop{ mIndex, sName, "outside-visible-drop", sInsertOutsideVisibleCellValues,
+            0 };
+        EnumSettingValue mOutsideLandedit{ mIndex, sName, "outside-landedit", sLandEditOutsideCellValues, 0 };
+        EnumSettingValue mOutsideVisibleLandedit{ mIndex, sName, "outside-visible-landedit",
+            sLandEditOutsideVisibleCellValues, 0 };
+        Settings::SettingValue<int> mTexturebrushMaximumsize{ mIndex, sName, "texturebrush-maximumsize", 50 };
+        Settings::SettingValue<int> mShapebrushMaximumsize{ mIndex, sName, "shapebrush-maximumsize", 100 };
+        Settings::SettingValue<bool> mLandeditPostSmoothpainting{ mIndex, sName, "landedit-post-smoothpainting",
+            false };
+        Settings::SettingValue<double> mLandeditPostSmoothstrength{ mIndex, sName, "landedit-post-smoothstrength",
+            0.25 };
+        Settings::SettingValue<bool> mOpenListView{ mIndex, sName, "open-list-view", false };
+        EnumSettingValue mPrimarySelectAction{ mIndex, sName, "primary-select-action", sSelectAction, 0 };
+        EnumSettingValue mSecondarySelectAction{ mIndex, sName, "secondary-select-action", sSelectAction, 1 };
+    };
+
+    struct KeyBindingsCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Key Bindings";
+
+        Settings::SettingValue<std::string> mDocumentFileNewgame{ mIndex, sName, "document-file-newgame", "Ctrl+N" };
+        Settings::SettingValue<std::string> mDocumentFileNewaddon{ mIndex, sName, "document-file-newaddon", "" };
+        Settings::SettingValue<std::string> mDocumentFileOpen{ mIndex, sName, "document-file-open", "Ctrl+O" };
+        Settings::SettingValue<std::string> mDocumentFileSave{ mIndex, sName, "document-file-save", "Ctrl+S" };
+        Settings::SettingValue<std::string> mDocumentHelpHelp{ mIndex, sName, "document-help-help", "F1" };
+        Settings::SettingValue<std::string> mDocumentHelpTutorial{ mIndex, sName, "document-help-tutorial", "" };
+        Settings::SettingValue<std::string> mDocumentFileVerify{ mIndex, sName, "document-file-verify", "" };
+        Settings::SettingValue<std::string> mDocumentFileMerge{ mIndex, sName, "document-file-merge", "" };
+        Settings::SettingValue<std::string> mDocumentFileErrorlog{ mIndex, sName, "document-file-errorlog", "" };
+        Settings::SettingValue<std::string> mDocumentFileMetadata{ mIndex, sName, "document-file-metadata", "" };
+        Settings::SettingValue<std::string> mDocumentFileClose{ mIndex, sName, "document-file-close", "Ctrl+W" };
+        Settings::SettingValue<std::string> mDocumentFileExit{ mIndex, sName, "document-file-exit", "Ctrl+Q" };
+        Settings::SettingValue<std::string> mDocumentEditUndo{ mIndex, sName, "document-edit-undo", "Ctrl+Z" };
+        Settings::SettingValue<std::string> mDocumentEditRedo{ mIndex, sName, "document-edit-redo", "Ctrl+Shift+Z" };
+        Settings::SettingValue<std::string> mDocumentEditPreferences{ mIndex, sName, "document-edit-preferences", "" };
+        Settings::SettingValue<std::string> mDocumentEditSearch{ mIndex, sName, "document-edit-search", "Ctrl+F" };
+        Settings::SettingValue<std::string> mDocumentViewNewview{ mIndex, sName, "document-view-newview", "" };
+        Settings::SettingValue<std::string> mDocumentViewStatusbar{ mIndex, sName, "document-view-statusbar", "" };
+        Settings::SettingValue<std::string> mDocumentViewFilters{ mIndex, sName, "document-view-filters", "" };
+        Settings::SettingValue<std::string> mDocumentWorldRegions{ mIndex, sName, "document-world-regions", "" };
+        Settings::SettingValue<std::string> mDocumentWorldCells{ mIndex, sName, "document-world-cells", "" };
+        Settings::SettingValue<std::string> mDocumentWorldReferencables{ mIndex, sName, "document-world-referencables",
+            "" };
+        Settings::SettingValue<std::string> mDocumentWorldReferences{ mIndex, sName, "document-world-references", "" };
+        Settings::SettingValue<std::string> mDocumentWorldLands{ mIndex, sName, "document-world-lands", "" };
+        Settings::SettingValue<std::string> mDocumentWorldLandtextures{ mIndex, sName, "document-world-landtextures",
+            "" };
+        Settings::SettingValue<std::string> mDocumentWorldPathgrid{ mIndex, sName, "document-world-pathgrid", "" };
+        Settings::SettingValue<std::string> mDocumentWorldRegionmap{ mIndex, sName, "document-world-regionmap", "" };
+        Settings::SettingValue<std::string> mDocumentMechanicsGlobals{ mIndex, sName, "document-mechanics-globals",
+            "" };
+        Settings::SettingValue<std::string> mDocumentMechanicsGamesettings{ mIndex, sName,
+            "document-mechanics-gamesettings", "" };
+        Settings::SettingValue<std::string> mDocumentMechanicsScripts{ mIndex, sName, "document-mechanics-scripts",
+            "" };
+        Settings::SettingValue<std::string> mDocumentMechanicsSpells{ mIndex, sName, "document-mechanics-spells", "" };
+        Settings::SettingValue<std::string> mDocumentMechanicsEnchantments{ mIndex, sName,
+            "document-mechanics-enchantments", "" };
+        Settings::SettingValue<std::string> mDocumentMechanicsMagiceffects{ mIndex, sName,
+            "document-mechanics-magiceffects", "" };
+        Settings::SettingValue<std::string> mDocumentMechanicsStartscripts{ mIndex, sName,
+            "document-mechanics-startscripts", "" };
+        Settings::SettingValue<std::string> mDocumentCharacterSkills{ mIndex, sName, "document-character-skills", "" };
+        Settings::SettingValue<std::string> mDocumentCharacterClasses{ mIndex, sName, "document-character-classes",
+            "" };
+        Settings::SettingValue<std::string> mDocumentCharacterFactions{ mIndex, sName, "document-character-factions",
+            "" };
+        Settings::SettingValue<std::string> mDocumentCharacterRaces{ mIndex, sName, "document-character-races", "" };
+        Settings::SettingValue<std::string> mDocumentCharacterBirthsigns{ mIndex, sName,
+            "document-character-birthsigns", "" };
+        Settings::SettingValue<std::string> mDocumentCharacterTopics{ mIndex, sName, "document-character-topics", "" };
+        Settings::SettingValue<std::string> mDocumentCharacterJournals{ mIndex, sName, "document-character-journals",
+            "" };
+        Settings::SettingValue<std::string> mDocumentCharacterTopicinfos{ mIndex, sName,
+            "document-character-topicinfos", "" };
+        Settings::SettingValue<std::string> mDocumentCharacterJournalinfos{ mIndex, sName,
+            "document-character-journalinfos", "" };
+        Settings::SettingValue<std::string> mDocumentCharacterBodyparts{ mIndex, sName, "document-character-bodyparts",
+            "" };
+        Settings::SettingValue<std::string> mDocumentAssetsReload{ mIndex, sName, "document-assets-reload", "F5" };
+        Settings::SettingValue<std::string> mDocumentAssetsSounds{ mIndex, sName, "document-assets-sounds", "" };
+        Settings::SettingValue<std::string> mDocumentAssetsSoundgens{ mIndex, sName, "document-assets-soundgens", "" };
+        Settings::SettingValue<std::string> mDocumentAssetsMeshes{ mIndex, sName, "document-assets-meshes", "" };
+        Settings::SettingValue<std::string> mDocumentAssetsIcons{ mIndex, sName, "document-assets-icons", "" };
+        Settings::SettingValue<std::string> mDocumentAssetsMusic{ mIndex, sName, "document-assets-music", "" };
+        Settings::SettingValue<std::string> mDocumentAssetsSoundres{ mIndex, sName, "document-assets-soundres", "" };
+        Settings::SettingValue<std::string> mDocumentAssetsTextures{ mIndex, sName, "document-assets-textures", "" };
+        Settings::SettingValue<std::string> mDocumentAssetsVideos{ mIndex, sName, "document-assets-videos", "" };
+        Settings::SettingValue<std::string> mDocumentDebugRun{ mIndex, sName, "document-debug-run", "" };
+        Settings::SettingValue<std::string> mDocumentDebugShutdown{ mIndex, sName, "document-debug-shutdown", "" };
+        Settings::SettingValue<std::string> mDocumentDebugProfiles{ mIndex, sName, "document-debug-profiles", "" };
+        Settings::SettingValue<std::string> mDocumentDebugRunlog{ mIndex, sName, "document-debug-runlog", "" };
+        Settings::SettingValue<std::string> mTableEdit{ mIndex, sName, "table-edit", "" };
+        Settings::SettingValue<std::string> mTableAdd{ mIndex, sName, "table-add", "Shift+A" };
+        Settings::SettingValue<std::string> mTableClone{ mIndex, sName, "table-clone", "Shift+D" };
+        Settings::SettingValue<std::string> mTouchRecord{ mIndex, sName, "touch-record", "" };
+        Settings::SettingValue<std::string> mTableRevert{ mIndex, sName, "table-revert", "" };
+        Settings::SettingValue<std::string> mTableRemove{ mIndex, sName, "table-remove", "Delete" };
+        Settings::SettingValue<std::string> mTableMoveup{ mIndex, sName, "table-moveup", "" };
+        Settings::SettingValue<std::string> mTableMovedown{ mIndex, sName, "table-movedown", "" };
+        Settings::SettingValue<std::string> mTableView{ mIndex, sName, "table-view", "Shift+C" };
+        Settings::SettingValue<std::string> mTablePreview{ mIndex, sName, "table-preview", "Shift+V" };
+        Settings::SettingValue<std::string> mTableExtendeddelete{ mIndex, sName, "table-extendeddelete", "" };
+        Settings::SettingValue<std::string> mTableExtendedrevert{ mIndex, sName, "table-extendedrevert", "" };
+        Settings::SettingValue<std::string> mReporttableShow{ mIndex, sName, "reporttable-show", "" };
+        Settings::SettingValue<std::string> mReporttableRemove{ mIndex, sName, "reporttable-remove", "Delete" };
+        Settings::SettingValue<std::string> mReporttableReplace{ mIndex, sName, "reporttable-replace", "" };
+        Settings::SettingValue<std::string> mReporttableRefresh{ mIndex, sName, "reporttable-refresh", "" };
+        Settings::SettingValue<std::string> mSceneNaviPrimary{ mIndex, sName, "scene-navi-primary", "MMB" };
+        Settings::SettingValue<std::string> mSceneNaviSecondary{ mIndex, sName, "scene-navi-secondary", "Ctrl+MMB" };
+        Settings::SettingValue<std::string> mSceneOpenPrimary{ mIndex, sName, "scene-open-primary", "Shift+RMB" };
+        Settings::SettingValue<std::string> mSceneEditPrimary{ mIndex, sName, "scene-edit-primary", "RMB" };
+        Settings::SettingValue<std::string> mSceneEditSecondary{ mIndex, sName, "scene-edit-secondary", "Ctrl+RMB" };
+        Settings::SettingValue<std::string> mSceneSelectPrimary{ mIndex, sName, "scene-select-primary", "LMB" };
+        Settings::SettingValue<std::string> mSceneSelectSecondary{ mIndex, sName, "scene-select-secondary",
+            "Ctrl+LMB" };
+        Settings::SettingValue<std::string> mSceneSelectTertiary{ mIndex, sName, "scene-select-tertiary", "Shift+LMB" };
+        Settings::SettingValue<std::string> mSceneSpeedModifier{ mIndex, sName, "scene-speed-modifier", "Shift" };
+        Settings::SettingValue<std::string> mSceneDelete{ mIndex, sName, "scene-delete", "Delete" };
+        Settings::SettingValue<std::string> mSceneInstanceDrop{ mIndex, sName, "scene-instance-drop", "F" };
+        Settings::SettingValue<std::string> mSceneDuplicate{ mIndex, sName, "scene-duplicate", "Shift+C" };
+        Settings::SettingValue<std::string> mSceneLoadCamCell{ mIndex, sName, "scene-load-cam-cell", "Keypad+5" };
+        Settings::SettingValue<std::string> mSceneLoadCamEastcell{ mIndex, sName, "scene-load-cam-eastcell",
+            "Keypad+6" };
+        Settings::SettingValue<std::string> mSceneLoadCamNorthcell{ mIndex, sName, "scene-load-cam-northcell",
+            "Keypad+8" };
+        Settings::SettingValue<std::string> mSceneLoadCamWestcell{ mIndex, sName, "scene-load-cam-westcell",
+            "Keypad+4" };
+        Settings::SettingValue<std::string> mSceneLoadCamSouthcell{ mIndex, sName, "scene-load-cam-southcell",
+            "Keypad+2" };
+        Settings::SettingValue<std::string> mSceneEditAbort{ mIndex, sName, "scene-edit-abort", "Escape" };
+        Settings::SettingValue<std::string> mSceneFocusToolbar{ mIndex, sName, "scene-focus-toolbar", "T" };
+        Settings::SettingValue<std::string> mSceneRenderStats{ mIndex, sName, "scene-render-stats", "F3" };
+        Settings::SettingValue<std::string> mSceneClearSelection{ mIndex, sName, "scene-clear-selection", "Space" };
+        Settings::SettingValue<std::string> mSceneUnhideAll{ mIndex, sName, "scene-unhide-all", "Alt+H" };
+        Settings::SettingValue<std::string> mSceneToggleVisibility{ mIndex, sName, "scene-toggle-visibility", "H" };
+        Settings::SettingValue<std::string> mSceneGroup0{ mIndex, sName, "scene-group-0", "0" };
+        Settings::SettingValue<std::string> mSceneSave0{ mIndex, sName, "scene-save-0", "Ctrl+0" };
+        Settings::SettingValue<std::string> mSceneGroup1{ mIndex, sName, "scene-group-1", "1" };
+        Settings::SettingValue<std::string> mSceneSave1{ mIndex, sName, "scene-save-1", "Ctrl+1" };
+        Settings::SettingValue<std::string> mSceneGroup2{ mIndex, sName, "scene-group-2", "2" };
+        Settings::SettingValue<std::string> mSceneSave2{ mIndex, sName, "scene-save-2", "Ctrl+2" };
+        Settings::SettingValue<std::string> mSceneGroup3{ mIndex, sName, "scene-group-3", "3" };
+        Settings::SettingValue<std::string> mSceneSave3{ mIndex, sName, "scene-save-3", "Ctrl+3" };
+        Settings::SettingValue<std::string> mSceneGroup4{ mIndex, sName, "scene-group-4", "4" };
+        Settings::SettingValue<std::string> mSceneSave4{ mIndex, sName, "scene-save-4", "Ctrl+4" };
+        Settings::SettingValue<std::string> mSceneGroup5{ mIndex, sName, "scene-group-5", "5" };
+        Settings::SettingValue<std::string> mSceneSave5{ mIndex, sName, "scene-save-5", "Ctrl+5" };
+        Settings::SettingValue<std::string> mSceneGroup6{ mIndex, sName, "scene-group-6", "6" };
+        Settings::SettingValue<std::string> mSceneSave6{ mIndex, sName, "scene-save-6", "Ctrl+6" };
+        Settings::SettingValue<std::string> mSceneGroup7{ mIndex, sName, "scene-group-7", "7" };
+        Settings::SettingValue<std::string> mSceneSave7{ mIndex, sName, "scene-save-7", "Ctrl+7" };
+        Settings::SettingValue<std::string> mSceneGroup8{ mIndex, sName, "scene-group-8", "8" };
+        Settings::SettingValue<std::string> mSceneSave8{ mIndex, sName, "scene-save-8", "Ctrl+8" };
+        Settings::SettingValue<std::string> mSceneGroup9{ mIndex, sName, "scene-group-9", "9" };
+        Settings::SettingValue<std::string> mSceneSave9{ mIndex, sName, "scene-save-9", "Ctrl+9" };
+        Settings::SettingValue<std::string> mSceneAxisX{ mIndex, sName, "scene-axis-x", "X" };
+        Settings::SettingValue<std::string> mSceneAxisY{ mIndex, sName, "scene-axis-y", "Y" };
+        Settings::SettingValue<std::string> mSceneAxisZ{ mIndex, sName, "scene-axis-z", "Z" };
+        Settings::SettingValue<std::string> mSceneMoveSubmode{ mIndex, sName, "scene-submode-move", "G" };
+        Settings::SettingValue<std::string> mSceneScaleSubmode{ mIndex, sName, "scene-submode-scale", "V" };
+        Settings::SettingValue<std::string> mSceneRotateSubmode{ mIndex, sName, "scene-submode-rotate", "R" };
+        Settings::SettingValue<std::string> mSceneCameraCycle{ mIndex, sName, "scene-cam-cycle", "Tab" };
+        Settings::SettingValue<std::string> mSceneToggleMarkers{ mIndex, sName, "scene-toggle-markers", "F4" };
+        Settings::SettingValue<std::string> mFreeForward{ mIndex, sName, "free-forward", "W" };
+        Settings::SettingValue<std::string> mFreeBackward{ mIndex, sName, "free-backward", "S" };
+        Settings::SettingValue<std::string> mFreeLeft{ mIndex, sName, "free-left", "A" };
+        Settings::SettingValue<std::string> mFreeRight{ mIndex, sName, "free-right", "D" };
+        Settings::SettingValue<std::string> mFreeRollLeft{ mIndex, sName, "free-roll-left", "Q" };
+        Settings::SettingValue<std::string> mFreeRollRight{ mIndex, sName, "free-roll-right", "E" };
+        Settings::SettingValue<std::string> mFreeSpeedMode{ mIndex, sName, "free-speed-mode", "" };
+        Settings::SettingValue<std::string> mOrbitUp{ mIndex, sName, "orbit-up", "W" };
+        Settings::SettingValue<std::string> mOrbitDown{ mIndex, sName, "orbit-down", "S" };
+        Settings::SettingValue<std::string> mOrbitLeft{ mIndex, sName, "orbit-left", "A" };
+        Settings::SettingValue<std::string> mOrbitRight{ mIndex, sName, "orbit-right", "D" };
+        Settings::SettingValue<std::string> mOrbitRollLeft{ mIndex, sName, "orbit-roll-left", "Q" };
+        Settings::SettingValue<std::string> mOrbitRollRight{ mIndex, sName, "orbit-roll-right", "E" };
+        Settings::SettingValue<std::string> mOrbitSpeedMode{ mIndex, sName, "orbit-speed-mode", "" };
+        Settings::SettingValue<std::string> mOrbitCenterSelection{ mIndex, sName, "orbit-center-selection", "C" };
+        Settings::SettingValue<std::string> mScriptEditorComment{ mIndex, sName, "script-editor-comment", "" };
+        Settings::SettingValue<std::string> mScriptEditorUncomment{ mIndex, sName, "script-editor-uncomment", "" };
+    };
+
+    struct ModelsCategory : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        static constexpr std::string_view sName = "Models";
+
+        Settings::SettingValue<std::string> mBaseanim{ mIndex, sName, "baseanim", "meshes/base_anim.nif" };
+        Settings::SettingValue<std::string> mBaseanimkna{ mIndex, sName, "baseanimkna", "meshes/base_animkna.nif" };
+        Settings::SettingValue<std::string> mBaseanimfemale{ mIndex, sName, "baseanimfemale",
+            "meshes/base_anim_female.nif" };
+        Settings::SettingValue<std::string> mWolfskin{ mIndex, sName, "wolfskin", "meshes/wolf/skin.nif" };
+    };
+
+    struct Values : Settings::WithIndex
+    {
+        using Settings::WithIndex::WithIndex;
+
+        WindowsCategory mWindows{ mIndex };
+        RecordsCategory mRecords{ mIndex };
+        IdTablesCategory mIdTables{ mIndex };
+        IdDialoguesCategory mIdDialogues{ mIndex };
+        ReportsCategory mReports{ mIndex };
+        SearchAndReplaceCategory mSearchAndReplace{ mIndex };
+        ScriptsCategory mScripts{ mIndex };
+        GeneralInputCategory mGeneralInput{ mIndex };
+        SceneInputCategory mSceneInput{ mIndex };
+        RenderingCategory mRendering{ mIndex };
+        TooltipsCategory mTooltips{ mIndex };
+        SceneEditingCategory mSceneEditing{ mIndex };
+        KeyBindingsCategory mKeyBindings{ mIndex };
+        ModelsCategory mModels{ mIndex };
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/effectlistcheck.cpp b/apps/opencs/model/tools/effectlistcheck.cpp
new file mode 100644
index 0000000000..b8695bc419
--- /dev/null
+++ b/apps/opencs/model/tools/effectlistcheck.cpp
@@ -0,0 +1,88 @@
+#include "effectlistcheck.hpp"
+
+#include <components/esm/attr.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadskil.hpp>
+
+#include <apps/opencs/model/doc/messages.hpp>
+#include <apps/opencs/model/world/universalid.hpp>
+
+namespace CSMTools
+{
+    void effectListCheck(
+        const std::vector<ESM::IndexedENAMstruct>& list, CSMDoc::Messages& messages, const CSMWorld::UniversalId& id)
+    {
+        if (list.empty())
+        {
+            messages.add(id, "No magic effects", "", CSMDoc::Message::Severity_Warning);
+            return;
+        }
+
+        size_t i = 1;
+        for (const ESM::IndexedENAMstruct& effect : list)
+        {
+            const std::string number = std::to_string(i);
+
+            // At the time of writing this effects, attributes and skills are mostly hardcoded
+            if (effect.mData.mEffectID < 0 || effect.mData.mEffectID >= ESM::MagicEffect::Length)
+                messages.add(id, "Effect #" + number + ": invalid effect ID", "", CSMDoc::Message::Severity_Error);
+            if (effect.mData.mSkill < -1 || effect.mData.mSkill >= ESM::Skill::Length)
+                messages.add(id, "Effect #" + number + ": invalid skill", "", CSMDoc::Message::Severity_Error);
+            if (effect.mData.mAttribute < -1 || effect.mData.mAttribute >= ESM::Attribute::Length)
+                messages.add(id, "Effect #" + number + ": invalid attribute", "", CSMDoc::Message::Severity_Error);
+
+            if (effect.mData.mRange < ESM::RT_Self || effect.mData.mRange > ESM::RT_Target)
+                messages.add(id, "Effect #" + number + ": invalid range", "", CSMDoc::Message::Severity_Error);
+
+            if (effect.mData.mArea < 0)
+                messages.add(id, "Effect #" + number + ": negative area", "", CSMDoc::Message::Severity_Error);
+
+            if (effect.mData.mDuration < 0)
+                messages.add(id, "Effect #" + number + ": negative duration", "", CSMDoc::Message::Severity_Error);
+
+            if (effect.mData.mMagnMin < 0)
+                messages.add(
+                    id, "Effect #" + number + ": negative minimum magnitude", "", CSMDoc::Message::Severity_Error);
+
+            if (effect.mData.mMagnMax < 0)
+                messages.add(
+                    id, "Effect #" + number + ": negative maximum magnitude", "", CSMDoc::Message::Severity_Error);
+            else if (effect.mData.mMagnMax == 0)
+                messages.add(
+                    id, "Effect #" + number + ": zero maximum magnitude", "", CSMDoc::Message::Severity_Warning);
+
+            if (effect.mData.mMagnMin > effect.mData.mMagnMax)
+                messages.add(id, "Effect #" + number + ": minimum magnitude is higher than maximum magnitude", "",
+                    CSMDoc::Message::Severity_Error);
+
+            ++i;
+        }
+    }
+
+    void ingredientEffectListCheck(
+        const ESM::Ingredient& ingredient, CSMDoc::Messages& messages, const CSMWorld::UniversalId& id)
+    {
+        bool hasEffects = false;
+
+        for (size_t i = 0; i < 4; i++)
+        {
+            if (ingredient.mData.mEffectID[i] == -1)
+                continue;
+
+            hasEffects = true;
+
+            const std::string number = std::to_string(i + 1);
+            if (ingredient.mData.mEffectID[i] < -1 || ingredient.mData.mEffectID[i] >= ESM::MagicEffect::Length)
+                messages.add(id, "Effect #" + number + ": invalid effect ID", "", CSMDoc::Message::Severity_Error);
+            if (ingredient.mData.mSkills[i] < -1 || ingredient.mData.mSkills[i] >= ESM::Skill::Length)
+                messages.add(id, "Effect #" + number + ": invalid skill", "", CSMDoc::Message::Severity_Error);
+            if (ingredient.mData.mAttributes[i] < -1 || ingredient.mData.mAttributes[i] >= ESM::Attribute::Length)
+                messages.add(id, "Effect #" + number + ": invalid attribute", "", CSMDoc::Message::Severity_Error);
+        }
+
+        if (!hasEffects)
+            messages.add(id, "No magic effects", "", CSMDoc::Message::Severity_Warning);
+    }
+}
diff --git a/apps/opencs/model/tools/effectlistcheck.hpp b/apps/opencs/model/tools/effectlistcheck.hpp
new file mode 100644
index 0000000000..832f3650eb
--- /dev/null
+++ b/apps/opencs/model/tools/effectlistcheck.hpp
@@ -0,0 +1,30 @@
+#ifndef CSM_TOOLS_EFFECTLISTCHECK_H
+#define CSM_TOOLS_EFFECTLISTCHECK_H
+
+#include <vector>
+
+namespace ESM
+{
+    struct IndexedENAMstruct;
+    struct Ingredient;
+}
+
+namespace CSMDoc
+{
+    class Messages;
+}
+
+namespace CSMWorld
+{
+    class UniversalId;
+}
+
+namespace CSMTools
+{
+    void effectListCheck(
+        const std::vector<ESM::IndexedENAMstruct>& list, CSMDoc::Messages& messages, const CSMWorld::UniversalId& id);
+    void ingredientEffectListCheck(
+        const ESM::Ingredient& ingredient, CSMDoc::Messages& messages, const CSMWorld::UniversalId& id);
+}
+
+#endif
diff --git a/apps/opencs/model/tools/enchantmentcheck.cpp b/apps/opencs/model/tools/enchantmentcheck.cpp
index d6cb22b738..8bd7d6cc4c 100644
--- a/apps/opencs/model/tools/enchantmentcheck.cpp
+++ b/apps/opencs/model/tools/enchantmentcheck.cpp
@@ -10,13 +10,14 @@
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/record.hpp>
 
-#include <components/esm3/effectlist.hpp>
 #include <components/esm3/loadench.hpp>
 
 #include "../prefs/state.hpp"
 
 #include "../world/universalid.hpp"
 
+#include "effectlistcheck.hpp"
+
 CSMTools::EnchantmentCheckStage::EnchantmentCheckStage(const CSMWorld::IdCollection<ESM::Enchantment>& enchantments)
     : mEnchantments(enchantments)
 {
@@ -54,47 +55,5 @@ void CSMTools::EnchantmentCheckStage::perform(int stage, CSMDoc::Messages& messa
     if (enchantment.mData.mCost > enchantment.mData.mCharge)
         messages.add(id, "Cost is higher than charge", "", CSMDoc::Message::Severity_Error);
 
-    if (enchantment.mEffects.mList.empty())
-    {
-        messages.add(id, "Enchantment doesn't have any magic effects", "", CSMDoc::Message::Severity_Warning);
-    }
-    else
-    {
-        std::vector<ESM::ENAMstruct>::const_iterator effect = enchantment.mEffects.mList.begin();
-
-        for (size_t i = 1; i <= enchantment.mEffects.mList.size(); i++)
-        {
-            const std::string number = std::to_string(i);
-            // At the time of writing this effects, attributes and skills are hardcoded
-            if (effect->mEffectID < 0 || effect->mEffectID > 142)
-            {
-                messages.add(id, "Effect #" + number + " is invalid", "", CSMDoc::Message::Severity_Error);
-                ++effect;
-                continue;
-            }
-
-            if (effect->mSkill < -1 || effect->mSkill > 26)
-                messages.add(
-                    id, "Effect #" + number + " affected skill is invalid", "", CSMDoc::Message::Severity_Error);
-            if (effect->mAttribute < -1 || effect->mAttribute > 7)
-                messages.add(
-                    id, "Effect #" + number + " affected attribute is invalid", "", CSMDoc::Message::Severity_Error);
-            if (effect->mRange < 0 || effect->mRange > 2)
-                messages.add(id, "Effect #" + number + " range is invalid", "", CSMDoc::Message::Severity_Error);
-            if (effect->mArea < 0)
-                messages.add(id, "Effect #" + number + " area is negative", "", CSMDoc::Message::Severity_Error);
-            if (effect->mDuration < 0)
-                messages.add(id, "Effect #" + number + " duration is negative", "", CSMDoc::Message::Severity_Error);
-            if (effect->mMagnMin < 0)
-                messages.add(
-                    id, "Effect #" + number + " minimum magnitude is negative", "", CSMDoc::Message::Severity_Error);
-            if (effect->mMagnMax < 0)
-                messages.add(
-                    id, "Effect #" + number + " maximum magnitude is negative", "", CSMDoc::Message::Severity_Error);
-            if (effect->mMagnMin > effect->mMagnMax)
-                messages.add(id, "Effect #" + number + " minimum magnitude is higher than maximum magnitude", "",
-                    CSMDoc::Message::Severity_Error);
-            ++effect;
-        }
-    }
+    effectListCheck(enchantment.mEffects.mList, messages, id);
 }
diff --git a/apps/opencs/model/tools/magiceffectcheck.cpp b/apps/opencs/model/tools/magiceffectcheck.cpp
index a9ad4023fc..212b343e00 100644
--- a/apps/opencs/model/tools/magiceffectcheck.cpp
+++ b/apps/opencs/model/tools/magiceffectcheck.cpp
@@ -58,7 +58,12 @@ void CSMTools::MagicEffectCheckStage::perform(int stage, CSMDoc::Messages& messa
         return;
 
     ESM::MagicEffect effect = record.get();
-    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_MagicEffect, effect.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_MagicEffect, CSMWorld::getRecordId(effect));
+
+    if (effect.mData.mSpeed <= 0.0f)
+    {
+        messages.add(id, "Speed is less than or equal to zero", "", CSMDoc::Message::Severity_Error);
+    }
 
     if (effect.mDescription.empty())
     {
diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index 5a7fa6c1b9..88cad267cb 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include <apps/opencs/model/world/land.hpp>
-#include <apps/opencs/model/world/landtexture.hpp>
 #include <apps/opencs/model/world/metadata.hpp>
 #include <apps/opencs/model/world/ref.hpp>
 #include <apps/opencs/model/world/refcollection.hpp>
@@ -117,7 +116,7 @@ void CSMTools::MergeReferencesStage::perform(int stage, CSMDoc::Messages& messag
         ref.mOriginalCell = ref.mCell;
 
         ref.mRefNum.mIndex = mIndex[ref.mCell]++;
-        ref.mRefNum.mContentFile = 0;
+        ref.mRefNum.mContentFile = -1;
         ref.mNew = false;
 
         mState.mTarget->getData().getReferences().appendRecord(std::make_unique<CSMWorld::Record<CSMWorld::CellRef>>(
@@ -137,13 +136,12 @@ int CSMTools::PopulateLandTexturesMergeStage::setup()
 
 void CSMTools::PopulateLandTexturesMergeStage::perform(int stage, CSMDoc::Messages& messages)
 {
-    const CSMWorld::Record<CSMWorld::LandTexture>& record = mState.mSource.getData().getLandTextures().getRecord(stage);
+    const CSMWorld::Record<ESM::LandTexture>& record = mState.mSource.getData().getLandTextures().getRecord(stage);
 
     if (!record.isDeleted())
     {
-        mState.mTarget->getData().getLandTextures().appendRecord(
-            std::make_unique<CSMWorld::Record<CSMWorld::LandTexture>>(CSMWorld::Record<CSMWorld::LandTexture>(
-                CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
+        mState.mTarget->getData().getLandTextures().appendRecord(std::make_unique<CSMWorld::Record<ESM::LandTexture>>(
+            CSMWorld::Record<ESM::LandTexture>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
     }
 }
 
@@ -189,9 +187,9 @@ void CSMTools::FixLandsAndLandTexturesMergeStage::perform(int stage, CSMDoc::Mes
         CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&>(
             *mState.mTarget->getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
 
-        const std::string& id = mState.mTarget->getData().getLand().getId(stage).getRefIdString();
+        const auto& id = mState.mTarget->getData().getLand().getId(stage);
 
-        CSMWorld::TouchLandCommand cmd(landTable, ltexTable, id);
+        CSMWorld::TouchLandCommand cmd(landTable, ltexTable, id.getRefIdString());
         cmd.redo();
 
         // Get rid of base data
diff --git a/apps/opencs/model/tools/pathgridcheck.cpp b/apps/opencs/model/tools/pathgridcheck.cpp
index 6420c1c83c..f03b896321 100644
--- a/apps/opencs/model/tools/pathgridcheck.cpp
+++ b/apps/opencs/model/tools/pathgridcheck.cpp
@@ -44,9 +44,9 @@ void CSMTools::PathgridCheckStage::perform(int stage, CSMDoc::Messages& messages
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Pathgrid, pathgrid.mId);
 
     // check the number of pathgrid points
-    if (pathgrid.mData.mS2 < static_cast<int>(pathgrid.mPoints.size()))
+    if (pathgrid.mData.mPoints < pathgrid.mPoints.size())
         messages.add(id, "Less points than expected", "", CSMDoc::Message::Severity_Error);
-    else if (pathgrid.mData.mS2 > static_cast<int>(pathgrid.mPoints.size()))
+    else if (pathgrid.mData.mPoints > pathgrid.mPoints.size())
         messages.add(id, "More points than expected", "", CSMDoc::Message::Severity_Error);
 
     std::vector<CSMTools::Point> pointList(pathgrid.mPoints.size());
diff --git a/apps/opencs/model/tools/racecheck.cpp b/apps/opencs/model/tools/racecheck.cpp
index 78f72f44c5..8f0df823c3 100644
--- a/apps/opencs/model/tools/racecheck.cpp
+++ b/apps/opencs/model/tools/racecheck.cpp
@@ -41,17 +41,17 @@ void CSMTools::RaceCheckStage::performPerRecord(int stage, CSMDoc::Messages& mes
         messages.add(id, "Description is missing", "", CSMDoc::Message::Severity_Warning);
 
     // test for positive height
-    if (race.mData.mHeight.mMale <= 0)
+    if (race.mData.mMaleHeight <= 0)
         messages.add(id, "Male height is non-positive", "", CSMDoc::Message::Severity_Error);
 
-    if (race.mData.mHeight.mFemale <= 0)
+    if (race.mData.mFemaleHeight <= 0)
         messages.add(id, "Female height is non-positive", "", CSMDoc::Message::Severity_Error);
 
     // test for non-negative weight
-    if (race.mData.mWeight.mMale < 0)
+    if (race.mData.mMaleWeight < 0)
         messages.add(id, "Male weight is negative", "", CSMDoc::Message::Severity_Error);
 
-    if (race.mData.mWeight.mFemale < 0)
+    if (race.mData.mFemaleWeight < 0)
         messages.add(id, "Female weight is negative", "", CSMDoc::Message::Severity_Error);
 
     /// \todo check data members that can't be edited in the table view
diff --git a/apps/opencs/model/tools/referenceablecheck.cpp b/apps/opencs/model/tools/referenceablecheck.cpp
index 6effa2cbf6..a00c3acd1c 100644
--- a/apps/opencs/model/tools/referenceablecheck.cpp
+++ b/apps/opencs/model/tools/referenceablecheck.cpp
@@ -38,6 +38,8 @@
 #include "../world/record.hpp"
 #include "../world/universalid.hpp"
 
+#include "effectlistcheck.hpp"
+
 namespace ESM
 {
     class Script;
@@ -330,7 +332,8 @@ void CSMTools::ReferenceableCheckStage::potionCheck(
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Potion, potion.mId);
 
     inventoryItemCheck<ESM::Potion>(potion, messages, id.toString());
-    /// \todo Check magic effects for validity
+
+    effectListCheck(potion.mEffects.mList, messages, id);
 
     // Check that mentioned scripts exist
     scriptCheck<ESM::Potion>(potion, messages, id.toString());
@@ -456,22 +459,12 @@ void CSMTools::ReferenceableCheckStage::creatureCheck(
     if (creature.mData.mLevel <= 0)
         messages.add(id, "Level is non-positive", "", CSMDoc::Message::Severity_Warning);
 
-    if (creature.mData.mStrength < 0)
-        messages.add(id, "Strength is negative", "", CSMDoc::Message::Severity_Warning);
-    if (creature.mData.mIntelligence < 0)
-        messages.add(id, "Intelligence is negative", "", CSMDoc::Message::Severity_Warning);
-    if (creature.mData.mWillpower < 0)
-        messages.add(id, "Willpower is negative", "", CSMDoc::Message::Severity_Warning);
-    if (creature.mData.mAgility < 0)
-        messages.add(id, "Agility is negative", "", CSMDoc::Message::Severity_Warning);
-    if (creature.mData.mSpeed < 0)
-        messages.add(id, "Speed is negative", "", CSMDoc::Message::Severity_Warning);
-    if (creature.mData.mEndurance < 0)
-        messages.add(id, "Endurance is negative", "", CSMDoc::Message::Severity_Warning);
-    if (creature.mData.mPersonality < 0)
-        messages.add(id, "Personality is negative", "", CSMDoc::Message::Severity_Warning);
-    if (creature.mData.mLuck < 0)
-        messages.add(id, "Luck is negative", "", CSMDoc::Message::Severity_Warning);
+    for (size_t i = 0; i < creature.mData.mAttributes.size(); ++i)
+    {
+        if (creature.mData.mAttributes[i] < 0)
+            messages.add(id, ESM::Attribute::indexToRefId(i).toDebugString() + " is negative", {},
+                CSMDoc::Message::Severity_Warning);
+    }
 
     if (creature.mData.mCombat < 0)
         messages.add(id, "Combat is negative", "", CSMDoc::Message::Severity_Warning);
@@ -575,6 +568,8 @@ void CSMTools::ReferenceableCheckStage::ingredientCheck(
 
     // Check that mentioned scripts exist
     scriptCheck<ESM::Ingredient>(ingredient, messages, id.toString());
+
+    ingredientEffectListCheck(ingredient, messages, id);
 }
 
 void CSMTools::ReferenceableCheckStage::creaturesLevListCheck(
@@ -701,25 +696,6 @@ void CSMTools::ReferenceableCheckStage::npcCheck(
             return;
         }
     }
-    else if (npc.mNpdt.mHealth != 0)
-    {
-        if (npc.mNpdt.mStrength == 0)
-            messages.add(id, "Strength is equal to zero", "", CSMDoc::Message::Severity_Warning);
-        if (npc.mNpdt.mIntelligence == 0)
-            messages.add(id, "Intelligence is equal to zero", "", CSMDoc::Message::Severity_Warning);
-        if (npc.mNpdt.mWillpower == 0)
-            messages.add(id, "Willpower is equal to zero", "", CSMDoc::Message::Severity_Warning);
-        if (npc.mNpdt.mAgility == 0)
-            messages.add(id, "Agility is equal to zero", "", CSMDoc::Message::Severity_Warning);
-        if (npc.mNpdt.mSpeed == 0)
-            messages.add(id, "Speed is equal to zero", "", CSMDoc::Message::Severity_Warning);
-        if (npc.mNpdt.mEndurance == 0)
-            messages.add(id, "Endurance is equal to zero", "", CSMDoc::Message::Severity_Warning);
-        if (npc.mNpdt.mPersonality == 0)
-            messages.add(id, "Personality is equal to zero", "", CSMDoc::Message::Severity_Warning);
-        if (npc.mNpdt.mLuck == 0)
-            messages.add(id, "Luck is equal to zero", "", CSMDoc::Message::Severity_Warning);
-    }
 
     if (level <= 0)
         messages.add(id, "Level is non-positive", "", CSMDoc::Message::Severity_Warning);
diff --git a/apps/opencs/model/tools/referencecheck.cpp b/apps/opencs/model/tools/referencecheck.cpp
index 87d133a59e..306094f2f5 100644
--- a/apps/opencs/model/tools/referencecheck.cpp
+++ b/apps/opencs/model/tools/referencecheck.cpp
@@ -18,16 +18,18 @@
 #include <apps/opencs/model/world/universalid.hpp>
 
 #include <components/esm3/cellref.hpp>
+#include <components/esm3/loadbody.hpp>
 #include <components/esm3/loadfact.hpp>
 
 CSMTools::ReferenceCheckStage::ReferenceCheckStage(const CSMWorld::RefCollection& references,
     const CSMWorld::RefIdCollection& referencables, const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
-    const CSMWorld::IdCollection<ESM::Faction>& factions)
+    const CSMWorld::IdCollection<ESM::Faction>& factions, const CSMWorld::IdCollection<ESM::BodyPart>& bodyparts)
     : mReferences(references)
     , mObjects(referencables)
     , mDataSet(referencables.getDataSet())
     , mCells(cells)
     , mFactions(factions)
+    , mBodyParts(bodyparts)
 {
     mIgnoreBaseRecords = false;
 }
@@ -43,15 +45,27 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages& message
     const CSMWorld::CellRef& cellRef = record.get();
     const CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Reference, cellRef.mId);
 
+    // Check RefNum is unique per content file, otherwise can cause load issues
+    const auto refNum = cellRef.mRefNum;
+    const auto insertResult = mUsedReferenceIDs.emplace(refNum, cellRef.mId);
+    if (!insertResult.second)
+        messages.add(id,
+            "Duplicate RefNum: " + std::to_string(refNum.mContentFile) + std::string("-")
+                + std::to_string(refNum.mIndex) + " shared with cell reference "
+                + insertResult.first->second.toString(),
+            "", CSMDoc::Message::Severity_Error);
+
     // Check reference id
     if (cellRef.mRefID.empty())
         messages.add(id, "Instance is not based on an object", "", CSMDoc::Message::Severity_Error);
     else
     {
         // Check for non existing referenced object
-        if (mObjects.searchId(cellRef.mRefID) == -1)
+        if (mObjects.searchId(cellRef.mRefID) == -1 && mBodyParts.searchId(cellRef.mRefID) == -1)
+        {
             messages.add(id, "Instance of a non-existent object '" + cellRef.mRefID.getRefIdString() + "'", "",
                 CSMDoc::Message::Severity_Error);
+        }
         else
         {
             // Check if reference charge is valid for it's proper referenced type
@@ -98,14 +112,14 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages& message
     if (cellRef.mEnchantmentCharge < -1)
         messages.add(id, "Negative number of enchantment points", "", CSMDoc::Message::Severity_Error);
 
-    // Check if gold value isn't negative
-    if (cellRef.mGoldValue < 0)
-        messages.add(id, "Negative gold value", "", CSMDoc::Message::Severity_Error);
+    if (cellRef.mCount < 1)
+        messages.add(id, "Reference without count", {}, CSMDoc::Message::Severity_Error);
 }
 
 int CSMTools::ReferenceCheckStage::setup()
 {
     mIgnoreBaseRecords = CSMPrefs::get()["Reports"]["ignore-base-records"].isTrue();
+    mUsedReferenceIDs.clear();
 
     return mReferences.getSize();
 }
diff --git a/apps/opencs/model/tools/referencecheck.hpp b/apps/opencs/model/tools/referencecheck.hpp
index 04cca2b803..58fb4e4170 100644
--- a/apps/opencs/model/tools/referencecheck.hpp
+++ b/apps/opencs/model/tools/referencecheck.hpp
@@ -8,6 +8,7 @@
 
 namespace ESM
 {
+    struct BodyPart;
     struct Faction;
 }
 
@@ -29,7 +30,8 @@ namespace CSMTools
     {
     public:
         ReferenceCheckStage(const CSMWorld::RefCollection& references, const CSMWorld::RefIdCollection& referencables,
-            const CSMWorld::IdCollection<CSMWorld::Cell>& cells, const CSMWorld::IdCollection<ESM::Faction>& factions);
+            const CSMWorld::IdCollection<CSMWorld::Cell>& cells, const CSMWorld::IdCollection<ESM::Faction>& factions,
+            const CSMWorld::IdCollection<ESM::BodyPart>& bodyparts);
 
         void perform(int stage, CSMDoc::Messages& messages) override;
         int setup() override;
@@ -40,6 +42,8 @@ namespace CSMTools
         const CSMWorld::RefIdData& mDataSet;
         const CSMWorld::IdCollection<CSMWorld::Cell>& mCells;
         const CSMWorld::IdCollection<ESM::Faction>& mFactions;
+        const CSMWorld::IdCollection<ESM::BodyPart>& mBodyParts;
+        std::unordered_map<ESM::RefNum, ESM::RefId> mUsedReferenceIDs;
         bool mIgnoreBaseRecords;
     };
 }
diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index 4affc1bd44..08e8a17714 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -47,9 +47,7 @@ void CSMTools::RegionCheckStage::perform(int stage, CSMDoc::Messages& messages)
     /// \todo test that the ID in mSleeplist exists
 
     // test that chances add up to 100
-    int chances = region.mData.mClear + region.mData.mCloudy + region.mData.mFoggy + region.mData.mOvercast
-        + region.mData.mRain + region.mData.mThunder + region.mData.mAsh + region.mData.mBlight + region.mData.mSnow
-        + region.mData.mBlizzard;
+    auto chances = std::accumulate(region.mData.mProbabilities.begin(), region.mData.mProbabilities.end(), 0u);
     if (chances != 100)
         messages.add(id, "Weather chances do not add up to 100", "", CSMDoc::Message::Severity_Error);
 
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index 84a8c71f95..f9251acdab 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -171,7 +171,7 @@ void CSMTools::ReportModel::flagAsReplaced(int index)
 
     hint[0] = 'r';
 
-    line.mHint = hint;
+    line.mHint = std::move(hint);
 
     emit dataChanged(this->index(index, 0), this->index(index, columnCount()));
 }
diff --git a/apps/opencs/model/tools/scriptcheck.cpp b/apps/opencs/model/tools/scriptcheck.cpp
index 7a76efa483..2ba8e33347 100644
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@@ -106,9 +106,6 @@ void CSMTools::ScriptCheckStage::perform(int stage, CSMDoc::Messages& messages)
 
     mId = mDocument.getData().getScripts().getId(stage);
 
-    if (mDocument.isBlacklisted(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Script, mId.getRefIdString())))
-        return;
-
     // Skip "Base" records (setting!) and "Deleted" records
     if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
         return;
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index f91438dc22..07973bf08b 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -13,6 +13,8 @@
 
 #include "../prefs/state.hpp"
 
+#include "effectlistcheck.hpp"
+
 CSMTools::SpellCheckStage::SpellCheckStage(const CSMWorld::IdCollection<ESM::Spell>& spells)
     : mSpells(spells)
 {
@@ -46,5 +48,5 @@ void CSMTools::SpellCheckStage::perform(int stage, CSMDoc::Messages& messages)
     if (spell.mData.mCost < 0)
         messages.add(id, "Spell cost is negative", "", CSMDoc::Message::Severity_Error);
 
-    /// \todo check data members that can't be edited in the table view
+    effectListCheck(spell.mEffects.mList, messages, id);
 }
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index e1e7a0dcd8..04548ca4cf 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -105,8 +105,8 @@ CSMDoc::OperationHolder* CSMTools::Tools::getVerifier()
                 mData.getFactions(), mData.getScripts(), mData.getResources(CSMWorld::UniversalId::Type_Meshes),
                 mData.getResources(CSMWorld::UniversalId::Type_Icons), mData.getBodyParts()));
 
-        mVerifierOperation->appendStage(new ReferenceCheckStage(
-            mData.getReferences(), mData.getReferenceables(), mData.getCells(), mData.getFactions()));
+        mVerifierOperation->appendStage(new ReferenceCheckStage(mData.getReferences(), mData.getReferenceables(),
+            mData.getCells(), mData.getFactions(), mData.getBodyParts()));
 
         mVerifierOperation->appendStage(new ScriptCheckStage(mDocument));
 
diff --git a/apps/opencs/model/tools/topicinfocheck.cpp b/apps/opencs/model/tools/topicinfocheck.cpp
index ba99a33a28..fab90d951a 100644
--- a/apps/opencs/model/tools/topicinfocheck.cpp
+++ b/apps/opencs/model/tools/topicinfocheck.cpp
@@ -171,10 +171,9 @@ void CSMTools::TopicInfoCheckStage::perform(int stage, CSMDoc::Messages& message
 
     // Check info conditions
 
-    for (std::vector<ESM::DialInfo::SelectStruct>::const_iterator it = topicInfo.mSelects.begin();
-         it != topicInfo.mSelects.end(); ++it)
+    for (const auto& select : topicInfo.mSelects)
     {
-        verifySelectStruct((*it), id, messages);
+        verifySelectStruct(select, id, messages);
     }
 }
 
@@ -308,49 +307,15 @@ bool CSMTools::TopicInfoCheckStage::verifyItem(
 }
 
 bool CSMTools::TopicInfoCheckStage::verifySelectStruct(
-    const ESM::DialInfo::SelectStruct& select, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+    const ESM::DialogueCondition& select, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
 {
     CSMWorld::ConstInfoSelectWrapper infoCondition(select);
 
-    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_None)
+    if (select.mFunction == ESM::DialogueCondition::Function_None)
     {
         messages.add(id, "Invalid condition '" + infoCondition.toString() + "'", "", CSMDoc::Message::Severity_Error);
         return false;
     }
-    else if (!infoCondition.variantTypeIsValid())
-    {
-        std::ostringstream stream;
-        stream << "Value of condition '" << infoCondition.toString() << "' has invalid ";
-
-        switch (select.mValue.getType())
-        {
-            case ESM::VT_None:
-                stream << "None";
-                break;
-            case ESM::VT_Short:
-                stream << "Short";
-                break;
-            case ESM::VT_Int:
-                stream << "Int";
-                break;
-            case ESM::VT_Long:
-                stream << "Long";
-                break;
-            case ESM::VT_Float:
-                stream << "Float";
-                break;
-            case ESM::VT_String:
-                stream << "String";
-                break;
-            default:
-                stream << "unknown";
-                break;
-        }
-        stream << " type";
-
-        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
-        return false;
-    }
     else if (infoCondition.conditionIsAlwaysTrue())
     {
         messages.add(
@@ -365,48 +330,48 @@ bool CSMTools::TopicInfoCheckStage::verifySelectStruct(
     }
 
     // Id checks
-    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Global
-        && !verifyId(ESM::RefId::stringRefId(infoCondition.getVariableName()), mGlobals, id, messages))
+    if (select.mFunction == ESM::DialogueCondition::Function_Global
+        && !verifyId(ESM::RefId::stringRefId(select.mVariable), mGlobals, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Journal
-        && !verifyId(ESM::RefId::stringRefId(infoCondition.getVariableName()), mJournals, id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_Journal
+        && !verifyId(ESM::RefId::stringRefId(select.mVariable), mJournals, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Item
-        && !verifyItem(ESM::RefId::stringRefId(infoCondition.getVariableName()), id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_Item
+        && !verifyItem(ESM::RefId::stringRefId(select.mVariable), id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Dead
-        && !verifyActor(ESM::RefId::stringRefId(infoCondition.getVariableName()), id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_Dead
+        && !verifyActor(ESM::RefId::stringRefId(select.mVariable), id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotId
-        && !verifyActor(ESM::RefId::stringRefId(infoCondition.getVariableName()), id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_NotId
+        && !verifyActor(ESM::RefId::stringRefId(select.mVariable), id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotFaction
-        && !verifyId(ESM::RefId::stringRefId(infoCondition.getVariableName()), mFactions, id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_NotFaction
+        && !verifyId(ESM::RefId::stringRefId(select.mVariable), mFactions, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotClass
-        && !verifyId(ESM::RefId::stringRefId(infoCondition.getVariableName()), mClasses, id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_NotClass
+        && !verifyId(ESM::RefId::stringRefId(select.mVariable), mClasses, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotRace
-        && !verifyId(ESM::RefId::stringRefId(infoCondition.getVariableName()), mRaces, id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_NotRace
+        && !verifyId(ESM::RefId::stringRefId(select.mVariable), mRaces, id, messages))
     {
         return false;
     }
-    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotCell
-        && !verifyCell(infoCondition.getVariableName(), id, messages))
+    else if (select.mFunction == ESM::DialogueCondition::Function_NotCell
+        && !verifyCell(select.mVariable, id, messages))
     {
         return false;
     }
diff --git a/apps/opencs/model/tools/topicinfocheck.hpp b/apps/opencs/model/tools/topicinfocheck.hpp
index 1bb2fc61dc..3069fbc0ff 100644
--- a/apps/opencs/model/tools/topicinfocheck.hpp
+++ b/apps/opencs/model/tools/topicinfocheck.hpp
@@ -84,7 +84,7 @@ namespace CSMTools
             const ESM::RefId& name, int rank, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
         bool verifyItem(const ESM::RefId& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
         bool verifySelectStruct(
-            const ESM::DialInfo::SelectStruct& select, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+            const ESM::DialogueCondition& select, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
         bool verifySound(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
 
         template <typename T>
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 3a54bb3b0e..acbe6b5d38 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -7,6 +7,7 @@
 #include <string_view>
 #include <vector>
 
+#include <apps/opencs/model/prefs/state.hpp>
 #include <apps/opencs/model/world/columns.hpp>
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/record.hpp>
@@ -20,7 +21,7 @@
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadrace.hpp>
 #include <components/esm3/mappings.hpp>
-#include <components/sceneutil/actorutil.hpp>
+#include <components/settings/settings.hpp>
 
 #include "data.hpp"
 
@@ -66,6 +67,11 @@ namespace CSMWorld
         return mMaleParts[ESM::getMeshPart(index)];
     }
 
+    const osg::Vec2f& ActorAdapter::RaceData::getGenderWeightHeight(bool isFemale)
+    {
+        return isFemale ? mWeightsHeights.mFemaleWeightHeight : mWeightsHeights.mMaleWeightHeight;
+    }
+
     bool ActorAdapter::RaceData::hasDependency(const ESM::RefId& id) const
     {
         return mDependencies.find(id) != mDependencies.end();
@@ -89,10 +95,11 @@ namespace CSMWorld
             mDependencies.emplace(id);
     }
 
-    void ActorAdapter::RaceData::reset_data(const ESM::RefId& id, bool isBeast)
+    void ActorAdapter::RaceData::reset_data(const ESM::RefId& id, const WeightsHeights& raceStats, bool isBeast)
     {
         mId = id;
         mIsBeast = isBeast;
+        mWeightsHeights = raceStats;
         for (auto& str : mFemaleParts)
             str = ESM::RefId();
         for (auto& str : mMaleParts)
@@ -129,11 +136,14 @@ namespace CSMWorld
         if (mCreature || !mSkeletonOverride.empty())
             return "meshes\\" + mSkeletonOverride;
 
-        bool firstPerson = false;
         bool beast = mRaceData ? mRaceData->isBeast() : false;
-        bool werewolf = false;
 
-        return SceneUtil::getActorSkeleton(firstPerson, mFemale, beast, werewolf);
+        if (beast)
+            return CSMPrefs::get()["Models"]["baseanimkna"].toString();
+        else if (mFemale)
+            return CSMPrefs::get()["Models"]["baseanimfemale"].toString();
+        else
+            return CSMPrefs::get()["Models"]["baseanim"].toString();
     }
 
     ESM::RefId ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
@@ -159,6 +169,11 @@ namespace CSMWorld
         return it->second.first;
     }
 
+    const osg::Vec2f& ActorAdapter::ActorData::getRaceWeightHeight() const
+    {
+        return mRaceData->getGenderWeightHeight(isFemale());
+    }
+
     bool ActorAdapter::ActorData::hasDependency(const ESM::RefId& id) const
     {
         return mDependencies.find(id) != mDependencies.end();
@@ -464,13 +479,13 @@ namespace CSMWorld
         if (type == UniversalId::Type_Creature)
         {
             // Valid creature record
-            setupCreature(id, data);
+            setupCreature(id, std::move(data));
             emit actorChanged(id);
         }
         else if (type == UniversalId::Type_Npc)
         {
             // Valid npc record
-            setupNpc(id, data);
+            setupNpc(id, std::move(data));
             emit actorChanged(id);
         }
         else
@@ -500,7 +515,11 @@ namespace CSMWorld
         }
 
         auto& race = raceRecord.get();
-        data->reset_data(id, race.mData.mFlags & ESM::Race::Beast);
+
+        WeightsHeights scaleStats = { osg::Vec2f(race.mData.mMaleWeight, race.mData.mMaleHeight),
+            osg::Vec2f(race.mData.mFemaleWeight, race.mData.mFemaleHeight) };
+
+        data->reset_data(id, scaleStats, race.mData.mFlags & ESM::Race::Beast);
 
         // Setup body parts
         for (int i = 0; i < mBodyParts.getSize(); ++i)
@@ -661,7 +680,7 @@ namespace CSMWorld
             RaceDataPtr data = mCachedRaces.get(race);
             if (data)
             {
-                setupRace(race, data);
+                setupRace(race, std::move(data));
                 // Race was changed. Need to mark actor dependencies as dirty.
                 // Cannot use markDirtyDependency because that would invalidate
                 // the current iterator.
@@ -679,7 +698,7 @@ namespace CSMWorld
             ActorDataPtr data = mCachedActors.get(actor);
             if (data)
             {
-                setupActor(actor, data);
+                setupActor(actor, std::move(data));
             }
         }
         mDirtyActors.clear();
diff --git a/apps/opencs/model/world/actoradapter.hpp b/apps/opencs/model/world/actoradapter.hpp
index 9747f448ae..d9a64cda31 100644
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@@ -41,6 +41,12 @@ namespace CSMWorld
         /// Tracks unique strings
         using RefIdSet = std::unordered_set<ESM::RefId>;
 
+        struct WeightsHeights
+        {
+            osg::Vec2f mMaleWeightHeight;
+            osg::Vec2f mFemaleWeightHeight;
+        };
+
         /// Contains base race data shared between actors
         class RaceData
         {
@@ -57,6 +63,8 @@ namespace CSMWorld
             const ESM::RefId& getFemalePart(ESM::PartReferenceType index) const;
             /// Retrieves the associated body part
             const ESM::RefId& getMalePart(ESM::PartReferenceType index) const;
+
+            const osg::Vec2f& getGenderWeightHeight(bool isFemale);
             /// Checks if the race has a data dependency
             bool hasDependency(const ESM::RefId& id) const;
 
@@ -67,7 +75,8 @@ namespace CSMWorld
             /// Marks an additional dependency
             void addOtherDependency(const ESM::RefId& id);
             /// Clears parts and dependencies
-            void reset_data(const ESM::RefId& raceId, bool isBeast = false);
+            void reset_data(const ESM::RefId& raceId, const WeightsHeights& raceStats = { { 1.f, 1.f }, { 1.f, 1.f } },
+                bool isBeast = false);
 
         private:
             bool handles(ESM::PartReferenceType type) const;
@@ -75,6 +84,7 @@ namespace CSMWorld
             bool mIsBeast;
             RacePartList mFemaleParts;
             RacePartList mMaleParts;
+            WeightsHeights mWeightsHeights;
             RefIdSet mDependencies;
         };
         using RaceDataPtr = std::shared_ptr<RaceData>;
@@ -96,6 +106,8 @@ namespace CSMWorld
             std::string getSkeleton() const;
             /// Retrieves the associated actor part
             ESM::RefId getPart(ESM::PartReferenceType index) const;
+
+            const osg::Vec2f& getRaceWeightHeight() const;
             /// Checks if the actor has a data dependency
             bool hasDependency(const ESM::RefId& id) const;
 
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 9db6b3b042..fa42ee0f09 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -15,14 +15,15 @@
 #include <QVariant>
 
 #include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadskil.hpp>
 #include <components/misc/strings/lower.hpp>
 
 #include "collectionbase.hpp"
 #include "columnbase.hpp"
+#include "columnimp.hpp"
 #include "info.hpp"
 #include "land.hpp"
-#include "landtexture.hpp"
 #include "record.hpp"
 #include "ref.hpp"
 
@@ -72,19 +73,15 @@ namespace CSMWorld
         return ESM::RefId::stringRefId(Land::createUniqueRecordId(record.mX, record.mY));
     }
 
-    inline void setRecordId(const ESM::RefId& id, LandTexture& record)
+    inline ESM::RefId getRecordId(const ESM::MagicEffect& record)
     {
-        int plugin = 0;
-        int index = 0;
-
-        LandTexture::parseUniqueRecordId(id.getRefIdString(), plugin, index);
-        record.mPluginIndex = plugin;
-        record.mIndex = index;
+        return ESM::RefId::stringRefId(CSMWorld::getStringId(record.mId));
     }
 
-    inline ESM::RefId getRecordId(const LandTexture& record)
+    inline void setRecordId(const ESM::RefId& id, ESM::MagicEffect& record)
     {
-        return ESM::RefId::stringRefId(LandTexture::createUniqueRecordId(record.mPluginIndex, record.mIndex));
+        int index = ESM::MagicEffect::indexNameToIndex(id.getRefIdString());
+        record.mId = ESM::RefId::index(ESM::REC_MGEF, static_cast<std::uint32_t>(index));
     }
 
     inline void setRecordId(const ESM::RefId& id, ESM::Skill& record)
@@ -326,7 +323,7 @@ namespace CSMWorld
         const ESM::RefId& origin, const ESM::RefId& destination, const UniversalId::Type type)
     {
         const int index = cloneRecordImp(origin, destination, type);
-        mRecords.at(index)->get().setPlugin(0);
+        mRecords.at(index)->get().setPlugin(-1);
     }
 
     template <typename ESXRecordT>
@@ -341,7 +338,7 @@ namespace CSMWorld
         const int index = touchRecordImp(id);
         if (index >= 0)
         {
-            mRecords.at(index)->get().setPlugin(0);
+            mRecords.at(index)->get().setPlugin(-1);
             return true;
         }
 
@@ -504,7 +501,7 @@ namespace CSMWorld
 
         auto record2 = std::make_unique<Record<ESXRecordT>>();
         record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
-        record2->mModified = record;
+        record2->mModified = std::move(record);
 
         insertRecord(std::move(record2), getAppendIndex(id, type), type);
     }
diff --git a/apps/opencs/model/world/columnimp.cpp b/apps/opencs/model/world/columnimp.cpp
index 981ec5278d..c31f9c01d0 100644
--- a/apps/opencs/model/world/columnimp.cpp
+++ b/apps/opencs/model/world/columnimp.cpp
@@ -2,11 +2,12 @@
 
 #include <apps/opencs/model/world/columnbase.hpp>
 #include <apps/opencs/model/world/columns.hpp>
+#include <apps/opencs/model/world/disabletag.hpp>
 #include <apps/opencs/model/world/land.hpp>
-#include <apps/opencs/model/world/landtexture.hpp>
 #include <apps/opencs/model/world/record.hpp>
 
 #include <components/esm3/loadland.hpp>
+#include <components/esm3/loadltex.hpp>
 #include <components/esm3/loadmgef.hpp>
 
 #include <algorithm>
@@ -45,36 +46,13 @@ namespace CSMWorld
         };
     }
 
-    /* LandTextureNicknameColumn */
-    LandTextureNicknameColumn::LandTextureNicknameColumn()
-        : Column<LandTexture>(Columns::ColumnId_TextureNickname, ColumnBase::Display_String)
-    {
-    }
-
-    QVariant LandTextureNicknameColumn::get(const Record<LandTexture>& record) const
-    {
-        return QString::fromStdString(record.get().mId.toString());
-    }
-
-    void LandTextureNicknameColumn::set(Record<LandTexture>& record, const QVariant& data)
-    {
-        LandTexture copy = record.get();
-        copy.mId = ESM::RefId::stringRefId(data.toString().toUtf8().constData());
-        record.setModified(copy);
-    }
-
-    bool LandTextureNicknameColumn::isEditable() const
-    {
-        return true;
-    }
-
     /* LandTextureIndexColumn */
     LandTextureIndexColumn::LandTextureIndexColumn()
-        : Column<LandTexture>(Columns::ColumnId_TextureIndex, ColumnBase::Display_Integer)
+        : Column<ESM::LandTexture>(Columns::ColumnId_TextureIndex, ColumnBase::Display_Integer)
     {
     }
 
-    QVariant LandTextureIndexColumn::get(const Record<LandTexture>& record) const
+    QVariant LandTextureIndexColumn::get(const Record<ESM::LandTexture>& record) const
     {
         return record.get().mIndex;
     }
@@ -100,22 +78,6 @@ namespace CSMWorld
         return false;
     }
 
-    /* LandTexturePluginIndexColumn */
-    LandTexturePluginIndexColumn::LandTexturePluginIndexColumn()
-        : Column<LandTexture>(Columns::ColumnId_PluginIndex, ColumnBase::Display_Integer, 0)
-    {
-    }
-
-    QVariant LandTexturePluginIndexColumn::get(const Record<LandTexture>& record) const
-    {
-        return record.get().mPluginIndex;
-    }
-
-    bool LandTexturePluginIndexColumn::isEditable() const
-    {
-        return false;
-    }
-
     /* LandNormalsColumn */
     LandNormalsColumn::LandNormalsColumn()
         : Column<Land>(Columns::ColumnId_LandNormalsIndex, ColumnBase::Display_String, 0)
@@ -202,6 +164,8 @@ namespace CSMWorld
             copy.getLandData()->mHeights[i] = values[i];
         }
 
+        copy.mFlags |= Land::Flag_HeightsNormals;
+
         record.setModified(copy);
     }
 
@@ -249,6 +213,8 @@ namespace CSMWorld
             copy.getLandData()->mColours[i] = values[i];
         }
 
+        copy.mFlags |= Land::Flag_Colors;
+
         record.setModified(copy);
     }
 
@@ -296,6 +262,8 @@ namespace CSMWorld
             copy.getLandData()->mTextures[i] = values[i];
         }
 
+        copy.mFlags |= Land::Flag_Textures;
+
         record.setModified(copy);
     }
 
@@ -316,7 +284,8 @@ namespace CSMWorld
         {
             return QString::fromUtf8(record.get().mRace.getRefIdString().c_str());
         }
-        return QVariant(QVariant::UserType);
+
+        return DisableTag::getVariant();
     }
 
     void BodyPartRaceColumn::set(Record<ESM::BodyPart>& record, const QVariant& data)
@@ -333,6 +302,37 @@ namespace CSMWorld
         return true;
     }
 
+    SelectionGroupColumn::SelectionGroupColumn()
+        : Column<ESM::SelectionGroup>(Columns::ColumnId_SelectionGroupObjects, ColumnBase::Display_None)
+    {
+    }
+
+    QVariant SelectionGroupColumn::get(const Record<ESM::SelectionGroup>& record) const
+    {
+        QVariant data;
+        QStringList selectionInfo;
+        const std::vector<std::string>& instances = record.get().selectedInstances;
+
+        for (const std::string& instance : instances)
+            selectionInfo << QString::fromStdString(instance);
+        data.setValue(selectionInfo);
+
+        return data;
+    }
+
+    void SelectionGroupColumn::set(Record<ESM::SelectionGroup>& record, const QVariant& data)
+    {
+        ESM::SelectionGroup record2 = record.get();
+        for (const auto& item : data.toStringList())
+            record2.selectedInstances.push_back(item.toStdString());
+        record.setModified(record2);
+    }
+
+    bool SelectionGroupColumn::isEditable() const
+    {
+        return false;
+    }
+
     std::optional<std::uint32_t> getSkillIndex(std::string_view value)
     {
         int index = ESM::Skill::refIdToIndex(ESM::RefId::stringRefId(value));
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 5e5ff83fcf..192f27ed46 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -14,8 +14,10 @@
 #include <components/esm3/loadbody.hpp>
 #include <components/esm3/loaddial.hpp>
 #include <components/esm3/loadinfo.hpp>
+#include <components/esm3/loadltex.hpp>
 #include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadskil.hpp>
+#include <components/esm3/selectiongroup.hpp>
 #include <components/esm3/variant.hpp>
 
 #include <optional>
@@ -28,7 +30,6 @@
 #include "columns.hpp"
 #include "info.hpp"
 #include "land.hpp"
-#include "landtexture.hpp"
 #include "record.hpp"
 
 namespace CSMWorld
@@ -82,13 +83,6 @@ namespace CSMWorld
         return QString::fromUtf8(Land::createUniqueRecordId(land.mX, land.mY).c_str());
     }
 
-    template <>
-    inline QVariant StringIdColumn<LandTexture>::get(const Record<LandTexture>& record) const
-    {
-        const LandTexture& ltex = record.get();
-        return QString::fromUtf8(LandTexture::createUniqueRecordId(ltex.mPluginIndex, ltex.mIndex).c_str());
-    }
-
     template <typename ESXRecordT>
     struct RecordStateColumn : public Column<ESXRecordT>
     {
@@ -570,19 +564,37 @@ namespace CSMWorld
 
         QVariant get(const Record<ESXRecordT>& record) const override
         {
-            const ESM::Race::MaleFemaleF& value = mWeight ? record.get().mData.mWeight : record.get().mData.mHeight;
-
-            return mMale ? value.mMale : value.mFemale;
+            if (mWeight)
+            {
+                if (mMale)
+                    return record.get().mData.mMaleWeight;
+                return record.get().mData.mFemaleWeight;
+            }
+            if (mMale)
+                return record.get().mData.mMaleHeight;
+            return record.get().mData.mFemaleHeight;
         }
 
         void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
 
-            ESM::Race::MaleFemaleF& value = mWeight ? record2.mData.mWeight : record2.mData.mHeight;
-
-            (mMale ? value.mMale : value.mFemale) = data.toFloat();
+            float bodyAttr = std::clamp(data.toFloat(), 0.5f, 2.0f);
 
+            if (mWeight)
+            {
+                if (mMale)
+                    record2.mData.mMaleWeight = bodyAttr;
+                else
+                    record2.mData.mFemaleWeight = bodyAttr;
+            }
+            else
+            {
+                if (mMale)
+                    record2.mData.mMaleHeight = bodyAttr;
+                else
+                    record2.mData.mFemaleHeight = bodyAttr;
+            }
             record.setModified(record2);
         }
 
@@ -952,7 +964,7 @@ namespace CSMWorld
         void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
-            record2.mScale = data.toFloat();
+            record2.mScale = std::clamp(data.toFloat(), 0.5f, 2.0f);
             record.setModified(record2);
         }
 
@@ -1095,19 +1107,19 @@ namespace CSMWorld
     };
 
     template <typename ESXRecordT>
-    struct GoldValueColumn : public Column<ESXRecordT>
+    struct StackSizeColumn : public Column<ESXRecordT>
     {
-        GoldValueColumn()
-            : Column<ESXRecordT>(Columns::ColumnId_CoinValue, ColumnBase::Display_Integer)
+        StackSizeColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_StackCount, ColumnBase::Display_Integer)
         {
         }
 
-        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mGoldValue; }
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mCount; }
 
         void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
             ESXRecordT record2 = record.get();
-            record2.mGoldValue = data.toInt();
+            record2.mCount = data.toInt();
             record.setModified(record2);
         }
 
@@ -1117,8 +1129,8 @@ namespace CSMWorld
     template <typename ESXRecordT>
     struct TeleportColumn : public Column<ESXRecordT>
     {
-        TeleportColumn()
-            : Column<ESXRecordT>(Columns::ColumnId_Teleport, ColumnBase::Display_Boolean)
+        TeleportColumn(int flags)
+            : Column<ESXRecordT>(Columns::ColumnId_Teleport, ColumnBase::Display_Boolean, flags)
         {
         }
 
@@ -1146,6 +1158,8 @@ namespace CSMWorld
 
         QVariant get(const Record<ESXRecordT>& record) const override
         {
+            if (!record.get().mTeleport)
+                return QVariant();
             return QString::fromUtf8(record.get().mDestCell.c_str());
         }
 
@@ -1163,6 +1177,26 @@ namespace CSMWorld
         bool isUserEditable() const override { return true; }
     };
 
+    template <typename ESXRecordT>
+    struct IsLockedColumn : public Column<ESXRecordT>
+    {
+        IsLockedColumn(int flags)
+            : Column<ESXRecordT>(Columns::ColumnId_IsLocked, ColumnBase::Display_Boolean, flags)
+        {
+        }
+
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mIsLocked; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
+        {
+            ESXRecordT record2 = record.get();
+            record2.mIsLocked = data.toBool();
+            record.setModified(record2);
+        }
+
+        bool isEditable() const override { return true; }
+    };
+
     template <typename ESXRecordT>
     struct LockLevelColumn : public Column<ESXRecordT>
     {
@@ -1171,7 +1205,12 @@ namespace CSMWorld
         {
         }
 
-        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mLockLevel; }
+        QVariant get(const Record<ESXRecordT>& record) const override
+        {
+            if (record.get().mIsLocked)
+                return record.get().mLockLevel;
+            return QVariant();
+        }
 
         void set(Record<ESXRecordT>& record, const QVariant& data) override
         {
@@ -1193,7 +1232,9 @@ namespace CSMWorld
 
         QVariant get(const Record<ESXRecordT>& record) const override
         {
-            return QString::fromUtf8(record.get().mKey.getRefIdString().c_str());
+            if (record.get().mIsLocked)
+                return QString::fromUtf8(record.get().mKey.getRefIdString().c_str());
+            return QVariant();
         }
 
         void set(Record<ESXRecordT>& record, const QVariant& data) override
@@ -1263,17 +1304,21 @@ namespace CSMWorld
     {
         ESM::Position ESXRecordT::*mPosition;
         int mIndex;
+        bool mIsDoor;
 
         PosColumn(ESM::Position ESXRecordT::*position, int index, bool door)
             : Column<ESXRecordT>((door ? Columns::ColumnId_DoorPositionXPos : Columns::ColumnId_PositionXPos) + index,
                 ColumnBase::Display_Float)
             , mPosition(position)
             , mIndex(index)
+            , mIsDoor(door)
         {
         }
 
         QVariant get(const Record<ESXRecordT>& record) const override
         {
+            if (!record.get().mTeleport && mIsDoor)
+                return QVariant();
             const ESM::Position& position = record.get().*mPosition;
             return position.pos[mIndex];
         }
@@ -1297,17 +1342,21 @@ namespace CSMWorld
     {
         ESM::Position ESXRecordT::*mPosition;
         int mIndex;
+        bool mIsDoor;
 
         RotColumn(ESM::Position ESXRecordT::*position, int index, bool door)
             : Column<ESXRecordT>((door ? Columns::ColumnId_DoorPositionXRot : Columns::ColumnId_PositionXRot) + index,
                 ColumnBase::Display_Double)
             , mPosition(position)
             , mIndex(index)
+            , mIsDoor(door)
         {
         }
 
         QVariant get(const Record<ESXRecordT>& record) const override
         {
+            if (!record.get().mTeleport && mIsDoor)
+                return QVariant();
             const ESM::Position& position = record.get().*mPosition;
             return osg::RadiansToDegrees(position.rot[mIndex]);
         }
@@ -2033,6 +2082,26 @@ namespace CSMWorld
         bool isEditable() const override { return true; }
     };
 
+    template <typename ESXRecordT>
+    struct ProjectileSpeedColumn : public Column<ESXRecordT>
+    {
+        ProjectileSpeedColumn()
+            : Column<ESXRecordT>(Columns::ColumnId_ProjectileSpeed, ColumnBase::Display_Float)
+        {
+        }
+
+        QVariant get(const Record<ESXRecordT>& record) const override { return record.get().mData.mSpeed; }
+
+        void set(Record<ESXRecordT>& record, const QVariant& data) override
+        {
+            ESXRecordT record2 = record.get();
+            record2.mData.mSpeed = data.toFloat();
+            record.setModified(record2);
+        }
+
+        bool isEditable() const override { return true; }
+    };
+
     template <typename ESXRecordT>
     struct SchoolColumn : public Column<ESXRecordT>
     {
@@ -2289,20 +2358,11 @@ namespace CSMWorld
         bool isEditable() const override { return true; }
     };
 
-    struct LandTextureNicknameColumn : public Column<LandTexture>
-    {
-        LandTextureNicknameColumn();
-
-        QVariant get(const Record<LandTexture>& record) const override;
-        void set(Record<LandTexture>& record, const QVariant& data) override;
-        bool isEditable() const override;
-    };
-
-    struct LandTextureIndexColumn : public Column<LandTexture>
+    struct LandTextureIndexColumn : public Column<ESM::LandTexture>
     {
         LandTextureIndexColumn();
 
-        QVariant get(const Record<LandTexture>& record) const override;
+        QVariant get(const Record<ESM::LandTexture>& record) const override;
         bool isEditable() const override;
     };
 
@@ -2314,14 +2374,6 @@ namespace CSMWorld
         bool isEditable() const override;
     };
 
-    struct LandTexturePluginIndexColumn : public Column<LandTexture>
-    {
-        LandTexturePluginIndexColumn();
-
-        QVariant get(const Record<LandTexture>& record) const override;
-        bool isEditable() const override;
-    };
-
     struct LandNormalsColumn : public Column<Land>
     {
         using DataType = QVector<signed char>;
@@ -2376,6 +2428,17 @@ namespace CSMWorld
         void set(Record<ESM::BodyPart>& record, const QVariant& data) override;
         bool isEditable() const override;
     };
+
+    struct SelectionGroupColumn : public Column<ESM::SelectionGroup>
+    {
+        SelectionGroupColumn();
+
+        QVariant get(const Record<ESM::SelectionGroup>& record) const override;
+
+        void set(Record<ESM::SelectionGroup>& record, const QVariant& data) override;
+
+        bool isEditable() const override;
+    };
 }
 
 // This is required to access the type as a QVariant.
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 4a476b52f3..d4c35c5cec 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -56,9 +56,11 @@ namespace CSMWorld
             { ColumnId_FactionIndex, "Faction Index" },
             { ColumnId_Charges, "Charges" },
             { ColumnId_Enchantment, "Enchantment" },
-            { ColumnId_CoinValue, "Coin Value" },
+            { ColumnId_StackCount, "Count" },
+            { ColumnId_GoldValue, "Value" },
             { ColumnId_Teleport, "Teleport" },
             { ColumnId_TeleportCell, "Teleport Cell" },
+            { ColumnId_IsLocked, "Locked" },
             { ColumnId_LockLevel, "Lock Level" },
             { ColumnId_Key, "Key" },
             { ColumnId_Trap, "Trap" },
@@ -235,6 +237,7 @@ namespace CSMWorld
             { ColumnId_RegionSounds, "Sounds" },
             { ColumnId_SoundName, "Sound Name" },
             { ColumnId_SoundChance, "Chance" },
+            { ColumnId_SoundProbability, "Probability" },
 
             { ColumnId_FactionReactions, "Reactions" },
             { ColumnId_FactionRanks, "Ranks" },
@@ -321,7 +324,6 @@ namespace CSMWorld
             { ColumnId_MaxAttack, "Max Attack" },
             { ColumnId_CreatureMisc, "Creature Misc" },
 
-            { ColumnId_Idle1, "Idle 1" },
             { ColumnId_Idle2, "Idle 2" },
             { ColumnId_Idle3, "Idle 3" },
             { ColumnId_Idle4, "Idle 4" },
@@ -329,6 +331,7 @@ namespace CSMWorld
             { ColumnId_Idle6, "Idle 6" },
             { ColumnId_Idle7, "Idle 7" },
             { ColumnId_Idle8, "Idle 8" },
+            { ColumnId_Idle9, "Idle 9" },
 
             { ColumnId_RegionWeather, "Weather" },
             { ColumnId_WeatherName, "Type" },
@@ -376,6 +379,7 @@ namespace CSMWorld
             { ColumnId_Blocked, "Blocked" },
 
             { ColumnId_LevelledCreatureId, "Levelled Creature" },
+            { ColumnId_ProjectileSpeed, "Projectile Speed" },
 
             // end marker
             { -1, 0 },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 92f41a2f20..469c1eee33 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -45,7 +45,7 @@ namespace CSMWorld
             ColumnId_FactionIndex = 31,
             ColumnId_Charges = 32,
             ColumnId_Enchantment = 33,
-            ColumnId_CoinValue = 34,
+            ColumnId_StackCount = 34,
             ColumnId_Teleport = 35,
             ColumnId_TeleportCell = 36,
             ColumnId_LockLevel = 37,
@@ -310,14 +310,14 @@ namespace CSMWorld
             ColumnId_MaxAttack = 284,
             ColumnId_CreatureMisc = 285,
 
-            ColumnId_Idle1 = 286,
-            ColumnId_Idle2 = 287,
-            ColumnId_Idle3 = 288,
-            ColumnId_Idle4 = 289,
-            ColumnId_Idle5 = 290,
-            ColumnId_Idle6 = 291,
-            ColumnId_Idle7 = 292,
-            ColumnId_Idle8 = 293,
+            ColumnId_Idle2 = 286,
+            ColumnId_Idle3 = 287,
+            ColumnId_Idle4 = 288,
+            ColumnId_Idle5 = 289,
+            ColumnId_Idle6 = 290,
+            ColumnId_Idle7 = 291,
+            ColumnId_Idle8 = 292,
+            ColumnId_Idle9 = 293,
 
             ColumnId_RegionWeather = 294,
             ColumnId_WeatherName = 295,
@@ -347,6 +347,16 @@ namespace CSMWorld
 
             ColumnId_LevelledCreatureId = 315,
 
+            ColumnId_SelectionGroupObjects = 316,
+
+            ColumnId_SoundProbability = 317,
+
+            ColumnId_IsLocked = 318,
+
+            ColumnId_ProjectileSpeed = 319,
+
+            ColumnId_GoldValue = 320,
+
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
             ColumnId_UseValue1 = 0x10000,
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index da49caef10..168049641a 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -7,7 +7,6 @@
 
 #include <apps/opencs/model/world/columns.hpp>
 #include <apps/opencs/model/world/land.hpp>
-#include <apps/opencs/model/world/landtexture.hpp>
 #include <apps/opencs/model/world/record.hpp>
 #include <apps/opencs/model/world/universalid.hpp>
 
@@ -36,7 +35,7 @@ CSMWorld::TouchCommand::TouchCommand(IdTable& table, const std::string& id, QUnd
 
 void CSMWorld::TouchCommand::redo()
 {
-    mOld.reset(mTable.getRecord(mId).clone().get());
+    mOld = mTable.getRecord(mId).clone();
     mChanged = mTable.touchRecord(mId);
 }
 
@@ -61,11 +60,11 @@ CSMWorld::ImportLandTexturesCommand::ImportLandTexturesCommand(
 
 void CSMWorld::ImportLandTexturesCommand::redo()
 {
-    int pluginColumn = mLands.findColumnIndex(Columns::ColumnId_PluginIndex);
-    int oldPlugin = mLands.data(mLands.getModelIndex(getOriginId(), pluginColumn)).toInt();
+    const int pluginColumn = mLands.findColumnIndex(Columns::ColumnId_PluginIndex);
+    const int oldPlugin = mLands.data(mLands.getModelIndex(getOriginId(), pluginColumn)).toInt();
 
     // Original data
-    int textureColumn = mLands.findColumnIndex(Columns::ColumnId_LandTexturesIndex);
+    const int textureColumn = mLands.findColumnIndex(Columns::ColumnId_LandTexturesIndex);
     mOld = mLands.data(mLands.getModelIndex(getOriginId(), textureColumn)).value<DataType>();
 
     // Need to make a copy so the old values can be looked up
@@ -74,44 +73,37 @@ void CSMWorld::ImportLandTexturesCommand::redo()
     // Perform touch/copy/etc...
     onRedo();
 
-    // Find all indices used
-    std::unordered_set<int> texIndices;
-    for (int i = 0; i < mOld.size(); ++i)
+    std::unordered_map<uint16_t, uint16_t> indexMapping;
+    for (uint16_t index : mOld)
     {
         // All indices are offset by 1 for a default texture
-        if (mOld[i] > 0)
-            texIndices.insert(mOld[i] - 1);
-    }
-
-    std::vector<std::string> oldTextures;
-    oldTextures.reserve(texIndices.size());
-    for (int index : texIndices)
-    {
-        oldTextures.push_back(LandTexture::createUniqueRecordId(oldPlugin, index));
-    }
-
-    // Import the textures, replace old values
-    LandTextureIdTable::ImportResults results = dynamic_cast<LandTextureIdTable&>(mLtexs).importTextures(oldTextures);
-    mCreatedTextures = std::move(results.createdRecords);
-    for (const auto& it : results.recordMapping)
-    {
-        int plugin = 0, newIndex = 0, oldIndex = 0;
-        LandTexture::parseUniqueRecordId(it.first, plugin, oldIndex);
-        LandTexture::parseUniqueRecordId(it.second, plugin, newIndex);
-
-        if (newIndex != oldIndex)
+        if (index == 0)
+            continue;
+        if (indexMapping.contains(index))
+            continue;
+        const CSMWorld::Record<ESM::LandTexture>* record
+            = static_cast<LandTextureIdTable&>(mLtexs).searchRecord(index - 1, oldPlugin);
+        if (!record || record->isDeleted())
         {
-            for (int i = 0; i < Land::LAND_NUM_TEXTURES; ++i)
-            {
-                // All indices are offset by 1 for a default texture
-                if (mOld[i] == oldIndex + 1)
-                    copy[i] = newIndex + 1;
-            }
+            indexMapping.emplace(index, 0);
+            continue;
         }
+        if (!record->isModified())
+        {
+            mTouchedTextures.emplace_back(record->clone());
+            mLtexs.touchRecord(record->get().mId.getRefIdString());
+        }
+        indexMapping.emplace(index, record->get().mIndex + 1);
+    }
+    for (int i = 0; i < Land::LAND_NUM_TEXTURES; ++i)
+    {
+        uint16_t oldIndex = mOld[i];
+        uint16_t newIndex = indexMapping[oldIndex];
+        copy[i] = newIndex;
     }
 
     // Apply modification
-    int stateColumn = mLands.findColumnIndex(Columns::ColumnId_Modification);
+    const int stateColumn = mLands.findColumnIndex(Columns::ColumnId_Modification);
     mOldState = mLands.data(mLands.getModelIndex(getDestinationId(), stateColumn)).toInt();
 
     QVariant variant;
@@ -133,12 +125,12 @@ void CSMWorld::ImportLandTexturesCommand::undo()
     // Undo copy/touch/etc...
     onUndo();
 
-    for (const std::string& id : mCreatedTextures)
+    for (auto& ltex : mTouchedTextures)
     {
-        int row = mLtexs.getModelIndex(id, 0).row();
-        mLtexs.removeRows(row, 1);
+        ESM::RefId id = static_cast<Record<ESM::LandTexture>*>(ltex.get())->get().mId;
+        mLtexs.setRecord(id.getRefIdString(), std::move(ltex));
     }
-    mCreatedTextures.clear();
+    mTouchedTextures.clear();
 }
 
 CSMWorld::CopyLandTexturesCommand::CopyLandTexturesCommand(
@@ -181,9 +173,8 @@ const std::string& CSMWorld::TouchLandCommand::getDestinationId() const
 
 void CSMWorld::TouchLandCommand::onRedo()
 {
+    mOld = mLands.getRecord(mId).clone();
     mChanged = mLands.touchRecord(mId);
-    if (mChanged)
-        mOld.reset(mLands.getRecord(mId).clone().get());
 }
 
 void CSMWorld::TouchLandCommand::onUndo()
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index a243950003..f6b0caeb1a 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -69,7 +69,7 @@ namespace CSMWorld
         IdTable& mLtexs;
         DataType mOld;
         int mOldState;
-        std::vector<std::string> mCreatedTextures;
+        std::vector<std::unique_ptr<RecordBase>> mTouchedTextures;
     };
 
     /// \brief This command is used to fix LandTexture records and texture
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 07e9879795..00e5fec7b0 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -16,7 +16,6 @@
 #include <apps/opencs/model/world/info.hpp>
 #include <apps/opencs/model/world/infocollection.hpp>
 #include <apps/opencs/model/world/land.hpp>
-#include <apps/opencs/model/world/landtexture.hpp>
 #include <apps/opencs/model/world/metadata.hpp>
 #include <apps/opencs/model/world/nestedidcollection.hpp>
 #include <apps/opencs/model/world/nestedinfocollection.hpp>
@@ -36,6 +35,7 @@
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loaddoor.hpp>
 #include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadltex.hpp>
 #include <components/esm3/loadstat.hpp>
 #include <components/files/collections.hpp>
 #include <components/misc/strings/lower.hpp>
@@ -137,17 +137,19 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     : mEncoder(encoding)
     , mPathgrids(mCells)
     , mRefs(mCells)
-    , mReader(nullptr)
     , mDialogue(nullptr)
-    , mReaderIndex(1)
+    , mReaderIndex(0)
     , mDataPaths(dataPaths)
     , mArchives(archives)
+    , mVFS(std::make_unique<VFS::Manager>())
 {
-    mVFS = std::make_unique<VFS::Manager>();
     VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths), mArchives, true);
 
     mResourcesManager.setVFS(mVFS.get());
-    mResourceSystem = std::make_unique<Resource::ResourceSystem>(mVFS.get());
+
+    constexpr double expiryDelay = 0;
+    mResourceSystem
+        = std::make_unique<Resource::ResourceSystem>(mVFS.get(), expiryDelay, &mEncoder.getStatelessEncoder());
 
     Shader::ShaderManager::DefineMap defines
         = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
@@ -158,7 +160,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     defines["radialFog"] = "0";
     defines["lightingModel"] = "0";
     defines["reverseZ"] = "0";
-    defines["refraction_enabled"] = "0";
+    defines["waterRefraction"] = "0";
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
@@ -298,8 +300,8 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mRegions.addColumn(new NestedParentColumn<ESM::Region>(Columns::ColumnId_RegionWeather));
     index = mRegions.getColumns() - 1;
     mRegions.addAdapter(std::make_pair(&mRegions.getColumn(index), new RegionWeatherAdapter()));
-    mRegions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn(Columns::ColumnId_WeatherName, ColumnBase::Display_String, false));
+    mRegions.getNestableColumn(index)->addColumn(new NestedChildColumn(
+        Columns::ColumnId_WeatherName, ColumnBase::Display_String, ColumnBase::Flag_Dialogue, false));
     mRegions.getNestableColumn(index)->addColumn(
         new NestedChildColumn(Columns::ColumnId_WeatherChance, ColumnBase::Display_UnsignedInteger8));
     // Region Sounds
@@ -310,6 +312,8 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
         new NestedChildColumn(Columns::ColumnId_SoundName, ColumnBase::Display_Sound));
     mRegions.getNestableColumn(index)->addColumn(
         new NestedChildColumn(Columns::ColumnId_SoundChance, ColumnBase::Display_UnsignedInteger8));
+    mRegions.getNestableColumn(index)->addColumn(new NestedChildColumn(
+        Columns::ColumnId_SoundProbability, ColumnBase::Display_String, ColumnBase::Flag_Dialogue, false));
 
     mBirthsigns.addColumn(new StringIdColumn<ESM::BirthSign>);
     mBirthsigns.addColumn(new RecordStateColumn<ESM::BirthSign>);
@@ -497,6 +501,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mMagicEffects.addColumn(new FixedRecordTypeColumn<ESM::MagicEffect>(UniversalId::Type_MagicEffect));
     mMagicEffects.addColumn(new SchoolColumn<ESM::MagicEffect>);
     mMagicEffects.addColumn(new BaseCostColumn<ESM::MagicEffect>);
+    mMagicEffects.addColumn(new ProjectileSpeedColumn<ESM::MagicEffect>);
     mMagicEffects.addColumn(new EffectTextureColumn<ESM::MagicEffect>(Columns::ColumnId_Icon));
     mMagicEffects.addColumn(new EffectTextureColumn<ESM::MagicEffect>(Columns::ColumnId_Particle));
     mMagicEffects.addColumn(new EffectObjectColumn<ESM::MagicEffect>(Columns::ColumnId_CastingObject));
@@ -507,6 +512,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mMagicEffects.addColumn(new EffectSoundColumn<ESM::MagicEffect>(Columns::ColumnId_HitSound));
     mMagicEffects.addColumn(new EffectSoundColumn<ESM::MagicEffect>(Columns::ColumnId_AreaSound));
     mMagicEffects.addColumn(new EffectSoundColumn<ESM::MagicEffect>(Columns::ColumnId_BoltSound));
+
     mMagicEffects.addColumn(
         new FlagColumn<ESM::MagicEffect>(Columns::ColumnId_AllowSpellmaking, ESM::MagicEffect::AllowSpellmaking));
     mMagicEffects.addColumn(
@@ -524,13 +530,11 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mLand.addColumn(new LandColoursColumn);
     mLand.addColumn(new LandTexturesColumn);
 
-    mLandTextures.addColumn(new StringIdColumn<LandTexture>(true));
-    mLandTextures.addColumn(new RecordStateColumn<LandTexture>);
-    mLandTextures.addColumn(new FixedRecordTypeColumn<LandTexture>(UniversalId::Type_LandTexture));
-    mLandTextures.addColumn(new LandTextureNicknameColumn);
-    mLandTextures.addColumn(new LandTexturePluginIndexColumn);
+    mLandTextures.addColumn(new StringIdColumn<ESM::LandTexture>);
+    mLandTextures.addColumn(new RecordStateColumn<ESM::LandTexture>);
+    mLandTextures.addColumn(new FixedRecordTypeColumn<ESM::LandTexture>(UniversalId::Type_LandTexture));
     mLandTextures.addColumn(new LandTextureIndexColumn);
-    mLandTextures.addColumn(new TextureColumn<LandTexture>);
+    mLandTextures.addColumn(new TextureColumn<ESM::LandTexture>);
 
     mPathgrids.addColumn(new StringIdColumn<Pathgrid>);
     mPathgrids.addColumn(new RecordStateColumn<Pathgrid>);
@@ -585,8 +589,9 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mRefs.addColumn(new FactionIndexColumn<CellRef>);
     mRefs.addColumn(new ChargesColumn<CellRef>);
     mRefs.addColumn(new EnchantmentChargesColumn<CellRef>);
-    mRefs.addColumn(new GoldValueColumn<CellRef>);
-    mRefs.addColumn(new TeleportColumn<CellRef>);
+    mRefs.addColumn(new StackSizeColumn<CellRef>);
+    mRefs.addColumn(new TeleportColumn<CellRef>(
+        ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
     mRefs.addColumn(new TeleportCellColumn<CellRef>);
     mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mDoorDest, 0, true));
     mRefs.addColumn(new PosColumn<CellRef>(&CellRef::mDoorDest, 1, true));
@@ -594,6 +599,8 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mDoorDest, 0, true));
     mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mDoorDest, 1, true));
     mRefs.addColumn(new RotColumn<CellRef>(&CellRef::mDoorDest, 2, true));
+    mRefs.addColumn(new IsLockedColumn<CellRef>(
+        ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
     mRefs.addColumn(new LockLevelColumn<CellRef>);
     mRefs.addColumn(new KeyColumn<CellRef>);
     mRefs.addColumn(new TrapColumn<CellRef>);
@@ -618,6 +625,11 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mDebugProfiles.addColumn(new DescriptionColumn<ESM::DebugProfile>);
     mDebugProfiles.addColumn(new ScriptColumn<ESM::DebugProfile>(ScriptColumn<ESM::DebugProfile>::Type_Lines));
 
+    mSelectionGroups.addColumn(new StringIdColumn<ESM::SelectionGroup>);
+    mSelectionGroups.addColumn(new RecordStateColumn<ESM::SelectionGroup>);
+    mSelectionGroups.addColumn(new FixedRecordTypeColumn<ESM::SelectionGroup>(UniversalId::Type_SelectionGroup));
+    mSelectionGroups.addColumn(new SelectionGroupColumn);
+
     mMetaData.appendBlankRecord(ESM::RefId::stringRefId("sys::meta"));
 
     mMetaData.addColumn(new StringIdColumn<MetaData>(true));
@@ -662,6 +674,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_Textures)), UniversalId::Type_Texture);
     addModel(new ResourceTable(&mResourcesManager.get(UniversalId::Type_Videos)), UniversalId::Type_Video);
     addModel(new IdTable(&mMetaData), UniversalId::Type_MetaData);
+    addModel(new IdTable(&mSelectionGroups), UniversalId::Type_SelectionGroup);
 
     mActorAdapter = std::make_unique<ActorAdapter>(*this);
 
@@ -672,8 +685,6 @@ CSMWorld::Data::~Data()
 {
     for (std::vector<QAbstractItemModel*>::iterator iter(mModels.begin()); iter != mModels.end(); ++iter)
         delete *iter;
-
-    delete mReader;
 }
 
 std::shared_ptr<Resource::ResourceSystem> CSMWorld::Data::getResourceSystem()
@@ -906,6 +917,16 @@ CSMWorld::IdCollection<ESM::DebugProfile>& CSMWorld::Data::getDebugProfiles()
     return mDebugProfiles;
 }
 
+CSMWorld::IdCollection<ESM::SelectionGroup>& CSMWorld::Data::getSelectionGroups()
+{
+    return mSelectionGroups;
+}
+
+const CSMWorld::IdCollection<ESM::SelectionGroup>& CSMWorld::Data::getSelectionGroups() const
+{
+    return mSelectionGroups;
+}
+
 const CSMWorld::IdCollection<CSMWorld::Land>& CSMWorld::Data::getLand() const
 {
     return mLand;
@@ -916,12 +937,12 @@ CSMWorld::IdCollection<CSMWorld::Land>& CSMWorld::Data::getLand()
     return mLand;
 }
 
-const CSMWorld::IdCollection<CSMWorld::LandTexture>& CSMWorld::Data::getLandTextures() const
+const CSMWorld::IdCollection<ESM::LandTexture>& CSMWorld::Data::getLandTextures() const
 {
     return mLandTextures;
 }
 
-CSMWorld::IdCollection<CSMWorld::LandTexture>& CSMWorld::Data::getLandTextures()
+CSMWorld::IdCollection<ESM::LandTexture>& CSMWorld::Data::getLandTextures()
 {
     return mLandTextures;
 }
@@ -1042,17 +1063,11 @@ int CSMWorld::Data::startLoading(const std::filesystem::path& path, bool base, b
 {
     Log(Debug::Info) << "Loading content file " << path;
 
-    // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading
-    std::shared_ptr<ESM::ESMReader> ptr(mReader);
-    mReaders.push_back(ptr);
-    mReader = nullptr;
-
     mDialogue = nullptr;
 
-    mReader = new ESM::ESMReader;
-    mReader->setEncoder(&mEncoder);
-    mReader->setIndex((project || !base) ? 0 : mReaderIndex++);
-    mReader->open(path);
+    ESM::ReadersCache::BusyItem reader = mReaders.get(mReaderIndex++);
+    reader->setEncoder(&mEncoder);
+    reader->open(path);
 
     mBase = base;
     mProject = project;
@@ -1061,13 +1076,13 @@ int CSMWorld::Data::startLoading(const std::filesystem::path& path, bool base, b
     {
         MetaData metaData;
         metaData.mId = ESM::RefId::stringRefId("sys::meta");
-        metaData.load(*mReader);
+        metaData.load(*reader);
 
         mMetaData.setRecord(0,
             std::make_unique<Record<MetaData>>(Record<MetaData>(RecordBase::State_ModifiedOnly, nullptr, &metaData)));
     }
 
-    return mReader->getRecordCount();
+    return reader->getRecordCount();
 }
 
 void CSMWorld::Data::loadFallbackEntries()
@@ -1089,7 +1104,7 @@ void CSMWorld::Data::loadFallbackEntries()
             newMarker.mModel = model;
             newMarker.mRecordFlags = 0;
             auto record = std::make_unique<CSMWorld::Record<ESM::Static>>();
-            record->mBase = newMarker;
+            record->mBase = std::move(newMarker);
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
             mReferenceables.appendRecord(std::move(record), CSMWorld::UniversalId::Type_Static);
         }
@@ -1105,7 +1120,7 @@ void CSMWorld::Data::loadFallbackEntries()
             newMarker.mModel = model;
             newMarker.mRecordFlags = 0;
             auto record = std::make_unique<CSMWorld::Record<ESM::Door>>();
-            record->mBase = newMarker;
+            record->mBase = std::move(newMarker);
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
             mReferenceables.appendRecord(std::move(record), CSMWorld::UniversalId::Type_Door);
         }
@@ -1114,24 +1129,17 @@ void CSMWorld::Data::loadFallbackEntries()
 
 bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
 {
-    if (!mReader)
+    if (mReaderIndex == 0)
         throw std::logic_error("can't continue loading, because no load has been started");
+    ESM::ReadersCache::BusyItem reader = mReaders.get(mReaderIndex - 1);
+    if (!reader->isOpen())
+        throw std::logic_error("can't continue loading, because no load has been started");
+    reader->setEncoder(&mEncoder);
+    reader->setIndex(static_cast<int>(mReaderIndex - 1));
+    reader->resolveParentFileIndices(mReaders);
 
-    if (!mReader->hasMoreRecs())
+    if (!reader->hasMoreRecs())
     {
-        if (mBase)
-        {
-            // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand
-            // loading. We don't store non-base reader, because everything going into modified will be fully loaded
-            // during the initial loading process.
-            std::shared_ptr<ESM::ESMReader> ptr(mReader);
-            mReaders.push_back(ptr);
-        }
-        else
-            delete mReader;
-
-        mReader = nullptr;
-
         mDialogue = nullptr;
 
         loadFallbackEntries();
@@ -1139,76 +1147,76 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
         return true;
     }
 
-    ESM::NAME n = mReader->getRecName();
-    mReader->getRecHeader();
+    ESM::NAME n = reader->getRecName();
+    reader->getRecHeader();
 
     bool unhandledRecord = false;
 
     switch (n.toInt())
     {
         case ESM::REC_GLOB:
-            mGlobals.load(*mReader, mBase);
+            mGlobals.load(*reader, mBase);
             break;
         case ESM::REC_GMST:
-            mGmsts.load(*mReader, mBase);
+            mGmsts.load(*reader, mBase);
             break;
         case ESM::REC_SKIL:
-            mSkills.load(*mReader, mBase);
+            mSkills.load(*reader, mBase);
             break;
         case ESM::REC_CLAS:
-            mClasses.load(*mReader, mBase);
+            mClasses.load(*reader, mBase);
             break;
         case ESM::REC_FACT:
-            mFactions.load(*mReader, mBase);
+            mFactions.load(*reader, mBase);
             break;
         case ESM::REC_RACE:
-            mRaces.load(*mReader, mBase);
+            mRaces.load(*reader, mBase);
             break;
         case ESM::REC_SOUN:
-            mSounds.load(*mReader, mBase);
+            mSounds.load(*reader, mBase);
             break;
         case ESM::REC_SCPT:
-            mScripts.load(*mReader, mBase);
+            mScripts.load(*reader, mBase);
             break;
         case ESM::REC_REGN:
-            mRegions.load(*mReader, mBase);
+            mRegions.load(*reader, mBase);
             break;
         case ESM::REC_BSGN:
-            mBirthsigns.load(*mReader, mBase);
+            mBirthsigns.load(*reader, mBase);
             break;
         case ESM::REC_SPEL:
-            mSpells.load(*mReader, mBase);
+            mSpells.load(*reader, mBase);
             break;
         case ESM::REC_ENCH:
-            mEnchantments.load(*mReader, mBase);
+            mEnchantments.load(*reader, mBase);
             break;
         case ESM::REC_BODY:
-            mBodyParts.load(*mReader, mBase);
+            mBodyParts.load(*reader, mBase);
             break;
         case ESM::REC_SNDG:
-            mSoundGens.load(*mReader, mBase);
+            mSoundGens.load(*reader, mBase);
             break;
         case ESM::REC_MGEF:
-            mMagicEffects.load(*mReader, mBase);
+            mMagicEffects.load(*reader, mBase);
             break;
         case ESM::REC_PGRD:
-            mPathgrids.load(*mReader, mBase);
+            mPathgrids.load(*reader, mBase);
             break;
         case ESM::REC_SSCR:
-            mStartScripts.load(*mReader, mBase);
+            mStartScripts.load(*reader, mBase);
             break;
 
         case ESM::REC_LTEX:
-            mLandTextures.load(*mReader, mBase);
+            mLandTextures.load(*reader, mBase);
             break;
 
         case ESM::REC_LAND:
-            mLand.load(*mReader, mBase);
+            mLand.load(*reader, mBase);
             break;
 
         case ESM::REC_CELL:
         {
-            int index = mCells.load(*mReader, mBase);
+            int index = mCells.load(*reader, mBase);
             if (index < 0 || index >= mCells.getSize())
             {
                 // log an error and continue loading the refs to the last loaded cell
@@ -1217,69 +1225,69 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
                 index = mCells.getSize() - 1;
             }
 
-            mRefs.load(*mReader, index, mBase, mRefLoadCache[mCells.getId(index)], messages);
+            mRefs.load(*reader, index, mBase, mRefLoadCache[mCells.getId(index)], messages);
             break;
         }
 
         case ESM::REC_ACTI:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Activator);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Activator);
             break;
         case ESM::REC_ALCH:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Potion);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Potion);
             break;
         case ESM::REC_APPA:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Apparatus);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Apparatus);
             break;
         case ESM::REC_ARMO:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Armor);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Armor);
             break;
         case ESM::REC_BOOK:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Book);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Book);
             break;
         case ESM::REC_CLOT:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Clothing);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Clothing);
             break;
         case ESM::REC_CONT:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Container);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Container);
             break;
         case ESM::REC_CREA:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Creature);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Creature);
             break;
         case ESM::REC_DOOR:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Door);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Door);
             break;
         case ESM::REC_INGR:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Ingredient);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Ingredient);
             break;
         case ESM::REC_LEVC:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_CreatureLevelledList);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_CreatureLevelledList);
             break;
         case ESM::REC_LEVI:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_ItemLevelledList);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_ItemLevelledList);
             break;
         case ESM::REC_LIGH:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Light);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Light);
             break;
         case ESM::REC_LOCK:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Lockpick);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Lockpick);
             break;
         case ESM::REC_MISC:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Miscellaneous);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Miscellaneous);
             break;
         case ESM::REC_NPC_:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Npc);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Npc);
             break;
         case ESM::REC_PROB:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Probe);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Probe);
             break;
         case ESM::REC_REPA:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Repair);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Repair);
             break;
         case ESM::REC_STAT:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Static);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Static);
             break;
         case ESM::REC_WEAP:
-            mReferenceables.load(*mReader, mBase, UniversalId::Type_Weapon);
+            mReferenceables.load(*reader, mBase, UniversalId::Type_Weapon);
             break;
 
         case ESM::REC_DIAL:
@@ -1287,7 +1295,7 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
             ESM::Dialogue record;
             bool isDeleted = false;
 
-            record.load(*mReader, isDeleted);
+            record.load(*reader, isDeleted);
 
             if (isDeleted)
             {
@@ -1333,14 +1341,14 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
                 messages.add(UniversalId::Type_None, "Found info record not following a dialogue record", "",
                     CSMDoc::Message::Severity_Error);
 
-                mReader->skipRecord();
+                reader->skipRecord();
                 break;
             }
 
             if (mDialogue->mType == ESM::Dialogue::Journal)
-                mJournalInfos.load(*mReader, mBase, *mDialogue, mJournalInfoOrder);
+                mJournalInfos.load(*reader, mBase, *mDialogue, mJournalInfoOrder);
             else
-                mTopicInfos.load(*mReader, mBase, *mDialogue, mTopicInfoOrder);
+                mTopicInfos.load(*reader, mBase, *mDialogue, mTopicInfoOrder);
 
             break;
         }
@@ -1353,7 +1361,7 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
                 break;
             }
 
-            mFilters.load(*mReader, mBase);
+            mFilters.load(*reader, mBase);
             break;
 
         case ESM::REC_DBGP:
@@ -1364,7 +1372,18 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
                 break;
             }
 
-            mDebugProfiles.load(*mReader, mBase);
+            mDebugProfiles.load(*reader, mBase);
+            break;
+
+        case ESM::REC_SELG:
+
+            if (!mProject)
+            {
+                unhandledRecord = true;
+                break;
+            }
+
+            mSelectionGroups.load(*reader, mBase);
             break;
 
         default:
@@ -1377,7 +1396,7 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
         messages.add(
             UniversalId::Type_None, "Unsupported record type: " + n.toString(), "", CSMDoc::Message::Severity_Error);
 
-        mReader->skipRecord();
+        reader->skipRecord();
     }
 
     return false;
@@ -1387,6 +1406,8 @@ void CSMWorld::Data::finishLoading()
 {
     mTopicInfos.sort(mTopicInfoOrder);
     mJournalInfos.sort(mJournalInfoOrder);
+    // Release file locks so we can actually write to the file we're editing
+    mReaders.clear();
 }
 
 bool CSMWorld::Data::hasId(const std::string& id) const
@@ -1409,7 +1430,8 @@ int CSMWorld::Data::count(RecordBase::State state) const
         + count(state, mRegions) + count(state, mBirthsigns) + count(state, mSpells) + count(state, mCells)
         + count(state, mEnchantments) + count(state, mBodyParts) + count(state, mLand) + count(state, mLandTextures)
         + count(state, mSoundGens) + count(state, mMagicEffects) + count(state, mReferenceables)
-        + count(state, mPathgrids);
+        + count(state, mPathgrids) + count(state, mTopics) + count(state, mTopicInfos) + count(state, mJournals)
+        + count(state, mJournalInfos);
 }
 
 std::vector<ESM::RefId> CSMWorld::Data::getIds(bool listDeleted) const
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index 1b63986eac..237b746746 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -24,6 +24,7 @@
 #include <components/esm3/loadfact.hpp>
 #include <components/esm3/loadglob.hpp>
 #include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadltex.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadregn.hpp>
@@ -33,6 +34,8 @@
 #include <components/esm3/loadsoun.hpp>
 #include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadsscr.hpp>
+#include <components/esm3/readerscache.hpp>
+#include <components/esm3/selectiongroup.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/misc/algorithm.hpp>
 #include <components/to_utf8/to_utf8.hpp>
@@ -41,7 +44,6 @@
 #include "idcollection.hpp"
 #include "infocollection.hpp"
 #include "land.hpp"
-#include "landtexture.hpp"
 #include "metadata.hpp"
 #include "nestedidcollection.hpp"
 #include "nestedinfocollection.hpp"
@@ -105,13 +107,14 @@ namespace CSMWorld
         IdCollection<ESM::BodyPart> mBodyParts;
         IdCollection<ESM::MagicEffect> mMagicEffects;
         IdCollection<ESM::DebugProfile> mDebugProfiles;
+        IdCollection<ESM::SelectionGroup> mSelectionGroups;
         IdCollection<ESM::SoundGenerator> mSoundGens;
         IdCollection<ESM::StartScript> mStartScripts;
         NestedInfoCollection mTopicInfos;
         InfoCollection mJournalInfos;
         NestedIdCollection<Cell> mCells;
         SubCellCollection<Pathgrid> mPathgrids;
-        IdCollection<LandTexture> mLandTextures;
+        IdCollection<ESM::LandTexture> mLandTextures;
         IdCollection<Land> mLand;
         RefIdCollection mReferenceables;
         RefCollection mRefs;
@@ -120,12 +123,12 @@ namespace CSMWorld
         std::unique_ptr<ActorAdapter> mActorAdapter;
         std::vector<QAbstractItemModel*> mModels;
         std::map<UniversalId::Type, QAbstractItemModel*> mModelIndex;
-        ESM::ESMReader* mReader;
+        ESM::ReadersCache mReaders;
         const ESM::Dialogue* mDialogue; // last loaded dialogue
         bool mBase;
         bool mProject;
-        std::map<ESM::RefId, std::map<unsigned int, unsigned int>> mRefLoadCache;
-        int mReaderIndex;
+        std::map<ESM::RefId, std::map<ESM::RefNum, unsigned int>> mRefLoadCache;
+        std::size_t mReaderIndex;
 
         Files::PathContainer mDataPaths;
         std::vector<std::string> mArchives;
@@ -133,14 +136,11 @@ namespace CSMWorld
         ResourcesManager mResourcesManager;
         std::shared_ptr<Resource::ResourceSystem> mResourceSystem;
 
-        std::vector<std::shared_ptr<ESM::ESMReader>> mReaders;
-
         InfoOrderByTopic mJournalInfoOrder;
         InfoOrderByTopic mTopicInfoOrder;
 
-        // not implemented
-        Data(const Data&);
-        Data& operator=(const Data&);
+        Data(const Data&) = delete;
+        Data& operator=(const Data&) = delete;
 
         void addModel(QAbstractItemModel* model, UniversalId::Type type, bool update = true);
 
@@ -251,13 +251,17 @@ namespace CSMWorld
 
         IdCollection<ESM::DebugProfile>& getDebugProfiles();
 
+        const IdCollection<ESM::SelectionGroup>& getSelectionGroups() const;
+
+        IdCollection<ESM::SelectionGroup>& getSelectionGroups();
+
         const IdCollection<CSMWorld::Land>& getLand() const;
 
         IdCollection<CSMWorld::Land>& getLand();
 
-        const IdCollection<CSMWorld::LandTexture>& getLandTextures() const;
+        const IdCollection<ESM::LandTexture>& getLandTextures() const;
 
-        IdCollection<CSMWorld::LandTexture>& getLandTextures();
+        IdCollection<ESM::LandTexture>& getLandTextures();
 
         const IdCollection<ESM::SoundGenerator>& getSoundGens() const;
 
diff --git a/apps/opencs/model/world/disabletag.hpp b/apps/opencs/model/world/disabletag.hpp
new file mode 100644
index 0000000000..1aee1ce6fc
--- /dev/null
+++ b/apps/opencs/model/world/disabletag.hpp
@@ -0,0 +1,22 @@
+#ifndef CSM_WOLRD_DISABLETAG_H
+#define CSM_WOLRD_DISABLETAG_H
+
+#include <QVariant>
+
+namespace CSMWorld
+{
+    class DisableTag
+    {
+    public:
+        static QVariant getVariant() { return QVariant::fromValue(CSMWorld::DisableTag()); }
+
+        static bool isDisableTag(const QVariant& variant)
+        {
+            return strcmp(variant.typeName(), "CSMWorld::DisableTag") == 0;
+        }
+    };
+}
+
+Q_DECLARE_METATYPE(CSMWorld::DisableTag)
+
+#endif
diff --git a/apps/opencs/model/world/idcollection.cpp b/apps/opencs/model/world/idcollection.cpp
index faab5a20cb..ca56eceb69 100644
--- a/apps/opencs/model/world/idcollection.cpp
+++ b/apps/opencs/model/world/idcollection.cpp
@@ -8,6 +8,7 @@
 #include <apps/opencs/model/world/pathgrid.hpp>
 #include <apps/opencs/model/world/record.hpp>
 
+#include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadpgrd.hpp>
 
 namespace ESM
@@ -18,12 +19,12 @@ namespace ESM
 namespace CSMWorld
 {
     template <>
-    int IdCollection<Pathgrid>::load(ESM::ESMReader& reader, bool base)
+    int BaseIdCollection<Pathgrid>::load(ESM::ESMReader& reader, bool base)
     {
         Pathgrid record;
         bool isDeleted = false;
 
-        loadRecord(record, reader, isDeleted);
+        loadRecord(record, reader, isDeleted, base);
 
         const ESM::RefId id = getRecordId(record);
         int index = this->searchId(id);
@@ -55,4 +56,115 @@ namespace CSMWorld
 
         return load(record, base, index);
     }
+
+    const Record<ESM::LandTexture>* IdCollection<ESM::LandTexture>::searchRecord(std::uint16_t index, int plugin) const
+    {
+        auto found = mIndices.find({ plugin, index });
+        if (found != mIndices.end())
+        {
+            int index = searchId(found->second);
+            if (index != -1)
+                return &getRecord(index);
+        }
+        return nullptr;
+    }
+
+    const std::string* IdCollection<ESM::LandTexture>::getLandTexture(std::uint16_t index, int plugin) const
+    {
+        const Record<ESM::LandTexture>* record = searchRecord(index, plugin);
+        if (record && !record->isDeleted())
+            return &record->get().mTexture;
+        return nullptr;
+    }
+
+    void IdCollection<ESM::LandTexture>::loadRecord(
+        ESM::LandTexture& record, ESM::ESMReader& reader, bool& isDeleted, bool base)
+    {
+        record.load(reader, isDeleted);
+        int plugin = base ? reader.getIndex() : -1;
+        mIndices.emplace(std::make_pair(plugin, record.mIndex), record.mId);
+    }
+
+    std::uint16_t IdCollection<ESM::LandTexture>::assignNewIndex(ESM::RefId id)
+    {
+        std::uint16_t index = 0;
+        if (!mIndices.empty())
+        {
+            auto end = mIndices.lower_bound({ -1, std::numeric_limits<std::uint16_t>::max() });
+            if (end != mIndices.begin())
+                end = std::prev(end);
+            if (end->first.first == -1)
+            {
+                constexpr std::uint16_t maxIndex = std::numeric_limits<std::uint16_t>::max() - 1;
+                if (end->first.second < maxIndex)
+                    index = end->first.second + 1;
+                else
+                {
+                    std::uint16_t prevIndex = 0;
+                    for (auto it = mIndices.lower_bound({ -1, 0 }); it != end; ++it)
+                    {
+                        if (prevIndex != it->first.second)
+                        {
+                            index = prevIndex;
+                            break;
+                        }
+                        ++prevIndex;
+                    }
+                }
+            }
+        }
+        mIndices.emplace(std::make_pair(-1, index), id);
+        return index;
+    }
+
+    bool IdCollection<ESM::LandTexture>::touchRecord(const ESM::RefId& id)
+    {
+        int row = BaseIdCollection<ESM::LandTexture>::touchRecordImp(id);
+        if (row != -1)
+        {
+            const_cast<ESM::LandTexture&>(getRecord(row).get()).mIndex = assignNewIndex(id);
+            return true;
+        }
+        return false;
+    }
+
+    void IdCollection<ESM::LandTexture>::cloneRecord(
+        const ESM::RefId& origin, const ESM::RefId& destination, const UniversalId::Type type)
+    {
+        int row = cloneRecordImp(origin, destination, type);
+        const_cast<ESM::LandTexture&>(getRecord(row).get()).mIndex = assignNewIndex(destination);
+    }
+
+    void IdCollection<ESM::LandTexture>::appendBlankRecord(const ESM::RefId& id, UniversalId::Type type)
+    {
+        ESM::LandTexture record;
+        record.blank();
+        record.mId = id;
+        record.mIndex = assignNewIndex(id);
+
+        auto record2 = std::make_unique<Record<ESM::LandTexture>>();
+        record2->mState = Record<ESM::LandTexture>::State_ModifiedOnly;
+        record2->mModified = std::move(record);
+
+        insertRecord(std::move(record2), getAppendIndex(id, type), type);
+    }
+
+    void IdCollection<ESM::LandTexture>::removeRows(int index, int count)
+    {
+        for (int row = index; row < index + count; ++row)
+        {
+            const auto& record = getRecord(row);
+            if (record.isModified())
+                mIndices.erase({ -1, record.get().mIndex });
+        }
+        BaseIdCollection<ESM::LandTexture>::removeRows(index, count);
+    }
+
+    void IdCollection<ESM::LandTexture>::replace(int index, std::unique_ptr<RecordBase> record)
+    {
+        const auto& current = getRecord(index);
+        if (current.isModified() && !record->isModified())
+            mIndices.erase({ -1, current.get().mIndex });
+        BaseIdCollection<ESM::LandTexture>::replace(index, std::move(record));
+    }
 }
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index 67b886c3f8..d4aa82ffc9 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -17,6 +17,7 @@
 namespace ESM
 {
     class ESMReader;
+    struct LandTexture;
 }
 
 namespace CSMWorld
@@ -25,9 +26,9 @@ namespace CSMWorld
 
     /// \brief Single type collection of top level records
     template <typename ESXRecordT>
-    class IdCollection : public Collection<ESXRecordT>
+    class BaseIdCollection : public Collection<ESXRecordT>
     {
-        virtual void loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted);
+        virtual void loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted, bool base);
 
     public:
         /// \return Index of loaded record (-1 if no record was loaded)
@@ -46,14 +47,46 @@ namespace CSMWorld
         /// \return Has the ID been deleted?
     };
 
+    template <class ESXRecordT>
+    class IdCollection : public BaseIdCollection<ESXRecordT>
+    {
+    };
+
+    template <>
+    class IdCollection<ESM::LandTexture> : public BaseIdCollection<ESM::LandTexture>
+    {
+        std::map<std::pair<int, std::uint16_t>, ESM::RefId> mIndices;
+
+        void loadRecord(ESM::LandTexture& record, ESM::ESMReader& reader, bool& isDeleted, bool base) override;
+
+        std::uint16_t assignNewIndex(ESM::RefId id);
+
+    public:
+        const Record<ESM::LandTexture>* searchRecord(std::uint16_t index, int plugin) const;
+
+        const std::string* getLandTexture(std::uint16_t index, int plugin) const;
+
+        bool touchRecord(const ESM::RefId& id) override;
+
+        void cloneRecord(
+            const ESM::RefId& origin, const ESM::RefId& destination, const UniversalId::Type type) override;
+
+        void appendBlankRecord(const ESM::RefId& id, UniversalId::Type type) override;
+
+        void removeRows(int index, int count) override;
+
+        void replace(int index, std::unique_ptr<RecordBase> record) override;
+    };
+
     template <typename ESXRecordT>
-    void IdCollection<ESXRecordT>::loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted)
+    void BaseIdCollection<ESXRecordT>::loadRecord(
+        ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted, bool base)
     {
         record.load(reader, isDeleted);
     }
 
     template <>
-    inline void IdCollection<Land>::loadRecord(Land& record, ESM::ESMReader& reader, bool& isDeleted)
+    inline void BaseIdCollection<Land>::loadRecord(Land& record, ESM::ESMReader& reader, bool& isDeleted, bool base)
     {
         record.load(reader, isDeleted);
 
@@ -64,15 +97,17 @@ namespace CSMWorld
 
         // Prevent data from being reloaded.
         record.mContext.filename.clear();
+        if (!base)
+            record.setPlugin(-1);
     }
 
     template <typename ESXRecordT>
-    int IdCollection<ESXRecordT>::load(ESM::ESMReader& reader, bool base)
+    int BaseIdCollection<ESXRecordT>::load(ESM::ESMReader& reader, bool base)
     {
         ESXRecordT record;
         bool isDeleted = false;
 
-        loadRecord(record, reader, isDeleted);
+        loadRecord(record, reader, isDeleted, base);
 
         ESM::RefId id = getRecordId(record);
         int index = this->searchId(id);
@@ -103,7 +138,7 @@ namespace CSMWorld
     }
 
     template <typename ESXRecordT>
-    int IdCollection<ESXRecordT>::load(const ESXRecordT& record, bool base, int index)
+    int BaseIdCollection<ESXRecordT>::load(const ESXRecordT& record, bool base, int index)
     {
         if (index == -2) // index unknown
             index = this->searchId(getRecordId(record));
@@ -135,7 +170,7 @@ namespace CSMWorld
     }
 
     template <typename ESXRecordT>
-    bool IdCollection<ESXRecordT>::tryDelete(const ESM::RefId& id)
+    bool BaseIdCollection<ESXRecordT>::tryDelete(const ESM::RefId& id)
     {
         int index = this->searchId(id);
 
@@ -162,7 +197,7 @@ namespace CSMWorld
     }
 
     template <>
-    int IdCollection<Pathgrid>::load(ESM::ESMReader& reader, bool base);
+    int BaseIdCollection<Pathgrid>::load(ESM::ESMReader& reader, bool base);
 }
 
 #endif
diff --git a/apps/opencs/model/world/idcompletionmanager.cpp b/apps/opencs/model/world/idcompletionmanager.cpp
index 263f462b6e..a4fdb4776d 100644
--- a/apps/opencs/model/world/idcompletionmanager.cpp
+++ b/apps/opencs/model/world/idcompletionmanager.cpp
@@ -117,7 +117,7 @@ void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data& data)
                 completer->setPopup(popup); // The completer takes ownership of the popup
                 completer->setMaxVisibleItems(10);
 
-                mCompleters[current->first] = completer;
+                mCompleters[current->first] = std::move(completer);
             }
         }
     }
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 69ac8a42b6..5ed0c6f0e7 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -12,6 +12,7 @@
 #include <type_traits>
 
 #include <apps/opencs/model/world/columns.hpp>
+#include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/idtablebase.hpp>
 #include <apps/opencs/model/world/record.hpp>
 #include <apps/opencs/model/world/universalid.hpp>
@@ -21,7 +22,6 @@
 
 #include "collectionbase.hpp"
 #include "columnbase.hpp"
-#include "landtexture.hpp"
 
 CSMWorld::IdTable::IdTable(CollectionBase* idCollection, unsigned int features)
     : IdTableBase(features)
@@ -361,68 +361,8 @@ CSMWorld::LandTextureIdTable::LandTextureIdTable(CollectionBase* idCollection, u
 {
 }
 
-CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::importTextures(
-    const std::vector<std::string>& ids)
+const CSMWorld::Record<ESM::LandTexture>* CSMWorld::LandTextureIdTable::searchRecord(
+    std::uint16_t index, int plugin) const
 {
-    ImportResults results;
-
-    // Map existing textures to ids
-    std::map<std::string, std::string> reverseLookupMap;
-    for (int i = 0; i < idCollection()->getSize(); ++i)
-    {
-        auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(i));
-        if (record.isModified())
-            reverseLookupMap.emplace(
-                Misc::StringUtils::lowerCase(record.get().mTexture), idCollection()->getId(i).getRefIdString());
-    }
-
-    for (const std::string& id : ids)
-    {
-        int plugin, index;
-        LandTexture::parseUniqueRecordId(id, plugin, index);
-
-        const ESM::RefId refId = ESM::RefId::stringRefId(id);
-        const int oldRow = idCollection()->searchId(refId);
-
-        // If it does not exist or it is in the current plugin, it can be skipped.
-        if (oldRow < 0 || plugin == 0)
-        {
-            results.recordMapping.emplace_back(id, id);
-            continue;
-        }
-
-        // Look for a pre-existing record
-        auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(oldRow));
-        std::string texture = Misc::StringUtils::lowerCase(record.get().mTexture);
-        auto searchIt = reverseLookupMap.find(texture);
-        if (searchIt != reverseLookupMap.end())
-        {
-            results.recordMapping.emplace_back(id, searchIt->second);
-            continue;
-        }
-
-        // Iterate until an unused index or found, or the index has completely wrapped around.
-        int startIndex = index;
-        do
-        {
-            std::string newId = LandTexture::createUniqueRecordId(0, index);
-            const ESM::RefId newRefId = ESM::RefId::stringRefId(newId);
-            int newRow = idCollection()->searchId(newRefId);
-
-            if (newRow < 0)
-            {
-                // Id not taken, clone it
-                cloneRecord(refId, newRefId, UniversalId::Type_LandTexture);
-                results.createdRecords.push_back(newId);
-                results.recordMapping.emplace_back(id, newId);
-                reverseLookupMap.emplace(texture, newId);
-                break;
-            }
-
-            const size_t MaxIndex = std::numeric_limits<uint16_t>::max() - 1;
-            index = (index + 1) % MaxIndex;
-        } while (index != startIndex);
-    }
-
-    return results;
+    return static_cast<CSMWorld::IdCollection<ESM::LandTexture>*>(idCollection())->searchRecord(index, plugin);
 }
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
index 3ec075ca95..9247c6c1e8 100644
--- a/apps/opencs/model/world/idtable.hpp
+++ b/apps/opencs/model/world/idtable.hpp
@@ -16,10 +16,17 @@
 
 class QObject;
 
+namespace ESM
+{
+    struct LandTexture;
+}
+
 namespace CSMWorld
 {
     class CollectionBase;
     struct RecordBase;
+    template <typename ESXRecordT>
+    struct Record;
 
     class IdTable : public IdTableBase
     {
@@ -103,26 +110,12 @@ namespace CSMWorld
         virtual CollectionBase* idCollection() const;
     };
 
-    /// An IdTable customized to handle the more unique needs of LandTextureId's which behave
-    /// differently from other records. The major difference is that base records cannot be
-    /// modified.
     class LandTextureIdTable : public IdTable
     {
     public:
-        struct ImportResults
-        {
-            using StringPair = std::pair<std::string, std::string>;
-
-            /// The newly added records
-            std::vector<std::string> createdRecords;
-            /// The 1st string is the original id, the 2nd is the mapped id
-            std::vector<StringPair> recordMapping;
-        };
-
         LandTextureIdTable(CollectionBase* idCollection, unsigned int features = 0);
 
-        /// Finds and maps/recreates the specified ids.
-        ImportResults importTextures(const std::vector<std::string>& ids);
+        const CSMWorld::Record<ESM::LandTexture>* searchRecord(std::uint16_t index, int plugin) const;
     };
 }
 
diff --git a/apps/opencs/model/world/idtableproxymodel.cpp b/apps/opencs/model/world/idtableproxymodel.cpp
index d4e342f5de..c03b4ea30a 100644
--- a/apps/opencs/model/world/idtableproxymodel.cpp
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@@ -63,9 +63,18 @@ bool CSMWorld::IdTableProxyModel::filterAcceptsRow(int sourceRow, const QModelIn
 
 CSMWorld::IdTableProxyModel::IdTableProxyModel(QObject* parent)
     : QSortFilterProxyModel(parent)
+    , mFilterTimer{ new QTimer(this) }
     , mSourceModel(nullptr)
 {
     setSortCaseSensitivity(Qt::CaseInsensitive);
+
+    mFilterTimer->setSingleShot(true);
+    int intervalSetting = CSMPrefs::State::get()["ID Tables"]["filter-delay"].toInt();
+    mFilterTimer->setInterval(intervalSetting);
+
+    connect(&CSMPrefs::State::get(), &CSMPrefs::State::settingChanged, this,
+        [this](const CSMPrefs::Setting* setting) { this->settingChanged(setting); });
+    connect(mFilterTimer.get(), &QTimer::timeout, this, [this]() { this->timerTimeout(); });
 }
 
 QModelIndex CSMWorld::IdTableProxyModel::getModelIndex(const std::string& id, int column) const
@@ -87,10 +96,8 @@ void CSMWorld::IdTableProxyModel::setSourceModel(QAbstractItemModel* model)
 
 void CSMWorld::IdTableProxyModel::setFilter(const std::shared_ptr<CSMFilter::Node>& filter)
 {
-    beginResetModel();
-    mFilter = filter;
-    updateColumnMap();
-    endResetModel();
+    mAwaitingFilter = filter;
+    mFilterTimer->start();
 }
 
 bool CSMWorld::IdTableProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
@@ -131,6 +138,26 @@ void CSMWorld::IdTableProxyModel::refreshFilter()
     }
 }
 
+void CSMWorld::IdTableProxyModel::timerTimeout()
+{
+    if (mAwaitingFilter)
+    {
+        beginResetModel();
+        mFilter = mAwaitingFilter;
+        updateColumnMap();
+        endResetModel();
+        mAwaitingFilter.reset();
+    }
+}
+
+void CSMWorld::IdTableProxyModel::settingChanged(const CSMPrefs::Setting* setting)
+{
+    if (*setting == "ID Tables/filter-delay")
+    {
+        mFilterTimer->setInterval(setting->toInt());
+    }
+}
+
 void CSMWorld::IdTableProxyModel::sourceRowsInserted(const QModelIndex& parent, int /*start*/, int end)
 {
     refreshFilter();
diff --git a/apps/opencs/model/world/idtableproxymodel.hpp b/apps/opencs/model/world/idtableproxymodel.hpp
index 639cf47287..b7d38f5a2d 100644
--- a/apps/opencs/model/world/idtableproxymodel.hpp
+++ b/apps/opencs/model/world/idtableproxymodel.hpp
@@ -10,6 +10,9 @@
 #include <QModelIndex>
 #include <QSortFilterProxyModel>
 #include <QString>
+#include <QTimer>
+
+#include "../prefs/state.hpp"
 
 #include "columns.hpp"
 
@@ -29,6 +32,8 @@ namespace CSMWorld
         Q_OBJECT
 
         std::shared_ptr<CSMFilter::Node> mFilter;
+        std::unique_ptr<QTimer> mFilterTimer;
+        std::shared_ptr<CSMFilter::Node> mAwaitingFilter;
         std::map<int, int> mColumnMap; // column ID, column index in this model (or -1)
 
         // Cache of enum values for enum columns (e.g. Modified, Record Type).
@@ -68,6 +73,10 @@ namespace CSMWorld
 
         virtual void sourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
+        void timerTimeout();
+
+        void settingChanged(const CSMPrefs::Setting* setting);
+
     signals:
 
         void rowAdded(const std::string& id);
diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
index fb1adf16d4..2e9ed6e150 100644
--- a/apps/opencs/model/world/infoselectwrapper.cpp
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -6,16 +6,9 @@
 
 #include <components/esm3/variant.hpp>
 
-const size_t CSMWorld::ConstInfoSelectWrapper::RuleMinSize = 5;
-
-const size_t CSMWorld::ConstInfoSelectWrapper::FunctionPrefixOffset = 1;
-const size_t CSMWorld::ConstInfoSelectWrapper::FunctionIndexOffset = 2;
-const size_t CSMWorld::ConstInfoSelectWrapper::RelationIndexOffset = 4;
-const size_t CSMWorld::ConstInfoSelectWrapper::VarNameOffset = 5;
-
 const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] = {
-    "Rank Low",
-    "Rank High",
+    "Faction Reaction Low",
+    "Faction Reaction High",
     "Rank Requirement",
     "Reputation",
     "Health Percent",
@@ -72,7 +65,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] = {
     "PC Endurance",
     "PC Personality",
     "PC Luck",
-    "PC Corpus",
+    "PC Corprus",
     "Weather",
     "PC Vampire",
     "Level",
@@ -112,55 +105,40 @@ const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] = {
     nullptr,
 };
 
-const char* CSMWorld::ConstInfoSelectWrapper::ComparisonEnumStrings[] = {
-    "Boolean",
-    "Integer",
-    "Numeric",
-    nullptr,
-};
-
-// static functions
-
-std::string CSMWorld::ConstInfoSelectWrapper::convertToString(FunctionName name)
+namespace
 {
-    if (name < Function_None)
-        return FunctionEnumStrings[name];
-    else
+    std::string_view convertToString(ESM::DialogueCondition::Function name)
+    {
+        if (name < ESM::DialogueCondition::Function_None)
+            return CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[name];
         return "(Invalid Data: Function)";
-}
+    }
 
-std::string CSMWorld::ConstInfoSelectWrapper::convertToString(RelationType type)
-{
-    if (type < Relation_None)
-        return RelationEnumStrings[type];
-    else
+    std::string_view convertToString(ESM::DialogueCondition::Comparison type)
+    {
+        if (type != ESM::DialogueCondition::Comp_None)
+            return CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[type - ESM::DialogueCondition::Comp_Eq];
         return "(Invalid Data: Relation)";
-}
-
-std::string CSMWorld::ConstInfoSelectWrapper::convertToString(ComparisonType type)
-{
-    if (type < Comparison_None)
-        return ComparisonEnumStrings[type];
-    else
-        return "(Invalid Data: Comparison)";
+    }
 }
 
 // ConstInfoSelectWrapper
 
-CSMWorld::ConstInfoSelectWrapper::ConstInfoSelectWrapper(const ESM::DialInfo::SelectStruct& select)
+CSMWorld::ConstInfoSelectWrapper::ConstInfoSelectWrapper(const ESM::DialogueCondition& select)
     : mConstSelect(select)
 {
-    readRule();
+    updateHasVariable();
+    updateComparisonType();
 }
 
-CSMWorld::ConstInfoSelectWrapper::FunctionName CSMWorld::ConstInfoSelectWrapper::getFunctionName() const
+ESM::DialogueCondition::Function CSMWorld::ConstInfoSelectWrapper::getFunctionName() const
 {
-    return mFunctionName;
+    return mConstSelect.mFunction;
 }
 
-CSMWorld::ConstInfoSelectWrapper::RelationType CSMWorld::ConstInfoSelectWrapper::getRelationType() const
+ESM::DialogueCondition::Comparison CSMWorld::ConstInfoSelectWrapper::getRelationType() const
 {
-    return mRelationType;
+    return mConstSelect.mComparison;
 }
 
 CSMWorld::ConstInfoSelectWrapper::ComparisonType CSMWorld::ConstInfoSelectWrapper::getComparisonType() const
@@ -175,24 +153,21 @@ bool CSMWorld::ConstInfoSelectWrapper::hasVariable() const
 
 const std::string& CSMWorld::ConstInfoSelectWrapper::getVariableName() const
 {
-    return mVariableName;
+    return mConstSelect.mVariable;
 }
 
 bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue() const
 {
-    if (!variantTypeIsValid())
-        return false;
-
     if (mComparisonType == Comparison_Boolean || mComparisonType == Comparison_Integer)
     {
-        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+        if (std::holds_alternative<float>(mConstSelect.mValue))
             return conditionIsAlwaysTrue(getConditionFloatRange(), getValidIntRange());
         else
             return conditionIsAlwaysTrue(getConditionIntRange(), getValidIntRange());
     }
     else if (mComparisonType == Comparison_Numeric)
     {
-        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+        if (std::holds_alternative<float>(mConstSelect.mValue))
             return conditionIsAlwaysTrue(getConditionFloatRange(), getValidFloatRange());
         else
             return conditionIsAlwaysTrue(getConditionIntRange(), getValidFloatRange());
@@ -203,19 +178,16 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue() const
 
 bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue() const
 {
-    if (!variantTypeIsValid())
-        return false;
-
     if (mComparisonType == Comparison_Boolean || mComparisonType == Comparison_Integer)
     {
-        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+        if (std::holds_alternative<float>(mConstSelect.mValue))
             return conditionIsNeverTrue(getConditionFloatRange(), getValidIntRange());
         else
             return conditionIsNeverTrue(getConditionIntRange(), getValidIntRange());
     }
     else if (mComparisonType == Comparison_Numeric)
     {
-        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+        if (std::holds_alternative<float>(mConstSelect.mValue))
             return conditionIsNeverTrue(getConditionFloatRange(), getValidFloatRange());
         else
             return conditionIsNeverTrue(getConditionIntRange(), getValidFloatRange());
@@ -224,170 +196,36 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue() const
     return false;
 }
 
-bool CSMWorld::ConstInfoSelectWrapper::variantTypeIsValid() const
-{
-    return (mConstSelect.mValue.getType() == ESM::VT_Int || mConstSelect.mValue.getType() == ESM::VT_Float);
-}
-
-const ESM::Variant& CSMWorld::ConstInfoSelectWrapper::getVariant() const
-{
-    return mConstSelect.mValue;
-}
-
 std::string CSMWorld::ConstInfoSelectWrapper::toString() const
 {
     std::ostringstream stream;
-    stream << convertToString(mFunctionName) << " ";
+    stream << convertToString(getFunctionName()) << " ";
 
     if (mHasVariable)
-        stream << mVariableName << " ";
+        stream << getVariableName() << " ";
 
-    stream << convertToString(mRelationType) << " ";
+    stream << convertToString(getRelationType()) << " ";
 
-    switch (mConstSelect.mValue.getType())
-    {
-        case ESM::VT_Int:
-            stream << mConstSelect.mValue.getInteger();
-            break;
-
-        case ESM::VT_Float:
-            stream << mConstSelect.mValue.getFloat();
-            break;
-
-        default:
-            stream << "(Invalid value type)";
-            break;
-    }
+    std::visit([&](auto value) { stream << value; }, mConstSelect.mValue);
 
     return stream.str();
 }
 
-void CSMWorld::ConstInfoSelectWrapper::readRule()
-{
-    if (mConstSelect.mSelectRule.size() < RuleMinSize)
-        throw std::runtime_error("InfoSelectWrapper: rule is to small");
-
-    readFunctionName();
-    readRelationType();
-    readVariableName();
-    updateHasVariable();
-    updateComparisonType();
-}
-
-void CSMWorld::ConstInfoSelectWrapper::readFunctionName()
-{
-    char functionPrefix = mConstSelect.mSelectRule[FunctionPrefixOffset];
-    std::string functionIndex = mConstSelect.mSelectRule.substr(FunctionIndexOffset, 2);
-    int convertedIndex = -1;
-
-    // Read in function index, form ## from 00 .. 73, skip leading zero
-    if (functionIndex[0] == '0')
-        functionIndex = functionIndex[1];
-
-    std::stringstream stream;
-    stream << functionIndex;
-    stream >> convertedIndex;
-
-    switch (functionPrefix)
-    {
-        case '1':
-            if (convertedIndex >= 0 && convertedIndex <= 73)
-                mFunctionName = static_cast<FunctionName>(convertedIndex);
-            else
-                mFunctionName = Function_None;
-            break;
-
-        case '2':
-            mFunctionName = Function_Global;
-            break;
-        case '3':
-            mFunctionName = Function_Local;
-            break;
-        case '4':
-            mFunctionName = Function_Journal;
-            break;
-        case '5':
-            mFunctionName = Function_Item;
-            break;
-        case '6':
-            mFunctionName = Function_Dead;
-            break;
-        case '7':
-            mFunctionName = Function_NotId;
-            break;
-        case '8':
-            mFunctionName = Function_NotFaction;
-            break;
-        case '9':
-            mFunctionName = Function_NotClass;
-            break;
-        case 'A':
-            mFunctionName = Function_NotRace;
-            break;
-        case 'B':
-            mFunctionName = Function_NotCell;
-            break;
-        case 'C':
-            mFunctionName = Function_NotLocal;
-            break;
-        default:
-            mFunctionName = Function_None;
-            break;
-    }
-}
-
-void CSMWorld::ConstInfoSelectWrapper::readRelationType()
-{
-    char relationIndex = mConstSelect.mSelectRule[RelationIndexOffset];
-
-    switch (relationIndex)
-    {
-        case '0':
-            mRelationType = Relation_Equal;
-            break;
-        case '1':
-            mRelationType = Relation_NotEqual;
-            break;
-        case '2':
-            mRelationType = Relation_Greater;
-            break;
-        case '3':
-            mRelationType = Relation_GreaterOrEqual;
-            break;
-        case '4':
-            mRelationType = Relation_Less;
-            break;
-        case '5':
-            mRelationType = Relation_LessOrEqual;
-            break;
-        default:
-            mRelationType = Relation_None;
-    }
-}
-
-void CSMWorld::ConstInfoSelectWrapper::readVariableName()
-{
-    if (mConstSelect.mSelectRule.size() >= VarNameOffset)
-        mVariableName = mConstSelect.mSelectRule.substr(VarNameOffset);
-    else
-        mVariableName.clear();
-}
-
 void CSMWorld::ConstInfoSelectWrapper::updateHasVariable()
 {
-    switch (mFunctionName)
+    switch (getFunctionName())
     {
-        case Function_Global:
-        case Function_Local:
-        case Function_Journal:
-        case Function_Item:
-        case Function_Dead:
-        case Function_NotId:
-        case Function_NotFaction:
-        case Function_NotClass:
-        case Function_NotRace:
-        case Function_NotCell:
-        case Function_NotLocal:
+        case ESM::DialogueCondition::Function_Global:
+        case ESM::DialogueCondition::Function_Local:
+        case ESM::DialogueCondition::Function_Journal:
+        case ESM::DialogueCondition::Function_Item:
+        case ESM::DialogueCondition::Function_Dead:
+        case ESM::DialogueCondition::Function_NotId:
+        case ESM::DialogueCondition::Function_NotFaction:
+        case ESM::DialogueCondition::Function_NotClass:
+        case ESM::DialogueCondition::Function_NotRace:
+        case ESM::DialogueCondition::Function_NotCell:
+        case ESM::DialogueCondition::Function_NotLocal:
             mHasVariable = true;
             break;
 
@@ -399,103 +237,103 @@ void CSMWorld::ConstInfoSelectWrapper::updateHasVariable()
 
 void CSMWorld::ConstInfoSelectWrapper::updateComparisonType()
 {
-    switch (mFunctionName)
+    switch (getFunctionName())
     {
         // Boolean
-        case Function_NotId:
-        case Function_NotFaction:
-        case Function_NotClass:
-        case Function_NotRace:
-        case Function_NotCell:
-        case Function_PcExpelled:
-        case Function_PcCommonDisease:
-        case Function_PcBlightDisease:
-        case Function_SameSex:
-        case Function_SameRace:
-        case Function_SameFaction:
-        case Function_Detected:
-        case Function_Alarmed:
-        case Function_PcCorpus:
-        case Function_PcVampire:
-        case Function_Attacked:
-        case Function_TalkedToPc:
-        case Function_ShouldAttack:
-        case Function_Werewolf:
+        case ESM::DialogueCondition::Function_NotId:
+        case ESM::DialogueCondition::Function_NotFaction:
+        case ESM::DialogueCondition::Function_NotClass:
+        case ESM::DialogueCondition::Function_NotRace:
+        case ESM::DialogueCondition::Function_NotCell:
+        case ESM::DialogueCondition::Function_PcExpelled:
+        case ESM::DialogueCondition::Function_PcCommonDisease:
+        case ESM::DialogueCondition::Function_PcBlightDisease:
+        case ESM::DialogueCondition::Function_SameSex:
+        case ESM::DialogueCondition::Function_SameRace:
+        case ESM::DialogueCondition::Function_SameFaction:
+        case ESM::DialogueCondition::Function_Detected:
+        case ESM::DialogueCondition::Function_Alarmed:
+        case ESM::DialogueCondition::Function_PcCorprus:
+        case ESM::DialogueCondition::Function_PcVampire:
+        case ESM::DialogueCondition::Function_Attacked:
+        case ESM::DialogueCondition::Function_TalkedToPc:
+        case ESM::DialogueCondition::Function_ShouldAttack:
+        case ESM::DialogueCondition::Function_Werewolf:
             mComparisonType = Comparison_Boolean;
             break;
 
         // Integer
-        case Function_Journal:
-        case Function_Item:
-        case Function_Dead:
-        case Function_RankLow:
-        case Function_RankHigh:
-        case Function_RankRequirement:
-        case Function_Reputation:
-        case Function_PcReputation:
-        case Function_PcLevel:
-        case Function_PcStrength:
-        case Function_PcBlock:
-        case Function_PcArmorer:
-        case Function_PcMediumArmor:
-        case Function_PcHeavyArmor:
-        case Function_PcBluntWeapon:
-        case Function_PcLongBlade:
-        case Function_PcAxe:
-        case Function_PcSpear:
-        case Function_PcAthletics:
-        case Function_PcEnchant:
-        case Function_PcDestruction:
-        case Function_PcAlteration:
-        case Function_PcIllusion:
-        case Function_PcConjuration:
-        case Function_PcMysticism:
-        case Function_PcRestoration:
-        case Function_PcAlchemy:
-        case Function_PcUnarmored:
-        case Function_PcSecurity:
-        case Function_PcSneak:
-        case Function_PcAcrobatics:
-        case Function_PcLightArmor:
-        case Function_PcShortBlade:
-        case Function_PcMarksman:
-        case Function_PcMerchantile:
-        case Function_PcSpeechcraft:
-        case Function_PcHandToHand:
-        case Function_PcGender:
-        case Function_PcClothingModifier:
-        case Function_PcCrimeLevel:
-        case Function_FactionRankDifference:
-        case Function_Choice:
-        case Function_PcIntelligence:
-        case Function_PcWillpower:
-        case Function_PcAgility:
-        case Function_PcSpeed:
-        case Function_PcEndurance:
-        case Function_PcPersonality:
-        case Function_PcLuck:
-        case Function_Weather:
-        case Function_Level:
-        case Function_CreatureTarget:
-        case Function_FriendHit:
-        case Function_Fight:
-        case Function_Hello:
-        case Function_Alarm:
-        case Function_Flee:
-        case Function_PcWerewolfKills:
+        case ESM::DialogueCondition::Function_Journal:
+        case ESM::DialogueCondition::Function_Item:
+        case ESM::DialogueCondition::Function_Dead:
+        case ESM::DialogueCondition::Function_FacReactionLowest:
+        case ESM::DialogueCondition::Function_FacReactionHighest:
+        case ESM::DialogueCondition::Function_RankRequirement:
+        case ESM::DialogueCondition::Function_Reputation:
+        case ESM::DialogueCondition::Function_PcReputation:
+        case ESM::DialogueCondition::Function_PcLevel:
+        case ESM::DialogueCondition::Function_PcStrength:
+        case ESM::DialogueCondition::Function_PcBlock:
+        case ESM::DialogueCondition::Function_PcArmorer:
+        case ESM::DialogueCondition::Function_PcMediumArmor:
+        case ESM::DialogueCondition::Function_PcHeavyArmor:
+        case ESM::DialogueCondition::Function_PcBluntWeapon:
+        case ESM::DialogueCondition::Function_PcLongBlade:
+        case ESM::DialogueCondition::Function_PcAxe:
+        case ESM::DialogueCondition::Function_PcSpear:
+        case ESM::DialogueCondition::Function_PcAthletics:
+        case ESM::DialogueCondition::Function_PcEnchant:
+        case ESM::DialogueCondition::Function_PcDestruction:
+        case ESM::DialogueCondition::Function_PcAlteration:
+        case ESM::DialogueCondition::Function_PcIllusion:
+        case ESM::DialogueCondition::Function_PcConjuration:
+        case ESM::DialogueCondition::Function_PcMysticism:
+        case ESM::DialogueCondition::Function_PcRestoration:
+        case ESM::DialogueCondition::Function_PcAlchemy:
+        case ESM::DialogueCondition::Function_PcUnarmored:
+        case ESM::DialogueCondition::Function_PcSecurity:
+        case ESM::DialogueCondition::Function_PcSneak:
+        case ESM::DialogueCondition::Function_PcAcrobatics:
+        case ESM::DialogueCondition::Function_PcLightArmor:
+        case ESM::DialogueCondition::Function_PcShortBlade:
+        case ESM::DialogueCondition::Function_PcMarksman:
+        case ESM::DialogueCondition::Function_PcMerchantile:
+        case ESM::DialogueCondition::Function_PcSpeechcraft:
+        case ESM::DialogueCondition::Function_PcHandToHand:
+        case ESM::DialogueCondition::Function_PcGender:
+        case ESM::DialogueCondition::Function_PcClothingModifier:
+        case ESM::DialogueCondition::Function_PcCrimeLevel:
+        case ESM::DialogueCondition::Function_FactionRankDifference:
+        case ESM::DialogueCondition::Function_Choice:
+        case ESM::DialogueCondition::Function_PcIntelligence:
+        case ESM::DialogueCondition::Function_PcWillpower:
+        case ESM::DialogueCondition::Function_PcAgility:
+        case ESM::DialogueCondition::Function_PcSpeed:
+        case ESM::DialogueCondition::Function_PcEndurance:
+        case ESM::DialogueCondition::Function_PcPersonality:
+        case ESM::DialogueCondition::Function_PcLuck:
+        case ESM::DialogueCondition::Function_Weather:
+        case ESM::DialogueCondition::Function_Level:
+        case ESM::DialogueCondition::Function_CreatureTarget:
+        case ESM::DialogueCondition::Function_FriendHit:
+        case ESM::DialogueCondition::Function_Fight:
+        case ESM::DialogueCondition::Function_Hello:
+        case ESM::DialogueCondition::Function_Alarm:
+        case ESM::DialogueCondition::Function_Flee:
+        case ESM::DialogueCondition::Function_PcWerewolfKills:
             mComparisonType = Comparison_Integer;
             break;
 
         // Numeric
-        case Function_Global:
-        case Function_Local:
-        case Function_NotLocal:
+        case ESM::DialogueCondition::Function_Global:
+        case ESM::DialogueCondition::Function_Local:
+        case ESM::DialogueCondition::Function_NotLocal:
 
-        case Function_Health_Percent:
-        case Function_PcHealthPercent:
-        case Function_PcMagicka:
-        case Function_PcFatigue:
-        case Function_PcHealth:
+        case ESM::DialogueCondition::Function_Health_Percent:
+        case ESM::DialogueCondition::Function_PcHealthPercent:
+        case ESM::DialogueCondition::Function_PcMagicka:
+        case ESM::DialogueCondition::Function_PcFatigue:
+        case ESM::DialogueCondition::Function_PcHealth:
             mComparisonType = Comparison_Numeric;
             break;
 
@@ -511,15 +349,15 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getConditionIntRange() con
     const int IntMin = std::numeric_limits<int>::min();
     const std::pair<int, int> InvalidRange(IntMax, IntMin);
 
-    int value = mConstSelect.mValue.getInteger();
+    int value = std::get<int>(mConstSelect.mValue);
 
-    switch (mRelationType)
+    switch (getRelationType())
     {
-        case Relation_Equal:
-        case Relation_NotEqual:
+        case ESM::DialogueCondition::Comp_Eq:
+        case ESM::DialogueCondition::Comp_Ne:
             return std::pair<int, int>(value, value);
 
-        case Relation_Greater:
+        case ESM::DialogueCondition::Comp_Gt:
             if (value == IntMax)
             {
                 return InvalidRange;
@@ -530,10 +368,10 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getConditionIntRange() con
             }
             break;
 
-        case Relation_GreaterOrEqual:
+        case ESM::DialogueCondition::Comp_Ge:
             return std::pair<int, int>(value, IntMax);
 
-        case Relation_Less:
+        case ESM::DialogueCondition::Comp_Ls:
             if (value == IntMin)
             {
                 return InvalidRange;
@@ -543,7 +381,7 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getConditionIntRange() con
                 return std::pair<int, int>(IntMin, value - 1);
             }
 
-        case Relation_LessOrEqual:
+        case ESM::DialogueCondition::Comp_Le:
             return std::pair<int, int>(IntMin, value);
 
         default:
@@ -557,24 +395,24 @@ std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getConditionFloatRange
     const float FloatMin = -std::numeric_limits<float>::infinity();
     const float Epsilon = std::numeric_limits<float>::epsilon();
 
-    float value = mConstSelect.mValue.getFloat();
+    float value = std::get<float>(mConstSelect.mValue);
 
-    switch (mRelationType)
+    switch (getRelationType())
     {
-        case Relation_Equal:
-        case Relation_NotEqual:
+        case ESM::DialogueCondition::Comp_Eq:
+        case ESM::DialogueCondition::Comp_Ne:
             return std::pair<float, float>(value, value);
 
-        case Relation_Greater:
+        case ESM::DialogueCondition::Comp_Gt:
             return std::pair<float, float>(value + Epsilon, FloatMax);
 
-        case Relation_GreaterOrEqual:
+        case ESM::DialogueCondition::Comp_Ge:
             return std::pair<float, float>(value, FloatMax);
 
-        case Relation_Less:
+        case ESM::DialogueCondition::Comp_Ls:
             return std::pair<float, float>(FloatMin, value - Epsilon);
 
-        case Relation_LessOrEqual:
+        case ESM::DialogueCondition::Comp_Le:
             return std::pair<float, float>(FloatMin, value);
 
         default:
@@ -587,120 +425,120 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
     const int IntMax = std::numeric_limits<int>::max();
     const int IntMin = std::numeric_limits<int>::min();
 
-    switch (mFunctionName)
+    switch (getFunctionName())
     {
         // Boolean
-        case Function_NotId:
-        case Function_NotFaction:
-        case Function_NotClass:
-        case Function_NotRace:
-        case Function_NotCell:
-        case Function_PcExpelled:
-        case Function_PcCommonDisease:
-        case Function_PcBlightDisease:
-        case Function_SameSex:
-        case Function_SameRace:
-        case Function_SameFaction:
-        case Function_Detected:
-        case Function_Alarmed:
-        case Function_PcCorpus:
-        case Function_PcVampire:
-        case Function_Attacked:
-        case Function_TalkedToPc:
-        case Function_ShouldAttack:
-        case Function_Werewolf:
+        case ESM::DialogueCondition::Function_NotId:
+        case ESM::DialogueCondition::Function_NotFaction:
+        case ESM::DialogueCondition::Function_NotClass:
+        case ESM::DialogueCondition::Function_NotRace:
+        case ESM::DialogueCondition::Function_NotCell:
+        case ESM::DialogueCondition::Function_PcExpelled:
+        case ESM::DialogueCondition::Function_PcCommonDisease:
+        case ESM::DialogueCondition::Function_PcBlightDisease:
+        case ESM::DialogueCondition::Function_SameSex:
+        case ESM::DialogueCondition::Function_SameRace:
+        case ESM::DialogueCondition::Function_SameFaction:
+        case ESM::DialogueCondition::Function_Detected:
+        case ESM::DialogueCondition::Function_Alarmed:
+        case ESM::DialogueCondition::Function_PcCorprus:
+        case ESM::DialogueCondition::Function_PcVampire:
+        case ESM::DialogueCondition::Function_Attacked:
+        case ESM::DialogueCondition::Function_TalkedToPc:
+        case ESM::DialogueCondition::Function_ShouldAttack:
+        case ESM::DialogueCondition::Function_Werewolf:
             return std::pair<int, int>(0, 1);
 
         // Integer
-        case Function_RankLow:
-        case Function_RankHigh:
-        case Function_Reputation:
-        case Function_PcReputation:
-        case Function_Journal:
+        case ESM::DialogueCondition::Function_FacReactionLowest:
+        case ESM::DialogueCondition::Function_FacReactionHighest:
+        case ESM::DialogueCondition::Function_Reputation:
+        case ESM::DialogueCondition::Function_PcReputation:
+        case ESM::DialogueCondition::Function_Journal:
             return std::pair<int, int>(IntMin, IntMax);
 
-        case Function_Item:
-        case Function_Dead:
-        case Function_PcLevel:
-        case Function_PcStrength:
-        case Function_PcBlock:
-        case Function_PcArmorer:
-        case Function_PcMediumArmor:
-        case Function_PcHeavyArmor:
-        case Function_PcBluntWeapon:
-        case Function_PcLongBlade:
-        case Function_PcAxe:
-        case Function_PcSpear:
-        case Function_PcAthletics:
-        case Function_PcEnchant:
-        case Function_PcDestruction:
-        case Function_PcAlteration:
-        case Function_PcIllusion:
-        case Function_PcConjuration:
-        case Function_PcMysticism:
-        case Function_PcRestoration:
-        case Function_PcAlchemy:
-        case Function_PcUnarmored:
-        case Function_PcSecurity:
-        case Function_PcSneak:
-        case Function_PcAcrobatics:
-        case Function_PcLightArmor:
-        case Function_PcShortBlade:
-        case Function_PcMarksman:
-        case Function_PcMerchantile:
-        case Function_PcSpeechcraft:
-        case Function_PcHandToHand:
-        case Function_PcClothingModifier:
-        case Function_PcCrimeLevel:
-        case Function_Choice:
-        case Function_PcIntelligence:
-        case Function_PcWillpower:
-        case Function_PcAgility:
-        case Function_PcSpeed:
-        case Function_PcEndurance:
-        case Function_PcPersonality:
-        case Function_PcLuck:
-        case Function_Level:
-        case Function_PcWerewolfKills:
+        case ESM::DialogueCondition::Function_Item:
+        case ESM::DialogueCondition::Function_Dead:
+        case ESM::DialogueCondition::Function_PcLevel:
+        case ESM::DialogueCondition::Function_PcStrength:
+        case ESM::DialogueCondition::Function_PcBlock:
+        case ESM::DialogueCondition::Function_PcArmorer:
+        case ESM::DialogueCondition::Function_PcMediumArmor:
+        case ESM::DialogueCondition::Function_PcHeavyArmor:
+        case ESM::DialogueCondition::Function_PcBluntWeapon:
+        case ESM::DialogueCondition::Function_PcLongBlade:
+        case ESM::DialogueCondition::Function_PcAxe:
+        case ESM::DialogueCondition::Function_PcSpear:
+        case ESM::DialogueCondition::Function_PcAthletics:
+        case ESM::DialogueCondition::Function_PcEnchant:
+        case ESM::DialogueCondition::Function_PcDestruction:
+        case ESM::DialogueCondition::Function_PcAlteration:
+        case ESM::DialogueCondition::Function_PcIllusion:
+        case ESM::DialogueCondition::Function_PcConjuration:
+        case ESM::DialogueCondition::Function_PcMysticism:
+        case ESM::DialogueCondition::Function_PcRestoration:
+        case ESM::DialogueCondition::Function_PcAlchemy:
+        case ESM::DialogueCondition::Function_PcUnarmored:
+        case ESM::DialogueCondition::Function_PcSecurity:
+        case ESM::DialogueCondition::Function_PcSneak:
+        case ESM::DialogueCondition::Function_PcAcrobatics:
+        case ESM::DialogueCondition::Function_PcLightArmor:
+        case ESM::DialogueCondition::Function_PcShortBlade:
+        case ESM::DialogueCondition::Function_PcMarksman:
+        case ESM::DialogueCondition::Function_PcMerchantile:
+        case ESM::DialogueCondition::Function_PcSpeechcraft:
+        case ESM::DialogueCondition::Function_PcHandToHand:
+        case ESM::DialogueCondition::Function_PcClothingModifier:
+        case ESM::DialogueCondition::Function_PcCrimeLevel:
+        case ESM::DialogueCondition::Function_Choice:
+        case ESM::DialogueCondition::Function_PcIntelligence:
+        case ESM::DialogueCondition::Function_PcWillpower:
+        case ESM::DialogueCondition::Function_PcAgility:
+        case ESM::DialogueCondition::Function_PcSpeed:
+        case ESM::DialogueCondition::Function_PcEndurance:
+        case ESM::DialogueCondition::Function_PcPersonality:
+        case ESM::DialogueCondition::Function_PcLuck:
+        case ESM::DialogueCondition::Function_Level:
+        case ESM::DialogueCondition::Function_PcWerewolfKills:
             return std::pair<int, int>(0, IntMax);
 
-        case Function_Fight:
-        case Function_Hello:
-        case Function_Alarm:
-        case Function_Flee:
+        case ESM::DialogueCondition::Function_Fight:
+        case ESM::DialogueCondition::Function_Hello:
+        case ESM::DialogueCondition::Function_Alarm:
+        case ESM::DialogueCondition::Function_Flee:
             return std::pair<int, int>(0, 100);
 
-        case Function_Weather:
+        case ESM::DialogueCondition::Function_Weather:
             return std::pair<int, int>(0, 9);
 
-        case Function_FriendHit:
+        case ESM::DialogueCondition::Function_FriendHit:
             return std::pair<int, int>(0, 4);
 
-        case Function_RankRequirement:
+        case ESM::DialogueCondition::Function_RankRequirement:
             return std::pair<int, int>(0, 3);
 
-        case Function_CreatureTarget:
+        case ESM::DialogueCondition::Function_CreatureTarget:
             return std::pair<int, int>(0, 2);
 
-        case Function_PcGender:
+        case ESM::DialogueCondition::Function_PcGender:
             return std::pair<int, int>(0, 1);
 
-        case Function_FactionRankDifference:
+        case ESM::DialogueCondition::Function_FactionRankDifference:
             return std::pair<int, int>(-9, 9);
 
         // Numeric
-        case Function_Global:
-        case Function_Local:
-        case Function_NotLocal:
+        case ESM::DialogueCondition::Function_Global:
+        case ESM::DialogueCondition::Function_Local:
+        case ESM::DialogueCondition::Function_NotLocal:
             return std::pair<int, int>(IntMin, IntMax);
 
-        case Function_PcMagicka:
-        case Function_PcFatigue:
-        case Function_PcHealth:
+        case ESM::DialogueCondition::Function_PcMagicka:
+        case ESM::DialogueCondition::Function_PcFatigue:
+        case ESM::DialogueCondition::Function_PcHealth:
             return std::pair<int, int>(0, IntMax);
 
-        case Function_Health_Percent:
-        case Function_PcHealthPercent:
+        case ESM::DialogueCondition::Function_Health_Percent:
+        case ESM::DialogueCondition::Function_PcHealthPercent:
             return std::pair<int, int>(0, 100);
 
         default:
@@ -713,21 +551,21 @@ std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getValidFloatRange() c
     const float FloatMax = std::numeric_limits<float>::infinity();
     const float FloatMin = -std::numeric_limits<float>::infinity();
 
-    switch (mFunctionName)
+    switch (getFunctionName())
     {
         // Numeric
-        case Function_Global:
-        case Function_Local:
-        case Function_NotLocal:
+        case ESM::DialogueCondition::Function_Global:
+        case ESM::DialogueCondition::Function_Local:
+        case ESM::DialogueCondition::Function_NotLocal:
             return std::pair<float, float>(FloatMin, FloatMax);
 
-        case Function_PcMagicka:
-        case Function_PcFatigue:
-        case Function_PcHealth:
+        case ESM::DialogueCondition::Function_PcMagicka:
+        case ESM::DialogueCondition::Function_PcFatigue:
+        case ESM::DialogueCondition::Function_PcHealth:
             return std::pair<float, float>(0, FloatMax);
 
-        case Function_Health_Percent:
-        case Function_PcHealthPercent:
+        case ESM::DialogueCondition::Function_Health_Percent:
+        case ESM::DialogueCondition::Function_PcHealthPercent:
             return std::pair<float, float>(0, 100);
 
         default:
@@ -768,19 +606,19 @@ template <typename T1, typename T2>
 bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue(
     std::pair<T1, T1> conditionRange, std::pair<T2, T2> validRange) const
 {
-    switch (mRelationType)
+    switch (getRelationType())
     {
-        case Relation_Equal:
+        case ESM::DialogueCondition::Comp_Eq:
             return false;
 
-        case Relation_NotEqual:
+        case ESM::DialogueCondition::Comp_Ne:
             // If value is not within range, it will always be true
             return !rangeContains(conditionRange.first, validRange);
 
-        case Relation_Greater:
-        case Relation_GreaterOrEqual:
-        case Relation_Less:
-        case Relation_LessOrEqual:
+        case ESM::DialogueCondition::Comp_Gt:
+        case ESM::DialogueCondition::Comp_Ge:
+        case ESM::DialogueCondition::Comp_Ls:
+        case ESM::DialogueCondition::Comp_Le:
             // If the valid range is completely within the condition range, it will always be true
             return rangeFullyContains(conditionRange, validRange);
 
@@ -795,18 +633,18 @@ template <typename T1, typename T2>
 bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(
     std::pair<T1, T1> conditionRange, std::pair<T2, T2> validRange) const
 {
-    switch (mRelationType)
+    switch (getRelationType())
     {
-        case Relation_Equal:
+        case ESM::DialogueCondition::Comp_Eq:
             return !rangeContains(conditionRange.first, validRange);
 
-        case Relation_NotEqual:
+        case ESM::DialogueCondition::Comp_Ne:
             return false;
 
-        case Relation_Greater:
-        case Relation_GreaterOrEqual:
-        case Relation_Less:
-        case Relation_LessOrEqual:
+        case ESM::DialogueCondition::Comp_Gt:
+        case ESM::DialogueCondition::Comp_Ge:
+        case ESM::DialogueCondition::Comp_Ls:
+        case ESM::DialogueCondition::Comp_Le:
             // If ranges do not overlap, it will never be true
             return !rangesOverlap(conditionRange, validRange);
 
@@ -817,153 +655,47 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(
     return false;
 }
 
+QVariant CSMWorld::ConstInfoSelectWrapper::getValue() const
+{
+    return std::visit([](auto value) { return QVariant(value); }, mConstSelect.mValue);
+}
+
 // InfoSelectWrapper
 
-CSMWorld::InfoSelectWrapper::InfoSelectWrapper(ESM::DialInfo::SelectStruct& select)
+CSMWorld::InfoSelectWrapper::InfoSelectWrapper(ESM::DialogueCondition& select)
     : CSMWorld::ConstInfoSelectWrapper(select)
     , mSelect(select)
 {
 }
 
-void CSMWorld::InfoSelectWrapper::setFunctionName(FunctionName name)
+void CSMWorld::InfoSelectWrapper::setFunctionName(ESM::DialogueCondition::Function name)
 {
-    mFunctionName = name;
+    mSelect.mFunction = name;
     updateHasVariable();
     updateComparisonType();
+    if (getComparisonType() != ConstInfoSelectWrapper::Comparison_Numeric
+        && std::holds_alternative<float>(mSelect.mValue))
+    {
+        mSelect.mValue = std::visit([](auto value) { return static_cast<int>(value); }, mSelect.mValue);
+    }
 }
 
-void CSMWorld::InfoSelectWrapper::setRelationType(RelationType type)
+void CSMWorld::InfoSelectWrapper::setRelationType(ESM::DialogueCondition::Comparison type)
 {
-    mRelationType = type;
+    mSelect.mComparison = type;
 }
 
 void CSMWorld::InfoSelectWrapper::setVariableName(const std::string& name)
 {
-    mVariableName = name;
+    mSelect.mVariable = name;
 }
 
-void CSMWorld::InfoSelectWrapper::setDefaults()
+void CSMWorld::InfoSelectWrapper::setValue(int value)
 {
-    if (!variantTypeIsValid())
-        mSelect.mValue.setType(ESM::VT_Int);
-
-    switch (mComparisonType)
-    {
-        case Comparison_Boolean:
-            setRelationType(Relation_Equal);
-            mSelect.mValue.setInteger(1);
-            break;
-
-        case Comparison_Integer:
-        case Comparison_Numeric:
-            setRelationType(Relation_Greater);
-            mSelect.mValue.setInteger(0);
-            break;
-
-        default:
-            // Do nothing
-            break;
-    }
-
-    update();
+    mSelect.mValue = value;
 }
 
-void CSMWorld::InfoSelectWrapper::update()
+void CSMWorld::InfoSelectWrapper::setValue(float value)
 {
-    std::ostringstream stream;
-
-    // Leading 0
-    stream << '0';
-
-    // Write Function
-
-    bool writeIndex = false;
-    size_t functionIndex = static_cast<size_t>(mFunctionName);
-
-    switch (mFunctionName)
-    {
-        case Function_None:
-            stream << '0';
-            break;
-        case Function_Global:
-            stream << '2';
-            break;
-        case Function_Local:
-            stream << '3';
-            break;
-        case Function_Journal:
-            stream << '4';
-            break;
-        case Function_Item:
-            stream << '5';
-            break;
-        case Function_Dead:
-            stream << '6';
-            break;
-        case Function_NotId:
-            stream << '7';
-            break;
-        case Function_NotFaction:
-            stream << '8';
-            break;
-        case Function_NotClass:
-            stream << '9';
-            break;
-        case Function_NotRace:
-            stream << 'A';
-            break;
-        case Function_NotCell:
-            stream << 'B';
-            break;
-        case Function_NotLocal:
-            stream << 'C';
-            break;
-        default:
-            stream << '1';
-            writeIndex = true;
-            break;
-    }
-
-    if (writeIndex && functionIndex < 10) // leading 0
-        stream << '0' << functionIndex;
-    else if (writeIndex)
-        stream << functionIndex;
-    else
-        stream << "00";
-
-    // Write Relation
-    switch (mRelationType)
-    {
-        case Relation_Equal:
-            stream << '0';
-            break;
-        case Relation_NotEqual:
-            stream << '1';
-            break;
-        case Relation_Greater:
-            stream << '2';
-            break;
-        case Relation_GreaterOrEqual:
-            stream << '3';
-            break;
-        case Relation_Less:
-            stream << '4';
-            break;
-        case Relation_LessOrEqual:
-            stream << '5';
-            break;
-        default:
-            stream << '0';
-            break;
-    }
-
-    if (mHasVariable)
-        stream << mVariableName;
-
-    mSelect.mSelectRule = stream.str();
-}
-
-ESM::Variant& CSMWorld::InfoSelectWrapper::getVariant()
-{
-    return mSelect.mValue;
+    mSelect.mValue = value;
 }
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
index 4ecdc676dc..b3b5abe462 100644
--- a/apps/opencs/model/world/infoselectwrapper.hpp
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -7,133 +7,13 @@
 
 #include <components/esm3/loadinfo.hpp>
 
-namespace ESM
-{
-    class Variant;
-}
+#include <QVariant>
 
 namespace CSMWorld
 {
-    // ESM::DialInfo::SelectStruct.mSelectRule
-    // 012345...
-    // ^^^ ^^
-    // ||| ||
-    // ||| |+------------- condition variable string
-    // ||| +-------------- comparison type, ['0'..'5']; e.g. !=, <, >=, etc
-    // ||+---------------- function index (encoded, where function == '1')
-    // |+----------------- function, ['1'..'C']; e.g. Global, Local, Not ID, etc
-    // +------------------ unknown
-    //
-
-    // Wrapper for DialInfo::SelectStruct
     class ConstInfoSelectWrapper
     {
     public:
-        // Order matters
-        enum FunctionName
-        {
-            Function_RankLow = 0,
-            Function_RankHigh,
-            Function_RankRequirement,
-            Function_Reputation,
-            Function_Health_Percent,
-            Function_PcReputation,
-            Function_PcLevel,
-            Function_PcHealthPercent,
-            Function_PcMagicka,
-            Function_PcFatigue,
-            Function_PcStrength,
-            Function_PcBlock,
-            Function_PcArmorer,
-            Function_PcMediumArmor,
-            Function_PcHeavyArmor,
-            Function_PcBluntWeapon,
-            Function_PcLongBlade,
-            Function_PcAxe,
-            Function_PcSpear,
-            Function_PcAthletics,
-            Function_PcEnchant,
-            Function_PcDestruction,
-            Function_PcAlteration,
-            Function_PcIllusion,
-            Function_PcConjuration,
-            Function_PcMysticism,
-            Function_PcRestoration,
-            Function_PcAlchemy,
-            Function_PcUnarmored,
-            Function_PcSecurity,
-            Function_PcSneak,
-            Function_PcAcrobatics,
-            Function_PcLightArmor,
-            Function_PcShortBlade,
-            Function_PcMarksman,
-            Function_PcMerchantile,
-            Function_PcSpeechcraft,
-            Function_PcHandToHand,
-            Function_PcGender,
-            Function_PcExpelled,
-            Function_PcCommonDisease,
-            Function_PcBlightDisease,
-            Function_PcClothingModifier,
-            Function_PcCrimeLevel,
-            Function_SameSex,
-            Function_SameRace,
-            Function_SameFaction,
-            Function_FactionRankDifference,
-            Function_Detected,
-            Function_Alarmed,
-            Function_Choice,
-            Function_PcIntelligence,
-            Function_PcWillpower,
-            Function_PcAgility,
-            Function_PcSpeed,
-            Function_PcEndurance,
-            Function_PcPersonality,
-            Function_PcLuck,
-            Function_PcCorpus,
-            Function_Weather,
-            Function_PcVampire,
-            Function_Level,
-            Function_Attacked,
-            Function_TalkedToPc,
-            Function_PcHealth,
-            Function_CreatureTarget,
-            Function_FriendHit,
-            Function_Fight,
-            Function_Hello,
-            Function_Alarm,
-            Function_Flee,
-            Function_ShouldAttack,
-            Function_Werewolf,
-            Function_PcWerewolfKills = 73,
-
-            Function_Global,
-            Function_Local,
-            Function_Journal,
-            Function_Item,
-            Function_Dead,
-            Function_NotId,
-            Function_NotFaction,
-            Function_NotClass,
-            Function_NotRace,
-            Function_NotCell,
-            Function_NotLocal,
-
-            Function_None
-        };
-
-        enum RelationType
-        {
-            Relation_Equal,
-            Relation_NotEqual,
-            Relation_Greater,
-            Relation_GreaterOrEqual,
-            Relation_Less,
-            Relation_LessOrEqual,
-
-            Relation_None
-        };
-
         enum ComparisonType
         {
             Comparison_Boolean,
@@ -143,25 +23,13 @@ namespace CSMWorld
             Comparison_None
         };
 
-        static const size_t RuleMinSize;
-
-        static const size_t FunctionPrefixOffset;
-        static const size_t FunctionIndexOffset;
-        static const size_t RelationIndexOffset;
-        static const size_t VarNameOffset;
-
         static const char* FunctionEnumStrings[];
         static const char* RelationEnumStrings[];
-        static const char* ComparisonEnumStrings[];
 
-        static std::string convertToString(FunctionName name);
-        static std::string convertToString(RelationType type);
-        static std::string convertToString(ComparisonType type);
+        ConstInfoSelectWrapper(const ESM::DialogueCondition& select);
 
-        ConstInfoSelectWrapper(const ESM::DialInfo::SelectStruct& select);
-
-        FunctionName getFunctionName() const;
-        RelationType getRelationType() const;
+        ESM::DialogueCondition::Function getFunctionName() const;
+        ESM::DialogueCondition::Comparison getRelationType() const;
         ComparisonType getComparisonType() const;
 
         bool hasVariable() const;
@@ -169,17 +37,12 @@ namespace CSMWorld
 
         bool conditionIsAlwaysTrue() const;
         bool conditionIsNeverTrue() const;
-        bool variantTypeIsValid() const;
 
-        const ESM::Variant& getVariant() const;
+        QVariant getValue() const;
 
         std::string toString() const;
 
     protected:
-        void readRule();
-        void readFunctionName();
-        void readRelationType();
-        void readVariableName();
         void updateHasVariable();
         void updateComparisonType();
 
@@ -207,38 +70,29 @@ namespace CSMWorld
         template <typename Type1, typename Type2>
         bool conditionIsNeverTrue(std::pair<Type1, Type1> conditionRange, std::pair<Type2, Type2> validRange) const;
 
-        FunctionName mFunctionName;
-        RelationType mRelationType;
         ComparisonType mComparisonType;
 
         bool mHasVariable;
-        std::string mVariableName;
 
     private:
-        const ESM::DialInfo::SelectStruct& mConstSelect;
+        const ESM::DialogueCondition& mConstSelect;
     };
 
-    // Wrapper for DialInfo::SelectStruct that can modify the wrapped select struct
+    // Wrapper for DialogueCondition that can modify the wrapped select struct
     class InfoSelectWrapper : public ConstInfoSelectWrapper
     {
     public:
-        InfoSelectWrapper(ESM::DialInfo::SelectStruct& select);
+        InfoSelectWrapper(ESM::DialogueCondition& select);
 
         // Wrapped SelectStruct will not be modified until update() is called
-        void setFunctionName(FunctionName name);
-        void setRelationType(RelationType type);
+        void setFunctionName(ESM::DialogueCondition::Function name);
+        void setRelationType(ESM::DialogueCondition::Comparison type);
         void setVariableName(const std::string& name);
-
-        // Modified wrapped SelectStruct
-        void update();
-
-        // This sets properties based on the function name to its defaults and updates the wrapped object
-        void setDefaults();
-
-        ESM::Variant& getVariant();
+        void setValue(int value);
+        void setValue(float value);
 
     private:
-        ESM::DialInfo::SelectStruct& mSelect;
+        ESM::DialogueCondition& mSelect;
 
         void writeRule();
     };
diff --git a/apps/opencs/model/world/landtexture.cpp b/apps/opencs/model/world/landtexture.cpp
deleted file mode 100644
index ecf370c282..0000000000
--- a/apps/opencs/model/world/landtexture.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "landtexture.hpp"
-
-#include <sstream>
-#include <stdexcept>
-
-#include <components/esm3/esmreader.hpp>
-#include <components/misc/strings/conversion.hpp>
-
-namespace CSMWorld
-{
-    void LandTexture::load(ESM::ESMReader& esm, bool& isDeleted)
-    {
-        ESM::LandTexture::load(esm, isDeleted);
-
-        mPluginIndex = esm.getIndex();
-    }
-
-    std::string LandTexture::createUniqueRecordId(int plugin, int index)
-    {
-        std::stringstream ss;
-        ss << 'L' << plugin << '#' << index;
-        return ss.str();
-    }
-
-    void LandTexture::parseUniqueRecordId(const std::string& id, int& plugin, int& index)
-    {
-        size_t middle = id.find('#');
-
-        if (middle == std::string::npos || id[0] != 'L')
-            throw std::runtime_error("Invalid LandTexture ID");
-
-        plugin = Misc::StringUtils::toNumeric<int>(id.substr(1, middle - 1), 0);
-        index = Misc::StringUtils::toNumeric<int>(id.substr(middle + 1), 0);
-    }
-}
diff --git a/apps/opencs/model/world/landtexture.hpp b/apps/opencs/model/world/landtexture.hpp
deleted file mode 100644
index d3cac5d3d7..0000000000
--- a/apps/opencs/model/world/landtexture.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CSM_WORLD_LANDTEXTURE_H
-#define CSM_WORLD_LANDTEXTURE_H
-
-#include <string>
-
-#include <components/esm3/loadltex.hpp>
-
-namespace ESM
-{
-    class ESMReader;
-}
-
-namespace CSMWorld
-{
-    /// \brief Wrapper for LandTexture record, providing info which plugin the LandTexture was loaded from.
-    struct LandTexture : public ESM::LandTexture
-    {
-        int mPluginIndex;
-
-        void load(ESM::ESMReader& esm, bool& isDeleted);
-
-        /// Returns a string identifier that will be unique to any LandTexture.
-        static std::string createUniqueRecordId(int plugin, int index);
-        /// Deconstructs a unique string identifier into plugin and index.
-        static void parseUniqueRecordId(const std::string& id, int& plugin, int& index);
-    };
-}
-
-#endif
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 9572d8de39..26c52ce50a 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -7,6 +7,7 @@
 #include <variant>
 
 #include <apps/opencs/model/world/cell.hpp>
+#include <apps/opencs/model/world/disabletag.hpp>
 #include <apps/opencs/model/world/nestedtablewrapper.hpp>
 #include <apps/opencs/model/world/record.hpp>
 
@@ -38,10 +39,9 @@ namespace CSMWorld
         point.mZ = 0;
         point.mAutogenerated = 0;
         point.mConnectionNum = 0;
-        point.mUnknown = 0;
 
         points.insert(points.begin() + position, point);
-        pathgrid.mData.mS2 = pathgrid.mPoints.size();
+        pathgrid.mData.mPoints = pathgrid.mPoints.size();
 
         record.setModified(pathgrid);
     }
@@ -58,7 +58,7 @@ namespace CSMWorld
         // Do not remove dangling edges, does not work with current undo mechanism
         // Do not automatically adjust indices, what would be done with dangling edges?
         points.erase(points.begin() + rowToRemove);
-        pathgrid.mData.mS2 = pathgrid.mPoints.size();
+        pathgrid.mData.mPoints = pathgrid.mPoints.size();
 
         record.setModified(pathgrid);
     }
@@ -67,7 +67,7 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
         pathgrid.mPoints = static_cast<const NestedTableWrapper<ESM::Pathgrid::PointList>&>(nestedTable).mNestedTable;
-        pathgrid.mData.mS2 = pathgrid.mPoints.size();
+        pathgrid.mData.mPoints = pathgrid.mPoints.size();
 
         record.setModified(pathgrid);
     }
@@ -414,20 +414,32 @@ namespace CSMWorld
 
     QVariant RegionSoundListAdapter::getData(const Record<ESM::Region>& record, int subRowIndex, int subColIndex) const
     {
-        ESM::Region region = record.get();
+        const ESM::Region& region = record.get();
 
-        std::vector<ESM::Region::SoundRef>& soundList = region.mSoundList;
+        const std::vector<ESM::Region::SoundRef>& soundList = region.mSoundList;
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int>(soundList.size()))
+        const size_t index = static_cast<size_t>(subRowIndex);
+        if (subRowIndex < 0 || index >= soundList.size())
             throw std::runtime_error("index out of range");
 
-        ESM::Region::SoundRef soundRef = soundList[subRowIndex];
+        const ESM::Region::SoundRef& soundRef = soundList[subRowIndex];
         switch (subColIndex)
         {
             case 0:
                 return QString(soundRef.mSound.getRefIdString().c_str());
             case 1:
                 return soundRef.mChance;
+            case 2:
+            {
+                float probability = 1.f;
+                for (size_t i = 0; i < index; ++i)
+                {
+                    const float p = std::min(soundList[i].mChance / 100.f, 1.f);
+                    probability *= 1.f - p;
+                }
+                probability *= std::min(soundRef.mChance / 100.f, 1.f) * 100.f;
+                return QString("%1%").arg(probability, 0, 'f', 2);
+            }
             default:
                 throw std::runtime_error("Region sounds subcolumn index out of range");
         }
@@ -463,7 +475,7 @@ namespace CSMWorld
 
     int RegionSoundListAdapter::getColumnsCount(const Record<ESM::Region>& record) const
     {
-        return 2;
+        return 3;
     }
 
     int RegionSoundListAdapter::getRowsCount(const Record<ESM::Region>& record) const
@@ -527,13 +539,11 @@ namespace CSMWorld
     {
         Info info = record.get();
 
-        std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
+        auto& conditions = info.mSelects;
 
         // default row
-        ESM::DialInfo::SelectStruct condStruct;
-        condStruct.mSelectRule = "01000";
-        condStruct.mValue = ESM::Variant();
-        condStruct.mValue.setType(ESM::VT_Int);
+        ESM::DialogueCondition condStruct;
+        condStruct.mIndex = conditions.size();
 
         conditions.insert(conditions.begin() + position, condStruct);
 
@@ -544,7 +554,7 @@ namespace CSMWorld
     {
         Info info = record.get();
 
-        std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
+        auto& conditions = info.mSelects;
 
         if (rowToRemove < 0 || rowToRemove >= static_cast<int>(conditions.size()))
             throw std::runtime_error("index out of range");
@@ -558,8 +568,8 @@ namespace CSMWorld
     {
         Info info = record.get();
 
-        info.mSelects = static_cast<const NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct>>&>(nestedTable)
-                            .mNestedTable;
+        info.mSelects
+            = static_cast<const NestedTableWrapper<std::vector<ESM::DialogueCondition>>&>(nestedTable).mNestedTable;
 
         record.setModified(info);
     }
@@ -567,14 +577,14 @@ namespace CSMWorld
     NestedTableWrapperBase* InfoConditionAdapter::table(const Record<Info>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct>>(record.get().mSelects);
+        return new NestedTableWrapper<std::vector<ESM::DialogueCondition>>(record.get().mSelects);
     }
 
     QVariant InfoConditionAdapter::getData(const Record<Info>& record, int subRowIndex, int subColIndex) const
     {
         Info info = record.get();
 
-        std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
+        auto& conditions = info.mSelects;
 
         if (subRowIndex < 0 || subRowIndex >= static_cast<int>(conditions.size()))
             throw std::runtime_error("index out of range");
@@ -596,23 +606,11 @@ namespace CSMWorld
             }
             case 2:
             {
-                return infoSelectWrapper.getRelationType();
+                return infoSelectWrapper.getRelationType() - ESM::DialogueCondition::Comp_Eq;
             }
             case 3:
             {
-                switch (infoSelectWrapper.getVariant().getType())
-                {
-                    case ESM::VT_Int:
-                    {
-                        return infoSelectWrapper.getVariant().getInteger();
-                    }
-                    case ESM::VT_Float:
-                    {
-                        return infoSelectWrapper.getVariant().getFloat();
-                    }
-                    default:
-                        return QVariant();
-                }
+                return infoSelectWrapper.getValue();
             }
             default:
                 throw std::runtime_error("Info condition subcolumn index out of range");
@@ -624,7 +622,7 @@ namespace CSMWorld
     {
         Info info = record.get();
 
-        std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
+        auto& conditions = info.mSelects;
 
         if (subRowIndex < 0 || subRowIndex >= static_cast<int>(conditions.size()))
             throw std::runtime_error("index out of range");
@@ -636,27 +634,18 @@ namespace CSMWorld
         {
             case 0: // Function
             {
-                infoSelectWrapper.setFunctionName(static_cast<ConstInfoSelectWrapper::FunctionName>(value.toInt()));
-
-                if (infoSelectWrapper.getComparisonType() != ConstInfoSelectWrapper::Comparison_Numeric
-                    && infoSelectWrapper.getVariant().getType() != ESM::VT_Int)
-                {
-                    infoSelectWrapper.getVariant().setType(ESM::VT_Int);
-                }
-
-                infoSelectWrapper.update();
+                infoSelectWrapper.setFunctionName(static_cast<ESM::DialogueCondition::Function>(value.toInt()));
                 break;
             }
             case 1: // Variable
             {
                 infoSelectWrapper.setVariableName(value.toString().toUtf8().constData());
-                infoSelectWrapper.update();
                 break;
             }
             case 2: // Relation
             {
-                infoSelectWrapper.setRelationType(static_cast<ConstInfoSelectWrapper::RelationType>(value.toInt()));
-                infoSelectWrapper.update();
+                infoSelectWrapper.setRelationType(
+                    static_cast<ESM::DialogueCondition::Comparison>(value.toInt() + ESM::DialogueCondition::Comp_Eq));
                 break;
             }
             case 3: // Value
@@ -668,13 +657,11 @@ namespace CSMWorld
                         // QVariant seems to have issues converting 0
                         if ((value.toInt(&conversionResult) && conversionResult) || value.toString().compare("0") == 0)
                         {
-                            infoSelectWrapper.getVariant().setType(ESM::VT_Int);
-                            infoSelectWrapper.getVariant().setInteger(value.toInt());
+                            infoSelectWrapper.setValue(value.toInt());
                         }
                         else if (value.toFloat(&conversionResult) && conversionResult)
                         {
-                            infoSelectWrapper.getVariant().setType(ESM::VT_Float);
-                            infoSelectWrapper.getVariant().setFloat(value.toFloat());
+                            infoSelectWrapper.setValue(value.toFloat());
                         }
                         break;
                     }
@@ -683,8 +670,7 @@ namespace CSMWorld
                     {
                         if ((value.toInt(&conversionResult) && conversionResult) || value.toString().compare("0") == 0)
                         {
-                            infoSelectWrapper.getVariant().setType(ESM::VT_Int);
-                            infoSelectWrapper.getVariant().setInteger(value.toInt());
+                            infoSelectWrapper.setValue(value.toInt());
                         }
                         break;
                     }
@@ -741,8 +727,8 @@ namespace CSMWorld
     QVariant RaceAttributeAdapter::getData(const Record<ESM::Race>& record, int subRowIndex, int subColIndex) const
     {
         ESM::Race race = record.get();
-
-        if (subRowIndex < 0 || subRowIndex >= ESM::Attribute::Length)
+        ESM::RefId attribute = ESM::Attribute::indexToRefId(subRowIndex);
+        if (attribute.empty())
             throw std::runtime_error("index out of range");
 
         switch (subColIndex)
@@ -750,9 +736,9 @@ namespace CSMWorld
             case 0:
                 return subRowIndex;
             case 1:
-                return race.mData.mAttributeValues[subRowIndex].mMale;
+                return race.mData.getAttribute(attribute, true);
             case 2:
-                return race.mData.mAttributeValues[subRowIndex].mFemale;
+                return race.mData.getAttribute(attribute, false);
             default:
                 throw std::runtime_error("Race Attribute subcolumn index out of range");
         }
@@ -762,8 +748,8 @@ namespace CSMWorld
         Record<ESM::Race>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Race race = record.get();
-
-        if (subRowIndex < 0 || subRowIndex >= ESM::Attribute::Length)
+        ESM::RefId attribute = ESM::Attribute::indexToRefId(subRowIndex);
+        if (attribute.empty())
             throw std::runtime_error("index out of range");
 
         switch (subColIndex)
@@ -771,10 +757,10 @@ namespace CSMWorld
             case 0:
                 return; // throw an exception here?
             case 1:
-                race.mData.mAttributeValues[subRowIndex].mMale = value.toInt();
+                race.mData.setAttribute(attribute, true, value.toInt());
                 break;
             case 2:
-                race.mData.mAttributeValues[subRowIndex].mFemale = value.toInt();
+                race.mData.setAttribute(attribute, false, value.toInt());
                 break;
             default:
                 throw std::runtime_error("Race Attribute subcolumn index out of range");
@@ -907,24 +893,24 @@ namespace CSMWorld
             // While the ambient information is not necessarily valid if the subrecord wasn't loaded,
             // the user should still be allowed to edit it
             case 1:
-                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mAmbient : QVariant(QVariant::UserType);
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mAmbient : DisableTag::getVariant();
             case 2:
-                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mSunlight : QVariant(QVariant::UserType);
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mSunlight : DisableTag::getVariant();
             case 3:
-                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mFog : QVariant(QVariant::UserType);
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mFog : DisableTag::getVariant();
             case 4:
-                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mFogDensity : QVariant(QVariant::UserType);
+                return (isInterior && !behaveLikeExterior) ? cell.mAmbi.mFogDensity : DisableTag::getVariant();
             case 5:
             {
                 if (isInterior && interiorWater)
                     return cell.mWater;
                 else
-                    return QVariant(QVariant::UserType);
+                    return DisableTag::getVariant();
             }
             case 6:
-                return isInterior ? QVariant(QVariant::UserType) : cell.mMapColor; // TODO: how to select?
+                return isInterior ? DisableTag::getVariant() : cell.mMapColor; // TODO: how to select?
             // case 7: return isInterior ?
-            // behaveLikeExterior : QVariant(QVariant::UserType);
+            // behaveLikeExterior : DisableTag::getVariant();
             default:
                 throw std::runtime_error("Cell subcolumn index out of range");
         }
@@ -996,7 +982,10 @@ namespace CSMWorld
             case 5:
             {
                 if (isInterior && interiorWater)
+                {
                     cell.mWater = value.toFloat();
+                    cell.setHasWaterHeightSub(true);
+                }
                 else
                     return; // return without saving
                 break;
@@ -1076,31 +1065,8 @@ namespace CSMWorld
         }
         else if (subColIndex == 1)
         {
-            switch (subRowIndex)
-            {
-                case 0:
-                    return region.mData.mClear;
-                case 1:
-                    return region.mData.mCloudy;
-                case 2:
-                    return region.mData.mFoggy;
-                case 3:
-                    return region.mData.mOvercast;
-                case 4:
-                    return region.mData.mRain;
-                case 5:
-                    return region.mData.mThunder;
-                case 6:
-                    return region.mData.mAsh;
-                case 7:
-                    return region.mData.mBlight;
-                case 8:
-                    return region.mData.mSnow;
-                case 9:
-                    return region.mData.mBlizzard;
-                default:
-                    break;
-            }
+            if (subRowIndex >= 0 && static_cast<size_t>(subRowIndex) < region.mData.mProbabilities.size())
+                return region.mData.mProbabilities[subRowIndex];
         }
 
         throw std::runtime_error("index out of range");
@@ -1110,45 +1076,11 @@ namespace CSMWorld
         Record<ESM::Region>& record, const QVariant& value, int subRowIndex, int subColIndex) const
     {
         ESM::Region region = record.get();
-        unsigned char chance = static_cast<unsigned char>(value.toInt());
+        uint8_t chance = static_cast<uint8_t>(value.toInt());
 
         if (subColIndex == 1)
         {
-            switch (subRowIndex)
-            {
-                case 0:
-                    region.mData.mClear = chance;
-                    break;
-                case 1:
-                    region.mData.mCloudy = chance;
-                    break;
-                case 2:
-                    region.mData.mFoggy = chance;
-                    break;
-                case 3:
-                    region.mData.mOvercast = chance;
-                    break;
-                case 4:
-                    region.mData.mRain = chance;
-                    break;
-                case 5:
-                    region.mData.mThunder = chance;
-                    break;
-                case 6:
-                    region.mData.mAsh = chance;
-                    break;
-                case 7:
-                    region.mData.mBlight = chance;
-                    break;
-                case 8:
-                    region.mData.mSnow = chance;
-                    break;
-                case 9:
-                    region.mData.mBlizzard = chance;
-                    break;
-                default:
-                    throw std::runtime_error("index out of range");
-            }
+            region.mData.mProbabilities.at(subRowIndex) = chance;
 
             record.setModified(region);
         }
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index 235396c650..f5c5501889 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -255,20 +255,22 @@ namespace CSMWorld
         {
             ESXRecordT magic = record.get();
 
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+            std::vector<ESM::IndexedENAMstruct>& effectsList = magic.mEffects.mList;
 
             // blank row
-            ESM::ENAMstruct effect;
-            effect.mEffectID = 0;
-            effect.mSkill = -1;
-            effect.mAttribute = -1;
-            effect.mRange = 0;
-            effect.mArea = 0;
-            effect.mDuration = 0;
-            effect.mMagnMin = 0;
-            effect.mMagnMax = 0;
+            ESM::IndexedENAMstruct effect;
+            effect.mIndex = position;
+            effect.mData.mEffectID = 0;
+            effect.mData.mSkill = -1;
+            effect.mData.mAttribute = -1;
+            effect.mData.mRange = 0;
+            effect.mData.mArea = 0;
+            effect.mData.mDuration = 0;
+            effect.mData.mMagnMin = 0;
+            effect.mData.mMagnMax = 0;
 
             effectsList.insert(effectsList.begin() + position, effect);
+            magic.mEffects.updateIndexes();
 
             record.setModified(magic);
         }
@@ -277,12 +279,13 @@ namespace CSMWorld
         {
             ESXRecordT magic = record.get();
 
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+            std::vector<ESM::IndexedENAMstruct>& effectsList = magic.mEffects.mList;
 
             if (rowToRemove < 0 || rowToRemove >= static_cast<int>(effectsList.size()))
                 throw std::runtime_error("index out of range");
 
             effectsList.erase(effectsList.begin() + rowToRemove);
+            magic.mEffects.updateIndexes();
 
             record.setModified(magic);
         }
@@ -292,7 +295,7 @@ namespace CSMWorld
             ESXRecordT magic = record.get();
 
             magic.mEffects.mList
-                = static_cast<const NestedTableWrapper<std::vector<ESM::ENAMstruct>>&>(nestedTable).mNestedTable;
+                = static_cast<const NestedTableWrapper<std::vector<ESM::IndexedENAMstruct>>&>(nestedTable).mNestedTable;
 
             record.setModified(magic);
         }
@@ -300,28 +303,23 @@ namespace CSMWorld
         NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const override
         {
             // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<ESM::ENAMstruct>>(record.get().mEffects.mList);
+            return new NestedTableWrapper<std::vector<ESM::IndexedENAMstruct>>(record.get().mEffects.mList);
         }
 
         QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const override
         {
             ESXRecordT magic = record.get();
 
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+            std::vector<ESM::IndexedENAMstruct>& effectsList = magic.mEffects.mList;
 
             if (subRowIndex < 0 || subRowIndex >= static_cast<int>(effectsList.size()))
                 throw std::runtime_error("index out of range");
 
-            ESM::ENAMstruct effect = effectsList[subRowIndex];
+            ESM::ENAMstruct effect = effectsList[subRowIndex].mData;
             switch (subColIndex)
             {
                 case 0:
-                {
-                    if (effect.mEffectID >= 0 && effect.mEffectID < ESM::MagicEffect::Length)
-                        return effect.mEffectID;
-                    else
-                        throw std::runtime_error("Magic effects ID unexpected value");
-                }
+                    return effect.mEffectID;
                 case 1:
                 {
                     switch (effect.mEffectID)
@@ -351,12 +349,7 @@ namespace CSMWorld
                     }
                 }
                 case 3:
-                {
-                    if (effect.mRange >= 0 && effect.mRange <= 2)
-                        return effect.mRange;
-                    else
-                        throw std::runtime_error("Magic effects range unexpected value");
-                }
+                    return effect.mRange;
                 case 4:
                     return effect.mArea;
                 case 5:
@@ -374,17 +367,37 @@ namespace CSMWorld
         {
             ESXRecordT magic = record.get();
 
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+            std::vector<ESM::IndexedENAMstruct>& effectsList = magic.mEffects.mList;
 
             if (subRowIndex < 0 || subRowIndex >= static_cast<int>(effectsList.size()))
                 throw std::runtime_error("index out of range");
 
-            ESM::ENAMstruct effect = effectsList[subRowIndex];
+            ESM::ENAMstruct effect = effectsList[subRowIndex].mData;
             switch (subColIndex)
             {
                 case 0:
                 {
                     effect.mEffectID = static_cast<short>(value.toInt());
+                    switch (effect.mEffectID)
+                    {
+                        case ESM::MagicEffect::DrainSkill:
+                        case ESM::MagicEffect::DamageSkill:
+                        case ESM::MagicEffect::RestoreSkill:
+                        case ESM::MagicEffect::FortifySkill:
+                        case ESM::MagicEffect::AbsorbSkill:
+                            effect.mAttribute = -1;
+                            break;
+                        case ESM::MagicEffect::DrainAttribute:
+                        case ESM::MagicEffect::DamageAttribute:
+                        case ESM::MagicEffect::RestoreAttribute:
+                        case ESM::MagicEffect::FortifyAttribute:
+                        case ESM::MagicEffect::AbsorbAttribute:
+                            effect.mSkill = -1;
+                            break;
+                        default:
+                            effect.mSkill = -1;
+                            effect.mAttribute = -1;
+                    }
                     break;
                 }
                 case 1:
@@ -418,7 +431,7 @@ namespace CSMWorld
                     throw std::runtime_error("Magic Effects subcolumn index out of range");
             }
 
-            magic.mEffects.mList[subRowIndex] = effect;
+            magic.mEffects.mList[subRowIndex].mData = effect;
 
             record.setModified(magic);
         }
diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
index d1f64fbfef..35e4c82a35 100644
--- a/apps/opencs/model/world/record.hpp
+++ b/apps/opencs/model/world/record.hpp
@@ -19,6 +19,11 @@ namespace CSMWorld
 
         State mState;
 
+        explicit RecordBase(State state)
+            : mState(state)
+        {
+        }
+
         virtual ~RecordBase() = default;
 
         virtual std::unique_ptr<RecordBase> clone() const = 0;
@@ -69,21 +74,18 @@ namespace CSMWorld
 
     template <typename ESXRecordT>
     Record<ESXRecordT>::Record()
-        : mBase()
+        : RecordBase(State_BaseOnly)
+        , mBase()
         , mModified()
     {
     }
 
     template <typename ESXRecordT>
     Record<ESXRecordT>::Record(State state, const ESXRecordT* base, const ESXRecordT* modified)
+        : RecordBase(state)
+        , mBase(base == nullptr ? ESXRecordT{} : *base)
+        , mModified(modified == nullptr ? ESXRecordT{} : *modified)
     {
-        if (base)
-            mBase = *base;
-
-        if (modified)
-            mModified = *modified;
-
-        this->mState = state;
     }
 
     template <typename ESXRecordT>
diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index 328d205106..e28ef64fe7 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -8,8 +8,6 @@ CSMWorld::CellRef::CellRef()
     : mNew(true)
     , mIdNum(0)
 {
-    mRefNum.mIndex = 0;
-    mRefNum.mContentFile = 0;
 }
 
 std::pair<int, int> CSMWorld::CellRef::getCellIndex() const
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 1afa9027a9..124e697de8 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -8,6 +8,7 @@
 #include <apps/opencs/model/world/collection.hpp>
 
 #include <components/esm3/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/misc/strings/conversion.hpp>
 
@@ -47,7 +48,7 @@ namespace CSMWorld
 }
 
 void CSMWorld::RefCollection::load(ESM::ESMReader& reader, int cellIndex, bool base,
-    std::map<unsigned int, unsigned int>& cache, CSMDoc::Messages& messages)
+    std::map<ESM::RefNum, unsigned int>& cache, CSMDoc::Messages& messages)
 {
     Record<Cell> cell = mCells.getRecord(cellIndex);
 
@@ -64,6 +65,8 @@ void CSMWorld::RefCollection::load(ESM::ESMReader& reader, int cellIndex, bool b
 
         if (!ESM::Cell::getNextRef(reader, ref, isDeleted, mref, isMoved))
             break;
+        if (!base && reader.getIndex() == ref.mRefNum.mContentFile)
+            ref.mRefNum.mContentFile = -1;
         // Keep mOriginalCell empty when in modified (as an indicator that the
         // original cell will always be equal the current cell).
         ref.mOriginalCell = base ? cell2.mId : ESM::RefId();
@@ -102,16 +105,7 @@ void CSMWorld::RefCollection::load(ESM::ESMReader& reader, int cellIndex, bool b
         else
             ref.mCell = cell2.mId;
 
-        if (ref.mRefNum.mContentFile != -1 && !base)
-        {
-            ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
-            ref.mRefNum.mIndex &= 0x00ffffff;
-        }
-
-        unsigned int refNum = (ref.mRefNum.mIndex & 0x00ffffff)
-            | (ref.mRefNum.hasContentFile() ? ref.mRefNum.mContentFile : 0xff) << 24;
-
-        std::map<unsigned int, unsigned int>::iterator iter = cache.find(refNum);
+        auto iter = cache.find(ref.mRefNum);
 
         if (isMoved)
         {
@@ -181,7 +175,7 @@ void CSMWorld::RefCollection::load(ESM::ESMReader& reader, int cellIndex, bool b
             ref.mIdNum = mNextId; // FIXME: fragile
             ref.mId = ESM::RefId::stringRefId(getNewId());
 
-            cache.emplace(refNum, ref.mIdNum);
+            cache.emplace(ref.mRefNum, ref.mIdNum);
 
             auto record = std::make_unique<Record<CellRef>>();
             record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
@@ -297,6 +291,7 @@ void CSMWorld::RefCollection::cloneRecord(
     const ESM::RefId& origin, const ESM::RefId& destination, const UniversalId::Type type)
 {
     auto copy = std::make_unique<Record<CellRef>>();
+    int index = getAppendIndex(ESM::RefId(), type);
 
     copy->mModified = getRecord(origin).get();
     copy->mState = RecordBase::State_ModifiedOnly;
@@ -304,6 +299,15 @@ void CSMWorld::RefCollection::cloneRecord(
     copy->get().mId = destination;
     copy->get().mIdNum = extractIdNum(destination.getRefIdString());
 
+    if (copy->get().mRefNum.hasContentFile())
+    {
+        mRefIndex.insert(std::make_pair(static_cast<Record<CellRef>*>(copy.get())->get().mIdNum, index));
+        copy->get().mRefNum.mContentFile = -1;
+        copy->get().mRefNum.mIndex = index;
+    }
+    else
+        copy->get().mRefNum.mIndex = copy->get().mIdNum;
+
     insertRecord(std::move(copy), getAppendIndex(destination, type)); // call RefCollection::insertRecord()
 }
 
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index a5e5fd3b6f..d3d200e6c2 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -55,7 +55,7 @@ namespace CSMWorld
         {
         }
 
-        void load(ESM::ESMReader& reader, int cellIndex, bool base, std::map<unsigned int, unsigned int>& cache,
+        void load(ESM::ESMReader& reader, int cellIndex, bool base, std::map<ESM::RefNum, unsigned int>& cache,
             CSMDoc::Messages& messages);
         ///< Load a sequence of references.
 
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 149b5d19ca..a6ea56a56d 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 
 #include <apps/opencs/model/world/columnbase.hpp>
+#include <apps/opencs/model/world/disabletag.hpp>
 #include <apps/opencs/model/world/record.hpp>
 #include <apps/opencs/model/world/refiddata.hpp>
 #include <apps/opencs/model/world/universalid.hpp>
@@ -33,7 +34,7 @@ QVariant CSMWorld::PotionRefIdAdapter::getData(const RefIdColumn* column, const
         data.getRecord(RefIdData::LocalIndex(index, UniversalId::Type_Potion)));
 
     if (column == mAutoCalc)
-        return record.get().mData.mAutoCalc != 0;
+        return record.get().mData.mFlags & ESM::Potion::Autocalc;
 
     // to show nested tables in dialogue subview, see IdTree::hasChildren()
     if (column == mColumns.mEffects)
@@ -51,7 +52,7 @@ void CSMWorld::PotionRefIdAdapter::setData(
     ESM::Potion potion = record.get();
 
     if (column == mAutoCalc)
-        potion.mData.mAutoCalc = value.toInt();
+        potion.mData.mFlags = value.toBool();
     else
     {
         InventoryRefIdAdapter<ESM::Potion>::setData(column, data, index, value);
@@ -194,6 +195,26 @@ void CSMWorld::IngredEffectRefIdAdapter::setNestedData(
     {
         case 0:
             ingredient.mData.mEffectID[subRowIndex] = value.toInt();
+            switch (ingredient.mData.mEffectID[subRowIndex])
+            {
+                case ESM::MagicEffect::DrainSkill:
+                case ESM::MagicEffect::DamageSkill:
+                case ESM::MagicEffect::RestoreSkill:
+                case ESM::MagicEffect::FortifySkill:
+                case ESM::MagicEffect::AbsorbSkill:
+                    ingredient.mData.mAttributes[subRowIndex] = -1;
+                    break;
+                case ESM::MagicEffect::DrainAttribute:
+                case ESM::MagicEffect::DamageAttribute:
+                case ESM::MagicEffect::RestoreAttribute:
+                case ESM::MagicEffect::FortifyAttribute:
+                case ESM::MagicEffect::AbsorbAttribute:
+                    ingredient.mData.mSkills[subRowIndex] = -1;
+                    break;
+                default:
+                    ingredient.mData.mSkills[subRowIndex] = -1;
+                    ingredient.mData.mAttributes[subRowIndex] = -1;
+            }
             break;
         case 1:
             ingredient.mData.mSkills[subRowIndex] = value.toInt();
@@ -516,10 +537,18 @@ QVariant CSMWorld::CreatureRefIdAdapter::getData(const RefIdColumn* column, cons
     if (column == mColumns.mBloodType)
         return record.get().mBloodType;
 
-    std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
+    {
+        std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mFlags.find(column);
 
-    if (iter != mColumns.mFlags.end())
-        return (record.get().mFlags & iter->second) != 0;
+        if (iter != mColumns.mFlags.end())
+            return (record.get().mFlags & iter->second) != 0;
+    }
+
+    {
+        std::map<const RefIdColumn*, unsigned int>::const_iterator iter = mColumns.mServices.find(column);
+        if (iter != mColumns.mServices.end() && iter->second == ESM::NPC::Training)
+            return QVariant();
+    }
 
     return ActorRefIdAdapter<ESM::Creature>::getData(column, data, index);
 }
@@ -930,30 +959,9 @@ QVariant CSMWorld::NpcAttributesRefIdAdapter::getNestedData(
 
     if (subColIndex == 0)
         return subRowIndex;
-    else if (subColIndex == 1)
-        switch (subRowIndex)
-        {
-            case 0:
-                return static_cast<int>(npcStruct.mStrength);
-            case 1:
-                return static_cast<int>(npcStruct.mIntelligence);
-            case 2:
-                return static_cast<int>(npcStruct.mWillpower);
-            case 3:
-                return static_cast<int>(npcStruct.mAgility);
-            case 4:
-                return static_cast<int>(npcStruct.mSpeed);
-            case 5:
-                return static_cast<int>(npcStruct.mEndurance);
-            case 6:
-                return static_cast<int>(npcStruct.mPersonality);
-            case 7:
-                return static_cast<int>(npcStruct.mLuck);
-            default:
-                return QVariant(); // throw an exception here?
-        }
-    else
-        return QVariant(); // throw an exception here?
+    else if (subColIndex == 1 && subRowIndex >= 0 && subRowIndex < ESM::Attribute::Length)
+        return static_cast<int>(npcStruct.mAttributes[subRowIndex]);
+    return QVariant(); // throw an exception here?
 }
 
 void CSMWorld::NpcAttributesRefIdAdapter::setNestedData(
@@ -964,36 +972,8 @@ void CSMWorld::NpcAttributesRefIdAdapter::setNestedData(
     ESM::NPC npc = record.get();
     ESM::NPC::NPDTstruct52& npcStruct = npc.mNpdt;
 
-    if (subColIndex == 1)
-        switch (subRowIndex)
-        {
-            case 0:
-                npcStruct.mStrength = static_cast<unsigned char>(value.toInt());
-                break;
-            case 1:
-                npcStruct.mIntelligence = static_cast<unsigned char>(value.toInt());
-                break;
-            case 2:
-                npcStruct.mWillpower = static_cast<unsigned char>(value.toInt());
-                break;
-            case 3:
-                npcStruct.mAgility = static_cast<unsigned char>(value.toInt());
-                break;
-            case 4:
-                npcStruct.mSpeed = static_cast<unsigned char>(value.toInt());
-                break;
-            case 5:
-                npcStruct.mEndurance = static_cast<unsigned char>(value.toInt());
-                break;
-            case 6:
-                npcStruct.mPersonality = static_cast<unsigned char>(value.toInt());
-                break;
-            case 7:
-                npcStruct.mLuck = static_cast<unsigned char>(value.toInt());
-                break;
-            default:
-                return; // throw an exception here?
-        }
+    if (subColIndex == 1 && subRowIndex >= 0 && subRowIndex < ESM::Attribute::Length)
+        npcStruct.mAttributes[subRowIndex] = static_cast<unsigned char>(value.toInt());
     else
         return; // throw an exception here?
 
@@ -1138,11 +1118,11 @@ QVariant CSMWorld::NpcMiscRefIdAdapter::getNestedData(
             case 0:
                 return static_cast<int>(record.get().mNpdt.mLevel);
             case 1:
-                return QVariant(QVariant::UserType);
+                return CSMWorld::DisableTag::getVariant();
             case 2:
-                return QVariant(QVariant::UserType);
+                return CSMWorld::DisableTag::getVariant();
             case 3:
-                return QVariant(QVariant::UserType);
+                return CSMWorld::DisableTag::getVariant();
             case 4:
                 return static_cast<int>(record.get().mNpdt.mDisposition);
             case 5:
@@ -1307,30 +1287,9 @@ QVariant CSMWorld::CreatureAttributesRefIdAdapter::getNestedData(
 
     if (subColIndex == 0)
         return subRowIndex;
-    else if (subColIndex == 1)
-        switch (subRowIndex)
-        {
-            case 0:
-                return creature.mData.mStrength;
-            case 1:
-                return creature.mData.mIntelligence;
-            case 2:
-                return creature.mData.mWillpower;
-            case 3:
-                return creature.mData.mAgility;
-            case 4:
-                return creature.mData.mSpeed;
-            case 5:
-                return creature.mData.mEndurance;
-            case 6:
-                return creature.mData.mPersonality;
-            case 7:
-                return creature.mData.mLuck;
-            default:
-                return QVariant(); // throw an exception here?
-        }
-    else
-        return QVariant(); // throw an exception here?
+    else if (subColIndex == 1 && subRowIndex >= 0 && subRowIndex < ESM::Attribute::Length)
+        return creature.mData.mAttributes[subRowIndex];
+    return QVariant(); // throw an exception here?
 }
 
 void CSMWorld::CreatureAttributesRefIdAdapter::setNestedData(
@@ -1338,42 +1297,14 @@ void CSMWorld::CreatureAttributesRefIdAdapter::setNestedData(
 {
     Record<ESM::Creature>& record
         = static_cast<Record<ESM::Creature>&>(data.getRecord(RefIdData::LocalIndex(row, UniversalId::Type_Creature)));
-    ESM::Creature creature = record.get();
 
-    if (subColIndex == 1)
-        switch (subRowIndex)
-        {
-            case 0:
-                creature.mData.mStrength = value.toInt();
-                break;
-            case 1:
-                creature.mData.mIntelligence = value.toInt();
-                break;
-            case 2:
-                creature.mData.mWillpower = value.toInt();
-                break;
-            case 3:
-                creature.mData.mAgility = value.toInt();
-                break;
-            case 4:
-                creature.mData.mSpeed = value.toInt();
-                break;
-            case 5:
-                creature.mData.mEndurance = value.toInt();
-                break;
-            case 6:
-                creature.mData.mPersonality = value.toInt();
-                break;
-            case 7:
-                creature.mData.mLuck = value.toInt();
-                break;
-            default:
-                return; // throw an exception here?
-        }
-    else
-        return; // throw an exception here?
-
-    record.setModified(creature);
+    if (subColIndex == 1 && subRowIndex >= 0 && subRowIndex < ESM::Attribute::Length)
+    {
+        ESM::Creature creature = record.get();
+        creature.mData.mAttributes[subRowIndex] = value.toInt();
+        record.setModified(creature);
+    }
+    // throw an exception here?
 }
 
 int CSMWorld::CreatureAttributesRefIdAdapter::getNestedColumnsCount(
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index b8c3974d75..e0d5799726 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -97,7 +97,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     inventoryColumns.mIcon = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Weight, ColumnBase::Display_Float);
     inventoryColumns.mWeight = &mColumns.back();
-    mColumns.emplace_back(Columns::ColumnId_CoinValue, ColumnBase::Display_Integer);
+    mColumns.emplace_back(Columns::ColumnId_GoldValue, ColumnBase::Display_Integer);
     inventoryColumns.mValue = &mColumns.back();
 
     IngredientColumns ingredientColumns(inventoryColumns);
@@ -210,7 +210,6 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiDuration, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderToD, CSMWorld::ColumnBase::Display_Integer));
 
-    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle1, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle2, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle3, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle4, CSMWorld::ColumnBase::Display_Integer));
@@ -218,6 +217,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle6, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle7, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle8, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle9, CSMWorld::ColumnBase::Display_Integer));
 
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
     mColumns.back().addColumn(
diff --git a/apps/opencs/model/world/regionmap.cpp b/apps/opencs/model/world/regionmap.cpp
index 5c22aedf4d..79a0d5474d 100644
--- a/apps/opencs/model/world/regionmap.cpp
+++ b/apps/opencs/model/world/regionmap.cpp
@@ -1,7 +1,9 @@
 #include "regionmap.hpp"
 
+#include <QApplication>
 #include <QBrush>
 #include <QModelIndex>
+#include <QPalette>
 #include <QSize>
 #include <QVariant>
 
@@ -21,20 +23,33 @@
 #include "data.hpp"
 #include "universalid.hpp"
 
-CSMWorld::RegionMap::CellDescription::CellDescription()
-    : mDeleted(false)
+namespace CSMWorld
 {
+    float getLandHeight(const CSMWorld::Cell& cell, CSMWorld::Data& data)
+    {
+        const IdCollection<Land>& lands = data.getLand();
+        int landIndex = lands.searchId(cell.mId);
+        if (landIndex == -1)
+            return 0.0f;
+
+        // If any part of land is above water, returns > 0 - otherwise returns < 0
+        const Land& land = lands.getRecord(landIndex).get();
+        if (land.getLandData())
+            return land.getLandData()->mMaxHeight - cell.mWater;
+
+        return 0.0f;
+    }
 }
 
-CSMWorld::RegionMap::CellDescription::CellDescription(const Record<Cell>& cell)
+CSMWorld::RegionMap::CellDescription::CellDescription(const Record<Cell>& cell, float landHeight)
 {
     const Cell& cell2 = cell.get();
 
     if (!cell2.isExterior())
         throw std::logic_error("Interior cell in region map");
 
+    mMaxLandHeight = landHeight;
     mDeleted = cell.isDeleted();
-
     mRegion = cell2.mRegion;
     mName = cell2.mName;
 }
@@ -92,7 +107,7 @@ void CSMWorld::RegionMap::buildMap()
 
         if (cell2.isExterior())
         {
-            CellDescription description(cell);
+            CellDescription description(cell, getLandHeight(cell2, mData));
 
             CellCoordinates index = getIndex(cell2);
 
@@ -140,7 +155,7 @@ void CSMWorld::RegionMap::addCells(int start, int end)
         {
             CellCoordinates index = getIndex(cell2);
 
-            CellDescription description(cell);
+            CellDescription description(cell, getLandHeight(cell.get(), mData));
 
             addCell(index, description);
         }
@@ -335,10 +350,11 @@ QVariant CSMWorld::RegionMap::data(const QModelIndex& index, int role) const
             auto iter = mColours.find(cell->second.mRegion);
 
             if (iter != mColours.end())
-                return QBrush(QColor(iter->second & 0xff, (iter->second >> 8) & 0xff, (iter->second >> 16) & 0xff));
+                return QBrush(QColor(iter->second & 0xff, (iter->second >> 8) & 0xff, (iter->second >> 16) & 0xff),
+                    cell->second.mMaxLandHeight > 0 ? Qt::SolidPattern : Qt::CrossPattern);
 
-            if (cell->second.mRegion.empty())
-                return QBrush(Qt::Dense6Pattern); // no region
+            if (cell->second.mRegion.empty()) // no region
+                return QBrush(cell->second.mMaxLandHeight > 0 ? Qt::Dense3Pattern : Qt::Dense6Pattern);
 
             return QBrush(Qt::red, Qt::Dense6Pattern); // invalid region
         }
diff --git a/apps/opencs/model/world/regionmap.hpp b/apps/opencs/model/world/regionmap.hpp
index 3f62c7b61d..96281ba49c 100644
--- a/apps/opencs/model/world/regionmap.hpp
+++ b/apps/opencs/model/world/regionmap.hpp
@@ -40,13 +40,12 @@ namespace CSMWorld
     private:
         struct CellDescription
         {
+            float mMaxLandHeight;
             bool mDeleted;
             ESM::RefId mRegion;
             std::string mName;
 
-            CellDescription();
-
-            CellDescription(const Record<Cell>& cell);
+            CellDescription(const Record<Cell>& cell, float landHeight);
         };
 
         Data& mData;
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index bfab0193b0..7082575c64 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -11,6 +11,7 @@
 
 #include <components/misc/strings/lower.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 
 CSMWorld::Resources::Resources(
     const VFS::Manager* vfs, const std::string& baseDirectory, UniversalId::Type type, const char* const* extensions)
@@ -27,20 +28,20 @@ void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char* const* e
 
     size_t baseSize = mBaseDirectory.size();
 
-    for (const auto& filepath : vfs->getRecursiveDirectoryIterator(""))
+    for (const auto& filepath : vfs->getRecursiveDirectoryIterator())
     {
-        if (filepath.size() < baseSize + 1 || filepath.substr(0, baseSize) != mBaseDirectory
-            || (filepath[baseSize] != '/' && filepath[baseSize] != '\\'))
+        const std::string_view view = filepath.view();
+        if (view.size() < baseSize + 1 || !view.starts_with(mBaseDirectory) || view[baseSize] != '/')
             continue;
 
         if (extensions)
         {
-            std::string::size_type extensionIndex = filepath.find_last_of('.');
+            const auto extensionIndex = view.find_last_of('.');
 
-            if (extensionIndex == std::string::npos)
+            if (extensionIndex == std::string_view::npos)
                 continue;
 
-            std::string extension = filepath.substr(extensionIndex + 1);
+            std::string_view extension = view.substr(extensionIndex + 1);
 
             int i = 0;
 
@@ -52,10 +53,9 @@ void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char* const* e
                 continue;
         }
 
-        std::string file = filepath.substr(baseSize + 1);
+        std::string file(view.substr(baseSize + 1));
         mFiles.push_back(file);
-        std::replace(file.begin(), file.end(), '\\', '/');
-        mIndex.insert(std::make_pair(Misc::StringUtils::lowerCase(file), static_cast<int>(mFiles.size()) - 1));
+        mIndex.emplace(std::move(file), static_cast<int>(mFiles.size()) - 1);
     }
 }
 
diff --git a/apps/opencs/model/world/subcellcollection.hpp b/apps/opencs/model/world/subcellcollection.hpp
index f7cb896aca..a025d407c7 100644
--- a/apps/opencs/model/world/subcellcollection.hpp
+++ b/apps/opencs/model/world/subcellcollection.hpp
@@ -18,14 +18,15 @@ namespace CSMWorld
     {
         const IdCollection<Cell>& mCells;
 
-        void loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted) override;
+        void loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted, bool base) override;
 
     public:
         SubCellCollection(const IdCollection<Cell>& cells);
     };
 
     template <typename ESXRecordT>
-    void SubCellCollection<ESXRecordT>::loadRecord(ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted)
+    void SubCellCollection<ESXRecordT>::loadRecord(
+        ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted, bool base)
     {
         record.load(reader, isDeleted, mCells);
     }
diff --git a/apps/opencs/model/world/tablemimedata.cpp b/apps/opencs/model/world/tablemimedata.cpp
index a966a53eee..a40698bc27 100644
--- a/apps/opencs/model/world/tablemimedata.cpp
+++ b/apps/opencs/model/world/tablemimedata.cpp
@@ -58,7 +58,7 @@ std::string CSMWorld::TableMimeData::getIcon() const
 
         if (tmpIcon != id.getIcon())
         {
-            return ":/multitype.png"; // icon stolen from gnome TODO: get new icon
+            return ":multitype";
         }
 
         tmpIcon = id.getIcon();
diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
index dec533b015..0ebccd6253 100644
--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@@ -23,157 +23,137 @@ namespace
     constexpr TypeData sNoArg[] = {
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, "-", ":placeholder" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Globals, "Global Variables",
-            ":./global-variable.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Gmsts, "Game Settings", ":./gmst.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Skills, "Skills", ":./skill.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Classes, "Classes", ":./class.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Factions, "Factions", ":./faction.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Races, "Races", ":./race.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Sounds, "Sounds", ":./sound.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Scripts, "Scripts", ":./script.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Regions, "Regions", ":./region.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Birthsigns, "Birthsigns",
-            ":./birthsign.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Spells, "Spells", ":./spell.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Topics, "Topics",
-            ":./dialogue-topics.png" },
+            ":global-variable" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Gmsts, "Game Settings", ":gmst" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Skills, "Skills", ":skill" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Classes, "Classes", ":class" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Factions, "Factions", ":faction" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Races, "Races", ":race" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Sounds, "Sounds", ":sound" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Scripts, "Scripts", ":script" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Regions, "Regions", ":region" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Birthsigns, "Birthsigns", ":birthsign" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Spells, "Spells", ":spell" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Topics, "Topics", ":dialogue-topics" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Journals, "Journals",
-            ":./journal-topics.png" },
+            ":journal-topics" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_TopicInfos, "Topic Infos",
-            ":./dialogue-topic-infos.png" },
+            ":dialogue-info" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_JournalInfos, "Journal Infos",
-            ":./journal-topic-infos.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Cells, "Cells", ":./cell.png" },
+            ":journal-topic-infos" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Cells, "Cells", ":cell" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Enchantments, "Enchantments",
-            ":./enchantment.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_BodyParts, "Body Parts",
-            ":./body-part.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Referenceables, "Objects",
-            ":./object.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_References, "Instances",
-            ":./instance.png" },
-        { CSMWorld::UniversalId::Class_NonRecord, CSMWorld::UniversalId::Type_RegionMap, "Region Map",
-            ":./region-map.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Filters, "Filters", ":./filter.png" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Meshes, "Meshes",
-            ":./resources-mesh" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Icons, "Icons", ":./resources-icon" },
+            ":enchantment" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_BodyParts, "Body Parts", ":body-part" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Referenceables, "Objects", ":object" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_References, "Instances", ":instance" },
+        { CSMWorld::UniversalId::Class_NonRecord, CSMWorld::UniversalId::Type_RegionMap, "Region Map", ":region-map" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Filters, "Filters", ":filter" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Meshes, "Meshes", ":resources-mesh" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Icons, "Icons", ":resources-icon" },
         { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Musics, "Music Files",
-            ":./resources-music" },
+            ":resources-music" },
         { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_SoundsRes, "Sound Files",
             ":resources-sound" },
         { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Textures, "Textures",
-            ":./resources-texture" },
-        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Videos, "Videos",
-            ":./resources-video" },
+            ":resources-texture" },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Videos, "Videos", ":resources-video" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_DebugProfiles, "Debug Profiles",
-            ":./debug-profile.png" },
-        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_RunLog, "Run Log", ":./run-log.png" },
+            ":debug-profile" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_SelectionGroup, "Selection Groups", "" },
+        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_RunLog, "Run Log", ":run-log" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_SoundGens, "Sound Generators",
-            ":./sound-generator.png" },
+            ":sound-generator" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MagicEffects, "Magic Effects",
-            ":./magic-effect.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Lands, "Lands",
-            ":./land-heightmap.png" },
+            ":magic-effect" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Lands, "Lands", ":land-heightmap" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_LandTextures, "Land Textures",
-            ":./land-texture.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Pathgrids, "Pathgrids",
-            ":./pathgrid.png" },
+            ":land-texture" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Pathgrids, "Pathgrids", ":pathgrid" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_StartScripts, "Start Scripts",
-            ":./start-script.png" },
-        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MetaDatas, "Metadata",
-            ":./metadata.png" },
+            ":start-script" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MetaDatas, "Metadata", ":metadata" },
     };
 
     constexpr TypeData sIdArg[] = {
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable",
-            ":./global-variable.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":./gmst.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Skill, "Skill", ":./skill.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class", ":./class.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Faction, "Faction", ":./faction.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Race, "Race", ":./race.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Sound, "Sound", ":./sound.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Script, "Script", ":./script.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", ":./region.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Birthsign, "Birthsign", ":./birthsign.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Spell, "Spell", ":./spell.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Topic, "Topic", ":./dialogue-topics.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Journal, "Journal",
-            ":./journal-topics.png" },
+            ":global-variable" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":gmst" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Skill, "Skill", ":skill" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class", ":class" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Faction, "Faction", ":faction" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Race, "Race", ":race" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Sound, "Sound", ":sound" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Script, "Script", ":script" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", ":region" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Birthsign, "Birthsign", ":birthsign" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Spell, "Spell", ":spell" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Topic, "Topic", ":dialogue-topics" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Journal, "Journal", ":journal-topics" },
         { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_TopicInfo, "TopicInfo",
-            ":./dialogue-topic-infos.png" },
+            ":dialogue-info" },
         { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_JournalInfo, "JournalInfo",
-            ":./journal-topic-infos.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell, "Cell", ":./cell.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell_Missing, "Cell", ":./cell.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Referenceable, "Object", ":./object.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Activator, "Activator",
-            ":./activator.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Potion, "Potion", ":./potion.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Apparatus, "Apparatus",
-            ":./apparatus.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Armor, "Armor", ":./armor.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Book, "Book", ":./book.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Clothing, "Clothing", ":./clothing.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Container, "Container",
-            ":./container.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Creature, "Creature", ":./creature.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Door, "Door", ":./door.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Ingredient, "Ingredient",
-            ":./ingredient.png" },
+            ":journal-topic-infos" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell, "Cell", ":cell" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell_Missing, "Cell", ":cell" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Referenceable, "Object", ":object" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Activator, "Activator", ":activator" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Potion, "Potion", ":potion" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Apparatus, "Apparatus", ":apparatus" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Armor, "Armor", ":armor" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Book, "Book", ":book" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Clothing, "Clothing", ":clothing" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Container, "Container", ":container" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Creature, "Creature", ":creature" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Door, "Door", ":door" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Ingredient, "Ingredient", ":ingredient" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_CreatureLevelledList,
-            "Creature Levelled List", ":./levelled-creature.png" },
+            "Creature Levelled List", ":levelled-creature" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_ItemLevelledList, "Item Levelled List",
-            ":./levelled-item.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Light, "Light", ":./light.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Lockpick, "Lockpick", ":./lockpick.png" },
+            ":levelled-item" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Light, "Light", ":light" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Lockpick, "Lockpick", ":lockpick" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Miscellaneous, "Miscellaneous",
-            ":./miscellaneous.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Npc, "NPC", ":./npc.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Probe, "Probe", ":./probe.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Repair, "Repair", ":./repair.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Static, "Static", ":./static.png" },
-        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Weapon, "Weapon", ":./weapon.png" },
-        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_Reference, "Instance",
-            ":./instance.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Filter, "Filter", ":./filter.png" },
-        { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Scene, "Scene", ":./scene.png" },
-        { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Preview, "Preview",
-            ":./record-preview.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment",
-            ":./enchantment.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", ":./body-part.png" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", ":./resources-mesh" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", ":./resources-icon" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", ":./resources-music" },
+            ":miscellaneous" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Npc, "NPC", ":npc" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Probe, "Probe", ":probe" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Repair, "Repair", ":repair" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Static, "Static", ":static" },
+        { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Weapon, "Weapon", ":weapon" },
+        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_Reference, "Instance", ":instance" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Filter, "Filter", ":filter" },
+        { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Scene, "Scene", ":scene" },
+        { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Preview, "Preview", ":edit-preview" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment", ":enchantment" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", ":body-part" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", ":resources-mesh" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", ":resources-icon" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", ":resources-music" },
         { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File",
-            ":./resources-sound" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture",
-            ":./resources-texture" },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Video, "Video", ":./resources-video" },
+            ":resources-sound" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture", ":resources-texture" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Video, "Video", ":resources-video" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_DebugProfile, "Debug Profile",
-            ":./debug-profile.png" },
+            ":debug-profile" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_SoundGen, "Sound Generator",
-            ":./sound-generator.png" },
+            ":sound-generator" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MagicEffect, "Magic Effect",
-            ":./magic-effect.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Land, "Land", ":./land-heightmap.png" },
+            ":magic-effect" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Land, "Land", ":land-heightmap" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_LandTexture, "Land Texture",
-            ":./land-texture.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", ":./pathgrid.png" },
+            ":land-texture" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", ":pathgrid" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_StartScript, "Start Script",
-            ":./start-script.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MetaData, "Metadata", ":./metadata.png" },
+            ":start-script" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MetaData, "Metadata", ":metadata" },
     };
 
     constexpr TypeData sIndexArg[] = {
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults,
-            "Verification Results", ":./menu-verify.png" },
+            "Verification Results", ":menu-verify" },
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_LoadErrorLog, "Load Error Log",
-            ":./error-log.png" },
-        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Search, "Global Search",
-            ":./menu-search.png" },
+            ":error-log" },
+        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Search, "Global Search", ":menu-search" },
     };
 
     struct WriteToStream
@@ -187,6 +167,8 @@ namespace
         {
             mStream << ": " << value;
         }
+
+        void operator()(const ESM::RefId& value) const { mStream << ": " << value.toString(); }
     };
 
     struct GetTypeData
@@ -218,6 +200,23 @@ namespace
 
         return std::to_string(value);
     }
+
+    CSMWorld::UniversalId::Class getClassByType(CSMWorld::UniversalId::Type type)
+    {
+        if (const auto it
+            = std::find_if(std::begin(sIdArg), std::end(sIdArg), [&](const TypeData& v) { return v.mType == type; });
+            it != std::end(sIdArg))
+            return it->mClass;
+        if (const auto it = std::find_if(
+                std::begin(sIndexArg), std::end(sIndexArg), [&](const TypeData& v) { return v.mType == type; });
+            it != std::end(sIndexArg))
+            return it->mClass;
+        if (const auto it
+            = std::find_if(std::begin(sNoArg), std::end(sNoArg), [&](const TypeData& v) { return v.mType == type; });
+            it != std::end(sNoArg))
+            return it->mClass;
+        throw std::logic_error("invalid UniversalId type: " + std::to_string(type));
+    }
 }
 
 CSMWorld::UniversalId::UniversalId(const std::string& universalId)
@@ -326,6 +325,13 @@ CSMWorld::UniversalId::UniversalId(Type type, ESM::RefId id)
     throw std::logic_error("invalid RefId argument UniversalId type: " + std::to_string(type));
 }
 
+CSMWorld::UniversalId::UniversalId(Type type, const UniversalId& id)
+    : mClass(getClassByType(type))
+    , mType(type)
+    , mValue(id.mValue)
+{
+}
+
 CSMWorld::UniversalId::UniversalId(Type type, int index)
     : mType(type)
     , mValue(index)
@@ -360,6 +366,10 @@ const std::string& CSMWorld::UniversalId::getId() const
     if (const std::string* result = std::get_if<std::string>(&mValue))
         return *result;
 
+    if (const ESM::RefId* refId = std::get_if<ESM::RefId>(&mValue))
+        if (const ESM::StringRefId* result = refId->getIf<ESM::StringRefId>())
+            return result->getValue();
+
     throw std::logic_error("invalid access to ID of " + ::toString(getArgumentType()) + " UniversalId");
 }
 
diff --git a/apps/opencs/model/world/universalid.hpp b/apps/opencs/model/world/universalid.hpp
index 2d3385bcb4..34ef480fa5 100644
--- a/apps/opencs/model/world/universalid.hpp
+++ b/apps/opencs/model/world/universalid.hpp
@@ -133,6 +133,7 @@ namespace CSMWorld
             Type_LandTexture,
             Type_Pathgrids,
             Type_Pathgrid,
+            Type_SelectionGroup,
             Type_StartScripts,
             Type_StartScript,
             Type_Search,
@@ -158,6 +159,8 @@ namespace CSMWorld
         UniversalId(Type type, int index);
         ///< Using a type for a non-index-argument UniversalId will throw an exception.
 
+        UniversalId(Type type, const UniversalId& id);
+
         Class getClass() const;
 
         ArgumentType getArgumentType() const;
diff --git a/files/ui/filedialog.ui b/apps/opencs/ui/filedialog.ui
similarity index 100%
rename from files/ui/filedialog.ui
rename to apps/opencs/ui/filedialog.ui
diff --git a/apps/opencs/view/doc/adjusterwidget.cpp b/apps/opencs/view/doc/adjusterwidget.cpp
index d4cfdc6d3e..a282ebcaff 100644
--- a/apps/opencs/view/doc/adjusterwidget.cpp
+++ b/apps/opencs/view/doc/adjusterwidget.cpp
@@ -91,7 +91,7 @@ void CSVDoc::AdjusterWidget::setName(const QString& name, bool addon)
         {
             // path already points to the local data directory
             message = "Will be saved as: " + Files::pathToQString(path);
-            mResultPath = path;
+            mResultPath = std::move(path);
         }
         // in all other cases, ensure the path points to data-local and do an existing file check
         else
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 1b502c9d6c..455fda20c2 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -13,27 +13,32 @@
 #include "adjusterwidget.hpp"
 #include "filewidget.hpp"
 
+#include "ui_filedialog.h"
+
 CSVDoc::FileDialog::FileDialog(QWidget* parent)
     : QDialog(parent)
     , mSelector(nullptr)
+    , ui(std::make_unique<Ui::FileDialog>())
     , mAction(ContentAction_Undefined)
     , mFileWidget(nullptr)
     , mAdjusterWidget(nullptr)
     , mDialogBuilt(false)
 {
-    ui.setupUi(this);
+    ui->setupUi(this);
     resize(400, 400);
 
     setObjectName("FileDialog");
-    mSelector = new ContentSelectorView::ContentSelector(ui.contentSelectorWidget, /*showOMWScripts=*/false);
+    mSelector = new ContentSelectorView::ContentSelector(ui->contentSelectorWidget, /*showOMWScripts=*/false);
     mAdjusterWidget = new AdjusterWidget(this);
 }
 
+CSVDoc::FileDialog::~FileDialog() = default;
+
 void CSVDoc::FileDialog::addFiles(const std::vector<std::filesystem::path>& dataDirs)
 {
-    for (auto iter = dataDirs.rbegin(); iter != dataDirs.rend(); ++iter)
+    for (const auto& dir : dataDirs)
     {
-        QString path = Files::pathToQString(*iter);
+        QString path = Files::pathToQString(dir);
         mSelector->addFiles(path);
     }
     mSelector->sortFiles();
@@ -68,7 +73,7 @@ void CSVDoc::FileDialog::showDialog(ContentAction action)
 {
     mAction = action;
 
-    ui.projectGroupBoxLayout->insertWidget(0, mAdjusterWidget);
+    ui->projectGroupBoxLayout->insertWidget(0, mAdjusterWidget);
 
     switch (mAction)
     {
@@ -92,7 +97,7 @@ void CSVDoc::FileDialog::showDialog(ContentAction action)
         connect(mSelector, &ContentSelectorView::ContentSelector::signalCurrentGamefileIndexChanged, this,
             qOverload<int>(&FileDialog::slotUpdateAcceptButton));
 
-        connect(ui.projectButtonBox, &QDialogButtonBox::rejected, this, &FileDialog::slotRejected);
+        connect(ui->projectButtonBox, &QDialogButtonBox::rejected, this, &FileDialog::slotRejected);
         mDialogBuilt = true;
     }
 
@@ -105,7 +110,7 @@ void CSVDoc::FileDialog::buildNewFileView()
 {
     setWindowTitle(tr("Create a new addon"));
 
-    QPushButton* createButton = ui.projectButtonBox->button(QDialogButtonBox::Ok);
+    QPushButton* createButton = ui->projectButtonBox->button(QDialogButtonBox::Ok);
     createButton->setText("Create");
     createButton->setEnabled(false);
 
@@ -122,27 +127,27 @@ void CSVDoc::FileDialog::buildNewFileView()
             qOverload<const QString&, bool>(&FileDialog::slotUpdateAcceptButton));
     }
 
-    ui.projectGroupBoxLayout->insertWidget(0, mFileWidget);
+    ui->projectGroupBoxLayout->insertWidget(0, mFileWidget);
 
-    connect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
+    connect(ui->projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
 }
 
 void CSVDoc::FileDialog::buildOpenFileView()
 {
     setWindowTitle(tr("Open"));
-    ui.projectGroupBox->setTitle(QString(""));
-    ui.projectButtonBox->button(QDialogButtonBox::Ok)->setText("Open");
+    ui->projectGroupBox->setTitle(QString(""));
+    ui->projectButtonBox->button(QDialogButtonBox::Ok)->setText("Open");
     if (mSelector->isGamefileSelected())
-        ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+        ui->projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
     else
-        ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+        ui->projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
     if (!mDialogBuilt)
     {
         connect(mSelector, &ContentSelectorView::ContentSelector::signalAddonDataChanged, this,
             &FileDialog::slotAddonDataChanged);
     }
-    connect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
+    connect(ui->projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
 }
 
 void CSVDoc::FileDialog::slotAddonDataChanged(const QModelIndex& topleft, const QModelIndex& bottomright)
@@ -176,7 +181,7 @@ void CSVDoc::FileDialog::slotUpdateAcceptButton(const QString& name, bool)
     else
         mAdjusterWidget->setName("", true);
 
-    ui.projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(success);
+    ui->projectButtonBox->button(QDialogButtonBox::Ok)->setEnabled(success);
 }
 
 QString CSVDoc::FileDialog::filename() const
@@ -190,8 +195,8 @@ QString CSVDoc::FileDialog::filename() const
 void CSVDoc::FileDialog::slotRejected()
 {
     emit rejected();
-    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
-    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
+    disconnect(ui->projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
+    disconnect(ui->projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
     if (mFileWidget)
     {
         delete mFileWidget;
@@ -208,7 +213,7 @@ void CSVDoc::FileDialog::slotNewFile()
         delete mFileWidget;
         mFileWidget = nullptr;
     }
-    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
+    disconnect(ui->projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotNewFile);
     close();
 }
 
@@ -219,6 +224,6 @@ void CSVDoc::FileDialog::slotOpenFile()
     mAdjusterWidget->setName(file->filePath(), !file->isGameFile());
 
     emit signalOpenFiles(mAdjusterWidget->getPath());
-    disconnect(ui.projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
+    disconnect(ui->projectButtonBox, &QDialogButtonBox::accepted, this, &FileDialog::slotOpenFile);
     close();
 }
diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index d660f22f75..a8a73439c7 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -14,8 +14,6 @@ Q_DECLARE_METATYPE(std::filesystem::path)
 
 #endif
 
-#include "ui_filedialog.h"
-
 #include <filesystem>
 #include <vector>
 
@@ -26,6 +24,11 @@ namespace ContentSelectorView
     class ContentSelector;
 }
 
+namespace Ui
+{
+    class FileDialog;
+}
+
 namespace CSVDoc
 {
     class FileWidget;
@@ -36,7 +39,7 @@ namespace CSVDoc
 
     private:
         ContentSelectorView::ContentSelector* mSelector;
-        Ui::FileDialog ui;
+        std::unique_ptr<Ui::FileDialog> ui;
         ContentAction mAction;
         FileWidget* mFileWidget;
         AdjusterWidget* mAdjusterWidget;
@@ -44,6 +47,9 @@ namespace CSVDoc
 
     public:
         explicit FileDialog(QWidget* parent = nullptr);
+
+        ~FileDialog();
+
         void showDialog(ContentAction action);
 
         void addFiles(const std::vector<std::filesystem::path>& dataDirs);
diff --git a/apps/opencs/view/doc/operation.cpp b/apps/opencs/view/doc/operation.cpp
index 4825f87ff3..571413af1b 100644
--- a/apps/opencs/view/doc/operation.cpp
+++ b/apps/opencs/view/doc/operation.cpp
@@ -13,21 +13,21 @@ void CSVDoc::Operation::updateLabel(int threads)
 {
     if (threads == -1 || ((threads == 0) != mStalling))
     {
-        std::string name("unknown operation");
+        std::string name("Unknown operation");
 
         switch (mType)
         {
             case CSMDoc::State_Saving:
-                name = "saving";
+                name = "Saving";
                 break;
             case CSMDoc::State_Verifying:
-                name = "verifying";
+                name = "Verifying";
                 break;
             case CSMDoc::State_Searching:
-                name = "searching";
+                name = "Searching";
                 break;
             case CSMDoc::State_Merging:
-                name = "merging";
+                name = "Merging";
                 break;
         }
 
@@ -70,6 +70,7 @@ void CSVDoc::Operation::initWidgets()
     mProgressBar = new QProgressBar();
     mAbortButton = new QPushButton("Abort");
     mLayout = new QHBoxLayout();
+    mLayout->setContentsMargins(8, 4, 8, 4);
 
     mLayout->addWidget(mProgressBar);
     mLayout->addWidget(mAbortButton);
@@ -94,17 +95,18 @@ void CSVDoc::Operation::setBarColor(int type)
     QString style
         = "QProgressBar {"
           "text-align: center;"
+          "border: 1px solid #4e4e4e;"
           "}"
           "QProgressBar::chunk {"
           "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 %1, stop:.50 %2 stop: .51 %3 stop:1 %4);"
           "text-align: center;"
-          "margin: 2px 1px 1p 2px;"
+          "margin: 2px;"
           "}";
 
-    QString topColor = "#F2F6F8";
-    QString bottomColor = "#E0EFF9";
-    QString midTopColor = "#D8E1E7";
-    QString midBottomColor = "#B5C6D0"; // default gray gloss
+    QString topColor = "#9e9e9e";
+    QString bottomColor = "#919191";
+    QString midTopColor = "#848484";
+    QString midBottomColor = "#717171"; // default gray
 
     // colors inspired by samples from:
     // http://www.colorzilla.com/gradient-editor/
@@ -113,42 +115,35 @@ void CSVDoc::Operation::setBarColor(int type)
     {
         case CSMDoc::State_Saving:
 
-            topColor = "#FECCB1";
-            midTopColor = "#F17432";
-            midBottomColor = "#EA5507";
-            bottomColor = "#FB955E"; // red gloss #2
+            topColor = "#f27d6e";
+            midTopColor = "#ee6954";
+            midBottomColor = "#f05536";
+            bottomColor = "#de511e"; // red
             break;
 
         case CSMDoc::State_Searching:
 
-            topColor = "#EBF1F6";
-            midTopColor = "#ABD3EE";
-            midBottomColor = "#89C3EB";
-            bottomColor = "#D5EBFB"; // blue gloss #4
+            topColor = "#6db3f2";
+            midTopColor = "#54a3ee";
+            midBottomColor = "#3690f0";
+            bottomColor = "#1e69de"; // blue
             break;
 
         case CSMDoc::State_Verifying:
 
-            topColor = "#BFD255";
-            midTopColor = "#8EB92A";
-            midBottomColor = "#72AA00";
-            bottomColor = "#9ECB2D"; // green gloss
+            topColor = "#bfd255";
+            midTopColor = "#8eb92a";
+            midBottomColor = "#72aa00";
+            bottomColor = "#9ecb2d"; // green
             break;
 
         case CSMDoc::State_Merging:
 
-            topColor = "#F3E2C7";
-            midTopColor = "#C19E67";
-            midBottomColor = "#B68D4C";
-            bottomColor = "#E9D4B3"; // l Brown 3D
+            topColor = "#d89188";
+            midTopColor = "#d07f72";
+            midBottomColor = "#cc6d5a";
+            bottomColor = "#b86344"; // brown
             break;
-
-        default:
-
-            topColor = "#F2F6F8";
-            bottomColor = "#E0EFF9";
-            midTopColor = "#D8E1E7";
-            midBottomColor = "#B5C6D0"; // gray gloss for undefined ops
     }
 
     mProgressBar->setStyleSheet(style.arg(topColor).arg(midTopColor).arg(midBottomColor).arg(bottomColor));
diff --git a/apps/opencs/view/doc/operations.cpp b/apps/opencs/view/doc/operations.cpp
index 4fe53d6297..97f47d621b 100644
--- a/apps/opencs/view/doc/operations.cpp
+++ b/apps/opencs/view/doc/operations.cpp
@@ -8,19 +8,24 @@
 
 #include "operation.hpp"
 
+namespace
+{
+    constexpr int operationLineHeight = 36;
+}
+
 CSVDoc::Operations::Operations()
 {
-    /// \todo make widget height fixed (exactly the height required to display all operations)
-
     setFeatures(QDockWidget::NoDockWidgetFeatures);
 
     QWidget* widgetContainer = new QWidget(this);
     mLayout = new QVBoxLayout;
+    mLayout->setContentsMargins(0, 0, 0, 0);
 
+    widgetContainer->setContentsMargins(0, 0, 0, 0);
     widgetContainer->setLayout(mLayout);
     setWidget(widgetContainer);
     setVisible(false);
-    setFixedHeight(widgetContainer->height());
+    setFixedHeight(operationLineHeight);
     setTitleBarWidget(new QWidget(this));
 }
 
@@ -33,9 +38,6 @@ void CSVDoc::Operations::setProgress(int current, int max, int type, int threads
             return;
         }
 
-    int oldCount = static_cast<int>(mOperations.size());
-    int newCount = oldCount + 1;
-
     Operation* operation = new Operation(type, this);
     connect(operation, qOverload<int>(&Operation::abortOperation), this, &Operations::abortOperation);
 
@@ -43,8 +45,8 @@ void CSVDoc::Operations::setProgress(int current, int max, int type, int threads
     mOperations.push_back(operation);
     operation->setProgress(current, max, threads);
 
-    if (oldCount > 0)
-        setFixedHeight(height() / oldCount * newCount);
+    int newCount = static_cast<int>(mOperations.size());
+    setFixedHeight(operationLineHeight * newCount);
 
     setVisible(true);
 }
@@ -54,16 +56,14 @@ void CSVDoc::Operations::quitOperation(int type)
     for (std::vector<Operation*>::iterator iter(mOperations.begin()); iter != mOperations.end(); ++iter)
         if ((*iter)->getType() == type)
         {
-            int oldCount = static_cast<int>(mOperations.size());
-            int newCount = oldCount - 1;
-
             mLayout->removeItem((*iter)->getLayout());
 
             (*iter)->deleteLater();
             mOperations.erase(iter);
 
-            if (oldCount > 1)
-                setFixedHeight(height() / oldCount * newCount);
+            int newCount = static_cast<int>(mOperations.size());
+            if (newCount > 0)
+                setFixedHeight(operationLineHeight * newCount);
             else
                 setVisible(false);
 
diff --git a/apps/opencs/view/doc/startup.cpp b/apps/opencs/view/doc/startup.cpp
index 27463b0456..c6e109355f 100644
--- a/apps/opencs/view/doc/startup.cpp
+++ b/apps/opencs/view/doc/startup.cpp
@@ -1,5 +1,7 @@
 #include "startup.hpp"
 
+#include <components/misc/scalableicon.hpp>
+
 #include <QGridLayout>
 #include <QGuiApplication>
 #include <QHBoxLayout>
@@ -10,13 +12,13 @@
 #include <QScreen>
 #include <QVBoxLayout>
 
-QPushButton* CSVDoc::StartupDialogue::addButton(const QString& label, const QIcon& icon)
+QPushButton* CSVDoc::StartupDialogue::addButton(const QString& label, const QString& icon)
 {
     int column = mColumn--;
 
     QPushButton* button = new QPushButton(this);
 
-    button->setIcon(QIcon(icon));
+    button->setIcon(Misc::ScalableIcon::load(icon));
 
     button->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
 
@@ -39,13 +41,13 @@ QWidget* CSVDoc::StartupDialogue::createButtons()
     mLayout = new QGridLayout(widget);
 
     /// \todo add icons
-    QPushButton* loadDocument = addButton("Edit A Content File", QIcon(":startup/edit-content"));
+    QPushButton* loadDocument = addButton("Edit A Content File", ":startup/edit-content");
     connect(loadDocument, &QPushButton::clicked, this, &StartupDialogue::loadDocument);
 
-    QPushButton* createAddon = addButton("Create A New Addon", QIcon(":startup/create-addon"));
+    QPushButton* createAddon = addButton("Create A New Addon", ":startup/create-addon");
     connect(createAddon, &QPushButton::clicked, this, &StartupDialogue::createAddon);
 
-    QPushButton* createGame = addButton("Create A New Game", QIcon(":startup/create-game"));
+    QPushButton* createGame = addButton("Create A New Game", ":startup/create-game");
     connect(createGame, &QPushButton::clicked, this, &StartupDialogue::createGame);
 
     for (int i = 0; i < 3; ++i)
@@ -78,7 +80,7 @@ QWidget* CSVDoc::StartupDialogue::createTools()
     QPushButton* config = new QPushButton(widget);
 
     config->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-    config->setIcon(QIcon(":startup/configure"));
+    config->setIcon(Misc::ScalableIcon::load(":startup/configure"));
     config->setToolTip("Open user settings");
 
     layout->addWidget(config);
diff --git a/apps/opencs/view/doc/startup.hpp b/apps/opencs/view/doc/startup.hpp
index 061b91b2d1..f2cccfcd38 100644
--- a/apps/opencs/view/doc/startup.hpp
+++ b/apps/opencs/view/doc/startup.hpp
@@ -20,7 +20,7 @@ namespace CSVDoc
         int mColumn;
         QGridLayout* mLayout;
 
-        QPushButton* addButton(const QString& label, const QIcon& icon);
+        QPushButton* addButton(const QString& label, const QString& icon);
 
         QWidget* createButtons();
 
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 08db4efa5e..7ee8092df6 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -36,6 +36,8 @@
 
 #include <components/files/conversion.hpp>
 #include <components/misc/helpviewer.hpp>
+#include <components/misc/scalableicon.hpp>
+#include <components/misc/strings/format.hpp>
 #include <components/misc/timeconvert.hpp>
 #include <components/version/version.hpp>
 
@@ -71,30 +73,30 @@ void CSVDoc::View::setupFileMenu()
 {
     QMenu* file = menuBar()->addMenu(tr("File"));
 
-    QAction* newGame = createMenuEntry("New Game", ":./menu-new-game.png", file, "document-file-newgame");
+    QAction* newGame = createMenuEntry("New Game", ":menu-new-game", file, "document-file-newgame");
     connect(newGame, &QAction::triggered, this, &View::newGameRequest);
 
-    QAction* newAddon = createMenuEntry("New Addon", ":./menu-new-addon.png", file, "document-file-newaddon");
+    QAction* newAddon = createMenuEntry("New Addon", ":menu-new-addon", file, "document-file-newaddon");
     connect(newAddon, &QAction::triggered, this, &View::newAddonRequest);
 
-    QAction* open = createMenuEntry("Open", ":./menu-open.png", file, "document-file-open");
+    QAction* open = createMenuEntry("Open", ":menu-open", file, "document-file-open");
     connect(open, &QAction::triggered, this, &View::loadDocumentRequest);
 
-    QAction* save = createMenuEntry("Save", ":./menu-save.png", file, "document-file-save");
+    QAction* save = createMenuEntry("Save", ":menu-save", file, "document-file-save");
     connect(save, &QAction::triggered, this, &View::save);
     mSave = save;
 
     file->addSeparator();
 
-    QAction* verify = createMenuEntry("Verify", ":./menu-verify.png", file, "document-file-verify");
+    QAction* verify = createMenuEntry("Verify", ":menu-verify", file, "document-file-verify");
     connect(verify, &QAction::triggered, this, &View::verify);
     mVerify = verify;
 
-    QAction* merge = createMenuEntry("Merge", ":./menu-merge.png", file, "document-file-merge");
+    QAction* merge = createMenuEntry("Merge", ":menu-merge", file, "document-file-merge");
     connect(merge, &QAction::triggered, this, &View::merge);
     mMerge = merge;
 
-    QAction* loadErrors = createMenuEntry("Error Log", ":./error-log.png", file, "document-file-errorlog");
+    QAction* loadErrors = createMenuEntry("Error Log", ":error-log", file, "document-file-errorlog");
     connect(loadErrors, &QAction::triggered, this, &View::loadErrorLog);
 
     QAction* meta = createMenuEntry(CSMWorld::UniversalId::Type_MetaDatas, file, "document-file-metadata");
@@ -102,10 +104,10 @@ void CSVDoc::View::setupFileMenu()
 
     file->addSeparator();
 
-    QAction* close = createMenuEntry("Close", ":./menu-close.png", file, "document-file-close");
+    QAction* close = createMenuEntry("Close", ":menu-close", file, "document-file-close");
     connect(close, &QAction::triggered, this, &View::close);
 
-    QAction* exit = createMenuEntry("Exit", ":./menu-exit.png", file, "document-file-exit");
+    QAction* exit = createMenuEntry("Exit", ":menu-exit", file, "document-file-exit");
     connect(exit, &QAction::triggered, this, &View::exit);
 
     connect(this, &View::exitApplicationRequest, &mViewManager, &ViewManager::exitApplication);
@@ -140,17 +142,16 @@ void CSVDoc::View::setupEditMenu()
     mUndo = mDocument->getUndoStack().createUndoAction(this, tr("Undo"));
     setupShortcut("document-edit-undo", mUndo);
     connect(mUndo, &QAction::changed, this, &View::undoActionChanged);
-    mUndo->setIcon(QIcon(QString::fromStdString(":./menu-undo.png")));
+    mUndo->setIcon(Misc::ScalableIcon::load(":menu-undo"));
     edit->addAction(mUndo);
 
     mRedo = mDocument->getUndoStack().createRedoAction(this, tr("Redo"));
     connect(mRedo, &QAction::changed, this, &View::redoActionChanged);
     setupShortcut("document-edit-redo", mRedo);
-    mRedo->setIcon(QIcon(QString::fromStdString(":./menu-redo.png")));
+    mRedo->setIcon(Misc::ScalableIcon::load(":menu-redo"));
     edit->addAction(mRedo);
 
-    QAction* userSettings
-        = createMenuEntry("Preferences", ":./menu-preferences.png", edit, "document-edit-preferences");
+    QAction* userSettings = createMenuEntry("Preferences", ":menu-preferences", edit, "document-edit-preferences");
     connect(userSettings, &QAction::triggered, this, &View::editSettingsRequest);
 
     QAction* search = createMenuEntry(CSMWorld::UniversalId::Type_Search, edit, "document-edit-search");
@@ -161,10 +162,10 @@ void CSVDoc::View::setupViewMenu()
 {
     QMenu* view = menuBar()->addMenu(tr("View"));
 
-    QAction* newWindow = createMenuEntry("New View", ":./menu-new-window.png", view, "document-view-newview");
+    QAction* newWindow = createMenuEntry("New View", ":menu-new-window", view, "document-view-newview");
     connect(newWindow, &QAction::triggered, this, &View::newView);
 
-    mShowStatusBar = createMenuEntry("Toggle Status Bar", ":./menu-status-bar.png", view, "document-view-statusbar");
+    mShowStatusBar = createMenuEntry("Toggle Status Bar", ":menu-status-bar", view, "document-view-statusbar");
     connect(mShowStatusBar, &QAction::toggled, this, &View::toggleShowStatusBar);
     mShowStatusBar->setCheckable(true);
     mShowStatusBar->setChecked(CSMPrefs::get()["Windows"]["show-statusbar"].isTrue());
@@ -289,7 +290,7 @@ void CSVDoc::View::setupAssetsMenu()
 {
     QMenu* assets = menuBar()->addMenu(tr("Assets"));
 
-    QAction* reload = createMenuEntry("Reload", ":./menu-reload.png", assets, "document-assets-reload");
+    QAction* reload = createMenuEntry("Reload", ":menu-reload", assets, "document-assets-reload");
     connect(reload, &QAction::triggered, &mDocument->getData(), &CSMWorld::Data::assetsChanged);
 
     assets->addSeparator();
@@ -341,9 +342,9 @@ void CSVDoc::View::setupDebugMenu()
     QAction* runDebug = debug->addMenu(mGlobalDebugProfileMenu);
     runDebug->setText(tr("Run OpenMW"));
     setupShortcut("document-debug-run", runDebug);
-    runDebug->setIcon(QIcon(QString::fromStdString(":./run-openmw.png")));
+    runDebug->setIcon(Misc::ScalableIcon::load(":run-openmw"));
 
-    QAction* stopDebug = createMenuEntry("Stop OpenMW", ":./stop-openmw.png", debug, "document-debug-shutdown");
+    QAction* stopDebug = createMenuEntry("Stop OpenMW", ":stop-openmw", debug, "document-debug-shutdown");
     connect(stopDebug, &QAction::triggered, this, &View::stop);
     mStopDebug = stopDebug;
 
@@ -355,16 +356,16 @@ void CSVDoc::View::setupHelpMenu()
 {
     QMenu* help = menuBar()->addMenu(tr("Help"));
 
-    QAction* helpInfo = createMenuEntry("Help", ":/info.png", help, "document-help-help");
+    QAction* helpInfo = createMenuEntry("Help", ":info", help, "document-help-help");
     connect(helpInfo, &QAction::triggered, this, &View::openHelp);
 
-    QAction* tutorial = createMenuEntry("Tutorial", ":/info.png", help, "document-help-tutorial");
+    QAction* tutorial = createMenuEntry("Tutorial", ":info", help, "document-help-tutorial");
     connect(tutorial, &QAction::triggered, this, &View::tutorial);
 
-    QAction* about = createMenuEntry("About OpenMW-CS", ":./info.png", help, "document-help-about");
+    QAction* about = createMenuEntry("About OpenMW-CS", ":info", help, "document-help-about");
     connect(about, &QAction::triggered, this, &View::infoAbout);
 
-    QAction* aboutQt = createMenuEntry("About Qt", ":./qt.png", help, "document-help-qt");
+    QAction* aboutQt = createMenuEntry("About Qt", ":qt", help, "document-help-qt");
     connect(aboutQt, &QAction::triggered, this, &View::infoAboutQt);
 }
 
@@ -375,7 +376,7 @@ QAction* CSVDoc::View::createMenuEntry(CSMWorld::UniversalId::Type type, QMenu*
     setupShortcut(shortcutName, entry);
     const std::string iconName = CSMWorld::UniversalId(type).getIcon();
     if (!iconName.empty() && iconName != ":placeholder")
-        entry->setIcon(QIcon(QString::fromStdString(iconName)));
+        entry->setIcon(Misc::ScalableIcon::load(QString::fromStdString(iconName)));
 
     menu->addAction(entry);
 
@@ -388,7 +389,7 @@ QAction* CSVDoc::View::createMenuEntry(
     QAction* entry = new QAction(QString::fromStdString(title), this);
     setupShortcut(shortcutName, entry);
     if (!iconName.empty() && iconName != ":placeholder")
-        entry->setIcon(QIcon(QString::fromStdString(iconName)));
+        entry->setIcon(Misc::ScalableIcon::load(QString::fromStdString(iconName)));
 
     menu->addAction(entry);
 
@@ -629,7 +630,7 @@ void CSVDoc::View::addSubView(const CSMWorld::UniversalId& id, const std::string
     if (isReferenceable)
     {
         view = mSubViewFactory.makeSubView(
-            CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Referenceable, id.getId()), *mDocument);
+            CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Referenceable, id), *mDocument);
     }
     else
     {
@@ -774,7 +775,7 @@ void CSVDoc::View::tutorial()
 void CSVDoc::View::infoAbout()
 {
     // Get current OpenMW version
-    QString versionInfo = (Version::getOpenmwVersionDescription(mDocument->getResourceDir()) +
+    QString versionInfo = (Version::getOpenmwVersionDescription() +
 #if defined(__x86_64__) || defined(_M_X64)
         " (64-bit)")
                               .c_str();
@@ -1111,7 +1112,10 @@ void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
 {
     QRect rect;
     if (isGrowLimit)
-        rect = QApplication::screenAt(pos())->geometry();
+    {
+        QScreen* screen = getWidgetScreen(pos());
+        rect = screen->geometry();
+    }
     else
         rect = desktopRect();
 
@@ -1156,3 +1160,27 @@ void CSVDoc::View::onRequestFocus(const std::string& id)
         addSubView(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Reference, id));
     }
 }
+
+QScreen* CSVDoc::View::getWidgetScreen(const QPoint& position)
+{
+    QScreen* screen = QApplication::screenAt(position);
+    if (screen == nullptr)
+    {
+        QPoint clampedPosition = position;
+
+        // If we failed to find the screen,
+        // clamp negative positions and try again
+        if (clampedPosition.x() <= 0)
+            clampedPosition.setX(0);
+        if (clampedPosition.y() <= 0)
+            clampedPosition.setY(0);
+
+        screen = QApplication::screenAt(clampedPosition);
+    }
+
+    if (screen == nullptr)
+        throw std::runtime_error(
+            Misc::StringUtils::format("Can not detect the screen for position [%d, %d]", position.x(), position.y()));
+
+    return screen;
+}
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 165cb0da8e..bdf051a80b 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -108,6 +108,8 @@ namespace CSVDoc
         View& operator=(const View&) = delete;
         ~View() override = default;
 
+        static QScreen* getWidgetScreen(const QPoint& position);
+
         const CSMDoc::Document* getDocument() const;
 
         CSMDoc::Document* getDocument();
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index dff4426ba5..812a1bd534 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -410,7 +410,7 @@ bool CSVDoc::ViewManager::removeDocument(CSVDoc::View* view)
                 remainingViews.push_back(*iter);
         }
         mDocumentManager.removeDocument(document);
-        mViews = remainingViews;
+        mViews = std::move(remainingViews);
     }
     return true;
 }
diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index 50735bf703..8076e99e63 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -18,6 +18,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/helpviewer.hpp>
+#include <components/misc/scalableicon.hpp>
 
 #include "../../model/prefs/shortcut.hpp"
 #include "../../model/world/columns.hpp"
@@ -44,7 +45,7 @@ CSVFilter::EditWidget::EditWidget(CSMWorld::Data& data, QWidget* parent)
 
     mHelpAction = new QAction(tr("Help"), this);
     connect(mHelpAction, &QAction::triggered, this, &EditWidget::openHelp);
-    mHelpAction->setIcon(QIcon(":/info.png"));
+    mHelpAction->setIcon(Misc::ScalableIcon::load(":info"));
     addAction(mHelpAction);
     auto* openHelpShortcut = new CSMPrefs::Shortcut("help", this);
     openHelpShortcut->associateAction(mHelpAction);
diff --git a/apps/opencs/view/prefs/keybindingpage.cpp b/apps/opencs/view/prefs/keybindingpage.cpp
index d3cc1ff889..f292fa4cf5 100644
--- a/apps/opencs/view/prefs/keybindingpage.cpp
+++ b/apps/opencs/view/prefs/keybindingpage.cpp
@@ -7,6 +7,7 @@
 
 #include <QComboBox>
 #include <QGridLayout>
+#include <QLabel>
 #include <QPushButton>
 #include <QStackedLayout>
 #include <QVBoxLayout>
@@ -61,46 +62,35 @@ namespace CSVPrefs
 
     void KeyBindingPage::addSetting(CSMPrefs::Setting* setting)
     {
-        std::pair<QWidget*, QWidget*> widgets = setting->makeWidgets(this);
+        const CSMPrefs::SettingWidgets widgets = setting->makeWidgets(this);
 
-        if (widgets.first)
+        if (widgets.mLabel != nullptr && widgets.mInput != nullptr)
         {
             // Label, Option widgets
             assert(mPageLayout);
 
             int next = mPageLayout->rowCount();
-            mPageLayout->addWidget(widgets.first, next, 0);
-            mPageLayout->addWidget(widgets.second, next, 1);
+            mPageLayout->addWidget(widgets.mLabel, next, 0);
+            mPageLayout->addWidget(widgets.mInput, next, 1);
         }
-        else if (widgets.second)
+        else if (widgets.mInput != nullptr)
         {
             // Wide single widget
             assert(mPageLayout);
 
             int next = mPageLayout->rowCount();
-            mPageLayout->addWidget(widgets.second, next, 0, 1, 2);
+            mPageLayout->addWidget(widgets.mInput, next, 0, 1, 2);
         }
         else
         {
-            if (setting->getLabel().empty())
-            {
-                // Insert empty space
-                assert(mPageLayout);
+            // Create new page
+            QWidget* pageWidget = new QWidget();
+            mPageLayout = new QGridLayout(pageWidget);
+            mPageLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
 
-                int next = mPageLayout->rowCount();
-                mPageLayout->addWidget(new QWidget(), next, 0);
-            }
-            else
-            {
-                // Create new page
-                QWidget* pageWidget = new QWidget();
-                mPageLayout = new QGridLayout(pageWidget);
-                mPageLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+            mStackedLayout->addWidget(pageWidget);
 
-                mStackedLayout->addWidget(pageWidget);
-
-                mPageSelector->addItem(QString::fromUtf8(setting->getLabel().c_str()));
-            }
+            mPageSelector->addItem(setting->getLabel());
         }
     }
 
diff --git a/apps/opencs/view/prefs/page.cpp b/apps/opencs/view/prefs/page.cpp
index 4f04a39f00..cc74122782 100644
--- a/apps/opencs/view/prefs/page.cpp
+++ b/apps/opencs/view/prefs/page.cpp
@@ -6,6 +6,7 @@
 #include <apps/opencs/view/prefs/pagebase.hpp>
 
 #include <QGridLayout>
+#include <QLabel>
 
 #include "../../model/prefs/category.hpp"
 #include "../../model/prefs/setting.hpp"
@@ -24,21 +25,17 @@ CSVPrefs::Page::Page(CSMPrefs::Category& category, QWidget* parent)
 
 void CSVPrefs::Page::addSetting(CSMPrefs::Setting* setting)
 {
-    std::pair<QWidget*, QWidget*> widgets = setting->makeWidgets(this);
+    const CSMPrefs::SettingWidgets widgets = setting->makeWidgets(this);
 
     int next = mGrid->rowCount();
 
-    if (widgets.first)
+    if (widgets.mLabel != nullptr && widgets.mInput != nullptr)
     {
-        mGrid->addWidget(widgets.first, next, 0);
-        mGrid->addWidget(widgets.second, next, 1);
+        mGrid->addWidget(widgets.mLabel, next, 0);
+        mGrid->addWidget(widgets.mInput, next, 1);
     }
-    else if (widgets.second)
+    else if (widgets.mInput != nullptr)
     {
-        mGrid->addWidget(widgets.second, next, 0, 1, 2);
-    }
-    else
-    {
-        mGrid->addWidget(new QWidget(this), next, 0);
+        mGrid->addWidget(widgets.mInput, next, 0, 1, 2);
     }
 }
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index d1bfac0ec6..43ac25461e 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -7,6 +7,7 @@
 #include <osg/Group>
 #include <osg/MatrixTransform>
 #include <osg/Node>
+#include <osg/Vec3d>
 
 #include <apps/opencs/model/world/actoradapter.hpp>
 #include <apps/opencs/model/world/idcollection.hpp>
@@ -29,7 +30,7 @@ namespace CSVRender
     Actor::Actor(const ESM::RefId& id, CSMWorld::Data& data)
         : mId(id)
         , mData(data)
-        , mBaseNode(new osg::Group())
+        , mBaseNode(new osg::PositionAttitudeTransform())
         , mSkeleton(nullptr)
     {
         mActorData = mData.getActorAdapter()->getActorData(mId);
@@ -46,7 +47,7 @@ namespace CSVRender
         mBaseNode->removeChildren(0, mBaseNode->getNumChildren());
 
         // Load skeleton
-        std::string skeletonModel = mActorData->getSkeleton();
+        VFS::Path::Normalized skeletonModel = mActorData->getSkeleton();
         skeletonModel
             = Misc::ResourceHelpers::correctActorModelPath(skeletonModel, mData.getResourceSystem()->getVFS());
         loadSkeleton(skeletonModel);
@@ -60,6 +61,10 @@ namespace CSVRender
 
             // Attach parts to skeleton
             loadBodyParts();
+
+            const osg::Vec2f& attributes = mActorData->getRaceWeightHeight();
+
+            mBaseNode->setScale(osg::Vec3d(attributes.x(), attributes.x(), attributes.y()));
         }
         else
         {
@@ -85,7 +90,7 @@ namespace CSVRender
     {
         auto sceneMgr = mData.getResourceSystem()->getSceneManager();
 
-        osg::ref_ptr<osg::Node> temp = sceneMgr->getInstance(model);
+        osg::ref_ptr<osg::Node> temp = sceneMgr->getInstance(VFS::Path::toNormalized(model));
         mSkeleton = dynamic_cast<SceneUtil::Skeleton*>(temp.get());
         if (!mSkeleton)
         {
@@ -118,7 +123,7 @@ namespace CSVRender
         auto node = mNodeMap.find(boneName);
         if (!mesh.empty() && node != mNodeMap.end())
         {
-            auto instance = sceneMgr->getInstance(mesh);
+            auto instance = sceneMgr->getInstance(VFS::Path::toNormalized(mesh));
             SceneUtil::attach(instance, mSkeleton, boneName, node->second, sceneMgr);
         }
     }
diff --git a/apps/opencs/view/render/actor.hpp b/apps/opencs/view/render/actor.hpp
index 86c7e7ff2d..09d896e7e7 100644
--- a/apps/opencs/view/render/actor.hpp
+++ b/apps/opencs/view/render/actor.hpp
@@ -5,6 +5,7 @@
 #include <string_view>
 
 #include <osg/Group>
+#include <osg/PositionAttitudeTransform>
 #include <osg/ref_ptr>
 
 #include <QObject>
@@ -59,9 +60,9 @@ namespace CSVRender
         CSMWorld::Data& mData;
         CSMWorld::ActorAdapter::ActorDataPtr mActorData;
 
-        osg::ref_ptr<osg::Group> mBaseNode;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
         SceneUtil::Skeleton* mSkeleton;
-        SceneUtil::NodeMapVisitor::NodeMap mNodeMap;
+        SceneUtil::NodeMap mNodeMap;
     };
 }
 
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 6238b40e72..3d3b82acf8 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -16,6 +16,7 @@
 #include <components/misc/strings/lower.hpp>
 #include <components/terrain/terraingrid.hpp>
 
+#include "../../model/doc/document.hpp"
 #include "../../model/world/idtable.hpp"
 
 #include "cellarrow.hpp"
@@ -31,6 +32,7 @@
 #include <apps/opencs/model/world/cell.hpp>
 #include <apps/opencs/model/world/cellcoordinates.hpp>
 #include <apps/opencs/model/world/columns.hpp>
+#include <apps/opencs/model/world/commands.hpp>
 #include <apps/opencs/model/world/data.hpp>
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/land.hpp>
@@ -130,39 +132,31 @@ void CSVRender::Cell::updateLand()
         return;
     }
 
-    // Setup land if available
     const CSMWorld::IdCollection<CSMWorld::Land>& land = mData.getLand();
-    int landIndex = land.searchId(mId);
-    if (landIndex != -1 && !land.getRecord(mId).isDeleted())
+
+    if (land.getRecord(mId).isDeleted())
+        return;
+
+    const ESM::Land& esmLand = land.getRecord(mId).get();
+
+    if (mTerrain)
     {
-        const ESM::Land& esmLand = land.getRecord(mId).get();
-
-        if (esmLand.getLandData(ESM::Land::DATA_VHGT))
-        {
-            if (mTerrain)
-            {
-                mTerrain->unloadCell(mCoordinates.getX(), mCoordinates.getY());
-                mTerrain->clearAssociatedCaches();
-            }
-            else
-            {
-                mTerrain = std::make_unique<Terrain::TerrainGrid>(mCellNode, mCellNode, mData.getResourceSystem().get(),
-                    mTerrainStorage, Mask_Terrain, ESM::Cell::sDefaultWorldspaceId);
-            }
-
-            mTerrain->loadCell(esmLand.mX, esmLand.mY);
-
-            if (!mCellBorder)
-                mCellBorder = std::make_unique<CellBorder>(mCellNode, mCoordinates);
-
-            mCellBorder->buildShape(esmLand);
-
-            return;
-        }
+        mTerrain->unloadCell(mCoordinates.getX(), mCoordinates.getY());
+        mTerrain->clearAssociatedCaches();
+    }
+    else
+    {
+        constexpr double expiryDelay = 0;
+        mTerrain = std::make_unique<Terrain::TerrainGrid>(mCellNode, mCellNode, mData.getResourceSystem().get(),
+            mTerrainStorage, Mask_Terrain, ESM::Cell::sDefaultWorldspaceId, expiryDelay);
     }
 
-    // No land data
-    unloadLand();
+    mTerrain->loadCell(esmLand.mX, esmLand.mY);
+
+    if (!mCellBorder)
+        mCellBorder = std::make_unique<CellBorder>(mCellNode, mCoordinates);
+
+    mCellBorder->buildShape(esmLand);
 }
 
 void CSVRender::Cell::unloadLand()
@@ -174,13 +168,14 @@ void CSVRender::Cell::unloadLand()
         mCellBorder.reset();
 }
 
-CSVRender::Cell::Cell(CSMWorld::Data& data, osg::Group* rootNode, const std::string& id, bool deleted)
-    : mData(data)
+CSVRender::Cell::Cell(
+    CSMDoc::Document& document, osg::Group* rootNode, const std::string& id, bool deleted, bool isExterior)
+    : mData(document.getData())
     , mId(ESM::RefId::stringRefId(id))
     , mDeleted(deleted)
     , mSubMode(0)
     , mSubModeElementMask(0)
-    , mUpdateLand(true)
+    , mUpdateLand(isExterior)
     , mLandDeleted(false)
 {
     std::pair<CSMWorld::CellCoordinates, bool> result = CSMWorld::CellCoordinates::fromId(id);
@@ -206,7 +201,17 @@ CSVRender::Cell::Cell(CSMWorld::Data& data, osg::Group* rootNode, const std::str
 
         addObjects(0, rows - 1);
 
-        updateLand();
+        if (mUpdateLand)
+        {
+            int landIndex = document.getData().getLand().searchId(mId);
+            if (landIndex == -1)
+            {
+                CSMWorld::IdTable& landTable
+                    = dynamic_cast<CSMWorld::IdTable&>(*mData.getTableModel(CSMWorld::UniversalId::Type_Land));
+                document.getUndoStack().push(new CSMWorld::CreateCommand(landTable, mId.getRefIdString()));
+            }
+            updateLand();
+        }
 
         mPathgrid = std::make_unique<Pathgrid>(mData, mCellNode, mId.getRefIdString(), mCoordinates);
         mCellWater = std::make_unique<CellWater>(mData, mCellNode, mId.getRefIdString(), mCoordinates);
@@ -611,6 +616,30 @@ osg::ref_ptr<CSVRender::TagBase> CSVRender::Cell::getSnapTarget(unsigned int ele
     return result;
 }
 
+void CSVRender::Cell::selectFromGroup(const std::vector<std::string>& group)
+{
+    for (const auto& [_, object] : mObjects)
+    {
+        for (const auto& objectName : group)
+        {
+            if (objectName == object->getReferenceId())
+            {
+                object->setSelected(true, osg::Vec4f(1, 0, 1, 1));
+            }
+        }
+    }
+}
+
+void CSVRender::Cell::unhideAll()
+{
+    for (const auto& [_, object] : mObjects)
+    {
+        osg::ref_ptr<osg::Group> rootNode = object->getRootNode();
+        if (rootNode->getNodeMask() == Mask_Hidden)
+            rootNode->setNodeMask(Mask_Reference);
+    }
+}
+
 std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::Cell::getSelection(unsigned int elementMask) const
 {
     std::vector<osg::ref_ptr<TagBase>> result;
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index cf50604c29..5ec8d87c33 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -9,6 +9,7 @@
 #include <osg/Vec3d>
 #include <osg/ref_ptr>
 
+#include "../../model/doc/document.hpp"
 #include "../../model/world/cellcoordinates.hpp"
 #include "instancedragmodes.hpp"
 #include <components/esm/refid.hpp>
@@ -89,7 +90,8 @@ namespace CSVRender
     public:
         /// \note Deleted covers both cells that are deleted and cells that don't exist in
         /// the first place.
-        Cell(CSMWorld::Data& data, osg::Group* rootNode, const std::string& id, bool deleted = false);
+        Cell(CSMDoc::Document& document, osg::Group* rootNode, const std::string& id, bool deleted = false,
+            bool isExterior = false);
 
         ~Cell();
 
@@ -148,6 +150,10 @@ namespace CSVRender
         // already selected
         void selectAllWithSameParentId(int elementMask);
 
+        void selectFromGroup(const std::vector<std::string>& group);
+
+        void unhideAll();
+
         void handleSelectDrag(Object* object, DragMode dragMode);
 
         void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode);
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index f63814dcb7..704db13e89 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -47,9 +47,6 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
 {
     const ESM::Land::LandData* landData = esmLand.getLandData(ESM::Land::DATA_VHGT);
 
-    if (!landData)
-        return;
-
     mBaseNode->removeChild(mBorderGeometry);
     mBorderGeometry = new osg::Geometry();
 
@@ -62,20 +59,40 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
         Traverse the cell border counter-clockwise starting at the SW corner vertex (0, 0).
         Each loop starts at a corner vertex and ends right before the next corner vertex.
     */
-    for (; x < ESM::Land::LAND_SIZE - 1; ++x)
-        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+    if (landData)
+    {
+        for (; x < ESM::Land::LAND_SIZE - 1; ++x)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
-    x = ESM::Land::LAND_SIZE - 1;
-    for (; y < ESM::Land::LAND_SIZE - 1; ++y)
-        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+        x = ESM::Land::LAND_SIZE - 1;
+        for (; y < ESM::Land::LAND_SIZE - 1; ++y)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
-    y = ESM::Land::LAND_SIZE - 1;
-    for (; x > 0; --x)
-        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+        y = ESM::Land::LAND_SIZE - 1;
+        for (; x > 0; --x)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
-    x = 0;
-    for (; y > 0; --y)
-        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+        x = 0;
+        for (; y > 0; --y)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+    }
+    else
+    {
+        for (; x < ESM::Land::LAND_SIZE - 1; ++x)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), ESM::Land::DEFAULT_HEIGHT));
+
+        x = ESM::Land::LAND_SIZE - 1;
+        for (; y < ESM::Land::LAND_SIZE - 1; ++y)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), ESM::Land::DEFAULT_HEIGHT));
+
+        y = ESM::Land::LAND_SIZE - 1;
+        for (; x > 0; --x)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), ESM::Land::DEFAULT_HEIGHT));
+
+        x = 0;
+        for (; y > 0; --y)
+            vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), ESM::Land::DEFAULT_HEIGHT));
+    }
 
     mBorderGeometry->setVertexArray(vertices);
 
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index 7589f2c1fc..5ad860b435 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -176,14 +176,14 @@ namespace CSVRender
         mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin));
 
         // Add water texture
-        std::string textureName = "textures/water/";
-        textureName += Fallback::Map::getString("Water_SurfaceTexture");
-        textureName += "00.dds";
+        constexpr VFS::Path::NormalizedView prefix("textures/water");
+        VFS::Path::Normalized texturePath(prefix);
+        texturePath /= std::string(Fallback::Map::getString("Water_SurfaceTexture")) + "00.dds";
 
         Resource::ImageManager* imageManager = mData.getResourceSystem()->getImageManager();
 
         osg::ref_ptr<osg::Texture2D> waterTexture = new osg::Texture2D();
-        waterTexture->setImage(imageManager->getImage(textureName));
+        waterTexture->setImage(imageManager->getImage(texturePath));
         waterTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
         waterTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index df5bb02332..7a59222eff 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -40,6 +40,7 @@
 #include <apps/opencs/view/render/tagbase.hpp>
 
 #include <components/esm/defs.hpp>
+#include <components/misc/scalableicon.hpp>
 
 #include "../../model/prefs/shortcut.hpp"
 #include "../../model/world/commandmacro.hpp"
@@ -59,6 +60,24 @@
 #include "pagedworldspacewidget.hpp"
 #include "worldspacewidget.hpp"
 
+namespace
+{
+    constexpr std::string_view sInstanceModeTooltip = R"(
+        Instance editing
+        <ul><li>Use {scene-select-primary} and {scene-select-secondary} to select and unselect instances</li>
+        <li>Use {scene-edit-primary} to manipulate instances</li>
+        <li>Use {scene-select-tertiary} to select a reference object and then {scene-edit-secondary} to snap 
+        selection relative to the reference object</li>
+        <li>Use {scene-submode-move}, {scene-submode-rotate}, {scene-submode-scale} to change to move, rotate, and 
+        scale modes respectively</li>
+        <li>Use {scene-axis-x}, {scene-axis-y}, and {scene-axis-z} to lock changes to X, Y, and Z axes 
+        respectively</li>
+        <li>Use {scene-delete} to delete currently selected objects</li>
+        <li>Use {scene-duplicate} to duplicate instances</li>
+        <li>Use {scene-instance-drop} to drop instances</li></ul>
+)";
+}
+
 int CSVRender::InstanceMode::getSubModeFromId(const std::string& id) const
 {
     return id == "move" ? 0 : (id == "rotate" ? 1 : 2);
@@ -186,10 +205,117 @@ osg::Vec3f CSVRender::InstanceMode::getMousePlaneCoords(const QPoint& point, con
     return mousePlanePoint;
 }
 
+void CSVRender::InstanceMode::saveSelectionGroup(const int group)
+{
+    QStringList strings;
+    QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+    QVariant selectionObjects;
+    CSMWorld::CommandMacro macro(undoStack, "Replace Selection Group");
+    std::string groupName = "project::" + std::to_string(group);
+
+    const auto& selection = getWorldspaceWidget().getSelection(Mask_Reference);
+    const int selectionObjectsIndex
+        = mSelectionGroups->findColumnIndex(CSMWorld::Columns::ColumnId_SelectionGroupObjects);
+
+    if (dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
+        groupName += "-ext";
+    else
+        groupName += "-" + getWorldspaceWidget().getCellId(osg::Vec3f(0, 0, 0));
+
+    CSMWorld::CreateCommand* newGroup = new CSMWorld::CreateCommand(*mSelectionGroups, groupName);
+
+    newGroup->setType(CSMWorld::UniversalId::Type_SelectionGroup);
+
+    for (const auto& object : selection)
+        if (const CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(object.get()))
+            strings << QString::fromStdString(objectTag->mObject->getReferenceId());
+
+    selectionObjects.setValue(strings);
+
+    newGroup->addValue(selectionObjectsIndex, selectionObjects);
+
+    if (mSelectionGroups->getModelIndex(groupName, 0).row() != -1)
+        macro.push(new CSMWorld::DeleteCommand(*mSelectionGroups, groupName));
+
+    macro.push(newGroup);
+
+    getWorldspaceWidget().clearSelection(Mask_Reference);
+}
+
+void CSVRender::InstanceMode::getSelectionGroup(const int group)
+{
+    std::string groupName = "project::" + std::to_string(group);
+    std::vector<std::string> targets;
+
+    const auto& selection = getWorldspaceWidget().getSelection(Mask_Reference);
+    const int selectionObjectsIndex
+        = mSelectionGroups->findColumnIndex(CSMWorld::Columns::ColumnId_SelectionGroupObjects);
+
+    if (dynamic_cast<CSVRender::PagedWorldspaceWidget*>(&getWorldspaceWidget()))
+        groupName += "-ext";
+    else
+        groupName += "-" + getWorldspaceWidget().getCellId(osg::Vec3f(0, 0, 0));
+
+    const QModelIndex groupSearch = mSelectionGroups->getModelIndex(groupName, selectionObjectsIndex);
+
+    if (groupSearch.row() == -1)
+        return;
+
+    for (const QString& target : groupSearch.data().toStringList())
+        targets.push_back(target.toStdString());
+
+    if (!selection.empty())
+        getWorldspaceWidget().clearSelection(Mask_Reference);
+
+    getWorldspaceWidget().selectGroup(targets);
+}
+
+void CSVRender::InstanceMode::setDragAxis(const char axis)
+{
+    int newDragAxis;
+
+    const std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
+
+    if (selection.empty())
+        return;
+
+    switch (axis)
+    {
+        case 'x':
+            newDragAxis = 0;
+            break;
+        case 'y':
+            newDragAxis = 1;
+            break;
+        case 'z':
+            newDragAxis = 2;
+            break;
+        default:
+            return;
+    }
+
+    if (newDragAxis == mDragAxis)
+        newDragAxis = -1;
+
+    if (mSubModeId == "move")
+    {
+        mObjectsAtDragStart.clear();
+
+        for (const auto& object : selection)
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(object.get()))
+            {
+                const osg::Vec3f thisPoint = objectTag->mObject->getPosition().asVec3();
+                mDragStart = thisPoint;
+                mObjectsAtDragStart.emplace_back(thisPoint);
+            }
+    }
+    mDragAxis = newDragAxis;
+}
+
 CSVRender::InstanceMode::InstanceMode(
     WorldspaceWidget* worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget* parent)
-    : EditMode(worldspaceWidget, QIcon(":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain,
-        "Instance editing", parent)
+    : EditMode(worldspaceWidget, Misc::ScalableIcon::load(":scenetoolbar/editing-instance"),
+        Mask_Reference | Mask_Terrain, sInstanceModeTooltip.data(), parent)
     , mSubMode(nullptr)
     , mSubModeId("move")
     , mSelectionMode(nullptr)
@@ -199,30 +325,42 @@ CSVRender::InstanceMode::InstanceMode(
     , mUnitScaleDist(1)
     , mParentNode(std::move(parentNode))
 {
+    mSelectionGroups = dynamic_cast<CSMWorld::IdTable*>(
+        worldspaceWidget->getDocument().getData().getTableModel(CSMWorld::UniversalId::Type_SelectionGroup));
+
     connect(this, &InstanceMode::requestFocus, worldspaceWidget, &WorldspaceWidget::requestFocus);
 
     CSMPrefs::Shortcut* deleteShortcut = new CSMPrefs::Shortcut("scene-delete", worldspaceWidget);
-    connect(
-        deleteShortcut, qOverload<bool>(&CSMPrefs::Shortcut::activated), this, &InstanceMode::deleteSelectedInstances);
+    connect(deleteShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &InstanceMode::deleteSelectedInstances);
 
-    // Following classes could be simplified by using QSignalMapper, which is obsolete in Qt5.10, but not in Qt4.8 and
-    // Qt5.14
-    CSMPrefs::Shortcut* dropToCollisionShortcut
-        = new CSMPrefs::Shortcut("scene-instance-drop-collision", worldspaceWidget);
-    connect(dropToCollisionShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
-        &InstanceMode::dropSelectedInstancesToCollision);
-    CSMPrefs::Shortcut* dropToTerrainLevelShortcut
-        = new CSMPrefs::Shortcut("scene-instance-drop-terrain", worldspaceWidget);
-    connect(dropToTerrainLevelShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
-        &InstanceMode::dropSelectedInstancesToTerrain);
-    CSMPrefs::Shortcut* dropToCollisionShortcut2
-        = new CSMPrefs::Shortcut("scene-instance-drop-collision-separately", worldspaceWidget);
-    connect(dropToCollisionShortcut2, qOverload<>(&CSMPrefs::Shortcut::activated), this,
-        &InstanceMode::dropSelectedInstancesToCollisionSeparately);
-    CSMPrefs::Shortcut* dropToTerrainLevelShortcut2
-        = new CSMPrefs::Shortcut("scene-instance-drop-terrain-separately", worldspaceWidget);
-    connect(dropToTerrainLevelShortcut2, qOverload<>(&CSMPrefs::Shortcut::activated), this,
-        &InstanceMode::dropSelectedInstancesToTerrainSeparately);
+    CSMPrefs::Shortcut* duplicateShortcut = new CSMPrefs::Shortcut("scene-duplicate", worldspaceWidget);
+
+    connect(
+        duplicateShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &InstanceMode::cloneSelectedInstances);
+
+    connect(new CSMPrefs::Shortcut("scene-instance-drop", worldspaceWidget),
+        qOverload<>(&CSMPrefs::Shortcut::activated), this, &InstanceMode::dropToCollision);
+
+    for (short i = 0; i <= 9; i++)
+    {
+        connect(new CSMPrefs::Shortcut("scene-group-" + std::to_string(i), worldspaceWidget),
+            qOverload<>(&CSMPrefs::Shortcut::activated), this, [this, i] { this->getSelectionGroup(i); });
+        connect(new CSMPrefs::Shortcut("scene-save-" + std::to_string(i), worldspaceWidget),
+            qOverload<>(&CSMPrefs::Shortcut::activated), this, [this, i] { this->saveSelectionGroup(i); });
+    }
+
+    connect(new CSMPrefs::Shortcut("scene-submode-move", worldspaceWidget), qOverload<>(&CSMPrefs::Shortcut::activated),
+        this, [this] { mSubMode->setButton("move"); });
+
+    connect(new CSMPrefs::Shortcut("scene-submode-scale", worldspaceWidget),
+        qOverload<>(&CSMPrefs::Shortcut::activated), this, [this] { mSubMode->setButton("scale"); });
+
+    connect(new CSMPrefs::Shortcut("scene-submode-rotate", worldspaceWidget),
+        qOverload<>(&CSMPrefs::Shortcut::activated), this, [this] { mSubMode->setButton("rotate"); });
+
+    for (const char axis : "xyz")
+        connect(new CSMPrefs::Shortcut(std::string("scene-axis-") + axis, worldspaceWidget),
+            qOverload<>(&CSMPrefs::Shortcut::activated), this, [this, axis] { this->setDragAxis(axis); });
 }
 
 void CSVRender::InstanceMode::activate(CSVWidget::SceneToolbar* toolbar)
@@ -1068,7 +1206,7 @@ void CSVRender::InstanceMode::handleSelectDrag(const QPoint& pos)
     mDragMode = DragMode_None;
 }
 
-void CSVRender::InstanceMode::deleteSelectedInstances(bool active)
+void CSVRender::InstanceMode::deleteSelectedInstances()
 {
     std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
     if (selection.empty())
@@ -1087,6 +1225,27 @@ void CSVRender::InstanceMode::deleteSelectedInstances(bool active)
     getWorldspaceWidget().clearSelection(Mask_Reference);
 }
 
+void CSVRender::InstanceMode::cloneSelectedInstances()
+{
+    std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
+    if (selection.empty())
+        return;
+
+    CSMDoc::Document& document = getWorldspaceWidget().getDocument();
+    CSMWorld::IdTable& referencesTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_References));
+    QUndoStack& undoStack = document.getUndoStack();
+
+    CSMWorld::CommandMacro macro(undoStack, "Clone Instances");
+    for (osg::ref_ptr<TagBase> tag : selection)
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
+        {
+            macro.push(new CSMWorld::CloneCommand(referencesTable, objectTag->mObject->getReferenceId(),
+                "ref#" + std::to_string(referencesTable.rowCount()), CSMWorld::UniversalId::Type_Reference));
+        }
+    // getWorldspaceWidget().clearSelection(Mask_Reference);
+}
+
 void CSVRender::InstanceMode::dropInstance(CSVRender::Object* object, float dropHeight)
 {
     object->setEdited(Object::Override_Position);
@@ -1095,7 +1254,7 @@ void CSVRender::InstanceMode::dropInstance(CSVRender::Object* object, float drop
     object->setPosition(position.pos);
 }
 
-float CSVRender::InstanceMode::calculateDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight)
+float CSVRender::InstanceMode::calculateDropHeight(CSVRender::Object* object, float objectHeight)
 {
     osg::Vec3d point = object->getPosition().asVec3();
 
@@ -1109,10 +1268,7 @@ float CSVRender::InstanceMode::calculateDropHeight(DropMode dropMode, CSVRender:
     intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
     osgUtil::IntersectionVisitor visitor(intersector);
 
-    if (dropMode & Terrain)
-        visitor.setTraversalMask(Mask_Terrain);
-    if (dropMode & Collision)
-        visitor.setTraversalMask(Mask_Terrain | Mask_Reference);
+    visitor.setTraversalMask(Mask_Terrain | Mask_Reference);
 
     mParentNode->accept(visitor);
 
@@ -1127,27 +1283,7 @@ float CSVRender::InstanceMode::calculateDropHeight(DropMode dropMode, CSVRender:
     return 0.0f;
 }
 
-void CSVRender::InstanceMode::dropSelectedInstancesToCollision()
-{
-    handleDropMethod(Collision, "Drop instances to next collision");
-}
-
-void CSVRender::InstanceMode::dropSelectedInstancesToTerrain()
-{
-    handleDropMethod(Terrain, "Drop instances to terrain level");
-}
-
-void CSVRender::InstanceMode::dropSelectedInstancesToCollisionSeparately()
-{
-    handleDropMethod(CollisionSep, "Drop instances to next collision level separately");
-}
-
-void CSVRender::InstanceMode::dropSelectedInstancesToTerrainSeparately()
-{
-    handleDropMethod(TerrainSep, "Drop instances to terrain level separately");
-}
-
-void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString commandMsg)
+void CSVRender::InstanceMode::dropToCollision()
 {
     std::vector<osg::ref_ptr<TagBase>> selection = getWorldspaceWidget().getSelection(Mask_Reference);
     if (selection.empty())
@@ -1156,43 +1292,19 @@ void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString comman
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
     QUndoStack& undoStack = document.getUndoStack();
 
-    CSMWorld::CommandMacro macro(undoStack, commandMsg);
+    CSMWorld::CommandMacro macro(undoStack, "Drop objects to collision");
 
     DropObjectHeightHandler dropObjectDataHandler(&getWorldspaceWidget());
 
-    if (dropMode & Separate)
-    {
-        int counter = 0;
-        for (osg::ref_ptr<TagBase> tag : selection)
-            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
-            {
-                float objectHeight = dropObjectDataHandler.mObjectHeights[counter];
-                float dropHeight = calculateDropHeight(dropMode, objectTag->mObject, objectHeight);
-                dropInstance(objectTag->mObject, dropHeight);
-                objectTag->mObject->apply(macro);
-                counter++;
-            }
-    }
-    else
-    {
-        float smallestDropHeight = std::numeric_limits<float>::max();
-        int counter = 0;
-        for (osg::ref_ptr<TagBase> tag : selection)
-            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
-            {
-                float objectHeight = dropObjectDataHandler.mObjectHeights[counter];
-                float thisDrop = calculateDropHeight(dropMode, objectTag->mObject, objectHeight);
-                if (thisDrop < smallestDropHeight)
-                    smallestDropHeight = thisDrop;
-                counter++;
-            }
-        for (osg::ref_ptr<TagBase> tag : selection)
-            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
-            {
-                dropInstance(objectTag->mObject, smallestDropHeight);
-                objectTag->mObject->apply(macro);
-            }
-    }
+    int counter = 0;
+    for (osg::ref_ptr<TagBase> tag : selection)
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
+        {
+            float objectHeight = dropObjectDataHandler.mObjectHeights[counter++];
+            float dropHeight = calculateDropHeight(objectTag->mObject, objectHeight);
+            dropInstance(objectTag->mObject, dropHeight);
+            objectTag->mObject->apply(macro);
+        }
 }
 
 CSVRender::DropObjectHeightHandler::DropObjectHeightHandler(WorldspaceWidget* worldspacewidget)
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 5055d08d5b..193423efd5 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -14,6 +14,8 @@
 
 #include "editmode.hpp"
 #include "instancedragmodes.hpp"
+#include <apps/opencs/model/world/idtable.hpp>
+#include <components/esm3/selectiongroup.hpp>
 
 class QDragEnterEvent;
 class QDropEvent;
@@ -39,17 +41,6 @@ namespace CSVRender
     {
         Q_OBJECT
 
-        enum DropMode
-        {
-            Separate = 0b1,
-
-            Collision = 0b10,
-            Terrain = 0b100,
-
-            CollisionSep = Collision | Separate,
-            TerrainSep = Terrain | Separate,
-        };
-
         CSVWidget::SceneToolMode* mSubMode;
         std::string mSubModeId;
         InstanceSelectionMode* mSelectionMode;
@@ -60,6 +51,7 @@ namespace CSVRender
         osg::ref_ptr<osg::Group> mParentNode;
         osg::Vec3 mDragStart;
         std::vector<osg::Vec3> mObjectsAtDragStart;
+        CSMWorld::IdTable* mSelectionGroups;
 
         int getSubModeFromId(const std::string& id) const;
 
@@ -74,7 +66,7 @@ namespace CSVRender
         osg::Vec3 getMousePlaneCoords(const QPoint& point, const osg::Vec3d& dragStart);
         void handleSelectDrag(const QPoint& pos);
         void dropInstance(CSVRender::Object* object, float dropHeight);
-        float calculateDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight);
+        float calculateDropHeight(CSVRender::Object* object, float objectHeight);
         osg::Vec3 calculateSnapPositionRelativeToTarget(osg::Vec3 initalPosition, osg::Vec3 targetPosition,
             osg::Vec3 targetRotation, osg::Vec3 translation, double snap) const;
 
@@ -130,13 +122,13 @@ namespace CSVRender
 
     private slots:
 
+        void setDragAxis(const char axis);
         void subModeChanged(const std::string& id);
-        void deleteSelectedInstances(bool active);
-        void dropSelectedInstancesToCollision();
-        void dropSelectedInstancesToTerrain();
-        void dropSelectedInstancesToCollisionSeparately();
-        void dropSelectedInstancesToTerrainSeparately();
-        void handleDropMethod(DropMode dropMode, QString commandMsg);
+        void deleteSelectedInstances();
+        void cloneSelectedInstances();
+        void getSelectionGroup(const int group);
+        void saveSelectionGroup(const int group);
+        void dropToCollision();
     };
 
     /// \brief Helper class to handle object mask data in safe way
diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
index e4004a1537..bf0ef9d181 100644
--- a/apps/opencs/view/render/instancemovemode.cpp
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -5,10 +5,12 @@
 
 #include <apps/opencs/view/widget/modebutton.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 class QWidget;
 
 CSVRender::InstanceMoveMode::InstanceMoveMode(QWidget* parent)
-    : ModeButton(QIcon(QPixmap(":scenetoolbar/transform-move")),
+    : ModeButton(Misc::ScalableIcon::load(":scenetoolbar/transform-move"),
         "Move selected instances"
         "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
         "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index fa8998747d..d3e2379640 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -58,7 +58,8 @@ namespace CSVRender
 
     InstanceSelectionMode::~InstanceSelectionMode()
     {
-        mParentNode->removeChild(mBaseNode);
+        if (mBaseNode)
+            mParentNode->removeChild(mBaseNode);
     }
 
     void InstanceSelectionMode::setDragStart(const osg::Vec3d& dragStart)
diff --git a/apps/opencs/view/render/mask.hpp b/apps/opencs/view/render/mask.hpp
index 818be8b228..1c84d886d3 100644
--- a/apps/opencs/view/render/mask.hpp
+++ b/apps/opencs/view/render/mask.hpp
@@ -11,11 +11,11 @@ namespace CSVRender
     enum Mask : unsigned int
     {
         // elements that are part of the actual scene
-        Mask_Reference = 0x2,
-        Mask_Pathgrid = 0x4,
-        Mask_Water = 0x8,
-        Mask_Fog = 0x10,
-        Mask_Terrain = 0x20,
+        Mask_Hidden = 0x0,
+        Mask_Reference = 0x1,
+        Mask_Pathgrid = 0x2,
+        Mask_Water = 0x4,
+        Mask_Terrain = 0x8,
 
         // used within models
         Mask_ParticleSystem = 0x100,
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 7782ce36c9..fe4b6e9b7f 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -33,7 +33,6 @@
 #include <osg/StateAttribute>
 #include <osg/StateSet>
 #include <osg/Vec3>
-#include <osg/Vec4f>
 
 #include <osgFX/Scribe>
 
@@ -152,7 +151,9 @@ void CSVRender::Object::update()
         }
         else if (!model.empty())
         {
-            std::string path = "meshes\\" + model;
+            constexpr VFS::Path::NormalizedView meshes("meshes");
+            VFS::Path::Normalized path(meshes);
+            path /= model;
             mResourceSystem->getSceneManager()->getInstance(path, mBaseNode);
         }
         else
@@ -485,7 +486,7 @@ CSVRender::Object::~Object()
     mParentNode->removeChild(mRootNode);
 }
 
-void CSVRender::Object::setSelected(bool selected)
+void CSVRender::Object::setSelected(bool selected, const osg::Vec4f& color)
 {
     mSelected = selected;
 
@@ -499,7 +500,7 @@ void CSVRender::Object::setSelected(bool selected)
     mRootNode->removeChild(mBaseNode);
     if (selected)
     {
-        mOutline->setWireframeColor(osg::Vec4f(1, 1, 1, 1));
+        mOutline->setWireframeColor(color);
         mOutline->addChild(mBaseNode);
         mRootNode->addChild(mOutline);
     }
@@ -714,7 +715,7 @@ void CSVRender::Object::setScale(float scale)
 {
     mOverrideFlags |= Override_Scale;
 
-    mScaleOverride = scale;
+    mScaleOverride = std::clamp(scale, 0.5f, 2.0f);
 
     adjustTransform();
 }
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 436c410c84..31f0d93ac4 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -5,9 +5,10 @@
 #include <string>
 
 #include <osg/Vec3f>
+#include <osg/Vec4f>
 #include <osg/ref_ptr>
 
-#include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 #include <components/esm/refid.hpp>
 
 #include "tagbase.hpp"
@@ -138,7 +139,7 @@ namespace CSVRender
         ~Object();
 
         /// Mark the object as selected, selected objects show an outline effect
-        void setSelected(bool selected);
+        void setSelected(bool selected, const osg::Vec4f& color = osg::Vec4f(1, 1, 1, 1));
 
         bool getSelected() const;
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 00d519ecc8..3fd35b7740 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -23,6 +23,7 @@
 
 #include <components/esm3/loadpgrd.hpp>
 #include <components/misc/constants.hpp>
+#include <components/misc/scalableicon.hpp>
 
 #include <osg/Camera>
 #include <osg/Vec3f>
@@ -85,8 +86,8 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
                 {
                     modified = true;
 
-                    auto cell = std::make_unique<Cell>(
-                        mDocument.getData(), mRootNode, iter->first.getId(mWorldspace), deleted);
+                    auto cell
+                        = std::make_unique<Cell>(mDocument, mRootNode, iter->first.getId(mWorldspace), deleted, true);
 
                     delete iter->second;
                     iter->second = cell.release();
@@ -160,7 +161,6 @@ void CSVRender::PagedWorldspaceWidget::addVisibilitySelectorButtons(CSVWidget::S
 {
     WorldspaceWidget::addVisibilitySelectorButtons(tool);
     tool->addButton(Button_Terrain, Mask_Terrain, "Terrain");
-    tool->addButton(Button_Fog, Mask_Fog, "Fog", "", true);
 }
 
 void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons(CSVWidget::SceneToolMode* tool)
@@ -170,9 +170,10 @@ void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons(CSVWidget::Sce
     /// \todo replace EditMode with suitable subclasses
     tool->addButton(new TerrainShapeMode(this, mRootNode, tool), "terrain-shape");
     tool->addButton(new TerrainTextureMode(this, mRootNode, tool), "terrain-texture");
-    tool->addButton(
-        new EditMode(this, QIcon(":placeholder"), Mask_Reference, "Terrain vertex paint editing"), "terrain-vertex");
-    tool->addButton(new EditMode(this, QIcon(":placeholder"), Mask_Reference, "Terrain movement"), "terrain-move");
+    const QIcon vertexIcon = Misc::ScalableIcon::load(":scenetoolbar/editing-terrain-vertex-paint");
+    const QIcon movementIcon = Misc::ScalableIcon::load(":scenetoolbar/editing-terrain-movement");
+    tool->addButton(new EditMode(this, vertexIcon, Mask_Reference, "Terrain vertex paint editing"), "terrain-vertex");
+    tool->addButton(new EditMode(this, movementIcon, Mask_Reference, "Terrain movement"), "terrain-move");
 }
 
 void CSVRender::PagedWorldspaceWidget::handleInteractionPress(const WorldspaceHitResult& hit, InteractionType type)
@@ -464,7 +465,7 @@ void CSVRender::PagedWorldspaceWidget::addCellToScene(const CSMWorld::CellCoordi
 
     bool deleted = index == -1 || cells.getRecord(index).mState == CSMWorld::RecordBase::State_Deleted;
 
-    auto cell = std::make_unique<Cell>(mDocument.getData(), mRootNode, coordinates.getId(mWorldspace), deleted);
+    auto cell = std::make_unique<Cell>(mDocument, mRootNode, coordinates.getId(mWorldspace), deleted, true);
     EditMode* editMode = getEditMode();
     cell->setSubMode(editMode->getSubMode(), editMode->getInteractionMask());
 
@@ -514,7 +515,7 @@ void CSVRender::PagedWorldspaceWidget::moveCellSelection(int x, int y)
             addCellToScene(*iter);
     }
 
-    mSelection = newSelection;
+    mSelection = std::move(newSelection);
 }
 
 void CSVRender::PagedWorldspaceWidget::addCellToSceneFromCamera(int offsetX, int offsetY)
@@ -875,6 +876,18 @@ std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::PagedWorldspaceWidget::
     return result;
 }
 
+void CSVRender::PagedWorldspaceWidget::selectGroup(const std::vector<std::string>& group) const
+{
+    for (const auto& [_, cell] : mCells)
+        cell->selectFromGroup(group);
+}
+
+void CSVRender::PagedWorldspaceWidget::unhideAll() const
+{
+    for (const auto& [_, cell] : mCells)
+        cell->unhideAll();
+}
+
 std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::PagedWorldspaceWidget::getEdited(
     unsigned int elementMask) const
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 9ba8911c7e..744cc7ccb9 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -163,6 +163,10 @@ namespace CSVRender
 
         std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const override;
 
+        void selectGroup(const std::vector<std::string>& group) const override;
+
+        void unhideAll() const override;
+
         std::vector<osg::ref_ptr<TagBase>> getEdited(unsigned int elementMask) const override;
 
         void setSubMode(int subMode, unsigned int elementMask) override;
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 44e85e7193..7f35956901 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -75,7 +75,7 @@ namespace CSVRender
         QString text("Pathgrid: ");
         text += mPathgrid->getId().c_str();
         text += " (";
-        text += QString::number(SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0)));
+        text += QString::number(SceneUtil::getPathgridNode(hit.index0));
         text += ")";
 
         return text;
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 5c45e2b31f..9800f825bc 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -2,6 +2,7 @@
 
 #include <QIcon>
 
+#include <components/misc/scalableicon.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 
 #include "../../model/prefs/state.hpp"
@@ -36,8 +37,8 @@ class QWidget;
 namespace CSVRender
 {
     PathgridMode::PathgridMode(WorldspaceWidget* worldspaceWidget, QWidget* parent)
-        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid | Mask_Terrain | Mask_Reference, getTooltip(),
-            parent)
+        : EditMode(worldspaceWidget, Misc::ScalableIcon::load(":scenetoolbar/editing-pathgrid"),
+            Mask_Pathgrid | Mask_Terrain | Mask_Reference, getTooltip(), parent)
         , mDragMode(DragMode_None)
         , mFromNode(0)
         , mSelectionMode(nullptr)
@@ -107,7 +108,7 @@ namespace CSVRender
             {
                 if (tag->getPathgrid()->isSelected())
                 {
-                    unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                    unsigned short node = SceneUtil::getPathgridNode(hit.index0);
 
                     QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
                     QString description = "Connect node to selected nodes";
@@ -128,7 +129,7 @@ namespace CSVRender
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
             {
                 mLastId = tag->getPathgrid()->getId();
-                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                unsigned short node = SceneUtil::getPathgridNode(hit.index0);
                 tag->getPathgrid()->toggleSelected(node);
             }
         }
@@ -146,7 +147,7 @@ namespace CSVRender
                     mLastId = tag->getPathgrid()->getId();
                 }
 
-                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                unsigned short node = SceneUtil::getPathgridNode(hit.index0);
                 tag->getPathgrid()->toggleSelected(node);
 
                 return;
@@ -189,7 +190,7 @@ namespace CSVRender
             {
                 mDragMode = DragMode_Edge;
                 mEdgeId = tag->getPathgrid()->getId();
-                mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                mFromNode = SceneUtil::getPathgridNode(hit.index0);
 
                 tag->getPathgrid()->setDragOrigin(mFromNode);
                 return true;
@@ -229,7 +230,7 @@ namespace CSVRender
                 if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
                     && tag->getPathgrid()->getId() == mEdgeId)
                 {
-                    unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                    unsigned short node = SceneUtil::getPathgridNode(hit.index0);
                     cell->getPathgrid()->setDragEndpoint(node);
                 }
                 else
@@ -267,7 +268,7 @@ namespace CSVRender
                 {
                     if (tag->getPathgrid()->getId() == mEdgeId)
                     {
-                        unsigned short toNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                        unsigned short toNode = SceneUtil::getPathgridNode(hit.index0);
 
                         QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
                         QString description = "Add edge between nodes";
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 12170c86a0..716a087d02 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -48,6 +48,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/glextensions.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 
 #include "../widget/scenetoolmode.hpp"
@@ -76,6 +77,8 @@ namespace CSVRender
             = new osgViewer::GraphicsWindowEmbedded(0, 0, width(), height());
         mWidget->setGraphicsWindowEmbedded(window);
 
+        mRenderer->setRealizeOperation(new SceneUtil::GetGLExtensionsOperation());
+
         int frameRateLimit = CSMPrefs::get()["Rendering"]["framerate-limit"].toInt();
         mRenderer->setRunMaxFrameRate(frameRateLimit);
         mRenderer->setUseConfigureAffinity(false);
@@ -87,10 +90,10 @@ namespace CSVRender
 
         mView->getCamera()->setGraphicsContext(window);
 
-        SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
+        osg::ref_ptr<SceneUtil::LightManager> lightMgr = new SceneUtil::LightManager;
         lightMgr->setStartLight(1);
         lightMgr->setLightingMask(Mask_Lighting);
-        mRootNode = lightMgr;
+        mRootNode = std::move(lightMgr);
 
         mView->getCamera()->setViewport(new osg::Viewport(0, 0, width(), height()));
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 6e1a216816..b9dc301efa 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -31,6 +31,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadland.hpp>
+#include <components/misc/scalableicon.hpp>
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolshapebrush.hpp"
@@ -62,8 +63,8 @@ namespace osg
 
 CSVRender::TerrainShapeMode::TerrainShapeMode(
     WorldspaceWidget* worldspaceWidget, osg::Group* parentNode, QWidget* parent)
-    : EditMode(
-        worldspaceWidget, QIcon{ ":scenetoolbar/editing-terrain-shape" }, Mask_Terrain, "Terrain land editing", parent)
+    : EditMode(worldspaceWidget, Misc::ScalableIcon::load(":scenetoolbar/editing-terrain-shape"), Mask_Terrain,
+        "Terrain land editing", parent)
     , mParentNode(parentNode)
 {
 }
@@ -127,7 +128,7 @@ void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult&
 {
     if (hit.hit && hit.tag == nullptr)
     {
-        if (mShapeEditTool == ShapeEditTool_Flatten)
+        if (mShapeEditTool == ShapeEditTool_Flatten || mShapeEditTool == ShapeEditTool_Equalize)
             setFlattenToolTargetHeight(hit);
         if (mDragMode == InteractionType_PrimaryEdit && mShapeEditTool != ShapeEditTool_Drag)
         {
@@ -166,7 +167,7 @@ bool CSVRender::TerrainShapeMode::primaryEditStartDrag(const QPoint& pos)
     {
         mEditingPos = hit.worldPos;
         mIsEditing = true;
-        if (mShapeEditTool == ShapeEditTool_Flatten)
+        if (mShapeEditTool == ShapeEditTool_Flatten || mShapeEditTool == ShapeEditTool_Equalize)
             setFlattenToolTargetHeight(hit);
     }
 
@@ -462,6 +463,8 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
             smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
         if (mShapeEditTool == ShapeEditTool_Flatten)
             flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+        if (mShapeEditTool == ShapeEditTool_Equalize)
+            equalizeHeight(cellCoords, x, y, mTargetHeight);
     }
 
     if (mBrushShape == CSVWidget::BrushShape_Square)
@@ -488,6 +491,8 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
                     smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
                 if (mShapeEditTool == ShapeEditTool_Flatten)
                     flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+                if (mShapeEditTool == ShapeEditTool_Equalize)
+                    equalizeHeight(cellCoords, x, y, mTargetHeight);
             }
         }
     }
@@ -528,6 +533,8 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
                         smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
                     if (mShapeEditTool == ShapeEditTool_Flatten)
                         flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+                    if (mShapeEditTool == ShapeEditTool_Equalize)
+                        equalizeHeight(cellCoords, x, y, mTargetHeight);
                 }
             }
         }
@@ -557,6 +564,8 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
                     smoothHeight(cellCoords, x, y, mShapeEditToolStrength);
                 if (mShapeEditTool == ShapeEditTool_Flatten)
                     flattenHeight(cellCoords, x, y, mShapeEditToolStrength, mTargetHeight);
+                if (mShapeEditTool == ShapeEditTool_Equalize)
+                    equalizeHeight(cellCoords, x, y, mTargetHeight);
             }
         }
     }
@@ -888,6 +897,30 @@ void CSVRender::TerrainShapeMode::flattenHeight(
         alterHeight(cellCoords, inCellX, inCellY, thisAlteredHeight + toolStrength);
 }
 
+void CSVRender::TerrainShapeMode::equalizeHeight(
+    const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int targetHeight)
+{
+    CSMDoc::Document& document = getWorldspaceWidget().getDocument();
+    CSMWorld::IdTable& landTable
+        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_Land));
+    int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
+
+    float thisHeight = 0.0f;
+
+    const std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
+
+    if (!noCell(cellId) && !noLand(cellId))
+    {
+        const CSMWorld::LandHeightsColumn::DataType landShapePointer
+            = landTable.data(landTable.getModelIndex(cellId, landshapeColumn))
+                  .value<CSMWorld::LandHeightsColumn::DataType>();
+
+        thisHeight = landShapePointer[inCellY * ESM::Land::LAND_SIZE + inCellX];
+    }
+
+    alterHeight(cellCoords, inCellX, inCellY, targetHeight - thisHeight);
+}
+
 void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoordinates& cellCoords, int inCellX,
     int inCellY, float* thisHeight, float* thisAlteredHeight, float* leftHeight, float* leftAlteredHeight,
     float* upHeight, float* upAlteredHeight, float* rightHeight, float* rightAlteredHeight, float* downHeight,
diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp
index e772621c4c..2344676cbd 100644
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@@ -74,7 +74,8 @@ namespace CSVRender
             ShapeEditTool_PaintToRaise = 1,
             ShapeEditTool_PaintToLower = 2,
             ShapeEditTool_Smooth = 3,
-            ShapeEditTool_Flatten = 4
+            ShapeEditTool_Flatten = 4,
+            ShapeEditTool_Equalize = 5
         };
 
         /// Editmode for terrain shape grid
@@ -145,6 +146,9 @@ namespace CSVRender
         void flattenHeight(
             const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength, int targetHeight);
 
+        /// Do a single equalize alteration for transient shape edit map
+        void equalizeHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int targetHeight);
+
         /// Get altered height values around one vertex
         void updateKeyHeightValues(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
             float* thisHeight, float* thisAlteredHeight, float* leftHeight, float* leftAlteredHeight, float* upHeight,
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index 5d2a4874c8..1c494820dc 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -7,7 +7,6 @@
 #include <apps/opencs/model/world/data.hpp>
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/land.hpp>
-#include <apps/opencs/model/world/landtexture.hpp>
 #include <apps/opencs/model/world/record.hpp>
 
 #include <algorithm>
@@ -42,14 +41,9 @@ namespace CSVRender
             land, ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX);
     }
 
-    const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)
+    const std::string* TerrainStorage::getLandTexture(std::uint16_t index, int plugin)
     {
-        const int row = mData.getLandTextures().searchId(
-            ESM::RefId::stringRefId(CSMWorld::LandTexture::createUniqueRecordId(plugin, index)));
-        if (row == -1)
-            return nullptr;
-
-        return &mData.getLandTextures().getRecord(row).get();
+        return mData.getLandTextures().getLandTexture(index, plugin);
     }
 
     void TerrainStorage::setAlteredHeight(int inCellX, int inCellY, float height)
@@ -154,6 +148,8 @@ namespace CSVRender
 
     void TerrainStorage::adjustColor(int col, int row, const ESM::LandData* heightData, osg::Vec4ub& color) const
     {
+        if (!heightData)
+            return;
         // Highlight broken height changes
         int heightWarningLimit = 1024;
         if (((col > 0 && row > 0) && leftOrUpIsOverTheLimit(col, row, heightWarningLimit, heightData->getHeights()))
diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp
index b09de55081..f7a7f72201 100644
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@@ -38,7 +38,7 @@ namespace CSVRender
         std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight;
 
         osg::ref_ptr<const ESMTerrain::LandObject> getLand(ESM::ExteriorCellLocation cellLocation) override;
-        const ESM::LandTexture* getLandTexture(int index, short plugin) override;
+        const std::string* getLandTexture(std::uint16_t index, int plugin) override;
 
         void getBounds(float& minX, float& maxX, float& minY, float& maxY, ESM::RefId worldspace) override;
 
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 79e9959cd6..cfc7f50cf1 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -26,6 +26,7 @@
 #include <apps/opencs/view/render/terrainselection.hpp>
 #include <apps/opencs/view/widget/scenetool.hpp>
 
+#include <components/misc/scalableicon.hpp>
 #include <components/misc/strings/conversion.hpp>
 
 #include "../widget/scenetoolbar.hpp"
@@ -37,7 +38,6 @@
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/landtexture.hpp"
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/universalid.hpp"
 
@@ -49,9 +49,8 @@
 
 CSVRender::TerrainTextureMode::TerrainTextureMode(
     WorldspaceWidget* worldspaceWidget, osg::Group* parentNode, QWidget* parent)
-    : EditMode(worldspaceWidget, QIcon{ ":scenetoolbar/editing-terrain-texture" }, Mask_Terrain | Mask_Reference,
-        "Terrain texture editing", parent)
-    , mBrushTexture("L0#0")
+    : EditMode(worldspaceWidget, Misc::ScalableIcon::load(":scenetoolbar/editing-terrain-texture"),
+        Mask_Terrain | Mask_Reference, "Terrain texture editing", parent)
     , mBrushSize(1)
     , mBrushShape(CSVWidget::BrushShape_Point)
     , mTextureBrushScenetool(nullptr)
@@ -136,8 +135,8 @@ void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult
     mCellId = getWorldspaceWidget().getCellId(hit.worldPos);
 
     QUndoStack& undoStack = document.getUndoStack();
-    CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
-    int index = landtexturesCollection.searchId(ESM::RefId::stringRefId(mBrushTexture));
+    CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
+    int index = landtexturesCollection.searchId(mBrushTexture);
 
     if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
@@ -185,8 +184,8 @@ bool CSVRender::TerrainTextureMode::primaryEditStartDrag(const QPoint& pos)
 
     mDragMode = InteractionType_PrimaryEdit;
 
-    CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
-    const int index = landtexturesCollection.searchId(ESM::RefId::stringRefId(mBrushTexture));
+    CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
+    const int index = landtexturesCollection.searchId(mBrushTexture);
 
     if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
@@ -241,8 +240,8 @@ void CSVRender::TerrainTextureMode::drag(const QPoint& pos, int diffX, int diffY
         std::string cellId = getWorldspaceWidget().getCellId(hit.worldPos);
         CSMDoc::Document& document = getWorldspaceWidget().getDocument();
 
-        CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
-        const int index = landtexturesCollection.searchId(ESM::RefId::stringRefId(mBrushTexture));
+        CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
+        const int index = landtexturesCollection.searchId(mBrushTexture);
 
         if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
         {
@@ -272,8 +271,8 @@ void CSVRender::TerrainTextureMode::dragCompleted(const QPoint& pos)
         CSMDoc::Document& document = getWorldspaceWidget().getDocument();
         QUndoStack& undoStack = document.getUndoStack();
 
-        CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
-        const int index = landtexturesCollection.searchId(ESM::RefId::stringRefId(mBrushTexture));
+        CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
+        const int index = landtexturesCollection.searchId(mBrushTexture);
 
         if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
         {
@@ -302,18 +301,7 @@ void CSVRender::TerrainTextureMode::handleDropEvent(QDropEvent* event)
 
         for (const CSMWorld::UniversalId& uid : ids)
         {
-            mBrushTexture = uid.getId();
-            emit passBrushTexture(mBrushTexture);
-        }
-    }
-    if (mime->holdsType(CSMWorld::UniversalId::Type_Texture))
-    {
-        const std::vector<CSMWorld::UniversalId> ids = mime->getData();
-
-        for (const CSMWorld::UniversalId& uid : ids)
-        {
-            std::string textureFileName = uid.toString();
-            createTexture(textureFileName);
+            mBrushTexture = ESM::RefId::stringRefId(uid.getId());
             emit passBrushTexture(mBrushTexture);
         }
     }
@@ -358,11 +346,8 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
 
     int textureColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandTexturesIndex);
 
-    std::size_t hashlocation = mBrushTexture.find('#');
-    std::string mBrushTextureInt = mBrushTexture.substr(hashlocation + 1);
-
     // All indices are offset by +1
-    int brushInt = Misc::StringUtils::toNumeric<int>(mBrushTexture.substr(hashlocation + 1), 0) + 1;
+    uint32_t brushInt = document.getData().getLandTextures().getRecord(mBrushTexture).get().mIndex + 1;
 
     int r = static_cast<float>(mBrushSize) / 2;
 
@@ -541,7 +526,7 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
                             = landTable.data(landTable.getModelIndex(cellId, textureColumn))
                                   .value<CSMWorld::LandTexturesColumn::DataType>();
                         newTerrainOtherCell[yInOtherCell * landTextureSize + xInOtherCell] = brushInt;
-                        pushEditToCommand(newTerrainOtherCell, document, landTable, cellId);
+                        pushEditToCommand(newTerrainOtherCell, document, landTable, std::move(cellId));
                     }
                 }
             }
@@ -661,50 +646,6 @@ void CSVRender::TerrainTextureMode::pushEditToCommand(CSMWorld::LandTexturesColu
     undoStack.push(new CSMWorld::TouchLandCommand(landTable, ltexTable, cellId));
 }
 
-void CSVRender::TerrainTextureMode::createTexture(const std::string& textureFileName)
-{
-    CSMDoc::Document& document = getWorldspaceWidget().getDocument();
-
-    CSMWorld::IdTable& ltexTable
-        = dynamic_cast<CSMWorld::IdTable&>(*document.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
-
-    QUndoStack& undoStack = document.getUndoStack();
-
-    std::string newId;
-
-    int counter = 0;
-    bool freeIndexFound = false;
-    do
-    {
-        const size_t maxCounter = std::numeric_limits<uint16_t>::max() - 1;
-        try
-        {
-            newId = CSMWorld::LandTexture::createUniqueRecordId(0, counter);
-            if (ltexTable.getRecord(newId).isDeleted() == 0)
-                counter = (counter + 1) % maxCounter;
-        }
-        catch (const std::exception&)
-        {
-            newId = CSMWorld::LandTexture::createUniqueRecordId(0, counter);
-            freeIndexFound = true;
-        }
-    } while (freeIndexFound == false);
-
-    std::size_t idlocation = textureFileName.find("Texture: ");
-    QString fileName = QString::fromStdString(textureFileName.substr(idlocation + 9));
-
-    QVariant textureFileNameVariant;
-    textureFileNameVariant.setValue(fileName);
-
-    undoStack.beginMacro("Add land texture record");
-
-    undoStack.push(new CSMWorld::CreateCommand(ltexTable, newId));
-    QModelIndex index(ltexTable.getModelIndex(newId, ltexTable.findColumnIndex(CSMWorld::Columns::ColumnId_Texture)));
-    undoStack.push(new CSMWorld::ModifyCommand(ltexTable, index, textureFileNameVariant));
-    undoStack.endMacro();
-    mBrushTexture = newId;
-}
-
 bool CSVRender::TerrainTextureMode::allowLandTextureEditing(const std::string& cellId)
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
@@ -831,7 +772,7 @@ void CSVRender::TerrainTextureMode::setBrushShape(CSVWidget::BrushShape brushSha
     }
 }
 
-void CSVRender::TerrainTextureMode::setBrushTexture(std::string brushTexture)
+void CSVRender::TerrainTextureMode::setBrushTexture(ESM::RefId brushTexture)
 {
-    mBrushTexture = std::move(brushTexture);
+    mBrushTexture = brushTexture;
 }
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index c4b0b5ffd4..6045f2e26b 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -117,14 +117,11 @@ namespace CSVRender
         void pushEditToCommand(CSMWorld::LandTexturesColumn::DataType& newLandGrid, CSMDoc::Document& document,
             CSMWorld::IdTable& landTable, std::string cellId);
 
-        /// \brief Create new land texture record from texture asset
-        void createTexture(const std::string& textureFileName);
-
         /// \brief Create new cell and land if needed
         bool allowLandTextureEditing(const std::string& textureFileName);
 
         std::string mCellId;
-        std::string mBrushTexture;
+        ESM::RefId mBrushTexture;
         int mBrushSize;
         CSVWidget::BrushShape mBrushShape;
         std::unique_ptr<BrushDraw> mBrushDraw;
@@ -139,13 +136,13 @@ namespace CSVRender
         const int landTextureSize{ ESM::Land::LAND_TEXTURE_SIZE };
 
     signals:
-        void passBrushTexture(std::string brushTexture);
+        void passBrushTexture(ESM::RefId brushTexture);
 
     public slots:
         void handleDropEvent(QDropEvent* event);
         void setBrushSize(int brushSize);
         void setBrushShape(CSVWidget::BrushShape brushShape);
-        void setBrushTexture(std::string brushShape);
+        void setBrushTexture(ESM::RefId brushShape);
     };
 }
 
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index fee608b200..a7d8af0a62 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -79,7 +79,7 @@ CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget(
 
     update();
 
-    mCell = std::make_unique<Cell>(document.getData(), mRootNode, mCellId);
+    mCell = std::make_unique<Cell>(document, mRootNode, mCellId);
 }
 
 void CSVRender::UnpagedWorldspaceWidget::cellDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
@@ -127,7 +127,7 @@ bool CSVRender::UnpagedWorldspaceWidget::handleDrop(
 
     mCellId = universalIdData.begin()->getId();
 
-    mCell = std::make_unique<Cell>(getDocument().getData(), mRootNode, mCellId);
+    mCell = std::make_unique<Cell>(getDocument(), mRootNode, mCellId);
     mCamPositionSet = false;
     mOrbitCamControl->reset();
 
@@ -199,6 +199,16 @@ std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::UnpagedWorldspaceWidget
     return mCell->getSelection(elementMask);
 }
 
+void CSVRender::UnpagedWorldspaceWidget::selectGroup(const std::vector<std::string>& group) const
+{
+    mCell->selectFromGroup(group);
+}
+
+void CSVRender::UnpagedWorldspaceWidget::unhideAll() const
+{
+    mCell->unhideAll();
+}
+
 std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::UnpagedWorldspaceWidget::getEdited(
     unsigned int elementMask) const
 {
@@ -337,7 +347,6 @@ void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons(CSVWidget:
 {
     WorldspaceWidget::addVisibilitySelectorButtons(tool);
     tool->addButton(Button_Terrain, Mask_Terrain, "Terrain", "", true);
-    tool->addButton(Button_Fog, Mask_Fog, "Fog");
 }
 
 std::string CSVRender::UnpagedWorldspaceWidget::getStartupInstruction()
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 10446354e9..89c916415d 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -93,6 +93,10 @@ namespace CSVRender
 
         std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const override;
 
+        void selectGroup(const std::vector<std::string>& group) const override;
+
+        void unhideAll() const override;
+
         std::vector<osg::ref_ptr<TagBase>> getEdited(unsigned int elementMask) const override;
 
         void setSubMode(int subMode, unsigned int elementMask) override;
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 6911f5f043..0a02ae456b 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -23,6 +23,7 @@
 #include <apps/opencs/view/widget/modebutton.hpp>
 
 #include <components/esm/defs.hpp>
+#include <components/misc/scalableicon.hpp>
 
 #include <osg/Camera>
 #include <osg/Group>
@@ -50,6 +51,7 @@
 
 #include "cameracontroller.hpp"
 #include "instancemode.hpp"
+#include "mask.hpp"
 #include "object.hpp"
 #include "pathgridmode.hpp"
 
@@ -73,6 +75,7 @@ CSVRender::WorldspaceWidget::WorldspaceWidget(CSMDoc::Document& document, QWidge
     , mShowToolTips(false)
     , mToolTipDelay(0)
     , mInConstructor(true)
+    , mSelectedNavigationMode(0)
 {
     setAcceptDrops(true);
 
@@ -135,6 +138,19 @@ CSVRender::WorldspaceWidget::WorldspaceWidget(CSMDoc::Document& document, QWidge
     CSMPrefs::Shortcut* abortShortcut = new CSMPrefs::Shortcut("scene-edit-abort", this);
     connect(abortShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &WorldspaceWidget::abortDrag);
 
+    connect(new CSMPrefs::Shortcut("scene-toggle-visibility", this), qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &WorldspaceWidget::toggleHiddenInstances);
+
+    connect(new CSMPrefs::Shortcut("scene-unhide-all", this), qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &WorldspaceWidget::unhideAll);
+
+    connect(new CSMPrefs::Shortcut("scene-clear-selection", this), qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        [this] { this->clearSelection(Mask_Reference); });
+
+    CSMPrefs::Shortcut* switchPerspectiveShortcut = new CSMPrefs::Shortcut("scene-cam-cycle", this);
+    connect(switchPerspectiveShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this,
+        &WorldspaceWidget::cycleNavigationMode);
+
     mInConstructor = false;
 }
 
@@ -174,11 +190,11 @@ void CSVRender::WorldspaceWidget::selectDefaultNavigationMode()
 
 void CSVRender::WorldspaceWidget::centerOrbitCameraOnSelection()
 {
-    std::vector<osg::ref_ptr<TagBase>> selection = getSelection(~0u);
+    std::vector<osg::ref_ptr<TagBase>> selection = getSelection(Mask_Reference);
 
     for (std::vector<osg::ref_ptr<TagBase>>::iterator it = selection.begin(); it != selection.end(); ++it)
     {
-        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(it->get()))
+        if (CSVRender::ObjectTag* objectTag = static_cast<CSVRender::ObjectTag*>(it->get()))
         {
             mOrbitCamControl->setCenter(objectTag->mObject->getPosition().asVec3());
         }
@@ -210,7 +226,7 @@ CSVWidget::SceneToolMode* CSVRender::WorldspaceWidget::makeNavigationSelector(CS
         "<li>Hold {free-forward:mod} to speed up movement</li>"
         "</ul>");
     tool->addButton(
-        new CSVRender::OrbitCameraMode(this, QIcon(":scenetoolbar/orbiting-camera"),
+        new CSVRender::OrbitCameraMode(this, Misc::ScalableIcon::load(":scenetoolbar/orbiting-camera"),
             "Orbiting Camera"
             "<ul><li>Always facing the centre point</li>"
             "<li>Rotate around the centre point via {orbit-up}, {orbit-left}, {orbit-down}, {orbit-right} or by moving "
@@ -224,9 +240,11 @@ CSVWidget::SceneToolMode* CSVRender::WorldspaceWidget::makeNavigationSelector(CS
             tool),
         "orbit");
 
-    connect(tool, &CSVWidget::SceneToolMode::modeChanged, this, &WorldspaceWidget::selectNavigationMode);
+    mCameraMode = tool;
 
-    return tool;
+    connect(mCameraMode, &CSVWidget::SceneToolMode::modeChanged, this, &WorldspaceWidget::selectNavigationMode);
+
+    return mCameraMode;
 }
 
 CSVWidget::SceneToolToggle2* CSVRender::WorldspaceWidget::makeSceneVisibilitySelector(CSVWidget::SceneToolbar* parent)
@@ -430,7 +448,7 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick(
             osg::Node* node = *nodeIter;
             if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase*>(node->getUserData()))
             {
-                WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() };
+                WorldspaceHitResult hit = { true, std::move(tag), 0, 0, 0, intersection.getWorldIntersectPoint() };
                 if (intersection.indexList.size() >= 3)
                 {
                     hit.index0 = intersection.indexList[0];
@@ -740,6 +758,44 @@ void CSVRender::WorldspaceWidget::speedMode(bool activate)
     mSpeedMode = activate;
 }
 
+void CSVRender::WorldspaceWidget::toggleHiddenInstances()
+{
+    const std::vector<osg::ref_ptr<TagBase>> selection = getSelection(Mask_Reference);
+
+    if (selection.empty())
+        return;
+
+    const CSVRender::ObjectTag* firstSelection = static_cast<CSVRender::ObjectTag*>(selection.begin()->get());
+    assert(firstSelection != nullptr);
+
+    const CSVRender::Mask firstMask
+        = firstSelection->mObject->getRootNode()->getNodeMask() == Mask_Hidden ? Mask_Reference : Mask_Hidden;
+
+    for (const auto& object : selection)
+        if (const auto objectTag = static_cast<CSVRender::ObjectTag*>(object.get()))
+            objectTag->mObject->getRootNode()->setNodeMask(firstMask);
+}
+
+void CSVRender::WorldspaceWidget::cycleNavigationMode()
+{
+    switch (++mSelectedNavigationMode)
+    {
+        case (CameraMode::FirstPerson):
+            mCameraMode->setButton("1st");
+            break;
+        case (CameraMode::Orbit):
+            mCameraMode->setButton("orbit");
+            break;
+        case (CameraMode::Free):
+            mCameraMode->setButton("free");
+            break;
+        default:
+            mCameraMode->setButton("1st");
+            mSelectedNavigationMode = 0;
+            break;
+    }
+}
+
 void CSVRender::WorldspaceWidget::handleInteraction(InteractionType type, bool activate)
 {
     if (activate)
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 442f4922f0..9a7df38620 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -75,6 +75,7 @@ namespace CSVRender
         CSMDoc::Document& mDocument;
         unsigned int mInteractionMask;
         CSVWidget::SceneToolMode* mEditMode;
+        CSVWidget::SceneToolMode* mCameraMode;
         bool mLocked;
         int mDragMode;
         bool mDragging;
@@ -89,6 +90,7 @@ namespace CSVRender
         bool mShowToolTips;
         int mToolTipDelay;
         bool mInConstructor;
+        int mSelectedNavigationMode;
 
     public:
         enum DropType
@@ -201,6 +203,10 @@ namespace CSVRender
 
         virtual std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const = 0;
 
+        virtual void selectGroup(const std::vector<std::string>&) const = 0;
+
+        virtual void unhideAll() const = 0;
+
         virtual std::vector<osg::ref_ptr<TagBase>> getEdited(unsigned int elementMask) const = 0;
 
         virtual void setSubMode(int subMode, unsigned int elementMask) = 0;
@@ -218,8 +224,14 @@ namespace CSVRender
             Button_Reference = 0x1,
             Button_Pathgrid = 0x2,
             Button_Water = 0x4,
-            Button_Fog = 0x8,
-            Button_Terrain = 0x10
+            Button_Terrain = 0x8
+        };
+
+        enum CameraMode
+        {
+            FirstPerson,
+            Orbit,
+            Free
         };
 
         virtual void addVisibilitySelectorButtons(CSVWidget::SceneToolToggle2* tool);
@@ -237,6 +249,8 @@ namespace CSVRender
 
         bool getSpeedMode();
 
+        void cycleNavigationMode();
+
     private:
         void dragEnterEvent(QDragEnterEvent* event) override;
 
@@ -300,6 +314,8 @@ namespace CSVRender
 
         void speedMode(bool activate);
 
+        void toggleHiddenInstances();
+
     protected slots:
 
         void elementSelectionChanged();
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index f2795d6de9..f11d7489a8 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -10,6 +10,8 @@
 #include <apps/opencs/view/widget/pushbutton.hpp>
 #include <apps/opencs/view/widget/scenetool.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 #include <type_traits>
 #include <utility>
 
@@ -94,7 +96,7 @@ void CSVWidget::SceneToolMode::showPanel(const QPoint& position)
 
 void CSVWidget::SceneToolMode::addButton(const std::string& icon, const std::string& id, const QString& tooltip)
 {
-    ModeButton* button = new ModeButton(QIcon(QPixmap(icon.c_str())), tooltip, mPanel);
+    ModeButton* button = new ModeButton(Misc::ScalableIcon::load(icon.c_str()), tooltip, mPanel);
     addButton(button, id);
 }
 
diff --git a/apps/opencs/view/widget/scenetoolrun.cpp b/apps/opencs/view/widget/scenetoolrun.cpp
index 6313f10fa9..59d5bf4d5e 100644
--- a/apps/opencs/view/widget/scenetoolrun.cpp
+++ b/apps/opencs/view/widget/scenetoolrun.cpp
@@ -8,6 +8,8 @@
 #include <QHeaderView>
 #include <QTableWidget>
 
+#include <components/misc/scalableicon.hpp>
+
 #include <apps/opencs/view/widget/pushbutton.hpp>
 #include <apps/opencs/view/widget/scenetool.hpp>
 
@@ -60,7 +62,7 @@ CSVWidget::SceneToolRun::SceneToolRun(
     , mSelected(mProfiles.begin())
     , mToolTip(toolTip)
 {
-    setIcon(QIcon(icon));
+    setIcon(Misc::ScalableIcon::load(icon));
     updateIcon();
     adjustToolTips();
 
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp
index 57b78ffc71..d7034cac07 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@@ -16,6 +16,8 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
+#include <components/misc/scalableicon.hpp>
+
 #include <apps/opencs/model/prefs/category.hpp>
 #include <apps/opencs/model/prefs/setting.hpp>
 #include <apps/opencs/view/widget/pushbutton.hpp>
@@ -60,10 +62,10 @@ CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidge
     : QFrame(parent, Qt::Popup)
     , mDocument(document)
 {
-    mButtonPoint = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-point")), "", this);
-    mButtonSquare = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-square")), "", this);
-    mButtonCircle = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-circle")), "", this);
-    mButtonCustom = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-custom")), "", this);
+    mButtonPoint = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-point"), "", this);
+    mButtonSquare = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-square"), "", this);
+    mButtonCircle = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-circle"), "", this);
+    mButtonCustom = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-custom"), "", this);
 
     mSizeSliders = new ShapeBrushSizeControls("Brush size", this);
 
@@ -107,6 +109,7 @@ CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidge
     mToolSelector->addItem(tr("Height, lower (paint)"));
     mToolSelector->addItem(tr("Smooth (paint)"));
     mToolSelector->addItem(tr("Flatten (paint)"));
+    mToolSelector->addItem(tr("Equalize (paint)"));
 
     QLabel* brushStrengthLabel = new QLabel(this);
     brushStrengthLabel->setText("Brush strength:");
@@ -201,25 +204,25 @@ void CSVWidget::SceneToolShapeBrush::setButtonIcon(CSVWidget::BrushShape brushSh
     {
         case BrushShape_Point:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-point")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-point"));
             tooltip += mShapeBrushWindow->toolTipPoint;
             break;
 
         case BrushShape_Square:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-square")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-square"));
             tooltip += mShapeBrushWindow->toolTipSquare;
             break;
 
         case BrushShape_Circle:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-circle")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-circle"));
             tooltip += mShapeBrushWindow->toolTipCircle;
             break;
 
         case BrushShape_Custom:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-custom")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-custom"));
             tooltip += mShapeBrushWindow->toolTipCustom;
             break;
     }
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp
index cc372753f6..27d628a384 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@@ -27,17 +27,19 @@
 #include <apps/opencs/model/prefs/category.hpp>
 #include <apps/opencs/model/prefs/setting.hpp>
 #include <apps/opencs/model/world/columns.hpp>
+#include <apps/opencs/model/world/commandmacro.hpp>
 #include <apps/opencs/model/world/record.hpp>
 #include <apps/opencs/view/widget/brushshapes.hpp>
 #include <apps/opencs/view/widget/pushbutton.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idcollection.hpp"
 #include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
 #include "../../model/world/universalid.hpp"
 
 namespace CSVWidget
@@ -72,12 +74,12 @@ CSVWidget::TextureBrushWindow::TextureBrushWindow(CSMDoc::Document& document, QW
     : QFrame(parent, Qt::Popup)
     , mDocument(document)
 {
-    mBrushTextureLabel = "Selected texture: " + mBrushTexture + " ";
+    mBrushTextureLabel = "Selected texture: " + mBrushTexture.getRefIdString() + " ";
 
-    CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
+    CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
 
     int landTextureFilename = landtexturesCollection.findColumnIndex(CSMWorld::Columns::ColumnId_Texture);
-    const int index = landtexturesCollection.searchId(ESM::RefId::stringRefId(mBrushTexture));
+    const int index = landtexturesCollection.searchId(mBrushTexture);
 
     if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
     {
@@ -90,10 +92,10 @@ CSVWidget::TextureBrushWindow::TextureBrushWindow(CSMDoc::Document& document, QW
         mSelectedBrush = new QLabel(QString::fromStdString(mBrushTextureLabel));
     }
 
-    mButtonPoint = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-point")), "", this);
-    mButtonSquare = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-square")), "", this);
-    mButtonCircle = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-circle")), "", this);
-    mButtonCustom = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-custom")), "", this);
+    mButtonPoint = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-point"), "", this);
+    mButtonSquare = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-square"), "", this);
+    mButtonCircle = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-circle"), "", this);
+    mButtonCustom = new QPushButton(Misc::ScalableIcon::load(":scenetoolbar/brush-custom"), "", this);
 
     mSizeSliders = new BrushSizeControls("Brush size", this);
 
@@ -152,68 +154,38 @@ void CSVWidget::TextureBrushWindow::configureButtonInitialSettings(QPushButton*
     button->setCheckable(true);
 }
 
-void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
+void CSVWidget::TextureBrushWindow::setBrushTexture(ESM::RefId brushTexture)
 {
     CSMWorld::IdTable& ltexTable = dynamic_cast<CSMWorld::IdTable&>(
         *mDocument.getData().getTableModel(CSMWorld::UniversalId::Type_LandTextures));
     QUndoStack& undoStack = mDocument.getUndoStack();
 
-    CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
+    CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
     int landTextureFilename = landtexturesCollection.findColumnIndex(CSMWorld::Columns::ColumnId_Texture);
 
-    int index = 0;
-    int pluginInDragged = 0;
-    CSMWorld::LandTexture::parseUniqueRecordId(brushTexture, pluginInDragged, index);
-    const ESM::RefId brushTextureRefId = ESM::RefId::stringRefId(brushTexture);
-    std::string newBrushTextureId = CSMWorld::LandTexture::createUniqueRecordId(0, index);
-    ESM::RefId newBrushTextureRefId = ESM::RefId::stringRefId(newBrushTextureId);
-    int rowInBase = landtexturesCollection.searchId(brushTextureRefId);
-    int rowInNew = landtexturesCollection.searchId(newBrushTextureRefId);
+    int row = landtexturesCollection.getIndex(brushTexture);
+    const auto& record = landtexturesCollection.getRecord(row);
 
-    // Check if texture exists in current plugin, and clone if id found in base, otherwise reindex the texture
-    // TO-DO: Handle case when texture is not found in neither base or plugin properly (finding new index is not enough)
-    // TO-DO: Handle conflicting plugins properly
-    if (rowInNew == -1)
+    if (!record.isDeleted())
     {
-        if (rowInBase == -1)
+        // Ensure the texture is defined by the current plugin
+        if (!record.isModified())
         {
-            int counter = 0;
-            bool freeIndexFound = false;
-            const int maxCounter = std::numeric_limits<uint16_t>::max() - 1;
-            do
-            {
-                newBrushTextureId = CSMWorld::LandTexture::createUniqueRecordId(0, counter);
-                newBrushTextureRefId = ESM::RefId::stringRefId(newBrushTextureId);
-                if (landtexturesCollection.searchId(brushTextureRefId) != -1
-                    && landtexturesCollection.getRecord(brushTextureRefId).isDeleted() == 0
-                    && landtexturesCollection.searchId(newBrushTextureRefId) != -1
-                    && landtexturesCollection.getRecord(newBrushTextureRefId).isDeleted() == 0)
-                    counter = (counter + 1) % maxCounter;
-                else
-                    freeIndexFound = true;
-            } while (freeIndexFound == false || counter < maxCounter);
+            CSMWorld::CommandMacro macro(undoStack);
+            macro.push(new CSMWorld::TouchCommand(ltexTable, brushTexture.getRefIdString()));
         }
-
-        undoStack.beginMacro("Add land texture record");
-        undoStack.push(new CSMWorld::CloneCommand(
-            ltexTable, brushTexture, newBrushTextureId, CSMWorld::UniversalId::Type_LandTexture));
-        undoStack.endMacro();
-    }
-
-    if (index != -1 && !landtexturesCollection.getRecord(rowInNew).isDeleted())
-    {
-        mBrushTextureLabel = "Selected texture: " + newBrushTextureId + " ";
+        mBrushTextureLabel = "Selected texture: " + brushTexture.getRefIdString() + " ";
         mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel)
-            + landtexturesCollection.getData(rowInNew, landTextureFilename).value<QString>());
+            + landtexturesCollection.getData(row, landTextureFilename).value<QString>());
     }
     else
     {
-        newBrushTextureId.clear();
+        brushTexture = {};
         mBrushTextureLabel = "No selected texture or invalid texture";
         mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel));
     }
 
-    mBrushTexture = newBrushTextureId;
+    mBrushTexture = brushTexture;
 
     emit passTextureId(mBrushTexture);
     emit passBrushShape(mBrushShape); // updates the icon tooltip
@@ -248,7 +220,6 @@ CSVWidget::SceneToolTextureBrush::SceneToolTextureBrush(
     , mTextureBrushWindow(new TextureBrushWindow(document, this))
 {
     mBrushHistory.resize(1);
-    mBrushHistory[0] = "L0#0";
 
     setAcceptDrops(true);
     connect(mTextureBrushWindow, &TextureBrushWindow::passBrushShape, this, &SceneToolTextureBrush::setButtonIcon);
@@ -282,39 +253,40 @@ void CSVWidget::SceneToolTextureBrush::setButtonIcon(CSVWidget::BrushShape brush
     {
         case BrushShape_Point:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-point")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-point"));
             tooltip += mTextureBrushWindow->toolTipPoint;
             break;
 
         case BrushShape_Square:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-square")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-square"));
             tooltip += mTextureBrushWindow->toolTipSquare;
             break;
 
         case BrushShape_Circle:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-circle")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-circle"));
             tooltip += mTextureBrushWindow->toolTipCircle;
             break;
 
         case BrushShape_Custom:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-custom")));
+            setIcon(Misc::ScalableIcon::load(":scenetoolbar/brush-custom"));
             tooltip += mTextureBrushWindow->toolTipCustom;
             break;
     }
 
     tooltip += "<p>(right click to access of previously used brush settings)";
 
-    CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
+    CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
 
     int landTextureFilename = landtexturesCollection.findColumnIndex(CSMWorld::Columns::ColumnId_Texture);
-    const int index = landtexturesCollection.searchId(ESM::RefId::stringRefId(mTextureBrushWindow->mBrushTexture));
+    const int index = landtexturesCollection.searchId(mTextureBrushWindow->mBrushTexture);
 
     if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
     {
-        tooltip += "<p>Selected texture: " + QString::fromStdString(mTextureBrushWindow->mBrushTexture) + " ";
+        tooltip += "<p>Selected texture: " + QString::fromStdString(mTextureBrushWindow->mBrushTexture.getRefIdString())
+            + " ";
 
         tooltip += landtexturesCollection.getData(index, landTextureFilename).value<QString>();
     }
@@ -340,25 +312,25 @@ void CSVWidget::SceneToolTextureBrush::updatePanel()
 
     for (int i = mBrushHistory.size() - 1; i >= 0; --i)
     {
-        CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
+        CSMWorld::IdCollection<ESM::LandTexture>& landtexturesCollection = mDocument.getData().getLandTextures();
         int landTextureFilename = landtexturesCollection.findColumnIndex(CSMWorld::Columns::ColumnId_Texture);
-        const int index = landtexturesCollection.searchId(ESM::RefId::stringRefId(mBrushHistory[i]));
+        const int index = landtexturesCollection.searchId(mBrushHistory[i]);
 
         if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
         {
             mTable->setItem(i, 1,
                 new QTableWidgetItem(landtexturesCollection.getData(index, landTextureFilename).value<QString>()));
-            mTable->setItem(i, 0, new QTableWidgetItem(QString::fromStdString(mBrushHistory[i])));
+            mTable->setItem(i, 0, new QTableWidgetItem(QString::fromStdString(mBrushHistory[i].getRefIdString())));
         }
         else
         {
             mTable->setItem(i, 1, new QTableWidgetItem("Invalid/deleted texture"));
-            mTable->setItem(i, 0, new QTableWidgetItem(QString::fromStdString(mBrushHistory[i])));
+            mTable->setItem(i, 0, new QTableWidgetItem(QString::fromStdString(mBrushHistory[i].getRefIdString())));
         }
     }
 }
 
-void CSVWidget::SceneToolTextureBrush::updateBrushHistory(const std::string& brushTexture)
+void CSVWidget::SceneToolTextureBrush::updateBrushHistory(ESM::RefId brushTexture)
 {
     mBrushHistory.insert(mBrushHistory.begin(), brushTexture);
     if (mBrushHistory.size() > 5)
@@ -369,7 +341,7 @@ void CSVWidget::SceneToolTextureBrush::clicked(const QModelIndex& index)
 {
     if (index.column() == 0 || index.column() == 1)
     {
-        std::string brushTexture = mBrushHistory[index.row()];
+        ESM::RefId brushTexture = mBrushHistory[index.row()];
         std::swap(mBrushHistory[index.row()], mBrushHistory[0]);
         mTextureBrushWindow->setBrushTexture(brushTexture);
         emit passTextureId(brushTexture);
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.hpp b/apps/opencs/view/widget/scenetooltexturebrush.hpp
index 940ab60ee7..09c7ef43f0 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.hpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.hpp
@@ -9,6 +9,8 @@
 #include "scenetool.hpp"
 #endif
 
+#include <components/esm/refid.hpp>
+
 class QTableWidget;
 class QDragEnterEvent;
 class QDropEvent;
@@ -70,7 +72,7 @@ namespace CSVWidget
     private:
         CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
         int mBrushSize = 1;
-        std::string mBrushTexture = "L0#0";
+        ESM::RefId mBrushTexture;
         CSMDoc::Document& mDocument;
         QLabel* mSelectedBrush;
         QGroupBox* mHorizontalGroupBox;
@@ -85,14 +87,14 @@ namespace CSVWidget
         friend class CSVRender::TerrainTextureMode;
 
     public slots:
-        void setBrushTexture(std::string brushTexture);
+        void setBrushTexture(ESM::RefId brushTexture);
         void setBrushShape();
         void setBrushSize(int brushSize);
 
     signals:
         void passBrushSize(int brushSize);
         void passBrushShape(CSVWidget::BrushShape brushShape);
-        void passTextureId(std::string brushTexture);
+        void passTextureId(ESM::RefId brushTexture);
     };
 
     class SceneToolTextureBrush : public SceneTool
@@ -103,7 +105,7 @@ namespace CSVWidget
         CSMDoc::Document& mDocument;
         QFrame* mPanel;
         QTableWidget* mTable;
-        std::vector<std::string> mBrushHistory;
+        std::vector<ESM::RefId> mBrushHistory;
         TextureBrushWindow* mTextureBrushWindow;
 
     private:
@@ -122,14 +124,14 @@ namespace CSVWidget
 
     public slots:
         void setButtonIcon(CSVWidget::BrushShape brushShape);
-        void updateBrushHistory(const std::string& mBrushTexture);
+        void updateBrushHistory(ESM::RefId mBrushTexture);
         void clicked(const QModelIndex& index);
         void activate() override;
 
     signals:
         void passEvent(QDropEvent* event);
         void passEvent(QDragEnterEvent* event);
-        void passTextureId(std::string brushTexture);
+        void passTextureId(ESM::RefId brushTexture);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 8dbd1e804c..9e1e8b11c6 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -10,6 +10,8 @@
 
 #include <apps/opencs/view/widget/scenetool.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 #include "pushbutton.hpp"
 #include "scenetoolbar.hpp"
 
@@ -50,7 +52,7 @@ void CSVWidget::SceneToolToggle2::adjustIcon()
 
     std::ostringstream stream;
     stream << mCompositeIcon << buttonIds;
-    setIcon(QIcon(QString::fromUtf8(stream.str().c_str())));
+    setIcon(Misc::ScalableIcon::load(QString::fromUtf8(stream.str().c_str())));
 }
 
 CSVWidget::SceneToolToggle2::SceneToolToggle2(
@@ -87,8 +89,8 @@ void CSVWidget::SceneToolToggle2::addButton(
     std::ostringstream stream;
     stream << mSingleIcon << id;
 
-    PushButton* button = new PushButton(
-        QIcon(QPixmap(stream.str().c_str())), PushButton::Type_Toggle, tooltip.isEmpty() ? name : tooltip, mPanel);
+    PushButton* button = new PushButton(Misc::ScalableIcon::load(stream.str().c_str()), PushButton::Type_Toggle,
+        tooltip.isEmpty() ? name : tooltip, mPanel);
 
     button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     button->setIconSize(QSize(mIconSize, mIconSize));
diff --git a/apps/opencs/view/world/datadisplaydelegate.cpp b/apps/opencs/view/world/datadisplaydelegate.cpp
index fc6a2b7d80..c642a05e2b 100644
--- a/apps/opencs/view/world/datadisplaydelegate.cpp
+++ b/apps/opencs/view/world/datadisplaydelegate.cpp
@@ -17,6 +17,8 @@
 #include <apps/opencs/view/world/enumdelegate.hpp>
 #include <apps/opencs/view/world/util.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 class QModelIndex;
 class QObject;
 
@@ -39,14 +41,45 @@ CSVWorld::DataDisplayDelegate::DataDisplayDelegate(const ValueList& values, cons
     , mIconSize(QSize(16, 16))
     , mHorizontalMargin(QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1)
     , mTextLeftOffset(8)
+    , mPixmapsColor(QApplication::palette().text().color())
+    , mUiScale(static_cast<QGuiApplication*>(QGuiApplication::instance())->devicePixelRatio())
     , mSettingKey(pageName + '/' + settingName)
 {
+    if (parent)
+        parent->installEventFilter(this);
+
     buildPixmaps();
 
     if (!pageName.empty())
         updateDisplayMode(CSMPrefs::get()[pageName][settingName].toString());
 }
 
+bool CSVWorld::DataDisplayDelegate::eventFilter(QObject* target, QEvent* event)
+{
+    if (event->type() == QEvent::Resize)
+    {
+        auto uiScale = static_cast<QGuiApplication*>(QGuiApplication::instance())->devicePixelRatio();
+        if (mUiScale != uiScale)
+        {
+            mUiScale = uiScale;
+
+            buildPixmaps();
+        }
+    }
+    else if (event->type() == QEvent::PaletteChange)
+    {
+        QColor themeColor = QApplication::palette().text().color();
+        if (themeColor != mPixmapsColor)
+        {
+            mPixmapsColor = std::move(themeColor);
+
+            buildPixmaps();
+        }
+    }
+
+    return false;
+}
+
 void CSVWorld::DataDisplayDelegate::buildPixmaps()
 {
     if (!mPixmaps.empty())
@@ -161,7 +194,7 @@ void CSVWorld::DataDisplayDelegateFactory::add(int enumValue, const QString& enu
     Icon icon;
     icon.mValue = enumValue;
     icon.mName = enumName;
-    icon.mIcon = QIcon(iconFilename);
+    icon.mIcon = Misc::ScalableIcon::load(iconFilename);
 
     for (auto it = mIcons.begin(); it != mIcons.end(); ++it)
     {
diff --git a/apps/opencs/view/world/datadisplaydelegate.hpp b/apps/opencs/view/world/datadisplaydelegate.hpp
index 087fc2a084..3b3c935d8b 100755
--- a/apps/opencs/view/world/datadisplaydelegate.hpp
+++ b/apps/opencs/view/world/datadisplaydelegate.hpp
@@ -41,6 +41,7 @@ namespace CSVWorld
 
     class DataDisplayDelegate : public EnumDelegate
     {
+        Q_OBJECT
     public:
         typedef std::vector<Icon> IconList;
         typedef std::vector<std::pair<int, QString>> ValueList;
@@ -61,6 +62,8 @@ namespace CSVWorld
         QSize mIconSize;
         int mHorizontalMargin;
         int mTextLeftOffset;
+        QColor mPixmapsColor;
+        qreal mUiScale;
 
         std::string mSettingKey;
 
@@ -80,6 +83,8 @@ namespace CSVWorld
         /// offset the horizontal position of the text from the right edge of the icon.  Default is 8 pixels.
         void setTextLeftOffset(int offset);
 
+        bool eventFilter(QObject* target, QEvent* event) override;
+
     private:
         /// update the display mode based on a passed string
         void updateDisplayMode(const std::string&);
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 24fe70af94..168e555eae 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -30,6 +30,7 @@
 #include <apps/opencs/model/prefs/setting.hpp>
 #include <apps/opencs/model/world/commanddispatcher.hpp>
 #include <apps/opencs/model/world/data.hpp>
+#include <apps/opencs/model/world/disabletag.hpp>
 #include <apps/opencs/model/world/idtablebase.hpp>
 #include <apps/opencs/model/world/universalid.hpp>
 #include <apps/opencs/view/doc/subview.hpp>
@@ -129,30 +130,24 @@ QWidget* CSVWorld::NotEditableSubDelegate::createEditor(
 /*
 ==============================DialogueDelegateDispatcherProxy==========================================
 */
-CSVWorld::DialogueDelegateDispatcherProxy::refWrapper::refWrapper(const QModelIndex& index)
-    : mIndex(index)
-{
-}
-
 CSVWorld::DialogueDelegateDispatcherProxy::DialogueDelegateDispatcherProxy(
     QWidget* editor, CSMWorld::ColumnBase::Display display)
     : mEditor(editor)
     , mDisplay(display)
-    , mIndexWrapper(nullptr)
 {
 }
 
 void CSVWorld::DialogueDelegateDispatcherProxy::editorDataCommited()
 {
-    if (mIndexWrapper.get())
+    if (mIndex.has_value())
     {
-        emit editorDataCommited(mEditor, mIndexWrapper->mIndex, mDisplay);
+        emit editorDataCommited(mEditor, mIndex.value(), mDisplay);
     }
 }
 
 void CSVWorld::DialogueDelegateDispatcherProxy::setIndex(const QModelIndex& index)
 {
-    mIndexWrapper = std::make_unique<refWrapper>(index);
+    mIndex = index;
 }
 
 QWidget* CSVWorld::DialogueDelegateDispatcherProxy::getEditor() const
@@ -655,7 +650,7 @@ void CSVWorld::EditWidget::remake(int row)
                         ++unlocked;
                     }
 
-                    if (mTable->index(row, i).data().type() == QVariant::UserType)
+                    if (CSMWorld::DisableTag::isDisableTag(mTable->index(row, i).data()))
                     {
                         editor->setEnabled(false);
                         label->setEnabled(false);
@@ -705,7 +700,7 @@ void CSVWorld::EditWidget::remake(int row)
                         unlockedLayout->addWidget(editor, unlocked, 1);
                         ++unlocked;
 
-                        if (tree->index(0, col, tree->index(row, i)).data().type() == QVariant::UserType)
+                        if (CSMWorld::DisableTag::isDisableTag(tree->index(0, col, tree->index(row, i)).data()))
                         {
                             editor->setEnabled(false);
                             label->setEnabled(false);
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index b5108f3b0e..4d05a956c9 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -74,23 +74,14 @@ namespace CSVWorld
             QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
     };
 
-    // this can't be nested into the DialogueDelegateDispatcher, because it needs to emit signals
     class DialogueDelegateDispatcherProxy : public QObject
     {
         Q_OBJECT
-        class refWrapper
-        {
-        public:
-            refWrapper(const QModelIndex& index);
-
-            const QModelIndex& mIndex;
-        };
-
         QWidget* mEditor;
 
         CSMWorld::ColumnBase::Display mDisplay;
 
-        std::unique_ptr<refWrapper> mIndexWrapper;
+        std::optional<QPersistentModelIndex> mIndex;
 
     public:
         DialogueDelegateDispatcherProxy(QWidget* editor, CSMWorld::ColumnBase::Display display);
diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index ae8c1cb708..a006779ba4 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -14,6 +14,8 @@
 #include <apps/opencs/model/world/columnbase.hpp>
 #include <apps/opencs/model/world/universalid.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 #include "dragdroputils.hpp"
 
 void CSVWorld::DragRecordTable::startDragFromTable(const CSVWorld::DragRecordTable& table, const QModelIndex& index)
@@ -29,7 +31,7 @@ void CSVWorld::DragRecordTable::startDragFromTable(const CSVWorld::DragRecordTab
     mime->setIndexAtDragStart(index);
     QDrag* drag = new QDrag(this);
     drag->setMimeData(mime);
-    drag->setPixmap(QString::fromUtf8(mime->getIcon().c_str()));
+    drag->setPixmap(Misc::ScalableIcon::load(mime->getIcon().c_str()).pixmap(QSize(16, 16)));
     drag->exec(Qt::CopyAction);
 }
 
@@ -92,7 +94,7 @@ void CSVWorld::DragRecordTable::dropEvent(QDropEvent* event)
     if (CSVWorld::DragDropUtils::isTopicOrJournal(*event, display))
     {
         const CSMWorld::TableMimeData* tableMimeData = CSVWorld::DragDropUtils::getTableMimeData(*event);
-        for (auto universalId : tableMimeData->getData())
+        for (const auto& universalId : tableMimeData->getData())
         {
             emit createNewInfoRecord(universalId.getId());
         }
diff --git a/apps/opencs/view/world/extendedcommandconfigurator.cpp b/apps/opencs/view/world/extendedcommandconfigurator.cpp
index 69659be8a6..97494fa076 100644
--- a/apps/opencs/view/world/extendedcommandconfigurator.cpp
+++ b/apps/opencs/view/world/extendedcommandconfigurator.cpp
@@ -146,7 +146,7 @@ void CSVWorld::ExtendedCommandConfigurator::setupCheckBoxes(const std::vector<CS
             CSMWorld::UniversalId type = types[counter];
             current->first->setText(QString::fromUtf8(type.getTypeName().c_str()));
             current->first->setChecked(true);
-            current->second = type;
+            current->second = std::move(type);
             ++counter;
         }
         else
diff --git a/apps/opencs/view/world/idcompletiondelegate.cpp b/apps/opencs/view/world/idcompletiondelegate.cpp
index 3e26ed9250..e39be392f4 100644
--- a/apps/opencs/view/world/idcompletiondelegate.cpp
+++ b/apps/opencs/view/world/idcompletiondelegate.cpp
@@ -46,41 +46,41 @@ QWidget* CSVWorld::IdCompletionDelegate::createEditor(QWidget* parent, const QSt
 
         switch (conditionFunction)
         {
-            case CSMWorld::ConstInfoSelectWrapper::Function_Global:
+            case ESM::DialogueCondition::Function_Global:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_GlobalVariable);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_Journal:
+            case ESM::DialogueCondition::Function_Journal:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Journal);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_Item:
+            case ESM::DialogueCondition::Function_Item:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_Dead:
-            case CSMWorld::ConstInfoSelectWrapper::Function_NotId:
+            case ESM::DialogueCondition::Function_Dead:
+            case ESM::DialogueCondition::Function_NotId:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_NotFaction:
+            case ESM::DialogueCondition::Function_NotFaction:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Faction);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_NotClass:
+            case ESM::DialogueCondition::Function_NotClass:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Class);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_NotRace:
+            case ESM::DialogueCondition::Function_NotRace:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Race);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_NotCell:
+            case ESM::DialogueCondition::Function_NotCell:
             {
                 return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_Cell);
             }
-            case CSMWorld::ConstInfoSelectWrapper::Function_Local:
-            case CSMWorld::ConstInfoSelectWrapper::Function_NotLocal:
+            case ESM::DialogueCondition::Function_Local:
+            case ESM::DialogueCondition::Function_NotLocal:
             {
                 return new CSVWidget::DropLineEdit(display, parent);
             }
diff --git a/apps/opencs/view/world/idvalidator.cpp b/apps/opencs/view/world/idvalidator.cpp
index 6f790d20cb..078bd6bce5 100644
--- a/apps/opencs/view/world/idvalidator.cpp
+++ b/apps/opencs/view/world/idvalidator.cpp
@@ -2,17 +2,6 @@
 
 #include <components/misc/strings/lower.hpp>
 
-bool CSVWorld::IdValidator::isValid(const QChar& c, bool first) const
-{
-    if (c.isLetter() || c == '_')
-        return true;
-
-    if (!first && (c.isDigit() || c.isSpace()))
-        return true;
-
-    return false;
-}
-
 CSVWorld::IdValidator::IdValidator(bool relaxed, QObject* parent)
     : QValidator(parent)
     , mRelaxed(relaxed)
@@ -92,7 +81,7 @@ QValidator::State CSVWorld::IdValidator::validate(QString& input, int& pos) cons
             {
                 prevScope = false;
 
-                if (!isValid(*iter, first))
+                if (!iter->isPrint())
                     return QValidator::Invalid;
             }
         }
diff --git a/apps/opencs/view/world/idvalidator.hpp b/apps/opencs/view/world/idvalidator.hpp
index e831542961..6b98d35672 100644
--- a/apps/opencs/view/world/idvalidator.hpp
+++ b/apps/opencs/view/world/idvalidator.hpp
@@ -13,9 +13,6 @@ namespace CSVWorld
         std::string mNamespace;
         mutable std::string mError;
 
-    private:
-        bool isValid(const QChar& c, bool first) const;
-
     public:
         IdValidator(bool relaxed = false, QObject* parent = nullptr);
         ///< \param relaxed Relaxed rules for IDs that also functino as user visible text
diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index f98fe5be5e..5ce83cc849 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -1,11 +1,12 @@
 #include "infocreator.hpp"
 
 #include <algorithm>
+#include <charconv>
 #include <memory>
 
 #include <QLabel>
+#include <QRandomGenerator>
 #include <QString>
-#include <QUuid>
 
 #include <apps/opencs/model/world/columnbase.hpp>
 #include <apps/opencs/model/world/idcollection.hpp>
@@ -27,15 +28,27 @@ class QUndoStack;
 
 std::string CSVWorld::InfoCreator::getId() const
 {
-    const std::string topic = mTopic->text().toStdString();
-
-    std::string unique = QUuid::createUuid().toByteArray().data();
-
-    unique.erase(std::remove(unique.begin(), unique.end(), '-'), unique.end());
-
-    unique = unique.substr(1, unique.size() - 2);
-
-    return topic + '#' + unique;
+    std::string id = mTopic->text().toStdString();
+    size_t length = id.size();
+    // We want generated ids to be at most 31 + \0 characters
+    id.resize(length + 32);
+    id[length] = '#';
+    // Combine a random 32bit number with a random 64bit number for a max 30 character string
+    quint32 gen32 = QRandomGenerator::global()->generate();
+    char* start = id.data() + length + 1;
+    char* end = start + 10; // 2^32 is a 10 digit number
+    auto result = std::to_chars(start, end, gen32);
+    quint64 gen64 = QRandomGenerator::global()->generate64();
+    if (gen64)
+    {
+        // 0-pad the first number so 10 + 11 isn't the same as 101 + 1
+        std::fill(result.ptr, end, '0');
+        start = end;
+        end = start + 20; // 2^64 is a 20 digit number
+        result = std::to_chars(start, end, gen64);
+    }
+    id.resize(result.ptr - id.data());
+    return id;
 }
 
 void CSVWorld::InfoCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
diff --git a/apps/opencs/view/world/landtexturecreator.cpp b/apps/opencs/view/world/landtexturecreator.cpp
deleted file mode 100644
index a46e5b6dbe..0000000000
--- a/apps/opencs/view/world/landtexturecreator.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "landtexturecreator.hpp"
-
-#include <cstdint>
-#include <limits>
-#include <stddef.h>
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QSpinBox>
-
-#include <apps/opencs/model/world/columns.hpp>
-#include <apps/opencs/model/world/data.hpp>
-#include <apps/opencs/model/world/idcollection.hpp>
-#include <apps/opencs/view/world/genericcreator.hpp>
-
-#include "../../model/world/commands.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
-
-namespace CSVWorld
-{
-    LandTextureCreator::LandTextureCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id)
-        : GenericCreator(data, undoStack, id)
-    {
-        // One index is reserved for a default texture
-        const size_t MaxIndex = std::numeric_limits<uint16_t>::max() - 1;
-
-        setManualEditing(false);
-
-        QLabel* nameLabel = new QLabel("Name");
-        insertBeforeButtons(nameLabel, false);
-
-        mNameEdit = new QLineEdit(this);
-        insertBeforeButtons(mNameEdit, true);
-
-        QLabel* indexLabel = new QLabel("Index");
-        insertBeforeButtons(indexLabel, false);
-
-        mIndexBox = new QSpinBox(this);
-        mIndexBox->setMinimum(0);
-        mIndexBox->setMaximum(MaxIndex);
-        insertBeforeButtons(mIndexBox, true);
-
-        connect(mNameEdit, &QLineEdit::textChanged, this, &LandTextureCreator::nameChanged);
-        connect(mIndexBox, qOverload<int>(&QSpinBox::valueChanged), this, &LandTextureCreator::indexChanged);
-    }
-
-    void LandTextureCreator::cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type)
-    {
-        GenericCreator::cloneMode(originId, type);
-
-        CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()));
-
-        int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_TextureNickname);
-        mNameEdit->setText((table.data(table.getModelIndex(originId, column)).toString()));
-
-        column = table.findColumnIndex(CSMWorld::Columns::ColumnId_TextureIndex);
-        mIndexBox->setValue((table.data(table.getModelIndex(originId, column)).toInt()));
-    }
-
-    void LandTextureCreator::focus()
-    {
-        mIndexBox->setFocus();
-    }
-
-    void LandTextureCreator::reset()
-    {
-        GenericCreator::reset();
-        mNameEdit->setText("");
-        mIndexBox->setValue(0);
-    }
-
-    std::string LandTextureCreator::getErrors() const
-    {
-        if (getData().getLandTextures().searchId(ESM::RefId::stringRefId(getId())) >= 0)
-        {
-            return "Index is already in use";
-        }
-
-        return "";
-    }
-
-    void LandTextureCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
-    {
-        GenericCreator::configureCreateCommand(command);
-
-        CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*getData().getTableModel(getCollectionId()));
-        int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_TextureNickname);
-        command.addValue(column, mName.c_str());
-    }
-
-    std::string LandTextureCreator::getId() const
-    {
-        return CSMWorld::LandTexture::createUniqueRecordId(0, mIndexBox->value());
-    }
-
-    void LandTextureCreator::nameChanged(const QString& value)
-    {
-        mName = value.toUtf8().constData();
-        update();
-    }
-
-    void LandTextureCreator::indexChanged(int value)
-    {
-        update();
-    }
-}
diff --git a/apps/opencs/view/world/landtexturecreator.hpp b/apps/opencs/view/world/landtexturecreator.hpp
deleted file mode 100644
index a2ebf093fb..0000000000
--- a/apps/opencs/view/world/landtexturecreator.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef CSV_WORLD_LANDTEXTURECREATOR_H
-#define CSV_WORLD_LANDTEXTURECREATOR_H
-
-#include <string>
-
-#include "genericcreator.hpp"
-
-#include <apps/opencs/model/world/universalid.hpp>
-
-namespace CSMWorld
-{
-    class CreateCommand;
-    class Data;
-}
-
-class QLineEdit;
-class QSpinBox;
-
-namespace CSVWorld
-{
-    class LandTextureCreator : public GenericCreator
-    {
-        Q_OBJECT
-
-    public:
-        LandTextureCreator(CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
-
-        void cloneMode(const std::string& originId, const CSMWorld::UniversalId::Type type) override;
-
-        void focus() override;
-
-        void reset() override;
-
-        std::string getErrors() const override;
-
-    protected:
-        void configureCreateCommand(CSMWorld::CreateCommand& command) const override;
-
-        std::string getId() const override;
-
-    private slots:
-
-        void nameChanged(const QString& val);
-        void indexChanged(int val);
-
-    private:
-        QLineEdit* mNameEdit;
-        QSpinBox* mIndexBox;
-
-        std::string mName;
-    };
-}
-
-#endif
diff --git a/apps/opencs/view/world/recordbuttonbar.cpp b/apps/opencs/view/world/recordbuttonbar.cpp
index 67270bd1ed..e2655136a1 100644
--- a/apps/opencs/view/world/recordbuttonbar.cpp
+++ b/apps/opencs/view/world/recordbuttonbar.cpp
@@ -12,6 +12,8 @@
 
 #include "../world/tablebottombox.hpp"
 
+#include <components/misc/scalableicon.hpp>
+
 #include <apps/opencs/model/prefs/category.hpp>
 #include <apps/opencs/model/prefs/setting.hpp>
 #include <apps/opencs/model/world/columns.hpp>
@@ -68,12 +70,12 @@ CSVWorld::RecordButtonBar::RecordButtonBar(const CSMWorld::UniversalId& id, CSMW
 
     // left section
     mPrevButton = new QToolButton(this);
-    mPrevButton->setIcon(QIcon(":record-previous"));
+    mPrevButton->setIcon(Misc::ScalableIcon::load(":record-previous"));
     mPrevButton->setToolTip("Switch to previous record");
     buttonsLayout->addWidget(mPrevButton, 0);
 
     mNextButton = new QToolButton(this);
-    mNextButton->setIcon(QIcon(":/record-next"));
+    mNextButton->setIcon(Misc::ScalableIcon::load(":/record-next"));
     mNextButton->setToolTip("Switch to next record");
     buttonsLayout->addWidget(mNextButton, 1);
 
@@ -83,7 +85,7 @@ CSVWorld::RecordButtonBar::RecordButtonBar(const CSMWorld::UniversalId& id, CSMW
     if (mTable.getFeatures() & CSMWorld::IdTable::Feature_Preview)
     {
         QToolButton* previewButton = new QToolButton(this);
-        previewButton->setIcon(QIcon(":edit-preview"));
+        previewButton->setIcon(Misc::ScalableIcon::load(":edit-preview"));
         previewButton->setToolTip("Open a preview of this record");
         buttonsLayout->addWidget(previewButton);
         connect(previewButton, &QToolButton::clicked, this, &RecordButtonBar::showPreview);
@@ -92,7 +94,7 @@ CSVWorld::RecordButtonBar::RecordButtonBar(const CSMWorld::UniversalId& id, CSMW
     if (mTable.getFeatures() & CSMWorld::IdTable::Feature_View)
     {
         QToolButton* viewButton = new QToolButton(this);
-        viewButton->setIcon(QIcon(":/cell.png"));
+        viewButton->setIcon(Misc::ScalableIcon::load(":cell"));
         viewButton->setToolTip("Open a scene view of the cell this record is located in");
         buttonsLayout->addWidget(viewButton);
         connect(viewButton, &QToolButton::clicked, this, &RecordButtonBar::viewRecord);
@@ -100,22 +102,22 @@ CSVWorld::RecordButtonBar::RecordButtonBar(const CSMWorld::UniversalId& id, CSMW
 
     // right section
     mCloneButton = new QToolButton(this);
-    mCloneButton->setIcon(QIcon(":edit-clone"));
+    mCloneButton->setIcon(Misc::ScalableIcon::load(":edit-clone"));
     mCloneButton->setToolTip("Clone record");
     buttonsLayout->addWidget(mCloneButton);
 
     mAddButton = new QToolButton(this);
-    mAddButton->setIcon(QIcon(":edit-add"));
+    mAddButton->setIcon(Misc::ScalableIcon::load(":edit-add"));
     mAddButton->setToolTip("Add new record");
     buttonsLayout->addWidget(mAddButton);
 
     mDeleteButton = new QToolButton(this);
-    mDeleteButton->setIcon(QIcon(":edit-delete"));
+    mDeleteButton->setIcon(Misc::ScalableIcon::load(":edit-delete"));
     mDeleteButton->setToolTip("Delete record");
     buttonsLayout->addWidget(mDeleteButton);
 
     mRevertButton = new QToolButton(this);
-    mRevertButton->setIcon(QIcon(":edit-undo"));
+    mRevertButton->setIcon(Misc::ScalableIcon::load(":edit-undo"));
     mRevertButton->setToolTip("Revert record");
     buttonsLayout->addWidget(mRevertButton);
 
diff --git a/apps/opencs/view/world/referenceablecreator.cpp b/apps/opencs/view/world/referenceablecreator.cpp
index e13648d637..c4e20adf72 100644
--- a/apps/opencs/view/world/referenceablecreator.cpp
+++ b/apps/opencs/view/world/referenceablecreator.cpp
@@ -7,6 +7,8 @@
 
 #include <apps/opencs/view/world/genericcreator.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 #include "../../model/world/commands.hpp"
 #include "../../model/world/universalid.hpp"
 
@@ -38,7 +40,8 @@ CSVWorld::ReferenceableCreator::ReferenceableCreator(
     {
         CSMWorld::UniversalId id2(*iter, "");
 
-        mType->addItem(QIcon(id2.getIcon().c_str()), id2.getTypeName().c_str(), static_cast<int>(id2.getType()));
+        mType->addItem(Misc::ScalableIcon::load(id2.getIcon().c_str()), id2.getTypeName().c_str(),
+            static_cast<int>(id2.getType()));
     }
 
     mType->model()->sort(0);
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index a2847848d0..17d0016afc 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -224,6 +224,10 @@ CSVWorld::RegionMap::RegionMap(const CSMWorld::UniversalId& universalId, CSMDoc:
     addAction(mViewInTableAction);
 
     setAcceptDrops(true);
+
+    // Make columns square incase QSizeHint doesnt apply
+    for (int column = 0; column < this->model()->columnCount(); ++column)
+        this->setColumnWidth(column, this->rowHeight(0));
 }
 
 void CSVWorld::RegionMap::selectAll()
@@ -358,12 +362,23 @@ std::vector<CSMWorld::UniversalId> CSVWorld::RegionMap::getDraggedRecords() cons
     return ids;
 }
 
+void CSVWorld::RegionMap::dragMoveEvent(QDragMoveEvent* event)
+{
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
+    if (mime != nullptr && (mime->holdsType(CSMWorld::UniversalId::Type_Region)))
+    {
+        event->accept();
+        return;
+    }
+
+    event->ignore();
+}
+
 void CSVWorld::RegionMap::dropEvent(QDropEvent* event)
 {
     QModelIndex index = indexAt(event->pos());
 
     bool exists = QTableView::model()->data(index, Qt::BackgroundRole) != QBrush(Qt::DiagCrossPattern);
-
     if (!index.isValid() || !exists)
     {
         return;
diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp
index b6c5078ea3..137b47ed83 100644
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@@ -59,6 +59,8 @@ namespace CSVWorld
 
         void mouseMoveEvent(QMouseEvent* event) override;
 
+        void dragMoveEvent(QDragMoveEvent* event) override;
+
         void dropEvent(QDropEvent* event) override;
 
     public:
diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index c8505f007f..00acf71235 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -2,6 +2,7 @@
 
 #include <vector>
 
+#include <QApplication>
 #include <QDragEnterEvent>
 #include <QMenu>
 #include <QPainter>
@@ -424,6 +425,7 @@ void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent* event)
     painter.setBackgroundMode(Qt::OpaqueMode);
     QFont font = painter.font();
     QBrush background = painter.background();
+    QColor textColor = QApplication::palette().text().color();
 
     while (block.isValid() && top <= event->rect().bottom())
     {
@@ -440,7 +442,7 @@ void CSVWorld::ScriptEdit::lineNumberAreaPaintEvent(QPaintEvent* event)
             else
             {
                 painter.setBackground(background);
-                painter.setPen(Qt::black);
+                painter.setPen(textColor);
             }
             painter.setFont(newFont);
             painter.drawText(0, top, mLineNumberArea->width(), fontMetrics().height(), Qt::AlignRight, number);
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 793f2e58c1..aa6890904d 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -212,7 +212,7 @@ void CSVWorld::ScriptSubView::useHint(const std::string& hint)
     if (hint.empty())
         return;
 
-    unsigned line = 0, column = 0;
+    int line = 0, column = 0;
     char c;
     std::istringstream stream(hint.c_str() + 1);
     switch (hint[0])
@@ -222,8 +222,8 @@ void CSVWorld::ScriptSubView::useHint(const std::string& hint)
         {
             QModelIndex index = mModel->getModelIndex(getUniversalId().getId(), mColumn);
             QString source = mModel->data(index).toString();
-            unsigned stringSize = source.length();
-            unsigned pos, dummy;
+            int stringSize = static_cast<int>(source.length());
+            int pos, dummy;
             if (!(stream >> c >> dummy >> pos))
                 return;
 
@@ -234,7 +234,7 @@ void CSVWorld::ScriptSubView::useHint(const std::string& hint)
                 pos = stringSize;
             }
 
-            for (unsigned i = 0; i <= pos; ++i)
+            for (int i = 0; i <= pos; ++i)
             {
                 if (source[i] == '\n')
                 {
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index 0e1f34d2dd..8a47f95e63 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -10,7 +10,6 @@
 #include "globalcreator.hpp"
 #include "infocreator.hpp"
 #include "landcreator.hpp"
-#include "landtexturecreator.hpp"
 #include "pathgridcreator.hpp"
 #include "previewsubview.hpp"
 #include "referenceablecreator.hpp"
@@ -92,7 +91,7 @@ void CSVWorld::addSubViewFactories(CSVDoc::SubViewFactoryManager& manager)
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<LandCreator>>);
 
     manager.add(CSMWorld::UniversalId::Type_LandTextures,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<LandTextureCreator>>);
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GenericCreator>>);
 
     manager.add(CSMWorld::UniversalId::Type_Globals,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GlobalCreator>>);
@@ -195,7 +194,7 @@ void CSVWorld::addSubViewFactories(CSVDoc::SubViewFactoryManager& manager)
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<LandCreator>>(false));
 
     manager.add(CSMWorld::UniversalId::Type_LandTexture,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<LandTextureCreator>>(false));
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator>>(false));
 
     manager.add(CSMWorld::UniversalId::Type_DebugProfile,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView,
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 1e80805630..86a1e93bbd 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -25,6 +25,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/helpviewer.hpp>
+#include <components/misc/scalableicon.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
 #include "../../model/doc/document.hpp"
@@ -323,7 +324,7 @@ CSVWorld::Table::Table(const CSMWorld::UniversalId& id, bool createAndDelete, bo
 
     mEditAction = new QAction(tr("Edit Record"), this);
     connect(mEditAction, &QAction::triggered, this, &Table::editRecord);
-    mEditAction->setIcon(QIcon(":edit-edit"));
+    mEditAction->setIcon(Misc::ScalableIcon::load(":edit-edit"));
     addAction(mEditAction);
     CSMPrefs::Shortcut* editShortcut = new CSMPrefs::Shortcut("table-edit", this);
     editShortcut->associateAction(mEditAction);
@@ -332,14 +333,14 @@ CSVWorld::Table::Table(const CSMWorld::UniversalId& id, bool createAndDelete, bo
     {
         mCreateAction = new QAction(tr("Add Record"), this);
         connect(mCreateAction, &QAction::triggered, this, &Table::createRequest);
-        mCreateAction->setIcon(QIcon(":edit-add"));
+        mCreateAction->setIcon(Misc::ScalableIcon::load(":edit-add"));
         addAction(mCreateAction);
         CSMPrefs::Shortcut* createShortcut = new CSMPrefs::Shortcut("table-add", this);
         createShortcut->associateAction(mCreateAction);
 
         mCloneAction = new QAction(tr("Clone Record"), this);
         connect(mCloneAction, &QAction::triggered, this, &Table::cloneRecord);
-        mCloneAction->setIcon(QIcon(":edit-clone"));
+        mCloneAction->setIcon(Misc::ScalableIcon::load(":edit-clone"));
         addAction(mCloneAction);
         CSMPrefs::Shortcut* cloneShortcut = new CSMPrefs::Shortcut("table-clone", this);
         cloneShortcut->associateAction(mCloneAction);
@@ -349,7 +350,7 @@ CSVWorld::Table::Table(const CSMWorld::UniversalId& id, bool createAndDelete, bo
     {
         mTouchAction = new QAction(tr("Touch Record"), this);
         connect(mTouchAction, &QAction::triggered, this, &Table::touchRecord);
-        mTouchAction->setIcon(QIcon(":edit-touch"));
+        mTouchAction->setIcon(Misc::ScalableIcon::load(":edit-touch"));
         addAction(mTouchAction);
         CSMPrefs::Shortcut* touchShortcut = new CSMPrefs::Shortcut("table-touch", this);
         touchShortcut->associateAction(mTouchAction);
@@ -357,56 +358,56 @@ CSVWorld::Table::Table(const CSMWorld::UniversalId& id, bool createAndDelete, bo
 
     mRevertAction = new QAction(tr("Revert Record"), this);
     connect(mRevertAction, &QAction::triggered, mDispatcher, &CSMWorld::CommandDispatcher::executeRevert);
-    mRevertAction->setIcon(QIcon(":edit-undo"));
+    mRevertAction->setIcon(Misc::ScalableIcon::load(":edit-undo"));
     addAction(mRevertAction);
     CSMPrefs::Shortcut* revertShortcut = new CSMPrefs::Shortcut("table-revert", this);
     revertShortcut->associateAction(mRevertAction);
 
     mDeleteAction = new QAction(tr("Delete Record"), this);
     connect(mDeleteAction, &QAction::triggered, mDispatcher, &CSMWorld::CommandDispatcher::executeDelete);
-    mDeleteAction->setIcon(QIcon(":edit-delete"));
+    mDeleteAction->setIcon(Misc::ScalableIcon::load(":edit-delete"));
     addAction(mDeleteAction);
     CSMPrefs::Shortcut* deleteShortcut = new CSMPrefs::Shortcut("table-remove", this);
     deleteShortcut->associateAction(mDeleteAction);
 
     mMoveUpAction = new QAction(tr("Move Up"), this);
     connect(mMoveUpAction, &QAction::triggered, this, &Table::moveUpRecord);
-    mMoveUpAction->setIcon(QIcon(":record-up"));
+    mMoveUpAction->setIcon(Misc::ScalableIcon::load(":record-up"));
     addAction(mMoveUpAction);
     CSMPrefs::Shortcut* moveUpShortcut = new CSMPrefs::Shortcut("table-moveup", this);
     moveUpShortcut->associateAction(mMoveUpAction);
 
     mMoveDownAction = new QAction(tr("Move Down"), this);
     connect(mMoveDownAction, &QAction::triggered, this, &Table::moveDownRecord);
-    mMoveDownAction->setIcon(QIcon(":record-down"));
+    mMoveDownAction->setIcon(Misc::ScalableIcon::load(":record-down"));
     addAction(mMoveDownAction);
     CSMPrefs::Shortcut* moveDownShortcut = new CSMPrefs::Shortcut("table-movedown", this);
     moveDownShortcut->associateAction(mMoveDownAction);
 
     mViewAction = new QAction(tr("View"), this);
     connect(mViewAction, &QAction::triggered, this, &Table::viewRecord);
-    mViewAction->setIcon(QIcon(":/cell.png"));
+    mViewAction->setIcon(Misc::ScalableIcon::load(":cell"));
     addAction(mViewAction);
     CSMPrefs::Shortcut* viewShortcut = new CSMPrefs::Shortcut("table-view", this);
     viewShortcut->associateAction(mViewAction);
 
     mPreviewAction = new QAction(tr("Preview"), this);
     connect(mPreviewAction, &QAction::triggered, this, &Table::previewRecord);
-    mPreviewAction->setIcon(QIcon(":edit-preview"));
+    mPreviewAction->setIcon(Misc::ScalableIcon::load(":edit-preview"));
     addAction(mPreviewAction);
     CSMPrefs::Shortcut* previewShortcut = new CSMPrefs::Shortcut("table-preview", this);
     previewShortcut->associateAction(mPreviewAction);
 
     mExtendedDeleteAction = new QAction(tr("Extended Delete Record"), this);
     connect(mExtendedDeleteAction, &QAction::triggered, this, &Table::executeExtendedDelete);
-    mExtendedDeleteAction->setIcon(QIcon(":edit-delete"));
+    mExtendedDeleteAction->setIcon(Misc::ScalableIcon::load(":edit-delete"));
     addAction(mExtendedDeleteAction);
     CSMPrefs::Shortcut* extendedDeleteShortcut = new CSMPrefs::Shortcut("table-extendeddelete", this);
     extendedDeleteShortcut->associateAction(mExtendedDeleteAction);
 
     mExtendedRevertAction = new QAction(tr("Extended Revert Record"), this);
     connect(mExtendedRevertAction, &QAction::triggered, this, &Table::executeExtendedRevert);
-    mExtendedRevertAction->setIcon(QIcon(":edit-undo"));
+    mExtendedRevertAction->setIcon(Misc::ScalableIcon::load(":edit-undo"));
     addAction(mExtendedRevertAction);
     CSMPrefs::Shortcut* extendedRevertShortcut = new CSMPrefs::Shortcut("table-extendedrevert", this);
     extendedRevertShortcut->associateAction(mExtendedRevertAction);
@@ -417,7 +418,7 @@ CSVWorld::Table::Table(const CSMWorld::UniversalId& id, bool createAndDelete, bo
 
     mHelpAction = new QAction(tr("Help"), this);
     connect(mHelpAction, &QAction::triggered, this, &Table::openHelp);
-    mHelpAction->setIcon(QIcon(":/info.png"));
+    mHelpAction->setIcon(Misc::ScalableIcon::load(":info"));
     addAction(mHelpAction);
     CSMPrefs::Shortcut* openHelpShortcut = new CSMPrefs::Shortcut("help", this);
     openHelpShortcut->associateAction(mHelpAction);
@@ -694,10 +695,10 @@ void CSVWorld::Table::previewRecord()
 
     if (selectedRows.size() == 1)
     {
-        std::string id = getUniversalId(selectedRows.begin()->row()).getId();
+        CSMWorld::UniversalId id = getUniversalId(selectedRows.begin()->row());
 
         QModelIndex index
-            = mModel->getModelIndex(id, mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Modification));
+            = mModel->getModelIndex(id.getId(), mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Modification));
 
         if (mModel->data(index) != CSMWorld::RecordBase::State_Deleted)
             emit editRequest(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Preview, id), "");
diff --git a/apps/opencs/view/world/tablebottombox.cpp b/apps/opencs/view/world/tablebottombox.cpp
index 72b70b8109..396ba2de33 100644
--- a/apps/opencs/view/world/tablebottombox.cpp
+++ b/apps/opencs/view/world/tablebottombox.cpp
@@ -15,6 +15,11 @@
 #include "creator.hpp"
 #include "infocreator.hpp"
 
+namespace
+{
+    constexpr const char* statusBarStyle = "QStatusBar::item { border: 0px }";
+}
+
 void CSVWorld::TableBottomBox::updateSize()
 {
     // Make sure that the size of the bottom box is determined by the currently visible widget
@@ -104,6 +109,7 @@ CSVWorld::TableBottomBox::TableBottomBox(const CreatorFactoryBase& creatorFactor
     mStatusBar = new QStatusBar(this);
 
     mStatusBar->addWidget(mStatus);
+    mStatusBar->setStyleSheet(statusBarStyle);
 
     mLayout->addWidget(mStatusBar);
 
@@ -129,6 +135,18 @@ CSVWorld::TableBottomBox::TableBottomBox(const CreatorFactoryBase& creatorFactor
     updateSize();
 }
 
+bool CSVWorld::TableBottomBox::event(QEvent* event)
+{
+    // Apply style sheet again if style was changed
+    if (event->type() == QEvent::PaletteChange)
+    {
+        if (mStatusBar != nullptr)
+            mStatusBar->setStyleSheet(statusBarStyle);
+    }
+
+    return QWidget::event(event);
+}
+
 void CSVWorld::TableBottomBox::setEditLock(bool locked)
 {
     if (mCreator)
diff --git a/apps/opencs/view/world/tablebottombox.hpp b/apps/opencs/view/world/tablebottombox.hpp
index 7be57066f6..193ca33026 100644
--- a/apps/opencs/view/world/tablebottombox.hpp
+++ b/apps/opencs/view/world/tablebottombox.hpp
@@ -61,6 +61,9 @@ namespace CSVWorld
 
         void extendedConfigRequest(ExtendedCommandConfigurator::Mode mode, const std::vector<std::string>& selectedIds);
 
+    protected:
+        bool event(QEvent* event) override;
+
     public:
         TableBottomBox(const CreatorFactoryBase& creatorFactory, CSMDoc::Document& document,
             const CSMWorld::UniversalId& id, QWidget* parent = nullptr);
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index c9e09e2d6a..d2bf425ddd 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -17,10 +17,13 @@
 
 #include <apps/opencs/view/doc/subview.hpp>
 
+#include <components/misc/scalableicon.hpp>
+
 #include "../../model/doc/document.hpp"
 #include "../../model/world/tablemimedata.hpp"
 
 #include "../doc/sizehint.hpp"
+#include "../doc/view.hpp"
 #include "../filter/filterbox.hpp"
 #include "../filter/filterdata.hpp"
 #include "table.hpp"
@@ -60,7 +63,7 @@ CSVWorld::TableSubView::TableSubView(
     mOptions->hide();
 
     QPushButton* opt = new QPushButton();
-    opt->setIcon(QIcon(":startup/configure"));
+    opt->setIcon(Misc::ScalableIcon::load(":startup/configure"));
     opt->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     opt->setToolTip("Open additional options for this subview.");
     connect(opt, &QPushButton::clicked, this, &TableSubView::toggleOptions);
@@ -78,8 +81,11 @@ CSVWorld::TableSubView::TableSubView(
     widget->setLayout(layout);
 
     setWidget(widget);
+
+    QScreen* screen = CSVDoc::View::getWidgetScreen(pos());
+
     // prefer height of the screen and full width of the table
-    const QRect rect = QApplication::screenAt(pos())->geometry();
+    const QRect rect = screen->geometry();
     int frameHeight = 40; // set a reasonable default
     QWidget* topLevel = QApplication::topLevelAt(pos());
     if (topLevel)
@@ -169,7 +175,7 @@ void CSVWorld::TableSubView::createFilterRequest(std::vector<CSMWorld::Universal
         {
             CSVFilter::FilterData filterData;
             filterData.searchData = it->getId();
-            filterData.columns = col;
+            filterData.columns = std::move(col);
             sourceFilter.emplace_back(filterData);
         }
 
@@ -195,7 +201,7 @@ void CSVWorld::TableSubView::createFilterRequest(std::vector<CSMWorld::Universal
 
         CSVFilter::FilterData filterData;
         filterData.searchData = qData;
-        filterData.columns = searchColumns;
+        filterData.columns = std::move(searchColumns);
 
         sourceFilterByValue.emplace_back(filterData);
 
diff --git a/apps/opencs_tests/CMakeLists.txt b/apps/opencs_tests/CMakeLists.txt
index 2b7309f8b9..3bf783bb68 100644
--- a/apps/opencs_tests/CMakeLists.txt
+++ b/apps/opencs_tests/CMakeLists.txt
@@ -26,7 +26,7 @@ if (BUILD_WITH_CODE_COVERAGE)
     target_link_libraries(openmw-cs-tests PRIVATE gcov)
 endif()
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(openmw-cs-tests PRIVATE
         <gtest/gtest.h>
     )
diff --git a/apps/opencs_tests/main.cpp b/apps/opencs_tests/main.cpp
index e1a8e67397..fd7d4900c8 100644
--- a/apps/opencs_tests/main.cpp
+++ b/apps/opencs_tests/main.cpp
@@ -1,7 +1,11 @@
+#include <components/debug/debugging.hpp>
+
 #include <gtest/gtest.h>
 
 int main(int argc, char* argv[])
 {
+    Log::sMinDebugLevel = Debug::getDebugLevel();
+
     testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }
diff --git a/apps/opencs_tests/model/world/testuniversalid.cpp b/apps/opencs_tests/model/world/testuniversalid.cpp
index 2e610b0dd0..871a5218d4 100644
--- a/apps/opencs_tests/model/world/testuniversalid.cpp
+++ b/apps/opencs_tests/model/world/testuniversalid.cpp
@@ -149,39 +149,36 @@ namespace CSMWorld
             Params{ UniversalId(UniversalId::Type_None), UniversalId::Type_None, UniversalId::Class_None,
                 UniversalId::ArgumentType_None, "-", "-", ":placeholder" },
             Params{ UniversalId(UniversalId::Type_RegionMap), UniversalId::Type_RegionMap, UniversalId::Class_NonRecord,
-                UniversalId::ArgumentType_None, "Region Map", "Region Map", ":./region-map.png" },
+                UniversalId::ArgumentType_None, "Region Map", "Region Map", ":region-map" },
             Params{ UniversalId(UniversalId::Type_RunLog), UniversalId::Type_RunLog, UniversalId::Class_Transient,
-                UniversalId::ArgumentType_None, "Run Log", "Run Log", ":./run-log.png" },
+                UniversalId::ArgumentType_None, "Run Log", "Run Log", ":run-log" },
             Params{ UniversalId(UniversalId::Type_Lands), UniversalId::Type_Lands, UniversalId::Class_RecordList,
-                UniversalId::ArgumentType_None, "Lands", "Lands", ":./land-heightmap.png" },
+                UniversalId::ArgumentType_None, "Lands", "Lands", ":land-heightmap" },
             Params{ UniversalId(UniversalId::Type_Icons), UniversalId::Type_Icons, UniversalId::Class_ResourceList,
-                UniversalId::ArgumentType_None, "Icons", "Icons", ":./resources-icon" },
+                UniversalId::ArgumentType_None, "Icons", "Icons", ":resources-icon" },
 
             Params{ UniversalId(UniversalId::Type_Activator, "a"), UniversalId::Type_Activator,
-                UniversalId::Class_RefRecord, UniversalId::ArgumentType_Id, "Activator", "Activator: a",
-                ":./activator.png" },
+                UniversalId::Class_RefRecord, UniversalId::ArgumentType_Id, "Activator", "Activator: a", ":activator" },
             Params{ UniversalId(UniversalId::Type_Gmst, "b"), UniversalId::Type_Gmst, UniversalId::Class_Record,
-                UniversalId::ArgumentType_Id, "Game Setting", "Game Setting: b", ":./gmst.png" },
+                UniversalId::ArgumentType_Id, "Game Setting", "Game Setting: b", ":gmst" },
             Params{ UniversalId(UniversalId::Type_Mesh, "c"), UniversalId::Type_Mesh, UniversalId::Class_Resource,
-                UniversalId::ArgumentType_Id, "Mesh", "Mesh: c", ":./resources-mesh" },
+                UniversalId::ArgumentType_Id, "Mesh", "Mesh: c", ":resources-mesh" },
             Params{ UniversalId(UniversalId::Type_Scene, "d"), UniversalId::Type_Scene, UniversalId::Class_Collection,
-                UniversalId::ArgumentType_Id, "Scene", "Scene: d", ":./scene.png" },
+                UniversalId::ArgumentType_Id, "Scene", "Scene: d", ":scene" },
             Params{ UniversalId(UniversalId::Type_Reference, "e"), UniversalId::Type_Reference,
-                UniversalId::Class_SubRecord, UniversalId::ArgumentType_Id, "Instance", "Instance: e",
-                ":./instance.png" },
+                UniversalId::Class_SubRecord, UniversalId::ArgumentType_Id, "Instance", "Instance: e", ":instance" },
 
             Params{ UniversalId(UniversalId::Type_Search, 42), UniversalId::Type_Search, UniversalId::Class_Transient,
-                UniversalId::ArgumentType_Index, "Global Search", "Global Search: 42", ":./menu-search.png" },
+                UniversalId::ArgumentType_Index, "Global Search", "Global Search: 42", ":menu-search" },
 
             Params{ UniversalId("Instance: f"), UniversalId::Type_Reference, UniversalId::Class_SubRecord,
-                UniversalId::ArgumentType_Id, "Instance", "Instance: f", ":./instance.png" },
+                UniversalId::ArgumentType_Id, "Instance", "Instance: f", ":instance" },
 
             Params{ UniversalId(UniversalId::Type_Reference, ESM::RefId::stringRefId("g")), UniversalId::Type_Reference,
-                UniversalId::Class_SubRecord, UniversalId::ArgumentType_RefId, "Instance", "Instance: \"g\"",
-                ":./instance.png" },
+                UniversalId::Class_SubRecord, UniversalId::ArgumentType_RefId, "Instance", "Instance: g", ":instance" },
             Params{ UniversalId(UniversalId::Type_Reference, ESM::RefId::index(ESM::REC_SKIL, 42)),
                 UniversalId::Type_Reference, UniversalId::Class_SubRecord, UniversalId::ArgumentType_RefId, "Instance",
-                "Instance: Index:SKIL:0x2a", ":./instance.png" },
+                "Instance: SKIL:0x2a", ":instance" },
         };
 
         INSTANTIATE_TEST_SUITE_P(ValidParams, CSMWorldUniversalIdValidPerTypeTest, ValuesIn(validParams));
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 3df00f1be0..37de0abeab 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -1,29 +1,29 @@
-# local files
-set(GAME
-    main.cpp
+set(OPENMW_SOURCES
     engine.cpp
     options.cpp
+)
 
+set(OPENMW_RESOURCES
     ${CMAKE_SOURCE_DIR}/files/windows/openmw.rc
     ${CMAKE_SOURCE_DIR}/files/windows/openmw.exe.manifest
 )
 
-if (ANDROID)
-    set(GAME ${GAME} android_main.cpp)
-endif()
-
-set(GAME_HEADER
+set(OPENMW_HEADERS
+    doc.hpp
     engine.hpp
+    options.hpp
+    profile.hpp
 )
 
-source_group(game FILES ${GAME} ${GAME_HEADER})
+source_group(apps/openmw FILES main.cpp android_main.cpp ${OPENMW_SOURCES} ${OPENMW_HEADERS} ${OPENMW_RESOURCES})
 
 add_openmw_dir (mwrender
-    actors objects renderingmanager animation rotatecontroller sky skyutil npcanimation vismask
+    actors objects renderingmanager animation rotatecontroller sky skyutil npcanimation esm4npcanimation vismask
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
     bulletdebugdraw globalmap characterpreview camera localmap water terrainstorage ripplesimulation
     renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover
-    postprocessor pingpongcull luminancecalculator pingpongcanvas transparentpass navmeshmode precipitationocclusion ripples
+    postprocessor pingpongcull luminancecalculator pingpongcanvas transparentpass precipitationocclusion ripples
+    actorutil distortion animationpriority bonegroup blendmask animblendcontroller
     )
 
 add_openmw_dir (mwinput
@@ -60,15 +60,19 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp object objectlists userdataserializer luaevents engineevents objectvariant
-    context globalscripts localscripts playerscripts luabindings objectbindings cellbindings mwscriptbindings
-    camerabindings uibindings soundbindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/item types/actor types/container types/lockable types/weapon types/npc types/creature types/player types/activator types/book types/lockpick types/probe types/apparatus types/potion types/ingredient types/misc types/repair types/armor types/light types/static types/clothing types/levelledlist types/terminal
-    worker magicbindings
+    context menuscripts globalscripts localscripts playerscripts luabindings objectbindings cellbindings
+    mwscriptbindings camerabindings vfsbindings uibindings soundbindings inputbindings nearbybindings dialoguebindings
+    postprocessingbindings stats recordstore debugbindings corebindings worldbindings worker magicbindings factionbindings
+    classbindings itemdata inputprocessor animationbindings birthsignbindings racebindings markupbindings
+    types/types types/door types/item types/actor types/container types/lockable types/weapon types/npc
+    types/creature types/player types/activator types/book types/lockpick types/probe types/apparatus
+    types/potion types/ingredient types/misc types/repair types/armor types/light types/static
+    types/clothing types/levelledlist types/terminal
     )
 
 add_openmw_dir (mwsound
     soundmanagerimp openal_output ffmpeg_decoder sound sound_buffer sound_decoder sound_output
-    loudness movieaudiofactory alext efx efx-presets regionsoundselector watersoundupdater volumesettings
+    loudness movieaudiofactory alext efx efx-presets regionsoundselector watersoundupdater
     )
 
 add_openmw_dir (mwworld
@@ -79,18 +83,19 @@ add_openmw_dir (mwworld
     store esmstore fallback actionrepair actionsoulgem livecellref actiondoor
     contentloader esmloader actiontrap cellreflist cellref weather projectilemanager
     cellpreloader datetimemanager groundcoverstore magiceffects cell ptrregistry
+    positioncellgrid
     )
 
 add_openmw_dir (mwphysics
     physicssystem trace collisiontype actor convert object heightfield closestnotmerayresultcallback
-    contacttestresultcallback deepestnotmecontacttestresultcallback stepper movementsolver projectile
+    contacttestresultcallback stepper movementsolver projectile
     actorconvexcallback raycasting mtphysics contacttestwrapper projectileconvexcallback
     )
 
 add_openmw_dir (mwclass
     classes activator creature npc weapon armor potion apparatus book clothing container door
     ingredient creaturelevlist itemlevlist light lockpick misc probe repair static actor bodypart
-    esm4base light4
+    esm4base esm4npc light4
     )
 
 add_openmw_dir (mwmechanics
@@ -98,7 +103,7 @@ add_openmw_dir (mwmechanics
     drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor aibreathe
     aicast aiescort aiface aiactivate aicombat recharge repair enchanting pathfinding pathgrid security spellcasting spellresistance
     disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction summoning
-    character actors objects aistate trading weaponpriority spellpriority weapontype spellutil
+    character actors objects aistate weaponpriority spellpriority weapontype spellutil
     spelleffects
     )
 
@@ -108,24 +113,32 @@ add_openmw_dir (mwstate
 
 add_openmw_dir (mwbase
     environment world scriptmanager dialoguemanager journal soundmanager mechanicsmanager
-    inputmanager windowmanager statemanager
+    inputmanager windowmanager statemanager luamanager
     )
 
 # Main executable
 
-if (NOT ANDROID)
-    openmw_add_executable(openmw
-        ${OPENMW_FILES}
-        ${GAME} ${GAME_HEADER}
-        ${APPLE_BUNDLE_RESOURCES}
-    )
-else ()
-    add_library(openmw
-        SHARED
-        ${OPENMW_FILES}
-        ${GAME} ${GAME_HEADER}
-    )
-endif ()
+add_library(openmw-lib STATIC
+    ${OPENMW_FILES}
+    ${OPENMW_SOURCES}
+)
+
+if(BUILD_OPENMW)
+    if (ANDROID)
+        add_library(openmw SHARED
+            main.cpp
+            android_main.cpp
+        )
+    else()
+        openmw_add_executable(openmw
+            ${APPLE_BUNDLE_RESOURCES}
+            ${OPENMW_RESOURCES}
+            main.cpp
+        )
+    endif()
+
+    target_link_libraries(openmw openmw-lib)
+endif()
 
 # Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
 # when we change the backend.
@@ -133,7 +146,7 @@ include_directories(
     ${FFmpeg_INCLUDE_DIRS}
 )
 
-target_link_libraries(openmw
+target_link_libraries(openmw-lib
     # CMake's built-in OSG finder does not use pkgconfig, so we have to
     # manually ensure the order is correct for inter-library dependencies.
     # This only makes a difference with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`.
@@ -145,19 +158,19 @@ target_link_libraries(openmw
     ${OSGDB_LIBRARIES}
     ${OSGUTIL_LIBRARIES}
     ${OSG_LIBRARIES}
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    Boost::program_options
     ${OPENAL_LIBRARY}
     ${FFmpeg_LIBRARIES}
     ${MyGUI_LIBRARIES}
-    ${SDL2_LIBRARY}
+    SDL2::SDL2
     ${RecastNavigation_LIBRARIES}
     "osg-ffmpeg-videoplayer"
     "oics"
     components
 )
 
-if (MSVC)
-    target_precompile_headers(openmw PRIVATE
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
+    target_precompile_headers(openmw-lib PRIVATE
         <boost/program_options/options_description.hpp>
 
         <sol/sol.hpp>
@@ -182,24 +195,26 @@ if (MSVC)
     )
 endif()
 
+add_definitions(-DMYGUI_DONT_USE_OBSOLETE=ON)
+
 if (ANDROID)
-    target_link_libraries(openmw EGL android log z)
+    target_link_libraries(openmw-lib EGL android log z)
 endif (ANDROID)
 
 if (USE_SYSTEM_TINYXML)
-    target_link_libraries(openmw ${TinyXML_LIBRARIES})
+    target_link_libraries(openmw-lib ${TinyXML_LIBRARIES})
 endif()
 
 if (NOT UNIX)
-    target_link_libraries(openmw ${SDL2MAIN_LIBRARY})
+    target_link_libraries(openmw-lib ${SDL2MAIN_LIBRARY})
 endif()
 
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
-    target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(openmw-lib ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-if(APPLE)
+if(APPLE AND BUILD_OPENMW)
     set(BUNDLE_RESOURCES_DIR "${APP_BUNDLE_DIR}/Contents/Resources")
 
     set(OPENMW_RESOURCES_ROOT ${BUNDLE_RESOURCES_DIR})
@@ -225,13 +240,17 @@ if(APPLE)
                                            "LINKER:SHELL:-framework AudioToolbox"
                                            "LINKER:SHELL:-framework VideoDecodeAcceleration")
     endif()
-endif(APPLE)
-
-if (BUILD_WITH_CODE_COVERAGE)
-    target_compile_options(openmw PRIVATE --coverage)
-    target_link_libraries(openmw gcov)
 endif()
 
-if (WIN32)
+if (BUILD_WITH_CODE_COVERAGE)
+    target_compile_options(openmw-lib PRIVATE --coverage)
+    target_link_libraries(openmw-lib gcov)
+    if (NOT ANDROID AND BUILD_OPENMW)
+        target_compile_options(openmw PRIVATE --coverage)
+        target_link_libraries(openmw gcov)
+    endif()
+endif()
+
+if (WIN32 AND BUILD_OPENMW)
     INSTALL(TARGETS openmw RUNTIME DESTINATION ".")
-endif (WIN32)
+endif()
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 0c77329f48..2736f339e4 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -14,6 +14,7 @@
 #include <components/debug/gldebug.hpp>
 
 #include <components/misc/rng.hpp>
+#include <components/misc/strings/format.hpp>
 
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
@@ -30,6 +31,7 @@
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
 
+#include <components/sceneutil/glextensions.hpp>
 #include <components/sceneutil/workqueue.hpp>
 
 #include <components/files/configurationmanager.hpp>
@@ -62,6 +64,7 @@
 #include "mwscript/interpretercontext.hpp"
 #include "mwscript/scriptmanagerimp.hpp"
 
+#include "mwsound/constants.hpp"
 #include "mwsound/soundmanagerimp.hpp"
 
 #include "mwworld/class.hpp"
@@ -105,14 +108,27 @@ namespace
         });
         // the forEachUserStatsValue loop is "run" at compile time, hence the settings manager is not available.
         // Unconditionnally add the async physics stats, and then remove it at runtime if necessary
-        if (Settings::Manager::getInt("async num threads", "Physics") == 0)
+        if (Settings::physics().mAsyncNumThreads == 0)
             profiler.removeUserStatsLine(" -Async");
     }
 
-    struct ScheduleNonDialogMessageBox
+    struct ScreenCaptureMessageBox
     {
-        void operator()(std::string message) const
+        void operator()(std::string filePath) const
         {
+            if (filePath.empty())
+            {
+                MWBase::Environment::get().getWindowManager()->scheduleMessageBox(
+                    "#{OMWEngine:ScreenshotFailed}", MWGui::ShowInDialogueMode_Never);
+
+                return;
+            }
+
+            std::string messageFormat
+                = MWBase::Environment::get().getL10nManager()->getMessage("OMWEngine", "ScreenshotMade");
+
+            std::string message = Misc::StringUtils::format(messageFormat, filePath);
+
             MWBase::Environment::get().getWindowManager()->scheduleMessageBox(
                 std::move(message), MWGui::ShowInDialogueMode_Never);
         }
@@ -149,6 +165,15 @@ namespace
     private:
         int mMaxTextureImageUnits = 0;
     };
+
+    void reportStats(unsigned frameNumber, osgViewer::Viewer& viewer, std::ostream& stream)
+    {
+        viewer.getViewerStats()->report(stream, frameNumber);
+        osgViewer::Viewer::Cameras cameras;
+        viewer.getCameras(cameras);
+        for (osg::Camera* camera : cameras)
+            camera->getStats()->report(stream, frameNumber);
+    }
 }
 
 void OMW::Engine::executeLocalScripts()
@@ -164,10 +189,9 @@ void OMW::Engine::executeLocalScripts()
     }
 }
 
-bool OMW::Engine::frame(float frametime)
+bool OMW::Engine::frame(unsigned frameNumber, float frametime)
 {
     const osg::Timer_t frameStart = mViewer->getStartTick();
-    const unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
     const osg::Timer* const timer = osg::Timer::instance();
     osg::Stats* const stats = mViewer->getViewerStats();
 
@@ -221,7 +245,7 @@ bool OMW::Engine::frame(float frametime)
 
             if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
             {
-                if (!mWindowManager->containsMode(MWGui::GM_MainMenu))
+                if (!mWindowManager->containsMode(MWGui::GM_MainMenu) || !paused)
                 {
                     if (mWorld->getScriptsEnabled())
                     {
@@ -313,19 +337,23 @@ bool OMW::Engine::frame(float frametime)
         mLuaManager->reportStats(frameNumber, *stats);
     }
 
+    mStereoManager->updateSettings(Settings::camera().mNearClip, Settings::camera().mViewingDistance);
+
     mViewer->eventTraversal();
     mViewer->updateTraversal();
 
+    // update GUI by world data
     {
         ScopedProfile<UserStatsType::WindowManager> profile(frameStart, frameNumber, *timer, *stats);
         mWorld->updateWindowManager();
     }
 
-    mLuaWorker->allowUpdate(); // if there is a separate Lua thread, it starts the update now
+    // if there is a separate Lua thread, it starts the update now
+    mLuaWorker->allowUpdate(frameStart, frameNumber, *stats);
 
     mViewer->renderingTraversals();
 
-    mLuaWorker->finishUpdate();
+    mLuaWorker->finishUpdate(frameStart, frameNumber, *stats);
 
     return true;
 }
@@ -346,7 +374,6 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
     , mActivationDistanceOverride(-1)
     , mGrab(true)
     , mRandomSeed(0)
-    , mScriptBlacklistUse(true)
     , mNewGame(false)
     , mCfgMgr(configurationManager)
     , mGlMaxTextureImageUnits(0)
@@ -423,6 +450,9 @@ void OMW::Engine::addArchive(const std::string& archive)
 void OMW::Engine::setResourceDir(const std::filesystem::path& parResDir)
 {
     mResDir = parResDir;
+    if (!Version::checkResourcesVersion(mResDir))
+        Log(Debug::Error) << "Resources dir " << mResDir
+                          << " doesn't match OpenMW binary, the game may work incorrectly.";
 }
 
 // Set start cell name
@@ -449,14 +479,13 @@ void OMW::Engine::setSkipMenu(bool skipMenu, bool newGame)
 
 void OMW::Engine::createWindow()
 {
-    int screen = Settings::Manager::getInt("screen", "Video");
-    int width = Settings::Manager::getInt("resolution x", "Video");
-    int height = Settings::Manager::getInt("resolution y", "Video");
-    Settings::WindowMode windowMode
-        = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
-    bool windowBorder = Settings::Manager::getBool("window border", "Video");
-    int vsync = Settings::Manager::getInt("vsync mode", "Video");
-    unsigned int antialiasing = std::max(0, Settings::Manager::getInt("antialiasing", "Video"));
+    const int screen = Settings::video().mScreen;
+    const int width = Settings::video().mResolutionX;
+    const int height = Settings::video().mResolutionY;
+    const Settings::WindowMode windowMode = Settings::video().mWindowMode;
+    const bool windowBorder = Settings::video().mWindowBorder;
+    const SDLUtil::VSyncMode vsync = Settings::video().mVsyncMode;
+    unsigned antialiasing = static_cast<unsigned>(Settings::video().mAntialiasing);
 
     int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(screen), pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(screen);
 
@@ -479,8 +508,7 @@ void OMW::Engine::createWindow()
     if (!windowBorder)
         flags |= SDL_WINDOW_BORDERLESS;
 
-    SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS,
-        Settings::Manager::getBool("minimize on focus loss", "Video") ? "1" : "0");
+    SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, Settings::video().mMinimizeOnFocusLoss ? "1" : "0");
 
     checkSDLError(SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8));
     checkSDLError(SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8));
@@ -510,7 +538,7 @@ void OMW::Engine::createWindow()
                     Log(Debug::Warning) << "Warning: " << antialiasing << "x antialiasing not supported, trying "
                                         << antialiasing / 2;
                     antialiasing /= 2;
-                    Settings::Manager::setInt("antialiasing", "Video", antialiasing);
+                    Settings::video().mAntialiasing.set(antialiasing);
                     checkSDLError(SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, antialiasing));
                     continue;
                 }
@@ -557,7 +585,7 @@ void OMW::Engine::createWindow()
             SDL_DestroyWindow(mWindow);
             mWindow = nullptr;
             antialiasing /= 2;
-            Settings::Manager::setInt("antialiasing", "Video", antialiasing);
+            Settings::video().mAntialiasing.set(antialiasing);
             checkSDLError(SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, antialiasing));
             continue;
         }
@@ -582,6 +610,7 @@ void OMW::Engine::createWindow()
     mViewer->setRealizeOperation(realizeOperations);
     osg::ref_ptr<IdentifyOpenGLOperation> identifyOp = new IdentifyOpenGLOperation();
     realizeOperations->add(identifyOp);
+    realizeOperations->add(new SceneUtil::GetGLExtensionsOperation());
 
     if (Debug::shouldDebugOpenGL())
         realizeOperations->add(new Debug::EnableGLDebugOperation());
@@ -590,7 +619,63 @@ void OMW::Engine::createWindow()
     realizeOperations->add(mSelectColorFormatOperation);
 
     if (Stereo::getStereo())
-        realizeOperations->add(new Stereo::InitializeStereoOperation());
+    {
+        Stereo::Settings settings;
+
+        settings.mMultiview = Settings::stereo().mMultiview;
+        settings.mAllowDisplayListsForMultiview = Settings::stereo().mAllowDisplayListsForMultiview;
+        settings.mSharedShadowMaps = Settings::stereo().mSharedShadowMaps;
+
+        if (Settings::stereo().mUseCustomView)
+        {
+            const osg::Vec3 leftEyeOffset(Settings::stereoView().mLeftEyeOffsetX,
+                Settings::stereoView().mLeftEyeOffsetY, Settings::stereoView().mLeftEyeOffsetZ);
+
+            const osg::Quat leftEyeOrientation(Settings::stereoView().mLeftEyeOrientationX,
+                Settings::stereoView().mLeftEyeOrientationY, Settings::stereoView().mLeftEyeOrientationZ,
+                Settings::stereoView().mLeftEyeOrientationW);
+
+            const osg::Vec3 rightEyeOffset(Settings::stereoView().mRightEyeOffsetX,
+                Settings::stereoView().mRightEyeOffsetY, Settings::stereoView().mRightEyeOffsetZ);
+
+            const osg::Quat rightEyeOrientation(Settings::stereoView().mRightEyeOrientationX,
+                Settings::stereoView().mRightEyeOrientationY, Settings::stereoView().mRightEyeOrientationZ,
+                Settings::stereoView().mRightEyeOrientationW);
+
+            settings.mCustomView = Stereo::CustomView{
+                .mLeft = Stereo::View{
+                    .pose = Stereo::Pose{
+                        .position = leftEyeOffset,
+                        .orientation = leftEyeOrientation,
+                    },
+                    .fov = Stereo::FieldOfView{
+                        .angleLeft = Settings::stereoView().mLeftEyeFovLeft,
+                        .angleRight = Settings::stereoView().mLeftEyeFovRight,
+                        .angleUp = Settings::stereoView().mLeftEyeFovUp,
+                        .angleDown = Settings::stereoView().mLeftEyeFovDown,
+                    },
+                },
+                .mRight = Stereo::View{
+                    .pose = Stereo::Pose{
+                        .position = rightEyeOffset,
+                        .orientation = rightEyeOrientation,
+                    },
+                    .fov = Stereo::FieldOfView{
+                        .angleLeft = Settings::stereoView().mRightEyeFovLeft,
+                        .angleRight = Settings::stereoView().mRightEyeFovRight,
+                        .angleUp = Settings::stereoView().mRightEyeFovUp,
+                        .angleDown = Settings::stereoView().mRightEyeFovDown,
+                    },
+                },
+            };
+        }
+
+        if (Settings::stereo().mUseCustomEyeResolution)
+            settings.mEyeResolution
+                = osg::Vec2i(Settings::stereoView().mEyeResolutionX, Settings::stereoView().mEyeResolutionY);
+
+        realizeOperations->add(new Stereo::InitializeStereoOperation(settings));
+    }
 
     mViewer->realize();
     mGlMaxTextureImageUnits = identifyOp->getMaxTextureImageUnits();
@@ -629,9 +714,9 @@ void OMW::Engine::prepareEngine()
     mStateManager = std::make_unique<MWState::StateManager>(mCfgMgr.getUserDataPath() / "saves", mContentFiles);
     mEnvironment.setStateManager(*mStateManager);
 
-    bool stereoEnabled
-        = Settings::Manager::getBool("stereo enabled", "Stereo") || osg::DisplaySettings::instance().get()->getStereo();
-    mStereoManager = std::make_unique<Stereo::Manager>(mViewer, stereoEnabled);
+    const bool stereoEnabled = Settings::stereo().mStereoEnabled || osg::DisplaySettings::instance().get()->getStereo();
+    mStereoManager = std::make_unique<Stereo::Manager>(
+        mViewer, stereoEnabled, Settings::camera().mNearClip, Settings::camera().mViewingDistance);
 
     osg::ref_ptr<osg::Group> rootNode(new osg::Group);
     mViewer->setSceneData(rootNode);
@@ -642,7 +727,8 @@ void OMW::Engine::prepareEngine()
 
     VFS::registerArchives(mVFS.get(), mFileCollections, mArchives, true);
 
-    mResourceSystem = std::make_unique<Resource::ResourceSystem>(mVFS.get());
+    mResourceSystem = std::make_unique<Resource::ResourceSystem>(
+        mVFS.get(), Settings::cells().mCacheExpiryDelay, &mEncoder.get()->getStatelessEncoder());
     mResourceSystem->getSceneManager()->getShaderManager().setMaxTextureUnits(mGlMaxTextureImageUnits);
     mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(
         false); // keep to Off for now to allow better state sharing
@@ -656,9 +742,8 @@ void OMW::Engine::prepareEngine()
     mScreenCaptureOperation = new SceneUtil::AsyncScreenCaptureOperation(mWorkQueue,
         new SceneUtil::WriteScreenshotToFileOperation(mCfgMgr.getScreenshotPath(),
             Settings::general().mScreenshotFormat,
-            Settings::general().mNotifyOnSavedScreenshot
-                ? std::function<void(std::string)>(ScheduleNonDialogMessageBox{})
-                : std::function<void(std::string)>(IgnoreString{})));
+            Settings::general().mNotifyOnSavedScreenshot ? std::function<void(std::string)>(ScreenCaptureMessageBox{})
+                                                         : std::function<void(std::string)>(IgnoreString{})));
 
     mScreenCaptureHandler = new osgViewer::ScreenCaptureHandler(mScreenCaptureOperation);
 
@@ -706,13 +791,13 @@ void OMW::Engine::prepareEngine()
     // gui needs our shaders path before everything else
     mResourceSystem->getSceneManager()->setShaderPath(mResDir / "shaders");
 
-    osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
-    bool shadersSupported = exts && (exts->glslLanguageVersion >= 1.2f);
+    osg::GLExtensions& exts = SceneUtil::getGLExtensions();
+    bool shadersSupported = exts.glslLanguageVersion >= 1.2f;
 
 #if OSG_VERSION_LESS_THAN(3, 6, 6)
     // hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
-    if (exts)
-        exts->glRenderbufferStorageMultisampleCoverageNV = nullptr;
+    if (!osg::isGLExtensionSupported(exts.contextID, "NV_framebuffer_multisample_coverage"))
+        exts.glRenderbufferStorageMultisampleCoverageNV = nullptr;
 #endif
 
     osg::ref_ptr<osg::Group> guiRoot = new osg::Group;
@@ -723,11 +808,11 @@ void OMW::Engine::prepareEngine()
 
     mWindowManager = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(),
         mWorkQueue.get(), mCfgMgr.getLogPath(), mScriptConsoleMode, mTranslationDataStorage, mEncoding,
-        Version::getOpenmwVersionDescription(mResDir), shadersSupported, mCfgMgr);
+        Version::getOpenmwVersionDescription(), shadersSupported, mCfgMgr);
     mEnvironment.setWindowManager(*mWindowManager);
 
-    mInputManager = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler,
-        mScreenCaptureOperation, keybinderUser, keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
+    mInputManager = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler, keybinderUser,
+        keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
     mEnvironment.setInputManager(*mInputManager);
 
     // Create sound system
@@ -737,6 +822,9 @@ void OMW::Engine::prepareEngine()
     // Create the world
     mWorld = std::make_unique<MWWorld::World>(
         mResourceSystem.get(), mActivationDistanceOverride, mCellName, mCfgMgr.getUserDataPath());
+    mEnvironment.setWorld(*mWorld);
+    mEnvironment.setWorldModel(mWorld->getWorldModel());
+    mEnvironment.setESMStore(mWorld->getStore());
 
     Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
     Loading::AsyncListener asyncListener(*listener);
@@ -759,13 +847,10 @@ void OMW::Engine::prepareEngine()
     }
     listener->loadingOff();
 
-    mWorld->init(mViewer, rootNode, mWorkQueue.get(), *mUnrefQueue);
+    mWorld->init(mViewer, std::move(rootNode), mWorkQueue.get(), *mUnrefQueue);
+    mEnvironment.setWorldScene(mWorld->getWorldScene());
     mWorld->setupPlayer();
     mWorld->setRandomSeed(mRandomSeed);
-    mEnvironment.setWorld(*mWorld);
-    mEnvironment.setWorldModel(mWorld->getWorldModel());
-    mEnvironment.setWorldScene(mWorld->getWorldScene());
-    mEnvironment.setESMStore(mWorld->getStore());
 
     const MWWorld::Store<ESM::GameSetting>* gmst = &mWorld->getStore().get<ESM::GameSetting>();
     mL10nManager->setGmstLoader(
@@ -798,8 +883,7 @@ void OMW::Engine::prepareEngine()
     mScriptContext = std::make_unique<MWScript::CompilerContext>(MWScript::CompilerContext::Type_Full);
     mScriptContext->setExtensions(&mExtensions);
 
-    mScriptManager = std::make_unique<MWScript::ScriptManager>(mWorld->getStore(), *mScriptContext, mWarningsMode,
-        mScriptBlacklistUse ? mScriptBlacklist : std::vector<ESM::RefId>());
+    mScriptManager = std::make_unique<MWScript::ScriptManager>(mWorld->getStore(), *mScriptContext, mWarningsMode);
     mEnvironment.setScriptManager(*mScriptManager);
 
     // Create game mechanics system
@@ -829,11 +913,11 @@ void OMW::Engine::prepareEngine()
                              << 100 * static_cast<double>(result.second) / result.first << "%)";
     }
 
-    mLuaManager->init();
     mLuaManager->loadPermanentStorage(mCfgMgr.getUserConfigPath());
+    mLuaManager->init();
 
     // starts a separate lua thread if "lua num threads" > 0
-    mLuaWorker = std::make_unique<MWLua::Worker>(*mLuaManager, *mViewer);
+    mLuaWorker = std::make_unique<MWLua::Worker>(*mLuaManager);
 }
 
 // Initialise and enter main loop.
@@ -863,7 +947,7 @@ void OMW::Engine::go()
     // Do not try to outsmart the OS thread scheduler (see bug #4785).
     mViewer->setUseConfigureAffinity(false);
 
-    mEnvironment.setFrameRateLimit(Settings::Manager::getFloat("framerate limit", "Video"));
+    mEnvironment.setFrameRateLimit(Settings::video().mFramerateLimit);
 
     prepareEngine();
 
@@ -889,17 +973,17 @@ void OMW::Engine::go()
     }
 
     // Setup profiler
-    osg::ref_ptr<Resource::Profiler> statshandler = new Resource::Profiler(stats.is_open(), mVFS.get());
+    osg::ref_ptr<Resource::Profiler> statsHandler = new Resource::Profiler(stats.is_open(), *mVFS);
 
-    initStatsHandler(*statshandler);
+    initStatsHandler(*statsHandler);
 
-    mViewer->addEventHandler(statshandler);
+    mViewer->addEventHandler(statsHandler);
 
-    osg::ref_ptr<Resource::StatsHandler> resourceshandler = new Resource::StatsHandler(stats.is_open(), mVFS.get());
-    mViewer->addEventHandler(resourceshandler);
+    osg::ref_ptr<Resource::StatsHandler> resourcesHandler = new Resource::StatsHandler(stats.is_open(), *mVFS);
+    mViewer->addEventHandler(resourcesHandler);
 
     if (stats.is_open())
-        Resource::CollectStatistics(mViewer);
+        Resource::collectStatistics(*mViewer);
 
     // Start the game
     if (!mSaveGameFile.empty())
@@ -910,7 +994,12 @@ void OMW::Engine::go()
     {
         // start in main menu
         mWindowManager->pushGuiMode(MWGui::GM_MainMenu);
-        mSoundManager->playPlaylist("Title");
+
+        if (mVFS->exists(MWSound::titleMusic))
+            mSoundManager->streamMusic(MWSound::titleMusic, MWSound::MusicType::Normal);
+        else
+            Log(Debug::Warning) << "Title music not found";
+
         std::string_view logo = Fallback::Map::getString("Movies_Morrowind_Logo");
         if (!logo.empty())
             mWindowManager->playVideo(logo, /*allowSkipping*/ true, /*overrideSounds*/ false);
@@ -936,29 +1025,34 @@ void OMW::Engine::go()
                               .count()
             * timeManager.getSimulationTimeScale();
 
-        mViewer->advance(timeManager.getSimulationTime());
+        mViewer->advance(timeManager.getRenderingSimulationTime());
 
-        if (!frame(dt))
+        const unsigned frameNumber = mViewer->getFrameStamp()->getFrameNumber();
+
+        if (!frame(frameNumber, dt))
         {
             std::this_thread::sleep_for(std::chrono::milliseconds(5));
             continue;
         }
         timeManager.updateIsPaused();
         if (!timeManager.isPaused())
+        {
             timeManager.setSimulationTime(timeManager.getSimulationTime() + dt);
+            timeManager.setRenderingSimulationTime(timeManager.getRenderingSimulationTime() + dt);
+        }
 
         if (stats)
         {
+            // The delay is required because rendering happens in parallel to the main thread and stats from there is
+            // available with delay.
             constexpr unsigned statsReportDelay = 3;
-            const auto frameNumber = mViewer->getFrameStamp()->getFrameNumber();
             if (frameNumber >= statsReportDelay)
             {
-                const unsigned reportFrameNumber = frameNumber - statsReportDelay;
-                mViewer->getViewerStats()->report(stats, reportFrameNumber);
-                osgViewer::Viewer::Cameras cameras;
-                mViewer->getCameras(cameras);
-                for (auto camera : cameras)
-                    camera->getStats()->report(stats, reportFrameNumber);
+                // Viewer frame number can be different from frameNumber because of loading screens which render new
+                // frames inside a simulation frame.
+                const unsigned currentFrameNumber = mViewer->getFrameStamp()->getFrameNumber();
+                for (unsigned i = frameNumber; i <= currentFrameNumber; ++i)
+                    reportStats(i - statsReportDelay, *mViewer, stats);
             }
         }
 
@@ -1015,16 +1109,6 @@ void OMW::Engine::setWarningsMode(int mode)
     mWarningsMode = mode;
 }
 
-void OMW::Engine::setScriptBlacklist(const std::vector<ESM::RefId>& list)
-{
-    mScriptBlacklist = list;
-}
-
-void OMW::Engine::setScriptBlacklistUse(bool use)
-{
-    mScriptBlacklistUse = use;
-}
-
 void OMW::Engine::setSaveGameFile(const std::filesystem::path& savegame)
 {
     mSaveGameFile = savegame;
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 2cd224785b..39056af560 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -178,8 +178,6 @@ namespace OMW
 
         Files::Collections mFileCollections;
         Translation::Storage mTranslationDataStorage;
-        std::vector<ESM::RefId> mScriptBlacklist;
-        bool mScriptBlacklistUse;
         bool mNewGame;
 
         // not implemented
@@ -188,7 +186,7 @@ namespace OMW
 
         void executeLocalScripts();
 
-        bool frame(float dt);
+        bool frame(unsigned frameNumber, float dt);
 
         /// Prepare engine for game play
         void prepareEngine();
@@ -253,10 +251,6 @@ namespace OMW
 
         void setWarningsMode(int mode);
 
-        void setScriptBlacklist(const std::vector<ESM::RefId>& list);
-
-        void setScriptBlacklistUse(bool use);
-
         /// Set the save game file to load after initialising the engine.
         void setSaveGameFile(const std::filesystem::path& savegame);
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index e326e0aa2b..5b89bca960 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -2,6 +2,7 @@
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/misc/osgpluginchecker.hpp>
 #include <components/misc/rng.hpp>
 #include <components/platform/platform.hpp>
 #include <components/version/version.hpp>
@@ -14,7 +15,7 @@
 #include <boost/program_options/variables_map.hpp>
 
 #if defined(_WIN32)
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 // makes __argc and __argv available on windows
 #include <cstdlib>
 
@@ -52,33 +53,20 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati
 
     if (variables.count("help"))
     {
-        getRawStdout() << desc << std::endl;
+        Debug::getRawStdout() << desc << std::endl;
         return false;
     }
 
     if (variables.count("version"))
     {
-        cfgMgr.readConfiguration(variables, desc, true);
-
-        Version::Version v
-            = Version::getOpenmwVersion(variables["resources"]
-                                            .as<Files::MaybeQuotedPath>()
-                                            .u8string()); // This call to u8string is redundant, but required to build
-                                                          // on MSVC 14.26 due to implementation bugs.
-        getRawStdout() << v.describe() << std::endl;
+        Debug::getRawStdout() << Version::getOpenmwVersionDescription() << std::endl;
         return false;
     }
 
     cfgMgr.readConfiguration(variables, desc);
 
-    setupLogging(cfgMgr.getLogPath(), "OpenMW");
-
-    Version::Version v
-        = Version::getOpenmwVersion(variables["resources"]
-                                        .as<Files::MaybeQuotedPath>()
-                                        .u8string()); // This call to u8string is redundant, but required to build on
-                                                      // MSVC 14.26 due to implementation bugs.
-    Log(Debug::Info) << v.describe();
+    Debug::setupLogging(cfgMgr.getLogPath(), "OpenMW");
+    Log(Debug::Info) << Version::getOpenmwVersionDescription();
 
     Settings::Manager::load(cfgMgr);
 
@@ -121,7 +109,8 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati
         Log(Debug::Error) << "No content file given (esm/esp, nor omwgame/omwaddon). Aborting...";
         return false;
     }
-    std::set<std::string> contentDedupe;
+    engine.addContentFile("builtin.omwscripts");
+    std::set<std::string> contentDedupe{ "builtin.omwscripts" };
     for (const auto& contentFile : content)
     {
         if (!contentDedupe.insert(contentFile).second)
@@ -160,14 +149,6 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati
     engine.setScriptConsoleMode(variables["script-console"].as<bool>());
     engine.setStartupScript(variables["script-run"].as<std::string>());
     engine.setWarningsMode(variables["script-warn"].as<int>());
-    std::vector<ESM::RefId> scriptBlacklist;
-    auto& scriptBlacklistString = variables["script-blacklist"].as<StringsVector>();
-    for (const auto& blacklistString : scriptBlacklistString)
-    {
-        scriptBlacklist.push_back(ESM::RefId::stringRefId(blacklistString));
-    }
-    engine.setScriptBlacklist(scriptBlacklist);
-    engine.setScriptBlacklistUse(variables["script-blacklist-use"].as<bool>());
     engine.setSaveGameFile(variables["load-savegame"].as<Files::MaybeQuotedPath>().u8string());
 
     // other settings
@@ -232,8 +213,6 @@ int runApplication(int argc, char* argv[])
     Platform::init();
 
 #ifdef __APPLE__
-    std::filesystem::path binary_path = std::filesystem::absolute(std::filesystem::path(argv[0]));
-    std::filesystem::current_path(binary_path.parent_path());
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
 #endif
 
@@ -243,6 +222,9 @@ int runApplication(int argc, char* argv[])
 
     if (parseOptions(argc, argv, *engine, cfgMgr))
     {
+        if (!Misc::checkRequiredOSGPluginsArePresent())
+            return 1;
+
         engine->go();
     }
 
@@ -255,7 +237,7 @@ extern "C" int SDL_main(int argc, char** argv)
 int main(int argc, char** argv)
 #endif
 {
-    return wrapApplication(&runApplication, argc, argv, "OpenMW");
+    return Debug::wrapApplication(&runApplication, argc, argv, "OpenMW");
 }
 
 // Platform specific for Windows when there is no console built into the executable.
diff --git a/apps/openmw/mwbase/dialoguemanager.hpp b/apps/openmw/mwbase/dialoguemanager.hpp
index 70887c69c1..e4c60e596d 100644
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWBASE_DIALOGUEMANAGER_H
 
 #include <list>
+#include <map>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -65,7 +66,7 @@ namespace MWBase
 
         virtual void goodbye() = 0;
 
-        virtual void say(const MWWorld::Ptr& actor, const ESM::RefId& topic) = 0;
+        virtual bool say(const MWWorld::Ptr& actor, const ESM::RefId& topic) = 0;
 
         virtual void keywordSelected(std::string_view keyword, ResponseCallback* callback) = 0;
         virtual void goodbyeSelected() = 0;
@@ -108,11 +109,15 @@ namespace MWBase
         /// Changes faction1's opinion of faction2 by \a diff.
         virtual void modFactionReaction(const ESM::RefId& faction1, const ESM::RefId& faction2, int diff) = 0;
 
+        /// Set faction1's opinion of faction2.
         virtual void setFactionReaction(const ESM::RefId& faction1, const ESM::RefId& faction2, int absolute) = 0;
 
         /// @return faction1's opinion of faction2
         virtual int getFactionReaction(const ESM::RefId& faction1, const ESM::RefId& faction2) const = 0;
 
+        /// @return all faction's opinion overrides
+        virtual const std::map<ESM::RefId, int>* getFactionReactionOverrides(const ESM::RefId& faction) const = 0;
+
         /// Removes the last added topic response for the given actor from the journal
         virtual void clearInfoActor(const MWWorld::Ptr& actor) const = 0;
     };
diff --git a/apps/openmw/mwbase/inputmanager.hpp b/apps/openmw/mwbase/inputmanager.hpp
index f52f9ea454..5ee20476b3 100644
--- a/apps/openmw/mwbase/inputmanager.hpp
+++ b/apps/openmw/mwbase/inputmanager.hpp
@@ -45,6 +45,7 @@ namespace MWBase
         virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& changed) = 0;
 
         virtual void setDragDrop(bool dragDrop) = 0;
+        virtual bool isGamepadGuiCursorEnabled() = 0;
         virtual void setGamepadGuiCursorEnabled(bool enabled) = 0;
 
         virtual void toggleControlSwitch(std::string_view sw, bool value) = 0;
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 12a894d343..a5d6fe1114 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -8,6 +8,7 @@
 #include <SDL_events.h>
 
 #include "../mwgui/mode.hpp"
+#include "../mwrender/animationpriority.hpp"
 #include <components/sdlutil/events.hpp>
 
 namespace MWWorld
@@ -29,6 +30,14 @@ namespace ESM
     struct LuaScripts;
 }
 
+namespace LuaUtil
+{
+    namespace InputAction
+    {
+        class Registry;
+    }
+}
+
 namespace MWBase
 {
     // \brief LuaManager is the central interface through which the engine invokes lua scripts.
@@ -46,23 +55,40 @@ namespace MWBase
 
         virtual void newGameStarted() = 0;
         virtual void gameLoaded() = 0;
+        virtual void gameEnded() = 0;
+        virtual void noGame() = 0;
         virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
         virtual void objectRemovedFromScene(const MWWorld::Ptr& ptr) = 0;
         virtual void objectTeleported(const MWWorld::Ptr& ptr) = 0;
         virtual void itemConsumed(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) = 0;
         virtual void objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
+        virtual void useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force) = 0;
+        virtual void animationTextKey(const MWWorld::Ptr& actor, const std::string& key) = 0;
+        virtual void playAnimation(const MWWorld::Ptr& object, const std::string& groupname,
+            const MWRender::AnimPriority& priority, int blendMask, bool autodisable, float speedmult,
+            std::string_view start, std::string_view stop, float startpoint, uint32_t loops, bool loopfallback)
+            = 0;
+        virtual void skillLevelUp(const MWWorld::Ptr& actor, ESM::RefId skillId, std::string_view source) = 0;
+        virtual void skillUse(const MWWorld::Ptr& actor, ESM::RefId skillId, int useType, float scale) = 0;
         virtual void exteriorCreated(MWWorld::CellStore& cell) = 0;
+        virtual void actorDied(const MWWorld::Ptr& actor) = 0;
         virtual void questUpdated(const ESM::RefId& questId, int stage) = 0;
-
         // `arg` is either forwarded from MWGui::pushGuiMode or empty
         virtual void uiModeChanged(const MWWorld::Ptr& arg) = 0;
 
         // TODO: notify LuaManager about other events
         // virtual void objectOnHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object,
-        //                          const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) = 0;
+        //                          const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful,
+        //                          DamageSourceType sourceType) = 0;
 
         struct InputEvent
         {
+            struct WheelChange
+            {
+                int x;
+                int y;
+            };
+
             enum
             {
                 KeyPressed,
@@ -73,8 +99,11 @@ namespace MWBase
                 TouchPressed,
                 TouchReleased,
                 TouchMoved,
+                MouseButtonPressed,
+                MouseButtonReleased,
+                MouseWheel,
             } mType;
-            std::variant<SDL_Keysym, int, SDLUtil::TouchEvent> mValue;
+            std::variant<SDL_Keysym, int, SDLUtil::TouchEvent, WheelChange> mValue;
         };
         virtual void inputEvent(const InputEvent& event) = 0;
 
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 5319ab6dde..4883fa2000 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "../mwmechanics/greetingstate.hpp"
+#include "../mwrender/animationpriority.hpp"
 
 #include "../mwworld/ptr.hpp"
 
@@ -104,7 +105,9 @@ namespace MWBase
         virtual bool awarenessCheck(const MWWorld::Ptr& ptr, const MWWorld::Ptr& observer) = 0;
 
         /// Makes \a ptr fight \a target. Also shouts a combat taunt.
-        virtual void startCombat(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) = 0;
+        virtual void startCombat(
+            const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, const std::set<MWWorld::Ptr>* targetAllies)
+            = 0;
 
         /// Removes an actor and its allies from combat with the actor's targets.
         virtual void stopCombat(const MWWorld::Ptr& ptr) = 0;
@@ -165,16 +168,33 @@ namespace MWBase
         ///< Forces an object to refresh its animation state.
 
         virtual bool playAnimationGroup(
-            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number = 1, bool persist = false)
+            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, uint32_t number = 1, bool scripted = false)
             = 0;
         ///< Run animation for a MW-reference. Calls to this function for references that are currently not
         /// in the scene should be ignored.
         ///
         /// \param mode 0 normal, 1 immediate start, 2 immediate loop
-        /// \param count How many times the animation should be run
-        /// \param persist Whether the animation state should be stored in saved games
-        ///                and persist after cell unload.
+        /// \param number How many times the animation should be run
+        /// \param scripted Whether the animation should be treated as a scripted animation.
         /// \return Success or error
+        virtual bool playAnimationGroupLua(const MWWorld::Ptr& ptr, std::string_view groupName, uint32_t loops,
+            float speed, std::string_view startKey, std::string_view stopKey, bool forceLoop)
+            = 0;
+        ///< Lua variant of playAnimationGroup. The mode parameter is omitted
+        /// and forced to 0. modes 1 and 2 can be emulated by doing clearAnimationQueue() and
+        /// setting the startKey.
+        ///
+        /// \param number How many times the animation should be run
+        /// \param speed How fast to play the animation, where 1.f = normal speed
+        /// \param startKey Which textkey to start the animation from
+        /// \param stopKey Which textkey to stop the animation on
+        /// \param forceLoop Force the animation to be looping, even if it's normally not looping.
+        /// \param blendMask See MWRender::Animation::BlendMask
+        /// \param scripted Whether the animation should be treated as as scripted animation
+        /// \return Success or error
+        ///
+
+        virtual void enableLuaAnimations(const MWWorld::Ptr& ptr, bool enable) = 0;
 
         virtual void skipAnimation(const MWWorld::Ptr& ptr) = 0;
         ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
@@ -182,9 +202,14 @@ namespace MWBase
 
         virtual bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) = 0;
 
+        virtual bool checkScriptedAnimationPlaying(const MWWorld::Ptr& ptr) const = 0;
+
         /// Save the current animation state of managed references to their RefData.
         virtual void persistAnimationStates() = 0;
 
+        /// Clear out the animation queue, and cancel any animation currently playing from the queue
+        virtual void clearAnimationQueue(const MWWorld::Ptr& ptr, bool clearScripted) = 0;
+
         /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
         /// paused we may want to do it manually (after equipping permanent enchantment)
         virtual void updateMagicEffects(const MWWorld::Ptr& ptr) = 0;
@@ -235,7 +260,7 @@ namespace MWBase
         virtual bool isReadyToBlock(const MWWorld::Ptr& ptr) const = 0;
         virtual bool isAttackingOrSpell(const MWWorld::Ptr& ptr) const = 0;
 
-        virtual void castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool manualSpell) = 0;
+        virtual void castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool scriptedSpell) = 0;
 
         virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& settings) = 0;
 
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index 3dd9cd3b33..5f96a4e095 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <string_view>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "../mwsound/type.hpp"
 #include "../mwworld/ptr.hpp"
 
@@ -29,6 +31,12 @@ namespace MWSound
         MaxCount
     };
 
+    enum class MusicType
+    {
+        Normal,
+        MWScript
+    };
+
     class Sound;
     class Stream;
     struct Sound_Decoder;
@@ -101,26 +109,28 @@ namespace MWBase
 
         virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& settings) = 0;
 
+        virtual bool isEnabled() const = 0;
+        ///< Returns true if sound system is enabled
+
         virtual void stopMusic() = 0;
         ///< Stops music if it's playing
 
-        virtual void streamMusic(const std::string& filename) = 0;
+        virtual MWSound::MusicType getMusicType() const = 0;
+
+        virtual void streamMusic(VFS::Path::NormalizedView filename, MWSound::MusicType type, float fade = 1.f) = 0;
         ///< Play a soundifle
-        /// \param filename name of a sound file in "Music/" in the data directory.
+        /// \param filename name of a sound file in the data directory.
+        /// \param type music type.
+        /// \param fade time in seconds to fade out current track before start this one.
 
         virtual bool isMusicPlaying() = 0;
         ///< Returns true if music is playing
 
-        virtual void playPlaylist(const std::string& playlist) = 0;
-        ///< Start playing music from the selected folder
-        /// \param name of the folder that contains the playlist
-        /// Title music playlist is predefined
-
-        virtual void say(const MWWorld::ConstPtr& reference, const std::string& filename) = 0;
+        virtual void say(const MWWorld::ConstPtr& reference, VFS::Path::NormalizedView filename) = 0;
         ///< Make an actor say some text.
         /// \param filename name of a sound file in the VFS
 
-        virtual void say(const std::string& filename) = 0;
+        virtual void say(VFS::Path::NormalizedView filename) = 0;
         ///< Say some text, without an actor ref
         /// \param filename name of a sound file in the VFS
 
diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index 1a25da32b0..35435e1430 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -44,6 +44,9 @@ namespace MWBase
 
         virtual void askLoadRecent() = 0;
 
+        virtual void requestNewGame() = 0;
+        virtual void requestLoad(const std::filesystem::path& filepath) = 0;
+
         virtual State getState() const = 0;
 
         virtual void newGame(bool bypass = false) = 0;
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 727aee4abc..0b2e85f3e1 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -77,6 +77,7 @@ namespace MWGui
     class JailScreen;
     class MessageBox;
     class PostProcessorHud;
+    class SettingsWindow;
 
     enum ShowInDialogueMode
     {
@@ -119,7 +120,7 @@ namespace MWBase
 
         virtual void pushGuiMode(MWGui::GuiMode mode, const MWWorld::Ptr& arg) = 0;
         virtual void pushGuiMode(MWGui::GuiMode mode) = 0;
-        virtual void popGuiMode() = 0;
+        virtual void popGuiMode(bool forceExit = false) = 0;
 
         virtual void removeGuiMode(MWGui::GuiMode mode) = 0;
         ///< can be anywhere in the stack
@@ -134,8 +135,9 @@ namespace MWBase
         virtual bool isGuiMode() const = 0;
 
         virtual bool isConsoleMode() const = 0;
-
         virtual bool isPostProcessorHudVisible() const = 0;
+        virtual bool isSettingsWindowVisible() const = 0;
+        virtual bool isInteractiveMessageBoxActive() const = 0;
 
         virtual void toggleVisible(MWGui::GuiWindow wnd) = 0;
 
@@ -164,7 +166,8 @@ namespace MWBase
 
         virtual void setConsoleSelectedObject(const MWWorld::Ptr& object) = 0;
         virtual MWWorld::Ptr getConsoleSelectedObject() const = 0;
-        virtual void setConsoleMode(const std::string& mode) = 0;
+        virtual void setConsoleMode(std::string_view mode) = 0;
+        virtual const std::string& getConsoleMode() = 0;
 
         static constexpr std::string_view sConsoleColor_Default = "#FFFFFF";
         static constexpr std::string_view sConsoleColor_Error = "#FF2222";
@@ -199,9 +202,6 @@ namespace MWBase
 
         virtual bool getFullHelp() const = 0;
 
-        virtual void setActiveMap(int x, int y, bool interior) = 0;
-        ///< set the indices of the map texture that should be used
-
         /// sets the visibility of the drowning bar
         virtual void setDrowningBarVisibility(bool visible) = 0;
 
@@ -229,7 +229,8 @@ namespace MWBase
         virtual void unsetSelectedWeapon() = 0;
 
         virtual void showCrosshair(bool show) = 0;
-        virtual bool toggleHud() = 0;
+        virtual bool setHudVisibility(bool show) = 0;
+        virtual bool isHudVisible() const = 0;
 
         virtual void disallowMouse() = 0;
         virtual void allowMouse() = 0;
@@ -253,8 +254,8 @@ namespace MWBase
             = 0;
         virtual void staticMessageBox(std::string_view message) = 0;
         virtual void removeStaticMessageBox() = 0;
-        virtual void interactiveMessageBox(
-            std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false)
+        virtual void interactiveMessageBox(std::string_view message, const std::vector<std::string>& buttons = {},
+            bool block = false, int defaultFocus = -1)
             = 0;
 
         /// returns the index of the pressed button or -1 if no button was pressed
@@ -289,7 +290,7 @@ namespace MWBase
 
         virtual void setEnemy(const MWWorld::Ptr& enemy) = 0;
 
-        virtual int getMessagesCount() const = 0;
+        virtual std::size_t getMessagesCount() const = 0;
 
         virtual const Translation::Storage& getTranslationDataStorage() const = 0;
 
@@ -341,6 +342,7 @@ namespace MWBase
         virtual void toggleConsole() = 0;
         virtual void toggleDebugWindow() = 0;
         virtual void togglePostProcessorHud() = 0;
+        virtual void toggleSettingsWindow() = 0;
 
         /// Cycle to next or previous spell
         virtual void cycleSpell(bool next) = 0;
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 40d57cbb6e..904b96c463 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -4,13 +4,13 @@
 #include "rotationflags.hpp"
 
 #include <deque>
-#include <map>
 #include <set>
 #include <span>
 #include <string_view>
 #include <vector>
 
 #include <components/misc/rng.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include "../mwworld/doorstate.hpp"
 #include "../mwworld/globalvariablename.hpp"
@@ -148,7 +148,7 @@ namespace MWBase
         virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
 
         virtual MWWorld::ESMStore& getStore() = 0;
-        const MWWorld::ESMStore& getStore() const { return const_cast<MWBase::World*>(this)->getStore(); }
+        virtual const MWWorld::ESMStore& getStore() const = 0;
 
         virtual const std::vector<int>& getESMVersions() const = 0;
 
@@ -183,9 +183,7 @@ namespace MWBase
         /// generate a name.
         virtual std::string_view getCellName(const MWWorld::Cell& cell) const = 0;
 
-        virtual std::string_view getCellName(const ESM::Cell* cell) const = 0;
-
-        virtual void removeRefScript(MWWorld::RefData* ref) = 0;
+        virtual void removeRefScript(const MWWorld::CellRef* ref) = 0;
         //< Remove the script attached to ref from mLocalScripts
 
         virtual MWWorld::Ptr getPtr(const ESM::RefId& name, bool activeOnly) = 0;
@@ -232,7 +230,7 @@ namespace MWBase
 
         virtual void setMoonColour(bool red) = 0;
 
-        virtual void modRegion(const ESM::RefId& regionid, const std::vector<char>& chances) = 0;
+        virtual void modRegion(const ESM::RefId& regionid, const std::vector<uint8_t>& chances) = 0;
 
         virtual void changeToInteriorCell(
             std::string_view cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true)
@@ -252,13 +250,6 @@ namespace MWBase
 
         virtual float getMaxActivationDistance() const = 0;
 
-        /// Returns a pointer to the object the provided object would hit (if within the
-        /// specified distance), and the point where the hit occurs. This will attempt to
-        /// use the "Head" node, or alternatively the "Bip01 Head" node as a basis.
-        virtual std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(
-            const MWWorld::ConstPtr& ptr, float distance, std::vector<MWWorld::Ptr>& targets)
-            = 0;
-
         virtual void adjustPosition(const MWWorld::Ptr& ptr, bool force) = 0;
         ///< Adjust position after load to be on ground. Must be called after model load.
         /// @param force do this even if the ptr is flying
@@ -311,7 +302,7 @@ namespace MWBase
         virtual const MWPhysics::RayCastingInterface* getRayCasting() const = 0;
 
         virtual bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
-            bool ignorePlayer, bool ignoreActors)
+            bool ignorePlayer, bool ignoreActors, std::span<const MWWorld::Ptr> ignoreList = {})
             = 0;
 
         virtual void setActorCollisionMode(const MWWorld::Ptr& ptr, bool internal, bool external) = 0;
@@ -434,7 +425,6 @@ namespace MWBase
 
         /// \todo this does not belong here
         virtual void screenshot(osg::Image* image, int w, int h) = 0;
-        virtual bool screenshot360(osg::Image* image) = 0;
 
         /// Find default position inside exterior cell specified by name
         /// \return empty RefId if exterior with given name not exists, the cell's RefId otherwise
@@ -470,7 +460,7 @@ namespace MWBase
          */
         virtual MWWorld::SpellCastState startSpellCast(const MWWorld::Ptr& actor) = 0;
 
-        virtual void castSpell(const MWWorld::Ptr& actor, bool manualSpell = false) = 0;
+        virtual void castSpell(const MWWorld::Ptr& actor, bool scriptedSpell = false) = 0;
 
         virtual void launchMagicBolt(const ESM::RefId& spellId, const MWWorld::Ptr& caster,
             const osg::Vec3f& fallbackDirection, ESM::RefNum item)
@@ -525,7 +515,7 @@ namespace MWBase
         /// Spawn a blood effect for \a ptr at \a worldPosition
         virtual void spawnBloodEffect(const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition) = 0;
 
-        virtual void spawnEffect(const std::string& model, const std::string& textureOverride,
+        virtual void spawnEffect(VFS::Path::NormalizedView model, const std::string& textureOverride,
             const osg::Vec3f& worldPos, float scale = 1.f, bool isMagicVFX = true)
             = 0;
 
@@ -546,9 +536,6 @@ namespace MWBase
             const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat)
             = 0;
 
-        /// Return the distance between actor's weapon and target's collision box.
-        virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0;
-
         virtual void addContainerScripts(const MWWorld::Ptr& reference, MWWorld::CellStore* cell) = 0;
         virtual void removeContainerScripts(const MWWorld::Ptr& reference) = 0;
 
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 9e99b4cacb..6de211e557 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -1,6 +1,7 @@
 #include "activator.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadacti.hpp>
 #include <components/esm3/loadcrea.hpp>
@@ -27,7 +28,6 @@
 #include "../mwrender/vismask.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 
@@ -59,10 +59,10 @@ namespace MWClass
     void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
         MWPhysics::PhysicsSystem& physics) const
     {
-        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+        physics.addObject(ptr, VFS::Path::toNormalized(model), rotation, MWPhysics::CollisionType_World);
     }
 
-    std::string Activator::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Activator::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Activator>(ptr);
     }
@@ -102,16 +102,13 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
 
-        std::string text;
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
-        info.text = text;
 
         return info;
     }
@@ -142,16 +139,14 @@ namespace MWClass
 
     ESM::RefId Activator::getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const
     {
-        const std::string model
-            = getModel(ptr); // Assume it's not empty, since we wouldn't have gotten the soundgen otherwise
+        // Assume it's not empty, since we wouldn't have gotten the soundgen otherwise
+        const std::string_view model = getModel(ptr);
         const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
         const ESM::RefId* creatureId = nullptr;
-        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         for (const ESM::Creature& iter : store.get<ESM::Creature>())
         {
-            if (!iter.mModel.empty()
-                && Misc::StringUtils::ciEqual(model, Misc::ResourceHelpers::correctMeshPath(iter.mModel, vfs)))
+            if (!iter.mModel.empty() && Misc::StringUtils::ciEqual(model, iter.mModel))
             {
                 creatureId = !iter.mOriginal.empty() ? &iter.mOriginal : &iter.mId;
                 break;
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 309e163abe..ec0f1bf282 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -41,7 +41,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
         ///< Generate action for activation
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         bool useAnim() const override;
         ///< Whether or not to use animated variant of model (default false)
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 152a4bbba9..ea0b0d07b3 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -3,6 +3,7 @@
 #include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
 
@@ -14,6 +15,7 @@
 #include "../mwphysics/physicssystem.hpp"
 
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/worldmodel.hpp"
 
 namespace MWClass
 {
@@ -25,7 +27,7 @@ namespace MWClass
     void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
         MWPhysics::PhysicsSystem& physics) const
     {
-        physics.addActor(ptr, model);
+        physics.addActor(ptr, VFS::Path::toNormalized(model));
         if (getCreatureStats(ptr).isDead() && getCreatureStats(ptr).isDeathAnimationFinished())
             MWBase::Environment::get().getWorld()->enableActorCollision(ptr, false);
     }
@@ -35,23 +37,6 @@ namespace MWClass
         return true;
     }
 
-    void Actor::block(const MWWorld::Ptr& ptr) const
-    {
-        const MWWorld::InventoryStore& inv = getInventoryStore(ptr);
-        MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-        if (shield == inv.end())
-            return;
-
-        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
-        const ESM::RefId skill = shield->getClass().getEquipmentSkill(*shield);
-        if (skill == ESM::Skill::LightArmor)
-            sndMgr->playSound3D(ptr, ESM::RefId::stringRefId("Light Armor Hit"), 1.0f, 1.0f);
-        else if (skill == ESM::Skill::MediumArmor)
-            sndMgr->playSound3D(ptr, ESM::RefId::stringRefId("Medium Armor Hit"), 1.0f, 1.0f);
-        else if (skill == ESM::Skill::HeavyArmor)
-            sndMgr->playSound3D(ptr, ESM::RefId::stringRefId("Heavy Armor Hit"), 1.0f, 1.0f);
-    }
-
     osg::Vec3f Actor::getRotationVector(const MWWorld::Ptr& ptr) const
     {
         MWMechanics::Movement& movement = getMovementSettings(ptr);
@@ -90,4 +75,19 @@ namespace MWClass
             moveSpeed *= 0.75f;
         return moveSpeed;
     }
+
+    bool Actor::consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const
+    {
+        MWMechanics::CastSpell cast(actor, actor);
+        const ESM::RefId& recordId = consumable.getCellRef().getRefId();
+        MWBase::Environment::get().getWorldModel()->registerPtr(consumable);
+        MWBase::Environment::get().getLuaManager()->itemConsumed(consumable, actor);
+        actor.getClass().getContainerStore(actor).remove(consumable, 1);
+        if (cast.cast(recordId))
+        {
+            MWBase::Environment::get().getWorld()->breakInvisibility(actor);
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 5a143c7a7d..cf0cb1eaa5 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -45,8 +45,6 @@ namespace MWClass
 
         bool useAnim() const override;
 
-        void block(const MWWorld::Ptr& ptr) const override;
-
         osg::Vec3f getRotationVector(const MWWorld::Ptr& ptr) const override;
         ///< Return desired rotations, as euler angles. Sets getMovementSettings(ptr).mRotation to zero.
 
@@ -62,6 +60,8 @@ namespace MWClass
         /// Return current movement speed.
         float getCurrentSpeed(const MWWorld::Ptr& ptr) const override;
 
+        bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const override;
+
         // not implemented
         Actor(const Actor&) = delete;
         Actor& operator=(const Actor&) = delete;
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 2fbe2f9f87..90112648b5 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -1,6 +1,7 @@
 #include "apparatus.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -15,9 +16,9 @@
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -35,17 +36,14 @@ namespace MWClass
         }
     }
 
-    std::string Apparatus::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Apparatus::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Apparatus>(ptr);
     }
 
     std::string_view Apparatus::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Apparatus>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Apparatus::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -92,8 +90,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -103,10 +100,10 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index ce0916c079..c6bd45858a 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -49,7 +49,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
     };
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 54561e3b0f..8bf9071f0c 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -1,6 +1,7 @@
 #include "armor.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadarmo.hpp>
 #include <components/esm3/loadgmst.hpp>
@@ -24,9 +25,9 @@
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -44,17 +45,14 @@ namespace MWClass
         }
     }
 
-    std::string Armor::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Armor::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Armor>(ptr);
     }
 
     std::string_view Armor::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Armor>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Armor::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -217,8 +215,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -258,15 +255,15 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
         info.enchant = ref->mBase->mEnchant;
         if (!info.enchant.empty())
             info.remainingEnchantCharge = static_cast<int>(ptr.getCellRef().getEnchantmentCharge());
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index d464360623..808bc078f4 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -74,7 +74,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;
 
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 431fb69652..81e42ac725 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -42,7 +42,7 @@ namespace MWClass
         return false;
     }
 
-    std::string BodyPart::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view BodyPart::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::BodyPart>(ptr);
     }
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
index 4a2d9d3620..4268c1ecf5 100644
--- a/apps/openmw/mwclass/bodypart.hpp
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -25,7 +25,7 @@ namespace MWClass
         bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
         ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
     };
 
 }
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index b2b65e01b2..9cbaaa9071 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -1,6 +1,7 @@
 #include "book.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadbook.hpp>
 #include <components/esm3/loadsoun.hpp>
@@ -19,11 +20,11 @@
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -41,17 +42,14 @@ namespace MWClass
         }
     }
 
-    std::string Book::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Book::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Book>(ptr);
     }
 
     std::string_view Book::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Book>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Book::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -111,8 +109,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -122,13 +119,13 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
         info.enchant = ref->mBase->mEnchant;
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index a30e85c107..ca804a32e6 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -54,7 +54,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;
 
diff --git a/apps/openmw/mwclass/classes.cpp b/apps/openmw/mwclass/classes.cpp
index 071389c22c..e7d5cf394b 100644
--- a/apps/openmw/mwclass/classes.cpp
+++ b/apps/openmw/mwclass/classes.cpp
@@ -9,11 +9,15 @@
 #include <components/esm4/loadcont.hpp>
 #include <components/esm4/loadcrea.hpp>
 #include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadflor.hpp>
 #include <components/esm4/loadfurn.hpp>
+#include <components/esm4/loadimod.hpp>
 #include <components/esm4/loadingr.hpp>
 #include <components/esm4/loadligh.hpp>
 #include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmstt.hpp>
 #include <components/esm4/loadnpc.hpp>
+#include <components/esm4/loadscol.hpp>
 #include <components/esm4/loadstat.hpp>
 #include <components/esm4/loadterm.hpp>
 #include <components/esm4/loadtree.hpp>
@@ -32,7 +36,6 @@
 #include "ingredient.hpp"
 #include "itemlevlist.hpp"
 #include "light.hpp"
-#include "light4.hpp"
 #include "lockpick.hpp"
 #include "misc.hpp"
 #include "npc.hpp"
@@ -43,6 +46,8 @@
 #include "weapon.hpp"
 
 #include "esm4base.hpp"
+#include "esm4npc.hpp"
+#include "light4.hpp"
 
 namespace MWClass
 {
@@ -71,22 +76,26 @@ namespace MWClass
         BodyPart::registerSelf();
 
         ESM4Named<ESM4::Activator>::registerSelf();
-        ESM4Named<ESM4::Potion>::registerSelf();
         ESM4Named<ESM4::Ammunition>::registerSelf();
         ESM4Named<ESM4::Armor>::registerSelf();
         ESM4Named<ESM4::Book>::registerSelf();
         ESM4Named<ESM4::Clothing>::registerSelf();
+        ESM4Named<ESM4::Creature>::registerSelf();
         ESM4Named<ESM4::Container>::registerSelf();
         ESM4Named<ESM4::Door>::registerSelf();
+        ESM4Named<ESM4::Flora>::registerSelf();
         ESM4Named<ESM4::Furniture>::registerSelf();
         ESM4Named<ESM4::Ingredient>::registerSelf();
+        ESM4Named<ESM4::ItemMod>::registerSelf();
+        ESM4Light::registerSelf();
         ESM4Named<ESM4::MiscItem>::registerSelf();
+        ESM4Named<ESM4::MovableStatic>::registerSelf();
+        ESM4Npc::registerSelf();
+        ESM4Named<ESM4::Potion>::registerSelf();
         ESM4Static::registerSelf();
+        ESM4Named<ESM4::StaticCollection>::registerSelf();
         ESM4Named<ESM4::Terminal>::registerSelf();
         ESM4Tree::registerSelf();
         ESM4Named<ESM4::Weapon>::registerSelf();
-        ESM4Light::registerSelf();
-        ESM4Actor<ESM4::Npc>::registerSelf();
-        ESM4Actor<ESM4::Creature>::registerSelf();
     }
 }
diff --git a/apps/openmw/mwclass/classmodel.hpp b/apps/openmw/mwclass/classmodel.hpp
index 5d1019ee1d..0f633f37bf 100644
--- a/apps/openmw/mwclass/classmodel.hpp
+++ b/apps/openmw/mwclass/classmodel.hpp
@@ -1,28 +1,18 @@
 #ifndef OPENMW_MWCLASS_CLASSMODEL_H
 #define OPENMW_MWCLASS_CLASSMODEL_H
 
-#include "../mwbase/environment.hpp"
-
 #include "../mwworld/livecellref.hpp"
 #include "../mwworld/ptr.hpp"
 
-#include <components/misc/resourcehelpers.hpp>
-#include <components/resource/resourcesystem.hpp>
-
-#include <string>
+#include <string_view>
 
 namespace MWClass
 {
     template <class Class>
-    std::string getClassModel(const MWWorld::ConstPtr& ptr)
+    std::string_view getClassModel(const MWWorld::ConstPtr& ptr)
     {
         const MWWorld::LiveCellRef<Class>* ref = ptr.get<Class>();
-
-        if (!ref->mBase->mModel.empty())
-            return Misc::ResourceHelpers::correctMeshPath(
-                ref->mBase->mModel, MWBase::Environment::get().getResourceSystem()->getVFS());
-
-        return {};
+        return ref->mBase->mModel;
     }
 }
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index cbc5cecb70..87d34c56d6 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -1,6 +1,7 @@
 #include "clothing.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadclot.hpp>
 #include <components/esm3/loadnpc.hpp>
@@ -16,12 +17,12 @@
 #include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -39,17 +40,14 @@ namespace MWClass
         }
     }
 
-    std::string Clothing::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Clothing::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Clothing>(ptr);
     }
 
     std::string_view Clothing::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Clothing>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Clothing::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -154,8 +152,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -165,15 +162,15 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
         info.enchant = ref->mBase->mEnchant;
         if (!info.enchant.empty())
             info.remainingEnchantCharge = static_cast<int>(ptr.getCellRef().getEnchantmentCharge());
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index a1e8348713..f95559f9c0 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -66,7 +66,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 19132f30ee..8327904ecd 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -1,6 +1,7 @@
 #include "container.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/containerstate.hpp>
 #include <components/esm3/loadcont.hpp>
@@ -21,9 +22,9 @@
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/nullaction.hpp"
+#include "../mwworld/worldmodel.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/animation.hpp"
 #include "../mwrender/objects.hpp"
@@ -33,6 +34,7 @@
 #include "../mwmechanics/npcstats.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -68,10 +70,12 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
+            MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
             MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
 
             // store
             ptr.getRefData().setCustomData(std::make_unique<ContainerCustomData>(*ref->mBase, ptr.getCell()));
+            getContainerStore(ptr).setPtr(ptr);
 
             MWBase::Environment::get().getWorld()->addContainerScripts(ptr, ptr.getCell());
         }
@@ -120,10 +124,10 @@ namespace MWClass
     void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
         MWPhysics::PhysicsSystem& physics) const
     {
-        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+        physics.addObject(ptr, VFS::Path::toNormalized(model), rotation, MWPhysics::CollisionType_World);
     }
 
-    std::string Container::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Container::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Container>(ptr);
     }
@@ -214,18 +218,13 @@ namespace MWClass
 
     std::string_view Container::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Container>(ptr);
     }
 
     MWWorld::ContainerStore& Container::getContainerStore(const MWWorld::Ptr& ptr) const
     {
         ensureCustomData(ptr);
-        auto& data = ptr.getRefData().getCustomData()->asContainerCustomData();
-        data.mStore.mPtr = ptr;
-        return data.mStore;
+        return ptr.getRefData().getCustomData()->asContainerCustomData().mStore;
     }
 
     ESM::RefId Container::getScript(const MWWorld::ConstPtr& ptr) const
@@ -248,7 +247,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name));
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name));
 
         std::string text;
         int lockLevel = ptr.getCellRef().getLockLevel();
@@ -264,13 +263,13 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
             if (ptr.getCellRef().getRefId() == "stolen_goods")
-                text += "\nYou can not use evidence chests";
+                info.extra += "\nYou cannot use evidence chests";
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
@@ -301,8 +300,13 @@ namespace MWClass
     MWWorld::Ptr Container::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
         const MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
-
-        return MWWorld::Ptr(cell.insert(ref), &cell);
+        MWWorld::Ptr newPtr(cell.insert(ref), &cell);
+        if (newPtr.getRefData().getCustomData())
+        {
+            MWBase::Environment::get().getWorldModel()->registerPtr(newPtr);
+            getContainerStore(newPtr).setPtr(newPtr);
+        }
+        return newPtr;
     }
 
     void Container::readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
@@ -312,6 +316,9 @@ namespace MWClass
 
         const ESM::ContainerState& containerState = state.asContainerState();
         ptr.getRefData().setCustomData(std::make_unique<ContainerCustomData>(containerState.mInventory));
+
+        MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
+        getContainerStore(ptr).setPtr(ptr);
     }
 
     void Container::writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 5f8b962e4a..88d8148fdc 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -85,7 +85,7 @@ namespace MWClass
 
         void respawn(const MWWorld::Ptr& ptr) const override;
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 672b198704..007338095f 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -1,6 +1,7 @@
 #include "creature.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/creaturestate.hpp>
 #include <components/esm3/loadclas.hpp>
@@ -39,14 +40,15 @@
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/localscripts.hpp"
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/worldmodel.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace
 {
@@ -117,6 +119,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
+            MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
             auto tempData = std::make_unique<CreatureCustomData>();
             CreatureCustomData* data = tempData.get();
             MWMechanics::CreatureCustomDataResetter resetter{ ptr };
@@ -125,14 +128,8 @@ namespace MWClass
             MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
 
             // creature stats
-            data->mCreatureStats.setAttribute(ESM::Attribute::Strength, ref->mBase->mData.mStrength);
-            data->mCreatureStats.setAttribute(ESM::Attribute::Intelligence, ref->mBase->mData.mIntelligence);
-            data->mCreatureStats.setAttribute(ESM::Attribute::Willpower, ref->mBase->mData.mWillpower);
-            data->mCreatureStats.setAttribute(ESM::Attribute::Agility, ref->mBase->mData.mAgility);
-            data->mCreatureStats.setAttribute(ESM::Attribute::Speed, ref->mBase->mData.mSpeed);
-            data->mCreatureStats.setAttribute(ESM::Attribute::Endurance, ref->mBase->mData.mEndurance);
-            data->mCreatureStats.setAttribute(ESM::Attribute::Personality, ref->mBase->mData.mPersonality);
-            data->mCreatureStats.setAttribute(ESM::Attribute::Luck, ref->mBase->mData.mLuck);
+            for (size_t i = 0; i < ref->mBase->mData.mAttributes.size(); ++i)
+                data->mCreatureStats.setAttribute(ESM::Attribute::indexToRefId(i), ref->mBase->mData.mAttributes[i]);
             data->mCreatureStats.setHealth(static_cast<float>(ref->mBase->mData.mHealth));
             data->mCreatureStats.setMagicka(static_cast<float>(ref->mBase->mData.mMana));
             data->mCreatureStats.setFatigue(static_cast<float>(ref->mBase->mData.mFatigue));
@@ -161,6 +158,7 @@ namespace MWClass
                 data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
             else
                 data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
+            data->mContainerStore->setPtr(ptr);
 
             data->mCreatureStats.setGoldPool(ref->mBase->mData.mGold);
 
@@ -181,21 +179,22 @@ namespace MWClass
         objects.insertCreature(ptr, model, hasInventoryStore(ptr));
     }
 
-    std::string Creature::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Creature::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Creature>(ptr);
     }
 
-    void Creature::getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const
+    void Creature::getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const
     {
-        std::string model = getModel(ptr);
+        std::string_view model = getModel(ptr);
         if (!model.empty())
             models.push_back(model);
 
-        // FIXME: use const version of InventoryStore functions once they are available
-        if (hasInventoryStore(ptr))
+        const MWWorld::CustomData* customData = ptr.getRefData().getCustomData();
+        if (customData && hasInventoryStore(ptr))
         {
-            const MWWorld::InventoryStore& invStore = getInventoryStore(ptr);
+            const auto& invStore
+                = static_cast<const MWWorld::InventoryStore&>(*customData->asCreatureCustomData().mContainerStore);
             for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
             {
                 MWWorld::ConstContainerStoreIterator equipped = invStore.getSlot(slot);
@@ -211,10 +210,7 @@ namespace MWClass
 
     std::string_view Creature::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Creature>(ptr);
     }
 
     MWMechanics::CreatureStats& Creature::getCreatureStats(const MWWorld::Ptr& ptr) const
@@ -245,24 +241,10 @@ namespace MWClass
         if (!weapon.isEmpty())
             dist *= weapon.get<ESM::Weapon>()->mBase->mData.mReach;
 
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
-        // result.
-        std::vector<MWWorld::Ptr> targetActors;
-        getCreatureStats(ptr).getAiSequence().getCombatTargets(targetActors);
-
-        std::pair<MWWorld::Ptr, osg::Vec3f> result
-            = MWBase::Environment::get().getWorld()->getHitContact(ptr, dist, targetActors);
+        const std::pair<MWWorld::Ptr, osg::Vec3f> result = MWMechanics::getHitContact(ptr, dist);
         if (result.first.isEmpty()) // Didn't hit anything
             return true;
 
-        const MWWorld::Class& othercls = result.first.getClass();
-        if (!othercls.isActor()) // Can't hit non-actors
-            return true;
-
-        MWMechanics::CreatureStats& otherstats = othercls.getCreatureStats(result.first);
-        if (otherstats.isDead()) // Can't hit dead actors
-            return true;
-
         // Note that earlier we returned true in spite of an apparent failure to hit anything alive.
         // This is because hitting nothing is not a "miss" and should be handled as such character controller-side.
         victim = result.first;
@@ -301,7 +283,8 @@ namespace MWClass
 
         if (!success)
         {
-            victim.getClass().onHit(victim, 0.0f, false, MWWorld::Ptr(), ptr, osg::Vec3f(), false);
+            victim.getClass().onHit(
+                victim, 0.0f, false, MWWorld::Ptr(), ptr, osg::Vec3f(), false, MWMechanics::DamageSourceType::Melee);
             MWMechanics::reduceWeaponCondition(0.f, false, weapon, ptr);
             return;
         }
@@ -331,11 +314,11 @@ namespace MWClass
         {
             const unsigned char* attack = nullptr;
             if (type == ESM::Weapon::AT_Chop)
-                attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
+                attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop.data();
             else if (type == ESM::Weapon::AT_Slash)
-                attack = weapon.get<ESM::Weapon>()->mBase->mData.mSlash;
+                attack = weapon.get<ESM::Weapon>()->mBase->mData.mSlash.data();
             else if (type == ESM::Weapon::AT_Thrust)
-                attack = weapon.get<ESM::Weapon>()->mBase->mData.mThrust;
+                attack = weapon.get<ESM::Weapon>()->mBase->mData.mThrust.data();
             if (attack)
             {
                 damage = attack[0] + ((attack[1] - attack[0]) * attackStrength);
@@ -355,31 +338,39 @@ namespace MWClass
         MWMechanics::applyElementalShields(ptr, victim);
 
         if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
-        {
             damage = 0;
-            victim.getClass().block(victim);
-        }
 
         MWMechanics::diseaseContact(victim, ptr);
 
-        victim.getClass().onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
+        victim.getClass().onHit(
+            victim, damage, healthdmg, weapon, ptr, hitPosition, true, MWMechanics::DamageSourceType::Melee);
     }
 
     void Creature::onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
-        const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const
+        const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful,
+        const MWMechanics::DamageSourceType sourceType) const
     {
         MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
 
+        // Self defense
+        bool setOnPcHitMe = true;
+
         // NOTE: 'object' and/or 'attacker' may be empty.
         if (!attacker.isEmpty() && attacker.getClass().isActor() && !stats.getAiSequence().isInCombat(attacker))
+        {
             stats.setAttacked(true);
 
-        // Self defense
-        bool setOnPcHitMe = true; // Note OnPcHitMe is not set for friendly hits.
-
-        // No retaliation for totally static creatures (they have no movement or attacks anyway)
-        if (isMobile(ptr) && !attacker.isEmpty())
-            setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
+            // No retaliation for totally static creatures (they have no movement or attacks anyway)
+            if (isMobile(ptr))
+            {
+                bool complain = sourceType == MWMechanics::DamageSourceType::Melee;
+                bool supportFriendlyFire = sourceType != MWMechanics::DamageSourceType::Ranged;
+                if (supportFriendlyFire && MWMechanics::friendlyHit(attacker, ptr, complain))
+                    setOnPcHitMe = false;
+                else
+                    setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
+            }
+        }
 
         // Attacker and target store each other as hitattemptactor if they have no one stored yet
         if (!attacker.isEmpty() && attacker.getClass().isActor())
@@ -481,18 +472,17 @@ namespace MWClass
         }
 
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
-
         if (stats.isDead())
         {
-            // by default user can loot friendly actors during death animation
-            if (Settings::game().mCanLootDuringDeathAnimation && !stats.getAiSequence().isInCombat())
+            // by default user can loot non-fighting actors during death animation
+            if (Settings::game().mCanLootDuringDeathAnimation)
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
 
             // otherwise wait until death animation
             if (stats.isDeathAnimationFinished())
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
         }
-        else if (!stats.getAiSequence().isInCombat() && !stats.getKnockedDown())
+        else if (!stats.getKnockedDown())
             return std::make_unique<MWWorld::ActionTalk>(ptr);
 
         // Tribunal and some mod companions oddly enough must use open action as fallback
@@ -505,10 +495,7 @@ namespace MWClass
     MWWorld::ContainerStore& Creature::getContainerStore(const MWWorld::Ptr& ptr) const
     {
         ensureCustomData(ptr);
-        auto& store = *ptr.getRefData().getCustomData()->asCreatureCustomData().mContainerStore;
-        if (hasInventoryStore(ptr))
-            static_cast<MWWorld::InventoryStore&>(store).setActor(ptr);
-        return store;
+        return *ptr.getRefData().getCustomData()->asCreatureCustomData().mContainerStore;
     }
 
     MWWorld::InventoryStore& Creature::getInventoryStore(const MWWorld::Ptr& ptr) const
@@ -519,7 +506,7 @@ namespace MWClass
             throw std::runtime_error("this creature has no inventory store");
     }
 
-    bool Creature::hasInventoryStore(const MWWorld::Ptr& ptr) const
+    bool Creature::hasInventoryStore(const MWWorld::ConstPtr& ptr) const
     {
         return isFlagBitSet(ptr, ESM::Creature::Weapon);
     }
@@ -590,7 +577,8 @@ namespace MWClass
         if (customData.mCreatureStats.isDead() && customData.mCreatureStats.isDeathAnimationFinished())
             return true;
 
-        return !customData.mCreatureStats.getAiSequence().isInCombat();
+        const MWMechanics::AiSequence& aiSeq = customData.mCreatureStats.getAiSequence();
+        return !aiSeq.isInCombat() || aiSeq.isFleeing();
     }
 
     MWGui::ToolTipInfo Creature::getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const
@@ -599,12 +587,10 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name));
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name));
 
-        std::string text;
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
-        info.text = text;
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
 
         return info;
     }
@@ -658,15 +644,13 @@ namespace MWClass
 
         if (sounds.empty())
         {
-            const std::string model = getModel(ptr);
+            const std::string_view model = getModel(ptr);
             if (!model.empty())
             {
-                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 for (const ESM::Creature& creature : store.get<ESM::Creature>())
                 {
                     if (creature.mId != ourId && creature.mOriginal != ourId && !creature.mModel.empty()
-                        && Misc::StringUtils::ciEqual(
-                            model, Misc::ResourceHelpers::correctMeshPath(creature.mModel, vfs)))
+                        && Misc::StringUtils::ciEqual(model, creature.mModel))
                     {
                         const ESM::RefId& fallbackId = !creature.mOriginal.empty() ? creature.mOriginal : creature.mId;
                         sound = store.get<ESM::SoundGenerator>().begin();
@@ -694,8 +678,13 @@ namespace MWClass
     MWWorld::Ptr Creature::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
         const MWWorld::LiveCellRef<ESM::Creature>* ref = ptr.get<ESM::Creature>();
-
-        return MWWorld::Ptr(cell.insert(ref), &cell);
+        MWWorld::Ptr newPtr(cell.insert(ref), &cell);
+        if (newPtr.getRefData().getCustomData())
+        {
+            MWBase::Environment::get().getWorldModel()->registerPtr(newPtr);
+            newPtr.getClass().getContainerStore(newPtr).setPtr(newPtr);
+        }
+        return newPtr;
     }
 
     bool Creature::isBipedal(const MWWorld::ConstPtr& ptr) const
@@ -791,29 +780,26 @@ namespace MWClass
 
         const ESM::CreatureState& creatureState = state.asCreatureState();
 
-        if (state.mVersion > 0)
+        if (!ptr.getRefData().getCustomData())
         {
-            if (!ptr.getRefData().getCustomData())
+            if (creatureState.mCreatureStats.mMissingACDT)
+                ensureCustomData(ptr);
+            else
             {
-                if (creatureState.mCreatureStats.mMissingACDT)
-                    ensureCustomData(ptr);
+                // Create a CustomData, but don't fill it from ESM records (not needed)
+                auto data = std::make_unique<CreatureCustomData>();
+
+                if (hasInventoryStore(ptr))
+                    data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
                 else
-                {
-                    // Create a CustomData, but don't fill it from ESM records (not needed)
-                    auto data = std::make_unique<CreatureCustomData>();
+                    data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
 
-                    if (hasInventoryStore(ptr))
-                        data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
-                    else
-                        data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
+                MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
+                data->mContainerStore->setPtr(ptr);
 
-                    ptr.getRefData().setCustomData(std::move(data));
-                }
+                ptr.getRefData().setCustomData(std::move(data));
             }
         }
-        else
-            ensureCustomData(
-                ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
 
         CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData();
 
@@ -833,7 +819,7 @@ namespace MWClass
         }
 
         const CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData();
-        if (ptr.getRefData().getCount() <= 0
+        if (ptr.getCellRef().getCount() <= 0
             && (!isFlagBitSet(ptr, ESM::Creature::Respawn) || !customData.mCreatureStats.isDead()))
         {
             state.mHasCustomState = false;
@@ -853,7 +839,7 @@ namespace MWClass
     void Creature::respawn(const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& creatureStats = getCreatureStats(ptr);
-        if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
+        if (ptr.getCellRef().getCount() > 0 && !creatureStats.isDead())
             return;
 
         if (!creatureStats.isDeathAnimationFinished())
@@ -865,16 +851,16 @@ namespace MWClass
         static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->mValue.getFloat();
 
         float delay
-            = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+            = ptr.getCellRef().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
 
         if (isFlagBitSet(ptr, ESM::Creature::Respawn)
             && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
             if (ptr.getCellRef().hasContentFile())
             {
-                if (ptr.getRefData().getCount() == 0)
+                if (ptr.getCellRef().getCount() == 0)
                 {
-                    ptr.getRefData().setCount(1);
+                    ptr.getCellRef().setCount(1);
                     const ESM::RefId& script = getScript(ptr);
                     if (!script.empty())
                         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, ptr);
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index bd7101e93d..b8619128c2 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -67,7 +67,8 @@ namespace MWClass
             const osg::Vec3f& hitPosition, bool success) const override;
 
         void onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
-            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const override;
+            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful,
+            const MWMechanics::DamageSourceType sourceType) const override;
 
         std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
         ///< Generate action for activation
@@ -78,7 +79,7 @@ namespace MWClass
         MWWorld::InventoryStore& getInventoryStore(const MWWorld::Ptr& ptr) const override;
         ///< Return inventory store
 
-        bool hasInventoryStore(const MWWorld::Ptr& ptr) const override;
+        bool hasInventoryStore(const MWWorld::ConstPtr& ptr) const override;
 
         ESM::RefId getScript(const MWWorld::ConstPtr& ptr) const override;
         ///< Return name of the script attached to ptr
@@ -104,9 +105,9 @@ namespace MWClass
 
         float getMaxSpeed(const MWWorld::Ptr& ptr) const override;
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
-        void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
+        void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const override;
         ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
         ///< list getModel().
 
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index dd346306e9..f16601531d 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -81,7 +81,7 @@ namespace MWClass
         if (!creature.isEmpty())
         {
             const MWMechanics::CreatureStats& creatureStats = creature.getClass().getCreatureStats(creature);
-            if (creature.getRefData().getCount() == 0)
+            if (creature.getCellRef().getCount() == 0)
                 customData.mSpawn = true;
             else if (creatureStats.isDead())
             {
@@ -99,25 +99,6 @@ namespace MWClass
             customData.mSpawn = true;
     }
 
-    void CreatureLevList::getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const
-    {
-        // disable for now, too many false positives
-        /*
-        const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
-        for (std::vector<ESM::LevelledListBase::LevelItem>::const_iterator it = ref->mBase->mList.begin(); it !=
-        ref->mBase->mList.end(); ++it)
-        {
-            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            if (it->mLevel > player.getClass().getCreatureStats(player).getLevel())
-                continue;
-
-            const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
-            MWWorld::ManualRef ref(store, it->mId);
-            ref.getPtr().getClass().getModelsToPreload(ref.getPtr(), models);
-        }
-        */
-    }
-
     void CreatureLevList::insertObjectRendering(
         const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -148,7 +129,7 @@ namespace MWClass
             manualRef.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
             manualRef.getPtr().getCellRef().setScale(ptr.getCellRef().getScale());
             MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(
-                manualRef.getPtr(), ptr.getCell(), ptr.getCellRef().getPosition());
+                manualRef.getPtr(), ptr.getCell(), ptr.getRefData().getPosition());
             customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
             customData.mSpawn = false;
         }
diff --git a/apps/openmw/mwclass/creaturelevlist.hpp b/apps/openmw/mwclass/creaturelevlist.hpp
index d689d1770e..ded8f77de5 100644
--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@@ -20,10 +20,6 @@ namespace MWClass
         bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
         ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-        void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
-        ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
-        ///< list getModel().
-
         void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
             MWRender::RenderingInterface& renderingInterface) const override;
         ///< Add reference into a cell for rendering
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index ecd6cb59aa..9fe7e92ffa 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -1,6 +1,7 @@
 #include "door.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/doorstate.hpp>
 #include <components/esm3/loaddoor.hpp>
@@ -25,7 +26,6 @@
 #include "../mwworld/worldmodel.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/animation.hpp"
 #include "../mwrender/objects.hpp"
@@ -35,6 +35,7 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -81,7 +82,7 @@ namespace MWClass
     void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
         MWPhysics::PhysicsSystem& physics) const
     {
-        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door);
+        physics.addObject(ptr, VFS::Path::toNormalized(model), rotation, MWPhysics::CollisionType_Door);
     }
 
     bool Door::isDoor() const
@@ -94,17 +95,14 @@ namespace MWClass
         return true;
     }
 
-    std::string Door::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Door::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Door>(ptr);
     }
 
     std::string_view Door::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Door>* ref = ptr.get<ESM::Door>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Door>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Door::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -136,7 +134,7 @@ namespace MWClass
                 const ESM::MagicEffect* effect = store.get<ESM::MagicEffect>().find(ESM::MagicEffect::Telekinesis);
 
                 animation->addSpellCastGlow(
-                    effect, 1); // 1 second glow to match the time taken for a door opening or closing
+                    effect->getColor(), 1); // 1 second glow to match the time taken for a door opening or closing
             }
         }
 
@@ -267,7 +265,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name));
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name));
 
         std::string text;
 
@@ -290,10 +288,10 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 17ada40c6f..18dd2348ab 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -51,7 +51,7 @@ namespace MWClass
         ESM::RefId getScript(const MWWorld::ConstPtr& ptr) const override;
         ///< Return name of the script attached to ptr
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         MWWorld::DoorState getDoorState(const MWWorld::ConstPtr& ptr) const override;
         /// This does not actually cause the door to move. Use World::activateDoor instead.
diff --git a/apps/openmw/mwclass/esm4base.cpp b/apps/openmw/mwclass/esm4base.cpp
index 956fc210ee..17af545348 100644
--- a/apps/openmw/mwclass/esm4base.cpp
+++ b/apps/openmw/mwclass/esm4base.cpp
@@ -1,11 +1,11 @@
 #include "esm4base.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
@@ -29,14 +29,13 @@ namespace MWClass
     void ESM4Impl::insertObjectPhysics(
         const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics)
     {
-        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+        physics.addObject(ptr, VFS::Path::toNormalized(model), rotation, MWPhysics::CollisionType_World);
     }
 
     MWGui::ToolTipInfo ESM4Impl::getToolTipInfo(std::string_view name, int count)
     {
         MWGui::ToolTipInfo info;
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         return info;
     }
 }
diff --git a/apps/openmw/mwclass/esm4base.hpp b/apps/openmw/mwclass/esm4base.hpp
index 3d2184e5fe..f13d6007cd 100644
--- a/apps/openmw/mwclass/esm4base.hpp
+++ b/apps/openmw/mwclass/esm4base.hpp
@@ -1,14 +1,18 @@
 #ifndef GAME_MWCLASS_ESM4BASE_H
 #define GAME_MWCLASS_ESM4BASE_H
 
+#include <components/esm4/inventory.hpp>
 #include <components/esm4/loadstat.hpp>
 #include <components/esm4/loadtree.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
+#include "../mwbase/environment.hpp"
+
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/registeredclass.hpp"
 
 #include "classmodel.hpp"
@@ -23,13 +27,40 @@ namespace MWClass
         void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
             MWPhysics::PhysicsSystem& physics);
         MWGui::ToolTipInfo getToolTipInfo(std::string_view name, int count);
+
+        // We don't handle ESM4 player stats yet, so for resolving levelled object we use an arbitrary number.
+        constexpr int sDefaultLevel = 5;
+
+        template <class LevelledRecord, class TargetRecord>
+        const TargetRecord* resolveLevelled(const ESM::RefId& id, int level = sDefaultLevel)
+        {
+            if (id.empty())
+                return nullptr;
+            const MWWorld::ESMStore* esmStore = MWBase::Environment::get().getESMStore();
+            const auto& targetStore = esmStore->get<TargetRecord>();
+            const TargetRecord* res = targetStore.search(id);
+            if (res)
+                return res;
+            const LevelledRecord* lvlRec = esmStore->get<LevelledRecord>().search(id);
+            if (!lvlRec)
+                return nullptr;
+            for (const ESM4::LVLO& obj : lvlRec->mLvlObject)
+            {
+                ESM::RefId candidateId = ESM::FormId::fromUint32(obj.item);
+                if (candidateId == id)
+                    continue;
+                const TargetRecord* candidate = resolveLevelled<LevelledRecord, TargetRecord>(candidateId, level);
+                if (candidate && (!res || obj.level <= level))
+                    res = candidate;
+            }
+            return res;
+        }
     }
 
-    // Base for all ESM4 Classes
+    // Base for many ESM4 Classes
     template <typename Record>
     class ESM4Base : public MWWorld::Class
     {
-
         MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override
         {
             const MWWorld::LiveCellRef<Record>* ref = ptr.get<Record>();
@@ -65,14 +96,14 @@ namespace MWClass
 
         std::string_view getName(const MWWorld::ConstPtr& ptr) const override { return {}; }
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override
         {
-            std::string model = getClassModel<Record>(ptr);
+            std::string_view model = getClassModel<Record>(ptr);
 
             // Hide meshes meshes/marker/* and *LOD.nif in ESM4 cells. It is a temporarty hack.
             // Needed because otherwise LOD meshes are rendered on top of normal meshes.
             // TODO: Figure out a better way find markers and LOD meshes; show LOD only outside of active grid.
-            if (model.empty() || Misc::StringUtils::ciStartsWith(model, "meshes\\marker")
+            if (model.empty() || Misc::StringUtils::ciStartsWith(model, "marker")
                 || Misc::StringUtils::ciEndsWith(model, "lod.nif"))
                 return {};
 
@@ -104,58 +135,22 @@ namespace MWClass
     class ESM4Named : public MWWorld::RegisteredClass<ESM4Named<Record>, ESM4Base<Record>>
     {
     public:
-        friend MWWorld::RegisteredClass<ESM4Named, ESM4Base<Record>>;
-
         ESM4Named()
             : MWWorld::RegisteredClass<ESM4Named, ESM4Base<Record>>(Record::sRecordId)
         {
         }
 
-    public:
-        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override { return true; }
-
-        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override
-        {
-            return ESM4Impl::getToolTipInfo(ptr.get<Record>()->mBase->mFullName, count);
-        }
-
         std::string_view getName(const MWWorld::ConstPtr& ptr) const override
         {
             return ptr.get<Record>()->mBase->mFullName;
         }
-    };
-
-    template <typename Record>
-    class ESM4Actor : public MWWorld::RegisteredClass<ESM4Actor<Record>, ESM4Base<Record>>
-    {
-    public:
-        friend MWWorld::RegisteredClass<ESM4Actor, ESM4Base<Record>>;
-
-        ESM4Actor()
-            : MWWorld::RegisteredClass<ESM4Actor, ESM4Base<Record>>(Record::sRecordId)
-        {
-        }
-
-        void insertObjectPhysics(
-            const MWWorld::Ptr&, const std::string&, const osg::Quat&, MWPhysics::PhysicsSystem&) const override
-        {
-        }
-
-        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override { return true; }
 
         MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override
         {
-            return ESM4Impl::getToolTipInfo(ptr.get<Record>()->mBase->mEditorId, count);
+            return ESM4Impl::getToolTipInfo(getName(ptr), count);
         }
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override
-        {
-            // TODO: Not clear where to get something renderable:
-            // ESM4::Npc::mModel is usually an empty string
-            // ESM4::Race::mModelMale is only a skeleton
-            // For now show error marker as a dummy model.
-            return "meshes/marker_error.nif";
-        }
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override { return !getName(ptr).empty(); }
     };
 }
 
diff --git a/apps/openmw/mwclass/esm4npc.cpp b/apps/openmw/mwclass/esm4npc.cpp
new file mode 100644
index 0000000000..a7fb0a3544
--- /dev/null
+++ b/apps/openmw/mwclass/esm4npc.cpp
@@ -0,0 +1,195 @@
+#include "esm4npc.hpp"
+
+#include <components/esm4/loadarmo.hpp>
+#include <components/esm4/loadclot.hpp>
+#include <components/esm4/loadlvli.hpp>
+#include <components/esm4/loadlvln.hpp>
+#include <components/esm4/loadnpc.hpp>
+#include <components/esm4/loadotft.hpp>
+#include <components/esm4/loadrace.hpp>
+
+#include <components/misc/resourcehelpers.hpp>
+
+#include "../mwworld/customdata.hpp"
+#include "../mwworld/esmstore.hpp"
+
+#include "esm4base.hpp"
+
+namespace MWClass
+{
+    template <class LevelledRecord, class TargetRecord>
+    static std::vector<const TargetRecord*> withBaseTemplates(
+        const TargetRecord* rec, int level = MWClass::ESM4Impl::sDefaultLevel)
+    {
+        std::vector<const TargetRecord*> res{ rec };
+        while (true)
+        {
+            const TargetRecord* newRec
+                = MWClass::ESM4Impl::resolveLevelled<ESM4::LevelledNpc, ESM4::Npc>(rec->mBaseTemplate, level);
+            if (!newRec || newRec == rec)
+                return res;
+            res.push_back(rec = newRec);
+        }
+    }
+
+    static const ESM4::Npc* chooseTemplate(const std::vector<const ESM4::Npc*>& recs, uint16_t flag)
+    {
+        for (const auto* rec : recs)
+        {
+            if (rec->mIsTES4)
+                return rec;
+            else if (rec->mIsFONV)
+            {
+                // TODO: FO3 should use this branch as well. But it is not clear how to distinguish FO3 from
+                // TES5. Currently FO3 uses wrong template flags that can lead to "ESM4 NPC traits not found"
+                // exception the NPC will not be added to the scene. But in any way it shouldn't cause a crash.
+                if (!(rec->mBaseConfig.fo3.templateFlags & flag))
+                    return rec;
+            }
+            else if (rec->mIsFO4)
+            {
+                if (!(rec->mBaseConfig.fo4.templateFlags & flag))
+                    return rec;
+            }
+            else if (!(rec->mBaseConfig.tes5.templateFlags & flag))
+                return rec;
+        }
+        return nullptr;
+    }
+
+    class ESM4NpcCustomData : public MWWorld::TypedCustomData<ESM4NpcCustomData>
+    {
+    public:
+        const ESM4::Npc* mTraits;
+        const ESM4::Npc* mBaseData;
+        const ESM4::Race* mRace;
+        bool mIsFemale;
+
+        // TODO: Use InventoryStore instead (currently doesn't support ESM4 objects)
+        std::vector<const ESM4::Armor*> mEquippedArmor;
+        std::vector<const ESM4::Clothing*> mEquippedClothing;
+
+        ESM4NpcCustomData& asESM4NpcCustomData() override { return *this; }
+        const ESM4NpcCustomData& asESM4NpcCustomData() const override { return *this; }
+    };
+
+    ESM4NpcCustomData& ESM4Npc::getCustomData(const MWWorld::ConstPtr& ptr)
+    {
+        // Note: the argument is ConstPtr because this function is used in `getModel` and `getName`
+        // which are virtual and work with ConstPtr. `getModel` and `getName` use custom data
+        // because they require a lot of work including levelled records resolving and it would be
+        // stupid to not to cache the results. Maybe we should stop using ConstPtr at all
+        // to avoid such workarounds.
+        MWWorld::RefData& refData = const_cast<MWWorld::RefData&>(ptr.getRefData());
+
+        if (auto* data = refData.getCustomData())
+            return data->asESM4NpcCustomData();
+
+        auto data = std::make_unique<ESM4NpcCustomData>();
+
+        const MWWorld::ESMStore* store = MWBase::Environment::get().getESMStore();
+        const ESM4::Npc* const base = ptr.get<ESM4::Npc>()->mBase;
+        auto npcRecs = withBaseTemplates<ESM4::LevelledNpc, ESM4::Npc>(base);
+
+        data->mTraits = chooseTemplate(npcRecs, ESM4::Npc::Template_UseTraits);
+
+        if (data->mTraits == nullptr)
+            Log(Debug::Warning) << "Traits are not found for ESM4 NPC base record: \"" << base->mEditorId << "\" ("
+                                << ESM::RefId(base->mId) << ")";
+
+        data->mBaseData = chooseTemplate(npcRecs, ESM4::Npc::Template_UseBaseData);
+
+        if (data->mBaseData == nullptr)
+            Log(Debug::Warning) << "Base data is not found for ESM4 NPC base record: \"" << base->mEditorId << "\" ("
+                                << ESM::RefId(base->mId) << ")";
+
+        if (data->mTraits != nullptr)
+        {
+            data->mRace = store->get<ESM4::Race>().find(data->mTraits->mRace);
+            if (data->mTraits->mIsTES4)
+                data->mIsFemale = data->mTraits->mBaseConfig.tes4.flags & ESM4::Npc::TES4_Female;
+            else if (data->mTraits->mIsFONV)
+                data->mIsFemale = data->mTraits->mBaseConfig.fo3.flags & ESM4::Npc::FO3_Female;
+            else if (data->mTraits->mIsFO4)
+                data->mIsFemale
+                    = data->mTraits->mBaseConfig.fo4.flags & ESM4::Npc::TES5_Female; // FO4 flags are the same as TES5
+            else
+                data->mIsFemale = data->mTraits->mBaseConfig.tes5.flags & ESM4::Npc::TES5_Female;
+        }
+
+        if (auto inv = chooseTemplate(npcRecs, ESM4::Npc::Template_UseInventory))
+        {
+            for (const ESM4::InventoryItem& item : inv->mInventory)
+            {
+                if (auto* armor
+                    = ESM4Impl::resolveLevelled<ESM4::LevelledItem, ESM4::Armor>(ESM::FormId::fromUint32(item.item)))
+                    data->mEquippedArmor.push_back(armor);
+                else if (data->mTraits != nullptr && data->mTraits->mIsTES4)
+                {
+                    const auto* clothing = ESM4Impl::resolveLevelled<ESM4::LevelledItem, ESM4::Clothing>(
+                        ESM::FormId::fromUint32(item.item));
+                    if (clothing)
+                        data->mEquippedClothing.push_back(clothing);
+                }
+            }
+            if (!inv->mDefaultOutfit.isZeroOrUnset())
+            {
+                if (const ESM4::Outfit* outfit = store->get<ESM4::Outfit>().search(inv->mDefaultOutfit))
+                {
+                    for (ESM::FormId itemId : outfit->mInventory)
+                        if (auto* armor = ESM4Impl::resolveLevelled<ESM4::LevelledItem, ESM4::Armor>(itemId))
+                            data->mEquippedArmor.push_back(armor);
+                }
+                else
+                    Log(Debug::Error) << "Outfit not found: " << ESM::RefId(inv->mDefaultOutfit);
+            }
+        }
+
+        ESM4NpcCustomData& res = *data;
+        refData.setCustomData(std::move(data));
+        return res;
+    }
+
+    const std::vector<const ESM4::Armor*>& ESM4Npc::getEquippedArmor(const MWWorld::Ptr& ptr)
+    {
+        return getCustomData(ptr).mEquippedArmor;
+    }
+
+    const std::vector<const ESM4::Clothing*>& ESM4Npc::getEquippedClothing(const MWWorld::Ptr& ptr)
+    {
+        return getCustomData(ptr).mEquippedClothing;
+    }
+
+    const ESM4::Npc* ESM4Npc::getTraitsRecord(const MWWorld::Ptr& ptr)
+    {
+        return getCustomData(ptr).mTraits;
+    }
+
+    const ESM4::Race* ESM4Npc::getRace(const MWWorld::Ptr& ptr)
+    {
+        return getCustomData(ptr).mRace;
+    }
+
+    bool ESM4Npc::isFemale(const MWWorld::Ptr& ptr)
+    {
+        return getCustomData(ptr).mIsFemale;
+    }
+
+    std::string_view ESM4Npc::getModel(const MWWorld::ConstPtr& ptr) const
+    {
+        const ESM4NpcCustomData& data = getCustomData(ptr);
+        if (data.mTraits == nullptr)
+            return {};
+        if (data.mTraits->mIsTES4)
+            return data.mTraits->mModel;
+        return data.mIsFemale ? data.mRace->mModelFemale : data.mRace->mModelMale;
+    }
+
+    std::string_view ESM4Npc::getName(const MWWorld::ConstPtr& ptr) const
+    {
+        const ESM4::Npc* const baseData = getCustomData(ptr).mBaseData;
+        if (baseData == nullptr)
+            return {};
+        return baseData->mFullName;
+    }
+}
diff --git a/apps/openmw/mwclass/esm4npc.hpp b/apps/openmw/mwclass/esm4npc.hpp
new file mode 100644
index 0000000000..39116586f1
--- /dev/null
+++ b/apps/openmw/mwclass/esm4npc.hpp
@@ -0,0 +1,71 @@
+#ifndef GAME_MWCLASS_ESM4ACTOR_H
+#define GAME_MWCLASS_ESM4ACTOR_H
+
+#include <components/esm4/loadcrea.hpp>
+#include <components/esm4/loadnpc.hpp>
+
+#include "../mwgui/tooltips.hpp"
+
+#include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
+
+#include "esm4base.hpp"
+
+namespace MWClass
+{
+    class ESM4Npc final : public MWWorld::RegisteredClass<ESM4Npc>
+    {
+    public:
+        ESM4Npc()
+            : MWWorld::RegisteredClass<ESM4Npc>(ESM4::Npc::sRecordId)
+        {
+        }
+
+        MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override
+        {
+            const MWWorld::LiveCellRef<ESM4::Npc>* ref = ptr.get<ESM4::Npc>();
+            return MWWorld::Ptr(cell.insert(ref), &cell);
+        }
+
+        void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
+            MWRender::RenderingInterface& renderingInterface) const override
+        {
+            renderingInterface.getObjects().insertNPC(ptr);
+        }
+
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override
+        {
+            insertObjectPhysics(ptr, model, rotation, physics);
+        }
+
+        void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
+            MWPhysics::PhysicsSystem& physics) const override
+        {
+            // ESM4Impl::insertObjectPhysics(ptr, getModel(ptr), rotation, physics);
+        }
+
+        bool hasToolTip(const MWWorld::ConstPtr& ptr) const override { return true; }
+        MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override
+        {
+            return ESM4Impl::getToolTipInfo(getName(ptr), count);
+        }
+
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
+
+        static const ESM4::Npc* getTraitsRecord(const MWWorld::Ptr& ptr);
+        static const ESM4::Race* getRace(const MWWorld::Ptr& ptr);
+        static bool isFemale(const MWWorld::Ptr& ptr);
+        static const std::vector<const ESM4::Armor*>& getEquippedArmor(const MWWorld::Ptr& ptr);
+        static const std::vector<const ESM4::Clothing*>& getEquippedClothing(const MWWorld::Ptr& ptr);
+
+    private:
+        static ESM4NpcCustomData& getCustomData(const MWWorld::ConstPtr& ptr);
+    };
+}
+
+#endif // GAME_MWCLASS_ESM4ACTOR_H
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index e87f74218b..94a1e8cc89 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -1,6 +1,7 @@
 #include "ingredient.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadingr.hpp>
 #include <components/esm3/loadnpc.hpp>
@@ -16,12 +17,12 @@
 #include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -39,17 +40,14 @@ namespace MWClass
         }
     }
 
-    std::string Ingredient::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Ingredient::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Ingredient>(ptr);
     }
 
     std::string_view Ingredient::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Ingredient>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Ingredient::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -107,8 +105,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -118,8 +115,8 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
@@ -144,9 +141,9 @@ namespace MWClass
 
             list.push_back(params);
         }
-        info.effects = list;
+        info.effects = std::move(list);
 
-        info.text = text;
+        info.text = std::move(text);
         info.isIngredient = true;
 
         return info;
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index b7a36d300f..2e7632cd5e 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -47,7 +47,7 @@ namespace MWClass
         const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
         ///< Return name of inventory icon.
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 931ed73dfe..9aa5e2c67d 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -1,6 +1,7 @@
 #include "light.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/loadnpc.hpp>
@@ -21,12 +22,12 @@
 #include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -62,7 +63,7 @@ namespace MWClass
     {
         // TODO: add option somewhere to enable collision for placeable objects
         if ((ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) == 0)
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+            physics.addObject(ptr, VFS::Path::toNormalized(model), rotation, MWPhysics::CollisionType_World);
     }
 
     bool Light::useAnim() const
@@ -70,7 +71,7 @@ namespace MWClass
         return true;
     }
 
-    std::string Light::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Light::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Light>(ptr);
     }
@@ -81,9 +82,7 @@ namespace MWClass
 
         if (ref->mBase->mModel.empty())
             return {};
-
-        const std::string& name = ref->mBase->mName;
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Light>(ptr);
     }
 
     bool Light::isItem(const MWWorld::ConstPtr& ptr) const
@@ -159,8 +158,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -174,11 +172,11 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 70d6852ff8..97625ee5f8 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -69,7 +69,7 @@ namespace MWClass
         float getRemainingUsageTime(const MWWorld::ConstPtr& ptr) const override;
         ///< Returns the remaining duration of the object.
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 1fc65c8f79..7955d5af20 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -1,6 +1,7 @@
 #include "lockpick.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadlock.hpp>
 #include <components/esm3/loadnpc.hpp>
@@ -15,12 +16,12 @@
 #include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -38,17 +39,14 @@ namespace MWClass
         }
     }
 
-    std::string Lockpick::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Lockpick::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Lockpick>(ptr);
     }
 
     std::string_view Lockpick::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick>* ref = ptr.get<ESM::Lockpick>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Lockpick>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Lockpick::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -104,8 +102,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -119,11 +116,11 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index fc65a038a6..48c18411a6 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -59,7 +59,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 6c517e3dde..cd97ecf216 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -1,6 +1,7 @@
 #include "misc.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadmisc.hpp>
@@ -19,12 +20,12 @@
 #include "../mwworld/worldmodel.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -49,17 +50,14 @@ namespace MWClass
         }
     }
 
-    std::string Miscellaneous::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Miscellaneous::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Miscellaneous>(ptr);
     }
 
     std::string_view Miscellaneous::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Miscellaneous>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Miscellaneous::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -79,8 +77,8 @@ namespace MWClass
         const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
 
         int value = ref->mBase->mData.mValue;
-        if (ptr.getCellRef().getGoldValue() > 1 && ptr.getRefData().getCount() == 1)
-            value = ptr.getCellRef().getGoldValue();
+        if (isGold(ptr) && ptr.getCellRef().getCount() != 1)
+            value = 1;
 
         if (!ptr.getCellRef().getSoul().empty())
         {
@@ -151,8 +149,8 @@ namespace MWClass
             countString = " (" + std::to_string(count) + ")";
 
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name))
-            + MWGui::ToolTips::getCountString(count) + MWGui::ToolTips::getSoulString(ptr.getCellRef());
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count)
+            + MWGui::ToolTips::getSoulString(ptr.getCellRef());
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -163,11 +161,11 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
@@ -189,8 +187,7 @@ namespace MWClass
         const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = newRef.getPtr().get<ESM::Miscellaneous>();
 
         MWWorld::Ptr ptr(cell.insert(ref), &cell);
-        ptr.getCellRef().setGoldValue(goldAmount);
-        ptr.getRefData().setCount(1);
+        ptr.getCellRef().setCount(goldAmount);
         return ptr;
     }
 
@@ -203,7 +200,7 @@ namespace MWClass
         {
             const MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
             newPtr = MWWorld::Ptr(cell.insert(ref), &cell);
-            newPtr.getRefData().setCount(count);
+            newPtr.getCellRef().setCount(count);
         }
         newPtr.getCellRef().unsetRefNum();
         newPtr.getRefData().setLuaScripts(nullptr);
@@ -216,10 +213,9 @@ namespace MWClass
         MWWorld::Ptr newPtr;
         if (isGold(ptr))
         {
-            newPtr = createGold(cell, getValue(ptr) * ptr.getRefData().getCount());
+            newPtr = createGold(cell, getValue(ptr) * ptr.getCellRef().getCount());
             newPtr.getRefData() = ptr.getRefData();
             newPtr.getCellRef().setRefNum(ptr.getCellRef().getRefNum());
-            newPtr.getRefData().setCount(1);
         }
         else
         {
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index dafeb0c764..6b7b838953 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -45,7 +45,7 @@ namespace MWClass
         const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
         ///< Return name of inventory icon.
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
diff --git a/apps/openmw/mwclass/nameorid.hpp b/apps/openmw/mwclass/nameorid.hpp
new file mode 100644
index 0000000000..b001cc5fc8
--- /dev/null
+++ b/apps/openmw/mwclass/nameorid.hpp
@@ -0,0 +1,25 @@
+#ifndef OPENMW_MWCLASS_NAMEORID_H
+#define OPENMW_MWCLASS_NAMEORID_H
+
+#include <components/esm/refid.hpp>
+
+#include "../mwworld/livecellref.hpp"
+#include "../mwworld/ptr.hpp"
+
+#include <string_view>
+
+namespace MWClass
+{
+    template <class Class>
+    std::string_view getNameOrId(const MWWorld::ConstPtr& ptr)
+    {
+        const MWWorld::LiveCellRef<Class>* ref = ptr.get<Class>();
+        if (!ref->mBase->mName.empty())
+            return ref->mBase->mName;
+        if (const auto* id = ref->mBase->mId.template getIf<ESM::StringRefId>())
+            return id->getValue();
+        return {};
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index b9e03aa45c..22c953d27d 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1,7 +1,9 @@
 #include "npc.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
+#include <cassert>
 #include <memory>
 
 #include <components/misc/constants.hpp>
@@ -17,6 +19,7 @@
 #include <components/esm3/loadsoun.hpp>
 #include <components/esm3/npcstate.hpp>
 #include <components/settings/values.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
@@ -57,10 +60,28 @@
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
+
+#include "nameorid.hpp"
 
 namespace
 {
+    struct NpcParts
+    {
+        const ESM::RefId mSwimLeft = ESM::RefId::stringRefId("Swim Left");
+        const ESM::RefId mSwimRight = ESM::RefId::stringRefId("Swim Right");
+        const ESM::RefId mFootWaterLeft = ESM::RefId::stringRefId("FootWaterLeft");
+        const ESM::RefId mFootWaterRight = ESM::RefId::stringRefId("FootWaterRight");
+        const ESM::RefId mFootBareLeft = ESM::RefId::stringRefId("FootBareLeft");
+        const ESM::RefId mFootBareRight = ESM::RefId::stringRefId("FootBareRight");
+        const ESM::RefId mFootLightLeft = ESM::RefId::stringRefId("footLightLeft");
+        const ESM::RefId mFootLightRight = ESM::RefId::stringRefId("footLightRight");
+        const ESM::RefId mFootMediumRight = ESM::RefId::stringRefId("FootMedRight");
+        const ESM::RefId mFootMediumLeft = ESM::RefId::stringRefId("FootMedLeft");
+        const ESM::RefId mFootHeavyLeft = ESM::RefId::stringRefId("footHeavyLeft");
+        const ESM::RefId mFootHeavyRight = ESM::RefId::stringRefId("footHeavyRight");
+    };
+
+    const NpcParts npcParts;
 
     int is_even(double d)
     {
@@ -92,11 +113,7 @@ namespace
         const auto& attributes = MWBase::Environment::get().getESMStore()->get<ESM::Attribute>();
         int level = creatureStats.getLevel();
         for (const ESM::Attribute& attribute : attributes)
-        {
-            const ESM::Race::MaleFemale& value
-                = race->mData.mAttributeValues[static_cast<size_t>(ESM::Attribute::refIdToIndex(attribute.mId))];
-            creatureStats.setAttribute(attribute.mId, male ? value.mMale : value.mFemale);
-        }
+            creatureStats.setAttribute(attribute.mId, race->mData.getAttribute(attribute.mId, male));
 
         // class bonus
         const ESM::Class* class_ = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(npc->mClass);
@@ -297,6 +314,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
+            MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
             bool recalculate = false;
             auto tempData = std::make_unique<NpcCustomData>();
             NpcCustomData* data = tempData.get();
@@ -316,14 +334,8 @@ namespace MWClass
                 for (size_t i = 0; i < ref->mBase->mNpdt.mSkills.size(); ++i)
                     data->mNpcStats.getSkill(ESM::Skill::indexToRefId(i)).setBase(ref->mBase->mNpdt.mSkills[i]);
 
-                data->mNpcStats.setAttribute(ESM::Attribute::Strength, ref->mBase->mNpdt.mStrength);
-                data->mNpcStats.setAttribute(ESM::Attribute::Intelligence, ref->mBase->mNpdt.mIntelligence);
-                data->mNpcStats.setAttribute(ESM::Attribute::Willpower, ref->mBase->mNpdt.mWillpower);
-                data->mNpcStats.setAttribute(ESM::Attribute::Agility, ref->mBase->mNpdt.mAgility);
-                data->mNpcStats.setAttribute(ESM::Attribute::Speed, ref->mBase->mNpdt.mSpeed);
-                data->mNpcStats.setAttribute(ESM::Attribute::Endurance, ref->mBase->mNpdt.mEndurance);
-                data->mNpcStats.setAttribute(ESM::Attribute::Personality, ref->mBase->mNpdt.mPersonality);
-                data->mNpcStats.setAttribute(ESM::Attribute::Luck, ref->mBase->mNpdt.mLuck);
+                for (size_t i = 0; i < ref->mBase->mNpdt.mAttributes.size(); ++i)
+                    data->mNpcStats.setAttribute(ESM::Attribute::indexToRefId(i), ref->mBase->mNpdt.mAttributes[i]);
 
                 data->mNpcStats.setHealth(ref->mBase->mNpdt.mHealth);
                 data->mNpcStats.setMagicka(ref->mBase->mNpdt.mMana);
@@ -397,9 +409,10 @@ namespace MWClass
             // inventory
             // setting ownership is used to make the NPC auto-equip his initial equipment only, and not bartered items
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-            getInventoryStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId(), prng);
-
-            getInventoryStore(ptr).autoEquip();
+            MWWorld::InventoryStore& inventory = getInventoryStore(ptr);
+            inventory.setPtr(ptr);
+            inventory.fill(ref->mBase->mInventory, ptr.getCellRef().getRefId(), prng);
+            inventory.autoEquip();
         }
     }
 
@@ -415,101 +428,105 @@ namespace MWClass
         return (ref->mBase->mRecordFlags & ESM::FLAG_Persistent) != 0;
     }
 
-    std::string Npc::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Npc::getModel(const MWWorld::ConstPtr& ptr) const
+    {
+        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
+        std::string_view model = Settings::models().mBaseanim.get();
+        const ESM::Race* race = MWBase::Environment::get().getESMStore()->get<ESM::Race>().find(ref->mBase->mRace);
+        if (race->mData.mFlags & ESM::Race::Beast)
+            model = Settings::models().mBaseanimkna.get();
+        // Base animations should be in the meshes dir
+        constexpr std::string_view prefix = "meshes/";
+        assert(VFS::Path::pathEqual(prefix, model.substr(0, prefix.size())));
+        return model.substr(prefix.size());
+    }
+
+    VFS::Path::Normalized Npc::getCorrectedModel(const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
 
-        std::string model = Settings::Manager::getString("baseanim", "Models");
         const ESM::Race* race = MWBase::Environment::get().getESMStore()->get<ESM::Race>().find(ref->mBase->mRace);
         if (race->mData.mFlags & ESM::Race::Beast)
-            model = Settings::Manager::getString("baseanimkna", "Models");
+            return Settings::models().mBaseanimkna.get();
 
-        return model;
+        return Settings::models().mBaseanim.get();
     }
 
-    void Npc::getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const
+    void Npc::getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const
     {
         const MWWorld::LiveCellRef<ESM::NPC>* npc = ptr.get<ESM::NPC>();
-        const ESM::Race* race = MWBase::Environment::get().getESMStore()->get<ESM::Race>().search(npc->mBase->mRace);
-        if (race && race->mData.mFlags & ESM::Race::Beast)
-            models.emplace_back(Settings::Manager::getString("baseanimkna", "Models"));
-
-        // keep these always loaded just in case
-        models.emplace_back(Settings::Manager::getString("xargonianswimkna", "Models"));
-        models.emplace_back(Settings::Manager::getString("xbaseanimfemale", "Models"));
-        models.emplace_back(Settings::Manager::getString("xbaseanim", "Models"));
-
-        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        const auto& esmStore = MWBase::Environment::get().getESMStore();
+        models.push_back(getModel(ptr));
 
         if (!npc->mBase->mModel.empty())
-            models.push_back(Misc::ResourceHelpers::correctMeshPath(npc->mBase->mModel, vfs));
+            models.push_back(npc->mBase->mModel);
 
         if (!npc->mBase->mHead.empty())
         {
-            const ESM::BodyPart* head
-                = MWBase::Environment::get().getESMStore()->get<ESM::BodyPart>().search(npc->mBase->mHead);
+            const ESM::BodyPart* head = esmStore->get<ESM::BodyPart>().search(npc->mBase->mHead);
             if (head)
-                models.push_back(Misc::ResourceHelpers::correctMeshPath(head->mModel, vfs));
+                models.push_back(head->mModel);
         }
         if (!npc->mBase->mHair.empty())
         {
-            const ESM::BodyPart* hair
-                = MWBase::Environment::get().getESMStore()->get<ESM::BodyPart>().search(npc->mBase->mHair);
+            const ESM::BodyPart* hair = esmStore->get<ESM::BodyPart>().search(npc->mBase->mHair);
             if (hair)
-                models.push_back(Misc::ResourceHelpers::correctMeshPath(hair->mModel, vfs));
+                models.push_back(hair->mModel);
         }
 
         bool female = (npc->mBase->mFlags & ESM::NPC::Female);
 
-        // FIXME: use const version of InventoryStore functions once they are available
-        // preload equipped items
-        const MWWorld::InventoryStore& invStore = getInventoryStore(ptr);
-        for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+        const MWWorld::CustomData* customData = ptr.getRefData().getCustomData();
+        if (customData)
         {
-            MWWorld::ConstContainerStoreIterator equipped = invStore.getSlot(slot);
-            if (equipped != invStore.end())
+            const MWWorld::InventoryStore& invStore = customData->asNpcCustomData().mInventoryStore;
+            for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
             {
-                std::vector<ESM::PartReference> parts;
-                if (equipped->getType() == ESM::Clothing::sRecordId)
+                MWWorld::ConstContainerStoreIterator equipped = invStore.getSlot(slot);
+                if (equipped != invStore.end())
                 {
-                    const ESM::Clothing* clothes = equipped->get<ESM::Clothing>()->mBase;
-                    parts = clothes->mParts.mParts;
-                }
-                else if (equipped->getType() == ESM::Armor::sRecordId)
-                {
-                    const ESM::Armor* armor = equipped->get<ESM::Armor>()->mBase;
-                    parts = armor->mParts.mParts;
-                }
-                else
-                {
-                    std::string model = equipped->getClass().getModel(*equipped);
-                    if (!model.empty())
-                        models.push_back(model);
-                }
+                    const auto addParts = [&](const std::vector<ESM::PartReference>& parts) {
+                        for (const ESM::PartReference& partRef : parts)
+                        {
+                            const ESM::RefId& partname
+                                = (female && !partRef.mFemale.empty()) || (!female && partRef.mMale.empty())
+                                ? partRef.mFemale
+                                : partRef.mMale;
 
-                for (std::vector<ESM::PartReference>::const_iterator it = parts.begin(); it != parts.end(); ++it)
-                {
-                    const ESM::RefId& partname
-                        = (female && !it->mFemale.empty()) || (!female && it->mMale.empty()) ? it->mFemale : it->mMale;
-
-                    const ESM::BodyPart* part
-                        = MWBase::Environment::get().getESMStore()->get<ESM::BodyPart>().search(partname);
-                    if (part && !part->mModel.empty())
-                        models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel, vfs));
+                            const ESM::BodyPart* part = esmStore->get<ESM::BodyPart>().search(partname);
+                            if (part && !part->mModel.empty())
+                                models.push_back(part->mModel);
+                        }
+                    };
+                    if (equipped->getType() == ESM::Clothing::sRecordId)
+                    {
+                        const ESM::Clothing* clothes = equipped->get<ESM::Clothing>()->mBase;
+                        addParts(clothes->mParts.mParts);
+                    }
+                    else if (equipped->getType() == ESM::Armor::sRecordId)
+                    {
+                        const ESM::Armor* armor = equipped->get<ESM::Armor>()->mBase;
+                        addParts(armor->mParts.mParts);
+                    }
+                    else
+                    {
+                        std::string_view model = equipped->getClass().getModel(*equipped);
+                        if (!model.empty())
+                            models.push_back(model);
+                    }
                 }
             }
         }
 
         // preload body parts
-        if (race)
+        if (const ESM::Race* race = esmStore->get<ESM::Race>().search(npc->mBase->mRace))
         {
             const std::vector<const ESM::BodyPart*>& parts
                 = MWRender::NpcAnimation::getBodyParts(race->mId, female, false, false);
-            for (std::vector<const ESM::BodyPart*>::const_iterator it = parts.begin(); it != parts.end(); ++it)
+            for (const ESM::BodyPart* part : parts)
             {
-                const ESM::BodyPart* part = *it;
                 if (part && !part->mModel.empty())
-                    models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel, vfs));
+                    models.push_back(part->mModel);
             }
         }
     }
@@ -525,10 +542,7 @@ namespace MWClass
             return store.find("sWerewolfPopup")->mValue.getString();
         }
 
-        const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::NPC>(ptr);
     }
 
     MWMechanics::CreatureStats& Npc::getCreatureStats(const MWWorld::Ptr& ptr) const
@@ -564,25 +578,10 @@ namespace MWClass
             * (!weapon.isEmpty() ? weapon.get<ESM::Weapon>()->mBase->mData.mReach
                                  : store.find("fHandToHandReach")->mValue.getFloat());
 
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
-        // result.
-        std::vector<MWWorld::Ptr> targetActors;
-        if (ptr != MWMechanics::getPlayer())
-            getCreatureStats(ptr).getAiSequence().getCombatTargets(targetActors);
-
-        // TODO: Use second to work out the hit angle
-        std::pair<MWWorld::Ptr, osg::Vec3f> result = world->getHitContact(ptr, dist, targetActors);
+        const std::pair<MWWorld::Ptr, osg::Vec3f> result = MWMechanics::getHitContact(ptr, dist);
         if (result.first.isEmpty()) // Didn't hit anything
             return true;
 
-        const MWWorld::Class& othercls = result.first.getClass();
-        if (!othercls.isActor()) // Can't hit non-actors
-            return true;
-
-        MWMechanics::CreatureStats& otherstats = othercls.getCreatureStats(result.first);
-        if (otherstats.isDead()) // Can't hit dead actors
-            return true;
-
         // Note that earlier we returned true in spite of an apparent failure to hit anything alive.
         // This is because hitting nothing is not a "miss" and should be handled as such character controller-side.
         victim = result.first;
@@ -622,7 +621,8 @@ namespace MWClass
         float damage = 0.0f;
         if (!success)
         {
-            othercls.onHit(victim, damage, false, weapon, ptr, osg::Vec3f(), false);
+            othercls.onHit(
+                victim, damage, false, weapon, ptr, osg::Vec3f(), false, MWMechanics::DamageSourceType::Melee);
             MWMechanics::reduceWeaponCondition(damage, false, weapon, ptr);
             MWMechanics::resistNormalWeapon(victim, ptr, weapon, damage);
             return;
@@ -633,11 +633,11 @@ namespace MWClass
         {
             const unsigned char* attack = nullptr;
             if (type == ESM::Weapon::AT_Chop)
-                attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
+                attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop.data();
             else if (type == ESM::Weapon::AT_Slash)
-                attack = weapon.get<ESM::Weapon>()->mBase->mData.mSlash;
+                attack = weapon.get<ESM::Weapon>()->mBase->mData.mSlash.data();
             else if (type == ESM::Weapon::AT_Thrust)
-                attack = weapon.get<ESM::Weapon>()->mBase->mData.mThrust;
+                attack = weapon.get<ESM::Weapon>()->mBase->mData.mThrust.data();
             if (attack)
             {
                 damage = attack[0] + ((attack[1] - attack[0]) * attackStrength);
@@ -661,7 +661,7 @@ namespace MWClass
             ESM::RefId weapskill = ESM::Skill::HandToHand;
             if (!weapon.isEmpty())
                 weapskill = weapon.getClass().getEquipmentSkill(weapon);
-            skillUsageSucceeded(ptr, weapskill, 0);
+            skillUsageSucceeded(ptr, weapskill, ESM::Skill::Weapon_SuccessfulHit);
 
             const MWMechanics::AiSequence& seq = victim.getClass().getCreatureStats(victim).getAiSequence();
 
@@ -671,8 +671,11 @@ namespace MWClass
             {
                 damage *= store.find("fCombatCriticalStrikeMult")->mValue.getFloat();
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sTargetCriticalStrike}");
-                MWBase::Environment::get().getSoundManager()->playSound3D(
-                    victim, ESM::RefId::stringRefId("critical damage"), 1.0f, 1.0f);
+                if (healthdmg)
+                {
+                    MWBase::Environment::get().getSoundManager()->playSound3D(
+                        victim, ESM::RefId::stringRefId("critical damage"), 1.0f, 1.0f);
+                }
             }
         }
 
@@ -685,34 +688,36 @@ namespace MWClass
         MWMechanics::applyElementalShields(ptr, victim);
 
         if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
-        {
             damage = 0;
-            victim.getClass().block(victim);
-        }
 
         if (victim == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState())
             damage = 0;
 
         MWMechanics::diseaseContact(victim, ptr);
 
-        othercls.onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
+        othercls.onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true, MWMechanics::DamageSourceType::Melee);
     }
 
     void Npc::onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
-        const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const
+        const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful,
+        const MWMechanics::DamageSourceType sourceType) const
     {
         MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
         MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
         bool wasDead = stats.isDead();
 
-        // Note OnPcHitMe is not set for friendly hits.
         bool setOnPcHitMe = true;
 
         // NOTE: 'object' and/or 'attacker' may be empty.
         if (!attacker.isEmpty() && attacker.getClass().isActor() && !stats.getAiSequence().isInCombat(attacker))
         {
             stats.setAttacked(true);
-            setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
+            bool complain = sourceType == MWMechanics::DamageSourceType::Melee;
+            bool supportFriendlyFire = sourceType != MWMechanics::DamageSourceType::Ranged;
+            if (supportFriendlyFire && MWMechanics::friendlyHit(attacker, ptr, complain))
+                setOnPcHitMe = false;
+            else
+                setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
         }
 
         // Attacker and target store each other as hitattemptactor if they have no one stored yet
@@ -752,9 +757,6 @@ namespace MWClass
         if (!object.isEmpty())
             stats.setLastHitObject(object.getCellRef().getRefId());
 
-        if (damage > 0.0f && !object.isEmpty())
-            MWMechanics::resistNormalWeapon(ptr, attacker, object, damage);
-
         if (damage < 0.001f)
             damage = 0;
 
@@ -849,7 +851,7 @@ namespace MWClass
 
                     ESM::RefId skill = armor.getClass().getEquipmentSkill(armor);
                     if (ptr == MWMechanics::getPlayer())
-                        skillUsageSucceeded(ptr, skill, 0);
+                        skillUsageSucceeded(ptr, skill, ESM::Skill::Armor_HitByOpponent);
 
                     if (skill == ESM::Skill::LightArmor)
                         sndMgr->playSound3D(ptr, ESM::RefId::stringRefId("Light Armor Hit"), 1.0f, 1.0f);
@@ -859,7 +861,7 @@ namespace MWClass
                         sndMgr->playSound3D(ptr, ESM::RefId::stringRefId("Heavy Armor Hit"), 1.0f, 1.0f);
                 }
                 else if (ptr == MWMechanics::getPlayer())
-                    skillUsageSucceeded(ptr, ESM::Skill::Unarmored, 0);
+                    skillUsageSucceeded(ptr, ESM::Skill::Unarmored, ESM::Skill::Armor_HitByOpponent);
             }
         }
 
@@ -921,53 +923,51 @@ namespace MWClass
         }
 
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
+        const MWMechanics::AiSequence& aiSequence = stats.getAiSequence();
+        const bool isPursuing = aiSequence.isInPursuit() && actor == MWMechanics::getPlayer();
+        const bool inCombatWithActor = aiSequence.isInCombat(actor) || isPursuing;
 
         if (stats.isDead())
         {
-            // by default user can loot friendly actors during death animation
-            if (Settings::game().mCanLootDuringDeathAnimation && !stats.getAiSequence().isInCombat())
+            // by default user can loot non-fighting actors during death animation
+            if (Settings::game().mCanLootDuringDeathAnimation)
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
 
             // otherwise wait until death animation
             if (stats.isDeathAnimationFinished())
                 return std::make_unique<MWWorld::ActionOpen>(ptr);
         }
-        else if (!stats.getAiSequence().isInCombat())
+        else
         {
-            if (stats.getKnockedDown() || MWBase::Environment::get().getMechanicsManager()->isSneaking(actor))
-                return std::make_unique<MWWorld::ActionOpen>(ptr); // stealing
+            const bool allowStealingFromKO
+                = Settings::game().mAlwaysAllowStealingFromKnockedOutActors || !inCombatWithActor;
+            if (stats.getKnockedDown() && allowStealingFromKO)
+                return std::make_unique<MWWorld::ActionOpen>(ptr);
 
-            // Can't talk to werewolves
-            if (!getNpcStats(ptr).isWerewolf())
+            const bool allowStealingWhileSneaking = !inCombatWithActor;
+            if (MWBase::Environment::get().getMechanicsManager()->isSneaking(actor) && allowStealingWhileSneaking)
+                return std::make_unique<MWWorld::ActionOpen>(ptr);
+
+            const bool allowTalking = !inCombatWithActor && !getNpcStats(ptr).isWerewolf();
+            if (allowTalking)
                 return std::make_unique<MWWorld::ActionTalk>(ptr);
         }
-        else // In combat
-        {
-            if (Settings::game().mAlwaysAllowStealingFromKnockedOutActors && stats.getKnockedDown())
-                return std::make_unique<MWWorld::ActionOpen>(ptr); // stealing
-        }
 
-        // Tribunal and some mod companions oddly enough must use open action as fallback
-        if (!getScript(ptr).empty() && ptr.getRefData().getLocals().getIntVar(getScript(ptr), "companion"))
-            return std::make_unique<MWWorld::ActionOpen>(ptr);
+        if (inCombatWithActor)
+            return std::make_unique<MWWorld::FailedAction>("#{sActorInCombat}");
 
         return std::make_unique<MWWorld::FailedAction>();
     }
 
     MWWorld::ContainerStore& Npc::getContainerStore(const MWWorld::Ptr& ptr) const
     {
-        ensureCustomData(ptr);
-        auto& store = ptr.getRefData().getCustomData()->asNpcCustomData().mInventoryStore;
-        store.setActor(ptr);
-        return store;
+        return getInventoryStore(ptr);
     }
 
     MWWorld::InventoryStore& Npc::getInventoryStore(const MWWorld::Ptr& ptr) const
     {
         ensureCustomData(ptr);
-        auto& store = ptr.getRefData().getCustomData()->asNpcCustomData().mInventoryStore;
-        store.setActor(ptr);
-        return store;
+        return ptr.getRefData().getCustomData()->asNpcCustomData().mInventoryStore;
     }
 
     ESM::RefId Npc::getScript(const MWWorld::ConstPtr& ptr) const
@@ -982,8 +982,7 @@ namespace MWClass
         // TODO: This function is called several times per frame for each NPC.
         // It would be better to calculate it only once per frame for each NPC and save the result in CreatureStats.
         const MWMechanics::NpcStats& stats = getNpcStats(ptr);
-        bool godmode = ptr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
-        if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead())
+        if (stats.isParalyzed() || stats.getKnockedDown() || stats.isDead())
             return 0.f;
 
         const MWBase::World* world = MWBase::Environment::get().getWorld();
@@ -1032,8 +1031,7 @@ namespace MWClass
             return 0.f;
 
         const MWMechanics::NpcStats& stats = getNpcStats(ptr);
-        bool godmode = ptr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
-        if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead())
+        if (stats.isParalyzed() || stats.getKnockedDown() || stats.isDead())
             return 0.f;
 
         const GMST& gmst = getGmst();
@@ -1088,7 +1086,8 @@ namespace MWClass
         if (customData.mNpcStats.isDead() && customData.mNpcStats.isDeathAnimationFinished())
             return true;
 
-        if (!customData.mNpcStats.getAiSequence().isInCombat())
+        const MWMechanics::AiSequence& aiSeq = customData.mNpcStats.getAiSequence();
+        if (!aiSeq.isInCombat() || aiSeq.isFleeing())
             return true;
 
         if (Settings::game().mAlwaysAllowStealingFromKnockedOutActors && customData.mNpcStats.getKnockedDown())
@@ -1105,7 +1104,7 @@ namespace MWClass
         MWGui::ToolTipInfo info;
 
         std::string_view name = getName(ptr);
-        info.caption = MyGUI::TextIterator::toTagsString(MWGui::toUString(name));
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name));
         if (fullHelp && !ref->mBase->mName.empty() && ptr.getRefData().getCustomData()
             && ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats.isWerewolf())
         {
@@ -1115,7 +1114,7 @@ namespace MWClass
         }
 
         if (fullHelp)
-            info.text = MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra = MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
 
         return info;
     }
@@ -1138,29 +1137,9 @@ namespace MWClass
         return getNpcStats(ptr).isWerewolf() ? 0.0f : Actor::getEncumbrance(ptr);
     }
 
-    bool Npc::consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const
-    {
-        MWBase::Environment::get().getWorld()->breakInvisibility(actor);
-        MWMechanics::CastSpell cast(actor, actor);
-        const ESM::RefId& recordId = consumable.getCellRef().getRefId();
-        MWBase::Environment::get().getWorldModel()->registerPtr(consumable);
-        MWBase::Environment::get().getLuaManager()->itemConsumed(consumable, actor);
-        actor.getClass().getContainerStore(actor).remove(consumable, 1);
-        return cast.cast(recordId);
-    }
-
     void Npc::skillUsageSucceeded(const MWWorld::Ptr& ptr, ESM::RefId skill, int usageType, float extraFactor) const
     {
-        MWMechanics::NpcStats& stats = getNpcStats(ptr);
-
-        if (stats.isWerewolf())
-            return;
-
-        MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
-
-        const ESM::Class* class_ = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(ref->mBase->mClass);
-
-        stats.useSkill(skill, *class_, usageType, extraFactor);
+        MWBase::Environment::get().getLuaManager()->skillUse(ptr, skill, usageType, extraFactor);
     }
 
     float Npc::getArmorRating(const MWWorld::Ptr& ptr) const
@@ -1226,24 +1205,24 @@ namespace MWClass
         if (ptr == MWMechanics::getPlayer() && ptr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson())
         {
             if (ref->mBase->isMale())
-                scale *= race->mData.mHeight.mMale;
+                scale *= race->mData.mMaleHeight;
             else
-                scale *= race->mData.mHeight.mFemale;
+                scale *= race->mData.mFemaleHeight;
 
             return;
         }
 
         if (ref->mBase->isMale())
         {
-            scale.x() *= race->mData.mWeight.mMale;
-            scale.y() *= race->mData.mWeight.mMale;
-            scale.z() *= race->mData.mHeight.mMale;
+            scale.x() *= race->mData.mMaleWeight;
+            scale.y() *= race->mData.mMaleWeight;
+            scale.z() *= race->mData.mMaleHeight;
         }
         else
         {
-            scale.x() *= race->mData.mWeight.mFemale;
-            scale.y() *= race->mData.mWeight.mFemale;
-            scale.z() *= race->mData.mHeight.mFemale;
+            scale.x() *= race->mData.mFemaleWeight;
+            scale.y() *= race->mData.mFemaleWeight;
+            scale.z() *= race->mData.mFemaleHeight;
         }
     }
 
@@ -1260,19 +1239,6 @@ namespace MWClass
 
     ESM::RefId Npc::getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const
     {
-        static const ESM::RefId swimLeft = ESM::RefId::stringRefId("Swim Left");
-        static const ESM::RefId swimRight = ESM::RefId::stringRefId("Swim Right");
-        static const ESM::RefId footWaterLeft = ESM::RefId::stringRefId("FootWaterLeft");
-        static const ESM::RefId footWaterRight = ESM::RefId::stringRefId("FootWaterRight");
-        static const ESM::RefId footBareLeft = ESM::RefId::stringRefId("FootBareLeft");
-        static const ESM::RefId footBareRight = ESM::RefId::stringRefId("FootBareRight");
-        static const ESM::RefId footLightLeft = ESM::RefId::stringRefId("footLightLeft");
-        static const ESM::RefId footLightRight = ESM::RefId::stringRefId("footLightRight");
-        static const ESM::RefId footMediumRight = ESM::RefId::stringRefId("FootMedRight");
-        static const ESM::RefId footMediumLeft = ESM::RefId::stringRefId("FootMedLeft");
-        static const ESM::RefId footHeavyLeft = ESM::RefId::stringRefId("footHeavyLeft");
-        static const ESM::RefId footHeavyRight = ESM::RefId::stringRefId("footHeavyRight");
-
         if (name == "left" || name == "right")
         {
             MWBase::World* world = MWBase::Environment::get().getWorld();
@@ -1280,9 +1246,9 @@ namespace MWClass
                 return ESM::RefId();
             osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
             if (world->isSwimming(ptr))
-                return (name == "left") ? swimLeft : swimRight;
+                return (name == "left") ? npcParts.mSwimLeft : npcParts.mSwimRight;
             if (world->isUnderwater(ptr.getCell(), pos) || world->isWalkingOnWater(ptr))
-                return (name == "left") ? footWaterLeft : footWaterRight;
+                return (name == "left") ? npcParts.mFootWaterLeft : npcParts.mFootWaterRight;
             if (world->isOnGround(ptr))
             {
                 if (getNpcStats(ptr).isWerewolf()
@@ -1297,15 +1263,15 @@ namespace MWClass
                 const MWWorld::InventoryStore& inv = Npc::getInventoryStore(ptr);
                 MWWorld::ConstContainerStoreIterator boots = inv.getSlot(MWWorld::InventoryStore::Slot_Boots);
                 if (boots == inv.end() || boots->getType() != ESM::Armor::sRecordId)
-                    return (name == "left") ? footBareLeft : footBareRight;
+                    return (name == "left") ? npcParts.mFootBareLeft : npcParts.mFootBareRight;
 
                 ESM::RefId skill = boots->getClass().getEquipmentSkill(*boots);
                 if (skill == ESM::Skill::LightArmor)
-                    return (name == "left") ? footLightLeft : footLightRight;
+                    return (name == "left") ? npcParts.mFootLightLeft : npcParts.mFootLightRight;
                 else if (skill == ESM::Skill::MediumArmor)
-                    return (name == "left") ? footMediumLeft : footMediumRight;
+                    return (name == "left") ? npcParts.mFootMediumLeft : npcParts.mFootMediumRight;
                 else if (skill == ESM::Skill::HeavyArmor)
-                    return (name == "left") ? footHeavyLeft : footHeavyRight;
+                    return (name == "left") ? npcParts.mFootHeavyLeft : npcParts.mFootHeavyRight;
             }
             return ESM::RefId();
         }
@@ -1314,9 +1280,9 @@ namespace MWClass
         if (name == "land")
             return ESM::RefId();
         if (name == "swimleft")
-            return swimLeft;
+            return npcParts.mSwimLeft;
         if (name == "swimright")
-            return swimRight;
+            return npcParts.mSwimRight;
         // TODO: I have no idea what these are supposed to do for NPCs since they use
         // voiced dialog for various conditions like health loss and combat taunts. Maybe
         // only for biped creatures?
@@ -1334,8 +1300,13 @@ namespace MWClass
     MWWorld::Ptr Npc::copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const
     {
         const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
-
-        return MWWorld::Ptr(cell.insert(ref), &cell);
+        MWWorld::Ptr newPtr(cell.insert(ref), &cell);
+        if (newPtr.getRefData().getCustomData())
+        {
+            MWBase::Environment::get().getWorldModel()->registerPtr(newPtr);
+            newPtr.getClass().getContainerStore(newPtr).setPtr(newPtr);
+        }
+        return newPtr;
     }
 
     float Npc::getSkill(const MWWorld::Ptr& ptr, ESM::RefId id) const
@@ -1355,20 +1326,19 @@ namespace MWClass
 
         const ESM::NpcState& npcState = state.asNpcState();
 
-        if (state.mVersion > 0)
+        if (!ptr.getRefData().getCustomData())
         {
-            if (!ptr.getRefData().getCustomData())
+            if (npcState.mCreatureStats.mMissingACDT)
+                ensureCustomData(ptr);
+            else
             {
-                if (npcState.mCreatureStats.mMissingACDT)
-                    ensureCustomData(ptr);
-                else
-                    // Create a CustomData, but don't fill it from ESM records (not needed)
-                    ptr.getRefData().setCustomData(std::make_unique<NpcCustomData>());
+                // Create a CustomData, but don't fill it from ESM records (not needed)
+                auto data = std::make_unique<NpcCustomData>();
+                MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
+                data->mInventoryStore.setPtr(ptr);
+                ptr.getRefData().setCustomData(std::move(data));
             }
         }
-        else
-            ensureCustomData(
-                ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
 
         NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData();
 
@@ -1389,7 +1359,7 @@ namespace MWClass
         }
 
         const NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData();
-        if (ptr.getRefData().getCount() <= 0
+        if (ptr.getCellRef().getCount() <= 0
             && (!(ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn) || !customData.mNpcStats.isDead()))
         {
             state.mHasCustomState = false;
@@ -1426,7 +1396,7 @@ namespace MWClass
     void Npc::respawn(const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& creatureStats = getCreatureStats(ptr);
-        if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
+        if (ptr.getCellRef().getCount() > 0 && !creatureStats.isDead())
             return;
 
         if (!creatureStats.isDeathAnimationFinished())
@@ -1438,16 +1408,16 @@ namespace MWClass
         static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->mValue.getFloat();
 
         float delay
-            = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+            = ptr.getCellRef().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
 
         if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn
             && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
             if (ptr.getCellRef().hasContentFile())
             {
-                if (ptr.getRefData().getCount() == 0)
+                if (ptr.getCellRef().getCount() == 0)
                 {
-                    ptr.getRefData().setCount(1);
+                    ptr.getCellRef().setCount(1);
                     const ESM::RefId& script = getScript(ptr);
                     if (!script.empty())
                         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, ptr);
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 9b53143c4d..29ab459242 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -74,7 +74,7 @@ namespace MWClass
         MWWorld::InventoryStore& getInventoryStore(const MWWorld::Ptr& ptr) const override;
         ///< Return inventory store
 
-        bool hasInventoryStore(const MWWorld::Ptr& ptr) const override { return true; }
+        bool hasInventoryStore(const MWWorld::ConstPtr& ptr) const override { return true; }
 
         bool evaluateHit(const MWWorld::Ptr& ptr, MWWorld::Ptr& victim, osg::Vec3f& hitPosition) const override;
 
@@ -82,9 +82,10 @@ namespace MWClass
             const osg::Vec3f& hitPosition, bool success) const override;
 
         void onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
-            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const override;
+            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful,
+            const MWMechanics::DamageSourceType sourceType) const override;
 
-        void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
+        void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const override;
         ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
         ///< list getModel().
 
@@ -114,8 +115,6 @@ namespace MWClass
         float getArmorRating(const MWWorld::Ptr& ptr) const override;
         ///< @return combined armor rating of this actor
 
-        bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const override;
-
         void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const override;
         /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
 
@@ -132,7 +131,9 @@ namespace MWClass
 
         ESM::RefId getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
+
+        VFS::Path::Normalized getCorrectedModel(const MWWorld::ConstPtr& ptr) const override;
 
         float getSkill(const MWWorld::Ptr& ptr, ESM::RefId id) const override;
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 9bab0345cb..9dca460724 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -1,6 +1,7 @@
 #include "potion.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -13,14 +14,15 @@
 #include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwmechanics/alchemy.hpp"
+#include "../mwmechanics/spellutil.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -38,17 +40,14 @@ namespace MWClass
         }
     }
 
-    std::string Potion::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Potion::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Potion>(ptr);
     }
 
     std::string_view Potion::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Potion>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Potion::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -65,9 +64,7 @@ namespace MWClass
 
     int Potion::getValue(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
-
-        return ref->mBase->mData.mValue;
+        return MWMechanics::getPotionValue(*ptr.get<ESM::Potion>()->mBase);
     }
 
     const ESM::RefId& Potion::getUpSoundId(const MWWorld::ConstPtr& ptr) const
@@ -95,14 +92,13 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
 
         text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
-        text += MWGui::ToolTips::getValueString(ref->mBase->mData.mValue, "#{sValue}");
+        text += MWGui::ToolTips::getValueString(getValue(ptr), "#{sValue}");
 
         info.effects = MWGui::Widgets::MWEffectList::effectListFromESM(&ref->mBase->mEffects);
 
@@ -115,11 +111,11 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 66b11b8ef4..057874ca1e 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -47,7 +47,7 @@ namespace MWClass
         const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
         ///< Return name of inventory icon.
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         float getWeight(const MWWorld::ConstPtr& ptr) const override;
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index e020c89443..4039f72cc5 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -1,6 +1,7 @@
 #include "probe.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadprob.hpp>
@@ -15,12 +16,12 @@
 #include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -38,17 +39,14 @@ namespace MWClass
         }
     }
 
-    std::string Probe::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Probe::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Probe>(ptr);
     }
 
     std::string_view Probe::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Probe>(ptr);
     }
     std::unique_ptr<MWWorld::Action> Probe::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
     {
@@ -103,8 +101,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -118,11 +115,11 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 9a66d7a4bf..fc1092546e 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -54,7 +54,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 68fc2f60da..922b33b67e 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -1,6 +1,7 @@
 #include "repair.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadrepa.hpp>
@@ -13,12 +14,12 @@
 #include "../mwworld/ptr.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -36,17 +37,14 @@ namespace MWClass
         }
     }
 
-    std::string Repair::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Repair::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Repair>(ptr);
     }
 
     std::string_view Repair::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Repair>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Repair::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -105,8 +103,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         std::string text;
@@ -120,11 +117,11 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index ee96c83eeb..50c58231ce 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -44,7 +44,7 @@ namespace MWClass
         const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
         ///< Return name of inventory icon.
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu (default implementation: return a
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index fe1226f19b..65fe58ea76 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -40,10 +40,10 @@ namespace MWClass
     void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
         MWPhysics::PhysicsSystem& physics) const
     {
-        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+        physics.addObject(ptr, VFS::Path::toNormalized(model), rotation, MWPhysics::CollisionType_World);
     }
 
-    std::string Static::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Static::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Static>(ptr);
     }
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 65f60f7653..a3ea68a86f 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -32,7 +32,7 @@ namespace MWClass
         bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
         ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
     };
 }
 
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 68a66b69d9..089c8c2894 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -1,6 +1,7 @@
 #include "weapon.hpp"
 
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadweap.hpp>
@@ -20,12 +21,12 @@
 #include "../mwmechanics/weapontype.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/ustring.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "classmodel.hpp"
+#include "nameorid.hpp"
 
 namespace MWClass
 {
@@ -43,17 +44,14 @@ namespace MWClass
         }
     }
 
-    std::string Weapon::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Weapon::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return getClassModel<ESM::Weapon>(ptr);
     }
 
     std::string_view Weapon::getName(const MWWorld::ConstPtr& ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
-        const std::string& name = ref->mBase->mName;
-
-        return !name.empty() ? name : ref->mBase->mId.getRefIdString();
+        return getNameOrId<ESM::Weapon>(ptr);
     }
 
     std::unique_ptr<MWWorld::Action> Weapon::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
@@ -150,8 +148,7 @@ namespace MWClass
 
         MWGui::ToolTipInfo info;
         std::string_view name = getName(ptr);
-        info.caption
-            = MyGUI::TextIterator::toTagsString(MWGui::toUString(name)) + MWGui::ToolTips::getCountString(count);
+        info.caption = MyGUI::TextIterator::toTagsString(MyGUI::UString(name)) + MWGui::ToolTips::getCountString(count);
         info.icon = ref->mBase->mIcon;
 
         const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@@ -240,11 +237,11 @@ namespace MWClass
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
         {
-            text += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
-            text += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
+            info.extra += MWGui::ToolTips::getCellRefString(ptr.getCellRef());
+            info.extra += MWGui::ToolTips::getMiscString(ref->mBase->mScript.getRefIdString(), "Script");
         }
 
-        info.text = text;
+        info.text = std::move(text);
 
         return info;
     }
@@ -277,8 +274,8 @@ namespace MWClass
             return { 0, "#{sInventoryMessage1}" };
 
         // Do not allow equip weapons from inventory during attack
-        if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
-            && MWBase::Environment::get().getWindowManager()->isGuiMode())
+        if (npc.isInCell() && MWBase::Environment::get().getWindowManager()->isGuiMode()
+            && MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc))
             return { 0, "#{sCantEquipWeapWarning}" };
 
         std::pair<std::vector<int>, bool> slots_ = getEquipmentSlots(ptr);
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 110069341d..9e79532bc0 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -72,7 +72,7 @@ namespace MWClass
         std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
         ///< Generate action for using via inventory menu
 
-        std::string getModel(const MWWorld::ConstPtr& ptr) const override;
+        std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
 
         bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 2b7774d8c9..9f3bb0b26f 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -543,7 +543,8 @@ namespace MWDialogue
         mPermanentDispositionChange += perm;
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
-        player.getClass().skillUsageSucceeded(player, ESM::Skill::Speechcraft, success ? 0 : 1);
+        player.getClass().skillUsageSucceeded(
+            player, ESM::Skill::Speechcraft, success ? ESM::Skill::Speechcraft_Success : ESM::Skill::Speechcraft_Fail);
 
         if (success)
         {
@@ -619,25 +620,25 @@ namespace MWDialogue
         return false;
     }
 
-    void DialogueManager::say(const MWWorld::Ptr& actor, const ESM::RefId& topic)
+    bool DialogueManager::say(const MWWorld::Ptr& actor, const ESM::RefId& topic)
     {
         MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
         if (sndMgr->sayActive(actor))
         {
             // Actor is already saying something.
-            return;
+            return false;
         }
 
         if (actor.getClass().isNpc() && MWBase::Environment::get().getWorld()->isSwimming(actor))
         {
             // NPCs don't talk while submerged
-            return;
+            return false;
         }
 
         if (actor.getClass().getCreatureStats(actor).getKnockedDown())
         {
             // Unconscious actors can not speak
-            return;
+            return false;
         }
 
         const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@@ -652,10 +653,11 @@ namespace MWDialogue
             if (Settings::gui().mSubtitles)
                 winMgr->messageBox(info->mResponse);
             if (!info->mSound.empty())
-                sndMgr->say(actor, Misc::ResourceHelpers::correctSoundPath(info->mSound));
+                sndMgr->say(actor, Misc::ResourceHelpers::correctSoundPath(VFS::Path::Normalized(info->mSound)));
             if (!info->mResultScript.empty())
                 executeScript(info->mResultScript, actor);
         }
+        return info != nullptr;
     }
 
     int DialogueManager::countSavedGameRecords() const
@@ -737,6 +739,17 @@ namespace MWDialogue
         return 0;
     }
 
+    const std::map<ESM::RefId, int>* DialogueManager::getFactionReactionOverrides(const ESM::RefId& faction) const
+    {
+        // Make sure the faction exists
+        MWBase::Environment::get().getESMStore()->get<ESM::Faction>().find(faction);
+
+        const auto found = mChangedFactionReaction.find(faction);
+        if (found != mChangedFactionReaction.end())
+            return &found->second;
+        return nullptr;
+    }
+
     void DialogueManager::clearInfoActor(const MWWorld::Ptr& actor) const
     {
         if (actor == mActor && !mLastTopic.empty())
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index c214106fdc..a735c57fef 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -100,7 +100,7 @@ namespace MWDialogue
 
         bool checkServiceRefused(ResponseCallback* callback, ServiceType service = ServiceType::Any) override;
 
-        void say(const MWWorld::Ptr& actor, const ESM::RefId& topic) override;
+        bool say(const MWWorld::Ptr& actor, const ESM::RefId& topic) override;
 
         // calbacks for the GUI
         void keywordSelected(std::string_view keyword, ResponseCallback* callback) override;
@@ -126,6 +126,8 @@ namespace MWDialogue
         /// @return faction1's opinion of faction2
         int getFactionReaction(const ESM::RefId& faction1, const ESM::RefId& faction2) const override;
 
+        const std::map<ESM::RefId, int>* getFactionReactionOverrides(const ESM::RefId& faction) const override;
+
         /// Removes the last added topic response for the given actor from the journal
         void clearInfoActor(const MWWorld::Ptr& actor) const override;
     };
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 899acf603e..295d690ce5 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -30,16 +30,16 @@ namespace
 {
     bool matchesStaticFilters(const MWDialogue::SelectWrapper& select, const MWWorld::Ptr& actor)
     {
-        const ESM::RefId selectId = ESM::RefId::stringRefId(select.getName());
-        if (select.getFunction() == MWDialogue::SelectWrapper::Function_NotId)
+        const ESM::RefId selectId = select.getId();
+        if (select.getFunction() == ESM::DialogueCondition::Function_NotId)
             return actor.getCellRef().getRefId() != selectId;
         if (actor.getClass().isNpc())
         {
-            if (select.getFunction() == MWDialogue::SelectWrapper::Function_NotFaction)
+            if (select.getFunction() == ESM::DialogueCondition::Function_NotFaction)
                 return actor.getClass().getPrimaryFaction(actor) != selectId;
-            else if (select.getFunction() == MWDialogue::SelectWrapper::Function_NotClass)
+            else if (select.getFunction() == ESM::DialogueCondition::Function_NotClass)
                 return actor.get<ESM::NPC>()->mBase->mClass != selectId;
-            else if (select.getFunction() == MWDialogue::SelectWrapper::Function_NotRace)
+            else if (select.getFunction() == ESM::DialogueCondition::Function_NotRace)
                 return actor.get<ESM::NPC>()->mBase->mRace != selectId;
         }
         return true;
@@ -47,7 +47,7 @@ namespace
 
     bool matchesStaticFilters(const ESM::DialInfo& info, const MWWorld::Ptr& actor)
     {
-        for (const ESM::DialInfo::SelectStruct& select : info.mSelects)
+        for (const auto& select : info.mSelects)
         {
             MWDialogue::SelectWrapper wrapper = select;
             if (wrapper.getType() == MWDialogue::SelectWrapper::Type_Boolean)
@@ -62,7 +62,7 @@ namespace
             }
             else if (wrapper.getType() == MWDialogue::SelectWrapper::Type_Numeric)
             {
-                if (wrapper.getFunction() == MWDialogue::SelectWrapper::Function_Local)
+                if (wrapper.getFunction() == ESM::DialogueCondition::Function_Local)
                 {
                     const ESM::RefId& scriptName = actor.getClass().getScript(actor);
                     if (scriptName.empty())
@@ -207,9 +207,8 @@ bool MWDialogue::Filter::testPlayer(const ESM::DialInfo& info) const
 
 bool MWDialogue::Filter::testSelectStructs(const ESM::DialInfo& info) const
 {
-    for (std::vector<ESM::DialInfo::SelectStruct>::const_iterator iter(info.mSelects.begin());
-         iter != info.mSelects.end(); ++iter)
-        if (!testSelectStruct(*iter))
+    for (const auto& select : info.mSelects)
+        if (!testSelectStruct(select))
             return false;
 
     return true;
@@ -270,11 +269,11 @@ bool MWDialogue::Filter::testSelectStruct(const SelectWrapper& select) const
         // If the actor is a creature, we pass all conditions only applicable to NPCs.
         return true;
 
-    if (select.getFunction() == SelectWrapper::Function_Choice && mChoice == -1)
+    if (select.getFunction() == ESM::DialogueCondition::Function_Choice && mChoice == -1)
         // If not currently in a choice, we reject all conditions that test against choices.
         return false;
 
-    if (select.getFunction() == SelectWrapper::Function_Weather
+    if (select.getFunction() == ESM::DialogueCondition::Function_Weather
         && !(MWBase::Environment::get().getWorld()->isCellExterior()
             || MWBase::Environment::get().getWorld()->isCellQuasiExterior()))
         // Reject weather conditions in interior cells
@@ -305,29 +304,31 @@ bool MWDialogue::Filter::testSelectStructNumeric(const SelectWrapper& select) co
 {
     switch (select.getFunction())
     {
-        case SelectWrapper::Function_Global:
+        case ESM::DialogueCondition::Function_Global:
 
             // internally all globals are float :(
             return select.selectCompare(MWBase::Environment::get().getWorld()->getGlobalFloat(select.getName()));
 
-        case SelectWrapper::Function_Local:
+        case ESM::DialogueCondition::Function_Local:
         {
             return testFunctionLocal(select);
         }
 
-        case SelectWrapper::Function_NotLocal:
+        case ESM::DialogueCondition::Function_NotLocal:
         {
             return !testFunctionLocal(select);
         }
 
-        case SelectWrapper::Function_PcHealthPercent:
+        case ESM::DialogueCondition::Function_PcHealthPercent:
         {
             MWWorld::Ptr player = MWMechanics::getPlayer();
             return select.selectCompare(
                 static_cast<int>(player.getClass().getCreatureStats(player).getHealth().getRatio() * 100));
         }
 
-        case SelectWrapper::Function_PcDynamicStat:
+        case ESM::DialogueCondition::Function_PcMagicka:
+        case ESM::DialogueCondition::Function_PcFatigue:
+        case ESM::DialogueCondition::Function_PcHealth:
         {
             MWWorld::Ptr player = MWMechanics::getPlayer();
 
@@ -336,7 +337,7 @@ bool MWDialogue::Filter::testSelectStructNumeric(const SelectWrapper& select) co
             return select.selectCompare(value);
         }
 
-        case SelectWrapper::Function_HealthPercent:
+        case ESM::DialogueCondition::Function_Health_Percent:
         {
             return select.selectCompare(
                 static_cast<int>(mActor.getClass().getCreatureStats(mActor).getHealth().getRatio() * 100));
@@ -354,59 +355,100 @@ int MWDialogue::Filter::getSelectStructInteger(const SelectWrapper& select) cons
 
     switch (select.getFunction())
     {
-        case SelectWrapper::Function_Journal:
+        case ESM::DialogueCondition::Function_Journal:
 
-            return MWBase::Environment::get().getJournal()->getJournalIndex(ESM::RefId::stringRefId(select.getName()));
+            return MWBase::Environment::get().getJournal()->getJournalIndex(select.getId());
 
-        case SelectWrapper::Function_Item:
+        case ESM::DialogueCondition::Function_Item:
         {
             MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
 
-            return store.count(ESM::RefId::stringRefId(select.getName()));
+            return store.count(select.getId());
         }
 
-        case SelectWrapper::Function_Dead:
+        case ESM::DialogueCondition::Function_Dead:
 
-            return MWBase::Environment::get().getMechanicsManager()->countDeaths(
-                ESM::RefId::stringRefId(select.getName()));
+            return MWBase::Environment::get().getMechanicsManager()->countDeaths(select.getId());
 
-        case SelectWrapper::Function_Choice:
+        case ESM::DialogueCondition::Function_Choice:
 
             return mChoice;
 
-        case SelectWrapper::Function_AiSetting:
+        case ESM::DialogueCondition::Function_Fight:
+        case ESM::DialogueCondition::Function_Hello:
+        case ESM::DialogueCondition::Function_Alarm:
+        case ESM::DialogueCondition::Function_Flee:
+        {
+            int argument = select.getArgument();
+            if (argument < 0 || argument > 3)
+            {
+                throw std::runtime_error("AiSetting index is out of range");
+            }
 
             return mActor.getClass()
                 .getCreatureStats(mActor)
-                .getAiSetting((MWMechanics::AiSetting)select.getArgument())
+                .getAiSetting(static_cast<MWMechanics::AiSetting>(argument))
                 .getModified(false);
-
-        case SelectWrapper::Function_PcAttribute:
+        }
+        case ESM::DialogueCondition::Function_PcStrength:
+        case ESM::DialogueCondition::Function_PcIntelligence:
+        case ESM::DialogueCondition::Function_PcWillpower:
+        case ESM::DialogueCondition::Function_PcAgility:
+        case ESM::DialogueCondition::Function_PcSpeed:
+        case ESM::DialogueCondition::Function_PcEndurance:
+        case ESM::DialogueCondition::Function_PcPersonality:
+        case ESM::DialogueCondition::Function_PcLuck:
         {
             ESM::RefId attribute = ESM::Attribute::indexToRefId(select.getArgument());
             return player.getClass().getCreatureStats(player).getAttribute(attribute).getModified();
         }
-        case SelectWrapper::Function_PcSkill:
+        case ESM::DialogueCondition::Function_PcBlock:
+        case ESM::DialogueCondition::Function_PcArmorer:
+        case ESM::DialogueCondition::Function_PcMediumArmor:
+        case ESM::DialogueCondition::Function_PcHeavyArmor:
+        case ESM::DialogueCondition::Function_PcBluntWeapon:
+        case ESM::DialogueCondition::Function_PcLongBlade:
+        case ESM::DialogueCondition::Function_PcAxe:
+        case ESM::DialogueCondition::Function_PcSpear:
+        case ESM::DialogueCondition::Function_PcAthletics:
+        case ESM::DialogueCondition::Function_PcEnchant:
+        case ESM::DialogueCondition::Function_PcDestruction:
+        case ESM::DialogueCondition::Function_PcAlteration:
+        case ESM::DialogueCondition::Function_PcIllusion:
+        case ESM::DialogueCondition::Function_PcConjuration:
+        case ESM::DialogueCondition::Function_PcMysticism:
+        case ESM::DialogueCondition::Function_PcRestoration:
+        case ESM::DialogueCondition::Function_PcAlchemy:
+        case ESM::DialogueCondition::Function_PcUnarmored:
+        case ESM::DialogueCondition::Function_PcSecurity:
+        case ESM::DialogueCondition::Function_PcSneak:
+        case ESM::DialogueCondition::Function_PcAcrobatics:
+        case ESM::DialogueCondition::Function_PcLightArmor:
+        case ESM::DialogueCondition::Function_PcShortBlade:
+        case ESM::DialogueCondition::Function_PcMarksman:
+        case ESM::DialogueCondition::Function_PcMerchantile:
+        case ESM::DialogueCondition::Function_PcSpeechcraft:
+        case ESM::DialogueCondition::Function_PcHandToHand:
         {
             ESM::RefId skill = ESM::Skill::indexToRefId(select.getArgument());
             return static_cast<int>(player.getClass().getNpcStats(player).getSkill(skill).getModified());
         }
-        case SelectWrapper::Function_FriendlyHit:
+        case ESM::DialogueCondition::Function_FriendHit:
         {
             int hits = mActor.getClass().getCreatureStats(mActor).getFriendlyHits();
 
             return hits > 4 ? 4 : hits;
         }
 
-        case SelectWrapper::Function_PcLevel:
+        case ESM::DialogueCondition::Function_PcLevel:
 
             return player.getClass().getCreatureStats(player).getLevel();
 
-        case SelectWrapper::Function_PcGender:
+        case ESM::DialogueCondition::Function_PcGender:
 
             return player.get<ESM::NPC>()->mBase->isMale() ? 0 : 1;
 
-        case SelectWrapper::Function_PcClothingModifier:
+        case ESM::DialogueCondition::Function_PcClothingModifier:
         {
             const MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
 
@@ -423,11 +465,11 @@ int MWDialogue::Filter::getSelectStructInteger(const SelectWrapper& select) cons
             return value;
         }
 
-        case SelectWrapper::Function_PcCrimeLevel:
+        case ESM::DialogueCondition::Function_PcCrimeLevel:
 
             return player.getClass().getNpcStats(player).getBounty();
 
-        case SelectWrapper::Function_RankRequirement:
+        case ESM::DialogueCondition::Function_RankRequirement:
         {
             const ESM::RefId& faction = mActor.getClass().getPrimaryFaction(mActor);
             if (faction.empty())
@@ -449,23 +491,23 @@ int MWDialogue::Filter::getSelectStructInteger(const SelectWrapper& select) cons
             return result;
         }
 
-        case SelectWrapper::Function_Level:
+        case ESM::DialogueCondition::Function_Level:
 
             return mActor.getClass().getCreatureStats(mActor).getLevel();
 
-        case SelectWrapper::Function_PCReputation:
+        case ESM::DialogueCondition::Function_PcReputation:
 
             return player.getClass().getNpcStats(player).getReputation();
 
-        case SelectWrapper::Function_Weather:
+        case ESM::DialogueCondition::Function_Weather:
 
             return MWBase::Environment::get().getWorld()->getCurrentWeather();
 
-        case SelectWrapper::Function_Reputation:
+        case ESM::DialogueCondition::Function_Reputation:
 
             return mActor.getClass().getNpcStats(mActor).getReputation();
 
-        case SelectWrapper::Function_FactionRankDiff:
+        case ESM::DialogueCondition::Function_FactionRankDifference:
         {
             const ESM::RefId& faction = mActor.getClass().getPrimaryFaction(mActor);
 
@@ -477,14 +519,14 @@ int MWDialogue::Filter::getSelectStructInteger(const SelectWrapper& select) cons
             return rank - npcRank;
         }
 
-        case SelectWrapper::Function_WerewolfKills:
+        case ESM::DialogueCondition::Function_PcWerewolfKills:
 
             return player.getClass().getNpcStats(player).getWerewolfKills();
 
-        case SelectWrapper::Function_RankLow:
-        case SelectWrapper::Function_RankHigh:
+        case ESM::DialogueCondition::Function_FacReactionLowest:
+        case ESM::DialogueCondition::Function_FacReactionHighest:
         {
-            bool low = select.getFunction() == SelectWrapper::Function_RankLow;
+            bool low = select.getFunction() == ESM::DialogueCondition::Function_FacReactionLowest;
 
             const ESM::RefId& factionId = mActor.getClass().getPrimaryFaction(mActor);
 
@@ -507,7 +549,7 @@ int MWDialogue::Filter::getSelectStructInteger(const SelectWrapper& select) cons
             return value;
         }
 
-        case SelectWrapper::Function_CreatureTargetted:
+        case ESM::DialogueCondition::Function_CreatureTarget:
 
         {
             MWWorld::Ptr target;
@@ -534,53 +576,49 @@ bool MWDialogue::Filter::getSelectStructBoolean(const SelectWrapper& select) con
 
     switch (select.getFunction())
     {
-        case SelectWrapper::Function_False:
+        case ESM::DialogueCondition::Function_NotId:
 
-            return false;
+            return mActor.getCellRef().getRefId() != select.getId();
 
-        case SelectWrapper::Function_NotId:
+        case ESM::DialogueCondition::Function_NotFaction:
 
-            return !(mActor.getCellRef().getRefId() == ESM::RefId::stringRefId(select.getName()));
+            return mActor.getClass().getPrimaryFaction(mActor) != select.getId();
 
-        case SelectWrapper::Function_NotFaction:
+        case ESM::DialogueCondition::Function_NotClass:
 
-            return !(mActor.getClass().getPrimaryFaction(mActor) == ESM::RefId::stringRefId(select.getName()));
+            return mActor.get<ESM::NPC>()->mBase->mClass != select.getId();
 
-        case SelectWrapper::Function_NotClass:
+        case ESM::DialogueCondition::Function_NotRace:
 
-            return !(mActor.get<ESM::NPC>()->mBase->mClass == ESM::RefId::stringRefId(select.getName()));
+            return mActor.get<ESM::NPC>()->mBase->mRace != select.getId();
 
-        case SelectWrapper::Function_NotRace:
-
-            return !(mActor.get<ESM::NPC>()->mBase->mRace == ESM::RefId::stringRefId(select.getName()));
-
-        case SelectWrapper::Function_NotCell:
+        case ESM::DialogueCondition::Function_NotCell:
         {
             std::string_view actorCell = MWBase::Environment::get().getWorld()->getCellName(mActor.getCell());
-            return !Misc::StringUtils::ciStartsWith(actorCell, select.getName());
+            return !Misc::StringUtils::ciStartsWith(actorCell, select.getCellName());
         }
-        case SelectWrapper::Function_SameGender:
+        case ESM::DialogueCondition::Function_SameSex:
 
             return (player.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Female)
                 == (mActor.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Female);
 
-        case SelectWrapper::Function_SameRace:
+        case ESM::DialogueCondition::Function_SameRace:
 
             return mActor.get<ESM::NPC>()->mBase->mRace == player.get<ESM::NPC>()->mBase->mRace;
 
-        case SelectWrapper::Function_SameFaction:
+        case ESM::DialogueCondition::Function_SameFaction:
 
             return player.getClass().getNpcStats(player).isInFaction(mActor.getClass().getPrimaryFaction(mActor));
 
-        case SelectWrapper::Function_PcCommonDisease:
+        case ESM::DialogueCondition::Function_PcCommonDisease:
 
             return player.getClass().getCreatureStats(player).hasCommonDisease();
 
-        case SelectWrapper::Function_PcBlightDisease:
+        case ESM::DialogueCondition::Function_PcBlightDisease:
 
             return player.getClass().getCreatureStats(player).hasBlightDisease();
 
-        case SelectWrapper::Function_PcCorprus:
+        case ESM::DialogueCondition::Function_PcCorprus:
 
             return player.getClass()
                        .getCreatureStats(player)
@@ -589,7 +627,7 @@ bool MWDialogue::Filter::getSelectStructBoolean(const SelectWrapper& select) con
                        .getMagnitude()
                 != 0;
 
-        case SelectWrapper::Function_PcExpelled:
+        case ESM::DialogueCondition::Function_PcExpelled:
         {
             const ESM::RefId& faction = mActor.getClass().getPrimaryFaction(mActor);
 
@@ -599,7 +637,7 @@ bool MWDialogue::Filter::getSelectStructBoolean(const SelectWrapper& select) con
             return player.getClass().getNpcStats(player).getExpelled(faction);
         }
 
-        case SelectWrapper::Function_PcVampire:
+        case ESM::DialogueCondition::Function_PcVampire:
 
             return player.getClass()
                        .getCreatureStats(player)
@@ -608,27 +646,27 @@ bool MWDialogue::Filter::getSelectStructBoolean(const SelectWrapper& select) con
                        .getMagnitude()
                 > 0;
 
-        case SelectWrapper::Function_TalkedToPc:
+        case ESM::DialogueCondition::Function_TalkedToPc:
 
             return mTalkedToPlayer;
 
-        case SelectWrapper::Function_Alarmed:
+        case ESM::DialogueCondition::Function_Alarmed:
 
             return mActor.getClass().getCreatureStats(mActor).isAlarmed();
 
-        case SelectWrapper::Function_Detected:
+        case ESM::DialogueCondition::Function_Detected:
 
             return MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, mActor);
 
-        case SelectWrapper::Function_Attacked:
+        case ESM::DialogueCondition::Function_Attacked:
 
             return mActor.getClass().getCreatureStats(mActor).getAttacked();
 
-        case SelectWrapper::Function_ShouldAttack:
+        case ESM::DialogueCondition::Function_ShouldAttack:
 
             return MWBase::Environment::get().getMechanicsManager()->isAggressive(mActor, MWMechanics::getPlayer());
 
-        case SelectWrapper::Function_Werewolf:
+        case ESM::DialogueCondition::Function_Werewolf:
 
             return mActor.getClass().getNpcStats(mActor).isWerewolf();
 
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index e4d9453c83..28a2e16699 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -250,7 +250,7 @@ namespace MWDialogue
 
     void Journal::readRecord(ESM::ESMReader& reader, uint32_t type)
     {
-        if (type == ESM::REC_JOUR || type == ESM::REC_JOUR_LEGACY)
+        if (type == ESM::REC_JOUR)
         {
             ESM::JournalEntry record;
             record.load(reader);
diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 3b784cd59c..2c98eac218 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -87,7 +87,7 @@ namespace MWDialogue
                 // some keywords might be longer variations of other keywords, so we definitely need a list of
                 // candidates the first element in the pair is length of the match, i.e. depth from the first character
                 // on
-                std::vector<typename std::pair<int, typename Entry::childen_t::const_iterator>> candidates;
+                std::vector<typename std::pair<std::ptrdiff_t, typename Entry::childen_t::const_iterator>> candidates;
 
                 while ((j + 1) != end)
                 {
@@ -148,11 +148,11 @@ namespace MWDialogue
             // resolve overlapping keywords
             while (!matches.empty())
             {
-                int longestKeywordSize = 0;
+                std::size_t longestKeywordSize = 0;
                 typename std::vector<Match>::iterator longestKeyword = matches.begin();
                 for (typename std::vector<Match>::iterator it = matches.begin(); it != matches.end(); ++it)
                 {
-                    int size = it->mEnd - it->mBeg;
+                    std::size_t size = it->mEnd - it->mBeg;
                     if (size > longestKeywordSize)
                     {
                         longestKeywordSize = size;
@@ -199,7 +199,7 @@ namespace MWDialogue
 
         void seed_impl(std::string_view keyword, value_t value, size_t depth, Entry& entry)
         {
-            int ch = Misc::StringUtils::toLower(keyword.at(depth));
+            auto ch = Misc::StringUtils::toLower(keyword.at(depth));
 
             typename Entry::childen_t::iterator j = entry.mChildren.find(ch);
 
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index 94f7f73097..02c9d29b59 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -10,431 +10,264 @@
 namespace
 {
     template <typename T1, typename T2>
-    bool selectCompareImp(char comp, T1 value1, T2 value2)
+    bool selectCompareImp(ESM::DialogueCondition::Comparison comp, T1 value1, T2 value2)
     {
         switch (comp)
         {
-            case '0':
+            case ESM::DialogueCondition::Comp_Eq:
                 return value1 == value2;
-            case '1':
+            case ESM::DialogueCondition::Comp_Ne:
                 return value1 != value2;
-            case '2':
+            case ESM::DialogueCondition::Comp_Gt:
                 return value1 > value2;
-            case '3':
+            case ESM::DialogueCondition::Comp_Ge:
                 return value1 >= value2;
-            case '4':
+            case ESM::DialogueCondition::Comp_Ls:
                 return value1 < value2;
-            case '5':
+            case ESM::DialogueCondition::Comp_Le:
                 return value1 <= value2;
+            default:
+                throw std::runtime_error("unknown compare type in dialogue info select");
         }
-
-        throw std::runtime_error("unknown compare type in dialogue info select");
     }
 
     template <typename T>
-    bool selectCompareImp(const ESM::DialInfo::SelectStruct& select, T value1)
+    bool selectCompareImp(const ESM::DialogueCondition& select, T value1)
     {
-        if (select.mValue.getType() == ESM::VT_Int)
-        {
-            return selectCompareImp(select.mSelectRule[4], value1, select.mValue.getInteger());
-        }
-        else if (select.mValue.getType() == ESM::VT_Float)
-        {
-            return selectCompareImp(select.mSelectRule[4], value1, select.mValue.getFloat());
-        }
-        else
-            throw std::runtime_error("unsupported variable type in dialogue info select");
+        return std::visit(
+            [&](auto value) { return selectCompareImp(select.mComparison, value1, value); }, select.mValue);
     }
 }
 
-MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::decodeFunction() const
-{
-    const int index = Misc::StringUtils::toNumeric<int>(mSelect.mSelectRule.substr(2, 2), 0);
-
-    switch (index)
-    {
-        case 0:
-            return Function_RankLow;
-        case 1:
-            return Function_RankHigh;
-        case 2:
-            return Function_RankRequirement;
-        case 3:
-            return Function_Reputation;
-        case 4:
-            return Function_HealthPercent;
-        case 5:
-            return Function_PCReputation;
-        case 6:
-            return Function_PcLevel;
-        case 7:
-            return Function_PcHealthPercent;
-        case 8:
-        case 9:
-            return Function_PcDynamicStat;
-        case 10:
-            return Function_PcAttribute;
-        case 11:
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-        case 17:
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:
-        case 25:
-        case 26:
-        case 27:
-        case 28:
-        case 29:
-        case 30:
-        case 31:
-        case 32:
-        case 33:
-        case 34:
-        case 35:
-        case 36:
-        case 37:
-            return Function_PcSkill;
-        case 38:
-            return Function_PcGender;
-        case 39:
-            return Function_PcExpelled;
-        case 40:
-            return Function_PcCommonDisease;
-        case 41:
-            return Function_PcBlightDisease;
-        case 42:
-            return Function_PcClothingModifier;
-        case 43:
-            return Function_PcCrimeLevel;
-        case 44:
-            return Function_SameGender;
-        case 45:
-            return Function_SameRace;
-        case 46:
-            return Function_SameFaction;
-        case 47:
-            return Function_FactionRankDiff;
-        case 48:
-            return Function_Detected;
-        case 49:
-            return Function_Alarmed;
-        case 50:
-            return Function_Choice;
-        case 51:
-        case 52:
-        case 53:
-        case 54:
-        case 55:
-        case 56:
-        case 57:
-            return Function_PcAttribute;
-        case 58:
-            return Function_PcCorprus;
-        case 59:
-            return Function_Weather;
-        case 60:
-            return Function_PcVampire;
-        case 61:
-            return Function_Level;
-        case 62:
-            return Function_Attacked;
-        case 63:
-            return Function_TalkedToPc;
-        case 64:
-            return Function_PcDynamicStat;
-        case 65:
-            return Function_CreatureTargetted;
-        case 66:
-            return Function_FriendlyHit;
-        case 67:
-        case 68:
-        case 69:
-        case 70:
-            return Function_AiSetting;
-        case 71:
-            return Function_ShouldAttack;
-        case 72:
-            return Function_Werewolf;
-        case 73:
-            return Function_WerewolfKills;
-    }
-
-    return Function_False;
-}
-
-MWDialogue::SelectWrapper::SelectWrapper(const ESM::DialInfo::SelectStruct& select)
+MWDialogue::SelectWrapper::SelectWrapper(const ESM::DialogueCondition& select)
     : mSelect(select)
 {
 }
 
-MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::getFunction() const
+ESM::DialogueCondition::Function MWDialogue::SelectWrapper::getFunction() const
 {
-    char type = mSelect.mSelectRule[1];
-
-    switch (type)
-    {
-        case '1':
-            return decodeFunction();
-        case '2':
-            return Function_Global;
-        case '3':
-            return Function_Local;
-        case '4':
-            return Function_Journal;
-        case '5':
-            return Function_Item;
-        case '6':
-            return Function_Dead;
-        case '7':
-            return Function_NotId;
-        case '8':
-            return Function_NotFaction;
-        case '9':
-            return Function_NotClass;
-        case 'A':
-            return Function_NotRace;
-        case 'B':
-            return Function_NotCell;
-        case 'C':
-            return Function_NotLocal;
-    }
-
-    return Function_None;
+    return mSelect.mFunction;
 }
 
 int MWDialogue::SelectWrapper::getArgument() const
 {
-    if (mSelect.mSelectRule[1] != '1')
-        return 0;
-
-    int index = 0;
-
-    std::istringstream(mSelect.mSelectRule.substr(2, 2)) >> index;
-
-    switch (index)
+    switch (mSelect.mFunction)
     {
         // AI settings
-        case 67:
+        case ESM::DialogueCondition::Function_Fight:
             return 1;
-        case 68:
+        case ESM::DialogueCondition::Function_Hello:
             return 0;
-        case 69:
+        case ESM::DialogueCondition::Function_Alarm:
             return 3;
-        case 70:
+        case ESM::DialogueCondition::Function_Flee:
             return 2;
 
         // attributes
-        case 10:
+        case ESM::DialogueCondition::Function_PcStrength:
             return 0;
-        case 51:
+        case ESM::DialogueCondition::Function_PcIntelligence:
             return 1;
-        case 52:
+        case ESM::DialogueCondition::Function_PcWillpower:
             return 2;
-        case 53:
+        case ESM::DialogueCondition::Function_PcAgility:
             return 3;
-        case 54:
+        case ESM::DialogueCondition::Function_PcSpeed:
             return 4;
-        case 55:
+        case ESM::DialogueCondition::Function_PcEndurance:
             return 5;
-        case 56:
+        case ESM::DialogueCondition::Function_PcPersonality:
             return 6;
-        case 57:
+        case ESM::DialogueCondition::Function_PcLuck:
             return 7;
 
         // skills
-        case 11:
+        case ESM::DialogueCondition::Function_PcBlock:
             return 0;
-        case 12:
+        case ESM::DialogueCondition::Function_PcArmorer:
             return 1;
-        case 13:
+        case ESM::DialogueCondition::Function_PcMediumArmor:
             return 2;
-        case 14:
+        case ESM::DialogueCondition::Function_PcHeavyArmor:
             return 3;
-        case 15:
+        case ESM::DialogueCondition::Function_PcBluntWeapon:
             return 4;
-        case 16:
+        case ESM::DialogueCondition::Function_PcLongBlade:
             return 5;
-        case 17:
+        case ESM::DialogueCondition::Function_PcAxe:
             return 6;
-        case 18:
+        case ESM::DialogueCondition::Function_PcSpear:
             return 7;
-        case 19:
+        case ESM::DialogueCondition::Function_PcAthletics:
             return 8;
-        case 20:
+        case ESM::DialogueCondition::Function_PcEnchant:
             return 9;
-        case 21:
+        case ESM::DialogueCondition::Function_PcDestruction:
             return 10;
-        case 22:
+        case ESM::DialogueCondition::Function_PcAlteration:
             return 11;
-        case 23:
+        case ESM::DialogueCondition::Function_PcIllusion:
             return 12;
-        case 24:
+        case ESM::DialogueCondition::Function_PcConjuration:
             return 13;
-        case 25:
+        case ESM::DialogueCondition::Function_PcMysticism:
             return 14;
-        case 26:
+        case ESM::DialogueCondition::Function_PcRestoration:
             return 15;
-        case 27:
+        case ESM::DialogueCondition::Function_PcAlchemy:
             return 16;
-        case 28:
+        case ESM::DialogueCondition::Function_PcUnarmored:
             return 17;
-        case 29:
+        case ESM::DialogueCondition::Function_PcSecurity:
             return 18;
-        case 30:
+        case ESM::DialogueCondition::Function_PcSneak:
             return 19;
-        case 31:
+        case ESM::DialogueCondition::Function_PcAcrobatics:
             return 20;
-        case 32:
+        case ESM::DialogueCondition::Function_PcLightArmor:
             return 21;
-        case 33:
+        case ESM::DialogueCondition::Function_PcShortBlade:
             return 22;
-        case 34:
+        case ESM::DialogueCondition::Function_PcMarksman:
             return 23;
-        case 35:
+        case ESM::DialogueCondition::Function_PcMerchantile:
             return 24;
-        case 36:
+        case ESM::DialogueCondition::Function_PcSpeechcraft:
             return 25;
-        case 37:
+        case ESM::DialogueCondition::Function_PcHandToHand:
             return 26;
 
         // dynamic stats
-        case 8:
+        case ESM::DialogueCondition::Function_PcMagicka:
             return 1;
-        case 9:
+        case ESM::DialogueCondition::Function_PcFatigue:
             return 2;
-        case 64:
+        case ESM::DialogueCondition::Function_PcHealth:
+            return 0;
+        default:
             return 0;
     }
-
-    return 0;
 }
 
 MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
 {
-    static const Function integerFunctions[] = {
-        Function_Journal,
-        Function_Item,
-        Function_Dead,
-        Function_Choice,
-        Function_AiSetting,
-        Function_PcAttribute,
-        Function_PcSkill,
-        Function_FriendlyHit,
-        Function_PcLevel,
-        Function_PcGender,
-        Function_PcClothingModifier,
-        Function_PcCrimeLevel,
-        Function_RankRequirement,
-        Function_Level,
-        Function_PCReputation,
-        Function_Weather,
-        Function_Reputation,
-        Function_FactionRankDiff,
-        Function_WerewolfKills,
-        Function_RankLow,
-        Function_RankHigh,
-        Function_CreatureTargetted,
-        // end marker
-        Function_None,
-    };
-
-    static const Function numericFunctions[] = {
-        Function_Global,
-        Function_Local,
-        Function_NotLocal,
-        Function_PcDynamicStat,
-        Function_PcHealthPercent,
-        Function_HealthPercent,
-        // end marker
-        Function_None,
-    };
-
-    static const Function booleanFunctions[] = {
-        Function_False,
-        Function_SameGender,
-        Function_SameRace,
-        Function_SameFaction,
-        Function_PcCommonDisease,
-        Function_PcBlightDisease,
-        Function_PcCorprus,
-        Function_PcExpelled,
-        Function_PcVampire,
-        Function_TalkedToPc,
-        Function_Alarmed,
-        Function_Detected,
-        Function_Attacked,
-        Function_ShouldAttack,
-        Function_Werewolf,
-        // end marker
-        Function_None,
-    };
-
-    static const Function invertedBooleanFunctions[] = {
-        Function_NotId,
-        Function_NotFaction,
-        Function_NotClass,
-        Function_NotRace,
-        Function_NotCell,
-        // end marker
-        Function_None,
-    };
-
-    Function function = getFunction();
-
-    for (int i = 0; integerFunctions[i] != Function_None; ++i)
-        if (integerFunctions[i] == function)
+    switch (mSelect.mFunction)
+    {
+        case ESM::DialogueCondition::Function_Journal:
+        case ESM::DialogueCondition::Function_Item:
+        case ESM::DialogueCondition::Function_Dead:
+        case ESM::DialogueCondition::Function_Choice:
+        case ESM::DialogueCondition::Function_Fight:
+        case ESM::DialogueCondition::Function_Hello:
+        case ESM::DialogueCondition::Function_Alarm:
+        case ESM::DialogueCondition::Function_Flee:
+        case ESM::DialogueCondition::Function_PcStrength:
+        case ESM::DialogueCondition::Function_PcIntelligence:
+        case ESM::DialogueCondition::Function_PcWillpower:
+        case ESM::DialogueCondition::Function_PcAgility:
+        case ESM::DialogueCondition::Function_PcSpeed:
+        case ESM::DialogueCondition::Function_PcEndurance:
+        case ESM::DialogueCondition::Function_PcPersonality:
+        case ESM::DialogueCondition::Function_PcLuck:
+        case ESM::DialogueCondition::Function_PcBlock:
+        case ESM::DialogueCondition::Function_PcArmorer:
+        case ESM::DialogueCondition::Function_PcMediumArmor:
+        case ESM::DialogueCondition::Function_PcHeavyArmor:
+        case ESM::DialogueCondition::Function_PcBluntWeapon:
+        case ESM::DialogueCondition::Function_PcLongBlade:
+        case ESM::DialogueCondition::Function_PcAxe:
+        case ESM::DialogueCondition::Function_PcSpear:
+        case ESM::DialogueCondition::Function_PcAthletics:
+        case ESM::DialogueCondition::Function_PcEnchant:
+        case ESM::DialogueCondition::Function_PcDestruction:
+        case ESM::DialogueCondition::Function_PcAlteration:
+        case ESM::DialogueCondition::Function_PcIllusion:
+        case ESM::DialogueCondition::Function_PcConjuration:
+        case ESM::DialogueCondition::Function_PcMysticism:
+        case ESM::DialogueCondition::Function_PcRestoration:
+        case ESM::DialogueCondition::Function_PcAlchemy:
+        case ESM::DialogueCondition::Function_PcUnarmored:
+        case ESM::DialogueCondition::Function_PcSecurity:
+        case ESM::DialogueCondition::Function_PcSneak:
+        case ESM::DialogueCondition::Function_PcAcrobatics:
+        case ESM::DialogueCondition::Function_PcLightArmor:
+        case ESM::DialogueCondition::Function_PcShortBlade:
+        case ESM::DialogueCondition::Function_PcMarksman:
+        case ESM::DialogueCondition::Function_PcMerchantile:
+        case ESM::DialogueCondition::Function_PcSpeechcraft:
+        case ESM::DialogueCondition::Function_PcHandToHand:
+        case ESM::DialogueCondition::Function_FriendHit:
+        case ESM::DialogueCondition::Function_PcLevel:
+        case ESM::DialogueCondition::Function_PcGender:
+        case ESM::DialogueCondition::Function_PcClothingModifier:
+        case ESM::DialogueCondition::Function_PcCrimeLevel:
+        case ESM::DialogueCondition::Function_RankRequirement:
+        case ESM::DialogueCondition::Function_Level:
+        case ESM::DialogueCondition::Function_PcReputation:
+        case ESM::DialogueCondition::Function_Weather:
+        case ESM::DialogueCondition::Function_Reputation:
+        case ESM::DialogueCondition::Function_FactionRankDifference:
+        case ESM::DialogueCondition::Function_PcWerewolfKills:
+        case ESM::DialogueCondition::Function_FacReactionLowest:
+        case ESM::DialogueCondition::Function_FacReactionHighest:
+        case ESM::DialogueCondition::Function_CreatureTarget:
             return Type_Integer;
-
-    for (int i = 0; numericFunctions[i] != Function_None; ++i)
-        if (numericFunctions[i] == function)
+        case ESM::DialogueCondition::Function_Global:
+        case ESM::DialogueCondition::Function_Local:
+        case ESM::DialogueCondition::Function_NotLocal:
+        case ESM::DialogueCondition::Function_PcHealth:
+        case ESM::DialogueCondition::Function_PcMagicka:
+        case ESM::DialogueCondition::Function_PcFatigue:
+        case ESM::DialogueCondition::Function_PcHealthPercent:
+        case ESM::DialogueCondition::Function_Health_Percent:
             return Type_Numeric;
-
-    for (int i = 0; booleanFunctions[i] != Function_None; ++i)
-        if (booleanFunctions[i] == function)
+        case ESM::DialogueCondition::Function_SameSex:
+        case ESM::DialogueCondition::Function_SameRace:
+        case ESM::DialogueCondition::Function_SameFaction:
+        case ESM::DialogueCondition::Function_PcCommonDisease:
+        case ESM::DialogueCondition::Function_PcBlightDisease:
+        case ESM::DialogueCondition::Function_PcCorprus:
+        case ESM::DialogueCondition::Function_PcExpelled:
+        case ESM::DialogueCondition::Function_PcVampire:
+        case ESM::DialogueCondition::Function_TalkedToPc:
+        case ESM::DialogueCondition::Function_Alarmed:
+        case ESM::DialogueCondition::Function_Detected:
+        case ESM::DialogueCondition::Function_Attacked:
+        case ESM::DialogueCondition::Function_ShouldAttack:
+        case ESM::DialogueCondition::Function_Werewolf:
             return Type_Boolean;
-
-    for (int i = 0; invertedBooleanFunctions[i] != Function_None; ++i)
-        if (invertedBooleanFunctions[i] == function)
+        case ESM::DialogueCondition::Function_NotId:
+        case ESM::DialogueCondition::Function_NotFaction:
+        case ESM::DialogueCondition::Function_NotClass:
+        case ESM::DialogueCondition::Function_NotRace:
+        case ESM::DialogueCondition::Function_NotCell:
             return Type_Inverted;
-
-    return Type_None;
+        default:
+            return Type_None;
+    };
 }
 
 bool MWDialogue::SelectWrapper::isNpcOnly() const
 {
-    static const Function functions[] = {
-        Function_NotFaction,
-        Function_NotClass,
-        Function_NotRace,
-        Function_SameGender,
-        Function_SameRace,
-        Function_SameFaction,
-        Function_RankRequirement,
-        Function_Reputation,
-        Function_FactionRankDiff,
-        Function_Werewolf,
-        Function_WerewolfKills,
-        Function_RankLow,
-        Function_RankHigh,
-        // end marker
-        Function_None,
-    };
-
-    Function function = getFunction();
-
-    for (int i = 0; functions[i] != Function_None; ++i)
-        if (functions[i] == function)
+    switch (mSelect.mFunction)
+    {
+        case ESM::DialogueCondition::Function_NotFaction:
+        case ESM::DialogueCondition::Function_NotClass:
+        case ESM::DialogueCondition::Function_NotRace:
+        case ESM::DialogueCondition::Function_SameSex:
+        case ESM::DialogueCondition::Function_SameRace:
+        case ESM::DialogueCondition::Function_SameFaction:
+        case ESM::DialogueCondition::Function_RankRequirement:
+        case ESM::DialogueCondition::Function_Reputation:
+        case ESM::DialogueCondition::Function_FactionRankDifference:
+        case ESM::DialogueCondition::Function_Werewolf:
+        case ESM::DialogueCondition::Function_PcWerewolfKills:
+        case ESM::DialogueCondition::Function_FacReactionLowest:
+        case ESM::DialogueCondition::Function_FacReactionHighest:
             return true;
-
-    return false;
+        default:
+            return false;
+    }
 }
 
 bool MWDialogue::SelectWrapper::selectCompare(int value) const
@@ -454,5 +287,15 @@ bool MWDialogue::SelectWrapper::selectCompare(bool value) const
 
 std::string MWDialogue::SelectWrapper::getName() const
 {
-    return Misc::StringUtils::lowerCase(std::string_view(mSelect.mSelectRule).substr(5));
+    return Misc::StringUtils::lowerCase(mSelect.mVariable);
+}
+
+std::string_view MWDialogue::SelectWrapper::getCellName() const
+{
+    return mSelect.mVariable;
+}
+
+ESM::RefId MWDialogue::SelectWrapper::getId() const
+{
+    return ESM::RefId::stringRefId(mSelect.mVariable);
 }
diff --git a/apps/openmw/mwdialogue/selectwrapper.hpp b/apps/openmw/mwdialogue/selectwrapper.hpp
index 0d376d957c..d831b6cea0 100644
--- a/apps/openmw/mwdialogue/selectwrapper.hpp
+++ b/apps/openmw/mwdialogue/selectwrapper.hpp
@@ -7,62 +7,9 @@ namespace MWDialogue
 {
     class SelectWrapper
     {
-        const ESM::DialInfo::SelectStruct& mSelect;
+        const ESM::DialogueCondition& mSelect;
 
     public:
-        enum Function
-        {
-            Function_None,
-            Function_False,
-            Function_Journal,
-            Function_Item,
-            Function_Dead,
-            Function_NotId,
-            Function_NotFaction,
-            Function_NotClass,
-            Function_NotRace,
-            Function_NotCell,
-            Function_NotLocal,
-            Function_Local,
-            Function_Global,
-            Function_SameGender,
-            Function_SameRace,
-            Function_SameFaction,
-            Function_Choice,
-            Function_PcCommonDisease,
-            Function_PcBlightDisease,
-            Function_PcCorprus,
-            Function_AiSetting,
-            Function_PcAttribute,
-            Function_PcSkill,
-            Function_PcExpelled,
-            Function_PcVampire,
-            Function_FriendlyHit,
-            Function_TalkedToPc,
-            Function_PcLevel,
-            Function_PcHealthPercent,
-            Function_PcDynamicStat,
-            Function_PcGender,
-            Function_PcClothingModifier,
-            Function_PcCrimeLevel,
-            Function_RankRequirement,
-            Function_HealthPercent,
-            Function_Level,
-            Function_PCReputation,
-            Function_Weather,
-            Function_Reputation,
-            Function_Alarmed,
-            Function_FactionRankDiff,
-            Function_Detected,
-            Function_Attacked,
-            Function_ShouldAttack,
-            Function_CreatureTargetted,
-            Function_Werewolf,
-            Function_WerewolfKills,
-            Function_RankLow,
-            Function_RankHigh
-        };
-
         enum Type
         {
             Type_None,
@@ -72,13 +19,10 @@ namespace MWDialogue
             Type_Inverted
         };
 
-    private:
-        Function decodeFunction() const;
-
     public:
-        SelectWrapper(const ESM::DialInfo::SelectStruct& select);
+        SelectWrapper(const ESM::DialogueCondition& select);
 
-        Function getFunction() const;
+        ESM::DialogueCondition::Function getFunction() const;
 
         int getArgument() const;
 
@@ -95,6 +39,10 @@ namespace MWDialogue
 
         std::string getName() const;
         ///< Return case-smashed name.
+
+        std::string_view getCellName() const;
+
+        ESM::RefId getId() const;
     };
 }
 
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 1eb41a2d86..5a6245fca0 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -6,7 +6,9 @@
 #include <MyGUI_ControllerRepeatClick.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_UString.h>
 
+#include <components/esm3/loadappa.hpp>
 #include <components/esm3/loadingr.hpp>
 #include <components/esm3/loadmgef.hpp>
 
@@ -27,7 +29,6 @@
 #include "itemview.hpp"
 #include "itemwidget.hpp"
 #include "sortfilteritemmodel.hpp"
-#include "ustring.hpp"
 #include "widgets.hpp"
 
 namespace MWGui
@@ -77,6 +78,11 @@ namespace MWGui
         mIngredients[2]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
         mIngredients[3]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
 
+        mApparatus[0]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onApparatusSelected);
+        mApparatus[1]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onApparatusSelected);
+        mApparatus[2]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onApparatusSelected);
+        mApparatus[3]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onApparatusSelected);
+
         mCreateButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCreateButtonClicked);
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCancelButtonClicked);
 
@@ -141,12 +147,12 @@ namespace MWGui
         }
 
         // remove ingredient slots that have been fully used up
-        for (int i = 0; i < 4; ++i)
+        for (size_t i = 0; i < mIngredients.size(); ++i)
             if (mIngredients[i]->isUserString("ToolTipType"))
             {
                 MWWorld::Ptr ingred = *mIngredients[i]->getUserData<MWWorld::Ptr>();
-                if (ingred.getRefData().getCount() == 0)
-                    removeIngredient(mIngredients[i]);
+                if (ingred.getCellRef().getCount() == 0)
+                    mAlchemy->removeIngredient(i);
             }
 
         updateFilters();
@@ -158,7 +164,7 @@ namespace MWGui
         auto const& wm = MWBase::Environment::get().getWindowManager();
         std::string_view ingredient = wm->getGameSettingString("sIngredients", "Ingredients");
 
-        if (mFilterType->getCaption() == toUString(ingredient))
+        if (mFilterType->getCaption() == ingredient)
             mCurrentFilter = FilterType::ByName;
         else
             mCurrentFilter = FilterType::ByEffect;
@@ -170,17 +176,17 @@ namespace MWGui
     void AlchemyWindow::switchFilterType(MyGUI::Widget* _sender)
     {
         auto const& wm = MWBase::Environment::get().getWindowManager();
-        MyGUI::UString ingredient = toUString(wm->getGameSettingString("sIngredients", "Ingredients"));
+        std::string_view ingredient = wm->getGameSettingString("sIngredients", "Ingredients");
         auto* button = _sender->castType<MyGUI::Button>();
 
         if (button->getCaption() == ingredient)
         {
-            button->setCaption(toUString(wm->getGameSettingString("sMagicEffects", "Magic Effects")));
+            button->setCaption(MyGUI::UString(wm->getGameSettingString("sMagicEffects", "Magic Effects")));
             mCurrentFilter = FilterType::ByEffect;
         }
         else
         {
-            button->setCaption(ingredient);
+            button->setCaption(MyGUI::UString(ingredient));
             mCurrentFilter = FilterType::ByName;
         }
         mSortModel->setNameFilter({});
@@ -289,7 +295,85 @@ namespace MWGui
 
     void AlchemyWindow::onIngredientSelected(MyGUI::Widget* _sender)
     {
-        removeIngredient(_sender);
+        size_t i = std::distance(mIngredients.begin(), std::find(mIngredients.begin(), mIngredients.end(), _sender));
+        mAlchemy->removeIngredient(i);
+        update();
+    }
+
+    void AlchemyWindow::onItemSelected(MWWorld::Ptr item)
+    {
+        mItemSelectionDialog->setVisible(false);
+
+        int32_t index = item.get<ESM::Apparatus>()->mBase->mData.mType;
+        const auto& widget = mApparatus[index];
+
+        widget->setItem(item);
+
+        if (item.isEmpty())
+        {
+            widget->clearUserStrings();
+            return;
+        }
+
+        mAlchemy->addApparatus(item);
+
+        widget->setUserString("ToolTipType", "ItemPtr");
+        widget->setUserData(MWWorld::Ptr(item));
+
+        MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
+        update();
+    }
+
+    void AlchemyWindow::onItemCancel()
+    {
+        mItemSelectionDialog->setVisible(false);
+    }
+
+    void AlchemyWindow::onApparatusSelected(MyGUI::Widget* _sender)
+    {
+        size_t i = std::distance(mApparatus.begin(), std::find(mApparatus.begin(), mApparatus.end(), _sender));
+        if (_sender->getUserData<MWWorld::Ptr>()->isEmpty()) // if this apparatus slot is empty
+        {
+            std::string title;
+            switch (i)
+            {
+                case ESM::Apparatus::AppaType::MortarPestle:
+                    title = "#{sMortar}";
+                    break;
+                case ESM::Apparatus::AppaType::Alembic:
+                    title = "#{sAlembic}";
+                    break;
+                case ESM::Apparatus::AppaType::Calcinator:
+                    title = "#{sCalcinator}";
+                    break;
+                case ESM::Apparatus::AppaType::Retort:
+                    title = "#{sRetort}";
+                    break;
+                default:
+                    title = "#{sApparatus}";
+            }
+
+            mItemSelectionDialog = std::make_unique<ItemSelectionDialog>(title);
+            mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &AlchemyWindow::onItemSelected);
+            mItemSelectionDialog->eventDialogCanceled += MyGUI::newDelegate(this, &AlchemyWindow::onItemCancel);
+            mItemSelectionDialog->setVisible(true);
+            mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
+            mItemSelectionDialog->getSortModel()->setApparatusTypeFilter(i);
+            mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyAlchemyTools);
+        }
+        else
+        {
+            const auto& widget = mApparatus[i];
+            mAlchemy->removeApparatus(i);
+
+            if (widget->getChildCount())
+                MyGUI::Gui::getInstance().destroyWidget(widget->getChildAt(0));
+
+            widget->clearUserStrings();
+            widget->setItem(MWWorld::Ptr());
+            widget->setUserData(MWWorld::Ptr());
+        }
+
         update();
     }
 
@@ -311,8 +395,10 @@ namespace MWGui
     {
         std::string suggestedName = mAlchemy->suggestPotionName();
         if (suggestedName != mSuggestedPotionName)
+        {
             mNameEdit->setCaptionWithReplacing(suggestedName);
-        mSuggestedPotionName = suggestedName;
+            mSuggestedPotionName = std::move(suggestedName);
+        }
 
         mSortModel->clearDragItems();
 
@@ -329,7 +415,7 @@ namespace MWGui
             }
 
             if (!item.isEmpty())
-                mSortModel->addDragItem(item, item.getRefData().getCount());
+                mSortModel->addDragItem(item, item.getCellRef().getCount());
 
             if (ingredient->getChildCount())
                 MyGUI::Gui::getInstance().destroyWidget(ingredient->getChildAt(0));
@@ -344,12 +430,12 @@ namespace MWGui
             ingredient->setUserString("ToolTipType", "ItemPtr");
             ingredient->setUserData(MWWorld::Ptr(item));
 
-            ingredient->setCount(item.getRefData().getCount());
+            ingredient->setCount(item.getCellRef().getCount());
         }
 
         mItemView->update();
 
-        std::set<MWMechanics::EffectKey> effectIds = mAlchemy->listEffects();
+        std::vector<MWMechanics::EffectKey> effectIds = mAlchemy->listEffects();
         Widgets::SpellEffectList list;
         unsigned int effectIndex = 0;
         for (const MWMechanics::EffectKey& effectKey : effectIds)
@@ -386,15 +472,6 @@ namespace MWGui
         effectsWidget->setCoord(coord);
     }
 
-    void AlchemyWindow::removeIngredient(MyGUI::Widget* ingredient)
-    {
-        for (int i = 0; i < 4; ++i)
-            if (mIngredients[i] == ingredient)
-                mAlchemy->removeIngredient(i);
-
-        update();
-    }
-
     void AlchemyWindow::addRepeatController(MyGUI::Widget* widget)
     {
         MyGUI::ControllerItem* item
diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index 39ea5ec9b3..82e5c3f583 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -10,6 +10,7 @@
 #include <components/widgets/box.hpp>
 #include <components/widgets/numericeditbox.hpp>
 
+#include "itemselection.hpp"
 #include "windowbase.hpp"
 
 #include "../mwmechanics/alchemy.hpp"
@@ -44,6 +45,8 @@ namespace MWGui
         };
         FilterType mCurrentFilter;
 
+        std::unique_ptr<ItemSelectionDialog> mItemSelectionDialog;
+
         ItemView* mItemView;
         InventoryItemModel* mModel;
         SortFilterItemModel* mSortModel;
@@ -63,6 +66,7 @@ namespace MWGui
         void onCancelButtonClicked(MyGUI::Widget* _sender);
         void onCreateButtonClicked(MyGUI::Widget* _sender);
         void onIngredientSelected(MyGUI::Widget* _sender);
+        void onApparatusSelected(MyGUI::Widget* _sender);
         void onAccept(MyGUI::EditBox*);
         void onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
         void onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
@@ -84,7 +88,8 @@ namespace MWGui
 
         void onSelectedItem(int index);
 
-        void removeIngredient(MyGUI::Widget* ingredient);
+        void onItemSelected(MWWorld::Ptr item);
+        void onItemCancel();
 
         void createPotions(int count);
 
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index 617c373b0b..3dfdd17627 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -4,6 +4,7 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadspel.hpp>
@@ -18,7 +19,6 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
 
-#include "ustring.hpp"
 #include "widgets.hpp"
 
 namespace
@@ -56,7 +56,8 @@ namespace MWGui
 
         MyGUI::Button* okButton;
         getWidget(okButton, "OKButton");
-        okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+        okButton->setCaption(
+            MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
         okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BirthDialog::onOkClicked);
 
         updateBirths();
@@ -70,10 +71,10 @@ namespace MWGui
 
         if (shown)
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void BirthDialog::onOpen()
@@ -235,7 +236,7 @@ namespace MWGui
             {
                 MyGUI::TextBox* label
                     = mSpellArea->createWidget<MyGUI::TextBox>("SandBrightText", coord, MyGUI::Align::Default, "Label");
-                label->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                label->setCaption(MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
                     categories[category].label, {})));
                 mSpellItems.push_back(label);
                 coord.top += lineHeight;
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 5d9256b20d..1966442513 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1065,7 +1065,7 @@ namespace MWGui
                 {
                     createActiveFormats(newBook);
 
-                    mBook = newBook;
+                    mBook = std::move(newBook);
                     setPage(newPage);
 
                     if (newPage < mBook->mPages.size())
diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp
index 60a86851fa..ef875a18b9 100644
--- a/apps/openmw/mwgui/bookwindow.cpp
+++ b/apps/openmw/mwgui/bookwindow.cpp
@@ -4,6 +4,7 @@
 #include <MyGUI_TextBox.h>
 
 #include <components/esm3/loadbook.hpp>
+#include <components/esm4/loadbook.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -83,7 +84,7 @@ namespace MWGui
 
     void BookWindow::setPtr(const MWWorld::Ptr& book)
     {
-        if (book.isEmpty() || book.getType() != ESM::REC_BOOK)
+        if (book.isEmpty() || (book.getType() != ESM::REC_BOOK && book.getType() != ESM::REC_BOOK4))
             throw std::runtime_error("Invalid argument in BookWindow::setPtr");
         mBook = book;
 
@@ -93,11 +94,16 @@ namespace MWGui
         clearPages();
         mCurrentPage = 0;
 
-        MWWorld::LiveCellRef<ESM::Book>* ref = mBook.get<ESM::Book>();
+        const std::string* text;
+        if (book.getType() == ESM::REC_BOOK)
+            text = &book.get<ESM::Book>()->mBase->mText;
+        else
+            text = &book.get<ESM4::Book>()->mBase->mText;
+        bool shrinkTextAtLastTag = book.getType() == ESM::REC_BOOK;
 
         Formatting::BookFormatter formatter;
-        mPages = formatter.markupToWidget(mLeftPage, ref->mBase->mText);
-        formatter.markupToWidget(mRightPage, ref->mBase->mText);
+        mPages = formatter.markupToWidget(mLeftPage, *text, shrinkTextAtLastTag);
+        formatter.markupToWidget(mRightPage, *text, shrinkTextAtLastTag);
 
         updatePages();
 
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 19f7d97176..be2d22ae84 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -39,7 +39,7 @@ namespace
     {
         const std::string mText;
         const Response mResponses[3];
-        const std::string mSound;
+        const VFS::Path::Normalized mSound;
     };
 
     Step sGenerateClassSteps(int number)
@@ -63,17 +63,17 @@ namespace
         switch (order)
         {
             case 0:
-                return { question, { r0, r1, r2 }, sound };
+                return { std::move(question), { std::move(r0), std::move(r1), std::move(r2) }, std::move(sound) };
             case 1:
-                return { question, { r0, r2, r1 }, sound };
+                return { std::move(question), { std::move(r0), std::move(r2), std::move(r1) }, std::move(sound) };
             case 2:
-                return { question, { r1, r0, r2 }, sound };
+                return { std::move(question), { std::move(r1), std::move(r0), std::move(r2) }, std::move(sound) };
             case 3:
-                return { question, { r1, r2, r0 }, sound };
+                return { std::move(question), { std::move(r1), std::move(r2), std::move(r0) }, std::move(sound) };
             case 4:
-                return { question, { r2, r0, r1 }, sound };
+                return { std::move(question), { std::move(r2), std::move(r0), std::move(r1) }, std::move(sound) };
             default:
-                return { question, { r2, r1, r0 }, sound };
+                return { std::move(question), { std::move(r2), std::move(r1), std::move(r0) }, std::move(sound) };
         }
     }
 }
@@ -333,10 +333,10 @@ namespace MWGui
             if (!classId.empty())
                 MWBase::Environment::get().getMechanicsManager()->setPlayerClass(classId);
 
-            const ESM::Class* klass = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(classId);
-            if (klass)
+            const ESM::Class* pickedClass = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(classId);
+            if (pickedClass)
             {
-                mPlayerClass = *klass;
+                mPlayerClass = *pickedClass;
             }
             MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mPickClassDialog));
         }
@@ -454,30 +454,30 @@ namespace MWGui
     {
         if (mCreateClassDialog)
         {
-            ESM::Class klass;
-            klass.mName = mCreateClassDialog->getName();
-            klass.mDescription = mCreateClassDialog->getDescription();
-            klass.mData.mSpecialization = mCreateClassDialog->getSpecializationId();
-            klass.mData.mIsPlayable = 0x1;
-            klass.mRecordFlags = 0;
+            ESM::Class createdClass;
+            createdClass.mName = mCreateClassDialog->getName();
+            createdClass.mDescription = mCreateClassDialog->getDescription();
+            createdClass.mData.mSpecialization = mCreateClassDialog->getSpecializationId();
+            createdClass.mData.mIsPlayable = 0x1;
+            createdClass.mRecordFlags = 0;
 
             std::vector<ESM::RefId> attributes = mCreateClassDialog->getFavoriteAttributes();
-            assert(attributes.size() >= klass.mData.mAttribute.size());
-            for (size_t i = 0; i < klass.mData.mAttribute.size(); ++i)
-                klass.mData.mAttribute[i] = ESM::Attribute::refIdToIndex(attributes[i]);
+            assert(attributes.size() >= createdClass.mData.mAttribute.size());
+            for (size_t i = 0; i < createdClass.mData.mAttribute.size(); ++i)
+                createdClass.mData.mAttribute[i] = ESM::Attribute::refIdToIndex(attributes[i]);
 
             std::vector<ESM::RefId> majorSkills = mCreateClassDialog->getMajorSkills();
             std::vector<ESM::RefId> minorSkills = mCreateClassDialog->getMinorSkills();
-            assert(majorSkills.size() >= klass.mData.mSkills.size());
-            assert(minorSkills.size() >= klass.mData.mSkills.size());
-            for (size_t i = 0; i < klass.mData.mSkills.size(); ++i)
+            assert(majorSkills.size() >= createdClass.mData.mSkills.size());
+            assert(minorSkills.size() >= createdClass.mData.mSkills.size());
+            for (size_t i = 0; i < createdClass.mData.mSkills.size(); ++i)
             {
-                klass.mData.mSkills[i][1] = ESM::Skill::refIdToIndex(majorSkills[i]);
-                klass.mData.mSkills[i][0] = ESM::Skill::refIdToIndex(minorSkills[i]);
+                createdClass.mData.mSkills[i][1] = ESM::Skill::refIdToIndex(majorSkills[i]);
+                createdClass.mData.mSkills[i][0] = ESM::Skill::refIdToIndex(minorSkills[i]);
             }
 
-            MWBase::Environment::get().getMechanicsManager()->setPlayerClass(klass);
-            mPlayerClass = klass;
+            MWBase::Environment::get().getMechanicsManager()->setPlayerClass(createdClass);
+            mPlayerClass = std::move(createdClass);
 
             // Do not delete dialog, so that choices are remembered in case we want to go back and adjust them later
             mCreateClassDialog->setVisible(false);
@@ -666,9 +666,10 @@ namespace MWGui
 
         MWBase::Environment::get().getMechanicsManager()->setPlayerClass(mGenerateClass);
 
-        const ESM::Class* klass = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(mGenerateClass);
+        const ESM::Class* generatedClass
+            = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(mGenerateClass);
 
-        mPlayerClass = *klass;
+        mPlayerClass = *generatedClass;
     }
 
     void CharacterCreation::onGenerateClassBack()
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index f71da8bdf5..839f0f5072 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -4,6 +4,7 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_UString.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -20,7 +21,6 @@
 #include <components/vfs/manager.hpp>
 
 #include "tooltips.hpp"
-#include "ustring.hpp"
 
 namespace
 {
@@ -129,10 +129,10 @@ namespace MWGui
 
         if (shown)
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void PickClassDialog::onOpen()
@@ -248,27 +248,27 @@ namespace MWGui
         if (mCurrentClassId.empty())
             return;
         const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
-        const ESM::Class* klass = store.get<ESM::Class>().search(mCurrentClassId);
-        if (!klass)
+        const ESM::Class* currentClass = store.get<ESM::Class>().search(mCurrentClassId);
+        if (!currentClass)
             return;
 
         ESM::Class::Specialization specialization
-            = static_cast<ESM::Class::Specialization>(klass->mData.mSpecialization);
+            = static_cast<ESM::Class::Specialization>(currentClass->mData.mSpecialization);
 
         std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
             ESM::Class::sGmstSpecializationIds[specialization], ESM::Class::sGmstSpecializationIds[specialization]) };
         mSpecializationName->setCaption(specName);
         ToolTips::createSpecializationToolTip(mSpecializationName, specName, specialization);
 
-        mFavoriteAttribute[0]->setAttributeId(ESM::Attribute::indexToRefId(klass->mData.mAttribute[0]));
-        mFavoriteAttribute[1]->setAttributeId(ESM::Attribute::indexToRefId(klass->mData.mAttribute[1]));
+        mFavoriteAttribute[0]->setAttributeId(ESM::Attribute::indexToRefId(currentClass->mData.mAttribute[0]));
+        mFavoriteAttribute[1]->setAttributeId(ESM::Attribute::indexToRefId(currentClass->mData.mAttribute[1]));
         ToolTips::createAttributeToolTip(mFavoriteAttribute[0], mFavoriteAttribute[0]->getAttributeId());
         ToolTips::createAttributeToolTip(mFavoriteAttribute[1], mFavoriteAttribute[1]->getAttributeId());
 
-        for (size_t i = 0; i < klass->mData.mSkills.size(); ++i)
+        for (size_t i = 0; i < currentClass->mData.mSkills.size(); ++i)
         {
-            ESM::RefId minor = ESM::Skill::indexToRefId(klass->mData.mSkills[i][0]);
-            ESM::RefId major = ESM::Skill::indexToRefId(klass->mData.mSkills[i][1]);
+            ESM::RefId minor = ESM::Skill::indexToRefId(currentClass->mData.mSkills[i][0]);
+            ESM::RefId major = ESM::Skill::indexToRefId(currentClass->mData.mSkills[i][1]);
             mMinorSkill[i]->setSkillId(minor);
             mMajorSkill[i]->setSkillId(major);
             ToolTips::createSkillToolTip(mMinorSkill[i], minor);
@@ -546,10 +546,10 @@ namespace MWGui
 
         if (shown)
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     // widget controls
@@ -869,7 +869,7 @@ namespace MWGui
         getWidget(okButton, "OKButton");
         okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DescriptionDialog::onOkClicked);
         okButton->setCaption(
-            toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sInputMenu1", {})));
+            MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sInputMenu1", {})));
 
         // Make sure the edit box has focus
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp
index ff6cf2d5f7..240198eddc 100644
--- a/apps/openmw/mwgui/companionwindow.cpp
+++ b/apps/openmw/mwgui/companionwindow.cpp
@@ -71,7 +71,7 @@ namespace MWGui
 
         const ItemStack& item = mSortModel->getItem(index);
 
-        // We can't take conjured items from a companion NPC
+        // We can't take conjured items from a companion actor
         if (item.mFlags & ItemStack::Flag_Bound)
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sBarterDialog12}");
@@ -119,13 +119,13 @@ namespace MWGui
         }
     }
 
-    void CompanionWindow::setPtr(const MWWorld::Ptr& npc)
+    void CompanionWindow::setPtr(const MWWorld::Ptr& actor)
     {
-        if (npc.isEmpty() || npc.getType() != ESM::REC_NPC_)
+        if (actor.isEmpty() || !actor.getClass().isActor())
             throw std::runtime_error("Invalid argument in CompanionWindow::setPtr");
-        mPtr = npc;
+        mPtr = actor;
         updateEncumbranceBar();
-        auto model = std::make_unique<CompanionItemModel>(npc);
+        auto model = std::make_unique<CompanionItemModel>(actor);
         mModel = model.get();
         auto sortModel = std::make_unique<SortFilterItemModel>(std::move(model));
         mSortModel = sortModel.get();
@@ -133,7 +133,7 @@ namespace MWGui
         mItemView->setModel(std::move(sortModel));
         mItemView->resetScrollBars();
 
-        setTitle(npc.getClass().getName(npc));
+        setTitle(actor.getClass().getName(actor));
     }
 
     void CompanionWindow::onFrame(float dt)
diff --git a/apps/openmw/mwgui/companionwindow.hpp b/apps/openmw/mwgui/companionwindow.hpp
index c85044b472..97f3a0072e 100644
--- a/apps/openmw/mwgui/companionwindow.hpp
+++ b/apps/openmw/mwgui/companionwindow.hpp
@@ -26,7 +26,7 @@ namespace MWGui
 
         void resetReference() override;
 
-        void setPtr(const MWWorld::Ptr& npc) override;
+        void setPtr(const MWWorld::Ptr& actor) override;
         void onFrame(float dt) override;
         void clear() override { resetReference(); }
 
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index d4553b9664..a188f3c86b 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -9,7 +9,6 @@
 #include <fstream>
 #include <regex>
 
-#include <apps/openmw/mwgui/textcolours.hpp>
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
 #include <components/compiler/lineparser.hpp>
@@ -20,6 +19,8 @@
 #include <components/misc/utf8stream.hpp>
 #include <components/settings/values.hpp>
 
+#include "apps/openmw/mwgui/textcolours.hpp"
+
 #include "../mwscript/extensions.hpp"
 #include "../mwscript/interpretercontext.hpp"
 
@@ -439,7 +440,7 @@ namespace MWGui
         // If new search term reset position, otherwise continue from current position
         if (newSearchTerm != mCurrentSearchTerm)
         {
-            mCurrentSearchTerm = newSearchTerm;
+            mCurrentSearchTerm = std::move(newSearchTerm);
             mCurrentOccurrenceIndex = std::string::npos;
         }
 
@@ -770,11 +771,6 @@ namespace MWGui
         return output.append(matches.front());
     }
 
-    void Console::onResChange(int width, int height)
-    {
-        setCoord(10, 10, width - 10, height / 2);
-    }
-
     void Console::updateSelectedObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr)
     {
         if (mPtr == currentPtr)
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index 79d18847a4..2b6ecfc8ad 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -47,8 +47,6 @@ namespace MWGui
 
         void onOpen() override;
 
-        void onResChange(int width, int height) override;
-
         // Print a message to the console, in specified color.
         void print(const std::string& msg, std::string_view color = MWBase::WindowManager::sConsoleColor_Default);
 
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index ba4f7156c9..09b66672ba 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -7,6 +7,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/manualref.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -114,7 +115,8 @@ namespace MWGui
         MWWorld::ContainerStore& store = source.first.getClass().getContainerStore(source.first);
         if (item.mBase.getContainerStore() == &store)
             throw std::runtime_error("Item to copy needs to be from a different container!");
-        return *store.add(item.mBase.getCellRef().getRefId(), count, allowAutoEquip);
+        MWWorld::ManualRef newRef(*MWBase::Environment::get().getESMStore(), item.mBase, count);
+        return *store.add(newRef.getPtr(), count, allowAutoEquip);
     }
 
     void ContainerItemModel::removeItem(const ItemStack& item, size_t count)
@@ -129,7 +131,7 @@ namespace MWGui
             {
                 if (stacks(*it, item.mBase))
                 {
-                    int quantity = it->mRef->mData.getCount(false);
+                    int quantity = it->mRef->mRef.getCount(false);
                     // If this is a restocking quantity, just don't remove it
                     if (quantity < 0 && mTrading)
                         toRemove += quantity;
@@ -144,11 +146,11 @@ namespace MWGui
         {
             if (stacks(source, item.mBase))
             {
-                int refCount = source.getRefData().getCount();
+                int refCount = source.getCellRef().getCount();
                 if (refCount - toRemove <= 0)
                     MWBase::Environment::get().getWorld()->deleteObject(source);
                 else
-                    source.getRefData().setCount(std::max(0, refCount - toRemove));
+                    source.getCellRef().setCount(std::max(0, refCount - toRemove));
                 toRemove -= refCount;
                 if (toRemove <= 0)
                     return;
@@ -176,7 +178,7 @@ namespace MWGui
                     if (stacks(*it, itemStack.mBase))
                     {
                         // we already have an item stack of this kind, add to it
-                        itemStack.mCount += it->getRefData().getCount();
+                        itemStack.mCount += it->getCellRef().getCount();
                         found = true;
                         break;
                     }
@@ -185,7 +187,7 @@ namespace MWGui
                 if (!found)
                 {
                     // no stack yet, create one
-                    ItemStack newItem(*it, this, it->getRefData().getCount());
+                    ItemStack newItem(*it, this, it->getCellRef().getCount());
                     mItems.push_back(newItem);
                 }
             }
@@ -198,7 +200,7 @@ namespace MWGui
                 if (stacks(source, itemStack.mBase))
                 {
                     // we already have an item stack of this kind, add to it
-                    itemStack.mCount += source.getRefData().getCount();
+                    itemStack.mCount += source.getCellRef().getCount();
                     found = true;
                     break;
                 }
@@ -207,7 +209,7 @@ namespace MWGui
             if (!found)
             {
                 // no stack yet, create one
-                ItemStack newItem(source, this, source.getRefData().getCount());
+                ItemStack newItem(source, this, source.getCellRef().getCount());
                 mItems.push_back(newItem);
             }
         }
diff --git a/apps/openmw/mwgui/cursor.cpp b/apps/openmw/mwgui/cursor.cpp
index 7c95e2fd11..1b6431f0fb 100644
--- a/apps/openmw/mwgui/cursor.cpp
+++ b/apps/openmw/mwgui/cursor.cpp
@@ -23,8 +23,8 @@ namespace MWGui
         MyGUI::xml::ElementEnumerator info = _node->getElementEnumerator();
         while (info.next("Property"))
         {
-            const std::string& key = info->findAttribute("key");
-            const std::string& value = info->findAttribute("value");
+            auto key = info->findAttribute("key");
+            auto value = info->findAttribute("value");
 
             if (key == "Point")
                 mPoint = MyGUI::IntPoint::parse(value);
diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 5d3948e76d..59f695e7f8 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -129,6 +129,7 @@ namespace MWGui
     static std::mutex sBufferMutex;
     static int64_t sLogStartIndex;
     static int64_t sLogEndIndex;
+    static bool hasPrefix = false;
 
     void DebugWindow::startLogRecording()
     {
@@ -170,11 +171,17 @@ namespace MWGui
                     addChar(c);
                     if (c == '#')
                         addChar(c);
+                    if (c == '\n')
+                        hasPrefix = false;
                 }
             };
             for (char c : color)
                 addChar(c);
-            addShieldedStr(prefix);
+            if (!hasPrefix)
+            {
+                addShieldedStr(prefix);
+                hasPrefix = true;
+            }
             addShieldedStr(msg);
             if (bufferOverflow)
                 sLogStartIndex = (sLogEndIndex + 1) % bufSize;
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 4ab77c3956..6f154bb134 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -4,6 +4,7 @@
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_ScrollBar.h>
+#include <MyGUI_UString.h>
 #include <MyGUI_Window.h>
 
 #include <components/debug/debuglog.hpp>
@@ -22,9 +23,11 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "bookpage.hpp"
 #include "textcolours.hpp"
@@ -193,7 +196,7 @@ namespace MWGui
                 std::string topicName
                     = Misc::StringUtils::lowerCase(windowManager->getTranslationDataStorage().topicStandardForm(link));
 
-                std::string displayName = link;
+                std::string displayName = std::move(link);
                 while (displayName[displayName.size() - 1] == '*')
                     displayName.erase(displayName.size() - 1, 1);
 
@@ -245,7 +248,7 @@ namespace MWGui
                 i = match.mEnd;
             }
             if (i != text.end())
-                addTopicLink(typesetter, 0, i - text.begin(), text.size());
+                addTopicLink(std::move(typesetter), 0, i - text.begin(), text.size());
         }
     }
 
@@ -337,7 +340,7 @@ namespace MWGui
     void DialogueWindow::onTradeComplete()
     {
         MyGUI::UString message = MyGUI::LanguageManager::getInstance().replaceTags("#{sBarterDialog5}");
-        addResponse({}, message.asUTF8());
+        addResponse({}, message);
     }
 
     bool DialogueWindow::exit()
@@ -361,9 +364,8 @@ namespace MWGui
         if (mCurrentWindowSize == _sender->getSize())
             return;
 
-        mTopicsList->adjustSize();
+        redrawTopicsList();
         updateHistory();
-        updateTopicFormat();
         mCurrentWindowSize = _sender->getSize();
     }
 
@@ -531,6 +533,14 @@ namespace MWGui
         return true;
     }
 
+    void DialogueWindow::redrawTopicsList()
+    {
+        mTopicsList->adjustSize();
+
+        // The topics list has been regenerated so topic formatting needs to be updated
+        updateTopicFormat();
+    }
+
     void DialogueWindow::updateTopicsPane()
     {
         mTopicsList->clear();
@@ -588,11 +598,9 @@ namespace MWGui
             t->eventTopicActivated += MyGUI::newDelegate(this, &DialogueWindow::onTopicActivated);
             mTopicLinks[topicId] = std::move(t);
         }
-        mTopicsList->adjustSize();
 
+        redrawTopicsList();
         updateHistory();
-        // The topics list has been regenerated so topic formatting needs to be updated
-        updateTopicFormat();
     }
 
     void DialogueWindow::updateHistory(bool scrollbar)
@@ -735,6 +743,15 @@ namespace MWGui
         bool dispositionVisible = false;
         if (!mPtr.isEmpty() && mPtr.getClass().isNpc())
         {
+            // If actor was a witness to a crime which was payed off,
+            // restore original disposition immediately.
+            MWMechanics::NpcStats& npcStats = mPtr.getClass().getNpcStats(mPtr);
+            if (npcStats.getCrimeId() != -1 && npcStats.getCrimeDispositionModifier() != 0)
+            {
+                if (npcStats.getCrimeId() <= MWBase::Environment::get().getWorld()->getPlayer().getCrimeId())
+                    npcStats.setCrimeDispositionModifier(0);
+            }
+
             dispositionVisible = true;
             mDispositionBar->setProgressRange(100);
             mDispositionBar->setProgressPosition(
@@ -744,21 +761,12 @@ namespace MWGui
                 + std::string("/100"));
         }
 
-        bool dispositionWasVisible = mDispositionBar->getVisible();
-
-        if (dispositionVisible && !dispositionWasVisible)
+        if (mDispositionBar->getVisible() != dispositionVisible)
         {
-            mDispositionBar->setVisible(true);
-            int offset = mDispositionBar->getHeight() + 5;
+            mDispositionBar->setVisible(dispositionVisible);
+            const int offset = (mDispositionBar->getHeight() + 5) * (dispositionVisible ? 1 : -1);
             mTopicsList->setCoord(mTopicsList->getCoord() + MyGUI::IntCoord(0, offset, 0, -offset));
-            mTopicsList->adjustSize();
-        }
-        else if (!dispositionVisible && dispositionWasVisible)
-        {
-            mDispositionBar->setVisible(false);
-            int offset = mDispositionBar->getHeight() + 5;
-            mTopicsList->setCoord(mTopicsList->getCoord() - MyGUI::IntCoord(0, offset, 0, -offset));
-            mTopicsList->adjustSize();
+            redrawTopicsList();
         }
     }
 
@@ -786,18 +794,34 @@ namespace MWGui
         if (!Settings::gui().mColorTopicEnable)
             return;
 
-        const MyGUI::Colour& specialColour = Settings::gui().mColorTopicSpecific;
-        const MyGUI::Colour& oldColour = Settings::gui().mColorTopicExhausted;
-
         for (const std::string& keyword : mKeywords)
         {
             int flag = MWBase::Environment::get().getDialogueManager()->getTopicFlag(ESM::RefId::stringRefId(keyword));
             MyGUI::Button* button = mTopicsList->getItemWidget(keyword);
+            const auto oldCaption = button->getCaption();
+            const MyGUI::IntSize oldSize = button->getSize();
 
+            bool changed = false;
             if (flag & MWBase::DialogueManager::TopicType::Specific)
-                button->getSubWidgetText()->setTextColour(specialColour);
+            {
+                button->changeWidgetSkin("MW_ListLine_Specific");
+                changed = true;
+            }
             else if (flag & MWBase::DialogueManager::TopicType::Exhausted)
-                button->getSubWidgetText()->setTextColour(oldColour);
+            {
+                button->changeWidgetSkin("MW_ListLine_Exhausted");
+                changed = true;
+            }
+
+            if (changed)
+            {
+                button->setCaption(oldCaption);
+                button->setTextAlign(MyGUI::Align::Left);
+                MyGUI::ISubWidgetText* text = button->getSubWidgetText();
+                if (text != nullptr)
+                    text->setWordWrap(true);
+                button->setSize(oldSize);
+            }
         }
     }
 
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 1b79cadca5..8a8b309401 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -190,6 +190,7 @@ namespace MWGui
         void updateDisposition();
         void restock();
         void deleteLater();
+        void redrawTopicsList();
 
         bool mIsCompanion;
         std::list<std::string> mKeywords;
diff --git a/apps/openmw/mwgui/draganddrop.cpp b/apps/openmw/mwgui/draganddrop.cpp
index c99e97e37d..0fa2cc4e21 100644
--- a/apps/openmw/mwgui/draganddrop.cpp
+++ b/apps/openmw/mwgui/draganddrop.cpp
@@ -126,7 +126,7 @@ namespace MWGui
 
     void DragAndDrop::onFrame()
     {
-        if (mIsOnDragAndDrop && mItem.mBase.getRefData().getCount() == 0)
+        if (mIsOnDragAndDrop && mItem.mBase.getCellRef().getCount() == 0)
             finish();
     }
 
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index e70599697a..af4a3e8ce3 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_UString.h>
 
 #include <components/misc/strings/format.hpp>
 #include <components/settings/values.hpp>
@@ -26,7 +27,6 @@
 #include "itemwidget.hpp"
 
 #include "sortfilteritemmodel.hpp"
-#include "ustring.hpp"
 
 namespace MWGui
 {
@@ -95,7 +95,7 @@ namespace MWGui
         else
         {
             std::string_view name = item.getClass().getName(item);
-            mName->setCaption(toUString(name));
+            mName->setCaption(MyGUI::UString(name));
             mItemBox->setItem(item);
             mItemBox->setUserString("ToolTipType", "ItemPtr");
             mItemBox->setUserData(MWWorld::Ptr(item));
@@ -115,23 +115,26 @@ namespace MWGui
         switch (mEnchanting.getCastStyle())
         {
             case ESM::Enchantment::CastOnce:
-                mTypeButton->setCaption(toUString(
+                mTypeButton->setCaption(MyGUI::UString(
                     MWBase::Environment::get().getWindowManager()->getGameSettingString("sItemCastOnce", "Cast Once")));
                 setConstantEffect(false);
                 break;
             case ESM::Enchantment::WhenStrikes:
-                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
-                    "sItemCastWhenStrikes", "When Strikes")));
+                mTypeButton->setCaption(
+                    MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                        "sItemCastWhenStrikes", "When Strikes")));
                 setConstantEffect(false);
                 break;
             case ESM::Enchantment::WhenUsed:
-                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
-                    "sItemCastWhenUsed", "When Used")));
+                mTypeButton->setCaption(
+                    MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                        "sItemCastWhenUsed", "When Used")));
                 setConstantEffect(false);
                 break;
             case ESM::Enchantment::ConstantEffect:
-                mTypeButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
-                    "sItemCastConstant", "Cast Constant")));
+                mTypeButton->setCaption(
+                    MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString(
+                        "sItemCastConstant", "Cast Constant")));
                 setConstantEffect(true);
                 break;
         }
@@ -270,7 +273,7 @@ namespace MWGui
 
     void EnchantingDialog::notifyEffectsChanged()
     {
-        mEffectList.mList = mEffects;
+        mEffectList.populate(mEffects);
         mEnchanting.setEffect(mEffectList);
         updateLabels();
     }
@@ -370,7 +373,7 @@ namespace MWGui
         {
             MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("enchant fail"));
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage34}");
-            if (!mEnchanting.getGem().isEmpty() && !mEnchanting.getGem().getRefData().getCount())
+            if (!mEnchanting.getGem().isEmpty() && !mEnchanting.getGem().getCellRef().getCount())
             {
                 setSoulGem(MWWorld::Ptr());
                 mEnchanting.nextCastStyle();
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 8479379976..b2d9415897 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -23,7 +23,7 @@
 namespace MWGui::Formatting
 {
     /* BookTextParser */
-    BookTextParser::BookTextParser(const std::string& text)
+    BookTextParser::BookTextParser(const std::string& text, bool shrinkTextAtLastTag)
         : mIndex(0)
         , mText(text)
         , mIgnoreNewlineTags(true)
@@ -36,20 +36,25 @@ namespace MWGui::Formatting
 
         Misc::StringUtils::replaceAll(mText, "\r", {});
 
-        // vanilla game does not show any text after the last EOL tag.
-        const std::string lowerText = Misc::StringUtils::lowerCase(mText);
-        size_t brIndex = lowerText.rfind("<br>");
-        size_t pIndex = lowerText.rfind("<p>");
-        mPlainTextEnd = 0;
-        if (brIndex != pIndex)
+        if (shrinkTextAtLastTag)
         {
-            if (brIndex != std::string::npos && pIndex != std::string::npos)
-                mPlainTextEnd = std::max(brIndex, pIndex);
-            else if (brIndex != std::string::npos)
-                mPlainTextEnd = brIndex;
-            else
-                mPlainTextEnd = pIndex;
+            // vanilla game does not show any text after the last EOL tag.
+            const std::string lowerText = Misc::StringUtils::lowerCase(mText);
+            size_t brIndex = lowerText.rfind("<br>");
+            size_t pIndex = lowerText.rfind("<p>");
+            mPlainTextEnd = 0;
+            if (brIndex != pIndex)
+            {
+                if (brIndex != std::string::npos && pIndex != std::string::npos)
+                    mPlainTextEnd = std::max(brIndex, pIndex);
+                else if (brIndex != std::string::npos)
+                    mPlainTextEnd = brIndex;
+                else
+                    mPlainTextEnd = pIndex;
+            }
         }
+        else
+            mPlainTextEnd = mText.size();
 
         registerTag("br", Event_BrTag);
         registerTag("p", Event_PTag);
@@ -73,6 +78,17 @@ namespace MWGui::Formatting
         while (mIndex < mText.size())
         {
             char ch = mText[mIndex];
+            if (ch == '[')
+            {
+                constexpr std::string_view pageBreakTag = "[pagebreak]\n";
+                if (std::string_view(mText.data() + mIndex, mText.size() - mIndex).starts_with(pageBreakTag))
+                {
+                    mIndex += pageBreakTag.size();
+                    flushBuffer();
+                    mIgnoreNewlineTags = false;
+                    return Event_PageBreak;
+                }
+            }
             if (ch == '<')
             {
                 const size_t tagStart = mIndex + 1;
@@ -98,6 +114,8 @@ namespace MWGui::Formatting
                             }
                         }
                         mIgnoreLineEndings = true;
+                        if (type == Event_PTag && !mAttributes.empty())
+                            flushBuffer();
                     }
                     else
                         flushBuffer();
@@ -180,9 +198,9 @@ namespace MWGui::Formatting
             if (tag.empty())
                 return;
 
-            if (tag[0] == '"')
+            if (tag[0] == '"' || tag[0] == '\'')
             {
-                size_t quoteEndPos = tag.find('"', 1);
+                size_t quoteEndPos = tag.find(tag[0], 1);
                 if (quoteEndPos == std::string::npos)
                     throw std::runtime_error("BookTextParser Error: Missing end quote in tag");
                 value = tag.substr(1, quoteEndPos - 1);
@@ -203,13 +221,13 @@ namespace MWGui::Formatting
                 }
             }
 
-            mAttributes[key] = value;
+            mAttributes[key] = std::move(value);
         }
     }
 
     /* BookFormatter */
-    Paginator::Pages BookFormatter::markupToWidget(
-        MyGUI::Widget* parent, const std::string& markup, const int pageWidth, const int pageHeight)
+    Paginator::Pages BookFormatter::markupToWidget(MyGUI::Widget* parent, const std::string& markup,
+        const int pageWidth, const int pageHeight, bool shrinkTextAtLastTag)
     {
         Paginator pag(pageWidth, pageHeight);
 
@@ -225,14 +243,16 @@ namespace MWGui::Formatting
             MyGUI::IntCoord(0, 0, pag.getPageWidth(), pag.getPageHeight()), MyGUI::Align::Left | MyGUI::Align::Top);
         paper->setNeedMouseFocus(false);
 
-        BookTextParser parser(markup);
+        BookTextParser parser(markup, shrinkTextAtLastTag);
 
         bool brBeforeLastTag = false;
         bool isPrevImg = false;
+        bool inlineImageInserted = false;
         for (;;)
         {
             BookTextParser::Events event = parser.next();
-            if (event == BookTextParser::Event_BrTag || event == BookTextParser::Event_PTag)
+            if (event == BookTextParser::Event_BrTag
+                || (event == BookTextParser::Event_PTag && parser.getAttributes().empty()))
                 continue;
 
             std::string plainText = parser.getReadyText();
@@ -272,6 +292,12 @@ namespace MWGui::Formatting
 
                 if (!plainText.empty() || brBeforeLastTag || isPrevImg)
                 {
+                    if (inlineImageInserted)
+                    {
+                        pag.setCurrentTop(pag.getCurrentTop() - mTextStyle.mTextSize);
+                        plainText = "        " + plainText;
+                        inlineImageInserted = false;
+                    }
                     TextElement elem(paper, pag, mBlockStyle, mTextStyle, plainText);
                     elem.paginate();
                 }
@@ -286,6 +312,10 @@ namespace MWGui::Formatting
 
             switch (event)
             {
+                case BookTextParser::Event_PageBreak:
+                    pag << Paginator::Page(pag.getStartTop(), pag.getCurrentTop());
+                    pag.setStartTop(pag.getCurrentTop());
+                    break;
                 case BookTextParser::Event_ImgTag:
                 {
                     const BookTextParser::Attributes& attr = parser.getAttributes();
@@ -293,22 +323,38 @@ namespace MWGui::Formatting
                     auto srcIt = attr.find("src");
                     if (srcIt == attr.end())
                         continue;
-                    auto widthIt = attr.find("width");
-                    if (widthIt == attr.end())
-                        continue;
-                    auto heightIt = attr.find("height");
-                    if (heightIt == attr.end())
-                        continue;
+                    int width = 0;
+                    if (auto widthIt = attr.find("width"); widthIt != attr.end())
+                        width = MyGUI::utility::parseInt(widthIt->second);
+                    int height = 0;
+                    if (auto heightIt = attr.find("height"); heightIt != attr.end())
+                        height = MyGUI::utility::parseInt(heightIt->second);
 
                     const std::string& src = srcIt->second;
-                    int width = MyGUI::utility::parseInt(widthIt->second);
-                    int height = MyGUI::utility::parseInt(heightIt->second);
-
                     auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                    std::string correctedSrc = Misc::ResourceHelpers::correctBookartPath(src, width, height, vfs);
-                    bool exists = vfs->exists(correctedSrc);
 
-                    if (!exists)
+                    std::string correctedSrc;
+
+                    constexpr std::string_view imgPrefix = "img://";
+                    if (src.starts_with(imgPrefix))
+                    {
+                        correctedSrc = src.substr(imgPrefix.size(), src.size() - imgPrefix.size());
+                        if (width == 0)
+                        {
+                            width = 50;
+                            inlineImageInserted = true;
+                        }
+                        if (height == 0)
+                            height = 50;
+                    }
+                    else
+                    {
+                        if (width == 0 || height == 0)
+                            continue;
+                        correctedSrc = Misc::ResourceHelpers::correctBookartPath(src, width, height, vfs);
+                    }
+
+                    if (!vfs->exists(correctedSrc))
                     {
                         Log(Debug::Warning) << "Warning: Could not find \"" << src << "\" referenced by an <img> tag.";
                         break;
@@ -326,6 +372,7 @@ namespace MWGui::Formatting
                     else
                         handleFont(parser.getAttributes());
                     break;
+                case BookTextParser::Event_PTag:
                 case BookTextParser::Event_DivTag:
                     handleDiv(parser.getAttributes());
                     break;
@@ -343,9 +390,10 @@ namespace MWGui::Formatting
         return pag.getPages();
     }
 
-    Paginator::Pages BookFormatter::markupToWidget(MyGUI::Widget* parent, const std::string& markup)
+    Paginator::Pages BookFormatter::markupToWidget(
+        MyGUI::Widget* parent, const std::string& markup, bool shrinkTextAtLastTag)
     {
-        return markupToWidget(parent, markup, parent->getWidth(), parent->getHeight());
+        return markupToWidget(parent, markup, parent->getWidth(), parent->getHeight(), shrinkTextAtLastTag);
     }
 
     void BookFormatter::resetFontProperties()
diff --git a/apps/openmw/mwgui/formatting.hpp b/apps/openmw/mwgui/formatting.hpp
index 421bda6f1d..9a215b200b 100644
--- a/apps/openmw/mwgui/formatting.hpp
+++ b/apps/openmw/mwgui/formatting.hpp
@@ -46,10 +46,11 @@ namespace MWGui
                 Event_PTag,
                 Event_ImgTag,
                 Event_DivTag,
-                Event_FontTag
+                Event_FontTag,
+                Event_PageBreak,
             };
 
-            BookTextParser(const std::string& text);
+            BookTextParser(const std::string& text, bool shrinkTextAtLastTag);
 
             Events next();
 
@@ -120,9 +121,9 @@ namespace MWGui
         class BookFormatter
         {
         public:
-            Paginator::Pages markupToWidget(
-                MyGUI::Widget* parent, const std::string& markup, const int pageWidth, const int pageHeight);
-            Paginator::Pages markupToWidget(MyGUI::Widget* parent, const std::string& markup);
+            Paginator::Pages markupToWidget(MyGUI::Widget* parent, const std::string& markup, const int pageWidth,
+                const int pageHeight, bool shrinkTextAtLastTag);
+            Paginator::Pages markupToWidget(MyGUI::Widget* parent, const std::string& markup, bool shrinkTextAtLastTag);
 
         private:
             void resetFontProperties();
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index d6eb07e8aa..0a37c93b4f 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -421,18 +421,23 @@ namespace MWGui
 
         mSpellBox->setUserString("ToolTipType", "Spell");
         mSpellBox->setUserString("Spell", spellId.serialize());
+        mSpellBox->setUserData(MyGUI::Any::Null);
 
-        // use the icon of the first effect
-        const ESM::MagicEffect* effect = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(
-            spell->mEffects.mList.front().mEffectID);
-
-        std::string icon = effect->mIcon;
-        std::replace(icon.begin(), icon.end(), '/', '\\');
-        int slashPos = icon.rfind('\\');
-        icon.insert(slashPos + 1, "b_");
-        icon = Misc::ResourceHelpers::correctIconPath(icon, MWBase::Environment::get().getResourceSystem()->getVFS());
-
-        mSpellImage->setSpellIcon(icon);
+        if (!spell->mEffects.mList.empty())
+        {
+            // use the icon of the first effect
+            const ESM::MagicEffect* effect = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(
+                spell->mEffects.mList.front().mData.mEffectID);
+            std::string icon = effect->mIcon;
+            std::replace(icon.begin(), icon.end(), '/', '\\');
+            size_t slashPos = icon.rfind('\\');
+            icon.insert(slashPos + 1, "b_");
+            icon = Misc::ResourceHelpers::correctIconPath(
+                icon, MWBase::Environment::get().getResourceSystem()->getVFS());
+            mSpellImage->setSpellIcon(icon);
+        }
+        else
+            mSpellImage->setSpellIcon({});
     }
 
     void HUD::setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent)
@@ -491,6 +496,7 @@ namespace MWGui
         mSpellStatus->setProgressPosition(0);
         mSpellImage->setItem(MWWorld::Ptr());
         mSpellBox->clearUserStrings();
+        mSpellBox->setUserData(MyGUI::Any::Null);
     }
 
     void HUD::unsetSelectedWeapon()
@@ -520,6 +526,7 @@ namespace MWGui
         mWeapBox->setUserString("ToolTipLayout", "HandToHandToolTip");
         mWeapBox->setUserString("Caption_HandToHandText", itemName);
         mWeapBox->setUserString("ImageTexture_HandToHandImage", icon);
+        mWeapBox->setUserData(MyGUI::Any::Null);
     }
 
     void HUD::setCrosshairVisible(bool visible)
@@ -650,17 +657,31 @@ namespace MWGui
         updateEnemyHealthBar();
     }
 
-    void HUD::resetEnemy()
+    void HUD::clear()
     {
         mEnemyActorId = -1;
         mEnemyHealthTimer = -1;
-    }
 
-    void HUD::clear()
-    {
-        unsetSelectedSpell();
-        unsetSelectedWeapon();
-        resetEnemy();
+        mWeaponSpellTimer = 0.f;
+        mWeaponName = std::string();
+        mSpellName = std::string();
+        mWeaponSpellBox->setVisible(false);
+
+        mWeapStatus->setProgressRange(100);
+        mWeapStatus->setProgressPosition(0);
+        mSpellStatus->setProgressRange(100);
+        mSpellStatus->setProgressPosition(0);
+
+        mWeapImage->setItem(MWWorld::Ptr());
+        mSpellImage->setItem(MWWorld::Ptr());
+
+        mWeapBox->clearUserStrings();
+        mWeapBox->setUserData(MyGUI::Any::Null);
+        mSpellBox->clearUserStrings();
+        mSpellBox->setUserData(MyGUI::Any::Null);
+
+        mActiveCell = nullptr;
+        mHasALastActiveCell = false;
     }
 
     void HUD::customMarkerCreated(MyGUI::Widget* marker)
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index 1dd9cdb521..8dd98628c4 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -58,7 +58,6 @@ namespace MWGui
         MyGUI::Widget* getEffectBox() { return mEffectBox; }
 
         void setEnemy(const MWWorld::Ptr& enemy);
-        void resetEnemy();
 
         void clear() override;
 
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index e20637d58c..7464290947 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/manualref.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -57,8 +58,9 @@ namespace MWGui
     {
         if (item.mBase.getContainerStore() == &mActor.getClass().getContainerStore(mActor))
             throw std::runtime_error("Item to copy needs to be from a different container!");
-        return *mActor.getClass().getContainerStore(mActor).add(
-            item.mBase.getCellRef().getRefId(), count, allowAutoEquip);
+
+        MWWorld::ManualRef newRef(*MWBase::Environment::get().getESMStore(), item.mBase, count);
+        return *mActor.getClass().getContainerStore(mActor).add(newRef.getPtr(), count, allowAutoEquip);
     }
 
     void InventoryItemModel::removeItem(const ItemStack& item, size_t count)
@@ -115,7 +117,7 @@ namespace MWGui
             if (!item.getClass().showsInInventory(item))
                 continue;
 
-            ItemStack newItem(item, this, item.getRefData().getCount());
+            ItemStack newItem(item, this, item.getCellRef().getCount());
 
             if (mActor.getClass().hasInventoryStore(mActor))
             {
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 9ae9ecf2b0..a773b4635b 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -19,6 +19,7 @@
 #include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
@@ -416,6 +417,8 @@ namespace MWGui
 
     void InventoryWindow::onWindowResize(MyGUI::Window* _sender)
     {
+        WindowBase::clampWindowCoordinates(_sender);
+
         adjustPanes();
         const WindowSettingValues settings = getModeSettings(mGuiMode);
 
@@ -439,6 +442,9 @@ namespace MWGui
 
     void InventoryWindow::updateArmorRating()
     {
+        if (mPtr.isEmpty())
+            return;
+
         mArmorRating->setCaptionWithReplacing(
             "#{sArmor}: " + MyGUI::utility::toString(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
         if (mArmorRating->getTextSize().width > mArmorRating->getSize().width)
@@ -555,6 +561,20 @@ namespace MWGui
         std::unique_ptr<MWWorld::Action> action = ptr.getClass().use(ptr, force);
         action->execute(player);
 
+        // Handles partial equipping (final part)
+        if (mEquippedStackableCount.has_value())
+        {
+            // the count to unequip
+            int count = ptr.getCellRef().getCount() - mDragAndDrop->mDraggedCount - mEquippedStackableCount.value();
+            if (count > 0)
+            {
+                MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
+                invStore.unequipItemQuantity(ptr, count);
+                updateItemView();
+            }
+            mEquippedStackableCount.reset();
+        }
+
         if (isVisible())
         {
             mItemView->update();
@@ -580,27 +600,21 @@ namespace MWGui
             }
 
             // Handles partial equipping
-            const std::pair<std::vector<int>, bool> slots = ptr.getClass().getEquipmentSlots(ptr);
+            mEquippedStackableCount.reset();
+            const auto slots = ptr.getClass().getEquipmentSlots(ptr);
             if (!slots.first.empty() && slots.second)
             {
-                int equippedStackableCount = 0;
                 MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
                 MWWorld::ConstContainerStoreIterator slotIt = invStore.getSlot(slots.first.front());
 
-                // Get the count before useItem()
+                // Save the currently equipped count before useItem()
                 if (slotIt != invStore.end() && slotIt->getCellRef().getRefId() == ptr.getCellRef().getRefId())
-                    equippedStackableCount = slotIt->getRefData().getCount();
-
-                useItem(ptr);
-                int unequipCount = ptr.getRefData().getCount() - mDragAndDrop->mDraggedCount - equippedStackableCount;
-                if (unequipCount > 0)
-                {
-                    invStore.unequipItemQuantity(ptr, unequipCount);
-                    updateItemView();
-                }
+                    mEquippedStackableCount = slotIt->getCellRef().getCount();
+                else
+                    mEquippedStackableCount = 0;
             }
-            else
-                useItem(ptr);
+
+            MWBase::Environment::get().getLuaManager()->useItem(ptr, MWMechanics::getPlayer(), false);
 
             // If item is ingredient or potion don't stop drag and drop to simplify action of taking more than one 1
             // item
@@ -726,7 +740,7 @@ namespace MWGui
         if (!object.getClass().hasToolTip(object))
             return;
 
-        int count = object.getRefData().getCount();
+        int count = object.getCellRef().getCount();
         if (object.getClass().isGold(object))
             count *= object.getClass().getValue(object);
 
@@ -738,16 +752,14 @@ namespace MWGui
 
         // Player must not be paralyzed, knocked down, or dead to pick up an item.
         const MWMechanics::NpcStats& playerStats = player.getClass().getNpcStats(player);
-        bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
-        if ((!godmode && playerStats.isParalyzed()) || playerStats.getKnockedDown() || playerStats.isDead())
+        if (playerStats.isParalyzed() || playerStats.getKnockedDown() || playerStats.isDead())
             return;
 
         MWBase::Environment::get().getMechanicsManager()->itemTaken(player, object, MWWorld::Ptr(), count);
 
         // add to player inventory
         // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
-        MWWorld::Ptr newObject
-            = *player.getClass().getContainerStore(player).add(object, object.getRefData().getCount());
+        MWWorld::Ptr newObject = *player.getClass().getContainerStore(player).add(object, count);
 
         // remove from world
         MWBase::Environment::get().getWorld()->deleteObject(object);
@@ -779,8 +791,7 @@ namespace MWGui
             return;
 
         const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
-        bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
-        if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead() || stats.getHitRecovery())
+        if (stats.isParalyzed() || stats.getKnockedDown() || stats.isDead() || stats.getHitRecovery())
             return;
 
         ItemModel::ModelIndex selected = -1;
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index f3d8e3dcd6..9fc77ceec5 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -74,6 +74,7 @@ namespace MWGui
         DragAndDrop* mDragAndDrop;
 
         int mSelectedItem;
+        std::optional<int> mEquippedStackableCount;
 
         MWWorld::Ptr mPtr;
 
diff --git a/apps/openmw/mwgui/itemchargeview.cpp b/apps/openmw/mwgui/itemchargeview.cpp
index 92fff6f873..02c3cc182c 100644
--- a/apps/openmw/mwgui/itemchargeview.cpp
+++ b/apps/openmw/mwgui/itemchargeview.cpp
@@ -6,6 +6,7 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadench.hpp>
 
@@ -18,7 +19,6 @@
 
 #include "itemmodel.hpp"
 #include "itemwidget.hpp"
-#include "ustring.hpp"
 
 namespace MWGui
 {
@@ -128,6 +128,11 @@ namespace MWGui
 
         mLines.swap(lines);
 
+        std::stable_sort(mLines.begin(), mLines.end(),
+            [](const MWGui::ItemChargeView::Line& a, const MWGui::ItemChargeView::Line& b) {
+                return Misc::StringUtils::ciLess(a.mText->getCaption(), b.mText->getCaption());
+            });
+
         layoutWidgets();
     }
 
@@ -177,7 +182,7 @@ namespace MWGui
     void ItemChargeView::updateLine(const ItemChargeView::Line& line)
     {
         std::string_view name = line.mItemPtr.getClass().getName(line.mItemPtr);
-        line.mText->setCaption(toUString(name));
+        line.mText->setCaption(MyGUI::UString(name));
 
         line.mCharge->setVisible(false);
         switch (mDisplayMode)
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 4bdd2399fe..a4cf48fcbe 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -58,7 +58,7 @@ namespace MWGui
     MWWorld::Ptr ItemModel::moveItem(const ItemStack& item, size_t count, ItemModel* otherModel, bool allowAutoEquip)
     {
         MWWorld::Ptr ret = MWWorld::Ptr();
-        if (static_cast<size_t>(item.mBase.getRefData().getCount()) <= count)
+        if (static_cast<size_t>(item.mBase.getCellRef().getCount()) <= count)
         {
             // We are moving the full stack
             ret = otherModel->addItem(item, count, allowAutoEquip);
diff --git a/apps/openmw/mwgui/itemselection.hpp b/apps/openmw/mwgui/itemselection.hpp
index 78f865bb55..fe87d7e38a 100644
--- a/apps/openmw/mwgui/itemselection.hpp
+++ b/apps/openmw/mwgui/itemselection.hpp
@@ -32,6 +32,8 @@ namespace MWGui
         void setCategory(int category);
         void setFilter(int filter);
 
+        SortFilterItemModel* getSortModel() { return mSortModel; }
+
     private:
         ItemView* mItemView;
         SortFilterItemModel* mSortModel;
diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index 5ee74c6e87..05fff2d40f 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -202,7 +202,7 @@ namespace MWGui
         setIcon(ptr);
     }
 
-    void SpellWidget::setSpellIcon(const std::string& icon)
+    void SpellWidget::setSpellIcon(std::string_view icon)
     {
         if (mFrame && !mCurrentFrame.empty())
         {
diff --git a/apps/openmw/mwgui/itemwidget.hpp b/apps/openmw/mwgui/itemwidget.hpp
index 29b0063203..63837ae92f 100644
--- a/apps/openmw/mwgui/itemwidget.hpp
+++ b/apps/openmw/mwgui/itemwidget.hpp
@@ -58,7 +58,7 @@ namespace MWGui
     {
         MYGUI_RTTI_DERIVED(SpellWidget)
     public:
-        void setSpellIcon(const std::string& icon);
+        void setSpellIcon(std::string_view icon);
     };
 
 }
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 0cc5a00831..574c425d3e 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -126,7 +126,7 @@ namespace
                 MWGui::BookPage::ClickCallback callback = [this](intptr_t linkId) { notifyTopicClicked(linkId); };
 
                 getPage(LeftBookPage)->adviseLinkClicked(callback);
-                getPage(RightBookPage)->adviseLinkClicked(callback);
+                getPage(RightBookPage)->adviseLinkClicked(std::move(callback));
 
                 getPage(LeftBookPage)->eventMouseWheel
                     += MyGUI::newDelegate(this, &JournalWindowImpl::notifyMouseWheel);
@@ -140,7 +140,7 @@ namespace
 
                 getPage(LeftTopicIndex)->adviseLinkClicked(callback);
                 getPage(CenterTopicIndex)->adviseLinkClicked(callback);
-                getPage(RightTopicIndex)->adviseLinkClicked(callback);
+                getPage(RightTopicIndex)->adviseLinkClicked(std::move(callback));
             }
 
             adjustButton(PrevPageBTN);
@@ -376,7 +376,7 @@ namespace
             setVisible(PageTwoNum, relPages > 1);
 
             getPage(LeftBookPage)->showPage((relPages > 0) ? book : Book(), page + 0);
-            getPage(RightBookPage)->showPage((relPages > 0) ? book : Book(), page + 1);
+            getPage(RightBookPage)->showPage((relPages > 0) ? std::move(book) : Book(), page + 1);
 
             setText(PageOneNum, page + 1);
             setText(PageTwoNum, page + 2);
diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index a8fb52c95e..9d4971951a 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -183,6 +183,10 @@ namespace MWGui
                 return switchFocus(D_Down, false);
             case MyGUI::KeyCode::Tab:
                 return switchFocus(MyGUI::InputManager::getInstance().isShiftPressed() ? D_Prev : D_Next, true);
+            case MyGUI::KeyCode::Period:
+                return switchFocus(D_Prev, true);
+            case MyGUI::KeyCode::Slash:
+                return switchFocus(D_Next, true);
             case MyGUI::KeyCode::Return:
             case MyGUI::KeyCode::NumpadEnter:
             case MyGUI::KeyCode::Space:
@@ -242,12 +246,12 @@ namespace MWGui
 
         bool forward = (direction == D_Next || direction == D_Right || direction == D_Down);
 
-        int index = found - keyFocusList.begin();
+        std::ptrdiff_t index{ found - keyFocusList.begin() };
         index = forward ? (index + 1) : (index - 1);
         if (wrap)
             index = (index + keyFocusList.size()) % keyFocusList.size();
         else
-            index = std::clamp<int>(index, 0, keyFocusList.size() - 1);
+            index = std::clamp<std::ptrdiff_t>(index, 0, keyFocusList.size() - 1);
 
         MyGUI::Widget* next = keyFocusList[index];
         int vertdiff = next->getTop() - focus->getTop();
diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp
index fb0fb5e1c5..8d70bc956b 100644
--- a/apps/openmw/mwgui/layout.cpp
+++ b/apps/openmw/mwgui/layout.cpp
@@ -3,11 +3,10 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_LayoutManager.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
 #include <MyGUI_Widget.h>
 #include <MyGUI_Window.h>
 
-#include "ustring.hpp"
-
 namespace MWGui
 {
     void Layout::initialise(std::string_view _layout)
@@ -52,16 +51,15 @@ namespace MWGui
     {
         MyGUI::Widget* pt;
         getWidget(pt, name);
-        static_cast<MyGUI::TextBox*>(pt)->setCaption(toUString(caption));
+        static_cast<MyGUI::TextBox*>(pt)->setCaption(MyGUI::UString(caption));
     }
 
     void Layout::setTitle(std::string_view title)
     {
         MyGUI::Window* window = static_cast<MyGUI::Window*>(mMainWidget);
-        MyGUI::UString uTitle = toUString(title);
 
-        if (window->getCaption() != uTitle)
-            window->setCaptionWithReplacing(uTitle);
+        if (window->getCaption() != title)
+            window->setCaptionWithReplacing(MyGUI::UString(title));
     }
 
     MyGUI::Widget* Layout::getWidget(std::string_view _name)
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index b13fdbeeb9..87f2db55a5 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
 
 #include <components/fallback/fallback.hpp>
 #include <components/widgets/box.hpp>
@@ -21,8 +22,9 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "class.hpp"
-#include "ustring.hpp"
 
 namespace
 {
@@ -164,8 +166,10 @@ namespace MWGui
         const MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
         setClassImage(mClassImage,
-            ESM::RefId::stringRefId(getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(0),
-                pcStats.getSkillIncreasesForSpecialization(1), pcStats.getSkillIncreasesForSpecialization(2))));
+            ESM::RefId::stringRefId(
+                getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(ESM::Class::Specialization::Combat),
+                    pcStats.getSkillIncreasesForSpecialization(ESM::Class::Specialization::Magic),
+                    pcStats.getSkillIncreasesForSpecialization(ESM::Class::Specialization::Stealth))));
 
         int level = creatureStats.getLevel() + 1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level));
@@ -176,7 +180,7 @@ namespace MWGui
         if (levelupdescription.empty())
             levelupdescription = Fallback::Map::getString("Level_Up_Default");
 
-        mLevelDescription->setCaption(toUString(levelupdescription));
+        mLevelDescription->setCaption(MyGUI::UString(levelupdescription));
 
         unsigned int availableAttributes = 0;
         for (const ESM::Attribute& attribute : MWBase::Environment::get().getESMStore()->get<ESM::Attribute>())
@@ -214,7 +218,7 @@ namespace MWGui
         center();
 
         // Play LevelUp Music
-        MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Triumph.mp3");
+        MWBase::Environment::get().getSoundManager()->streamMusic(MWSound::triumphMusic, MWSound::MusicType::Normal);
     }
 
     void LevelupDialog::onOkButtonClicked(MyGUI::Widget* sender)
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index fd7afa2d8a..263e676e15 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -9,6 +9,7 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_ScrollBar.h>
 #include <MyGUI_TextBox.h>
+#include <MyGUI_UString.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/pathhelpers.hpp>
@@ -17,6 +18,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/settings/values.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
@@ -37,7 +39,6 @@ namespace MWGui
         , mLastRenderTime(0.0)
         , mLoadingOnTime(0.0)
         , mImportantLabel(false)
-        , mVisible(false)
         , mNestedLoadingCount(0)
         , mProgress(0)
         , mShowWallpaper(true)
@@ -65,7 +66,8 @@ namespace MWGui
                 != supported_extensions.end();
         };
 
-        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator("Splash/"))
+        constexpr VFS::Path::NormalizedView splash("splash/");
+        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(splash))
         {
             if (isSupportedExtension(Misc::getFileExtension(name)))
                 mSplashScreens.push_back(name);
@@ -139,7 +141,7 @@ namespace MWGui
         osg::BoundingSphere computeBound(const osg::Node&) const override { return osg::BoundingSphere(); }
     };
 
-    void LoadingScreen::loadingOn(bool visible)
+    void LoadingScreen::loadingOn()
     {
         // Early-out if already on
         if (mNestedLoadingCount++ > 0 && mMainWidget->getVisible())
@@ -158,17 +160,8 @@ namespace MWGui
             mOldIcoMax = ico->getMaximumNumOfObjectsToCompilePerFrame();
         }
 
-        mVisible = visible;
-        mLoadingBox->setVisible(mVisible);
         setVisible(true);
 
-        if (!mVisible)
-        {
-            mShowWallpaper = false;
-            draw();
-            return;
-        }
-
         mShowWallpaper = MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame;
 
         if (mShowWallpaper)
@@ -183,7 +176,6 @@ namespace MWGui
     {
         if (--mNestedLoadingCount > 0)
             return;
-        mLoadingBox->setVisible(true); // restore
 
         if (mLastRenderTime < mLoadingOnTime)
         {
@@ -191,7 +183,7 @@ namespace MWGui
             // we may still want to show the label if the caller requested it
             if (mImportantLabel)
             {
-                MWBase::Environment::get().getWindowManager()->messageBox(mLoadingText->getCaption().asUTF8());
+                MWBase::Environment::get().getWindowManager()->messageBox(mLoadingText->getCaption());
                 mImportantLabel = false;
             }
         }
@@ -324,7 +316,7 @@ namespace MWGui
 
     void LoadingScreen::draw()
     {
-        if (mVisible && !needToDrawLoadingScreen())
+        if (!needToDrawLoadingScreen())
             return;
 
         if (mShowWallpaper && mTimer.time_m() > mLastWallpaperChangeTime + 5000 * 1)
@@ -340,7 +332,12 @@ namespace MWGui
 
         MWBase::Environment::get().getInputManager()->update(0, true, true);
 
-        mResourceSystem->reportStats(mViewer->getFrameStamp()->getFrameNumber(), mViewer->getViewerStats());
+        osg::Stats* const stats = mViewer->getViewerStats();
+        const unsigned frameNumber = mViewer->getFrameStamp()->getFrameNumber();
+
+        stats->setAttribute(frameNumber, "Loading", 1);
+
+        mResourceSystem->reportStats(frameNumber, stats);
         if (osgUtil::IncrementalCompileOperation* ico = mViewer->getIncrementalCompileOperation())
         {
             ico->setMinimumTimeAvailableForGLCompileAndDeletePerFrame(1.f / getTargetFrameRate());
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index 2cd3f73576..35de331ee0 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -38,7 +38,7 @@ namespace MWGui
 
         /// Overridden from Loading::Listener, see the Loading::Listener documentation for usage details
         void setLabel(const std::string& label, bool important) override;
-        void loadingOn(bool visible = true) override;
+        void loadingOn() override;
         void loadingOff() override;
         void setProgressRange(size_t range) override;
         void setProgress(size_t value) override;
@@ -66,7 +66,6 @@ namespace MWGui
 
         bool mImportantLabel;
 
-        bool mVisible;
         int mNestedLoadingCount;
 
         size_t mProgress;
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 37e835f1a4..da747dd7a2 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -4,8 +4,10 @@
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_TextBox.h>
 
+#include <components/misc/frameratelimiter.hpp>
 #include <components/settings/values.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/vfs/pathutil.hpp>
 #include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -18,10 +20,61 @@
 #include "backgroundimage.hpp"
 #include "confirmationdialog.hpp"
 #include "savegamedialog.hpp"
+#include "settingswindow.hpp"
 #include "videowidget.hpp"
 
 namespace MWGui
 {
+    void MenuVideo::run()
+    {
+        Misc::FrameRateLimiter frameRateLimiter
+            = Misc::makeFrameRateLimiter(MWBase::Environment::get().getFrameRateLimit());
+        while (mRunning)
+        {
+            // If finished playing, start again
+            if (!mVideo->update())
+                mVideo->playVideo("video\\menu_background.bik");
+            frameRateLimiter.limit();
+        }
+    }
+
+    MenuVideo::MenuVideo(const VFS::Manager* vfs)
+        : mRunning(true)
+    {
+        // Use black background to correct aspect ratio
+        mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>(
+            "ImageBox", 0, 0, 1, 1, MyGUI::Align::Default, "MainMenuBackground");
+        mVideoBackground->setImageTexture("black");
+
+        mVideo = mVideoBackground->createWidget<VideoWidget>(
+            "ImageBox", 0, 0, 1, 1, MyGUI::Align::Stretch, "MainMenuBackground");
+        mVideo->setVFS(vfs);
+
+        mVideo->playVideo("video\\menu_background.bik");
+        mThread = std::thread([this] { run(); });
+    }
+
+    void MenuVideo::resize(int screenWidth, int screenHeight)
+    {
+        const bool stretch = Settings::gui().mStretchMenuBackground;
+        mVideoBackground->setSize(screenWidth, screenHeight);
+        mVideo->autoResize(stretch);
+        mVideo->setVisible(true);
+    }
+
+    MenuVideo::~MenuVideo()
+    {
+        mRunning = false;
+        mThread.join();
+        try
+        {
+            MyGUI::Gui::getInstance().destroyWidget(mVideoBackground);
+        }
+        catch (const MyGUI::Exception& e)
+        {
+            Log(Debug::Error) << "Error in the destructor: " << e.what();
+        }
+    }
 
     MainMenu::MainMenu(int w, int h, const VFS::Manager* vfs, const std::string& versionDescription)
         : WindowBase("openmw_mainmenu.layout")
@@ -30,13 +83,13 @@ namespace MWGui
         , mVFS(vfs)
         , mButtonBox(nullptr)
         , mBackground(nullptr)
-        , mVideoBackground(nullptr)
-        , mVideo(nullptr)
     {
         getWidget(mVersionText, "VersionText");
         mVersionText->setCaption(versionDescription);
 
-        mHasAnimatedMenu = mVFS->exists("video/menu_background.bik");
+        constexpr VFS::Path::NormalizedView menuBackgroundVideo("video/menu_background.bik");
+
+        mHasAnimatedMenu = mVFS->exists(menuBackgroundVideo);
 
         updateMenu();
     }
@@ -47,6 +100,8 @@ namespace MWGui
         mHeight = h;
 
         updateMenu();
+        if (mVideo)
+            mVideo->resize(w, h);
     }
 
     void MainMenu::setVisible(bool visible)
@@ -96,8 +151,6 @@ namespace MWGui
         {
             winMgr->removeGuiMode(GM_MainMenu);
         }
-        else if (name == "options")
-            winMgr->pushGuiMode(GM_Settings);
         else if (name == "credits")
             winMgr->playVideo("mw_credits.bik", true);
         else if (name == "exitgame")
@@ -126,26 +179,25 @@ namespace MWGui
                 dialog->eventCancelClicked.clear();
             }
         }
-
-        else
+        else if (name == "loadgame" || name == "savegame")
         {
             if (!mSaveGameDialog)
                 mSaveGameDialog = std::make_unique<SaveGameDialog>();
-            if (name == "loadgame")
-                mSaveGameDialog->setLoadOrSave(true);
-            else if (name == "savegame")
-                mSaveGameDialog->setLoadOrSave(false);
+            mSaveGameDialog->setLoadOrSave(name == "loadgame");
             mSaveGameDialog->setVisible(true);
         }
+
+        if (winMgr->isSettingsWindowVisible() || name == "options")
+        {
+            winMgr->toggleSettingsWindow();
+        }
     }
 
     void MainMenu::showBackground(bool show)
     {
         if (mVideo && !show)
         {
-            MyGUI::Gui::getInstance().destroyWidget(mVideoBackground);
-            mVideoBackground = nullptr;
-            mVideo = nullptr;
+            mVideo.reset();
         }
         if (mBackground && !show)
         {
@@ -161,27 +213,12 @@ namespace MWGui
         if (mHasAnimatedMenu)
         {
             if (!mVideo)
-            {
-                // Use black background to correct aspect ratio
-                mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>(
-                    "ImageBox", 0, 0, 1, 1, MyGUI::Align::Default, "MainMenuBackground");
-                mVideoBackground->setImageTexture("black");
+                mVideo.emplace(mVFS);
 
-                mVideo = mVideoBackground->createWidget<VideoWidget>(
-                    "ImageBox", 0, 0, 1, 1, MyGUI::Align::Stretch, "MainMenuBackground");
-                mVideo->setVFS(mVFS);
-
-                mVideo->playVideo("video\\menu_background.bik");
-            }
-
-            MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
+            const auto& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
             int screenWidth = viewSize.width;
             int screenHeight = viewSize.height;
-            mVideoBackground->setSize(screenWidth, screenHeight);
-
-            mVideo->autoResize(stretch);
-
-            mVideo->setVisible(true);
+            mVideo->resize(screenWidth, screenHeight);
         }
         else
         {
@@ -195,20 +232,14 @@ namespace MWGui
         }
     }
 
-    void MainMenu::onFrame(float dt)
-    {
-        if (mVideo)
-        {
-            if (!mVideo->update())
-            {
-                // If finished playing, start again
-                mVideo->playVideo("video\\menu_background.bik");
-            }
-        }
-    }
-
     bool MainMenu::exit()
     {
+        if (MWBase::Environment::get().getWindowManager()->isSettingsWindowVisible())
+        {
+            MWBase::Environment::get().getWindowManager()->toggleSettingsWindow();
+            return false;
+        }
+
         return MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_Running;
     }
 
diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp
index ee6a5cdb16..06a8c945c1 100644
--- a/apps/openmw/mwgui/mainmenu.hpp
+++ b/apps/openmw/mwgui/mainmenu.hpp
@@ -2,6 +2,8 @@
 #define OPENMW_GAME_MWGUI_MAINMENU_H
 
 #include <memory>
+#include <optional>
+#include <thread>
 
 #include "savegamedialog.hpp"
 #include "windowbase.hpp"
@@ -21,6 +23,20 @@ namespace MWGui
 
     class BackgroundImage;
     class VideoWidget;
+    class MenuVideo
+    {
+        MyGUI::ImageBox* mVideoBackground;
+        VideoWidget* mVideo;
+        std::thread mThread;
+        bool mRunning;
+
+        void run();
+
+    public:
+        MenuVideo(const VFS::Manager* vfs);
+        void resize(int w, int h);
+        ~MenuVideo();
+    };
 
     class MainMenu : public WindowBase
     {
@@ -36,8 +52,6 @@ namespace MWGui
 
         void setVisible(bool visible) override;
 
-        void onFrame(float dt) override;
-
         bool exit() override;
 
     private:
@@ -48,8 +62,7 @@ namespace MWGui
 
         BackgroundImage* mBackground;
 
-        MyGUI::ImageBox* mVideoBackground;
-        VideoWidget* mVideo; // For animated main menus
+        std::optional<MenuVideo> mVideo; // For animated main menus
 
         std::map<std::string, Gui::ImageButton*, std::less<>> mButtons;
 
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 088024ac63..bf4bd7644c 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -82,19 +82,31 @@ namespace
 
     MyGUI::IntRect createRect(const MyGUI::IntPoint& center, int radius)
     {
-        return { center.left - radius, center.top + radius, center.left + radius, center.top - radius };
+        return { center.left - radius, center.top - radius, center.left + radius, center.top + radius };
     }
 
     int getLocalViewingDistance()
     {
         if (!Settings::map().mAllowZooming)
             return Constants::CellGridRadius;
-        if (!Settings::Manager::getBool("distant terrain", "Terrain"))
+        if (!Settings::terrain().mDistantTerrain)
             return Constants::CellGridRadius;
         const int viewingDistanceInCells = Settings::camera().mViewingDistance / Constants::CellSizeInUnits;
         return std::clamp(
             viewingDistanceInCells, Constants::CellGridRadius, Settings::map().mMaxLocalViewingDistance.get());
     }
+
+    ESM::RefId getCellIdInWorldSpace(const MWWorld::Cell& cell, int x, int y)
+    {
+        if (cell.isExterior())
+            return ESM::Cell::generateIdForCell(true, {}, x, y);
+        return cell.getId();
+    }
+
+    void setCanvasSize(MyGUI::ScrollView* scrollView, const MyGUI::IntRect& grid, int widgetSize)
+    {
+        scrollView->setCanvasSize(widgetSize * (grid.width() + 1), widgetSize * (grid.height() + 1));
+    }
 }
 
 namespace MWGui
@@ -170,21 +182,8 @@ namespace MWGui
     LocalMapBase::LocalMapBase(
         CustomMarkerCollection& markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled)
         : mLocalMapRender(localMapRender)
-        , mCurX(0)
-        , mCurY(0)
-        , mInterior(false)
-        , mLocalMap(nullptr)
-        , mCompass(nullptr)
-        , mChanged(true)
-        , mFogOfWarToggled(true)
         , mFogOfWarEnabled(fogOfWarEnabled)
-        , mNumCells(1)
-        , mCellDistance(0)
         , mCustomMarkers(markers)
-        , mMarkerUpdateTimer(0.0f)
-        , mLastDirectionX(0.0f)
-        , mLastDirectionY(0.0f)
-        , mNeedDoorMarkersUpdate(false)
     {
         mCustomMarkers.eventMarkersChanged += MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
     }
@@ -194,47 +193,40 @@ namespace MWGui
         mCustomMarkers.eventMarkersChanged -= MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
     }
 
+    MWGui::LocalMapBase::MapEntry& LocalMapBase::addMapEntry()
+    {
+        const int mapWidgetSize = Settings::map().mLocalMapWidgetSize;
+        MyGUI::ImageBox* map = mLocalMap->createWidget<MyGUI::ImageBox>(
+            "ImageBox", MyGUI::IntCoord(0, 0, mapWidgetSize, mapWidgetSize), MyGUI::Align::Top | MyGUI::Align::Left);
+        map->setDepth(Local_MapLayer);
+
+        MyGUI::ImageBox* fog = mLocalMap->createWidget<MyGUI::ImageBox>(
+            "ImageBox", MyGUI::IntCoord(0, 0, mapWidgetSize, mapWidgetSize), MyGUI::Align::Top | MyGUI::Align::Left);
+        fog->setDepth(Local_FogLayer);
+        fog->setColour(MyGUI::Colour(0, 0, 0));
+
+        map->setNeedMouseFocus(false);
+        fog->setNeedMouseFocus(false);
+
+        return mMaps.emplace_back(map, fog);
+    }
+
     void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int cellDistance)
     {
         mLocalMap = widget;
         mCompass = compass;
-        mCellDistance = cellDistance;
-        mNumCells = mCellDistance * 2 + 1;
+        mGrid = createRect({ 0, 0 }, cellDistance);
+        mExtCellDistance = cellDistance;
 
         const int mapWidgetSize = Settings::map().mLocalMapWidgetSize;
-
-        mLocalMap->setCanvasSize(mapWidgetSize * mNumCells, mapWidgetSize * mNumCells);
+        setCanvasSize(mLocalMap, mGrid, mapWidgetSize);
 
         mCompass->setDepth(Local_CompassLayer);
         mCompass->setNeedMouseFocus(false);
 
-        for (int mx = 0; mx < mNumCells; ++mx)
-        {
-            for (int my = 0; my < mNumCells; ++my)
-            {
-                MyGUI::ImageBox* map = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
-                    MyGUI::IntCoord(mx * mapWidgetSize, my * mapWidgetSize, mapWidgetSize, mapWidgetSize),
-                    MyGUI::Align::Top | MyGUI::Align::Left);
-                map->setDepth(Local_MapLayer);
-
-                MyGUI::ImageBox* fog = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
-                    MyGUI::IntCoord(mx * mapWidgetSize, my * mapWidgetSize, mapWidgetSize, mapWidgetSize),
-                    MyGUI::Align::Top | MyGUI::Align::Left);
-                fog->setDepth(Local_FogLayer);
-                fog->setColour(MyGUI::Colour(0, 0, 0));
-
-                map->setNeedMouseFocus(false);
-                fog->setNeedMouseFocus(false);
-
-                mMaps.emplace_back(map, fog);
-            }
-        }
-    }
-
-    void LocalMapBase::setCellPrefix(const std::string& prefix)
-    {
-        mPrefix = prefix;
-        mChanged = true;
+        int numCells = (mGrid.width() + 1) * (mGrid.height() + 1);
+        for (int i = 0; i < numCells; ++i)
+            addMapEntry();
     }
 
     bool LocalMapBase::toggleFogOfWar()
@@ -262,8 +254,8 @@ namespace MWGui
     {
         // normalized cell coordinates
         auto mapWidgetSize = getWidgetSize();
-        return MyGUI::IntPoint(std::round(nX * mapWidgetSize + (mCellDistance + (cellX - mCurX)) * mapWidgetSize),
-            std::round(nY * mapWidgetSize + (mCellDistance - (cellY - mCurY)) * mapWidgetSize));
+        return MyGUI::IntPoint(std::round((nX + cellX - mGrid.left) * mapWidgetSize),
+            std::round((nY - cellY + mGrid.bottom) * mapWidgetSize));
     }
 
     MyGUI::IntPoint LocalMapBase::getMarkerPosition(float worldX, float worldY, MarkerUserData& markerPos) const
@@ -272,7 +264,7 @@ namespace MWGui
         // normalized cell coordinates
         float nX, nY;
 
-        if (!mInterior)
+        if (mActiveCell->isExterior())
         {
             ESM::ExteriorCellLocation cellPos = ESM::positionToExteriorCellLocation(worldX, worldY);
             cellIndex.x() = cellPos.mX;
@@ -300,11 +292,9 @@ namespace MWGui
         return MyGUI::IntCoord(position.left - halfMarkerSize, position.top - halfMarkerSize, markerSize, markerSize);
     }
 
-    MyGUI::Widget* LocalMapBase::createDoorMarker(
-        const std::string& name, const MyGUI::VectorString& notes, float x, float y) const
+    MyGUI::Widget* LocalMapBase::createDoorMarker(const std::string& name, float x, float y) const
     {
         MarkerUserData data(mLocalMapRender);
-        data.notes = notes;
         data.caption = name;
         MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>(
             "MarkerButton", getMarkerCoordinates(x, y, data, 8), MyGUI::Align::Default);
@@ -338,7 +328,7 @@ namespace MWGui
 
     std::vector<MyGUI::Widget*>& LocalMapBase::currentDoorMarkersWidgets()
     {
-        return mInterior ? mInteriorDoorMarkerWidgets : mExteriorDoorMarkerWidgets;
+        return mActiveCell->isExterior() ? mExteriorDoorMarkerWidgets : mInteriorDoorMarkerWidgets;
     }
 
     void LocalMapBase::updateCustomMarkers()
@@ -346,57 +336,63 @@ namespace MWGui
         for (MyGUI::Widget* widget : mCustomMarkerWidgets)
             MyGUI::Gui::getInstance().destroyWidget(widget);
         mCustomMarkerWidgets.clear();
-
-        for (int dX = -mCellDistance; dX <= mCellDistance; ++dX)
-        {
-            for (int dY = -mCellDistance; dY <= mCellDistance; ++dY)
+        if (!mActiveCell)
+            return;
+        auto updateMarkers = [this](CustomMarkerCollection::RangeType markers) {
+            for (auto it = markers.first; it != markers.second; ++it)
             {
-                ESM::RefId cellRefId = ESM::Cell::generateIdForCell(!mInterior, mPrefix, mCurX + dX, mCurY + dY);
-
-                CustomMarkerCollection::RangeType markers = mCustomMarkers.getMarkers(cellRefId);
-                for (CustomMarkerCollection::ContainerType::const_iterator it = markers.first; it != markers.second;
-                     ++it)
+                const ESM::CustomMarker& marker = it->second;
+                MarkerUserData markerPos(mLocalMapRender);
+                MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("CustomMarkerButton",
+                    getMarkerCoordinates(marker.mWorldX, marker.mWorldY, markerPos, 16), MyGUI::Align::Default);
+                markerWidget->setDepth(Local_MarkerAboveFogLayer);
+                markerWidget->setUserString("ToolTipType", "Layout");
+                markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
+                markerWidget->setUserString("Caption_TextOneLine", MyGUI::TextIterator::toTagsString(marker.mNote));
+                markerWidget->setNormalColour(MyGUI::Colour(0.6f, 0.6f, 0.6f));
+                markerWidget->setHoverColour(MyGUI::Colour(1.0f, 1.0f, 1.0f));
+                markerWidget->setUserData(marker);
+                markerWidget->setNeedMouseFocus(true);
+                customMarkerCreated(markerWidget);
+                mCustomMarkerWidgets.push_back(markerWidget);
+            }
+        };
+        if (mActiveCell->isExterior())
+        {
+            for (int x = mGrid.left; x <= mGrid.right; ++x)
+            {
+                for (int y = mGrid.top; y <= mGrid.bottom; ++y)
                 {
-                    const ESM::CustomMarker& marker = it->second;
-
-                    MarkerUserData markerPos(mLocalMapRender);
-                    MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("CustomMarkerButton",
-                        getMarkerCoordinates(marker.mWorldX, marker.mWorldY, markerPos, 16), MyGUI::Align::Default);
-                    markerWidget->setDepth(Local_MarkerAboveFogLayer);
-                    markerWidget->setUserString("ToolTipType", "Layout");
-                    markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
-                    markerWidget->setUserString("Caption_TextOneLine", MyGUI::TextIterator::toTagsString(marker.mNote));
-                    markerWidget->setNormalColour(MyGUI::Colour(0.6f, 0.6f, 0.6f));
-                    markerWidget->setHoverColour(MyGUI::Colour(1.0f, 1.0f, 1.0f));
-                    markerWidget->setUserData(marker);
-                    markerWidget->setNeedMouseFocus(true);
-                    customMarkerCreated(markerWidget);
-                    mCustomMarkerWidgets.push_back(markerWidget);
+                    ESM::RefId cellRefId = getCellIdInWorldSpace(*mActiveCell, x, y);
+                    updateMarkers(mCustomMarkers.getMarkers(cellRefId));
                 }
             }
         }
+        else
+            updateMarkers(mCustomMarkers.getMarkers(mActiveCell->getId()));
 
         redraw();
     }
 
-    void LocalMapBase::setActiveCell(const int x, const int y, bool interior)
+    void LocalMapBase::setActiveCell(const MWWorld::Cell& cell)
     {
-        if (x == mCurX && y == mCurY && mInterior == interior && !mChanged)
+        if (&cell == mActiveCell)
             return; // don't do anything if we're still in the same cell
 
-        if (!interior && !(x == mCurX && y == mCurY))
-        {
-            const MyGUI::IntRect intersection
-                = { std::max(x, mCurX) - mCellDistance, std::max(y, mCurY) - mCellDistance,
-                      std::min(x, mCurX) + mCellDistance, std::min(y, mCurY) + mCellDistance };
+        const int x = cell.getGridX();
+        const int y = cell.getGridY();
 
+        MyGUI::IntSize oldSize{ mGrid.width(), mGrid.height() };
+
+        if (cell.isExterior())
+        {
+            mGrid = createRect({ x, y }, mExtCellDistance);
             const MyGUI::IntRect activeGrid = createRect({ x, y }, Constants::CellGridRadius);
-            const MyGUI::IntRect currentView = createRect({ x, y }, mCellDistance);
 
             mExteriorDoorMarkerWidgets.clear();
             for (auto& [coord, doors] : mExteriorDoorsByCell)
             {
-                if (!mHasALastActiveCell || !currentView.inside({ coord.first, coord.second })
+                if (!mHasALastActiveCell || !mGrid.inside({ coord.first, coord.second })
                     || activeGrid.inside({ coord.first, coord.second }))
                 {
                     mDoorMarkersToRecycle.insert(mDoorMarkersToRecycle.end(), doors.begin(), doors.end());
@@ -409,32 +405,54 @@ namespace MWGui
             for (auto& widget : mDoorMarkersToRecycle)
                 widget->setVisible(false);
 
-            for (auto const& cell : mMaps)
+            if (mHasALastActiveCell)
             {
-                if (mHasALastActiveCell && !intersection.inside({ cell.mCellX, cell.mCellY }))
-                    mLocalMapRender->removeExteriorCell(cell.mCellX, cell.mCellY);
+                for (const auto& entry : mMaps)
+                {
+                    if (!mGrid.inside({ entry.mCellX, entry.mCellY }))
+                        mLocalMapRender->removeExteriorCell(entry.mCellX, entry.mCellY);
+                }
             }
         }
+        else
+            mGrid = mLocalMapRender->getInteriorGrid();
 
-        mCurX = x;
-        mCurY = y;
-        mInterior = interior;
-        mChanged = false;
+        mActiveCell = &cell;
 
-        for (int mx = 0; mx < mNumCells; ++mx)
+        constexpr auto resetEntry = [](MapEntry& entry, bool visible, const MyGUI::IntPoint* position) {
+            entry.mMapWidget->setVisible(visible);
+            entry.mFogWidget->setVisible(visible);
+            if (position)
+            {
+                entry.mMapWidget->setPosition(*position);
+                entry.mFogWidget->setPosition(*position);
+            }
+            entry.mMapWidget->setRenderItemTexture(nullptr);
+            entry.mFogWidget->setRenderItemTexture(nullptr);
+            entry.mMapTexture.reset();
+            entry.mFogTexture.reset();
+        };
+
+        std::size_t usedEntries = 0;
+        for (int cx = mGrid.left; cx <= mGrid.right; ++cx)
         {
-            for (int my = 0; my < mNumCells; ++my)
+            for (int cy = mGrid.top; cy <= mGrid.bottom; ++cy)
             {
-                MapEntry& entry = mMaps[my + mNumCells * mx];
-                entry.mMapWidget->setRenderItemTexture(nullptr);
-                entry.mFogWidget->setRenderItemTexture(nullptr);
-                entry.mMapTexture.reset();
-                entry.mFogTexture.reset();
-
-                entry.mCellX = x + (mx - mCellDistance);
-                entry.mCellY = y - (my - mCellDistance);
+                MapEntry& entry = usedEntries < mMaps.size() ? mMaps[usedEntries] : addMapEntry();
+                entry.mCellX = cx;
+                entry.mCellY = cy;
+                MyGUI::IntPoint position = getPosition(cx, cy, 0, 0);
+                resetEntry(entry, true, &position);
+                ++usedEntries;
             }
         }
+        for (std::size_t i = usedEntries; i < mMaps.size(); ++i)
+        {
+            resetEntry(mMaps[i], false, nullptr);
+        }
+
+        if (oldSize != MyGUI::IntSize{ mGrid.width(), mGrid.height() })
+            setCanvasSize(mLocalMap, mGrid, getWidgetSize());
 
         // Delay the door markers update until scripts have been given a chance to run.
         // If we don't do this, door markers that should be disabled will still appear on the map.
@@ -443,7 +461,7 @@ namespace MWGui
         for (MyGUI::Widget* widget : currentDoorMarkersWidgets())
             widget->setCoord(getMarkerCoordinates(widget, 8));
 
-        if (!mInterior)
+        if (mActiveCell->isExterior())
             mHasALastActiveCell = true;
 
         updateMagicMarkers();
@@ -509,7 +527,7 @@ namespace MWGui
         if (markers.empty())
             return;
 
-        std::string markerTexture;
+        std::string_view markerTexture;
         if (type == MWBase::World::Detect_Creature)
         {
             markerTexture = "textures\\detect_animal_icon.dds";
@@ -561,15 +579,7 @@ namespace MWGui
     {
         MyGUI::IntRect coord = widget->getAbsoluteRect();
         MyGUI::IntRect croppedCoord = cropTo->getAbsoluteRect();
-        if (coord.left < croppedCoord.left && coord.right < croppedCoord.left)
-            return true;
-        if (coord.left > croppedCoord.right && coord.right > croppedCoord.right)
-            return true;
-        if (coord.top < croppedCoord.top && coord.bottom < croppedCoord.top)
-            return true;
-        if (coord.top > croppedCoord.bottom && coord.bottom > croppedCoord.bottom)
-            return true;
-        return false;
+        return !coord.intersect(croppedCoord);
     }
 
     void LocalMapBase::updateRequiredMaps()
@@ -582,7 +592,7 @@ namespace MWGui
 
             if (!entry.mMapTexture)
             {
-                if (!mInterior)
+                if (mActiveCell->isExterior())
                     requestMapRender(&MWBase::Environment::get().getWorldModel()->getExterior(
                         ESM::ExteriorCellLocation(entry.mCellX, entry.mCellY, ESM::Cell::sDefaultWorldspaceId)));
 
@@ -628,12 +638,12 @@ namespace MWGui
             mDoorMarkersToRecycle.end(), mInteriorDoorMarkerWidgets.begin(), mInteriorDoorMarkerWidgets.end());
         mInteriorDoorMarkerWidgets.clear();
 
-        if (mInterior)
+        if (!mActiveCell->isExterior())
         {
             for (MyGUI::Widget* widget : mExteriorDoorMarkerWidgets)
                 widget->setVisible(false);
 
-            MWWorld::CellStore& cell = worldModel->getInterior(mPrefix);
+            MWWorld::CellStore& cell = worldModel->getInterior(mActiveCell->getNameId());
             world->getDoorMarkers(cell, doors);
         }
         else
@@ -662,8 +672,9 @@ namespace MWGui
             MarkerUserData* data;
             if (mDoorMarkersToRecycle.empty())
             {
-                markerWidget = createDoorMarker(marker.name, destNotes, marker.x, marker.y);
+                markerWidget = createDoorMarker(marker.name, marker.x, marker.y);
                 data = markerWidget->getUserData<MarkerUserData>();
+                data->notes = std::move(destNotes);
                 doorMarkerCreated(markerWidget);
             }
             else
@@ -672,14 +683,14 @@ namespace MWGui
                 mDoorMarkersToRecycle.pop_back();
 
                 data = markerWidget->getUserData<MarkerUserData>();
-                data->notes = destNotes;
+                data->notes = std::move(destNotes);
                 data->caption = marker.name;
                 markerWidget->setCoord(getMarkerCoordinates(marker.x, marker.y, *data, 8));
                 markerWidget->setVisible(true);
             }
 
             currentDoorMarkersWidgets().push_back(markerWidget);
-            if (!mInterior)
+            if (mActiveCell->isExterior())
                 mExteriorDoorsByCell[{ data->cellX, data->cellY }].push_back(markerWidget);
         }
 
@@ -702,8 +713,7 @@ namespace MWGui
         MWWorld::CellStore* markedCell = nullptr;
         ESM::Position markedPosition;
         MWBase::Environment::get().getWorld()->getPlayer().getMarkedPosition(markedCell, markedPosition);
-        if (markedCell && markedCell->isExterior() == !mInterior
-            && (!mInterior || Misc::StringUtils::ciEqual(markedCell->getCell()->getNameId(), mPrefix)))
+        if (markedCell && markedCell->getCell()->getWorldSpace() == mActiveCell->getWorldSpace())
         {
             MarkerUserData markerPos(mLocalMapRender);
             MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
@@ -722,7 +732,7 @@ namespace MWGui
     void LocalMapBase::updateLocalMap()
     {
         auto mapWidgetSize = getWidgetSize();
-        mLocalMap->setCanvasSize(mapWidgetSize * mNumCells, mapWidgetSize * mNumCells);
+        setCanvasSize(mLocalMap, mGrid, getWidgetSize());
 
         const auto size = MyGUI::IntSize(std::ceil(mapWidgetSize), std::ceil(mapWidgetSize));
         for (auto& entry : mMaps)
@@ -867,15 +877,13 @@ namespace MWGui
 
         MyGUI::IntPoint widgetPos = clickedPos - mEventBoxLocal->getAbsolutePosition();
         auto mapWidgetSize = getWidgetSize();
-        int x = int(widgetPos.left / float(mapWidgetSize)) - mCellDistance;
-        int y = (int(widgetPos.top / float(mapWidgetSize)) - mCellDistance) * -1;
+        int x = int(widgetPos.left / float(mapWidgetSize)) + mGrid.left;
+        int y = mGrid.bottom - int(widgetPos.top / float(mapWidgetSize));
         float nX = widgetPos.left / float(mapWidgetSize) - int(widgetPos.left / float(mapWidgetSize));
         float nY = widgetPos.top / float(mapWidgetSize) - int(widgetPos.top / float(mapWidgetSize));
-        x += mCurX;
-        y += mCurY;
 
         osg::Vec2f worldPos;
-        if (mInterior)
+        if (!mActiveCell->isExterior())
         {
             worldPos = mLocalMapRender->interiorMapToWorldPosition(nX, nY, x, y);
         }
@@ -887,7 +895,7 @@ namespace MWGui
 
         mEditingMarker.mWorldX = worldPos.x();
         mEditingMarker.mWorldY = worldPos.y();
-        ESM::RefId clickedId = ESM::Cell::generateIdForCell(!mInterior, LocalMapBase::mPrefix, x, y);
+        ESM::RefId clickedId = getCellIdInWorldSpace(*mActiveCell, x, y);
 
         mEditingMarker.mCell = clickedId;
 
@@ -902,11 +910,11 @@ namespace MWGui
         const bool zoomOut = rel < 0;
         const bool zoomIn = !zoomOut;
         const double speedDiff = zoomOut ? 1.0 / speed : speed;
-        const float localMapSizeInUnits = localWidgetSize * mNumCells;
 
-        const float currentMinLocalMapZoom = std::max({ (float(Settings::map().mGlobalMapCellSize) * 4.f)
-                / float(localWidgetSize),
-            float(mLocalMap->getWidth()) / localMapSizeInUnits, float(mLocalMap->getHeight()) / localMapSizeInUnits });
+        const float currentMinLocalMapZoom
+            = std::max({ (float(Settings::map().mGlobalMapCellSize) * 4.f) / float(localWidgetSize),
+                float(mLocalMap->getWidth()) / (localWidgetSize * (mGrid.width() + 1)),
+                float(mLocalMap->getHeight()) / (localWidgetSize * (mGrid.height() + 1)) });
 
         if (Settings::map().mGlobal)
         {
@@ -978,7 +986,7 @@ namespace MWGui
         resizeGlobalMap();
 
         float x = mCurPos.x(), y = mCurPos.y();
-        if (mInterior)
+        if (!mActiveCell->isExterior())
         {
             auto pos = MWBase::Environment::get().getWorld()->getPlayer().getLastKnownExteriorPosition();
             x = pos.x();
@@ -1021,7 +1029,7 @@ namespace MWGui
         resizeGlobalMap();
     }
 
-    MapWindow::~MapWindow() {}
+    MapWindow::~MapWindow() = default;
 
     void MapWindow::setCellName(const std::string& cellName)
     {
@@ -1290,7 +1298,7 @@ namespace MWGui
         mMarkers.clear();
 
         mGlobalMapRender->clear();
-        mChanged = true;
+        mActiveCell = nullptr;
 
         for (auto& widgetPair : mGlobalMapMarkers)
             MyGUI::Gui::getInstance().destroyWidget(widgetPair.first.widget);
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 5afc8c7c8a..ed070c5407 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -27,6 +27,7 @@ namespace ESM
 
 namespace MWWorld
 {
+    class Cell;
     class CellStore;
 }
 
@@ -77,8 +78,7 @@ namespace MWGui
         virtual ~LocalMapBase();
         void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int cellDistance = Constants::CellGridRadius);
 
-        void setCellPrefix(const std::string& prefix);
-        void setActiveCell(const int x, const int y, bool interior = false);
+        void setActiveCell(const MWWorld::Cell& cell);
         void requestMapRender(const MWWorld::CellStore* cell);
         void setPlayerDir(const float x, const float y);
         void setPlayerPos(int cellX, int cellY, const float nx, const float ny);
@@ -112,23 +112,17 @@ namespace MWGui
     protected:
         void updateLocalMap();
 
-        float mLocalMapZoom = 1.f;
         MWRender::LocalMap* mLocalMapRender;
-
-        int mCurX, mCurY; // the position of the active cell on the global map (in cell coords)
-        bool mHasALastActiveCell = false;
+        const MWWorld::Cell* mActiveCell = nullptr;
         osg::Vec2f mCurPos; // the position of the player in the world (in cell coords)
 
-        bool mInterior;
-        MyGUI::ScrollView* mLocalMap;
-        MyGUI::ImageBox* mCompass;
-        std::string mPrefix;
-        bool mChanged;
-        bool mFogOfWarToggled;
+        MyGUI::ScrollView* mLocalMap = nullptr;
+        MyGUI::ImageBox* mCompass = nullptr;
+        float mLocalMapZoom = 1.f;
+        bool mHasALastActiveCell = false;
+        bool mFogOfWarToggled = true;
         bool mFogOfWarEnabled;
-
-        int mNumCells; // for convenience, mCellDistance * 2 + 1
-        int mCellDistance;
+        bool mNeedDoorMarkersUpdate = false;
 
         // Stores markers that were placed by a player. May be shared between multiple map views.
         CustomMarkerCollection& mCustomMarkers;
@@ -170,8 +164,7 @@ namespace MWGui
         MyGUI::IntPoint getMarkerPosition(float worldX, float worldY, MarkerUserData& markerPos) const;
         MyGUI::IntCoord getMarkerCoordinates(
             float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const;
-        MyGUI::Widget* createDoorMarker(
-            const std::string& name, const MyGUI::VectorString& notes, float x, float y) const;
+        MyGUI::Widget* createDoorMarker(const std::string& name, float x, float y) const;
         MyGUI::IntCoord getMarkerCoordinates(MyGUI::Widget* widget, size_t markerSize) const;
 
         virtual void notifyPlayerUpdate() {}
@@ -189,12 +182,14 @@ namespace MWGui
         void redraw();
         float getWidgetSize() const;
 
-        float mMarkerUpdateTimer;
+        MWGui::LocalMapBase::MapEntry& addMapEntry();
 
-        float mLastDirectionX;
-        float mLastDirectionY;
+        MyGUI::IntRect mGrid{ -1, -1, 1, 1 };
+        int mExtCellDistance = 0;
+        float mMarkerUpdateTimer = 0.f;
 
-        bool mNeedDoorMarkersUpdate;
+        float mLastDirectionX = 0.f;
+        float mLastDirectionY = 0.f;
 
     private:
         void updateDoorMarkers();
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index c5393fbfb7..a59f225e9e 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -47,13 +47,15 @@ namespace MWGui
 
         MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
         int categories = MWWorld::ContainerStore::Type_Weapon | MWWorld::ContainerStore::Type_Armor;
+        std::vector<std::tuple<std::string, int, MWWorld::Ptr>> items;
+
         for (MWWorld::ContainerStoreIterator iter(store.begin(categories)); iter != store.end(); ++iter)
         {
             if (iter->getClass().hasItemHealth(*iter))
             {
                 int maxDurability = iter->getClass().getItemMaxHealth(*iter);
                 int durability = iter->getClass().getItemHealth(*iter);
-                if (maxDurability == durability || maxDurability == 0)
+                if (maxDurability <= durability || maxDurability == 0)
                     continue;
 
                 int basePrice = iter->getClass().getValue(*iter);
@@ -76,22 +78,31 @@ namespace MWGui
                 name += " - " + MyGUI::utility::toString(price)
                     + MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>().find("sgp")->mValue.getString();
 
-                MyGUI::Button* button = mList->createWidget<MyGUI::Button>(price <= playerGold
-                        ? "SandTextButton"
-                        : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
-                    0, currentY, 0, lineHeight, MyGUI::Align::Default);
-
-                currentY += lineHeight;
-
-                button->setUserString("Price", MyGUI::utility::toString(price));
-                button->setUserData(MWWorld::Ptr(*iter));
-                button->setCaptionWithReplacing(name);
-                button->setSize(mList->getWidth(), lineHeight);
-                button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel);
-                button->setUserString("ToolTipType", "ItemPtr");
-                button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick);
+                items.emplace_back(name, price, *iter);
             }
         }
+
+        std::stable_sort(items.begin(), items.end(),
+            [](const auto& a, const auto& b) { return Misc::StringUtils::ciLess(std::get<0>(a), std::get<0>(b)); });
+
+        for (const auto& [name, price, ptr] : items)
+        {
+            MyGUI::Button* button = mList->createWidget<MyGUI::Button>(price <= playerGold
+                    ? "SandTextButton"
+                    : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip
+                0, currentY, 0, lineHeight, MyGUI::Align::Default);
+
+            currentY += lineHeight;
+
+            button->setUserString("Price", MyGUI::utility::toString(price));
+            button->setUserData(MWWorld::Ptr(ptr));
+            button->setCaptionWithReplacing(name);
+            button->setSize(mList->getWidth(), lineHeight);
+            button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel);
+            button->setUserString("ToolTipType", "ItemPtr");
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick);
+        }
+
         // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
         // scrollbar is hidden
         mList->setVisibleVScroll(false);
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 49d474c826..1d6e1511c4 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -4,6 +4,7 @@
 #include <MyGUI_EditBox.h>
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_RenderManager.h>
+#include <MyGUI_UString.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/algorithm.hpp>
@@ -27,7 +28,7 @@ namespace MWGui
         MessageBoxManager::clear();
     }
 
-    int MessageBoxManager::getMessagesCount()
+    std::size_t MessageBoxManager::getMessagesCount()
     {
         return mMessageBoxes.size();
     }
@@ -46,6 +47,20 @@ namespace MWGui
         mLastButtonPressed = -1;
     }
 
+    void MessageBoxManager::resetInteractiveMessageBox()
+    {
+        if (mInterMessageBoxe)
+        {
+            mInterMessageBoxe->setVisible(false);
+            mInterMessageBoxe.reset();
+        }
+    }
+
+    void MessageBoxManager::setLastButtonPressed(int index)
+    {
+        mLastButtonPressed = index;
+    }
+
     void MessageBoxManager::onFrame(float frameDuration)
     {
         for (auto it = mMessageBoxes.begin(); it != mMessageBoxes.end();)
@@ -112,7 +127,7 @@ namespace MWGui
     }
 
     bool MessageBoxManager::createInteractiveMessageBox(
-        std::string_view message, const std::vector<std::string>& buttons)
+        std::string_view message, const std::vector<std::string>& buttons, bool immediate, int defaultFocus)
     {
         if (mInterMessageBoxe != nullptr)
         {
@@ -120,7 +135,8 @@ namespace MWGui
             mInterMessageBoxe->setVisible(false);
         }
 
-        mInterMessageBoxe = std::make_unique<InteractiveMessageBox>(*this, std::string{ message }, buttons);
+        mInterMessageBoxe
+            = std::make_unique<InteractiveMessageBox>(*this, std::string{ message }, buttons, immediate, defaultFocus);
         mLastButtonPressed = -1;
 
         return true;
@@ -200,13 +216,15 @@ namespace MWGui
         mMainWidget->setVisible(value);
     }
 
-    InteractiveMessageBox::InteractiveMessageBox(
-        MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
+    InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message,
+        const std::vector<std::string>& buttons, bool immediate, int defaultFocus)
         : WindowModal(MWBase::Environment::get().getWindowManager()->isGuiMode()
                 ? "openmw_interactive_messagebox_notransp.layout"
                 : "openmw_interactive_messagebox.layout")
         , mMessageBoxManager(parMessageBoxManager)
         , mButtonPressed(-1)
+        , mDefaultFocus(defaultFocus)
+        , mImmediate(immediate)
     {
         int textPadding = 10; // padding between text-widget and main-widget
         int textButtonPadding = 10; // padding between the text-widget und the button-widget
@@ -362,14 +380,17 @@ namespace MWGui
 
     MyGUI::Widget* InteractiveMessageBox::getDefaultKeyFocus()
     {
-        std::vector<std::string> keywords{ "sOk", "sYes" };
+        if (mDefaultFocus >= 0 && mDefaultFocus < static_cast<int>(mButtons.size()))
+            return mButtons[mDefaultFocus];
+        auto& languageManager = MyGUI::LanguageManager::getInstance();
+        std::vector<MyGUI::UString> keywords{ languageManager.replaceTags("#{sOk}"),
+            languageManager.replaceTags("#{sYes}") };
+
         for (MyGUI::Button* button : mButtons)
         {
-            for (const std::string& keyword : keywords)
+            for (const MyGUI::UString& keyword : keywords)
             {
-                if (Misc::StringUtils::ciEqual(
-                        MyGUI::LanguageManager::getInstance().replaceTags("#{" + keyword + "}").asUTF8(),
-                        button->getCaption().asUTF8()))
+                if (Misc::StringUtils::ciEqual(keyword, button->getCaption()))
                 {
                     return button;
                 }
@@ -393,6 +414,12 @@ namespace MWGui
             {
                 mButtonPressed = index;
                 mMessageBoxManager.onButtonPressed(mButtonPressed);
+                if (!mImmediate)
+                    return;
+
+                mMessageBoxManager.setLastButtonPressed(mButtonPressed);
+                MWBase::Environment::get().getInputManager()->changeInputMode(
+                    MWBase::Environment::get().getWindowManager()->isGuiMode());
                 return;
             }
             index++;
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index b10586549f..feb717e0ad 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -25,10 +25,11 @@ namespace MWGui
         void onFrame(float frameDuration);
         void createMessageBox(std::string_view message, bool stat = false);
         void removeStaticMessageBox();
-        bool createInteractiveMessageBox(std::string_view message, const std::vector<std::string>& buttons);
+        bool createInteractiveMessageBox(std::string_view message, const std::vector<std::string>& buttons,
+            bool immediate = false, int defaultFocus = -1);
         bool isInteractiveMessageBox();
 
-        int getMessagesCount();
+        std::size_t getMessagesCount();
 
         const InteractiveMessageBox* getInteractiveMessageBox() const { return mInterMessageBoxe.get(); }
 
@@ -40,6 +41,10 @@ namespace MWGui
         /// @param reset Reset the pressed button to -1 after reading it.
         int readPressedButton(bool reset = true);
 
+        void resetInteractiveMessageBox();
+
+        void setLastButtonPressed(int index);
+
         typedef MyGUI::delegates::MultiDelegate<int> EventHandle_Int;
 
         // Note: this delegate unassigns itself after it was fired, i.e. works once.
@@ -88,7 +93,7 @@ namespace MWGui
     {
     public:
         InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message,
-            const std::vector<std::string>& buttons);
+            const std::vector<std::string>& buttons, bool immediate, int defaultFocus);
         void mousePressed(MyGUI::Widget* _widget);
         int readPressedButton();
 
@@ -107,6 +112,8 @@ namespace MWGui
         std::vector<MyGUI::Button*> mButtons;
 
         int mButtonPressed;
+        int mDefaultFocus;
+        bool mImmediate;
     };
 
 }
diff --git a/apps/openmw/mwgui/mode.hpp b/apps/openmw/mwgui/mode.hpp
index 63f81e8b47..44f9743743 100644
--- a/apps/openmw/mwgui/mode.hpp
+++ b/apps/openmw/mwgui/mode.hpp
@@ -6,7 +6,6 @@ namespace MWGui
     enum GuiMode
     {
         GM_None,
-        GM_Settings, // Settings window
         GM_Inventory, // Inventory mode
         GM_Container,
         GM_Companion,
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index bfaf011835..fa7bce449b 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -134,7 +134,7 @@ namespace MWGui
             return false;
         }
         else
-            player.getClass().skillUsageSucceeded(player, ESM::Skill::Sneak, 1);
+            player.getClass().skillUsageSucceeded(player, ESM::Skill::Sneak, ESM::Skill::Sneak_PickPocket);
 
         return true;
     }
diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index e54704d6d4..8f5b20ba98 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -20,6 +20,7 @@
 #include <components/fx/technique.hpp>
 #include <components/fx/widgets.hpp>
 
+#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/utf8stream.hpp>
 
 #include <components/widgets/box.hpp>
@@ -135,9 +136,9 @@ namespace MWGui
                 return;
 
             if (enabled)
-                processor->enableTechnique(technique);
+                processor->enableTechnique(std::move(technique));
             else
-                processor->disableTechnique(technique);
+                processor->disableTechnique(std::move(technique));
             processor->saveChain();
         }
     }
@@ -167,10 +168,11 @@ namespace MWGui
         if (static_cast<size_t>(index) != selected)
         {
             auto technique = *mActiveList->getItemDataAt<std::shared_ptr<fx::Technique>>(selected);
-            if (technique->getDynamic())
+            if (technique->getDynamic() || technique->getInternal())
                 return;
 
-            if (processor->enableTechnique(technique, index) != MWRender::PostProcessor::Status_Error)
+            if (processor->enableTechnique(std::move(technique), index - mOffset)
+                != MWRender::PostProcessor::Status_Error)
                 processor->saveChain();
         }
     }
@@ -421,7 +423,12 @@ namespace MWGui
 
         auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
 
+        std::vector<std::string> techniques;
         for (const auto& [name, _] : processor->getTechniqueMap())
+            techniques.push_back(name);
+        std::sort(techniques.begin(), techniques.end(), Misc::StringUtils::ciLess);
+
+        for (const std::string& name : techniques)
         {
             auto technique = processor->loadTechnique(name);
 
@@ -438,10 +445,16 @@ namespace MWGui
             }
         }
 
+        mOffset = 0;
         for (auto technique : processor->getTechniques())
         {
             if (!technique->getHidden())
+            {
                 mActiveList->addItem(technique->getName(), technique);
+
+                if (technique->getInternal())
+                    mOffset++;
+            }
         }
 
         auto tryFocus = [this](ListWrapper* widget, const std::string& hint) {
@@ -478,6 +491,7 @@ namespace MWGui
         factory.registerFactory<fx::Widgets::EditNumberFloat>("Widget");
         factory.registerFactory<fx::Widgets::EditNumberInt>("Widget");
         factory.registerFactory<fx::Widgets::EditBool>("Widget");
+        factory.registerFactory<fx::Widgets::EditChoice>("Widget");
         factory.registerFactory<ListWrapper>("Widget");
     }
 }
diff --git a/apps/openmw/mwgui/postprocessorhud.hpp b/apps/openmw/mwgui/postprocessorhud.hpp
index e08d20e358..20e27bac3a 100644
--- a/apps/openmw/mwgui/postprocessorhud.hpp
+++ b/apps/openmw/mwgui/postprocessorhud.hpp
@@ -96,6 +96,8 @@ namespace MWGui
         Gui::AutoSizedEditBox* mShaderInfo;
 
         std::string mOverrideHint;
+
+        int mOffset = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index fb03ab99c9..93b0ef071f 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -85,7 +85,7 @@ namespace MWGui
             {
                 MWWorld::Ptr item = *mKey[index].button->getUserData<MWWorld::Ptr>();
                 // Make sure the item is available and is not broken
-                if (item.isEmpty() || item.getRefData().getCount() < 1
+                if (item.isEmpty() || item.getCellRef().getCount() < 1
                     || (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
                 {
                     // Try searching for a compatible replacement
@@ -299,7 +299,8 @@ namespace MWGui
         mSelected->button->setUserString("Spell", spellId.serialize());
 
         // use the icon of the first effect
-        const ESM::MagicEffect* effect = esmStore.get<ESM::MagicEffect>().find(spell->mEffects.mList.front().mEffectID);
+        const ESM::MagicEffect* effect
+            = esmStore.get<ESM::MagicEffect>().find(spell->mEffects.mList.front().mData.mEffectID);
 
         std::string path = effect->mIcon;
         std::replace(path.begin(), path.end(), '/', '\\');
@@ -352,8 +353,7 @@ namespace MWGui
         bool isDelayNeeded = MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player)
             || playerStats.getKnockedDown() || playerStats.getHitRecovery();
 
-        bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
-        bool isReturnNeeded = (!godmode && playerStats.isParalyzed()) || playerStats.isDead();
+        bool isReturnNeeded = playerStats.isParalyzed() || playerStats.isDead();
 
         if (isReturnNeeded)
         {
@@ -383,12 +383,12 @@ namespace MWGui
                 item = nullptr;
 
             // check the item is available and not broken
-            if (item.isEmpty() || item.getRefData().getCount() < 1
+            if (item.isEmpty() || item.getCellRef().getCount() < 1
                 || (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
             {
                 item = store.findReplacement(key->id);
 
-                if (item.isEmpty() || item.getRefData().getCount() < 1)
+                if (item.isEmpty() || item.getCellRef().getCount() < 1)
                 {
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sQuickMenu5} " + key->name);
 
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index da5c0c9ca8..7b445d419f 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -4,6 +4,7 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
 #include <MyGUI_ScrollBar.h>
+#include <MyGUI_UString.h>
 
 #include <osg/Texture2D>
 
@@ -19,7 +20,6 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "tooltips.hpp"
-#include "ustring.hpp"
 
 namespace
 {
@@ -114,7 +114,8 @@ namespace MWGui
 
         MyGUI::Button* okButton;
         getWidget(okButton, "OKButton");
-        okButton->setCaption(toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+        okButton->setCaption(
+            MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
         okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onOkClicked);
 
         updateRaces();
@@ -129,10 +130,10 @@ namespace MWGui
 
         if (shown)
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void RaceDialog::onOpen()
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index c2acea93ce..7d57988d97 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -75,7 +75,7 @@ namespace MWGui
 
         mChargeLabel->setCaptionWithReplacing("#{sCharges} " + MyGUI::utility::toString(creature->mData.mSoul));
 
-        bool toolBoxVisible = (gem.getRefData().getCount() != 0);
+        bool toolBoxVisible = gem.getCellRef().getCount() != 0;
         mGemBox->setVisible(toolBoxVisible);
         mGemBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
 
diff --git a/apps/openmw/mwgui/referenceinterface.cpp b/apps/openmw/mwgui/referenceinterface.cpp
index de7c93d862..6dad6b8543 100644
--- a/apps/openmw/mwgui/referenceinterface.cpp
+++ b/apps/openmw/mwgui/referenceinterface.cpp
@@ -2,14 +2,14 @@
 
 namespace MWGui
 {
-    ReferenceInterface::ReferenceInterface() {}
+    ReferenceInterface::ReferenceInterface() = default;
 
-    ReferenceInterface::~ReferenceInterface() {}
+    ReferenceInterface::~ReferenceInterface() = default;
 
     void ReferenceInterface::checkReferenceAvailable()
     {
         // check if count of the reference has become 0
-        if (!mPtr.isEmpty() && mPtr.getRefData().getCount() == 0)
+        if (!mPtr.isEmpty() && mPtr.getCellRef().getCount() == 0)
         {
             mPtr = MWWorld::Ptr();
             onReferenceUnavailable();
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index aabd3d46ab..c1602b8407 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -49,7 +49,7 @@ namespace MWGui
             = new SortFilterItemModel(std::make_unique<InventoryItemModel>(MWMechanics::getPlayer()));
         model->setFilter(SortFilterItemModel::Filter_OnlyRepairable);
         mRepairBox->setModel(model);
-
+        mRepairBox->update();
         // Reset scrollbars
         mRepairBox->resetScrollbars();
     }
@@ -86,7 +86,7 @@ namespace MWGui
         mUsesLabel->setCaptionWithReplacing("#{sUses} " + MyGUI::utility::toString(uses));
         mQualityLabel->setCaptionWithReplacing("#{sQuality} " + qualityStr.str());
 
-        bool toolBoxVisible = (mRepair.getTool().getRefData().getCount() != 0);
+        bool toolBoxVisible = (mRepair.getTool().getCellRef().getCount() != 0);
         mToolBox->setVisible(toolBoxVisible);
         mToolBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
 
@@ -142,7 +142,7 @@ namespace MWGui
 
     void Repair::onRepairItem(MyGUI::Widget* /*sender*/, const MWWorld::Ptr& ptr)
     {
-        if (!mRepair.getTool().getRefData().getCount())
+        if (!mRepair.getTool().getCellRef().getCount())
             return;
 
         mRepair.repair(ptr);
diff --git a/apps/openmw/mwgui/resourceskin.cpp b/apps/openmw/mwgui/resourceskin.cpp
index ea081dd17a..3d9f09952e 100644
--- a/apps/openmw/mwgui/resourceskin.cpp
+++ b/apps/openmw/mwgui/resourceskin.cpp
@@ -9,15 +9,14 @@ namespace MWGui
     void resizeSkin(MyGUI::xml::ElementPtr _node)
     {
         _node->setAttribute("type", "ResourceSkin");
-        const std::string size = _node->findAttribute("size");
-        if (!size.empty())
+        if (!_node->findAttribute("size").empty())
             return;
 
-        const std::string textureName = _node->findAttribute("texture");
+        auto textureName = _node->findAttribute("texture");
         if (textureName.empty())
             return;
 
-        MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(textureName);
+        MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(std::string{ textureName });
         if (!texture)
             return;
 
@@ -30,7 +29,7 @@ namespace MWGui
             if (basis->getName() != "BasisSkin")
                 continue;
 
-            const std::string basisSkinType = basis->findAttribute("type");
+            auto basisSkinType = basis->findAttribute("type");
             if (Misc::StringUtils::ciEqual(basisSkinType, "SimpleText"))
                 continue;
             bool isTileRect = Misc::StringUtils::ciEqual(basisSkinType, "TileRect");
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index 04c3806c0e..ddce2c5f50 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -6,6 +6,7 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm3/loadbsgn.hpp>
 #include <components/esm3/loadrace.hpp>
@@ -19,7 +20,6 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "tooltips.hpp"
-#include "ustring.hpp"
 
 namespace
 {
@@ -148,11 +148,11 @@ namespace MWGui
         mUpdateSkillArea = true;
     }
 
-    void ReviewDialog::setClass(const ESM::Class& class_)
+    void ReviewDialog::setClass(const ESM::Class& playerClass)
     {
-        mKlass = class_;
-        mClassWidget->setCaption(mKlass.mName);
-        ToolTips::createClassToolTip(mClassWidget, mKlass);
+        mClass = playerClass;
+        mClassWidget->setCaption(mClass.mName);
+        ToolTips::createClassToolTip(mClassWidget, mClass);
     }
 
     void ReviewDialog::setBirthSign(const ESM::RefId& signId)
@@ -272,7 +272,7 @@ namespace MWGui
         MyGUI::TextBox* groupWidget = mSkillView->createWidget<MyGUI::TextBox>("SandBrightText",
             MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height), MyGUI::Align::Default);
         groupWidget->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
-        groupWidget->setCaption(toUString(label));
+        groupWidget->setCaption(MyGUI::UString(label));
         mSkillWidgets.push_back(groupWidget);
 
         const int lineHeight = Settings::gui().mFontSize + 2;
@@ -287,7 +287,7 @@ namespace MWGui
         MyGUI::TextBox* skillValueWidget;
 
         skillNameWidget = mSkillView->createWidget<MyGUI::TextBox>("SandText", coord1, MyGUI::Align::Default);
-        skillNameWidget->setCaption(toUString(text));
+        skillNameWidget->setCaption(MyGUI::UString(text));
         skillNameWidget->eventMouseWheel += MyGUI::newDelegate(this, &ReviewDialog::onMouseWheel);
 
         skillValueWidget = mSkillView->createWidget<MyGUI::TextBox>("SandTextRight", coord2, MyGUI::Align::Default);
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index 6f594c60f0..7226ad628d 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -30,7 +30,7 @@ namespace MWGui
 
         void setPlayerName(const std::string& name);
         void setRace(const ESM::RefId& raceId);
-        void setClass(const ESM::Class& class_);
+        void setClass(const ESM::Class& playerClass);
         void setBirthSign(const ESM::RefId& signId);
 
         void setHealth(const MWMechanics::DynamicStat<float>& value);
@@ -96,7 +96,7 @@ namespace MWGui
         std::map<ESM::RefId, MyGUI::TextBox*> mSkillWidgetMap;
         ESM::RefId mRaceId, mBirthSignId;
         std::string mName;
-        ESM::Class mKlass;
+        ESM::Class mClass;
         std::vector<MyGUI::Widget*> mSkillWidgets; //< Skills and other information
 
         bool mUpdateSkillArea;
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 71b39328f6..94f25e118b 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -7,23 +7,20 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LanguageManager.h>
+#include <MyGUI_UString.h>
 
 #include <osg/Texture2D>
 #include <osgDB/ReadFile>
 
 #include <components/debug/debuglog.hpp>
-
-#include <components/myguiplatform/myguitexture.hpp>
-
-#include <components/misc/strings/lower.hpp>
-
-#include <components/settings/settings.hpp>
-
+#include <components/esm3/loadclas.hpp>
 #include <components/files/conversion.hpp>
 #include <components/files/memorystream.hpp>
+#include <components/l10n/manager.hpp>
+#include <components/misc/strings/lower.hpp>
 #include <components/misc/timeconvert.hpp>
-
-#include <components/esm3/loadclas.hpp>
+#include <components/myguiplatform/myguitexture.hpp>
+#include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
@@ -35,7 +32,6 @@
 #include "../mwstate/character.hpp"
 
 #include "confirmationdialog.hpp"
-#include "ustring.hpp"
 
 namespace MWGui
 {
@@ -168,7 +164,7 @@ namespace MWGui
 
         mCurrentCharacter = mgr->getCurrentCharacter();
 
-        const std::string& directory = Settings::Manager::getString("character", "Saves");
+        const std::string& directory = Settings::saves().mCharacter;
 
         size_t selectedIndex = MyGUI::ITEM_NONE;
 
@@ -197,8 +193,8 @@ namespace MWGui
                         className = "?"; // From an older savegame format that did not support custom classes properly.
                 }
 
-                title << " (#{sLevel} " << signature.mPlayerLevel << " "
-                      << MyGUI::TextIterator::toTagsString(toUString(className)) << ")";
+                title << " (#{OMWEngine:Level} " << signature.mPlayerLevel << " "
+                      << MyGUI::TextIterator::toTagsString(MyGUI::UString(className)) << ")";
 
                 mCharacterSelection->addItem(MyGUI::LanguageManager::getInstance().replaceTags(title.str()));
 
@@ -302,7 +298,7 @@ namespace MWGui
 
         if (mSaving)
         {
-            MWBase::Environment::get().getStateManager()->saveGame(mSaveNameEdit->getCaption().asUTF8(), mCurrentSlot);
+            MWBase::Environment::get().getStateManager()->saveGame(mSaveNameEdit->getCaption(), mCurrentSlot);
         }
         else
         {
@@ -367,18 +363,23 @@ namespace MWGui
 
     std::string formatTimeplayed(const double timeInSeconds)
     {
-        int timePlayed = (int)floor(timeInSeconds);
-        int days = timePlayed / 60 / 60 / 24;
-        int hours = (timePlayed / 60 / 60) % 24;
-        int minutes = (timePlayed / 60) % 60;
-        int seconds = timePlayed % 60;
+        auto l10n = MWBase::Environment::get().getL10nManager()->getContext("Interface");
+        int duration = static_cast<int>(timeInSeconds);
+        if (duration <= 0)
+            return l10n->formatMessage("DurationSecond", { "seconds" }, { 0 });
 
-        std::stringstream stream;
-        stream << std::setfill('0') << std::setw(2) << days << ":";
-        stream << std::setfill('0') << std::setw(2) << hours << ":";
-        stream << std::setfill('0') << std::setw(2) << minutes << ":";
-        stream << std::setfill('0') << std::setw(2) << seconds;
-        return stream.str();
+        std::string result;
+        int hours = duration / 3600;
+        int minutes = (duration / 60) % 60;
+        int seconds = duration % 60;
+        if (hours)
+            result += l10n->formatMessage("DurationHour", { "hours" }, { hours });
+        if (minutes)
+            result += l10n->formatMessage("DurationMinute", { "minutes" }, { minutes });
+        if (seconds)
+            result += l10n->formatMessage("DurationSecond", { "seconds" }, { seconds });
+
+        return result;
     }
 
     void SaveGameDialog::onSlotSelected(MyGUI::ListBox* sender, size_t pos)
@@ -412,7 +413,11 @@ namespace MWGui
 
         text << Misc::fileTimeToString(mCurrentSlot->mTimeStamp, "%Y.%m.%d %T") << "\n";
 
-        text << "#{sLevel} " << mCurrentSlot->mProfile.mPlayerLevel << "\n";
+        if (mCurrentSlot->mProfile.mMaximumHealth > 0)
+            text << "#{OMWEngine:Health} " << static_cast<int>(mCurrentSlot->mProfile.mCurrentHealth) << "/"
+                 << static_cast<int>(mCurrentSlot->mProfile.mMaximumHealth) << "\n";
+
+        text << "#{OMWEngine:Level} " << mCurrentSlot->mProfile.mPlayerLevel << "\n";
         text << "#{sCell=" << mCurrentSlot->mProfile.mPlayerCellName << "}\n";
 
         int hour = int(mCurrentSlot->mProfile.mInGameTime.mGameHour);
@@ -422,12 +427,15 @@ namespace MWGui
         if (hour == 0)
             hour = 12;
 
+        if (mCurrentSlot->mProfile.mCurrentDay > 0)
+            text << "#{Calendar:day} " << mCurrentSlot->mProfile.mCurrentDay << "\n";
+
         text << mCurrentSlot->mProfile.mInGameTime.mDay << " "
              << MWBase::Environment::get().getWorld()->getTimeManager()->getMonthName(
                     mCurrentSlot->mProfile.mInGameTime.mMonth)
              << " " << hour << " " << (pm ? "#{Calendar:pm}" : "#{Calendar:am}");
 
-        if (Settings::Manager::getBool("timeplayed", "Saves"))
+        if (mCurrentSlot->mProfile.mTimePlayed > 0)
         {
             text << "\n"
                  << "#{OMWEngine:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);
diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index e22517a360..0068ba7960 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -96,9 +96,10 @@ namespace MWGui
         {
             imageBox->setImageTexture(texturePath);
             const MyGUI::IntSize imageSize = imageBox->getImageSize();
-            imageBox->setImageCoord(
-                MyGUI::IntCoord(texCoordOverride.left * imageSize.width, texCoordOverride.top * imageSize.height,
-                    texCoordOverride.width * imageSize.width, texCoordOverride.height * imageSize.height));
+            imageBox->setImageCoord(MyGUI::IntCoord(static_cast<int>(texCoordOverride.left * imageSize.width),
+                static_cast<int>(texCoordOverride.top * imageSize.height),
+                static_cast<int>(texCoordOverride.width * imageSize.width),
+                static_cast<int>(texCoordOverride.height * imageSize.height)));
         }
     }
 
diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index 3debf0d66d..0b1658fd84 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -3,6 +3,7 @@
 #include <MyGUI_ScrollView.h>
 
 #include <components/esm3/loadbook.hpp>
+#include <components/esm4/loadbook.hpp>
 #include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -42,17 +43,22 @@ namespace MWGui
 
     void ScrollWindow::setPtr(const MWWorld::Ptr& scroll)
     {
-        if (scroll.isEmpty() || scroll.getType() != ESM::REC_BOOK)
+        if (scroll.isEmpty() || (scroll.getType() != ESM::REC_BOOK && scroll.getType() != ESM::REC_BOOK4))
             throw std::runtime_error("Invalid argument in ScrollWindow::setPtr");
         mScroll = scroll;
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         bool showTakeButton = scroll.getContainerStore() != &player.getClass().getContainerStore(player);
 
-        MWWorld::LiveCellRef<ESM::Book>* ref = mScroll.get<ESM::Book>();
+        const std::string* text;
+        if (scroll.getType() == ESM::REC_BOOK)
+            text = &scroll.get<ESM::Book>()->mBase->mText;
+        else
+            text = &scroll.get<ESM4::Book>()->mBase->mText;
+        bool shrinkTextAtLastTag = scroll.getType() == ESM::REC_BOOK;
 
         Formatting::BookFormatter formatter;
-        formatter.markupToWidget(mTextView, ref->mBase->mText, 390, mTextView->getHeight());
+        formatter.markupToWidget(mTextView, *text, 390, mTextView->getHeight(), shrinkTextAtLastTag);
         MyGUI::IntSize size = mTextView->getChildAt(0)->getSize();
 
         // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the
diff --git a/apps/openmw/mwgui/settings.cpp b/apps/openmw/mwgui/settings.cpp
index fb1068ca41..5005876d55 100644
--- a/apps/openmw/mwgui/settings.cpp
+++ b/apps/openmw/mwgui/settings.cpp
@@ -99,6 +99,25 @@ namespace MWGui
         };
     }
 
+    WindowSettingValues makeDebugWindowSettingValues()
+    {
+        return WindowSettingValues{
+            .mRegular = WindowRectSettingValues {
+                .mX = Settings::windows().mDebugX,
+                .mY = Settings::windows().mDebugY,
+                .mW = Settings::windows().mDebugW,
+                .mH = Settings::windows().mDebugH,
+            },
+            .mMaximized = WindowRectSettingValues {
+                .mX = Settings::windows().mDebugMaximizedX,
+                .mY = Settings::windows().mDebugMaximizedY,
+                .mW = Settings::windows().mDebugMaximizedW,
+                .mH = Settings::windows().mDebugMaximizedH,
+            },
+            .mIsMaximized = Settings::windows().mDebugMaximized,
+        };
+    }
+
     WindowSettingValues makeDialogueWindowSettingValues()
     {
         return WindowSettingValues{
diff --git a/apps/openmw/mwgui/settings.hpp b/apps/openmw/mwgui/settings.hpp
index 8d1cda37dd..b51ac29ce5 100644
--- a/apps/openmw/mwgui/settings.hpp
+++ b/apps/openmw/mwgui/settings.hpp
@@ -25,6 +25,7 @@ namespace MWGui
     WindowSettingValues makeCompanionWindowSettingValues();
     WindowSettingValues makeConsoleWindowSettingValues();
     WindowSettingValues makeContainerWindowSettingValues();
+    WindowSettingValues makeDebugWindowSettingValues();
     WindowSettingValues makeDialogueWindowSettingValues();
     WindowSettingValues makeInventoryWindowSettingValues();
     WindowSettingValues makeInventoryBarterWindowSettingValues();
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index b077d9f640..f38f6dc0e1 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -2,7 +2,6 @@
 
 #include <array>
 #include <iomanip>
-#include <numeric>
 #include <regex>
 
 #include <unicode/locid.h>
@@ -13,6 +12,7 @@
 #include <MyGUI_ScrollBar.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_TabControl.h>
+#include <MyGUI_UString.h>
 #include <MyGUI_Window.h>
 
 #include <SDL_video.h>
@@ -20,6 +20,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/lua_ui/scriptsettings.hpp>
 #include <components/misc/constants.hpp>
+#include <components/misc/display.hpp>
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/format.hpp>
@@ -28,6 +29,7 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/settings/values.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 #include <components/widgets/sharedstatebutton.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -38,20 +40,25 @@
 #include "../mwbase/world.hpp"
 
 #include "confirmationdialog.hpp"
-#include "ustring.hpp"
 
 namespace
 {
-    std::string textureMipmappingToStr(const std::string& val)
+    std::string textureFilteringToStr(const std::string& mipFilter, const std::string& magFilter)
     {
-        if (val == "linear")
-            return "#{OMWEngine:TextureFilteringTrilinear}";
-        if (val == "nearest")
-            return "#{OMWEngine:TextureFilteringBilinear}";
-        if (val == "none")
+        if (mipFilter == "none")
             return "#{OMWEngine:TextureFilteringDisabled}";
 
-        Log(Debug::Warning) << "Warning: Invalid texture mipmap option: " << val;
+        if (magFilter == "linear")
+        {
+            if (mipFilter == "linear")
+                return "#{OMWEngine:TextureFilteringTrilinear}";
+            if (mipFilter == "nearest")
+                return "#{OMWEngine:TextureFilteringBilinear}";
+        }
+        else if (magFilter == "nearest")
+            return "#{OMWEngine:TextureFilteringNearest}";
+
+        Log(Debug::Warning) << "Warning: Invalid texture filtering options: " << mipFilter << ", " << magFilter;
         return "#{OMWEngine:TextureFilteringOther}";
     }
 
@@ -93,20 +100,6 @@ namespace
         return left.first > right.first;
     }
 
-    std::string getAspect(int x, int y)
-    {
-        int gcd = std::gcd(x, y);
-        if (gcd == 0)
-            return std::string();
-
-        int xaspect = x / gcd;
-        int yaspect = y / gcd;
-        // special case: 8 : 5 is usually referred to as 16:10
-        if (xaspect == 8 && yaspect == 5)
-            return "16 : 10";
-        return MyGUI::utility::toString(xaspect) + " : " + MyGUI::utility::toString(yaspect);
-    }
-
     const std::string_view checkButtonType = "CheckButton";
     const std::string_view sliderType = "Slider";
 
@@ -145,9 +138,9 @@ namespace
     void updateMaxLightsComboBox(MyGUI::ComboBox* box)
     {
         constexpr int min = 8;
-        constexpr int max = 32;
+        constexpr int max = 64;
         constexpr int increment = 8;
-        int maxLights = Settings::Manager::getInt("max lights", "Shaders");
+        const int maxLights = Settings::shaders().mMaxLights;
         // show increments of 8 in dropdown
         if (maxLights >= min && maxLights <= max && !(maxLights % increment))
             box->setIndexSelected((maxLights / increment) - 1);
@@ -168,7 +161,7 @@ namespace MWGui
             std::string_view type = getSettingType(current);
             if (type == checkButtonType)
             {
-                const std::string initialValue
+                std::string_view initialValue
                     = Settings::get<bool>(getSettingCategory(current), getSettingName(current)) ? "#{Interface:On}"
                                                                                                 : "#{Interface:Off}";
                 current->castType<MyGUI::Button>()->setCaptionWithReplacing(initialValue);
@@ -230,14 +223,24 @@ namespace MWGui
         }
     }
 
+    void SettingsWindow::onFrame(float duration)
+    {
+        if (mScriptView->getVisible())
+        {
+            const auto scriptsSize = mScriptAdapter->getSize();
+            if (mScriptView->getCanvasSize() != scriptsSize)
+                mScriptView->setCanvasSize(scriptsSize);
+        }
+    }
+
     void SettingsWindow::updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value)
     {
-        std::string labelWidgetName = scroller->getUserString("SettingLabelWidget");
+        auto labelWidgetName = scroller->getUserString("SettingLabelWidget");
         if (!labelWidgetName.empty())
         {
             MyGUI::TextBox* textBox;
             getWidget(textBox, labelWidgetName);
-            std::string labelCaption = scroller->getUserString("SettingLabelCaption");
+            std::string labelCaption{ scroller->getUserString("SettingLabelCaption") };
             labelCaption = Misc::StringUtils::format(labelCaption, value);
             textBox->setCaptionWithReplacing(labelCaption);
         }
@@ -248,7 +251,7 @@ namespace MWGui
         , mKeyboardMode(true)
         , mCurrentPage(-1)
     {
-        bool terrain = Settings::Manager::getBool("distant terrain", "Terrain");
+        const bool terrain = Settings::terrain().mDistantTerrain;
         const std::string_view widgetName = terrain ? "RenderingDistanceSlider" : "LargeRenderingDistanceSlider";
         MyGUI::Widget* unusedSlider;
         getWidget(unusedSlider, widgetName);
@@ -269,6 +272,9 @@ namespace MWGui
         getWidget(mResetControlsButton, "ResetControlsButton");
         getWidget(mKeyboardSwitch, "KeyboardButton");
         getWidget(mControllerSwitch, "ControllerButton");
+        getWidget(mWaterRefractionButton, "WaterRefractionButton");
+        getWidget(mSunlightScatteringButton, "SunlightScatteringButton");
+        getWidget(mWobblyShoresButton, "WobblyShoresButton");
         getWidget(mWaterTextureSize, "WaterTextureSize");
         getWidget(mWaterReflectionDetail, "WaterReflectionDetail");
         getWidget(mWaterRainRippleDetail, "WaterRainRippleDetail");
@@ -309,6 +315,8 @@ namespace MWGui
             += MyGUI::newDelegate(this, &SettingsWindow::onTextureFilteringChanged);
         mResolutionList->eventListChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onResolutionSelected);
 
+        mWaterRefractionButton->eventMouseButtonClick
+            += MyGUI::newDelegate(this, &SettingsWindow::onRefractionButtonClicked);
         mWaterTextureSize->eventComboChangePosition
             += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
         mWaterReflectionDetail->eventComboChangePosition
@@ -344,7 +352,7 @@ namespace MWGui
             += MyGUI::newDelegate(this, &SettingsWindow::onResetDefaultBindings);
 
         // fill resolution list
-        int screen = Settings::Manager::getInt("screen", "Video");
+        const int screen = Settings::video().mScreen;
         int numDisplayModes = SDL_GetNumDisplayModes(screen);
         std::vector<std::pair<int, int>> resolutions;
         for (int i = 0; i < numDisplayModes; i++)
@@ -356,21 +364,17 @@ namespace MWGui
         std::sort(resolutions.begin(), resolutions.end(), sortResolutions);
         for (std::pair<int, int>& resolution : resolutions)
         {
-            std::string str
-                = MyGUI::utility::toString(resolution.first) + " x " + MyGUI::utility::toString(resolution.second);
-            std::string aspect = getAspect(resolution.first, resolution.second);
-            if (!aspect.empty())
-                str = str + " (" + aspect + ")";
+            std::string str = Misc::getResolutionText(resolution.first, resolution.second, "%i x %i (%i:%i)");
 
             if (mResolutionList->findItemIndexWith(str) == MyGUI::ITEM_NONE)
                 mResolutionList->addItem(str);
         }
         highlightCurrentResolution();
 
-        const std::string& tmip = Settings::general().mTextureMipmap;
-        mTextureFilteringButton->setCaptionWithReplacing(textureMipmappingToStr(tmip));
+        mTextureFilteringButton->setCaptionWithReplacing(
+            textureFilteringToStr(Settings::general().mTextureMipmap, Settings::general().mTextureMinFilter));
 
-        int waterTextureSize = Settings::Manager::getInt("rtt size", "Water");
+        int waterTextureSize = Settings::water().mRttSize;
         if (waterTextureSize >= 512)
             mWaterTextureSize->setIndexSelected(0);
         if (waterTextureSize >= 1024)
@@ -378,16 +382,19 @@ namespace MWGui
         if (waterTextureSize >= 2048)
             mWaterTextureSize->setIndexSelected(2);
 
-        int waterReflectionDetail = std::clamp(Settings::Manager::getInt("reflection detail", "Water"), 0, 5);
+        const int waterReflectionDetail = Settings::water().mReflectionDetail;
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
-        int waterRainRippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
+        const int waterRainRippleDetail = Settings::water().mRainRippleDetail;
         mWaterRainRippleDetail->setIndexSelected(waterRainRippleDetail);
 
+        const bool waterRefraction = Settings::water().mRefraction;
+        mSunlightScatteringButton->setEnabled(waterRefraction);
+        mWobblyShoresButton->setEnabled(waterRefraction);
+
         updateMaxLightsComboBox(mMaxLights);
 
-        Settings::WindowMode windowMode
-            = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
+        const Settings::WindowMode windowMode = Settings::video().mWindowMode;
         mWindowBorderButton->setEnabled(
             windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::WindowedFullscreen);
 
@@ -401,7 +408,8 @@ namespace MWGui
 
         std::vector<std::string> availableLanguages;
         const VFS::Manager* vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-        for (const auto& path : vfs->getRecursiveDirectoryIterator("l10n/"))
+        constexpr VFS::Path::NormalizedView l10n("l10n/");
+        for (const auto& path : vfs->getRecursiveDirectoryIterator(l10n))
         {
             if (Misc::getFileExtension(path) == "yaml")
             {
@@ -459,7 +467,7 @@ namespace MWGui
 
     void SettingsWindow::onOkButtonClicked(MyGUI::Widget* _sender)
     {
-        MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Settings);
+        setVisible(false);
     }
 
     void SettingsWindow::onResolutionSelected(MyGUI::ListBox* _sender, size_t index)
@@ -481,8 +489,8 @@ namespace MWGui
         int resX, resY;
         parseResolution(resX, resY, resStr);
 
-        Settings::Manager::setInt("resolution x", "Video", resX);
-        Settings::Manager::setInt("resolution y", "Video", resY);
+        Settings::video().mResolutionX.set(resX);
+        Settings::video().mResolutionY.set(resY);
 
         apply();
     }
@@ -496,8 +504,8 @@ namespace MWGui
     {
         mResolutionList->setIndexSelected(MyGUI::ITEM_NONE);
 
-        int currentX = Settings::Manager::getInt("resolution x", "Video");
-        int currentY = Settings::Manager::getInt("resolution y", "Video");
+        const int currentX = Settings::video().mResolutionX;
+        const int currentY = Settings::video().mResolutionY;
 
         for (size_t i = 0; i < mResolutionList->getItemCount(); ++i)
         {
@@ -512,6 +520,14 @@ namespace MWGui
         }
     }
 
+    void SettingsWindow::onRefractionButtonClicked(MyGUI::Widget* _sender)
+    {
+        const bool refractionEnabled = Settings::water().mRefraction;
+
+        mSunlightScatteringButton->setEnabled(refractionEnabled);
+        mWobblyShoresButton->setEnabled(refractionEnabled);
+    }
+
     void SettingsWindow::onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
         int size = 0;
@@ -521,21 +537,19 @@ namespace MWGui
             size = 1024;
         else if (pos == 2)
             size = 2048;
-        Settings::Manager::setInt("rtt size", "Water", size);
+        Settings::water().mRttSize.set(size);
         apply();
     }
 
     void SettingsWindow::onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = static_cast<unsigned int>(std::min<size_t>(pos, 5));
-        Settings::Manager::setInt("reflection detail", "Water", level);
+        Settings::water().mReflectionDetail.set(static_cast<int>(pos));
         apply();
     }
 
     void SettingsWindow::onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = static_cast<unsigned int>(std::min<size_t>(pos, 2));
-        Settings::Manager::setInt("rain ripple detail", "Water", level);
+        Settings::water().mRainRippleDetail.set(static_cast<int>(pos));
         apply();
     }
 
@@ -549,7 +563,8 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
             "#{OMWEngine:ChangeRequiresRestart}", { "#{Interface:OK}" }, true);
 
-        Settings::Manager::setString("lighting method", "Shaders", *_sender->getItemDataAt<std::string>(pos));
+        Settings::shaders().mLightingMethod.set(
+            Settings::parseLightingMethod(*_sender->getItemDataAt<std::string>(pos)));
         apply();
     }
 
@@ -582,23 +597,22 @@ namespace MWGui
             "#{OMWEngine:ChangeRequiresRestart}", { "#{Interface:OK}" }, true);
     }
 
-    void SettingsWindow::onVSyncModeChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onVSyncModeChanged(MyGUI::ComboBox* sender, size_t pos)
     {
         if (pos == MyGUI::ITEM_NONE)
             return;
 
-        int index = static_cast<int>(_sender->getIndexSelected());
-        Settings::Manager::setInt("vsync mode", "Video", index);
+        Settings::video().mVsyncMode.set(static_cast<SDLUtil::VSyncMode>(sender->getIndexSelected()));
         apply();
     }
 
-    void SettingsWindow::onWindowModeChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onWindowModeChanged(MyGUI::ComboBox* sender, size_t pos)
     {
         if (pos == MyGUI::ITEM_NONE)
             return;
 
-        int index = static_cast<int>(_sender->getIndexSelected());
-        if (index == static_cast<size_t>(Settings::WindowMode::WindowedFullscreen))
+        const Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(sender->getIndexSelected());
+        if (windowMode == Settings::WindowMode::WindowedFullscreen)
         {
             mResolutionList->setEnabled(false);
             mWindowModeHint->setVisible(true);
@@ -609,20 +623,18 @@ namespace MWGui
             mWindowModeHint->setVisible(false);
         }
 
-        if (index == static_cast<size_t>(Settings::WindowMode::Windowed))
+        if (windowMode == Settings::WindowMode::Windowed)
             mWindowBorderButton->setEnabled(true);
         else
             mWindowBorderButton->setEnabled(false);
 
-        Settings::Manager::setInt("window mode", "Video", index);
+        Settings::video().mWindowMode.set(windowMode);
         apply();
     }
 
     void SettingsWindow::onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        int count = 8 * (pos + 1);
-
-        Settings::Manager::setInt("max lights", "Shaders", count);
+        Settings::shaders().mMaxLights.set(8 * (pos + 1));
         apply();
         configureWidgets(mMainWidget, false);
     }
@@ -636,6 +648,8 @@ namespace MWGui
         if (selectedButton == 1 || selectedButton == -1)
             return;
 
+        Settings::shaders().mForcePerPixelLighting.reset();
+        Settings::shaders().mClassicFalloff.reset();
         Settings::shaders().mLightBoundsMultiplier.reset();
         Settings::shaders().mMaximumLightDistance.reset();
         Settings::shaders().mLightFadeStart.reset();
@@ -643,8 +657,7 @@ namespace MWGui
         Settings::shaders().mMaxLights.reset();
         Settings::shaders().mLightingMethod.reset();
 
-        const SceneUtil::LightingMethod lightingMethod
-            = SceneUtil::LightManager::getLightingMethodFromString(Settings::shaders().mLightingMethod);
+        const SceneUtil::LightingMethod lightingMethod = Settings::shaders().mLightingMethod;
         const std::size_t lightIndex = mLightingMethodButton->findItemIndexWith(lightingMethodToStr(lightingMethod));
         mLightingMethodButton->setIndexSelected(lightIndex);
         updateMaxLightsComboBox(mMaxLights);
@@ -655,18 +668,17 @@ namespace MWGui
 
     void SettingsWindow::onButtonToggled(MyGUI::Widget* _sender)
     {
-        MyGUI::UString on = toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOn", "On"));
+        std::string_view on = MWBase::Environment::get().getWindowManager()->getGameSettingString("sOn", "On");
         bool newState;
         if (_sender->castType<MyGUI::Button>()->getCaption() == on)
         {
-            MyGUI::UString off
-                = toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOff", "Off"));
-            _sender->castType<MyGUI::Button>()->setCaption(off);
+            _sender->castType<MyGUI::Button>()->setCaption(
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOff", "Off")));
             newState = false;
         }
         else
         {
-            _sender->castType<MyGUI::Button>()->setCaption(on);
+            _sender->castType<MyGUI::Button>()->setCaption(MyGUI::UString(on));
             newState = true;
         }
 
@@ -680,12 +692,24 @@ namespace MWGui
 
     void SettingsWindow::onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        if (pos == 0)
-            Settings::general().mTextureMipmap.set("nearest");
-        else if (pos == 1)
-            Settings::general().mTextureMipmap.set("linear");
-        else
-            Log(Debug::Warning) << "Unexpected option pos " << pos;
+        auto& generalSettings = Settings::general();
+        switch (pos)
+        {
+            case 0: // Bilinear with mips
+                generalSettings.mTextureMipmap.set("nearest");
+                generalSettings.mTextureMagFilter.set("linear");
+                generalSettings.mTextureMinFilter.set("linear");
+                break;
+            case 1: // Trilinear with mips
+                generalSettings.mTextureMipmap.set("linear");
+                generalSettings.mTextureMagFilter.set("linear");
+                generalSettings.mTextureMinFilter.set("linear");
+                break;
+            default:
+                Log(Debug::Warning) << "Unexpected texture filtering option pos " << pos;
+                break;
+        }
+
         apply();
     }
 
@@ -843,14 +867,12 @@ namespace MWGui
 
     void SettingsWindow::updateWindowModeSettings()
     {
-        size_t index = static_cast<size_t>(Settings::Manager::getInt("window mode", "Video"));
+        const Settings::WindowMode windowMode = Settings::video().mWindowMode;
+        const std::size_t windowModeIndex = static_cast<std::size_t>(windowMode);
 
-        if (index > static_cast<size_t>(Settings::WindowMode::Windowed))
-            index = MyGUI::ITEM_NONE;
+        mWindowModeList->setIndexSelected(windowModeIndex);
 
-        mWindowModeList->setIndexSelected(index);
-
-        if (index != static_cast<size_t>(Settings::WindowMode::Windowed) && index != MyGUI::ITEM_NONE)
+        if (windowMode != Settings::WindowMode::Windowed && windowModeIndex != MyGUI::ITEM_NONE)
         {
             // check if this resolution is supported in fullscreen
             if (mResolutionList->getIndexSelected() != MyGUI::ITEM_NONE)
@@ -858,8 +880,8 @@ namespace MWGui
                 const std::string& resStr = mResolutionList->getItemNameAt(mResolutionList->getIndexSelected());
                 int resX, resY;
                 parseResolution(resX, resY, resStr);
-                Settings::Manager::setInt("resolution x", "Video", resX);
-                Settings::Manager::setInt("resolution y", "Video", resY);
+                Settings::video().mResolutionX.set(resX);
+                Settings::video().mResolutionY.set(resY);
             }
 
             bool supported = false;
@@ -876,8 +898,7 @@ namespace MWGui
                     fallbackY = resY;
                 }
 
-                if (resX == Settings::Manager::getInt("resolution x", "Video")
-                    && resY == Settings::Manager::getInt("resolution y", "Video"))
+                if (resX == Settings::video().mResolutionX && resY == Settings::video().mResolutionY)
                     supported = true;
             }
 
@@ -885,26 +906,21 @@ namespace MWGui
             {
                 if (fallbackX != 0 && fallbackY != 0)
                 {
-                    Settings::Manager::setInt("resolution x", "Video", fallbackX);
-                    Settings::Manager::setInt("resolution y", "Video", fallbackY);
+                    Settings::video().mResolutionX.set(fallbackX);
+                    Settings::video().mResolutionY.set(fallbackY);
                 }
             }
 
             mWindowBorderButton->setEnabled(false);
         }
 
-        if (index == static_cast<size_t>(Settings::WindowMode::WindowedFullscreen))
+        if (windowMode == Settings::WindowMode::WindowedFullscreen)
             mResolutionList->setEnabled(false);
     }
 
     void SettingsWindow::updateVSyncModeSettings()
     {
-        int index = static_cast<size_t>(Settings::Manager::getInt("vsync mode", "Video"));
-
-        if (index < 0 || index > 2)
-            index = 0;
-
-        mVSyncModeList->setIndexSelected(index);
+        mVSyncModeList->setIndexSelected(static_cast<size_t>(Settings::video().mVsyncMode));
     }
 
     void SettingsWindow::layoutControlsBox()
@@ -1005,7 +1021,6 @@ namespace MWGui
         mScriptDisabled->setVisible(disabled);
 
         LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
-        mScriptView->setCanvasSize(mScriptAdapter->getSize());
     }
 
     void SettingsWindow::onScriptFilterChange(MyGUI::EditBox*)
@@ -1022,7 +1037,6 @@ namespace MWGui
             mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
             LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
         }
-        mScriptView->setCanvasSize(mScriptAdapter->getSize());
     }
 
     void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index ecf9bf0d94..dc4e09f8ac 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -14,6 +14,8 @@ namespace MWGui
 
         void onOpen() override;
 
+        void onFrame(float duration) override;
+
         void updateControlsBox();
 
         void updateLightSettings();
@@ -35,6 +37,9 @@ namespace MWGui
         MyGUI::Button* mWindowBorderButton;
         MyGUI::ComboBox* mTextureFilteringButton;
 
+        MyGUI::Button* mWaterRefractionButton;
+        MyGUI::Button* mSunlightScatteringButton;
+        MyGUI::Button* mWobblyShoresButton;
         MyGUI::ComboBox* mWaterTextureSize;
         MyGUI::ComboBox* mWaterReflectionDetail;
         MyGUI::ComboBox* mWaterRainRippleDetail;
@@ -74,6 +79,7 @@ namespace MWGui
         void onResolutionCancel();
         void highlightCurrentResolution();
 
+        void onRefractionButtonClicked(MyGUI::Widget* _sender);
         void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
         void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
         void onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 4a5e02a881..fe85ea4bd0 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -174,6 +174,7 @@ namespace MWGui
         : mCategory(Category_All)
         , mFilter(0)
         , mSortByType(true)
+        , mApparatusTypeFilter(-1)
     {
         mSourceModel = std::move(sourceModel);
     }
@@ -287,7 +288,7 @@ namespace MWGui
 
         if ((mFilter & Filter_OnlyRepairable)
             && (!base.getClass().hasItemHealth(base)
-                || (base.getClass().getItemHealth(base) == base.getClass().getItemMaxHealth(base))
+                || (base.getClass().getItemHealth(base) >= base.getClass().getItemMaxHealth(base))
                 || (base.getType() != ESM::Weapon::sRecordId && base.getType() != ESM::Armor::sRecordId)))
             return false;
 
@@ -311,6 +312,16 @@ namespace MWGui
                 return false;
         }
 
+        if ((mFilter & Filter_OnlyAlchemyTools))
+        {
+            if (base.getType() != ESM::Apparatus::sRecordId)
+                return false;
+
+            int32_t apparatusType = base.get<ESM::Apparatus>()->mBase->mData.mType;
+            if (mApparatusTypeFilter >= 0 && apparatusType != mApparatusTypeFilter)
+                return false;
+        }
+
         std::string compare = Utf8Stream::lowerCaseUtf8(item.mBase.getClass().getName(item.mBase));
         if (compare.find(mNameFilter) == std::string::npos)
             return false;
@@ -352,6 +363,11 @@ namespace MWGui
         mEffectFilter = Utf8Stream::lowerCaseUtf8(filter);
     }
 
+    void SortFilterItemModel::setApparatusTypeFilter(const int32_t type)
+    {
+        mApparatusTypeFilter = type;
+    }
+
     void SortFilterItemModel::update()
     {
         mSourceModel->update();
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.hpp b/apps/openmw/mwgui/sortfilteritemmodel.hpp
index 66a22b3afa..d8490f7db1 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.hpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.hpp
@@ -27,6 +27,7 @@ namespace MWGui
         void setFilter(int filter);
         void setNameFilter(const std::string& filter);
         void setEffectFilter(const std::string& filter);
+        void setApparatusTypeFilter(const int32_t type);
 
         /// Use ItemStack::Type for sorting?
         void setSortByType(bool sort) { mSortByType = sort; }
@@ -49,6 +50,7 @@ namespace MWGui
         static constexpr int Filter_OnlyRepairable = (1 << 5);
         static constexpr int Filter_OnlyRechargable = (1 << 6);
         static constexpr int Filter_OnlyRepairTools = (1 << 7);
+        static constexpr int Filter_OnlyAlchemyTools = (1 << 8);
 
     private:
         std::vector<ItemStack> mItems;
@@ -59,6 +61,7 @@ namespace MWGui
         int mFilter;
         bool mSortByType;
 
+        int32_t mApparatusTypeFilter; // filter by apparatus type
         std::string mNameFilter; // filter by item name
         std::string mEffectFilter; // filter by magic effect
     };
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 1618f34a7a..d8302df87c 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -119,7 +119,7 @@ namespace MWGui
 
     void EditEffectDialog::newEffect(const ESM::MagicEffect* effect)
     {
-        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
+        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0 || mConstantEffect;
         bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
 
         setMagicEffect(effect);
@@ -240,7 +240,7 @@ namespace MWGui
         // cycle through range types until we find something that's allowed
         // does not handle the case where nothing is allowed (this should be prevented before opening the Add Effect
         // dialog)
-        bool allowSelf = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
+        bool allowSelf = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0 || mConstantEffect;
         bool allowTouch = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
         bool allowTarget = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTarget) && !mConstantEffect;
         if (mEffect.mRange == ESM::RT_Self && !allowSelf)
@@ -470,9 +470,7 @@ namespace MWGui
                 y *= 1.5;
         }
 
-        ESM::EffectList effectList;
-        effectList.mList = mEffects;
-        mSpell.mEffects = effectList;
+        mSpell.mEffects.populate(mEffects);
         mSpell.mData.mCost = int(y);
         mSpell.mData.mType = ESM::Spell::ST_Spell;
         mSpell.mData.mFlags = 0;
@@ -528,10 +526,11 @@ namespace MWGui
             if (spell->mData.mType != ESM::Spell::ST_Spell)
                 continue;
 
-            for (const ESM::ENAMstruct& effectInfo : spell->mEffects.mList)
+            for (const ESM::IndexedENAMstruct& effectInfo : spell->mEffects.mList)
             {
+                int16_t effectId = effectInfo.mData.mEffectID;
                 const ESM::MagicEffect* effect
-                    = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effectInfo.mEffectID);
+                    = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effectId);
 
                 // skip effects that do not allow spellmaking/enchanting
                 int requiredFlags
@@ -539,8 +538,8 @@ namespace MWGui
                 if (!(effect->mData.mFlags & requiredFlags))
                     continue;
 
-                if (std::find(knownEffects.begin(), knownEffects.end(), effectInfo.mEffectID) == knownEffects.end())
-                    knownEffects.push_back(effectInfo.mEffectID);
+                if (std::find(knownEffects.begin(), knownEffects.end(), effectId) == knownEffects.end())
+                    knownEffects.push_back(effectId);
             }
         }
 
@@ -629,7 +628,7 @@ namespace MWGui
         const ESM::MagicEffect* effect
             = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
 
-        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
+        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0 || mConstantEffect;
         bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
         bool allowTarget = (effect->mData.mFlags & ESM::MagicEffect::CastTarget) && !mConstantEffect;
 
@@ -751,25 +750,9 @@ namespace MWGui
     void EffectEditorBase::setConstantEffect(bool constant)
     {
         mAddEffectDialog.setConstantEffect(constant);
+        if (!mConstantEffect && constant)
+            for (ESM::ENAMstruct& effect : mEffects)
+                effect.mRange = ESM::RT_Self;
         mConstantEffect = constant;
-
-        if (!constant)
-            return;
-
-        for (auto it = mEffects.begin(); it != mEffects.end();)
-        {
-            if (it->mRange != ESM::RT_Self)
-            {
-                auto& store = *MWBase::Environment::get().getESMStore();
-                auto magicEffect = store.get<ESM::MagicEffect>().find(it->mEffectID);
-                if ((magicEffect->mData.mFlags & ESM::MagicEffect::CastSelf) == 0)
-                {
-                    it = mEffects.erase(it);
-                    continue;
-                }
-                it->mRange = ESM::RT_Self;
-            }
-            ++it;
-        }
     }
 }
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index 5337e2f798..aa29dfc156 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -172,7 +172,7 @@ namespace MWGui
                 w += 16;
 
                 ToolTipInfo* tooltipInfo = image->getUserData<ToolTipInfo>();
-                tooltipInfo->text = sourcesDescription;
+                tooltipInfo->text = std::move(sourcesDescription);
 
                 // Fade out
                 if (totalDuration >= fadeTime && fadeTime > 0.f)
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index f340d072e0..3d70c391c9 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -48,14 +48,14 @@ namespace MWGui
 
         for (const auto& effect : effects.mList)
         {
-            short effectId = effect.mEffectID;
+            short effectId = effect.mData.mEffectID;
 
             if (effectId != -1)
             {
                 const ESM::MagicEffect* magicEffect = store.get<ESM::MagicEffect>().find(effectId);
                 const ESM::Attribute* attribute
-                    = store.get<ESM::Attribute>().search(ESM::Attribute::indexToRefId(effect.mAttribute));
-                const ESM::Skill* skill = store.get<ESM::Skill>().search(ESM::Skill::indexToRefId(effect.mSkill));
+                    = store.get<ESM::Attribute>().search(ESM::Attribute::indexToRefId(effect.mData.mAttribute));
+                const ESM::Skill* skill = store.get<ESM::Skill>().search(ESM::Skill::indexToRefId(effect.mData.mSkill));
 
                 std::string fullEffectName = MWMechanics::getMagicEffectString(*magicEffect, attribute, skill);
                 std::string convert = Utf8Stream::lowerCaseUtf8(fullEffectName);
@@ -137,7 +137,7 @@ namespace MWGui
             newSpell.mItem = item;
             newSpell.mId = item.getCellRef().getRefId();
             newSpell.mName = item.getClass().getName(item);
-            newSpell.mCount = item.getRefData().getCount();
+            newSpell.mCount = item.getCellRef().getCount();
             newSpell.mType = Spell::Type_EnchantedItem;
             newSpell.mSelected = invStore.getSelectedEnchantItem() == it;
 
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index b136a3cad1..d183a00273 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -14,6 +14,7 @@
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/datetimemanager.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/player.hpp"
@@ -91,8 +92,8 @@ namespace MWGui
             mSpellView->incrementalUpdate();
         }
 
-        // Update effects in-game too if the window is pinned
-        if (mPinned && !MWBase::Environment::get().getWindowManager()->isGuiMode())
+        // Update effects if the time is unpaused for any reason (e.g. the window is pinned)
+        if (!MWBase::Environment::get().getWorld()->getTimeManager()->isPaused())
             mSpellIcons->updateWidgets(mEffectBox, false);
     }
 
@@ -236,9 +237,8 @@ namespace MWGui
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player))
             return;
 
-        bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
         const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
-        if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead() || stats.getHitRecovery())
+        if (stats.isParalyzed() || stats.getKnockedDown() || stats.isDead() || stats.getHitRecovery())
             return;
 
         mSpellView->setModel(new SpellModel(MWMechanics::getPlayer()));
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index cb16ab6d15..69f0b4b449 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -32,7 +32,6 @@
 #include "../mwmechanics/npcstats.hpp"
 
 #include "tooltips.hpp"
-#include "ustring.hpp"
 
 namespace MWGui
 {
@@ -417,7 +416,7 @@ namespace MWGui
         MyGUI::TextBox* groupWidget = mSkillView->createWidget<MyGUI::TextBox>("SandBrightText",
             MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height),
             MyGUI::Align::Left | MyGUI::Align::Top | MyGUI::Align::HStretch);
-        groupWidget->setCaption(toUString(label));
+        groupWidget->setCaption(MyGUI::UString(label));
         groupWidget->eventMouseWheel += MyGUI::newDelegate(this, &StatsWindow::onMouseWheel);
         mSkillWidgets.push_back(groupWidget);
 
@@ -433,7 +432,7 @@ namespace MWGui
 
         skillNameWidget = mSkillView->createWidget<MyGUI::TextBox>(
             "SandText", coord1, MyGUI::Align::Left | MyGUI::Align::Top | MyGUI::Align::HStretch);
-        skillNameWidget->setCaption(toUString(text));
+        skillNameWidget->setCaption(MyGUI::UString(text));
         skillNameWidget->eventMouseWheel += MyGUI::newDelegate(this, &StatsWindow::onMouseWheel);
 
         skillValueWidget = mSkillView->createWidget<MyGUI::TextBox>(
@@ -583,9 +582,8 @@ namespace MWGui
             const std::set<ESM::RefId>& expelled = PCstats.getExpelled();
 
             bool firstFaction = true;
-            for (auto& factionPair : mFactions)
+            for (const auto& [factionId, factionRank] : mFactions)
             {
-                const ESM::RefId& factionId = factionPair.first;
                 const ESM::Faction* faction = store.get<ESM::Faction>().find(factionId);
                 if (faction->mData.mIsHidden == 1)
                     continue;
@@ -612,10 +610,10 @@ namespace MWGui
                     text += "\n#{fontcolourhtml=normal}#{sExpelled}";
                 else
                 {
-                    const int rank = std::clamp(factionPair.second, 0, 9);
-                    text += std::string("\n#{fontcolourhtml=normal}") + faction->mRanks[rank];
-
-                    if (rank < 9)
+                    const auto rank = static_cast<size_t>(std::max(0, factionRank));
+                    if (rank < faction->mRanks.size())
+                        text += std::string("\n#{fontcolourhtml=normal}") + faction->mRanks[rank];
+                    if (rank + 1 < faction->mRanks.size() && !faction->mRanks[rank + 1].empty())
                     {
                         // player doesn't have max rank yet
                         text += std::string("\n\n#{fontcolourhtml=header}#{sNextRank} ") + faction->mRanks[rank + 1];
diff --git a/apps/openmw/mwgui/textinput.cpp b/apps/openmw/mwgui/textinput.cpp
index 18a56e7284..5f47b96f03 100644
--- a/apps/openmw/mwgui/textinput.cpp
+++ b/apps/openmw/mwgui/textinput.cpp
@@ -5,8 +5,7 @@
 
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
-
-#include "ustring.hpp"
+#include <MyGUI_UString.h>
 
 namespace MWGui
 {
@@ -35,10 +34,10 @@ namespace MWGui
 
         if (shown)
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
         else
             okButton->setCaption(
-                toUString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
+                MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sOK", {})));
     }
 
     void TextInputDialog::setTextLabel(std::string_view label)
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 6beee8d07b..960a4a5a21 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -7,6 +7,7 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_TextIterator.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm/records.hpp>
 #include <components/l10n/manager.hpp>
@@ -119,7 +120,7 @@ namespace MWGui
                     tooltipSize = createToolTip(info, checkOwned());
                 }
                 else
-                    tooltipSize = getToolTipViaPtr(mFocusObject.getRefData().getCount(), true);
+                    tooltipSize = getToolTipViaPtr(mFocusObject.getCellRef().getCount(), true);
 
                 MyGUI::IntPoint tooltipPosition = MyGUI::InputManager::getInstance().getMousePosition();
                 position(tooltipPosition, tooltipSize, viewSize);
@@ -186,7 +187,7 @@ namespace MWGui
                     if (mFocusObject.isEmpty())
                         return;
 
-                    tooltipSize = getToolTipViaPtr(mFocusObject.getRefData().getCount(), false, checkOwned());
+                    tooltipSize = getToolTipViaPtr(mFocusObject.getCellRef().getCount(), false, checkOwned());
                 }
                 else if (type == "ItemModelIndex")
                 {
@@ -210,7 +211,7 @@ namespace MWGui
 
                     mFocusObject = item;
                     if (!mFocusObject.isEmpty())
-                        tooltipSize = getToolTipViaPtr(mFocusObject.getRefData().getCount(), false);
+                        tooltipSize = getToolTipViaPtr(mFocusObject.getCellRef().getCount(), false);
                 }
                 else if (type == "Spell")
                 {
@@ -221,34 +222,36 @@ namespace MWGui
                         = store->get<ESM::Spell>().find(ESM::RefId::deserialize(focus->getUserString("Spell")));
                     info.caption = spell->mName;
                     Widgets::SpellEffectList effects;
-                    for (const ESM::ENAMstruct& spellEffect : spell->mEffects.mList)
+                    for (const ESM::IndexedENAMstruct& spellEffect : spell->mEffects.mList)
                     {
                         Widgets::SpellEffectParams params;
-                        params.mEffectID = spellEffect.mEffectID;
-                        params.mSkill = ESM::Skill::indexToRefId(spellEffect.mSkill);
-                        params.mAttribute = ESM::Attribute::indexToRefId(spellEffect.mAttribute);
-                        params.mDuration = spellEffect.mDuration;
-                        params.mMagnMin = spellEffect.mMagnMin;
-                        params.mMagnMax = spellEffect.mMagnMax;
-                        params.mRange = spellEffect.mRange;
-                        params.mArea = spellEffect.mArea;
+                        params.mEffectID = spellEffect.mData.mEffectID;
+                        params.mSkill = ESM::Skill::indexToRefId(spellEffect.mData.mSkill);
+                        params.mAttribute = ESM::Attribute::indexToRefId(spellEffect.mData.mAttribute);
+                        params.mDuration = spellEffect.mData.mDuration;
+                        params.mMagnMin = spellEffect.mData.mMagnMin;
+                        params.mMagnMax = spellEffect.mData.mMagnMax;
+                        params.mRange = spellEffect.mData.mRange;
+                        params.mArea = spellEffect.mData.mArea;
                         params.mIsConstant = (spell->mData.mType == ESM::Spell::ST_Ability);
                         params.mNoTarget = false;
                         effects.push_back(params);
                     }
-                    if (MWMechanics::spellIncreasesSkill(
-                            spell)) // display school of spells that contribute to skill progress
+                    // display school of spells that contribute to skill progress
+                    if (MWMechanics::spellIncreasesSkill(spell))
                     {
-                        MWWorld::Ptr player = MWMechanics::getPlayer();
-                        const auto& school
-                            = store->get<ESM::Skill>().find(MWMechanics::getSpellSchool(spell, player))->mSchool;
-                        info.text = "#{sSchool}: " + MyGUI::TextIterator::toTagsString(school->mName).asUTF8();
+                        ESM::RefId id = MWMechanics::getSpellSchool(spell, MWMechanics::getPlayer());
+                        if (!id.empty())
+                        {
+                            const auto& school = store->get<ESM::Skill>().find(id)->mSchool;
+                            info.text = "#{sSchool}: " + MyGUI::TextIterator::toTagsString(school->mName).asUTF8();
+                        }
                     }
-                    const std::string& cost = focus->getUserString("SpellCost");
+                    auto cost = focus->getUserString("SpellCost");
                     if (!cost.empty() && cost != "0")
                         info.text
                             += MWGui::ToolTips::getValueString(MWMechanics::calcSpellCost(*spell), "#{sCastCost}");
-                    info.effects = effects;
+                    info.effects = std::move(effects);
                     tooltipSize = createToolTip(info);
                 }
                 else if (type == "Layout")
@@ -303,7 +306,7 @@ namespace MWGui
         {
             if (!mFocusObject.isEmpty())
             {
-                MyGUI::IntSize tooltipSize = getToolTipViaPtr(mFocusObject.getRefData().getCount(), true, checkOwned());
+                MyGUI::IntSize tooltipSize = getToolTipViaPtr(mFocusObject.getCellRef().getCount(), true, checkOwned());
 
                 setCoord(viewSize.width / 2 - tooltipSize.width / 2,
                     std::max(0, int(mFocusToolTipY * viewSize.height - tooltipSize.height)), tooltipSize.width,
@@ -407,10 +410,13 @@ namespace MWGui
         const std::string& image = info.icon;
         int imageSize = (!image.empty()) ? info.imageSize : 0;
         std::string text = info.text;
+        std::string_view extra = info.extra;
 
         // remove the first newline (easier this way)
-        if (text.size() > 0 && text[0] == '\n')
+        if (!text.empty() && text[0] == '\n')
             text.erase(0, 1);
+        if (!extra.empty() && extra[0] == '\n')
+            extra = extra.substr(1);
 
         const ESM::Enchantment* enchant = nullptr;
         const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@@ -478,10 +484,13 @@ namespace MWGui
                 MyGUI::IntCoord(padding.left + 8 + 4, totalSize.height + padding.top, 300 - padding.left - 8 - 4,
                     300 - totalSize.height),
                 MyGUI::Align::Default);
-            edit->setEditMultiLine(true);
-            edit->setEditWordWrap(true);
-            edit->setCaption(note);
-            edit->setSize(edit->getWidth(), edit->getTextSize().height);
+            constexpr size_t maxLength = 60;
+            std::string shortenedNote = note.substr(0, std::min(maxLength, note.find('\n')));
+            if (shortenedNote.size() < note.size())
+                shortenedNote += " ...";
+            edit->setCaption(shortenedNote);
+            MyGUI::IntSize noteTextSize = edit->getTextSize();
+            edit->setSize(std::max(edit->getWidth(), noteTextSize.width), noteTextSize.height);
             icon->setPosition(icon->getLeft(), (edit->getTop() + edit->getBottom()) / 2 - icon->getHeight() / 2);
             totalSize.height += std::max(edit->getHeight(), icon->getHeight());
             totalSize.width = std::max(totalSize.width, edit->getWidth() + 8 + 4);
@@ -566,6 +575,24 @@ namespace MWGui
             }
         }
 
+        if (!extra.empty())
+        {
+            Gui::EditBox* extraWidget = mDynamicToolTipBox->createWidget<Gui::EditBox>("SandText",
+                MyGUI::IntCoord(padding.left, totalSize.height + 12, 300 - padding.left, 300 - totalSize.height),
+                MyGUI::Align::Stretch, "ToolTipExtraText");
+
+            extraWidget->setEditStatic(true);
+            extraWidget->setEditMultiLine(true);
+            extraWidget->setEditWordWrap(info.wordWrap);
+            extraWidget->setCaptionWithReplacing(extra);
+            extraWidget->setTextAlign(MyGUI::Align::HCenter | MyGUI::Align::Top);
+            extraWidget->setNeedKeyFocus(false);
+
+            MyGUI::IntSize extraTextSize = extraWidget->getTextSize();
+            totalSize.height += extraTextSize.height + 4;
+            totalSize.width = std::max(totalSize.width, extraTextSize.width);
+        }
+
         captionWidget->setCoord((totalSize.width - captionSize.width) / 2 + imageSize,
             (captionHeight - captionSize.height) / 2, captionSize.width - imageSize, captionSize.height);
 
@@ -953,8 +980,7 @@ namespace MWGui
         widget->setUserString("Caption_MagicEffectSchool",
             "#{sSchool}: "
                 + MyGUI::TextIterator::toTagsString(
-                    store->get<ESM::Skill>().find(effect->mData.mSchool)->mSchool->mName)
-                      .asUTF8());
+                    store->get<ESM::Skill>().find(effect->mData.mSchool)->mSchool->mName));
         widget->setUserString("ImageTexture_MagicEffectImage", icon);
     }
 }
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index 69f6856840..132698475f 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -29,6 +29,7 @@ namespace MWGui
 
         std::string caption;
         std::string text;
+        std::string extra;
         std::string icon;
         int imageSize;
 
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index c62d360412..ba752303d2 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_ControllerRepeatClick.h>
 #include <MyGUI_InputManager.h>
 
+#include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
 #include <components/widgets/numericeditbox.hpp>
 
@@ -42,6 +43,75 @@ namespace
         return static_cast<int>(price * count);
     }
 
+    bool haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer)
+    {
+        // accept if merchant offer is better than player offer
+        if (playerOffer <= merchantOffer)
+        {
+            return true;
+        }
+
+        // reject if npc is a creature
+        if (merchant.getType() != ESM::NPC::sRecordId)
+        {
+            return false;
+        }
+
+        const MWWorld::Store<ESM::GameSetting>& gmst
+            = MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
+
+        // Is the player buying?
+        bool buying = (merchantOffer < 0);
+        int a = std::abs(merchantOffer);
+        int b = std::abs(playerOffer);
+        int d = (buying) ? int(100 * (a - b) / a) : int(100 * (b - a) / b);
+
+        int clampedDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(merchant);
+
+        const MWMechanics::CreatureStats& merchantStats = merchant.getClass().getCreatureStats(merchant);
+        const MWMechanics::CreatureStats& playerStats = player.getClass().getCreatureStats(player);
+
+        float a1 = static_cast<float>(player.getClass().getSkill(player, ESM::Skill::Mercantile));
+        float b1 = 0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified();
+        float c1 = 0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified();
+        float d1 = static_cast<float>(merchant.getClass().getSkill(merchant, ESM::Skill::Mercantile));
+        float e1 = 0.1f * merchantStats.getAttribute(ESM::Attribute::Luck).getModified();
+        float f1 = 0.2f * merchantStats.getAttribute(ESM::Attribute::Personality).getModified();
+
+        float dispositionTerm = gmst.find("fDispositionMod")->mValue.getFloat() * (clampedDisposition - 50);
+        float pcTerm = (dispositionTerm + a1 + b1 + c1) * playerStats.getFatigueTerm();
+        float npcTerm = (d1 + e1 + f1) * merchantStats.getFatigueTerm();
+        float x = gmst.find("fBargainOfferMulti")->mValue.getFloat() * d
+            + gmst.find("fBargainOfferBase")->mValue.getFloat() + int(pcTerm - npcTerm);
+
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::rollDice(100, prng) + 1;
+
+        // reject if roll fails
+        // (or if player tries to buy things and get money)
+        if (roll > x || (merchantOffer < 0 && 0 < playerOffer))
+        {
+            return false;
+        }
+
+        // apply skill gain on successful barter
+        float skillGain = 0.f;
+        int finalPrice = std::abs(playerOffer);
+        int initialMerchantOffer = std::abs(merchantOffer);
+
+        if (!buying && (finalPrice > initialMerchantOffer))
+        {
+            skillGain = std::floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
+        }
+        else if (buying && (finalPrice < initialMerchantOffer))
+        {
+            skillGain = std::floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer);
+        }
+        player.getClass().skillUsageSucceeded(
+            player, ESM::Skill::Mercantile, ESM::Skill::Mercantile_Success, skillGain);
+
+        return true;
+    }
 }
 
 namespace MWGui
@@ -328,7 +398,7 @@ namespace MWGui
             }
         }
 
-        bool offerAccepted = mTrading.haggle(player, mPtr, mCurrentBalance, mCurrentMerchantOffer);
+        bool offerAccepted = haggle(player, mPtr, mCurrentBalance, mCurrentMerchantOffer);
 
         // apply disposition change if merchant is NPC
         if (mPtr.getClass().isNpc())
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index 7d5fd399df..33c39cb269 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -1,8 +1,6 @@
 #ifndef MWGUI_TRADEWINDOW_H
 #define MWGUI_TRADEWINDOW_H
 
-#include "../mwmechanics/trading.hpp"
-
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
 
@@ -53,7 +51,6 @@ namespace MWGui
         ItemView* mItemView;
         SortFilterItemModel* mSortModel;
         TradeItemModel* mTradeModel;
-        MWMechanics::Trading mTrading;
 
         static const float sBalanceChangeInitialPause; // in seconds
         static const float sBalanceChangeInterval; // in seconds
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index c915619a1a..890aa0ba68 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
@@ -167,17 +168,14 @@ namespace MWGui
 
         // You can not train a skill above its governing attribute
         if (pcStats.getSkill(skill->mId).getBase()
-            >= pcStats.getAttribute(ESM::Attribute::indexToRefId(skill->mData.mAttribute)).getBase())
+            >= pcStats.getAttribute(ESM::Attribute::indexToRefId(skill->mData.mAttribute)).getModified())
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage17}");
             return;
         }
 
         // increase skill
-        MWWorld::LiveCellRef<ESM::NPC>* playerRef = player.get<ESM::NPC>();
-
-        const ESM::Class* class_ = store.get<ESM::Class>().find(playerRef->mBase->mClass);
-        pcStats.increaseSkill(skill->mId, *class_, true);
+        MWBase::Environment::get().getLuaManager()->skillLevelUp(player, skill->mId, "trainer");
 
         // remove gold
         player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price);
@@ -191,8 +189,8 @@ namespace MWGui
         mProgressBar.setProgress(0, 2);
         mTimeAdvancer.run(2);
 
-        MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.2);
-        MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.2, false, 0.2);
+        MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.2f);
+        MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.2f, false, 0.2f);
     }
 
     void TrainingWindow::onTrainingProgressChanged(int cur, int total)
diff --git a/apps/openmw/mwgui/ustring.hpp b/apps/openmw/mwgui/ustring.hpp
deleted file mode 100644
index 5a6c30312a..0000000000
--- a/apps/openmw/mwgui/ustring.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef MWGUI_USTRING_H
-#define MWGUI_USTRING_H
-
-#include <MyGUI_UString.h>
-
-namespace MWGui
-{
-    // FIXME: Remove once we get a version of MyGUI that supports string_view
-    inline MyGUI::UString toUString(std::string_view string)
-    {
-        return { string.data(), string.size() };
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index ab17031168..568f05abc3 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -8,7 +8,7 @@
 
 #include <components/esm3/loadregn.hpp>
 #include <components/misc/strings/format.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 #include <components/widgets/box.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -186,7 +186,7 @@ namespace MWGui
 
     void WaitDialog::startWaiting(int hoursToWait)
     {
-        if (Settings::Manager::getBool("autosave", "Saves")) // autosaves when enabled
+        if (Settings::saves().mAutosave) // autosaves when enabled
             MWBase::Environment::get().getStateManager()->quickSave("Autosave");
 
         MWBase::World* world = MWBase::Environment::get().getWorld();
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index debacfbed9..6cc5bdfdf5 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -6,6 +6,7 @@
 #include <MyGUI_ControllerManager.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ProgressBar.h>
+#include <MyGUI_UString.h>
 
 #include <components/esm/attr.hpp>
 #include <components/esm3/loadmgef.hpp>
@@ -20,8 +21,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include "ustring.hpp"
-
 namespace MWGui::Widgets
 {
     /* MWSkill */
@@ -135,8 +134,7 @@ namespace MWGui::Widgets
             }
             else
             {
-                MyGUI::UString name = toUString(attribute->mName);
-                mAttributeNameWidget->setCaption(name);
+                mAttributeNameWidget->setCaption(MyGUI::UString(attribute->mName));
             }
         }
         if (mAttributeValueWidget)
@@ -197,18 +195,18 @@ namespace MWGui::Widgets
         const ESM::Spell* spell = store.get<ESM::Spell>().search(mId);
         MYGUI_ASSERT(spell, "spell with id '" << mId << "' not found");
 
-        for (const ESM::ENAMstruct& effectInfo : spell->mEffects.mList)
+        for (const ESM::IndexedENAMstruct& effectInfo : spell->mEffects.mList)
         {
             MWSpellEffectPtr effect
                 = creator->createWidget<MWSpellEffect>("MW_EffectImage", coord, MyGUI::Align::Default);
             SpellEffectParams params;
-            params.mEffectID = effectInfo.mEffectID;
-            params.mSkill = ESM::Skill::indexToRefId(effectInfo.mSkill);
-            params.mAttribute = ESM::Attribute::indexToRefId(effectInfo.mAttribute);
-            params.mDuration = effectInfo.mDuration;
-            params.mMagnMin = effectInfo.mMagnMin;
-            params.mMagnMax = effectInfo.mMagnMax;
-            params.mRange = effectInfo.mRange;
+            params.mEffectID = effectInfo.mData.mEffectID;
+            params.mSkill = ESM::Skill::indexToRefId(effectInfo.mData.mSkill);
+            params.mAttribute = ESM::Attribute::indexToRefId(effectInfo.mData.mAttribute);
+            params.mDuration = effectInfo.mData.mDuration;
+            params.mMagnMin = effectInfo.mData.mMagnMin;
+            params.mMagnMax = effectInfo.mData.mMagnMax;
+            params.mRange = effectInfo.mData.mRange;
             params.mIsConstant = (flags & MWEffectList::EF_Constant) != 0;
             params.mNoTarget = (flags & MWEffectList::EF_NoTarget);
             params.mNoMagnitude = (flags & MWEffectList::EF_NoMagnitude);
@@ -310,17 +308,17 @@ namespace MWGui::Widgets
     SpellEffectList MWEffectList::effectListFromESM(const ESM::EffectList* effects)
     {
         SpellEffectList result;
-        for (const ESM::ENAMstruct& effectInfo : effects->mList)
+        for (const ESM::IndexedENAMstruct& effectInfo : effects->mList)
         {
             SpellEffectParams params;
-            params.mEffectID = effectInfo.mEffectID;
-            params.mSkill = ESM::Skill::indexToRefId(effectInfo.mSkill);
-            params.mAttribute = ESM::Attribute::indexToRefId(effectInfo.mAttribute);
-            params.mDuration = effectInfo.mDuration;
-            params.mMagnMin = effectInfo.mMagnMin;
-            params.mMagnMax = effectInfo.mMagnMax;
-            params.mRange = effectInfo.mRange;
-            params.mArea = effectInfo.mArea;
+            params.mEffectID = effectInfo.mData.mEffectID;
+            params.mSkill = ESM::Skill::indexToRefId(effectInfo.mData.mSkill);
+            params.mAttribute = ESM::Attribute::indexToRefId(effectInfo.mData.mAttribute);
+            params.mDuration = effectInfo.mData.mDuration;
+            params.mMagnMin = effectInfo.mData.mMagnMin;
+            params.mMagnMax = effectInfo.mData.mMagnMax;
+            params.mRange = effectInfo.mData.mRange;
+            params.mArea = effectInfo.mData.mArea;
             result.push_back(params);
         }
         return result;
@@ -355,12 +353,10 @@ namespace MWGui::Widgets
 
         const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
 
-        const ESM::MagicEffect* magicEffect = store.get<ESM::MagicEffect>().search(mEffectParams.mEffectID);
+        const ESM::MagicEffect* magicEffect = store.get<ESM::MagicEffect>().find(mEffectParams.mEffectID);
         const ESM::Attribute* attribute = store.get<ESM::Attribute>().search(mEffectParams.mAttribute);
         const ESM::Skill* skill = store.get<ESM::Skill>().search(mEffectParams.mSkill);
 
-        assert(magicEffect);
-
         auto windowManager = MWBase::Environment::get().getWindowManager();
 
         std::string_view pt = windowManager->getGameSettingString("spoint", {});
@@ -375,7 +371,7 @@ namespace MWGui::Widgets
 
         std::string spellLine = MWMechanics::getMagicEffectString(*magicEffect, attribute, skill);
 
-        if (mEffectParams.mMagnMin || mEffectParams.mMagnMax)
+        if ((mEffectParams.mMagnMin || mEffectParams.mMagnMax) && !mEffectParams.mNoMagnitude)
         {
             ESM::MagicEffect::MagnitudeDisplayType displayType = magicEffect->getMagnitudeDisplayType();
             if (displayType == ESM::MagicEffect::MDT_TimesInt)
@@ -390,7 +386,7 @@ namespace MWGui::Widgets
 
                 spellLine += formatter.str();
             }
-            else if (displayType != ESM::MagicEffect::MDT_None && !mEffectParams.mNoMagnitude)
+            else if (displayType != ESM::MagicEffect::MDT_None)
             {
                 spellLine += " " + MyGUI::utility::toString(mEffectParams.mMagnMin);
                 if (mEffectParams.mMagnMin != mEffectParams.mMagnMax)
@@ -499,13 +495,13 @@ namespace MWGui::Widgets
         {
             std::stringstream out;
             out << mValue << "/" << mMax;
-            mBarTextWidget->setCaption(out.str().c_str());
+            mBarTextWidget->setCaption(out.str());
         }
     }
     void MWDynamicStat::setTitle(std::string_view text)
     {
         if (mTextWidget)
-            mTextWidget->setCaption(toUString(text));
+            mTextWidget->setCaption(MyGUI::UString(text));
     }
 
     MWDynamicStat::~MWDynamicStat() {}
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index 4c191eaeb8..f5d90590f8 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -58,7 +58,7 @@ void WindowBase::setVisible(bool visible)
         onClose();
 }
 
-bool WindowBase::isVisible()
+bool WindowBase::isVisible() const
 {
     return mMainWidget->getVisible();
 }
@@ -77,6 +77,34 @@ void WindowBase::center()
     mMainWidget->setCoord(coord);
 }
 
+void WindowBase::clampWindowCoordinates(MyGUI::Window* window)
+{
+    MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
+    if (window->getLayer())
+        viewSize = window->getLayer()->getSize();
+
+    // Window's minimum size is larger than the screen size, can not clamp coordinates
+    auto minSize = window->getMinSize();
+    if (minSize.width > viewSize.width || minSize.height > viewSize.height)
+        return;
+
+    int left = std::max(0, window->getPosition().left);
+    int top = std::max(0, window->getPosition().top);
+    int width = std::clamp(window->getSize().width, 0, viewSize.width);
+    int height = std::clamp(window->getSize().height, 0, viewSize.height);
+    if (left + width > viewSize.width)
+        left = viewSize.width - width;
+
+    if (top + height > viewSize.height)
+        top = viewSize.height - height;
+
+    if (window->getSize().width != width || window->getSize().height != height)
+        window->setSize(width, height);
+
+    if (window->getPosition().left != left || window->getPosition().top != top)
+        window->setPosition(left, top);
+}
+
 WindowModal::WindowModal(const std::string& parLayout)
     : WindowBase(parLayout)
 {
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index 88b46b0bd2..466060c6ad 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -37,7 +37,7 @@ namespace MWGui
         /// Sets the visibility of the window
         void setVisible(bool visible) override;
         /// Returns the visibility state of the window
-        bool isVisible();
+        bool isVisible() const;
 
         void center();
 
@@ -52,6 +52,8 @@ namespace MWGui
         virtual std::string_view getWindowIdForLua() const { return ""; }
         void setDisabledByLua(bool disabled) { mDisabledByLua = disabled; }
 
+        static void clampWindowCoordinates(MyGUI::Window* window);
+
     protected:
         virtual void onTitleDoubleClicked();
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index b9c52136c1..1816cf8a61 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -51,6 +51,7 @@
 #include <components/l10n/manager.hpp>
 
 #include <components/lua_ui/util.hpp>
+#include <components/lua_ui/widget.hpp>
 
 #include <components/settings/values.hpp>
 
@@ -117,7 +118,6 @@
 #include "tradewindow.hpp"
 #include "trainingwindow.hpp"
 #include "travelwindow.hpp"
-#include "ustring.hpp"
 #include "videowidget.hpp"
 #include "waitdialog.hpp"
 
@@ -294,8 +294,7 @@ namespace MWGui
             += MyGUI::newDelegate(this, &WindowManager::onClipboardRequested);
 
         mVideoWrapper = std::make_unique<SDLUtil::VideoWrapper>(window, viewer);
-        mVideoWrapper->setGammaContrast(
-            Settings::Manager::getFloat("gamma", "Video"), Settings::Manager::getFloat("contrast", "Video"));
+        mVideoWrapper->setGammaContrast(Settings::video().mGamma, Settings::video().mContrast);
 
         if (useShaders)
             mGuiPlatform->getRenderManagerPtr()->enableShaders(mResourceSystem->getSceneManager()->getShaderManager());
@@ -357,7 +356,8 @@ namespace MWGui
         mWindows.push_back(std::move(console));
         trackWindow(mConsole, makeConsoleWindowSettingValues());
 
-        bool questList = mResourceSystem->getVFS()->exists("textures/tx_menubook_options_over.dds");
+        constexpr VFS::Path::NormalizedView menubookOptionsOverTexture("textures/tx_menubook_options_over.dds");
+        const bool questList = mResourceSystem->getVFS()->exists(menubookOptionsOverTexture);
         auto journal = JournalWindow::create(JournalViewModel::create(), questList, mEncoding);
         mGuiModeStates[GM_Journal] = GuiModeState(journal.get());
         mWindows.push_back(std::move(journal));
@@ -410,7 +410,6 @@ namespace MWGui
         mSettingsWindow = settingsWindow.get();
         mWindows.push_back(std::move(settingsWindow));
         trackWindow(mSettingsWindow, makeSettingsWindowSettingValues());
-        mGuiModeStates[GM_Settings] = GuiModeState(mSettingsWindow);
 
         auto confirmationDialog = std::make_unique<ConfirmationDialog>();
         mConfirmationDialog = confirmationDialog.get();
@@ -498,6 +497,7 @@ namespace MWGui
         auto debugWindow = std::make_unique<DebugWindow>();
         mDebugWindow = debugWindow.get();
         mWindows.push_back(std::move(debugWindow));
+        trackWindow(mDebugWindow, makeDebugWindowSettingValues());
 
         auto postProcessorHud = std::make_unique<PostProcessorHud>();
         mPostProcessorHud = postProcessorHud.get();
@@ -548,7 +548,8 @@ namespace MWGui
     {
         try
         {
-            LuaUi::clearUserInterface();
+            LuaUi::clearGameInterface();
+            LuaUi::clearMenuInterface();
 
             mStatsWatcher.reset();
 
@@ -744,9 +745,9 @@ namespace MWGui
     }
 
     void WindowManager::interactiveMessageBox(
-        std::string_view message, const std::vector<std::string>& buttons, bool block)
+        std::string_view message, const std::vector<std::string>& buttons, bool block, int defaultFocus)
     {
-        mMessageBoxManager->createInteractiveMessageBox(message, buttons);
+        mMessageBoxManager->createInteractiveMessageBox(message, buttons, block, defaultFocus);
         updateVisible();
 
         if (block)
@@ -779,6 +780,8 @@ namespace MWGui
 
                 frameRateLimiter.limit();
             }
+
+            mMessageBoxManager->resetInteractiveMessageBox();
         }
     }
 
@@ -786,8 +789,8 @@ namespace MWGui
     {
         if (getMode() == GM_Dialogue && showInDialogueMode != MWGui::ShowInDialogueMode_Never)
         {
-            MyGUI::UString text = MyGUI::LanguageManager::getInstance().replaceTags(toUString(message));
-            mDialogueWindow->addMessageBox(text.asUTF8());
+            MyGUI::UString text = MyGUI::LanguageManager::getInstance().replaceTags(MyGUI::UString(message));
+            mDialogueWindow->addMessageBox(text);
         }
         else if (showInDialogueMode != MWGui::ShowInDialogueMode_Only)
         {
@@ -842,7 +845,7 @@ namespace MWGui
 
         if (!player.getCell()->isExterior())
         {
-            setActiveMap(x, y, true);
+            setActiveMap(*player.getCell()->getCell());
         }
         // else: need to know the current grid center, call setActiveMap from changeCell
 
@@ -912,6 +915,9 @@ namespace MWGui
         if (isConsoleMode())
             mConsole->onFrame(frameDuration);
 
+        if (isSettingsWindowVisible())
+            mSettingsWindow->onFrame(frameDuration);
+
         if (!gameRunning)
             return;
 
@@ -980,29 +986,23 @@ namespace MWGui
                 mMap->addVisitedLocation(name, cellCommon->getGridX(), cellCommon->getGridY());
 
             mMap->cellExplored(cellCommon->getGridX(), cellCommon->getGridY());
-
-            setActiveMap(cellCommon->getGridX(), cellCommon->getGridY(), false);
         }
         else
         {
-            mMap->setCellPrefix(std::string(cellCommon->getNameId()));
-            mHud->setCellPrefix(std::string(cellCommon->getNameId()));
-
             osg::Vec3f worldPos;
             if (!MWBase::Environment::get().getWorld()->findInteriorPositionInWorldSpace(cell, worldPos))
                 worldPos = MWBase::Environment::get().getWorld()->getPlayer().getLastKnownExteriorPosition();
             else
                 MWBase::Environment::get().getWorld()->getPlayer().setLastKnownExteriorPosition(worldPos);
             mMap->setGlobalMapPlayerPosition(worldPos.x(), worldPos.y());
-
-            setActiveMap(0, 0, true);
         }
+        setActiveMap(*cellCommon);
     }
 
-    void WindowManager::setActiveMap(int x, int y, bool interior)
+    void WindowManager::setActiveMap(const MWWorld::Cell& cell)
     {
-        mMap->setActiveCell(x, y, interior);
-        mHud->setActiveCell(x, y, interior);
+        mMap->setActiveCell(cell);
+        mHud->setActiveCell(cell);
     }
 
     void WindowManager::setDrowningBarVisibility(bool visible)
@@ -1087,7 +1087,7 @@ namespace MWGui
 
     void WindowManager::onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result)
     {
-        std::string_view tag = _tag.asUTF8();
+        std::string_view tag = _tag;
 
         std::string_view MyGuiPrefix = "setting=";
 
@@ -1097,10 +1097,13 @@ namespace MWGui
         {
             tag = tag.substr(MyGuiPrefix.length());
             size_t comma_pos = tag.find(',');
+            if (comma_pos == std::string_view::npos)
+                throw std::runtime_error("Invalid setting tag (expected comma): " + std::string(tag));
+
             std::string_view settingSection = tag.substr(0, comma_pos);
             std::string_view settingTag = tag.substr(comma_pos + 1, tag.length());
 
-            _result = Settings::Manager::getString(settingTag, settingSection);
+            _result = Settings::get<MyGUI::Colour>(settingSection, settingTag).get().print();
         }
         else if (tag.starts_with(tokenToFind))
         {
@@ -1115,7 +1118,7 @@ namespace MWGui
         else
         {
             std::vector<std::string> split;
-            Misc::StringUtils::split(std::string{ tag }, split, ":");
+            Misc::StringUtils::split(tag, split, ":");
 
             l10n::Manager& l10nManager = *MWBase::Environment::get().getL10nManager();
 
@@ -1156,25 +1159,22 @@ namespace MWGui
                 changeRes = true;
 
             else if (setting.first == "Video" && setting.second == "vsync mode")
-                mVideoWrapper->setSyncToVBlank(Settings::Manager::getInt("vsync mode", "Video"));
+                mVideoWrapper->setSyncToVBlank(Settings::video().mVsyncMode);
             else if (setting.first == "Video" && (setting.second == "gamma" || setting.second == "contrast"))
-                mVideoWrapper->setGammaContrast(
-                    Settings::Manager::getFloat("gamma", "Video"), Settings::Manager::getFloat("contrast", "Video"));
+                mVideoWrapper->setGammaContrast(Settings::video().mGamma, Settings::video().mContrast);
         }
 
         if (changeRes)
         {
-            mVideoWrapper->setVideoMode(Settings::Manager::getInt("resolution x", "Video"),
-                Settings::Manager::getInt("resolution y", "Video"),
-                static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video")),
-                Settings::Manager::getBool("window border", "Video"));
+            mVideoWrapper->setVideoMode(Settings::video().mResolutionX, Settings::video().mResolutionY,
+                Settings::video().mWindowMode, Settings::video().mWindowBorder);
         }
     }
 
     void WindowManager::windowResized(int x, int y)
     {
-        Settings::Manager::setInt("resolution x", "Video", x);
-        Settings::Manager::setInt("resolution y", "Video", y);
+        Settings::video().mResolutionX.set(x);
+        Settings::video().mResolutionY.set(y);
 
         // We only want to process changes to window-size related settings.
         Settings::CategorySettingVector filter = { { "Video", "resolution x" }, { "Video", "resolution y" } };
@@ -1204,6 +1204,8 @@ namespace MWGui
             const WindowRectSettingValues& rect = settings.mIsMaximized ? settings.mMaximized : settings.mRegular;
             window->setPosition(MyGUI::IntPoint(static_cast<int>(rect.mX * x), static_cast<int>(rect.mY * y)));
             window->setSize(MyGUI::IntSize(static_cast<int>(rect.mW * x), static_cast<int>(rect.mH * y)));
+
+            WindowBase::clampWindowCoordinates(window);
         }
 
         for (const auto& window : mWindows)
@@ -1227,7 +1229,7 @@ namespace MWGui
         MWBase::Environment::get().getStateManager()->requestQuit();
     }
 
-    void WindowManager::onCursorChange(const std::string& name)
+    void WindowManager::onCursorChange(std::string_view name)
     {
         mCursorManager->cursorChanged(name);
     }
@@ -1304,7 +1306,7 @@ namespace MWGui
         return mViewer->getCamera()->getCullMask();
     }
 
-    void WindowManager::popGuiMode()
+    void WindowManager::popGuiMode(bool forceExit)
     {
         if (mDragAndDrop && mDragAndDrop->mIsOnDragAndDrop)
         {
@@ -1314,10 +1316,19 @@ namespace MWGui
         if (!mGuiModes.empty())
         {
             const GuiMode mode = mGuiModes.back();
+            if (forceExit)
+            {
+                GuiModeState& state = mGuiModeStates[mode];
+                for (const auto& window : state.mWindows)
+                    window->exit();
+            }
             mKeyboardNavigation->saveFocus(mode);
-            mGuiModes.pop_back();
-            mGuiModeStates[mode].update(false);
-            MWBase::Environment::get().getLuaManager()->uiModeChanged(MWWorld::Ptr());
+            if (containsMode(mode))
+            {
+                mGuiModes.pop_back();
+                mGuiModeStates[mode].update(false);
+                MWBase::Environment::get().getLuaManager()->uiModeChanged(MWWorld::Ptr());
+            }
         }
 
         if (!mGuiModes.empty())
@@ -1539,8 +1550,7 @@ namespace MWGui
 
     bool WindowManager::isGuiMode() const
     {
-        return !mGuiModes.empty() || isConsoleMode() || (mPostProcessorHud && mPostProcessorHud->isVisible())
-            || (mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox());
+        return !mGuiModes.empty() || isConsoleMode() || isPostProcessorHudVisible() || isInteractiveMessageBoxActive();
     }
 
     bool WindowManager::isConsoleMode() const
@@ -1550,7 +1560,17 @@ namespace MWGui
 
     bool WindowManager::isPostProcessorHudVisible() const
     {
-        return mPostProcessorHud->isVisible();
+        return mPostProcessorHud && mPostProcessorHud->isVisible();
+    }
+
+    bool WindowManager::isSettingsWindowVisible() const
+    {
+        return mSettingsWindow && mSettingsWindow->isVisible();
+    }
+
+    bool WindowManager::isInteractiveMessageBoxActive() const
+    {
+        return mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox();
     }
 
     MWGui::GuiMode WindowManager::getMode() const
@@ -1600,9 +1620,9 @@ namespace MWGui
         mQuickKeysMenu->activateQuickKey(index);
     }
 
-    bool WindowManager::toggleHud()
+    bool WindowManager::setHudVisibility(bool show)
     {
-        mHudEnabled = !mHudEnabled;
+        mHudEnabled = show;
         updateVisible();
         mMessageBoxManager->setVisible(mHudEnabled);
         return mHudEnabled;
@@ -1670,7 +1690,10 @@ namespace MWGui
 
     void WindowManager::onKeyFocusChanged(MyGUI::Widget* widget)
     {
-        if (widget && widget->castType<MyGUI::EditBox>(false))
+        bool isEditBox = widget && widget->castType<MyGUI::EditBox>(false);
+        LuaUi::WidgetExtension* luaWidget = dynamic_cast<LuaUi::WidgetExtension*>(widget);
+        bool capturesInput = luaWidget ? luaWidget->isTextInput() : isEditBox;
+        if (widget && capturesInput)
             SDL_StartTextInput();
         else
             SDL_StopTextInput();
@@ -1681,9 +1704,9 @@ namespace MWGui
         mHud->setEnemy(enemy);
     }
 
-    int WindowManager::getMessagesCount() const
+    std::size_t WindowManager::getMessagesCount() const
     {
-        int count = 0;
+        std::size_t count = 0;
         if (mMessageBoxManager)
             count = mMessageBoxManager->getMessagesCount();
 
@@ -1706,13 +1729,15 @@ namespace MWGui
 
         const WindowRectSettingValues& rect = settings.mIsMaximized ? settings.mMaximized : settings.mRegular;
 
-        layout->mMainWidget->setPosition(
+        MyGUI::Window* window = layout->mMainWidget->castType<MyGUI::Window>();
+        window->setPosition(
             MyGUI::IntPoint(static_cast<int>(rect.mX * viewSize.width), static_cast<int>(rect.mY * viewSize.height)));
-        layout->mMainWidget->setSize(
+        window->setSize(
             MyGUI::IntSize(static_cast<int>(rect.mW * viewSize.width), static_cast<int>(rect.mH * viewSize.height)));
 
-        MyGUI::Window* window = layout->mMainWidget->castType<MyGUI::Window>();
         window->eventWindowChangeCoord += MyGUI::newDelegate(this, &WindowManager::onWindowChangeCoord);
+        WindowBase::clampWindowCoordinates(window);
+
         mTrackedWindows.emplace(window, settings);
     }
 
@@ -1742,6 +1767,8 @@ namespace MWGui
         if (it == mTrackedWindows.end())
             return;
 
+        WindowBase::clampWindowCoordinates(window);
+
         const WindowSettingValues& settings = it->second;
 
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
@@ -2067,13 +2094,13 @@ namespace MWGui
             mWerewolfFader->notifyAlphaChanged(set ? 1.0f : 0.0f);
     }
 
-    void WindowManager::onClipboardChanged(const std::string& _type, const std::string& _data)
+    void WindowManager::onClipboardChanged(std::string_view _type, std::string_view _data)
     {
         if (_type == "Text")
             SDL_SetClipboardText(MyGUI::TextIterator::getOnlyText(MyGUI::UString(_data)).asUTF8().c_str());
     }
 
-    void WindowManager::onClipboardRequested(const std::string& _type, std::string& _data)
+    void WindowManager::onClipboardRequested(std::string_view _type, std::string& _data)
     {
         if (_type != "Text")
             return;
@@ -2126,6 +2153,21 @@ namespace MWGui
         updateVisible();
     }
 
+    void WindowManager::toggleSettingsWindow()
+    {
+        bool visible = mSettingsWindow->isVisible();
+
+        if (!visible && !mGuiModes.empty())
+            mKeyboardNavigation->saveFocus(mGuiModes.back());
+
+        mSettingsWindow->setVisible(!visible);
+
+        if (visible && !mGuiModes.empty())
+            mKeyboardNavigation->restoreFocus(mGuiModes.back());
+
+        updateVisible();
+    }
+
     void WindowManager::cycleSpell(bool next)
     {
         if (!isGuiMode())
@@ -2168,11 +2210,16 @@ namespace MWGui
         mConsole->print(msg, color);
     }
 
-    void WindowManager::setConsoleMode(const std::string& mode)
+    void WindowManager::setConsoleMode(std::string_view mode)
     {
         mConsole->setConsoleMode(mode);
     }
 
+    const std::string& WindowManager::getConsoleMode()
+    {
+        return mConsole->getConsoleMode();
+    }
+
     void WindowManager::createCursors()
     {
         MyGUI::ResourceManager::EnumeratorPtr enumerator = MyGUI::ResourceManager::getInstance().getEnumerator();
@@ -2182,9 +2229,10 @@ namespace MWGui
             ResourceImageSetPointerFix* imgSetPointer = resource->castType<ResourceImageSetPointerFix>(false);
             if (!imgSetPointer)
                 continue;
-            std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0, 0).texture;
 
-            osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(tex_name);
+            const VFS::Path::Normalized path(imgSetPointer->getImageSet()->getIndexInfo(0, 0).texture);
+
+            osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(path);
 
             if (image.valid())
             {
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 9d79e0a0d7..3ca863127b 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -50,6 +50,7 @@ namespace MyGUI
 
 namespace MWWorld
 {
+    class Cell;
     class ESMStore;
 }
 
@@ -149,7 +150,7 @@ namespace MWGui
 
         void pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg) override;
         void pushGuiMode(GuiMode mode) override;
-        void popGuiMode() override;
+        void popGuiMode(bool forceExit = false) override;
         void removeGuiMode(GuiMode mode) override; ///< can be anywhere in the stack
 
         void goToJail(int days) override;
@@ -160,8 +161,9 @@ namespace MWGui
         bool isGuiMode() const override;
 
         bool isConsoleMode() const override;
-
         bool isPostProcessorHudVisible() const override;
+        bool isSettingsWindowVisible() const override;
+        bool isInteractiveMessageBoxActive() const override;
 
         void toggleVisible(GuiWindow wnd) override;
 
@@ -191,7 +193,8 @@ namespace MWGui
         void setConsoleSelectedObject(const MWWorld::Ptr& object) override;
         MWWorld::Ptr getConsoleSelectedObject() const override;
         void printToConsole(const std::string& msg, std::string_view color) override;
-        void setConsoleMode(const std::string& mode) override;
+        void setConsoleMode(std::string_view mode) override;
+        const std::string& getConsoleMode() override;
 
         /// Set time left for the player to start drowning (update the drowning bar)
         /// @param time time left to start drowning
@@ -214,9 +217,6 @@ namespace MWGui
         bool toggleFullHelp() override; ///< show extra info in item tooltips (owner, script)
         bool getFullHelp() const override;
 
-        void setActiveMap(int x, int y, bool interior) override;
-        ///< set the indices of the map texture that should be used
-
         /// sets the visibility of the drowning bar
         void setDrowningBarVisibility(bool visible) override;
 
@@ -247,7 +247,8 @@ namespace MWGui
         void showCrosshair(bool show) override;
 
         /// Turn visibility of HUD on or off
-        bool toggleHud() override;
+        bool setHudVisibility(bool show) override;
+        bool isHudVisible() const override { return mHudEnabled; }
 
         void disallowMouse() override;
         void allowMouse() override;
@@ -267,8 +268,8 @@ namespace MWGui
             enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
         void staticMessageBox(std::string_view message) override;
         void removeStaticMessageBox() override;
-        void interactiveMessageBox(
-            std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false) override;
+        void interactiveMessageBox(std::string_view message, const std::vector<std::string>& buttons = {},
+            bool block = false, int defaultFocus = -1) override;
 
         int readPressedButton() override; ///< returns the index of the pressed button or -1 if no button was pressed
                                           ///< (->MessageBoxmanager->InteractiveMessageBox)
@@ -312,12 +313,10 @@ namespace MWGui
 
         void setEnemy(const MWWorld::Ptr& enemy) override;
 
-        int getMessagesCount() const override;
+        std::size_t getMessagesCount() const override;
 
         const Translation::Storage& getTranslationDataStorage() const override;
 
-        void onSoulgemDialogButtonPressed(int button);
-
         bool getCursorVisible() override;
 
         /// Call when mouse cursor or buttons are used.
@@ -363,6 +362,7 @@ namespace MWGui
         void toggleConsole() override;
         void toggleDebugWindow() override;
         void togglePostProcessorHud() override;
+        void toggleSettingsWindow() override;
 
         /// Cycle to next or previous spell
         void cycleSpell(bool next) override;
@@ -560,7 +560,7 @@ namespace MWGui
          */
         void onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result);
 
-        void onCursorChange(const std::string& name);
+        void onCursorChange(std::string_view name);
         void onKeyFocusChanged(MyGUI::Widget* widget);
 
         // Key pressed while playing a video
@@ -568,8 +568,8 @@ namespace MWGui
 
         void sizeVideo(int screenWidth, int screenHeight);
 
-        void onClipboardChanged(const std::string& _type, const std::string& _data);
-        void onClipboardRequested(const std::string& _type, std::string& _data);
+        void onClipboardChanged(std::string_view _type, std::string_view _data);
+        void onClipboardRequested(std::string_view _type, std::string& _data);
 
         void createTextures();
         void createCursors();
@@ -586,6 +586,9 @@ namespace MWGui
         void setCullMask(uint32_t mask) override;
         uint32_t getCullMask() override;
 
+        void setActiveMap(const MWWorld::Cell& cell);
+        ///< set the indices of the map texture that should be used
+
         Files::ConfigurationManager& mCfgMgr;
     };
 }
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 3fac540f5e..154888c44c 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -4,7 +4,7 @@
 
 #include <SDL_keyboard.h>
 
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
@@ -27,13 +27,11 @@
 namespace MWInput
 {
 
-    ActionManager::ActionManager(BindingsManager* bindingsManager,
-        osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
-        osg::ref_ptr<osgViewer::Viewer> viewer, osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler)
+    ActionManager::ActionManager(BindingsManager* bindingsManager, osg::ref_ptr<osgViewer::Viewer> viewer,
+        osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler)
         : mBindingsManager(bindingsManager)
         , mViewer(std::move(viewer))
         , mScreenCaptureHandler(std::move(screenCaptureHandler))
-        , mScreenCaptureOperation(screenCaptureOperation)
         , mTimeIdle(0.f)
     {
     }
@@ -118,7 +116,7 @@ namespace MWInput
                 quickKey(10);
                 break;
             case A_ToggleHUD:
-                windowManager->toggleHud();
+                windowManager->setHudVisibility(!windowManager->isHudVisible());
                 break;
             case A_ToggleDebug:
                 windowManager->toggleDebugWindow();
@@ -170,24 +168,8 @@ namespace MWInput
 
     void ActionManager::screenshot()
     {
-        const std::string& settingStr = Settings::Manager::getString("screenshot type", "Video");
-        bool regularScreenshot = settingStr.empty() || settingStr == "regular";
-
-        if (regularScreenshot)
-        {
-            mScreenCaptureHandler->setFramesToCapture(1);
-            mScreenCaptureHandler->captureNextFrame(*mViewer);
-        }
-        else
-        {
-            osg::ref_ptr<osg::Image> screenshot(new osg::Image);
-
-            if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get()))
-            {
-                (*mScreenCaptureOperation)(*(screenshot.get()), 0);
-                // FIXME: mScreenCaptureHandler->getCaptureOperation() causes crash for some reason
-            }
-        }
+        mScreenCaptureHandler->setFramesToCapture(1);
+        mScreenCaptureHandler->captureNextFrame(*mViewer);
     }
 
     void ActionManager::toggleMainMenu()
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index d78c6906bf..eb21f7ef79 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -17,9 +17,8 @@ namespace MWInput
     class ActionManager
     {
     public:
-        ActionManager(BindingsManager* bindingsManager,
-            osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
-            osg::ref_ptr<osgViewer::Viewer> viewer, osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler);
+        ActionManager(BindingsManager* bindingsManager, osg::ref_ptr<osgViewer::Viewer> viewer,
+            osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler);
 
         void update(float dt);
 
@@ -48,7 +47,6 @@ namespace MWInput
         BindingsManager* mBindingsManager;
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
-        osgViewer::ScreenCaptureHandler::CaptureOperation* mScreenCaptureOperation;
 
         float mTimeIdle;
     };
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index 29e66f7905..339ebf4276 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -1,5 +1,7 @@
 #include "bindingsmanager.hpp"
 
+#include <filesystem>
+
 #include <MyGUI_EditBox.h>
 
 #include <extern/oics/ICSChannelListener.h>
@@ -194,13 +196,22 @@ namespace MWInput
 
     BindingsManager::~BindingsManager()
     {
+        const std::string newFileName = Files::pathToUnicodeString(mUserFile) + ".new";
         try
         {
-            mInputBinder->save(Files::pathToUnicodeString(mUserFile));
+            if (mInputBinder->save(newFileName))
+            {
+                std::filesystem::rename(Files::pathFromUnicodeString(newFileName), mUserFile);
+                Log(Debug::Info) << "Saved input bindings: " << mUserFile;
+            }
+            else
+            {
+                Log(Debug::Error) << "Failed to save input bindings to " << newFileName;
+            }
         }
-        catch (std::exception& e)
+        catch (const std::exception& e)
         {
-            Log(Debug::Error) << "Failed to save input bindings: " << e.what();
+            Log(Debug::Error) << "Failed to save input bindings to " << newFileName << ": " << e.what();
         }
     }
 
@@ -381,10 +392,6 @@ namespace MWInput
         defaultButtonBindings[A_Inventory] = SDL_CONTROLLER_BUTTON_B;
         defaultButtonBindings[A_GameMenu] = SDL_CONTROLLER_BUTTON_START;
         defaultButtonBindings[A_QuickSave] = SDL_CONTROLLER_BUTTON_GUIDE;
-        defaultButtonBindings[A_MoveForward] = SDL_CONTROLLER_BUTTON_DPAD_UP;
-        defaultButtonBindings[A_MoveLeft] = SDL_CONTROLLER_BUTTON_DPAD_LEFT;
-        defaultButtonBindings[A_MoveBackward] = SDL_CONTROLLER_BUTTON_DPAD_DOWN;
-        defaultButtonBindings[A_MoveRight] = SDL_CONTROLLER_BUTTON_DPAD_RIGHT;
 
         std::map<int, int> defaultAxisBindings;
         defaultAxisBindings[A_MoveForwardBackward] = SDL_CONTROLLER_AXIS_LEFTY;
@@ -594,11 +601,12 @@ namespace MWInput
     }
     const std::initializer_list<int>& BindingsManager::getActionControllerSorting()
     {
-        static const std::initializer_list<int> actions{ A_TogglePOV, A_ZoomIn, A_ZoomOut, A_Sneak, A_Activate, A_Use,
-            A_ToggleWeapon, A_ToggleSpell, A_AutoMove, A_Jump, A_Inventory, A_Journal, A_Rest, A_QuickSave, A_QuickLoad,
-            A_ToggleHUD, A_Screenshot, A_QuickKeysMenu, A_QuickKey1, A_QuickKey2, A_QuickKey3, A_QuickKey4, A_QuickKey5,
-            A_QuickKey6, A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10, A_CycleSpellLeft, A_CycleSpellRight,
-            A_CycleWeaponLeft, A_CycleWeaponRight };
+        static const std::initializer_list<int> actions{ A_MoveForward, A_MoveBackward, A_MoveLeft, A_MoveRight,
+            A_TogglePOV, A_ZoomIn, A_ZoomOut, A_Sneak, A_Activate, A_Use, A_ToggleWeapon, A_ToggleSpell, A_AutoMove,
+            A_Jump, A_Inventory, A_Journal, A_Rest, A_QuickSave, A_QuickLoad, A_ToggleHUD, A_Screenshot,
+            A_QuickKeysMenu, A_QuickKey1, A_QuickKey2, A_QuickKey3, A_QuickKey4, A_QuickKey5, A_QuickKey6, A_QuickKey7,
+            A_QuickKey8, A_QuickKey9, A_QuickKey10, A_CycleSpellLeft, A_CycleSpellRight, A_CycleWeaponLeft,
+            A_CycleWeaponRight };
 
         return actions;
     }
@@ -615,12 +623,12 @@ namespace MWInput
         return mInputBinder->detectingBindingState();
     }
 
-    void BindingsManager::mousePressed(const SDL_MouseButtonEvent& arg, int deviceID)
+    void BindingsManager::mousePressed(const SDL_MouseButtonEvent& arg, Uint8 deviceID)
     {
         mInputBinder->mousePressed(arg, deviceID);
     }
 
-    void BindingsManager::mouseReleased(const SDL_MouseButtonEvent& arg, int deviceID)
+    void BindingsManager::mouseReleased(const SDL_MouseButtonEvent& arg, Uint8 deviceID)
     {
         mInputBinder->mouseReleased(arg, deviceID);
     }
diff --git a/apps/openmw/mwinput/bindingsmanager.hpp b/apps/openmw/mwinput/bindingsmanager.hpp
index a11baf74de..bee9e07cf7 100644
--- a/apps/openmw/mwinput/bindingsmanager.hpp
+++ b/apps/openmw/mwinput/bindingsmanager.hpp
@@ -47,8 +47,8 @@ namespace MWInput
 
         SDL_GameController* getControllerOrNull() const;
 
-        void mousePressed(const SDL_MouseButtonEvent& evt, int deviceID);
-        void mouseReleased(const SDL_MouseButtonEvent& arg, int deviceID);
+        void mousePressed(const SDL_MouseButtonEvent& evt, Uint8 deviceID);
+        void mouseReleased(const SDL_MouseButtonEvent& arg, Uint8 deviceID);
         void mouseMoved(const SDLUtil::MouseMotionEvent& arg);
         void mouseWheelMoved(const SDL_MouseWheelEvent& arg);
 
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 7054f72c8f..0c0a3de57c 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -34,16 +34,27 @@ namespace MWInput
     {
         if (!controllerBindingsFile.empty())
         {
-            SDL_GameControllerAddMappingsFromFile(Files::pathToUnicodeString(controllerBindingsFile).c_str());
+            const int result
+                = SDL_GameControllerAddMappingsFromFile(Files::pathToUnicodeString(controllerBindingsFile).c_str());
+            if (result < 0)
+                Log(Debug::Error) << "Failed to add game controller mappings from file \"" << controllerBindingsFile
+                                  << "\": " << SDL_GetError();
         }
 
         if (!userControllerBindingsFile.empty())
         {
-            SDL_GameControllerAddMappingsFromFile(Files::pathToUnicodeString(userControllerBindingsFile).c_str());
+            const int result
+                = SDL_GameControllerAddMappingsFromFile(Files::pathToUnicodeString(userControllerBindingsFile).c_str());
+            if (result < 0)
+                Log(Debug::Error) << "Failed to add game controller mappings from user file \""
+                                  << userControllerBindingsFile << "\": " << SDL_GetError();
         }
 
         // Open all presently connected sticks
-        int numSticks = SDL_NumJoysticks();
+        const int numSticks = SDL_NumJoysticks();
+        if (numSticks < 0)
+            Log(Debug::Error) << "Failed to get number of joysticks: " << SDL_GetError();
+
         for (int i = 0; i < numSticks; i++)
         {
             if (SDL_IsGameController(i))
@@ -52,11 +63,17 @@ namespace MWInput
                 evt.which = i;
                 static const int fakeDeviceID = 1;
                 ControllerManager::controllerAdded(fakeDeviceID, evt);
-                Log(Debug::Info) << "Detected game controller: " << SDL_GameControllerNameForIndex(i);
+                if (const char* name = SDL_GameControllerNameForIndex(i))
+                    Log(Debug::Info) << "Detected game controller: " << name;
+                else
+                    Log(Debug::Warning) << "Detected game controller without a name: " << SDL_GetError();
             }
             else
             {
-                Log(Debug::Info) << "Detected unusable controller: " << SDL_JoystickNameForIndex(i);
+                if (const char* name = SDL_JoystickNameForIndex(i))
+                    Log(Debug::Info) << "Detected unusable controller: " << name;
+                else
+                    Log(Debug::Warning) << "Detected unusable controller without a name: " << SDL_GetError();
             }
         }
 
@@ -77,7 +94,7 @@ namespace MWInput
             // We keep track of our own mouse position, so that moving the mouse while in
             // game mode does not move the position of the GUI cursor
             float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
-            const float gamepadCursorSpeed = Settings::input().mEnableController;
+            const float gamepadCursorSpeed = Settings::input().mGamepadCursorSpeed;
             const float xMove = xAxis * dt * 1500.0f / uiScale * gamepadCursorSpeed;
             const float yMove = yAxis * dt * 1500.0f / uiScale * gamepadCursorSpeed;
 
@@ -260,11 +277,11 @@ namespace MWInput
                 key = MyGUI::KeyCode::Apostrophe;
                 break;
             case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
-                key = MyGUI::KeyCode::Period;
-                break;
+                MWBase::Environment::get().getWindowManager()->injectKeyPress(MyGUI::KeyCode::Period, 0, false);
+                return true;
             case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
-                key = MyGUI::KeyCode::Slash;
-                break;
+                MWBase::Environment::get().getWindowManager()->injectKeyPress(MyGUI::KeyCode::Slash, 0, false);
+                return true;
             case SDL_CONTROLLER_BUTTON_LEFTSTICK:
                 mGamepadGuiCursorEnabled = !mGamepadGuiCursorEnabled;
                 MWBase::Environment::get().getWindowManager()->setCursorActive(mGamepadGuiCursorEnabled);
@@ -336,8 +353,11 @@ namespace MWInput
             return;
         if (!SDL_GameControllerHasSensor(cntrl, SDL_SENSOR_GYRO))
             return;
-        if (SDL_GameControllerSetSensorEnabled(cntrl, SDL_SENSOR_GYRO, SDL_TRUE) < 0)
+        if (const int result = SDL_GameControllerSetSensorEnabled(cntrl, SDL_SENSOR_GYRO, SDL_TRUE); result < 0)
+        {
+            Log(Debug::Error) << "Failed to enable game controller sensor: " << SDL_GetError();
             return;
+        }
         mGyroAvailable = true;
 #endif
     }
@@ -353,7 +373,11 @@ namespace MWInput
 #if SDL_VERSION_ATLEAST(2, 0, 14)
         SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
         if (cntrl && mGyroAvailable)
-            SDL_GameControllerGetSensorData(cntrl, SDL_SENSOR_GYRO, gyro, 3);
+        {
+            const int result = SDL_GameControllerGetSensorData(cntrl, SDL_SENSOR_GYRO, gyro, 3);
+            if (result < 0)
+                Log(Debug::Error) << "Failed to get game controller sensor data: " << SDL_GetError();
+        }
 #endif
         return std::array<float, 3>({ gyro[0], gyro[1], gyro[2] });
     }
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index f9ca0a3432..328757a954 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -25,17 +25,14 @@
 namespace MWInput
 {
     InputManager::InputManager(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer,
-        osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler,
-        osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
-        const std::filesystem::path& userFile, bool userFileExists,
-        const std::filesystem::path& userControllerBindingsFile, const std::filesystem::path& controllerBindingsFile,
-        bool grab)
+        osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler, const std::filesystem::path& userFile,
+        bool userFileExists, const std::filesystem::path& userControllerBindingsFile,
+        const std::filesystem::path& controllerBindingsFile, bool grab)
         : mControlsDisabled(false)
         , mInputWrapper(std::make_unique<SDLUtil::InputWrapper>(window, viewer, grab))
         , mBindingsManager(std::make_unique<BindingsManager>(userFile, userFileExists))
         , mControlSwitch(std::make_unique<ControlSwitch>())
-        , mActionManager(std::make_unique<ActionManager>(
-              mBindingsManager.get(), screenCaptureOperation, viewer, screenCaptureHandler))
+        , mActionManager(std::make_unique<ActionManager>(mBindingsManager.get(), viewer, screenCaptureHandler))
         , mKeyboardManager(std::make_unique<KeyboardManager>(mBindingsManager.get()))
         , mMouseManager(std::make_unique<MouseManager>(mBindingsManager.get(), mInputWrapper.get(), window))
         , mControllerManager(std::make_unique<ControllerManager>(
@@ -102,6 +99,11 @@ namespace MWInput
         mControllerManager->setGamepadGuiCursorEnabled(enabled);
     }
 
+    bool InputManager::isGamepadGuiCursorEnabled()
+    {
+        return mControllerManager->gamepadGuiCursorEnabled();
+    }
+
     void InputManager::changeInputMode(bool guiMode)
     {
         mControllerManager->setGuiCursorEnabled(guiMode);
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index c5de579961..39a1133db5 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -49,10 +49,8 @@ namespace MWInput
     {
     public:
         InputManager(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer,
-            osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler,
-            osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
-            const std::filesystem::path& userFile, bool userFileExists,
-            const std::filesystem::path& userControllerBindingsFile,
+            osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler, const std::filesystem::path& userFile,
+            bool userFileExists, const std::filesystem::path& userControllerBindingsFile,
             const std::filesystem::path& controllerBindingsFile, bool grab);
 
         ~InputManager() final;
@@ -68,6 +66,7 @@ namespace MWInput
 
         void setDragDrop(bool dragDrop) override;
         void setGamepadGuiCursorEnabled(bool enabled) override;
+        bool isGamepadGuiCursorEnabled() override;
 
         void toggleControlSwitch(std::string_view sw, bool value) override;
         bool getControlSwitch(std::string_view sw) override;
@@ -105,16 +104,6 @@ namespace MWInput
         bool controlsDisabled() override { return mControlsDisabled; }
 
     private:
-        void convertMousePosForMyGUI(int& x, int& y);
-
-        void handleGuiArrowKey(int action);
-
-        void quickKey(int index);
-        void showQuickKeysMenu();
-
-        void loadKeyDefaults(bool force = false);
-        void loadControllerDefaults(bool force = false);
-
         bool mControlsDisabled;
 
         std::unique_ptr<SDLUtil::InputWrapper> mInputWrapper;
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index 363a78fadd..eed95cf1c9 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -10,9 +10,12 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwgui/settingswindow.hpp"
+
 #include "../mwworld/player.hpp"
 
 #include "actions.hpp"
@@ -117,15 +120,22 @@ namespace MWInput
             mBindingsManager->setPlayerControlsEnabled(!guiMode);
             mBindingsManager->mouseReleased(arg, id);
         }
+
+        MWBase::Environment::get().getLuaManager()->inputEvent(
+            { MWBase::LuaManager::InputEvent::MouseButtonReleased, arg.button });
     }
 
     void MouseManager::mouseWheelMoved(const SDL_MouseWheelEvent& arg)
     {
         MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
         if (mBindingsManager->isDetectingBindingState() || !input->controlsDisabled())
+        {
             mBindingsManager->mouseWheelMoved(arg);
+        }
 
         input->setJoystickLastUsed(false);
+        MWBase::Environment::get().getLuaManager()->inputEvent({ MWBase::LuaManager::InputEvent::MouseWheel,
+            MWBase::LuaManager::InputEvent::WheelChange{ arg.x, arg.y } });
     }
 
     void MouseManager::mousePressed(const SDL_MouseButtonEvent& arg, Uint8 id)
@@ -156,9 +166,12 @@ namespace MWInput
 
         // Don't trigger any mouse bindings while in settings menu, otherwise rebinding controls becomes impossible
         // Also do not trigger bindings when input controls are disabled, e.g. during save loading
-        if (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Settings
-            && !input->controlsDisabled())
+        if (!MWBase::Environment::get().getWindowManager()->isSettingsWindowVisible() && !input->controlsDisabled())
+        {
             mBindingsManager->mousePressed(arg, id);
+        }
+        MWBase::Environment::get().getLuaManager()->inputEvent(
+            { MWBase::LuaManager::InputEvent::MouseButtonPressed, arg.button });
     }
 
     void MouseManager::updateCursorMode()
@@ -205,14 +218,14 @@ namespace MWInput
         };
 
         // Only actually turn player when we're not in vanity mode
-        bool controls = MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols");
-        if (!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot) && controls)
+        bool playerLooking = MWBase::Environment::get().getInputManager()->getControlSwitch("playerlooking");
+        if (!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot) && playerLooking)
         {
             MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
             player.yaw(-rot[2]);
             player.pitch(-rot[0]);
         }
-        else if (!controls)
+        else if (!playerLooking)
             MWBase::Environment::get().getWorld()->disableDeferredPreviewRotation();
 
         MWBase::Environment::get().getInputManager()->resetIdleTime();
@@ -246,7 +259,8 @@ namespace MWInput
 
     void MouseManager::warpMouse()
     {
-        float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
-        mInputWrapper->warpMouse(static_cast<int>(mGuiCursorX * uiScale), static_cast<int>(mGuiCursorY * uiScale));
+        float guiUiScale = Settings::gui().mScalingFactor;
+        mInputWrapper->warpMouse(
+            static_cast<int>(mGuiCursorX * guiUiScale), static_cast<int>(mGuiCursorY * guiUiScale));
     }
 }
diff --git a/apps/openmw/mwinput/sensormanager.cpp b/apps/openmw/mwinput/sensormanager.cpp
index 32e48a008e..298006030a 100644
--- a/apps/openmw/mwinput/sensormanager.cpp
+++ b/apps/openmw/mwinput/sensormanager.cpp
@@ -42,8 +42,7 @@ namespace MWInput
 
         float angle = 0;
 
-        SDL_DisplayOrientation currentOrientation
-            = SDL_GetDisplayOrientation(Settings::Manager::getInt("screen", "Video"));
+        SDL_DisplayOrientation currentOrientation = SDL_GetDisplayOrientation(Settings::video().mScreen);
         switch (currentOrientation)
         {
             case SDL_ORIENTATION_UNKNOWN:
diff --git a/apps/openmw/mwlua/animationbindings.cpp b/apps/openmw/mwlua/animationbindings.cpp
new file mode 100644
index 0000000000..b74a3e51c3
--- /dev/null
+++ b/apps/openmw/mwlua/animationbindings.cpp
@@ -0,0 +1,336 @@
+#include "animationbindings.hpp"
+
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/lua/asyncpackage.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/lua/utilpackage.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/settings/values.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwmechanics/character.hpp"
+
+#include "../mwworld/esmstore.hpp"
+
+#include "context.hpp"
+#include "luamanagerimp.hpp"
+#include "objectvariant.hpp"
+
+namespace MWLua
+{
+    using BlendMask = MWRender::Animation::BlendMask;
+    using BoneGroup = MWRender::Animation::BoneGroup;
+    using Priority = MWMechanics::Priority;
+    using AnimationPriorities = MWRender::Animation::AnimPriority;
+
+    MWWorld::Ptr getMutablePtrOrThrow(const ObjectVariant& variant)
+    {
+        if (variant.isLObject())
+            throw std::runtime_error("Local scripts can only modify animations of the object they are attached to.");
+
+        MWWorld::Ptr ptr = variant.ptr();
+        if (ptr.isEmpty())
+            throw std::runtime_error("Invalid object");
+        if (!ptr.getRefData().isEnabled())
+            throw std::runtime_error("Can't use a disabled object");
+
+        return ptr;
+    }
+
+    MWWorld::Ptr getPtrOrThrow(const ObjectVariant& variant)
+    {
+        MWWorld::Ptr ptr = variant.ptr();
+        if (ptr.isEmpty())
+            throw std::runtime_error("Invalid object");
+
+        return ptr;
+    }
+
+    MWRender::Animation* getMutableAnimationOrThrow(const ObjectVariant& variant)
+    {
+        MWWorld::Ptr ptr = getMutablePtrOrThrow(variant);
+        auto world = MWBase::Environment::get().getWorld();
+        MWRender::Animation* anim = world->getAnimation(ptr);
+        if (!anim)
+            throw std::runtime_error("Object has no animation");
+        return anim;
+    }
+
+    const MWRender::Animation* getConstAnimationOrThrow(const ObjectVariant& variant)
+    {
+        MWWorld::Ptr ptr = getPtrOrThrow(variant);
+        auto world = MWBase::Environment::get().getWorld();
+        const MWRender::Animation* anim = world->getAnimation(ptr);
+        if (!anim)
+            throw std::runtime_error("Object has no animation");
+        return anim;
+    }
+
+    static AnimationPriorities getPriorityArgument(const sol::table& args)
+    {
+        auto asPriorityEnum = args.get<sol::optional<Priority>>("priority");
+        if (asPriorityEnum)
+            return asPriorityEnum.value();
+
+        auto asTable = args.get<sol::optional<sol::table>>("priority");
+        if (asTable)
+        {
+            AnimationPriorities priorities = AnimationPriorities(Priority::Priority_Default);
+            for (const auto& entry : asTable.value())
+            {
+                if (!entry.first.is<BoneGroup>() || !entry.second.is<Priority>())
+                    throw std::runtime_error("Priority table must consist of BoneGroup-Priority pairs only");
+                auto group = entry.first.as<BoneGroup>();
+                auto priority = entry.second.as<Priority>();
+                if (group < 0 || group >= BoneGroup::Num_BoneGroups)
+                    throw std::runtime_error("Invalid bonegroup: " + std::to_string(group));
+                priorities[group] = priority;
+            }
+
+            return priorities;
+        }
+
+        return Priority::Priority_Default;
+    }
+
+    sol::table initAnimationPackage(const Context& context)
+    {
+        auto view = context.sol();
+        auto mechanics = MWBase::Environment::get().getMechanicsManager();
+        auto world = MWBase::Environment::get().getWorld();
+
+        sol::table api(view, sol::create);
+
+        api["PRIORITY"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWMechanics::Priority>(view,
+                {
+                    { "Default", MWMechanics::Priority::Priority_Default },
+                    { "WeaponLowerBody", MWMechanics::Priority::Priority_WeaponLowerBody },
+                    { "SneakIdleLowerBody", MWMechanics::Priority::Priority_SneakIdleLowerBody },
+                    { "SwimIdle", MWMechanics::Priority::Priority_SwimIdle },
+                    { "Jump", MWMechanics::Priority::Priority_Jump },
+                    { "Movement", MWMechanics::Priority::Priority_Movement },
+                    { "Hit", MWMechanics::Priority::Priority_Hit },
+                    { "Weapon", MWMechanics::Priority::Priority_Weapon },
+                    { "Block", MWMechanics::Priority::Priority_Block },
+                    { "Knockdown", MWMechanics::Priority::Priority_Knockdown },
+                    { "Torch", MWMechanics::Priority::Priority_Torch },
+                    { "Storm", MWMechanics::Priority::Priority_Storm },
+                    { "Death", MWMechanics::Priority::Priority_Death },
+                    { "Scripted", MWMechanics::Priority::Priority_Scripted },
+                }));
+
+        api["BLEND_MASK"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, BlendMask>(view,
+            {
+                { "LowerBody", BlendMask::BlendMask_LowerBody },
+                { "Torso", BlendMask::BlendMask_Torso },
+                { "LeftArm", BlendMask::BlendMask_LeftArm },
+                { "RightArm", BlendMask::BlendMask_RightArm },
+                { "UpperBody", BlendMask::BlendMask_UpperBody },
+                { "All", BlendMask::BlendMask_All },
+            }));
+
+        api["BONE_GROUP"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, BoneGroup>(view,
+            {
+                { "LowerBody", BoneGroup::BoneGroup_LowerBody },
+                { "Torso", BoneGroup::BoneGroup_Torso },
+                { "LeftArm", BoneGroup::BoneGroup_LeftArm },
+                { "RightArm", BoneGroup::BoneGroup_RightArm },
+            }));
+
+        api["hasAnimation"] = [world](const sol::object& object) -> bool {
+            return world->getAnimation(getPtrOrThrow(ObjectVariant(object))) != nullptr;
+        };
+
+        // equivalent to MWScript's SkipAnim
+        api["skipAnimationThisFrame"] = [mechanics](const sol::object& object) {
+            MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+            // This sets a flag that is only used during the update pass, so
+            // there's no need to queue
+            mechanics->skipAnimation(ptr);
+        };
+
+        api["getTextKeyTime"] = [](const sol::object& object, std::string_view key) -> sol::optional<float> {
+            float time = getConstAnimationOrThrow(ObjectVariant(object))->getTextKeyTime(key);
+            if (time >= 0.f)
+                return time;
+            return sol::nullopt;
+        };
+        api["isPlaying"] = [](const sol::object& object, std::string_view groupname) {
+            return getConstAnimationOrThrow(ObjectVariant(object))->isPlaying(groupname);
+        };
+        api["getCurrentTime"] = [](const sol::object& object, std::string_view groupname) -> sol::optional<float> {
+            float time = getConstAnimationOrThrow(ObjectVariant(object))->getCurrentTime(groupname);
+            if (time >= 0.f)
+                return time;
+            return sol::nullopt;
+        };
+        api["isLoopingAnimation"] = [](const sol::object& object, std::string_view groupname) {
+            return getConstAnimationOrThrow(ObjectVariant(object))->isLoopingAnimation(groupname);
+        };
+        api["cancel"] = [](const sol::object& object, std::string_view groupname) {
+            return getMutableAnimationOrThrow(ObjectVariant(object))->disable(groupname);
+        };
+        api["setLoopingEnabled"] = [](const sol::object& object, std::string_view groupname, bool enabled) {
+            return getMutableAnimationOrThrow(ObjectVariant(object))->setLoopingEnabled(groupname, enabled);
+        };
+        // MWRender::Animation::getInfo can also return the current speed multiplier, but this is never used.
+        api["getCompletion"] = [](const sol::object& object, std::string_view groupname) -> sol::optional<float> {
+            float completion = 0.f;
+            if (getConstAnimationOrThrow(ObjectVariant(object))->getInfo(groupname, &completion))
+                return completion;
+            return sol::nullopt;
+        };
+        api["getLoopCount"] = [](const sol::object& object, std::string groupname) -> sol::optional<size_t> {
+            size_t loops = 0;
+            if (getConstAnimationOrThrow(ObjectVariant(object))->getInfo(groupname, nullptr, nullptr, &loops))
+                return loops;
+            return sol::nullopt;
+        };
+        api["getSpeed"] = [](const sol::object& object, std::string groupname) -> sol::optional<float> {
+            float speed = 0.f;
+            if (getConstAnimationOrThrow(ObjectVariant(object))->getInfo(groupname, nullptr, &speed, nullptr))
+                return speed;
+            return sol::nullopt;
+        };
+        api["setSpeed"] = [](const sol::object& object, std::string groupname, float speed) {
+            getMutableAnimationOrThrow(ObjectVariant(object))->adjustSpeedMult(groupname, speed);
+        };
+        api["getActiveGroup"] = [](const sol::object& object, MWRender::BoneGroup boneGroup) -> std::string_view {
+            if (boneGroup < 0 || boneGroup >= BoneGroup::Num_BoneGroups)
+                throw std::runtime_error("Invalid bonegroup: " + std::to_string(boneGroup));
+            return getConstAnimationOrThrow(ObjectVariant(object))->getActiveGroup(boneGroup);
+        };
+
+        // Clears out the animation queue, and cancel any animation currently playing from the queue
+        api["clearAnimationQueue"] = [mechanics](const sol::object& object, bool clearScripted) {
+            MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+            mechanics->clearAnimationQueue(ptr, clearScripted);
+        };
+
+        // Extended variant of MWScript's PlayGroup and LoopGroup
+        api["playQueued"] = sol::overload(
+            [mechanics](const sol::object& object, const std::string& groupname, const sol::table& options) {
+                uint32_t numberOfLoops = options.get_or("loops", std::numeric_limits<uint32_t>::max());
+                float speed = options.get_or("speed", 1.f);
+                std::string startKey = options.get_or<std::string>("startKey", "start");
+                std::string stopKey = options.get_or<std::string>("stopKey", "stop");
+                bool forceLoop = options.get_or("forceLoop", false);
+
+                MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+                mechanics->playAnimationGroupLua(ptr, groupname, numberOfLoops, speed, startKey, stopKey, forceLoop);
+            },
+            [mechanics](const sol::object& object, const std::string& groupname) {
+                MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+                mechanics->playAnimationGroupLua(
+                    ptr, groupname, std::numeric_limits<int>::max(), 1, "start", "stop", false);
+            });
+
+        api["playBlended"] = [](const sol::object& object, std::string_view groupName, const sol::table& options) {
+            uint32_t loops = options.get_or("loops", 0u);
+            MWRender::Animation::AnimPriority priority = getPriorityArgument(options);
+            BlendMask blendMask = options.get_or("blendMask", BlendMask::BlendMask_All);
+            bool autoDisable = options.get_or("autoDisable", true);
+            float speed = options.get_or("speed", 1.0f);
+            std::string start = options.get_or<std::string>("startKey", "start");
+            std::string stop = options.get_or<std::string>("stopKey", "stop");
+            float startPoint = options.get_or("startPoint", 0.0f);
+            bool forceLoop = options.get_or("forceLoop", false);
+
+            const std::string lowerGroup = Misc::StringUtils::lowerCase(groupName);
+
+            auto animation = getMutableAnimationOrThrow(ObjectVariant(object));
+            animation->play(lowerGroup, priority, blendMask, autoDisable, speed, start, stop, startPoint, loops,
+                forceLoop || animation->isLoopingAnimation(lowerGroup));
+        };
+
+        api["hasGroup"] = [](const sol::object& object, std::string_view groupname) -> bool {
+            const MWRender::Animation* anim = getConstAnimationOrThrow(ObjectVariant(object));
+            return anim->hasAnimation(groupname);
+        };
+
+        // Note: This checks the nodemap, and does not read the scene graph itself, and so should be thread safe.
+        api["hasBone"] = [](const sol::object& object, std::string_view bonename) -> bool {
+            const MWRender::Animation* anim = getConstAnimationOrThrow(ObjectVariant(object));
+            return anim->getNode(bonename) != nullptr;
+        };
+
+        api["addVfx"] = [context](
+                            const sol::object& object, std::string_view model, sol::optional<sol::table> options) {
+            if (options)
+            {
+                context.mLuaManager->addAction(
+                    [object = ObjectVariant(object), model = std::string(model),
+                        effectId = options->get_or<std::string>("vfxId", ""), loop = options->get_or("loop", false),
+                        boneName = options->get_or<std::string>("boneName", ""),
+                        particleTexture = options->get_or<std::string>("particleTextureOverride", "")] {
+                        MWRender::Animation* anim = getMutableAnimationOrThrow(ObjectVariant(object));
+
+                        anim->addEffect(model, effectId, loop, boneName, particleTexture);
+                    },
+                    "addVfxAction");
+            }
+            else
+            {
+                context.mLuaManager->addAction(
+                    [object = ObjectVariant(object), model = std::string(model)] {
+                        MWRender::Animation* anim = getMutableAnimationOrThrow(object);
+                        anim->addEffect(model, "");
+                    },
+                    "addVfxAction");
+            }
+        };
+
+        api["removeVfx"] = [context](const sol::object& object, std::string_view effectId) {
+            context.mLuaManager->addAction(
+                [object = ObjectVariant(object), effectId = std::string(effectId)] {
+                    MWRender::Animation* anim = getMutableAnimationOrThrow(object);
+                    anim->removeEffect(effectId);
+                },
+                "removeVfxAction");
+        };
+
+        api["removeAllVfx"] = [context](const sol::object& object) {
+            context.mLuaManager->addAction(
+                [object = ObjectVariant(object)] {
+                    MWRender::Animation* anim = getMutableAnimationOrThrow(object);
+                    anim->removeEffects();
+                },
+                "removeVfxAction");
+        };
+
+        return LuaUtil::makeReadOnly(api);
+    }
+
+    sol::table initWorldVfxBindings(const Context& context)
+    {
+        sol::table api(context.mLua->unsafeState(), sol::create);
+        auto world = MWBase::Environment::get().getWorld();
+
+        api["spawn"]
+            = [world, context](std::string_view model, const osg::Vec3f& worldPos, sol::optional<sol::table> options) {
+                  if (options)
+                  {
+                      bool magicVfx = options->get_or("mwMagicVfx", true);
+                      std::string texture = options->get_or<std::string>("particleTextureOverride", "");
+                      float scale = options->get_or("scale", 1.f);
+                      context.mLuaManager->addAction(
+                          [world, model = VFS::Path::Normalized(model), texture = std::move(texture), worldPos, scale,
+                              magicVfx]() { world->spawnEffect(model, texture, worldPos, scale, magicVfx); },
+                          "openmw.vfx.spawn");
+                  }
+                  else
+                  {
+                      context.mLuaManager->addAction([world, model = VFS::Path::Normalized(model),
+                                                         worldPos]() { world->spawnEffect(model, "", worldPos); },
+                          "openmw.vfx.spawn");
+                  }
+              };
+
+        return api;
+    }
+}
diff --git a/apps/openmw/mwlua/animationbindings.hpp b/apps/openmw/mwlua/animationbindings.hpp
new file mode 100644
index 0000000000..aa89649a35
--- /dev/null
+++ b/apps/openmw/mwlua/animationbindings.hpp
@@ -0,0 +1,14 @@
+#ifndef MWLUA_ANIMATIONBINDINGS_H
+#define MWLUA_ANIMATIONBINDINGS_H
+
+#include <sol/forward.hpp>
+
+namespace MWLua
+{
+    struct Context;
+
+    sol::table initAnimationPackage(const Context& context);
+    sol::table initWorldVfxBindings(const Context& context);
+}
+
+#endif // MWLUA_ANIMATIONBINDINGS_H
diff --git a/apps/openmw/mwlua/birthsignbindings.cpp b/apps/openmw/mwlua/birthsignbindings.cpp
new file mode 100644
index 0000000000..218d05b804
--- /dev/null
+++ b/apps/openmw/mwlua/birthsignbindings.cpp
@@ -0,0 +1,47 @@
+#include "birthsignbindings.hpp"
+
+#include <components/esm3/loadbsgn.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
+
+#include "../mwbase/environment.hpp"
+
+#include "idcollectionbindings.hpp"
+#include "types/types.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::BirthSign> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+    sol::table initBirthSignRecordBindings(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table birthSigns(lua, sol::create);
+        addRecordFunctionBinding<ESM::BirthSign>(birthSigns, context);
+
+        auto signT = lua.new_usertype<ESM::BirthSign>("ESM3_BirthSign");
+        signT[sol::meta_function::to_string] = [](const ESM::BirthSign& rec) -> std::string {
+            return "ESM3_BirthSign[" + rec.mId.toDebugString() + "]";
+        };
+        signT["id"] = sol::readonly_property([](const ESM::BirthSign& rec) { return rec.mId.serializeText(); });
+        signT["name"] = sol::readonly_property([](const ESM::BirthSign& rec) -> std::string_view { return rec.mName; });
+        signT["description"]
+            = sol::readonly_property([](const ESM::BirthSign& rec) -> std::string_view { return rec.mDescription; });
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        signT["texture"] = sol::readonly_property([vfs](const ESM::BirthSign& rec) -> std::string {
+            return Misc::ResourceHelpers::correctTexturePath(rec.mTexture, vfs);
+        });
+        signT["spells"] = sol::readonly_property([lua](const ESM::BirthSign& rec) -> sol::table {
+            return createReadOnlyRefIdTable(lua, rec.mPowers.mList);
+        });
+
+        return LuaUtil::makeReadOnly(birthSigns);
+    }
+}
diff --git a/apps/openmw/mwlua/birthsignbindings.hpp b/apps/openmw/mwlua/birthsignbindings.hpp
new file mode 100644
index 0000000000..bf41707d47
--- /dev/null
+++ b/apps/openmw/mwlua/birthsignbindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_BIRTHSIGNBINDINGS_H
+#define MWLUA_BIRTHSIGNBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initBirthSignRecordBindings(const Context& context);
+}
+
+#endif // MWLUA_BIRTHSIGNBINDINGS_H
diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index bbdba00ee2..d64110ea98 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -1,3 +1,4 @@
+#include "camerabindings.hpp"
 
 #include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
@@ -13,7 +14,7 @@ namespace MWLua
 
     using CameraMode = MWRender::Camera::Mode;
 
-    sol::table initCameraPackage(sol::state_view& lua)
+    sol::table initCameraPackage(sol::state_view lua)
     {
         MWRender::Camera* camera = MWBase::Environment::get().getWorld()->getCamera();
         MWRender::RenderingManager* renderingManager = MWBase::Environment::get().getWorld()->getRenderingManager();
@@ -94,8 +95,8 @@ namespace MWLua
         api["getViewTransform"] = [camera]() { return LuaUtil::TransformM{ camera->getViewMatrix() }; };
 
         api["viewportToWorldVector"] = [camera, renderingManager](osg::Vec2f pos) -> osg::Vec3f {
-            double width = Settings::Manager::getInt("resolution x", "Video");
-            double height = Settings::Manager::getInt("resolution y", "Video");
+            const double width = Settings::video().mResolutionX;
+            const double height = Settings::video().mResolutionY;
             double aspect = (height == 0.0) ? 1.0 : width / height;
             double fovTan = std::tan(osg::DegreesToRadians(renderingManager->getFieldOfView()) / 2);
             osg::Matrixf invertedViewMatrix;
@@ -106,8 +107,8 @@ namespace MWLua
         };
 
         api["worldToViewportVector"] = [camera](osg::Vec3f pos) {
-            double width = Settings::Manager::getInt("resolution x", "Video");
-            double height = Settings::Manager::getInt("resolution y", "Video");
+            const double width = Settings::video().mResolutionX;
+            const double height = Settings::video().mResolutionY;
 
             osg::Matrix windowMatrix
                 = osg::Matrix::translate(1.0, 1.0, 1.0) * osg::Matrix::scale(0.5 * width, 0.5 * height, 0.5);
diff --git a/apps/openmw/mwlua/camerabindings.hpp b/apps/openmw/mwlua/camerabindings.hpp
index be468495e1..001ef32167 100644
--- a/apps/openmw/mwlua/camerabindings.hpp
+++ b/apps/openmw/mwlua/camerabindings.hpp
@@ -5,7 +5,7 @@
 
 namespace MWLua
 {
-    sol::table initCameraPackage(sol::state_view& lua);
+    sol::table initCameraPackage(sol::state_view lua);
 }
 
 #endif // MWLUA_CAMERABINDINGS_H
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 48c7141ab8..933dba3fda 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -12,6 +12,7 @@
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loaddoor.hpp>
 #include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlevlist.hpp>
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/loadlock.hpp>
 #include <components/esm3/loadmisc.hpp>
@@ -30,15 +31,21 @@
 #include <components/esm4/loadclot.hpp>
 #include <components/esm4/loadcont.hpp>
 #include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadflor.hpp>
 #include <components/esm4/loadfurn.hpp>
+#include <components/esm4/loadimod.hpp>
 #include <components/esm4/loadingr.hpp>
 #include <components/esm4/loadligh.hpp>
 #include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmstt.hpp>
 #include <components/esm4/loadrefr.hpp>
+#include <components/esm4/loadscol.hpp>
 #include <components/esm4/loadstat.hpp>
 #include <components/esm4/loadtree.hpp>
 #include <components/esm4/loadweap.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/worldmodel.hpp"
 
@@ -62,7 +69,8 @@ namespace MWLua
     template <class CellT, class ObjectT>
     static void initCellBindings(const std::string& prefix, const Context& context)
     {
-        sol::usertype<CellT> cellT = context.mLua->sol().new_usertype<CellT>(prefix + "Cell");
+        auto view = context.sol();
+        sol::usertype<CellT> cellT = view.new_usertype<CellT>(prefix + "Cell");
 
         cellT[sol::meta_function::equal_to] = [](const CellT& a, const CellT& b) { return a.mStore == b.mStore; };
         cellT[sol::meta_function::to_string] = [](const CellT& c) {
@@ -77,6 +85,8 @@ namespace MWLua
         };
 
         cellT["name"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->getNameId(); });
+        cellT["id"]
+            = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->getId().serializeText(); });
         cellT["region"] = sol::readonly_property(
             [](const CellT& c) -> std::string { return c.mStore->getCell()->getRegion().serializeText(); });
         cellT["worldSpaceId"] = sol::readonly_property(
@@ -109,15 +119,21 @@ namespace MWLua
             return cell == c.mStore || (cell->getCell()->getWorldSpace() == c.mStore->getCell()->getWorldSpace());
         };
 
+        cellT["waterLevel"] = sol::readonly_property([](const CellT& c) -> sol::optional<float> {
+            if (c.mStore->getCell()->hasWater())
+                return c.mStore->getWaterLevel();
+            else
+                return sol::nullopt;
+        });
+
         if constexpr (std::is_same_v<CellT, GCell>)
         { // only for global scripts
-            cellT["getAll"] = [ids = getPackageToTypeTable(context.mLua->sol())](
-                                  const CellT& cell, sol::optional<sol::table> type) {
+            cellT["getAll"] = [ids = getPackageToTypeTable(view)](const CellT& cell, sol::optional<sol::table> type) {
                 if (cell.mStore->getState() != MWWorld::CellStore::State_Loaded)
                     cell.mStore->load();
                 ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
                 auto visitor = [&](const MWWorld::Ptr& ptr) {
-                    if (ptr.getRefData().isDeleted())
+                    if (ptr.mRef->isDeleted())
                         return true;
                     MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
                     if (getLiveCellRefType(ptr.mRef) == ptr.getType())
@@ -198,6 +214,9 @@ namespace MWLua
                         case ESM::REC_STAT:
                             cell.mStore->template forEachType<ESM::Static>(visitor);
                             break;
+                        case ESM::REC_LEVC:
+                            cell.mStore->template forEachType<ESM::CreatureLevList>(visitor);
+                            break;
 
                         case ESM::REC_ACTI4:
                             cell.mStore->template forEachType<ESM4::Activator>(visitor);
@@ -220,9 +239,15 @@ namespace MWLua
                         case ESM::REC_DOOR4:
                             cell.mStore->template forEachType<ESM4::Door>(visitor);
                             break;
+                        case ESM::REC_FLOR4:
+                            cell.mStore->template forEachType<ESM4::Flora>(visitor);
+                            break;
                         case ESM::REC_FURN4:
                             cell.mStore->template forEachType<ESM4::Furniture>(visitor);
                             break;
+                        case ESM::REC_IMOD4:
+                            cell.mStore->template forEachType<ESM4::ItemMod>(visitor);
+                            break;
                         case ESM::REC_INGR4:
                             cell.mStore->template forEachType<ESM4::Ingredient>(visitor);
                             break;
@@ -232,9 +257,15 @@ namespace MWLua
                         case ESM::REC_MISC4:
                             cell.mStore->template forEachType<ESM4::MiscItem>(visitor);
                             break;
+                        case ESM::REC_MSTT4:
+                            cell.mStore->template forEachType<ESM4::MovableStatic>(visitor);
+                            break;
                         case ESM::REC_ALCH4:
                             cell.mStore->template forEachType<ESM4::Potion>(visitor);
                             break;
+                        case ESM::REC_SCOL4:
+                            cell.mStore->template forEachType<ESM4::StaticCollection>(visitor);
+                            break;
                         case ESM::REC_STAT4:
                             cell.mStore->template forEachType<ESM4::Static>(visitor);
                             break;
@@ -252,7 +283,7 @@ namespace MWLua
                 if (!ok)
                     throw std::runtime_error(
                         std::string("Incorrect type argument in cell:getAll: " + LuaUtil::toString(*type)));
-                return GObjectList{ res };
+                return GObjectList{ std::move(res) };
             };
         }
     }
diff --git a/apps/openmw/mwlua/classbindings.cpp b/apps/openmw/mwlua/classbindings.cpp
new file mode 100644
index 0000000000..c94631fb3c
--- /dev/null
+++ b/apps/openmw/mwlua/classbindings.cpp
@@ -0,0 +1,53 @@
+#include "classbindings.hpp"
+
+#include <components/esm3/loadclas.hpp>
+#include <components/lua/luastate.hpp>
+
+#include "idcollectionbindings.hpp"
+#include "types/types.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Class> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+
+    sol::table initClassRecordBindings(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table classes(lua, sol::create);
+        addRecordFunctionBinding<ESM::Class>(classes, context);
+
+        auto classT = lua.new_usertype<ESM::Class>("ESM3_Class");
+        classT[sol::meta_function::to_string]
+            = [](const ESM::Class& rec) -> std::string { return "ESM3_Class[" + rec.mId.toDebugString() + "]"; };
+        classT["id"] = sol::readonly_property([](const ESM::Class& rec) { return rec.mId.serializeText(); });
+        classT["name"] = sol::readonly_property([](const ESM::Class& rec) -> std::string_view { return rec.mName; });
+        classT["description"]
+            = sol::readonly_property([](const ESM::Class& rec) -> std::string_view { return rec.mDescription; });
+
+        classT["attributes"] = sol::readonly_property([lua](const ESM::Class& rec) -> sol::table {
+            return createReadOnlyRefIdTable(lua, rec.mData.mAttribute, ESM::Attribute::indexToRefId);
+        });
+        classT["majorSkills"] = sol::readonly_property([lua](const ESM::Class& rec) -> sol::table {
+            return createReadOnlyRefIdTable(
+                lua, rec.mData.mSkills, [](const auto& pair) { return ESM::Skill::indexToRefId(pair[1]); });
+        });
+        classT["minorSkills"] = sol::readonly_property([lua](const ESM::Class& rec) -> sol::table {
+            return createReadOnlyRefIdTable(
+                lua, rec.mData.mSkills, [](const auto& pair) { return ESM::Skill::indexToRefId(pair[0]); });
+        });
+
+        classT["specialization"] = sol::readonly_property([](const ESM::Class& rec) -> std::string_view {
+            return ESM::Class::specializationIndexToLuaId.at(rec.mData.mSpecialization);
+        });
+        classT["isPlayable"]
+            = sol::readonly_property([](const ESM::Class& rec) -> bool { return rec.mData.mIsPlayable; });
+        return LuaUtil::makeReadOnly(classes);
+    }
+}
diff --git a/apps/openmw/mwlua/classbindings.hpp b/apps/openmw/mwlua/classbindings.hpp
new file mode 100644
index 0000000000..1acb0a9ad3
--- /dev/null
+++ b/apps/openmw/mwlua/classbindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_CLASSBINDINGS_H
+#define MWLUA_CLASSBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initClassRecordBindings(const Context& context);
+}
+
+#endif // MWLUA_CLASSBINDINGS_H
diff --git a/apps/openmw/mwlua/context.hpp b/apps/openmw/mwlua/context.hpp
index 68b46164d6..363507bdc9 100644
--- a/apps/openmw/mwlua/context.hpp
+++ b/apps/openmw/mwlua/context.hpp
@@ -1,6 +1,8 @@
 #ifndef MWLUA_CONTEXT_H
 #define MWLUA_CONTEXT_H
 
+#include <components/lua/luastate.hpp>
+
 namespace LuaUtil
 {
     class LuaState;
@@ -15,12 +17,90 @@ namespace MWLua
 
     struct Context
     {
-        bool mIsGlobal;
+        enum Type
+        {
+            Menu,
+            Global,
+            Local,
+        };
+        Type mType;
         LuaManager* mLuaManager;
         LuaUtil::LuaState* mLua;
         LuaUtil::UserdataSerializer* mSerializer;
         ObjectLists* mObjectLists;
         LuaEvents* mLuaEvents;
+
+        std::string_view typeName() const
+        {
+            switch (mType)
+            {
+                case Menu:
+                    return "menu";
+                case Global:
+                    return "global";
+                case Local:
+                    return "local";
+                default:
+                    throw std::domain_error("Unhandled context type");
+            }
+        }
+
+        template <class... Str>
+        sol::object getCachedPackage(std::string_view first, const Str&... str) const
+        {
+            sol::object package = sol()[first];
+            if constexpr (sizeof...(str) == 0)
+                return package;
+            else
+                return LuaUtil::getFieldOrNil(package, str...);
+        }
+
+        template <class... Str>
+        const sol::object& setCachedPackage(const sol::object& value, std::string_view first, const Str&... str) const
+        {
+            sol::state_view lua = sol();
+            if constexpr (sizeof...(str) == 0)
+                lua[first] = value;
+            else
+            {
+                if (lua[first] == sol::nil)
+                    lua[first] = sol::table(lua, sol::create);
+                sol::table table = lua[first];
+                LuaUtil::setDeepField(table, value, str...);
+            }
+            return value;
+        }
+
+        sol::object getTypePackage(std::string_view key) const { return getCachedPackage(key, typeName()); }
+
+        const sol::object& setTypePackage(const sol::object& value, std::string_view key) const
+        {
+            return setCachedPackage(value, key, typeName());
+        }
+
+        template <class Factory>
+        sol::object cachePackage(std::string_view key, Factory factory) const
+        {
+            sol::object cached = getCachedPackage(key);
+            if (cached != sol::nil)
+                return cached;
+            else
+                return setCachedPackage(factory(), key);
+        }
+
+        bool initializeOnce(std::string_view key) const
+        {
+            auto view = sol();
+            sol::object flag = view[key];
+            view[key] = sol::make_object(view, true);
+            return flag == sol::nil;
+        }
+
+        sol::state_view sol() const
+        {
+            // Bindings are initialized in a safe context
+            return mLua->unsafeState();
+        }
     };
 
 }
diff --git a/apps/openmw/mwlua/corebindings.cpp b/apps/openmw/mwlua/corebindings.cpp
new file mode 100644
index 0000000000..445bcdd617
--- /dev/null
+++ b/apps/openmw/mwlua/corebindings.cpp
@@ -0,0 +1,154 @@
+#include "corebindings.hpp"
+
+#include <chrono>
+#include <stdexcept>
+
+#include <components/debug/debuglog.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/lua/l10n.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/lua/serialization.hpp>
+#include <components/lua/util.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/misc/strings/lower.hpp>
+#include <components/version/version.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/statemanager.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwworld/datetimemanager.hpp"
+#include "../mwworld/esmstore.hpp"
+
+#include "dialoguebindings.hpp"
+#include "factionbindings.hpp"
+#include "luaevents.hpp"
+#include "magicbindings.hpp"
+#include "soundbindings.hpp"
+#include "stats.hpp"
+
+namespace MWLua
+{
+    static sol::table initContentFilesBindings(sol::state_view& lua)
+    {
+        const std::vector<std::string>& contentList = MWBase::Environment::get().getWorld()->getContentFiles();
+        sol::table list(lua, sol::create);
+        for (size_t i = 0; i < contentList.size(); ++i)
+            list[LuaUtil::toLuaIndex(i)] = Misc::StringUtils::lowerCase(contentList[i]);
+        sol::table res(lua, sol::create);
+        res["list"] = LuaUtil::makeReadOnly(list);
+        res["indexOf"] = [&contentList](std::string_view contentFile) -> sol::optional<int> {
+            for (size_t i = 0; i < contentList.size(); ++i)
+                if (Misc::StringUtils::ciEqual(contentList[i], contentFile))
+                    return LuaUtil::toLuaIndex(i);
+            return sol::nullopt;
+        };
+        res["has"] = [&contentList](std::string_view contentFile) -> bool {
+            for (size_t i = 0; i < contentList.size(); ++i)
+                if (Misc::StringUtils::ciEqual(contentList[i], contentFile))
+                    return true;
+            return false;
+        };
+        return LuaUtil::makeReadOnly(res);
+    }
+
+    void addCoreTimeBindings(sol::table& api, const Context& context)
+    {
+        MWWorld::DateTimeManager* timeManager = MWBase::Environment::get().getWorld()->getTimeManager();
+
+        api["getSimulationTime"] = [timeManager]() { return timeManager->getSimulationTime(); };
+        api["getSimulationTimeScale"] = [timeManager]() { return timeManager->getSimulationTimeScale(); };
+        api["getGameTime"] = [timeManager]() { return timeManager->getGameTime(); };
+        api["getGameTimeScale"] = [timeManager]() { return timeManager->getGameTimeScale(); };
+        api["isWorldPaused"] = [timeManager]() { return timeManager->isPaused(); };
+        api["getRealTime"] = []() {
+            return std::chrono::duration<double>(std::chrono::steady_clock::now().time_since_epoch()).count();
+        };
+
+        if (context.mType != Context::Global)
+            api["getRealFrameDuration"] = []() { return MWBase::Environment::get().getFrameDuration(); };
+    }
+
+    sol::table initCorePackage(const Context& context)
+    {
+        auto lua = context.sol();
+        sol::object cached = context.getTypePackage("openmw_core");
+        if (cached != sol::nil)
+            return cached;
+
+        sol::table api(lua, sol::create);
+        api["API_REVISION"] = Version::getLuaApiRevision(); // specified in CMakeLists.txt
+        api["quit"] = [lua = context.mLua]() {
+            Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
+            MWBase::Environment::get().getStateManager()->requestQuit();
+        };
+        api["contentFiles"] = initContentFilesBindings(lua);
+        api["getFormId"] = [](std::string_view contentFile, unsigned int index) -> std::string {
+            const std::vector<std::string>& contentList = MWBase::Environment::get().getWorld()->getContentFiles();
+            for (size_t i = 0; i < contentList.size(); ++i)
+                if (Misc::StringUtils::ciEqual(contentList[i], contentFile))
+                    return ESM::RefId(ESM::FormId{ index, int(i) }).serializeText();
+            throw std::runtime_error("Content file not found: " + std::string(contentFile));
+        };
+        addCoreTimeBindings(api, context);
+
+        api["magic"]
+            = context.cachePackage("openmw_core_magic", [context]() { return initCoreMagicBindings(context); });
+
+        api["stats"]
+            = context.cachePackage("openmw_core_stats", [context]() { return initCoreStatsBindings(context); });
+
+        api["factions"]
+            = context.cachePackage("openmw_core_factions", [context]() { return initCoreFactionBindings(context); });
+        api["dialogue"]
+            = context.cachePackage("openmw_core_dialogue", [context]() { return initCoreDialogueBindings(context); });
+        api["l10n"] = context.cachePackage("openmw_core_l10n",
+            [lua]() { return LuaUtil::initL10nLoader(lua, MWBase::Environment::get().getL10nManager()); });
+        const MWWorld::Store<ESM::GameSetting>* gmstStore
+            = &MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
+        api["getGMST"] = [lua, gmstStore](const std::string& setting) -> sol::object {
+            const ESM::GameSetting* gmst = gmstStore->search(setting);
+            if (gmst == nullptr)
+                return sol::nil;
+            const ESM::Variant& value = gmst->mValue;
+            switch (value.getType())
+            {
+                case ESM::VT_Float:
+                    return sol::make_object<float>(lua, value.getFloat());
+                case ESM::VT_Short:
+                case ESM::VT_Long:
+                case ESM::VT_Int:
+                    return sol::make_object<int>(lua, value.getInteger());
+                case ESM::VT_String:
+                    return sol::make_object<std::string>(lua, value.getString());
+                case ESM::VT_Unknown:
+                case ESM::VT_None:
+                    break;
+            }
+            return sol::nil;
+        };
+
+        if (context.mType != Context::Menu)
+        {
+            api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData) {
+                context.mLuaEvents->addGlobalEvent(
+                    { std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer) });
+            };
+            api["sound"]
+                = context.cachePackage("openmw_core_sound", [context]() { return initCoreSoundBindings(context); });
+        }
+        else
+        {
+            api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData) {
+                if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame)
+                {
+                    throw std::logic_error("Can't send global events when no game is loaded");
+                }
+                context.mLuaEvents->addGlobalEvent(
+                    { std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer) });
+            };
+        }
+
+        sol::table readOnly = LuaUtil::makeReadOnly(api);
+        return context.setTypePackage(readOnly, "openmw_core");
+    }
+}
diff --git a/apps/openmw/mwlua/corebindings.hpp b/apps/openmw/mwlua/corebindings.hpp
new file mode 100644
index 0000000000..ef385ca993
--- /dev/null
+++ b/apps/openmw/mwlua/corebindings.hpp
@@ -0,0 +1,15 @@
+#ifndef MWLUA_COREBINDINGS_H
+#define MWLUA_COREBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    void addCoreTimeBindings(sol::table& api, const Context& context);
+
+    sol::table initCorePackage(const Context&);
+}
+
+#endif // MWLUA_COREBINDINGS_H
diff --git a/apps/openmw/mwlua/debugbindings.cpp b/apps/openmw/mwlua/debugbindings.cpp
index 7f64188ff5..dcb77580ce 100644
--- a/apps/openmw/mwlua/debugbindings.cpp
+++ b/apps/openmw/mwlua/debugbindings.cpp
@@ -1,9 +1,12 @@
 #include "debugbindings.hpp"
+
 #include "context.hpp"
 #include "luamanagerimp.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
+
 #include "../mwrender/postprocessor.hpp"
 #include "../mwrender/renderingmanager.hpp"
 
@@ -17,19 +20,21 @@ namespace MWLua
 {
     sol::table initDebugPackage(const Context& context)
     {
-        sol::table api = context.mLua->newTable();
+        auto view = context.sol();
+        sol::table api(view, sol::create);
 
         api["RENDER_MODE"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::RenderMode>({
-                { "CollisionDebug", MWRender::Render_CollisionDebug },
-                { "Wireframe", MWRender::Render_Wireframe },
-                { "Pathgrid", MWRender::Render_Pathgrid },
-                { "Water", MWRender::Render_Water },
-                { "Scene", MWRender::Render_Scene },
-                { "NavMesh", MWRender::Render_NavMesh },
-                { "ActorsPaths", MWRender::Render_ActorsPaths },
-                { "RecastMesh", MWRender::Render_RecastMesh },
-            }));
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWRender::RenderMode>(view,
+                {
+                    { "CollisionDebug", MWRender::Render_CollisionDebug },
+                    { "Wireframe", MWRender::Render_Wireframe },
+                    { "Pathgrid", MWRender::Render_Pathgrid },
+                    { "Water", MWRender::Render_Water },
+                    { "Scene", MWRender::Render_Scene },
+                    { "NavMesh", MWRender::Render_NavMesh },
+                    { "ActorsPaths", MWRender::Render_ActorsPaths },
+                    { "RecastMesh", MWRender::Render_RecastMesh },
+                }));
 
         api["toggleRenderMode"] = [context](MWRender::RenderMode value) {
             context.mLuaManager->addAction([value] { MWBase::Environment::get().getWorld()->toggleRenderMode(value); });
@@ -38,19 +43,28 @@ namespace MWLua
         api["toggleGodMode"] = []() { MWBase::Environment::get().getWorld()->toggleGodMode(); };
         api["isGodMode"] = []() { return MWBase::Environment::get().getWorld()->getGodModeState(); };
 
+        api["toggleAI"] = []() { MWBase::Environment::get().getMechanicsManager()->toggleAI(); };
+        api["isAIEnabled"] = []() { return MWBase::Environment::get().getMechanicsManager()->isAIActive(); };
+
         api["toggleCollision"] = []() { MWBase::Environment::get().getWorld()->toggleCollisionMode(); };
         api["isCollisionEnabled"] = []() {
             auto world = MWBase::Environment::get().getWorld();
             return world->isActorCollisionEnabled(world->getPlayerPtr());
         };
 
-        api["NAV_MESH_RENDER_MODE"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::NavMeshMode>({
-                { "AreaType", MWRender::NavMeshMode::AreaType },
-                { "UpdateFrequency", MWRender::NavMeshMode::UpdateFrequency },
-            }));
+        api["toggleMWScript"] = []() { MWBase::Environment::get().getWorld()->toggleScripts(); };
+        api["isMWScriptEnabled"] = []() { return MWBase::Environment::get().getWorld()->getScriptsEnabled(); };
 
-        api["setNavMeshRenderMode"] = [context](MWRender::NavMeshMode value) {
+        api["reloadLua"] = []() { MWBase::Environment::get().getLuaManager()->reloadAllScripts(); };
+
+        api["NAV_MESH_RENDER_MODE"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, Settings::NavMeshRenderMode>(view,
+                {
+                    { "AreaType", Settings::NavMeshRenderMode::AreaType },
+                    { "UpdateFrequency", Settings::NavMeshRenderMode::UpdateFrequency },
+                }));
+
+        api["setNavMeshRenderMode"] = [context](Settings::NavMeshRenderMode value) {
             context.mLuaManager->addAction(
                 [value] { MWBase::Environment::get().getWorld()->getRenderingManager()->setNavMeshMode(value); });
         };
diff --git a/apps/openmw/mwlua/dialoguebindings.cpp b/apps/openmw/mwlua/dialoguebindings.cpp
new file mode 100644
index 0000000000..d0ca799cb6
--- /dev/null
+++ b/apps/openmw/mwlua/dialoguebindings.cpp
@@ -0,0 +1,343 @@
+#include "dialoguebindings.hpp"
+
+#include "context.hpp"
+
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
+#include "apps/openmw/mwworld/store.hpp"
+
+#include <components/esm3/loaddial.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/vfs/pathutil.hpp>
+
+namespace
+{
+    std::vector<const ESM::Dialogue*> makeIndex(const MWWorld::Store<ESM::Dialogue>& store, ESM::Dialogue::Type type)
+    {
+        std::vector<const ESM::Dialogue*> result;
+        for (const ESM::Dialogue& v : store)
+            if (v.mType == type)
+                result.push_back(&v);
+        return result;
+    }
+
+    template <ESM::Dialogue::Type type>
+    class FilteredDialogueStore
+    {
+        const MWWorld::Store<ESM::Dialogue>& mDialogueStore;
+        std::vector<const ESM::Dialogue*> mIndex;
+
+    public:
+        explicit FilteredDialogueStore(const MWWorld::Store<ESM::Dialogue>& store)
+            : mDialogueStore(store)
+            , mIndex{ makeIndex(store, type) }
+        {
+        }
+
+        const ESM::Dialogue* search(const ESM::RefId& id) const
+        {
+            const ESM::Dialogue* dialogue = mDialogueStore.search(id);
+            if (dialogue != nullptr && dialogue->mType == type)
+                return dialogue;
+            return nullptr;
+        }
+
+        const ESM::Dialogue* at(std::size_t index) const
+        {
+            if (index >= mIndex.size())
+                return nullptr;
+            return mIndex[index];
+        }
+
+        std::size_t getSize() const { return mIndex.size(); }
+    };
+
+    template <ESM::Dialogue::Type filter>
+    void prepareBindingsForDialogueRecordStores(sol::table& table, const MWLua::Context& context)
+    {
+        using StoreT = FilteredDialogueStore<filter>;
+
+        sol::state_view lua = context.sol();
+        sol::usertype<StoreT> storeBindingsClass
+            = lua.new_usertype<StoreT>("ESM3_Dialogue_Type" + std::to_string(filter) + " Store");
+        storeBindingsClass[sol::meta_function::to_string] = [](const StoreT& store) {
+            return "{" + std::to_string(store.getSize()) + " ESM3_Dialogue_Type" + std::to_string(filter) + " records}";
+        };
+        storeBindingsClass[sol::meta_function::length] = [](const StoreT& store) { return store.getSize(); };
+        storeBindingsClass[sol::meta_function::index] = sol::overload(
+            [](const StoreT& store, size_t index) -> const ESM::Dialogue* {
+                if (index == 0)
+                {
+                    return nullptr;
+                }
+                return store.at(LuaUtil::fromLuaIndex(index));
+            },
+            [](const StoreT& store, std::string_view id) -> const ESM::Dialogue* {
+                return store.search(ESM::RefId::deserializeText(id));
+            });
+        storeBindingsClass[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
+        storeBindingsClass[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
+
+        table["records"] = StoreT{ MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>() };
+    }
+
+    struct DialogueInfos
+    {
+        const ESM::Dialogue& parentDialogueRecord;
+    };
+
+    void prepareBindingsForDialogueRecord(sol::state_view& lua)
+    {
+        auto recordBindingsClass = lua.new_usertype<ESM::Dialogue>("ESM3_Dialogue");
+        recordBindingsClass[sol::meta_function::to_string]
+            = [](const ESM::Dialogue& rec) { return "ESM3_Dialogue[" + rec.mId.toDebugString() + "]"; };
+        recordBindingsClass["id"]
+            = sol::readonly_property([](const ESM::Dialogue& rec) { return rec.mId.serializeText(); });
+        recordBindingsClass["name"]
+            = sol::readonly_property([](const ESM::Dialogue& rec) -> std::string_view { return rec.mStringId; });
+        recordBindingsClass["questName"]
+            = sol::readonly_property([](const ESM::Dialogue& rec) -> sol::optional<std::string_view> {
+                  if (rec.mType != ESM::Dialogue::Type::Journal)
+                  {
+                      return sol::nullopt;
+                  }
+                  for (const auto& mwDialogueInfo : rec.mInfo)
+                  {
+                      if (mwDialogueInfo.mQuestStatus == ESM::DialInfo::QuestStatus::QS_Name)
+                      {
+                          return sol::optional<std::string_view>(mwDialogueInfo.mResponse);
+                      }
+                  }
+                  return sol::nullopt;
+              });
+        recordBindingsClass["infos"]
+            = sol::readonly_property([](const ESM::Dialogue& rec) { return DialogueInfos{ rec }; });
+    }
+
+    void prepareBindingsForDialogueRecordInfoList(sol::state_view& lua)
+    {
+        auto recordInfosBindingsClass = lua.new_usertype<DialogueInfos>("ESM3_Dialogue_Infos");
+        recordInfosBindingsClass[sol::meta_function::to_string] = [](const DialogueInfos& store) {
+            const ESM::Dialogue& dialogueRecord = store.parentDialogueRecord;
+            return "{" + std::to_string(dialogueRecord.mInfo.size()) + " ESM3_Dialogue["
+                + dialogueRecord.mId.toDebugString() + "] info elements}";
+        };
+        recordInfosBindingsClass[sol::meta_function::length]
+            = [](const DialogueInfos& store) { return store.parentDialogueRecord.mInfo.size(); };
+        recordInfosBindingsClass[sol::meta_function::index]
+            = [](const DialogueInfos& store, size_t index) -> const ESM::DialInfo* {
+            const ESM::Dialogue& dialogueRecord = store.parentDialogueRecord;
+            if (index == 0 || index > dialogueRecord.mInfo.size())
+            {
+                return nullptr;
+            }
+            ESM::Dialogue::InfoContainer::const_iterator iter{ dialogueRecord.mInfo.cbegin() };
+            std::advance(iter, LuaUtil::fromLuaIndex(index));
+            return &(*iter);
+        };
+        recordInfosBindingsClass[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
+        recordInfosBindingsClass[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
+    }
+
+    void prepareBindingsForDialogueRecordInfoListElement(sol::state_view& lua)
+    {
+        auto recordInfoBindingsClass = lua.new_usertype<ESM::DialInfo>("ESM3_Dialogue_Info");
+
+        recordInfoBindingsClass[sol::meta_function::to_string]
+            = [](const ESM::DialInfo& rec) { return "ESM3_Dialogue_Info[" + rec.mId.toDebugString() + "]"; };
+        recordInfoBindingsClass["id"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) { return rec.mId.serializeText(); });
+        recordInfoBindingsClass["text"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> std::string_view { return rec.mResponse; });
+        recordInfoBindingsClass["questStage"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<int> {
+                  if (rec.mData.mType != ESM::Dialogue::Type::Journal)
+                  {
+                      return sol::nullopt;
+                  }
+                  return rec.mData.mJournalIndex;
+              });
+        recordInfoBindingsClass["isQuestFinished"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<bool> {
+                  if (rec.mData.mType != ESM::Dialogue::Type::Journal)
+                  {
+                      return sol::nullopt;
+                  }
+                  return (rec.mQuestStatus == ESM::DialInfo::QuestStatus::QS_Finished);
+              });
+        recordInfoBindingsClass["isQuestRestart"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<bool> {
+                  if (rec.mData.mType != ESM::Dialogue::Type::Journal)
+                  {
+                      return sol::nullopt;
+                  }
+                  return (rec.mQuestStatus == ESM::DialInfo::QuestStatus::QS_Restart);
+              });
+        recordInfoBindingsClass["isQuestName"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<bool> {
+                  if (rec.mData.mType != ESM::Dialogue::Type::Journal)
+                  {
+                      return sol::nullopt;
+                  }
+                  return (rec.mQuestStatus == ESM::DialInfo::QuestStatus::QS_Name);
+              });
+        recordInfoBindingsClass["filterActorId"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mActor.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  return rec.mActor.serializeText();
+              });
+        recordInfoBindingsClass["filterActorRace"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mRace.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  return rec.mRace.serializeText();
+              });
+        recordInfoBindingsClass["filterActorClass"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mClass.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  return rec.mClass.serializeText();
+              });
+        recordInfoBindingsClass["filterActorFaction"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mFaction.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  if (rec.mFactionLess)
+                  {
+                      return sol::optional<std::string>("");
+                  }
+                  return rec.mFaction.serializeText();
+              });
+        recordInfoBindingsClass["filterActorFactionRank"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<int> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mData.mRank == -1)
+                  {
+                      return sol::nullopt;
+                  }
+                  return LuaUtil::toLuaIndex(rec.mData.mRank);
+              });
+        recordInfoBindingsClass["filterPlayerCell"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mCell.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  return rec.mCell.serializeText();
+              });
+        recordInfoBindingsClass["filterActorDisposition"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<int> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal)
+                  {
+                      return sol::nullopt;
+                  }
+                  return rec.mData.mDisposition;
+              });
+        recordInfoBindingsClass["filterActorGender"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string_view> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mData.mGender == -1)
+                  {
+                      return sol::nullopt;
+                  }
+                  return sol::optional<std::string_view>(rec.mData.mGender == 0 ? "male" : "female");
+              });
+        recordInfoBindingsClass["filterPlayerFaction"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mPcFaction.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  return rec.mPcFaction.serializeText();
+              });
+        recordInfoBindingsClass["filterPlayerFactionRank"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<int> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mData.mPCrank == -1)
+                  {
+                      return sol::nullopt;
+                  }
+                  return LuaUtil::toLuaIndex(rec.mData.mPCrank);
+              });
+        recordInfoBindingsClass["sound"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string> {
+                  if (rec.mData.mType == ESM::Dialogue::Type::Journal || rec.mSound.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  return Misc::ResourceHelpers::correctSoundPath(VFS::Path::Normalized(rec.mSound)).value();
+              });
+        recordInfoBindingsClass["resultScript"]
+            = sol::readonly_property([](const ESM::DialInfo& rec) -> sol::optional<std::string_view> {
+                  if (rec.mResultScript.empty())
+                  {
+                      return sol::nullopt;
+                  }
+                  return sol::optional<std::string_view>(rec.mResultScript);
+              });
+    }
+
+    void prepareBindingsForDialogueRecords(sol::state_view& lua)
+    {
+        prepareBindingsForDialogueRecord(lua);
+        prepareBindingsForDialogueRecordInfoList(lua);
+        prepareBindingsForDialogueRecordInfoListElement(lua);
+    }
+}
+
+namespace sol
+{
+    template <ESM::Dialogue::Type filter>
+    struct is_automagical<FilteredDialogueStore<filter>> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<ESM::Dialogue> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<DialogueInfos> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<ESM::DialInfo> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+    sol::table initCoreDialogueBindings(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table api(lua, sol::create);
+
+        sol::table journalTable(lua, sol::create);
+        sol::table topicTable(lua, sol::create);
+        sol::table greetingTable(lua, sol::create);
+        sol::table persuasionTable(lua, sol::create);
+        sol::table voiceTable(lua, sol::create);
+        prepareBindingsForDialogueRecordStores<ESM::Dialogue::Type::Journal>(journalTable, context);
+        prepareBindingsForDialogueRecordStores<ESM::Dialogue::Type::Topic>(topicTable, context);
+        prepareBindingsForDialogueRecordStores<ESM::Dialogue::Type::Greeting>(greetingTable, context);
+        prepareBindingsForDialogueRecordStores<ESM::Dialogue::Type::Persuasion>(persuasionTable, context);
+        prepareBindingsForDialogueRecordStores<ESM::Dialogue::Type::Voice>(voiceTable, context);
+        api["journal"] = LuaUtil::makeStrictReadOnly(journalTable);
+        api["topic"] = LuaUtil::makeStrictReadOnly(topicTable);
+        api["greeting"] = LuaUtil::makeStrictReadOnly(greetingTable);
+        api["persuasion"] = LuaUtil::makeStrictReadOnly(persuasionTable);
+        api["voice"] = LuaUtil::makeStrictReadOnly(voiceTable);
+
+        prepareBindingsForDialogueRecords(lua);
+
+        return LuaUtil::makeReadOnly(api);
+    }
+}
diff --git a/apps/openmw/mwlua/dialoguebindings.hpp b/apps/openmw/mwlua/dialoguebindings.hpp
new file mode 100644
index 0000000000..a4ee242427
--- /dev/null
+++ b/apps/openmw/mwlua/dialoguebindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_DIALOGUEBINDINGS_H
+#define MWLUA_DIALOGUEBINDINGS_H
+
+#include <sol/forward.hpp>
+
+namespace MWLua
+{
+    struct Context;
+
+    sol::table initCoreDialogueBindings(const Context& context);
+}
+
+#endif // MWLUA_DIALOGUEBINDINGS_H
diff --git a/apps/openmw/mwlua/engineevents.cpp b/apps/openmw/mwlua/engineevents.cpp
index 569eb22bcf..6c652bccba 100644
--- a/apps/openmw/mwlua/engineevents.cpp
+++ b/apps/openmw/mwlua/engineevents.cpp
@@ -65,6 +65,15 @@ namespace MWLua
                 scripts->onActivated(LObject(actor));
         }
 
+        void operator()(const OnUseItem& event) const
+        {
+            MWWorld::Ptr obj = getPtr(event.mObject);
+            MWWorld::Ptr actor = getPtr(event.mActor);
+            if (actor.isEmpty() || obj.isEmpty())
+                return;
+            mGlobalScripts.onUseItem(GObject(obj), GObject(actor), event.mForce);
+        }
+
         void operator()(const OnConsume& event) const
         {
             MWWorld::Ptr actor = getPtr(event.mActor);
@@ -77,8 +86,35 @@ namespace MWLua
 
         void operator()(const OnNewExterior& event) const { mGlobalScripts.onNewExterior(GCell{ &event.mCell }); }
 
+        void operator()(const OnAnimationTextKey& event) const
+        {
+            MWWorld::Ptr actor = getPtr(event.mActor);
+            if (actor.isEmpty())
+                return;
+            if (auto* scripts = getLocalScripts(actor))
+                scripts->onAnimationTextKey(event.mGroupname, event.mKey);
+        }
+
+        void operator()(const OnSkillUse& event) const
+        {
+            MWWorld::Ptr actor = getPtr(event.mActor);
+            if (actor.isEmpty())
+                return;
+            if (auto* scripts = getLocalScripts(actor))
+                scripts->onSkillUse(event.mSkill, event.useType, event.scale);
+        }
+
+        void operator()(const OnSkillLevelUp& event) const
+        {
+            MWWorld::Ptr actor = getPtr(event.mActor);
+            if (actor.isEmpty())
+                return;
+            if (auto* scripts = getLocalScripts(actor))
+                scripts->onSkillLevelUp(event.mSkill, event.mSource);
+        }
+
     private:
-        MWWorld::Ptr getPtr(const ESM::RefNum& id) const
+        MWWorld::Ptr getPtr(ESM::RefNum id) const
         {
             MWWorld::Ptr res = mWorldModel->getPtr(id);
             if (res.isEmpty() && Settings::lua().mLuaDebug)
@@ -94,7 +130,7 @@ namespace MWLua
                 return ptr.getRefData().getLuaScripts();
         }
 
-        LocalScripts* getLocalScripts(const ESM::RefNum& id) const { return getLocalScripts(getPtr(id)); }
+        LocalScripts* getLocalScripts(ESM::RefNum id) const { return getLocalScripts(getPtr(id)); }
 
         GlobalScripts& mGlobalScripts;
         MWWorld::WorldModel* mWorldModel = MWBase::Environment::get().getWorldModel();
diff --git a/apps/openmw/mwlua/engineevents.hpp b/apps/openmw/mwlua/engineevents.hpp
index ac854abd4a..fb9183eb7c 100644
--- a/apps/openmw/mwlua/engineevents.hpp
+++ b/apps/openmw/mwlua/engineevents.hpp
@@ -36,6 +36,12 @@ namespace MWLua
             ESM::RefNum mActor;
             ESM::RefNum mObject;
         };
+        struct OnUseItem
+        {
+            ESM::RefNum mActor;
+            ESM::RefNum mObject;
+            bool mForce;
+        };
         struct OnConsume
         {
             ESM::RefNum mActor;
@@ -45,7 +51,27 @@ namespace MWLua
         {
             MWWorld::CellStore& mCell;
         };
-        using Event = std::variant<OnActive, OnInactive, OnConsume, OnActivate, OnNewExterior, OnTeleported>;
+        struct OnAnimationTextKey
+        {
+            ESM::RefNum mActor;
+            std::string mGroupname;
+            std::string mKey;
+        };
+        struct OnSkillUse
+        {
+            ESM::RefNum mActor;
+            std::string mSkill;
+            int useType;
+            float scale;
+        };
+        struct OnSkillLevelUp
+        {
+            ESM::RefNum mActor;
+            std::string mSkill;
+            std::string mSource;
+        };
+        using Event = std::variant<OnActive, OnInactive, OnConsume, OnActivate, OnUseItem, OnNewExterior, OnTeleported,
+            OnAnimationTextKey, OnSkillUse, OnSkillLevelUp>;
 
         void clear() { mQueue.clear(); }
         void addToQueue(Event e) { mQueue.push_back(std::move(e)); }
diff --git a/apps/openmw/mwlua/factionbindings.cpp b/apps/openmw/mwlua/factionbindings.cpp
new file mode 100644
index 0000000000..45234827de
--- /dev/null
+++ b/apps/openmw/mwlua/factionbindings.cpp
@@ -0,0 +1,113 @@
+#include "factionbindings.hpp"
+#include "recordstore.hpp"
+
+#include <components/esm3/loadfact.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
+
+#include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/environment.hpp"
+
+#include "../mwworld/store.hpp"
+
+#include "idcollectionbindings.hpp"
+
+namespace
+{
+    struct FactionRank : ESM::RankData
+    {
+        std::string mRankName;
+        ESM::RefId mFactionId;
+        size_t mRankIndex;
+
+        FactionRank(const ESM::RefId& factionId, const ESM::RankData& data, std::string_view rankName, size_t rankIndex)
+            : ESM::RankData(data)
+            , mRankName(rankName)
+            , mFactionId(factionId)
+            , mRankIndex(rankIndex)
+        {
+        }
+    };
+}
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Faction> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<MWWorld::Store<FactionRank>> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+    sol::table initCoreFactionBindings(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table factions(lua, sol::create);
+        addRecordFunctionBinding<ESM::Faction>(factions, context);
+        // Faction record
+        auto factionT = lua.new_usertype<ESM::Faction>("ESM3_Faction");
+        factionT[sol::meta_function::to_string]
+            = [](const ESM::Faction& rec) -> std::string { return "ESM3_Faction[" + rec.mId.toDebugString() + "]"; };
+        factionT["id"] = sol::readonly_property([](const ESM::Faction& rec) { return rec.mId.serializeText(); });
+        factionT["name"]
+            = sol::readonly_property([](const ESM::Faction& rec) -> std::string_view { return rec.mName; });
+        factionT["hidden"]
+            = sol::readonly_property([](const ESM::Faction& rec) -> bool { return rec.mData.mIsHidden; });
+        factionT["ranks"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Faction& rec) {
+            sol::table res(lua, sol::create);
+            for (size_t i = 0; i < rec.mRanks.size() && i < rec.mData.mRankData.size(); i++)
+            {
+                if (rec.mRanks[i].empty())
+                    break;
+
+                res.add(FactionRank(rec.mId, rec.mData.mRankData[i], rec.mRanks[i], i));
+            }
+
+            return res;
+        });
+        factionT["reactions"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Faction& rec) {
+            sol::table res(lua, sol::create);
+            for (const auto& [factionId, reaction] : rec.mReactions)
+                res[factionId.serializeText()] = reaction;
+
+            const auto* overrides
+                = MWBase::Environment::get().getDialogueManager()->getFactionReactionOverrides(rec.mId);
+
+            if (overrides != nullptr)
+            {
+                for (const auto& [factionId, reaction] : *overrides)
+                    res[factionId.serializeText()] = reaction;
+            }
+
+            return res;
+        });
+        factionT["attributes"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Faction& rec) {
+            return createReadOnlyRefIdTable(lua, rec.mData.mAttribute, ESM::Attribute::indexToRefId);
+        });
+        factionT["skills"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Faction& rec) {
+            return createReadOnlyRefIdTable(lua, rec.mData.mSkills, ESM::Skill::indexToRefId);
+        });
+        auto rankT = lua.new_usertype<FactionRank>("ESM3_FactionRank");
+        rankT[sol::meta_function::to_string] = [](const FactionRank& rec) -> std::string {
+            return "ESM3_FactionRank[" + rec.mFactionId.toDebugString() + ", "
+                + std::to_string(LuaUtil::toLuaIndex(rec.mRankIndex)) + "]";
+        };
+        rankT["name"]
+            = sol::readonly_property([](const FactionRank& rec) -> std::string_view { return rec.mRankName; });
+        rankT["primarySkillValue"] = sol::readonly_property([](const FactionRank& rec) { return rec.mPrimarySkill; });
+        rankT["favouredSkillValue"] = sol::readonly_property([](const FactionRank& rec) { return rec.mFavouredSkill; });
+        rankT["factionReaction"] = sol::readonly_property([](const FactionRank& rec) { return rec.mFactReaction; });
+        rankT["attributeValues"] = sol::readonly_property([lua = lua.lua_state()](const FactionRank& rec) {
+            sol::table res(lua, sol::create);
+            res.add(rec.mAttribute1);
+            res.add(rec.mAttribute2);
+            return res;
+        });
+        return LuaUtil::makeReadOnly(factions);
+    }
+}
diff --git a/apps/openmw/mwlua/factionbindings.hpp b/apps/openmw/mwlua/factionbindings.hpp
new file mode 100644
index 0000000000..0dc06ceaf2
--- /dev/null
+++ b/apps/openmw/mwlua/factionbindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_FACTIONBINDINGS_H
+#define MWLUA_FACTIONBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initCoreFactionBindings(const Context& context);
+}
+
+#endif // MWLUA_FACTIONBINDINGS_H
diff --git a/apps/openmw/mwlua/globalscripts.hpp b/apps/openmw/mwlua/globalscripts.hpp
index 0190000586..37fff22f99 100644
--- a/apps/openmw/mwlua/globalscripts.hpp
+++ b/apps/openmw/mwlua/globalscripts.hpp
@@ -1,10 +1,6 @@
 #ifndef MWLUA_GLOBALSCRIPTS_H
 #define MWLUA_GLOBALSCRIPTS_H
 
-#include <memory>
-#include <set>
-#include <string>
-
 #include <components/lua/luastate.hpp>
 #include <components/lua/scriptscontainer.hpp>
 
@@ -19,8 +15,16 @@ namespace MWLua
         GlobalScripts(LuaUtil::LuaState* lua)
             : LuaUtil::ScriptsContainer(lua, "Global")
         {
-            registerEngineHandlers({ &mObjectActiveHandlers, &mActorActiveHandlers, &mItemActiveHandlers,
-                &mNewGameHandlers, &mPlayerAddedHandlers, &mOnActivateHandlers, &mOnNewExteriorHandlers });
+            registerEngineHandlers({
+                &mObjectActiveHandlers,
+                &mActorActiveHandlers,
+                &mItemActiveHandlers,
+                &mNewGameHandlers,
+                &mPlayerAddedHandlers,
+                &mOnActivateHandlers,
+                &mOnUseItemHandlers,
+                &mOnNewExteriorHandlers,
+            });
         }
 
         void newGameStarted() { callEngineHandlers(mNewGameHandlers); }
@@ -32,6 +36,10 @@ namespace MWLua
         {
             callEngineHandlers(mOnActivateHandlers, obj, actor);
         }
+        void onUseItem(const GObject& obj, const GObject& actor, bool force)
+        {
+            callEngineHandlers(mOnUseItemHandlers, obj, actor, force);
+        }
         void onNewExterior(const GCell& cell) { callEngineHandlers(mOnNewExteriorHandlers, cell); }
 
     private:
@@ -41,6 +49,7 @@ namespace MWLua
         EngineHandlerList mNewGameHandlers{ "onNewGame" };
         EngineHandlerList mPlayerAddedHandlers{ "onPlayerAdded" };
         EngineHandlerList mOnActivateHandlers{ "onActivate" };
+        EngineHandlerList mOnUseItemHandlers{ "_onUseItem" };
         EngineHandlerList mOnNewExteriorHandlers{ "onNewExterior" };
     };
 
diff --git a/apps/openmw/mwlua/idcollectionbindings.hpp b/apps/openmw/mwlua/idcollectionbindings.hpp
new file mode 100644
index 0000000000..329486aba1
--- /dev/null
+++ b/apps/openmw/mwlua/idcollectionbindings.hpp
@@ -0,0 +1,25 @@
+#ifndef MWLUA_IDCOLLECTIONBINDINGS_H
+#define MWLUA_IDCOLLECTIONBINDINGS_H
+
+#include <functional>
+
+#include <components/esm/refid.hpp>
+#include <components/lua/luastate.hpp>
+
+namespace MWLua
+{
+    template <class C, class P = std::identity>
+    sol::table createReadOnlyRefIdTable(lua_State* lua, const C& container, P projection = {})
+    {
+        sol::table res(lua, sol::create);
+        for (const auto& element : container)
+        {
+            ESM::RefId id = projection(element);
+            if (!id.empty())
+                res.add(id.serializeText());
+        }
+        return LuaUtil::makeReadOnly(res);
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 9384eccdbc..b9affcdfca 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -4,19 +4,33 @@
 #include <SDL_gamecontroller.h>
 #include <SDL_mouse.h>
 
+#include <components/lua/inputactions.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/sdlutil/events.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwinput/actions.hpp"
 
+#include "luamanagerimp.hpp"
+
 namespace sol
 {
     template <>
     struct is_automagical<SDL_Keysym> : std::false_type
     {
     };
+
+    template <>
+    struct is_automagical<LuaUtil::InputAction::Info> : std::false_type
+    {
+    };
+
+    template <>
+    struct is_automagical<LuaUtil::InputAction::Registry> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
@@ -24,7 +38,13 @@ namespace MWLua
 
     sol::table initInputPackage(const Context& context)
     {
-        sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent");
+        sol::state_view lua = context.sol();
+        {
+            if (lua["openmw_input"] != sol::nil)
+                return lua["openmw_input"];
+        }
+
+        sol::usertype<SDL_Keysym> keyEvent = lua.new_usertype<SDL_Keysym>("KeyEvent");
         keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) {
             if (e.sym > 0 && e.sym <= 255)
                 return std::string(1, static_cast<char>(e.sym));
@@ -37,7 +57,7 @@ namespace MWLua
         keyEvent["withAlt"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_ALT; });
         keyEvent["withSuper"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_GUI; });
 
-        auto touchpadEvent = context.mLua->sol().new_usertype<SDLUtil::TouchEvent>("TouchpadEvent");
+        auto touchpadEvent = lua.new_usertype<SDLUtil::TouchEvent>("TouchpadEvent");
         touchpadEvent["device"] = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> int { return e.mDevice; });
         touchpadEvent["finger"] = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> int { return e.mFinger; });
         touchpadEvent["position"] = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> osg::Vec2f {
@@ -46,8 +66,132 @@ namespace MWLua
         touchpadEvent["pressure"]
             = sol::readonly_property([](const SDLUtil::TouchEvent& e) -> float { return e.mPressure; });
 
+        auto inputActions = lua.new_usertype<LuaUtil::InputAction::Registry>("InputActions");
+        inputActions[sol::meta_function::index]
+            = [](LuaUtil::InputAction::Registry& registry, std::string_view key) { return registry[key]; };
+        {
+            auto pairs = [](LuaUtil::InputAction::Registry& registry) {
+                auto next
+                    = [](LuaUtil::InputAction::Registry& registry,
+                          std::string_view key) -> sol::optional<std::tuple<std::string, LuaUtil::InputAction::Info>> {
+                    std::optional<std::string> nextKey(registry.nextKey(key));
+                    if (!nextKey.has_value())
+                        return sol::nullopt;
+                    else
+                        return std::make_tuple(*nextKey, registry[*nextKey].value());
+                };
+                return std::make_tuple(next, registry, registry.firstKey());
+            };
+            inputActions[sol::meta_function::pairs] = pairs;
+        }
+
+        auto actionInfo = lua.new_usertype<LuaUtil::InputAction::Info>("ActionInfo");
+        actionInfo["key"] = sol::readonly_property(
+            [](const LuaUtil::InputAction::Info& info) -> std::string_view { return info.mKey; });
+        actionInfo["name"] = sol::readonly_property(
+            [](const LuaUtil::InputAction::Info& info) -> std::string_view { return info.mName; });
+        actionInfo["description"] = sol::readonly_property(
+            [](const LuaUtil::InputAction::Info& info) -> std::string_view { return info.mDescription; });
+        actionInfo["l10n"] = sol::readonly_property(
+            [](const LuaUtil::InputAction::Info& info) -> std::string_view { return info.mL10n; });
+        actionInfo["type"] = sol::readonly_property([](const LuaUtil::InputAction::Info& info) { return info.mType; });
+        actionInfo["defaultValue"]
+            = sol::readonly_property([](const LuaUtil::InputAction::Info& info) { return info.mDefaultValue; });
+
+        auto inputTriggers = lua.new_usertype<LuaUtil::InputTrigger::Registry>("InputTriggers");
+        inputTriggers[sol::meta_function::index]
+            = [](LuaUtil::InputTrigger::Registry& registry, std::string_view key) { return registry[key]; };
+        {
+            auto pairs = [](LuaUtil::InputTrigger::Registry& registry) {
+                auto next
+                    = [](LuaUtil::InputTrigger::Registry& registry,
+                          std::string_view key) -> sol::optional<std::tuple<std::string, LuaUtil::InputTrigger::Info>> {
+                    std::optional<std::string> nextKey(registry.nextKey(key));
+                    if (!nextKey.has_value())
+                        return sol::nullopt;
+                    else
+                        return std::make_tuple(*nextKey, registry[*nextKey].value());
+                };
+                return std::make_tuple(next, registry, registry.firstKey());
+            };
+            inputTriggers[sol::meta_function::pairs] = pairs;
+        }
+
+        auto triggerInfo = lua.new_usertype<LuaUtil::InputTrigger::Info>("TriggerInfo");
+        triggerInfo["key"] = sol::readonly_property(
+            [](const LuaUtil::InputTrigger::Info& info) -> std::string_view { return info.mKey; });
+        triggerInfo["name"] = sol::readonly_property(
+            [](const LuaUtil::InputTrigger::Info& info) -> std::string_view { return info.mName; });
+        triggerInfo["description"] = sol::readonly_property(
+            [](const LuaUtil::InputTrigger::Info& info) -> std::string_view { return info.mDescription; });
+        triggerInfo["l10n"] = sol::readonly_property(
+            [](const LuaUtil::InputTrigger::Info& info) -> std::string_view { return info.mL10n; });
+
         MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
-        sol::table api(context.mLua->sol(), sol::create);
+        sol::table api(lua, sol::create);
+
+        api["ACTION_TYPE"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, LuaUtil::InputAction::Type>(lua,
+                {
+                    { "Boolean", LuaUtil::InputAction::Type::Boolean },
+                    { "Number", LuaUtil::InputAction::Type::Number },
+                    { "Range", LuaUtil::InputAction::Type::Range },
+                }));
+
+        api["actions"] = std::ref(context.mLuaManager->inputActions());
+        api["registerAction"] = [manager = context.mLuaManager](sol::table options) {
+            LuaUtil::InputAction::Info parsedOptions;
+            parsedOptions.mKey = options["key"].get<std::string_view>();
+            parsedOptions.mType = options["type"].get<LuaUtil::InputAction::Type>();
+            parsedOptions.mL10n = options["l10n"].get<std::string_view>();
+            parsedOptions.mName = options["name"].get<std::string_view>();
+            parsedOptions.mDescription = options["description"].get<std::string_view>();
+            parsedOptions.mDefaultValue = options["defaultValue"].get<sol::main_object>();
+            manager->inputActions().insert(std::move(parsedOptions));
+        };
+        api["bindAction"] = [manager = context.mLuaManager](
+                                std::string_view key, const sol::table& callback, sol::table dependencies) {
+            std::vector<std::string_view> parsedDependencies;
+            parsedDependencies.reserve(dependencies.size());
+            for (size_t i = 1; i <= dependencies.size(); ++i)
+            {
+                sol::object dependency = dependencies[i];
+                if (!dependency.is<std::string_view>())
+                    throw std::domain_error("The dependencies argument must be a list of Action keys");
+                parsedDependencies.push_back(dependency.as<std::string_view>());
+            }
+            if (!manager->inputActions().bind(key, LuaUtil::Callback::fromLua(callback), parsedDependencies))
+                throw std::domain_error("Cyclic action binding");
+        };
+        api["registerActionHandler"]
+            = [manager = context.mLuaManager](std::string_view key, const sol::table& callback) {
+                  manager->inputActions().registerHandler(key, LuaUtil::Callback::fromLua(callback));
+              };
+        api["getBooleanActionValue"] = [manager = context.mLuaManager](std::string_view key) {
+            return manager->inputActions().valueOfType(key, LuaUtil::InputAction::Type::Boolean);
+        };
+        api["getNumberActionValue"] = [manager = context.mLuaManager](std::string_view key) {
+            return manager->inputActions().valueOfType(key, LuaUtil::InputAction::Type::Number);
+        };
+        api["getRangeActionValue"] = [manager = context.mLuaManager](std::string_view key) {
+            return manager->inputActions().valueOfType(key, LuaUtil::InputAction::Type::Range);
+        };
+
+        api["triggers"] = std::ref(context.mLuaManager->inputTriggers());
+        api["registerTrigger"] = [manager = context.mLuaManager](sol::table options) {
+            LuaUtil::InputTrigger::Info parsedOptions;
+            parsedOptions.mKey = options["key"].get<std::string_view>();
+            parsedOptions.mL10n = options["l10n"].get<std::string_view>();
+            parsedOptions.mName = options["name"].get<std::string_view>();
+            parsedOptions.mDescription = options["description"].get<std::string_view>();
+            manager->inputTriggers().insert(std::move(parsedOptions));
+        };
+        api["registerTriggerHandler"]
+            = [manager = context.mLuaManager](std::string_view key, const sol::table& callback) {
+                  manager->inputTriggers().registerHandler(key, LuaUtil::Callback::fromLua(callback));
+              };
+        api["activateTrigger"]
+            = [manager = context.mLuaManager](std::string_view key) { manager->inputTriggers().activate(key); };
 
         api["isIdle"] = [input]() { return input->isIdle(); };
         api["isActionPressed"] = [input](int action) { return input->actionIsActive(action); };
@@ -68,6 +212,11 @@ namespace MWLua
         };
         api["isMouseButtonPressed"]
             = [](int button) -> bool { return SDL_GetMouseState(nullptr, nullptr) & SDL_BUTTON(button); };
+        api["_isGamepadCursorActive"] = [input]() -> bool { return input->isGamepadGuiCursorEnabled(); };
+        api["_setGamepadCursorActive"] = [input](bool v) {
+            input->setGamepadGuiCursorEnabled(v);
+            MWBase::Environment::get().getWindowManager()->setCursorActive(v);
+        };
         api["getMouseMoveX"] = [input]() { return input->getMouseMoveX(); };
         api["getMouseMoveY"] = [input]() { return input->getMouseMoveY(); };
         api["getAxisValue"] = [input](int axis) {
@@ -77,219 +226,227 @@ namespace MWLua
                 return input->getActionValue(axis - SDL_CONTROLLER_AXIS_MAX) * 2 - 1;
         };
 
+        // input.CONTROL_SWITCH is deprecated, remove after releasing 0.49
         api["getControlSwitch"] = [input](std::string_view key) { return input->getControlSwitch(key); };
         api["setControlSwitch"] = [input](std::string_view key, bool v) { input->toggleControlSwitch(key, v); };
 
-        api["getKeyName"] = [](SDL_Scancode code) { return SDL_GetKeyName(SDL_GetKeyFromScancode(code)); };
+        api["getKeyName"] = [](SDL_Scancode code) { return SDL_GetScancodeName(code); };
 
-        api["ACTION"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWInput::Actions>({
-            { "GameMenu", MWInput::A_GameMenu },
-            { "Screenshot", MWInput::A_Screenshot },
-            { "Inventory", MWInput::A_Inventory },
-            { "Console", MWInput::A_Console },
+        api["ACTION"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWInput::Actions>(lua,
+            {
+                { "GameMenu", MWInput::A_GameMenu },
+                { "Screenshot", MWInput::A_Screenshot },
+                { "Inventory", MWInput::A_Inventory },
+                { "Console", MWInput::A_Console },
 
-            { "MoveLeft", MWInput::A_MoveLeft },
-            { "MoveRight", MWInput::A_MoveRight },
-            { "MoveForward", MWInput::A_MoveForward },
-            { "MoveBackward", MWInput::A_MoveBackward },
+                { "MoveLeft", MWInput::A_MoveLeft },
+                { "MoveRight", MWInput::A_MoveRight },
+                { "MoveForward", MWInput::A_MoveForward },
+                { "MoveBackward", MWInput::A_MoveBackward },
 
-            { "Activate", MWInput::A_Activate },
-            { "Use", MWInput::A_Use },
-            { "Jump", MWInput::A_Jump },
-            { "AutoMove", MWInput::A_AutoMove },
-            { "Rest", MWInput::A_Rest },
-            { "Journal", MWInput::A_Journal },
-            { "Run", MWInput::A_Run },
-            { "CycleSpellLeft", MWInput::A_CycleSpellLeft },
-            { "CycleSpellRight", MWInput::A_CycleSpellRight },
-            { "CycleWeaponLeft", MWInput::A_CycleWeaponLeft },
-            { "CycleWeaponRight", MWInput::A_CycleWeaponRight },
-            { "AlwaysRun", MWInput::A_AlwaysRun },
-            { "Sneak", MWInput::A_Sneak },
+                { "Activate", MWInput::A_Activate },
+                { "Use", MWInput::A_Use },
+                { "Jump", MWInput::A_Jump },
+                { "AutoMove", MWInput::A_AutoMove },
+                { "Rest", MWInput::A_Rest },
+                { "Journal", MWInput::A_Journal },
+                { "Run", MWInput::A_Run },
+                { "CycleSpellLeft", MWInput::A_CycleSpellLeft },
+                { "CycleSpellRight", MWInput::A_CycleSpellRight },
+                { "CycleWeaponLeft", MWInput::A_CycleWeaponLeft },
+                { "CycleWeaponRight", MWInput::A_CycleWeaponRight },
+                { "AlwaysRun", MWInput::A_AlwaysRun },
+                { "Sneak", MWInput::A_Sneak },
 
-            { "QuickSave", MWInput::A_QuickSave },
-            { "QuickLoad", MWInput::A_QuickLoad },
-            { "QuickMenu", MWInput::A_QuickMenu },
-            { "ToggleWeapon", MWInput::A_ToggleWeapon },
-            { "ToggleSpell", MWInput::A_ToggleSpell },
-            { "TogglePOV", MWInput::A_TogglePOV },
+                { "QuickSave", MWInput::A_QuickSave },
+                { "QuickLoad", MWInput::A_QuickLoad },
+                { "QuickMenu", MWInput::A_QuickMenu },
+                { "ToggleWeapon", MWInput::A_ToggleWeapon },
+                { "ToggleSpell", MWInput::A_ToggleSpell },
+                { "TogglePOV", MWInput::A_TogglePOV },
 
-            { "QuickKey1", MWInput::A_QuickKey1 },
-            { "QuickKey2", MWInput::A_QuickKey2 },
-            { "QuickKey3", MWInput::A_QuickKey3 },
-            { "QuickKey4", MWInput::A_QuickKey4 },
-            { "QuickKey5", MWInput::A_QuickKey5 },
-            { "QuickKey6", MWInput::A_QuickKey6 },
-            { "QuickKey7", MWInput::A_QuickKey7 },
-            { "QuickKey8", MWInput::A_QuickKey8 },
-            { "QuickKey9", MWInput::A_QuickKey9 },
-            { "QuickKey10", MWInput::A_QuickKey10 },
-            { "QuickKeysMenu", MWInput::A_QuickKeysMenu },
+                { "QuickKey1", MWInput::A_QuickKey1 },
+                { "QuickKey2", MWInput::A_QuickKey2 },
+                { "QuickKey3", MWInput::A_QuickKey3 },
+                { "QuickKey4", MWInput::A_QuickKey4 },
+                { "QuickKey5", MWInput::A_QuickKey5 },
+                { "QuickKey6", MWInput::A_QuickKey6 },
+                { "QuickKey7", MWInput::A_QuickKey7 },
+                { "QuickKey8", MWInput::A_QuickKey8 },
+                { "QuickKey9", MWInput::A_QuickKey9 },
+                { "QuickKey10", MWInput::A_QuickKey10 },
+                { "QuickKeysMenu", MWInput::A_QuickKeysMenu },
 
-            { "ToggleHUD", MWInput::A_ToggleHUD },
-            { "ToggleDebug", MWInput::A_ToggleDebug },
-            { "TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD },
+                { "ToggleHUD", MWInput::A_ToggleHUD },
+                { "ToggleDebug", MWInput::A_ToggleDebug },
+                { "TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD },
 
-            { "ZoomIn", MWInput::A_ZoomIn },
-            { "ZoomOut", MWInput::A_ZoomOut },
-        }));
-
-        api["CONTROL_SWITCH"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
-                { "Controls", "playercontrols" },
-                { "Fighting", "playerfighting" },
-                { "Jumping", "playerjumping" },
-                { "Looking", "playerlooking" },
-                { "Magic", "playermagic" },
-                { "ViewMode", "playerviewswitch" },
-                { "VanityMode", "vanitymode" },
+                { "ZoomIn", MWInput::A_ZoomIn },
+                { "ZoomOut", MWInput::A_ZoomOut },
             }));
 
+        // input.CONTROL_SWITCH is deprecated, remove after releasing 0.49
+        api["CONTROL_SWITCH"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, std::string_view>(lua,
+                {
+                    { "Controls", "playercontrols" },
+                    { "Fighting", "playerfighting" },
+                    { "Jumping", "playerjumping" },
+                    { "Looking", "playerlooking" },
+                    { "Magic", "playermagic" },
+                    { "ViewMode", "playerviewswitch" },
+                    { "VanityMode", "vanitymode" },
+                }));
+
         api["CONTROLLER_BUTTON"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
-                { "A", SDL_CONTROLLER_BUTTON_A },
-                { "B", SDL_CONTROLLER_BUTTON_B },
-                { "X", SDL_CONTROLLER_BUTTON_X },
-                { "Y", SDL_CONTROLLER_BUTTON_Y },
-                { "Back", SDL_CONTROLLER_BUTTON_BACK },
-                { "Guide", SDL_CONTROLLER_BUTTON_GUIDE },
-                { "Start", SDL_CONTROLLER_BUTTON_START },
-                { "LeftStick", SDL_CONTROLLER_BUTTON_LEFTSTICK },
-                { "RightStick", SDL_CONTROLLER_BUTTON_RIGHTSTICK },
-                { "LeftShoulder", SDL_CONTROLLER_BUTTON_LEFTSHOULDER },
-                { "RightShoulder", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER },
-                { "DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP },
-                { "DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN },
-                { "DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT },
-                { "DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT },
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, SDL_GameControllerButton>(lua,
+                {
+                    { "A", SDL_CONTROLLER_BUTTON_A },
+                    { "B", SDL_CONTROLLER_BUTTON_B },
+                    { "X", SDL_CONTROLLER_BUTTON_X },
+                    { "Y", SDL_CONTROLLER_BUTTON_Y },
+                    { "Back", SDL_CONTROLLER_BUTTON_BACK },
+                    { "Guide", SDL_CONTROLLER_BUTTON_GUIDE },
+                    { "Start", SDL_CONTROLLER_BUTTON_START },
+                    { "LeftStick", SDL_CONTROLLER_BUTTON_LEFTSTICK },
+                    { "RightStick", SDL_CONTROLLER_BUTTON_RIGHTSTICK },
+                    { "LeftShoulder", SDL_CONTROLLER_BUTTON_LEFTSHOULDER },
+                    { "RightShoulder", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER },
+                    { "DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP },
+                    { "DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN },
+                    { "DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT },
+                    { "DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT },
+                }));
+
+        api["CONTROLLER_AXIS"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(lua,
+            {
+                { "LeftX", SDL_CONTROLLER_AXIS_LEFTX },
+                { "LeftY", SDL_CONTROLLER_AXIS_LEFTY },
+                { "RightX", SDL_CONTROLLER_AXIS_RIGHTX },
+                { "RightY", SDL_CONTROLLER_AXIS_RIGHTY },
+                { "TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT },
+                { "TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT },
+
+                { "LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown) },
+                { "LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight) },
+                { "MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward) },
+                { "MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight) },
             }));
 
-        api["CONTROLLER_AXIS"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            { "LeftX", SDL_CONTROLLER_AXIS_LEFTX },
-            { "LeftY", SDL_CONTROLLER_AXIS_LEFTY },
-            { "RightX", SDL_CONTROLLER_AXIS_RIGHTX },
-            { "RightY", SDL_CONTROLLER_AXIS_RIGHTY },
-            { "TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT },
-            { "TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT },
+        api["KEY"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, SDL_Scancode>(lua,
+            {
+                { "_0", SDL_SCANCODE_0 },
+                { "_1", SDL_SCANCODE_1 },
+                { "_2", SDL_SCANCODE_2 },
+                { "_3", SDL_SCANCODE_3 },
+                { "_4", SDL_SCANCODE_4 },
+                { "_5", SDL_SCANCODE_5 },
+                { "_6", SDL_SCANCODE_6 },
+                { "_7", SDL_SCANCODE_7 },
+                { "_8", SDL_SCANCODE_8 },
+                { "_9", SDL_SCANCODE_9 },
 
-            { "LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown) },
-            { "LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight) },
-            { "MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward) },
-            { "MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight) },
-        }));
+                { "NP_0", SDL_SCANCODE_KP_0 },
+                { "NP_1", SDL_SCANCODE_KP_1 },
+                { "NP_2", SDL_SCANCODE_KP_2 },
+                { "NP_3", SDL_SCANCODE_KP_3 },
+                { "NP_4", SDL_SCANCODE_KP_4 },
+                { "NP_5", SDL_SCANCODE_KP_5 },
+                { "NP_6", SDL_SCANCODE_KP_6 },
+                { "NP_7", SDL_SCANCODE_KP_7 },
+                { "NP_8", SDL_SCANCODE_KP_8 },
+                { "NP_9", SDL_SCANCODE_KP_9 },
+                { "NP_Divide", SDL_SCANCODE_KP_DIVIDE },
+                { "NP_Enter", SDL_SCANCODE_KP_ENTER },
+                { "NP_Minus", SDL_SCANCODE_KP_MINUS },
+                { "NP_Multiply", SDL_SCANCODE_KP_MULTIPLY },
+                { "NP_Delete", SDL_SCANCODE_KP_PERIOD },
+                { "NP_Plus", SDL_SCANCODE_KP_PLUS },
 
-        api["KEY"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({
-            { "_0", SDL_SCANCODE_0 },
-            { "_1", SDL_SCANCODE_1 },
-            { "_2", SDL_SCANCODE_2 },
-            { "_3", SDL_SCANCODE_3 },
-            { "_4", SDL_SCANCODE_4 },
-            { "_5", SDL_SCANCODE_5 },
-            { "_6", SDL_SCANCODE_6 },
-            { "_7", SDL_SCANCODE_7 },
-            { "_8", SDL_SCANCODE_8 },
-            { "_9", SDL_SCANCODE_9 },
+                { "F1", SDL_SCANCODE_F1 },
+                { "F2", SDL_SCANCODE_F2 },
+                { "F3", SDL_SCANCODE_F3 },
+                { "F4", SDL_SCANCODE_F4 },
+                { "F5", SDL_SCANCODE_F5 },
+                { "F6", SDL_SCANCODE_F6 },
+                { "F7", SDL_SCANCODE_F7 },
+                { "F8", SDL_SCANCODE_F8 },
+                { "F9", SDL_SCANCODE_F9 },
+                { "F10", SDL_SCANCODE_F10 },
+                { "F11", SDL_SCANCODE_F11 },
+                { "F12", SDL_SCANCODE_F12 },
 
-            { "NP_0", SDL_SCANCODE_KP_0 },
-            { "NP_1", SDL_SCANCODE_KP_1 },
-            { "NP_2", SDL_SCANCODE_KP_2 },
-            { "NP_3", SDL_SCANCODE_KP_3 },
-            { "NP_4", SDL_SCANCODE_KP_4 },
-            { "NP_5", SDL_SCANCODE_KP_5 },
-            { "NP_6", SDL_SCANCODE_KP_6 },
-            { "NP_7", SDL_SCANCODE_KP_7 },
-            { "NP_8", SDL_SCANCODE_KP_8 },
-            { "NP_9", SDL_SCANCODE_KP_9 },
-            { "NP_Divide", SDL_SCANCODE_KP_DIVIDE },
-            { "NP_Enter", SDL_SCANCODE_KP_ENTER },
-            { "NP_Minus", SDL_SCANCODE_KP_MINUS },
-            { "NP_Multiply", SDL_SCANCODE_KP_MULTIPLY },
-            { "NP_Delete", SDL_SCANCODE_KP_PERIOD },
-            { "NP_Plus", SDL_SCANCODE_KP_PLUS },
+                { "A", SDL_SCANCODE_A },
+                { "B", SDL_SCANCODE_B },
+                { "C", SDL_SCANCODE_C },
+                { "D", SDL_SCANCODE_D },
+                { "E", SDL_SCANCODE_E },
+                { "F", SDL_SCANCODE_F },
+                { "G", SDL_SCANCODE_G },
+                { "H", SDL_SCANCODE_H },
+                { "I", SDL_SCANCODE_I },
+                { "J", SDL_SCANCODE_J },
+                { "K", SDL_SCANCODE_K },
+                { "L", SDL_SCANCODE_L },
+                { "M", SDL_SCANCODE_M },
+                { "N", SDL_SCANCODE_N },
+                { "O", SDL_SCANCODE_O },
+                { "P", SDL_SCANCODE_P },
+                { "Q", SDL_SCANCODE_Q },
+                { "R", SDL_SCANCODE_R },
+                { "S", SDL_SCANCODE_S },
+                { "T", SDL_SCANCODE_T },
+                { "U", SDL_SCANCODE_U },
+                { "V", SDL_SCANCODE_V },
+                { "W", SDL_SCANCODE_W },
+                { "X", SDL_SCANCODE_X },
+                { "Y", SDL_SCANCODE_Y },
+                { "Z", SDL_SCANCODE_Z },
 
-            { "F1", SDL_SCANCODE_F1 },
-            { "F2", SDL_SCANCODE_F2 },
-            { "F3", SDL_SCANCODE_F3 },
-            { "F4", SDL_SCANCODE_F4 },
-            { "F5", SDL_SCANCODE_F5 },
-            { "F6", SDL_SCANCODE_F6 },
-            { "F7", SDL_SCANCODE_F7 },
-            { "F8", SDL_SCANCODE_F8 },
-            { "F9", SDL_SCANCODE_F9 },
-            { "F10", SDL_SCANCODE_F10 },
-            { "F11", SDL_SCANCODE_F11 },
-            { "F12", SDL_SCANCODE_F12 },
+                { "LeftArrow", SDL_SCANCODE_LEFT },
+                { "RightArrow", SDL_SCANCODE_RIGHT },
+                { "UpArrow", SDL_SCANCODE_UP },
+                { "DownArrow", SDL_SCANCODE_DOWN },
 
-            { "A", SDL_SCANCODE_A },
-            { "B", SDL_SCANCODE_B },
-            { "C", SDL_SCANCODE_C },
-            { "D", SDL_SCANCODE_D },
-            { "E", SDL_SCANCODE_E },
-            { "F", SDL_SCANCODE_F },
-            { "G", SDL_SCANCODE_G },
-            { "H", SDL_SCANCODE_H },
-            { "I", SDL_SCANCODE_I },
-            { "J", SDL_SCANCODE_J },
-            { "K", SDL_SCANCODE_K },
-            { "L", SDL_SCANCODE_L },
-            { "M", SDL_SCANCODE_M },
-            { "N", SDL_SCANCODE_N },
-            { "O", SDL_SCANCODE_O },
-            { "P", SDL_SCANCODE_P },
-            { "Q", SDL_SCANCODE_Q },
-            { "R", SDL_SCANCODE_R },
-            { "S", SDL_SCANCODE_S },
-            { "T", SDL_SCANCODE_T },
-            { "U", SDL_SCANCODE_U },
-            { "V", SDL_SCANCODE_V },
-            { "W", SDL_SCANCODE_W },
-            { "X", SDL_SCANCODE_X },
-            { "Y", SDL_SCANCODE_Y },
-            { "Z", SDL_SCANCODE_Z },
+                { "LeftAlt", SDL_SCANCODE_LALT },
+                { "LeftCtrl", SDL_SCANCODE_LCTRL },
+                { "LeftBracket", SDL_SCANCODE_LEFTBRACKET },
+                { "LeftSuper", SDL_SCANCODE_LGUI },
+                { "LeftShift", SDL_SCANCODE_LSHIFT },
+                { "RightAlt", SDL_SCANCODE_RALT },
+                { "RightCtrl", SDL_SCANCODE_RCTRL },
+                { "RightSuper", SDL_SCANCODE_RGUI },
+                { "RightBracket", SDL_SCANCODE_RIGHTBRACKET },
+                { "RightShift", SDL_SCANCODE_RSHIFT },
 
-            { "LeftArrow", SDL_SCANCODE_LEFT },
-            { "RightArrow", SDL_SCANCODE_RIGHT },
-            { "UpArrow", SDL_SCANCODE_UP },
-            { "DownArrow", SDL_SCANCODE_DOWN },
+                { "Apostrophe", SDL_SCANCODE_APOSTROPHE },
+                { "BackSlash", SDL_SCANCODE_BACKSLASH },
+                { "Backspace", SDL_SCANCODE_BACKSPACE },
+                { "CapsLock", SDL_SCANCODE_CAPSLOCK },
+                { "Comma", SDL_SCANCODE_COMMA },
+                { "Delete", SDL_SCANCODE_DELETE },
+                { "End", SDL_SCANCODE_END },
+                { "Enter", SDL_SCANCODE_RETURN },
+                { "Equals", SDL_SCANCODE_EQUALS },
+                { "Escape", SDL_SCANCODE_ESCAPE },
+                { "Home", SDL_SCANCODE_HOME },
+                { "Insert", SDL_SCANCODE_INSERT },
+                { "Minus", SDL_SCANCODE_MINUS },
+                { "NumLock", SDL_SCANCODE_NUMLOCKCLEAR },
+                { "PageDown", SDL_SCANCODE_PAGEDOWN },
+                { "PageUp", SDL_SCANCODE_PAGEUP },
+                { "Period", SDL_SCANCODE_PERIOD },
+                { "Pause", SDL_SCANCODE_PAUSE },
+                { "PrintScreen", SDL_SCANCODE_PRINTSCREEN },
+                { "ScrollLock", SDL_SCANCODE_SCROLLLOCK },
+                { "Semicolon", SDL_SCANCODE_SEMICOLON },
+                { "Slash", SDL_SCANCODE_SLASH },
+                { "Space", SDL_SCANCODE_SPACE },
+                { "Tab", SDL_SCANCODE_TAB },
+            }));
 
-            { "LeftAlt", SDL_SCANCODE_LALT },
-            { "LeftCtrl", SDL_SCANCODE_LCTRL },
-            { "LeftBracket", SDL_SCANCODE_LEFTBRACKET },
-            { "LeftSuper", SDL_SCANCODE_LGUI },
-            { "LeftShift", SDL_SCANCODE_LSHIFT },
-            { "RightAlt", SDL_SCANCODE_RALT },
-            { "RightCtrl", SDL_SCANCODE_RCTRL },
-            { "RightSuper", SDL_SCANCODE_RGUI },
-            { "RightBracket", SDL_SCANCODE_RIGHTBRACKET },
-            { "RightShift", SDL_SCANCODE_RSHIFT },
-
-            { "Apostrophe", SDL_SCANCODE_APOSTROPHE },
-            { "BackSlash", SDL_SCANCODE_BACKSLASH },
-            { "Backspace", SDL_SCANCODE_BACKSPACE },
-            { "CapsLock", SDL_SCANCODE_CAPSLOCK },
-            { "Comma", SDL_SCANCODE_COMMA },
-            { "Delete", SDL_SCANCODE_DELETE },
-            { "End", SDL_SCANCODE_END },
-            { "Enter", SDL_SCANCODE_RETURN },
-            { "Equals", SDL_SCANCODE_EQUALS },
-            { "Escape", SDL_SCANCODE_ESCAPE },
-            { "Home", SDL_SCANCODE_HOME },
-            { "Insert", SDL_SCANCODE_INSERT },
-            { "Minus", SDL_SCANCODE_MINUS },
-            { "NumLock", SDL_SCANCODE_NUMLOCKCLEAR },
-            { "PageDown", SDL_SCANCODE_PAGEDOWN },
-            { "PageUp", SDL_SCANCODE_PAGEUP },
-            { "Period", SDL_SCANCODE_PERIOD },
-            { "Pause", SDL_SCANCODE_PAUSE },
-            { "PrintScreen", SDL_SCANCODE_PRINTSCREEN },
-            { "ScrollLock", SDL_SCANCODE_SCROLLLOCK },
-            { "Semicolon", SDL_SCANCODE_SEMICOLON },
-            { "Slash", SDL_SCANCODE_SLASH },
-            { "Space", SDL_SCANCODE_SPACE },
-            { "Tab", SDL_SCANCODE_TAB },
-        }));
-
-        return LuaUtil::makeReadOnly(api);
+        lua["openmw_input"] = LuaUtil::makeReadOnly(api);
+        return lua["openmw_input"];
     }
 
 }
diff --git a/apps/openmw/mwlua/inputprocessor.hpp b/apps/openmw/mwlua/inputprocessor.hpp
new file mode 100644
index 0000000000..dcd19ae8cd
--- /dev/null
+++ b/apps/openmw/mwlua/inputprocessor.hpp
@@ -0,0 +1,85 @@
+#ifndef MWLUA_INPUTPROCESSOR_H
+#define MWLUA_INPUTPROCESSOR_H
+
+#include <SDL_events.h>
+
+#include <components/sdlutil/events.hpp>
+
+#include "../mwbase/luamanager.hpp"
+
+namespace MWLua
+{
+    template <class Container>
+    class InputProcessor
+    {
+    public:
+        InputProcessor(Container* scriptsContainer)
+            : mScriptsContainer(scriptsContainer)
+        {
+            mScriptsContainer->registerEngineHandlers({ &mKeyPressHandlers, &mKeyReleaseHandlers,
+                &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers, &mActionHandlers, &mTouchpadPressed,
+                &mTouchpadReleased, &mTouchpadMoved, &mMouseButtonPress, &mMouseButtonRelease, &mMouseWheel });
+        }
+
+        void processInputEvent(const MWBase::LuaManager::InputEvent& event)
+        {
+            using InputEvent = MWBase::LuaManager::InputEvent;
+            switch (event.mType)
+            {
+                case InputEvent::KeyPressed:
+                    mScriptsContainer->callEngineHandlers(mKeyPressHandlers, std::get<SDL_Keysym>(event.mValue));
+                    break;
+                case InputEvent::KeyReleased:
+                    mScriptsContainer->callEngineHandlers(mKeyReleaseHandlers, std::get<SDL_Keysym>(event.mValue));
+                    break;
+                case InputEvent::ControllerPressed:
+                    mScriptsContainer->callEngineHandlers(mControllerButtonPressHandlers, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::ControllerReleased:
+                    mScriptsContainer->callEngineHandlers(
+                        mControllerButtonReleaseHandlers, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::Action:
+                    mScriptsContainer->callEngineHandlers(mActionHandlers, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::TouchPressed:
+                    mScriptsContainer->callEngineHandlers(
+                        mTouchpadPressed, std::get<SDLUtil::TouchEvent>(event.mValue));
+                    break;
+                case InputEvent::TouchReleased:
+                    mScriptsContainer->callEngineHandlers(
+                        mTouchpadReleased, std::get<SDLUtil::TouchEvent>(event.mValue));
+                    break;
+                case InputEvent::TouchMoved:
+                    mScriptsContainer->callEngineHandlers(mTouchpadMoved, std::get<SDLUtil::TouchEvent>(event.mValue));
+                    break;
+                case InputEvent::MouseButtonPressed:
+                    mScriptsContainer->callEngineHandlers(mMouseButtonPress, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::MouseButtonReleased:
+                    mScriptsContainer->callEngineHandlers(mMouseButtonRelease, std::get<int>(event.mValue));
+                    break;
+                case InputEvent::MouseWheel:
+                    auto wheelEvent = std::get<MWBase::LuaManager::InputEvent::WheelChange>(event.mValue);
+                    mScriptsContainer->callEngineHandlers(mMouseWheel, wheelEvent.y, wheelEvent.x);
+                    break;
+            }
+        }
+
+    private:
+        Container* mScriptsContainer;
+        typename Container::EngineHandlerList mKeyPressHandlers{ "onKeyPress" };
+        typename Container::EngineHandlerList mKeyReleaseHandlers{ "onKeyRelease" };
+        typename Container::EngineHandlerList mControllerButtonPressHandlers{ "onControllerButtonPress" };
+        typename Container::EngineHandlerList mControllerButtonReleaseHandlers{ "onControllerButtonRelease" };
+        typename Container::EngineHandlerList mActionHandlers{ "onInputAction" };
+        typename Container::EngineHandlerList mTouchpadPressed{ "onTouchPress" };
+        typename Container::EngineHandlerList mTouchpadReleased{ "onTouchRelease" };
+        typename Container::EngineHandlerList mTouchpadMoved{ "onTouchMove" };
+        typename Container::EngineHandlerList mMouseButtonPress{ "onMouseButtonPress" };
+        typename Container::EngineHandlerList mMouseButtonRelease{ "onMouseButtonRelease" };
+        typename Container::EngineHandlerList mMouseWheel{ "onMouseWheel" };
+    };
+}
+
+#endif // MWLUA_INPUTPROCESSOR_H
diff --git a/apps/openmw/mwlua/itemdata.cpp b/apps/openmw/mwlua/itemdata.cpp
new file mode 100644
index 0000000000..38415ea25e
--- /dev/null
+++ b/apps/openmw/mwlua/itemdata.cpp
@@ -0,0 +1,200 @@
+#include "itemdata.hpp"
+
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
+
+#include "context.hpp"
+#include "luamanagerimp.hpp"
+#include "objectvariant.hpp"
+
+#include "../mwbase/environment.hpp"
+#include "../mwmechanics/spellutil.hpp"
+
+#include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+
+namespace
+{
+    using SelfObject = MWLua::SelfObject;
+    using Index = const SelfObject::CachedStat::Index&;
+
+    constexpr std::array properties = { "condition", "enchantmentCharge", "soul" };
+
+    void valueErr(std::string_view prop, std::string type)
+    {
+        throw std::logic_error("'" + std::string(prop) + "'" + " received invalid value type (" + type + ")");
+    }
+}
+
+namespace MWLua
+{
+    static void addStatUpdateAction(MWLua::LuaManager* manager, const SelfObject& obj)
+    {
+        if (!obj.mStatsCache.empty())
+            return; // was already added before
+        manager->addAction(
+            [obj = Object(obj)] {
+                LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
+                if (scripts)
+                    scripts->applyStatsCache();
+            },
+            "StatUpdateAction");
+    }
+
+    class ItemData
+    {
+        ObjectVariant mObject;
+
+    public:
+        ItemData(const ObjectVariant& object)
+            : mObject(object)
+        {
+        }
+
+        sol::object get(const Context& context, std::string_view prop) const
+        {
+            if (mObject.isSelfObject())
+            {
+                SelfObject* self = mObject.asSelfObject();
+                auto it = self->mStatsCache.find({ &ItemData::setValue, std::monostate{}, prop });
+                if (it != self->mStatsCache.end())
+                    return it->second;
+            }
+            return sol::make_object(context.mLua->unsafeState(), getValue(context, prop, mObject.ptr()));
+        }
+
+        void set(const Context& context, std::string_view prop, const sol::object& value) const
+        {
+            if (mObject.isGObject())
+                setValue({}, prop, mObject.ptr(), value);
+            else if (mObject.isSelfObject())
+            {
+                SelfObject* obj = mObject.asSelfObject();
+                addStatUpdateAction(context.mLuaManager, *obj);
+                obj->mStatsCache[SelfObject::CachedStat{ &ItemData::setValue, std::monostate{}, prop }] = value;
+            }
+            else
+                throw std::runtime_error("Only global or self scripts can set the value");
+        }
+
+        static sol::object getValue(const Context& context, std::string_view prop, const MWWorld::Ptr& ptr)
+        {
+            if (prop == "condition")
+            {
+                if (ptr.mRef->getType() == ESM::REC_LIGH)
+                    return sol::make_object(context.mLua->unsafeState(), ptr.getClass().getRemainingUsageTime(ptr));
+                else if (ptr.getClass().hasItemHealth(ptr))
+                    return sol::make_object(context.mLua->unsafeState(),
+                        ptr.getClass().getItemHealth(ptr) + ptr.getCellRef().getChargeIntRemainder());
+            }
+            else if (prop == "enchantmentCharge")
+            {
+                const ESM::RefId& enchantmentName = ptr.getClass().getEnchantment(ptr);
+
+                if (enchantmentName.empty())
+                    return sol::lua_nil;
+
+                float charge = ptr.getCellRef().getEnchantmentCharge();
+                const auto& store = MWBase::Environment::get().getESMStore();
+                const auto* enchantment = store->get<ESM::Enchantment>().find(enchantmentName);
+
+                if (charge == -1) // return the full charge
+                    return sol::make_object(
+                        context.mLua->unsafeState(), MWMechanics::getEnchantmentCharge(*enchantment));
+
+                return sol::make_object(context.mLua->unsafeState(), charge);
+            }
+            else if (prop == "soul")
+            {
+                ESM::RefId soul = ptr.getCellRef().getSoul();
+                if (soul.empty())
+                    return sol::lua_nil;
+
+                return sol::make_object(context.mLua->unsafeState(), soul.serializeText());
+            }
+
+            return sol::lua_nil;
+        }
+
+        static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+        {
+            if (prop == "condition")
+            {
+                if (value.get_type() == sol::type::number)
+                {
+                    float cond = LuaUtil::cast<float>(value);
+                    if (ptr.mRef->getType() == ESM::REC_LIGH)
+                        ptr.getClass().setRemainingUsageTime(ptr, cond);
+                    else if (ptr.getClass().hasItemHealth(ptr))
+                    {
+                        // if the value set is less than 0, chargeInt and chargeIntRemainder is set to 0
+                        ptr.getCellRef().setChargeIntRemainder(std::max(0.f, std::modf(cond, &cond)));
+                        ptr.getCellRef().setCharge(std::max(0.f, cond));
+                    }
+                }
+                else
+                    valueErr(prop, sol::type_name(value.lua_state(), value.get_type()));
+            }
+            else if (prop == "enchantmentCharge")
+            {
+                if (value.get_type() == sol::type::lua_nil)
+                    ptr.getCellRef().setEnchantmentCharge(-1);
+                else if (value.get_type() == sol::type::number)
+                    ptr.getCellRef().setEnchantmentCharge(std::max(0.0f, LuaUtil::cast<float>(value)));
+                else
+                    valueErr(prop, sol::type_name(value.lua_state(), value.get_type()));
+            }
+            else if (prop == "soul")
+            {
+                if (value.get_type() == sol::type::lua_nil)
+                    ptr.getCellRef().setSoul(ESM::RefId{});
+                else if (value.get_type() == sol::type::string)
+                {
+                    std::string_view souldId = LuaUtil::cast<std::string_view>(value);
+                    ESM::RefId creature = ESM::RefId::deserializeText(souldId);
+                    const auto& store = *MWBase::Environment::get().getESMStore();
+
+                    // TODO: Add Support for NPC Souls
+                    if (store.get<ESM::Creature>().search(creature))
+                        ptr.getCellRef().setSoul(creature);
+                    else
+                        throw std::runtime_error("Cannot use non-existent creature as a soul: " + std::string(souldId));
+                }
+                else
+                    valueErr(prop, sol::type_name(value.lua_state(), value.get_type()));
+            }
+        }
+    };
+}
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWLua::ItemData> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+    void addItemDataBindings(sol::table& item, const Context& context)
+    {
+        item["itemData"] = [](const sol::object& object) -> sol::optional<ItemData> {
+            ObjectVariant o(object);
+            if (o.ptr().getClass().isItem(o.ptr()) || o.ptr().mRef->getType() == ESM::REC_LIGH)
+                return ItemData(o);
+            return {};
+        };
+
+        sol::usertype<ItemData> itemData = context.sol().new_usertype<ItemData>("ItemData");
+        itemData[sol::meta_function::new_index] = [](const ItemData& stat, const sol::variadic_args args) {
+            throw std::runtime_error("Unknown ItemData property '" + args.get<std::string>() + "'");
+        };
+
+        for (std::string_view prop : properties)
+        {
+            itemData[prop] = sol::property([context, prop](const ItemData& stat) { return stat.get(context, prop); },
+                [context, prop](const ItemData& stat, const sol::object& value) { stat.set(context, prop, value); });
+        }
+    }
+}
diff --git a/apps/openmw/mwlua/itemdata.hpp b/apps/openmw/mwlua/itemdata.hpp
new file mode 100644
index 0000000000..f70705fb6c
--- /dev/null
+++ b/apps/openmw/mwlua/itemdata.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_ITEMDATA_H
+#define MWLUA_ITEMDATA_H
+
+#include <sol/forward.hpp>
+
+namespace MWLua
+{
+    struct Context;
+
+    void addItemDataBindings(sol::table& item, const Context& context);
+
+}
+#endif // MWLUA_ITEMDATA_H
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 8cf383e985..7a3e9ff23a 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -1,8 +1,11 @@
 #include "localscripts.hpp"
 
 #include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadweap.hpp>
 #include <components/misc/strings/lower.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwmechanics/aicombat.hpp"
 #include "../mwmechanics/aiescort.hpp"
 #include "../mwmechanics/aifollow.hpp"
@@ -11,6 +14,7 @@
 #include "../mwmechanics/aisequence.hpp"
 #include "../mwmechanics/aitravel.hpp"
 #include "../mwmechanics/aiwander.hpp"
+#include "../mwmechanics/attacktype.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/ptr.hpp"
@@ -34,8 +38,9 @@ namespace MWLua
 
     void LocalScripts::initializeSelfPackage(const Context& context)
     {
+        auto lua = context.sol();
         using ActorControls = MWBase::LuaManager::ActorControls;
-        sol::usertype<ActorControls> controls = context.mLua->sol().new_usertype<ActorControls>("ActorControls");
+        sol::usertype<ActorControls> controls = lua.new_usertype<ActorControls>("ActorControls");
 
 #define CONTROL(TYPE, FIELD)                                                                                           \
     sol::property([](const ActorControls& c) { return c.FIELD; },                                                      \
@@ -53,17 +58,22 @@ namespace MWLua
         controls["use"] = CONTROL(int, mUse);
 #undef CONTROL
 
-        sol::usertype<SelfObject> selfAPI = context.mLua->sol().new_usertype<SelfObject>(
-            "SelfObject", sol::base_classes, sol::bases<LObject, Object>());
+        sol::usertype<SelfObject> selfAPI
+            = lua.new_usertype<SelfObject>("SelfObject", sol::base_classes, sol::bases<LObject, Object>());
         selfAPI[sol::meta_function::to_string]
             = [](SelfObject& self) { return "openmw.self[" + self.toString() + "]"; };
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
         selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.mDisableAI = !v; };
+        selfAPI["ATTACK_TYPE"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWMechanics::AttackType>(lua,
+                { { "NoAttack", MWMechanics::AttackType::NoAttack }, { "Any", MWMechanics::AttackType::Any },
+                    { "Chop", MWMechanics::AttackType::Chop }, { "Slash", MWMechanics::AttackType::Slash },
+                    { "Thrust", MWMechanics::AttackType::Thrust } }));
 
         using AiPackage = MWMechanics::AiPackage;
-        sol::usertype<AiPackage> aiPackage = context.mLua->sol().new_usertype<AiPackage>("AiPackage");
+        sol::usertype<AiPackage> aiPackage = lua.new_usertype<AiPackage>("AiPackage");
         aiPackage["type"] = sol::readonly_property([](const AiPackage& p) -> std::string_view {
             switch (p.getTypeId())
             {
@@ -102,7 +112,37 @@ namespace MWLua
         });
         aiPackage["sideWithTarget"] = sol::readonly_property([](const AiPackage& p) { return p.sideWithTarget(); });
         aiPackage["destPosition"] = sol::readonly_property([](const AiPackage& p) { return p.getDestination(); });
+        aiPackage["distance"] = sol::readonly_property([](const AiPackage& p) { return p.getDistance(); });
+        aiPackage["duration"] = sol::readonly_property([](const AiPackage& p) { return p.getDuration(); });
+        aiPackage["idle"]
+            = sol::readonly_property([lua = lua.lua_state()](const AiPackage& p) -> sol::optional<sol::table> {
+                  if (p.getTypeId() == MWMechanics::AiPackageTypeId::Wander)
+                  {
+                      sol::table idles(lua, sol::create);
+                      const std::vector<unsigned char>& idle = static_cast<const MWMechanics::AiWander&>(p).getIdle();
+                      if (!idle.empty())
+                      {
+                          for (size_t i = 0; i < idle.size(); ++i)
+                          {
+                              std::string_view groupName = MWMechanics::AiWander::getIdleGroupName(i);
+                              idles[groupName] = idle[i];
+                          }
+                          return idles;
+                      }
+                  }
+                  return sol::nullopt;
+              });
 
+        aiPackage["isRepeat"] = sol::readonly_property([](const AiPackage& p) { return p.getRepeat(); });
+
+        selfAPI["_isFleeing"] = [](SelfObject& self) -> bool {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            if (ai.isEmpty())
+                return false;
+            else
+                return ai.isFleeing();
+        };
         selfAPI["_getActiveAiPackage"] = [](SelfObject& self) -> sol::optional<std::shared_ptr<AiPackage>> {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
@@ -130,13 +170,25 @@ namespace MWLua
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             ai.stack(MWMechanics::AiPursue(target.ptr()), ptr, cancelOther);
         };
-        selfAPI["_startAiFollow"] = [](SelfObject& self, const LObject& target, bool cancelOther) {
+        selfAPI["_startAiFollow"] = [](SelfObject& self, const LObject& target, sol::optional<LCell> cell,
+                                        float duration, const osg::Vec3f& dest, bool repeat, bool cancelOther) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            ai.stack(MWMechanics::AiFollow(target.ptr()), ptr, cancelOther);
+            if (cell)
+            {
+                ai.stack(MWMechanics::AiFollow(target.ptr().getCellRef().getRefId(),
+                             cell->mStore->getCell()->getNameId(), duration, dest.x(), dest.y(), dest.z(), repeat),
+                    ptr, cancelOther);
+            }
+            else
+            {
+                ai.stack(MWMechanics::AiFollow(
+                             target.ptr().getCellRef().getRefId(), duration, dest.x(), dest.y(), dest.z(), repeat),
+                    ptr, cancelOther);
+            }
         };
         selfAPI["_startAiEscort"] = [](SelfObject& self, const LObject& target, LCell cell, float duration,
-                                        const osg::Vec3f& dest, bool cancelOther) {
+                                        const osg::Vec3f& dest, bool repeat, bool cancelOther) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             // TODO: change AiEscort implementation to accept ptr instead of a non-unique refId.
@@ -144,33 +196,43 @@ namespace MWLua
             int gameHoursDuration = static_cast<int>(std::ceil(duration / 3600.0));
             auto* esmCell = cell.mStore->getCell();
             if (esmCell->isExterior())
-                ai.stack(MWMechanics::AiEscort(refId, gameHoursDuration, dest.x(), dest.y(), dest.z(), false), ptr,
+                ai.stack(MWMechanics::AiEscort(refId, gameHoursDuration, dest.x(), dest.y(), dest.z(), repeat), ptr,
                     cancelOther);
             else
                 ai.stack(MWMechanics::AiEscort(
-                             refId, esmCell->getNameId(), gameHoursDuration, dest.x(), dest.y(), dest.z(), false),
+                             refId, esmCell->getNameId(), gameHoursDuration, dest.x(), dest.y(), dest.z(), repeat),
                     ptr, cancelOther);
         };
-        selfAPI["_startAiWander"] = [](SelfObject& self, int distance, float duration, bool cancelOther) {
+        selfAPI["_startAiWander"]
+            = [](SelfObject& self, int distance, int duration, sol::table luaIdle, bool repeat, bool cancelOther) {
+                  const MWWorld::Ptr& ptr = self.ptr();
+                  MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+                  std::vector<unsigned char> idle;
+                  // Lua index starts at 1
+                  for (size_t i = 1; i <= luaIdle.size(); i++)
+                      idle.emplace_back(luaIdle.get<unsigned char>(i));
+                  ai.stack(MWMechanics::AiWander(distance, duration, 0, idle, repeat), ptr, cancelOther);
+              };
+        selfAPI["_startAiTravel"] = [](SelfObject& self, const osg::Vec3f& target, bool repeat, bool cancelOther) {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            int gameHoursDuration = static_cast<int>(std::ceil(duration / 3600.0));
-            ai.stack(MWMechanics::AiWander(distance, gameHoursDuration, 0, {}, false), ptr, cancelOther);
+            ai.stack(MWMechanics::AiTravel(target.x(), target.y(), target.z(), repeat), ptr, cancelOther);
         };
-        selfAPI["_startAiTravel"] = [](SelfObject& self, const osg::Vec3f& target, bool cancelOther) {
+        selfAPI["_enableLuaAnimations"] = [](SelfObject& self, bool enable) {
             const MWWorld::Ptr& ptr = self.ptr();
-            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            ai.stack(MWMechanics::AiTravel(target.x(), target.y(), target.z(), false), ptr, cancelOther);
+            MWBase::Environment::get().getMechanicsManager()->enableLuaAnimations(ptr, enable);
         };
     }
 
-    LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj)
-        : LuaUtil::ScriptsContainer(lua, "L" + obj.id().toString())
+    LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj, LuaUtil::ScriptTracker* tracker)
+        : LuaUtil::ScriptsContainer(lua, "L" + obj.id().toString(), tracker, false)
         , mData(obj)
     {
-        this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
+        lua->protectedCall(
+            [&](LuaUtil::LuaView& view) { addPackage("openmw.self", sol::make_object(view.sol(), &mData)); });
         registerEngineHandlers({ &mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers, &mOnActivatedHandlers,
-            &mOnTeleportedHandlers });
+            &mOnTeleportedHandlers, &mOnAnimationTextKeyHandlers, &mOnPlayAnimationHandlers, &mOnSkillUse,
+            &mOnSkillLevelUp });
     }
 
     void LocalScripts::setActive(bool active)
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index 6b1555868d..b32d8bba9e 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -22,7 +22,7 @@ namespace MWLua
         class CachedStat
         {
         public:
-            using Index = std::variant<int, ESM::RefId>;
+            using Index = std::variant<int, ESM::RefId, std::monostate>;
             using Setter = void (*)(const Index&, std::string_view, const MWWorld::Ptr&, const sol::object&);
 
             CachedStat(Setter setter, Index index, std::string_view prop)
@@ -62,15 +62,32 @@ namespace MWLua
     {
     public:
         static void initializeSelfPackage(const Context&);
-        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
+        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj, LuaUtil::ScriptTracker* tracker = nullptr);
 
         MWBase::LuaManager::ActorControls* getActorControls() { return &mData.mControls; }
         const MWWorld::Ptr& getPtrOrEmpty() const { return mData.ptrOrEmpty(); }
 
         void setActive(bool active);
+        bool isActive() const override { return mData.mIsActive; }
         void onConsume(const LObject& consumable) { callEngineHandlers(mOnConsumeHandlers, consumable); }
         void onActivated(const LObject& actor) { callEngineHandlers(mOnActivatedHandlers, actor); }
         void onTeleported() { callEngineHandlers(mOnTeleportedHandlers); }
+        void onAnimationTextKey(std::string_view groupname, std::string_view key)
+        {
+            callEngineHandlers(mOnAnimationTextKeyHandlers, groupname, key);
+        }
+        void onPlayAnimation(std::string_view groupname, const sol::table& options)
+        {
+            callEngineHandlers(mOnPlayAnimationHandlers, groupname, options);
+        }
+        void onSkillUse(std::string_view skillId, int useType, float scale)
+        {
+            callEngineHandlers(mOnSkillUse, skillId, useType, scale);
+        }
+        void onSkillLevelUp(std::string_view skillId, std::string_view source)
+        {
+            callEngineHandlers(mOnSkillLevelUp, skillId, source);
+        }
 
         void applyStatsCache();
 
@@ -83,6 +100,10 @@ namespace MWLua
         EngineHandlerList mOnConsumeHandlers{ "onConsume" };
         EngineHandlerList mOnActivatedHandlers{ "onActivated" };
         EngineHandlerList mOnTeleportedHandlers{ "onTeleported" };
+        EngineHandlerList mOnAnimationTextKeyHandlers{ "_onAnimationTextKey" };
+        EngineHandlerList mOnPlayAnimationHandlers{ "_onPlayAnimation" };
+        EngineHandlerList mOnSkillUse{ "_onSkillUse" };
+        EngineHandlerList mOnSkillLevelUp{ "_onSkillLevelUp" };
     };
 
 }
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 65b6977982..8debbe153d 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -1,335 +1,44 @@
 #include "luabindings.hpp"
 
-#include <chrono>
-
-#include <components/esm/attr.hpp>
-#include <components/esm3/loadacti.hpp>
-#include <components/esm3/loadalch.hpp>
-#include <components/esm3/loadarmo.hpp>
-#include <components/esm3/loadbook.hpp>
-#include <components/esm3/loadclot.hpp>
-#include <components/esm3/loadmisc.hpp>
-#include <components/esm3/loadskil.hpp>
-#include <components/esm3/loadweap.hpp>
-#include <components/lua/l10n.hpp>
-#include <components/lua/luastate.hpp>
+#include <components/lua/asyncpackage.hpp>
 #include <components/lua/utilpackage.hpp>
-#include <components/misc/strings/lower.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/statemanager.hpp"
-#include "../mwworld/action.hpp"
-#include "../mwworld/class.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwworld/datetimemanager.hpp"
-#include "../mwworld/esmstore.hpp"
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/store.hpp"
-#include "../mwworld/worldmodel.hpp"
-
-#include "luaevents.hpp"
-#include "luamanagerimp.hpp"
-#include "mwscriptbindings.hpp"
-#include "objectlists.hpp"
 
+#include "animationbindings.hpp"
 #include "camerabindings.hpp"
 #include "cellbindings.hpp"
+#include "corebindings.hpp"
 #include "debugbindings.hpp"
 #include "inputbindings.hpp"
-#include "magicbindings.hpp"
+#include "localscripts.hpp"
+#include "markupbindings.hpp"
+#include "menuscripts.hpp"
 #include "nearbybindings.hpp"
 #include "objectbindings.hpp"
 #include "postprocessingbindings.hpp"
 #include "soundbindings.hpp"
 #include "types/types.hpp"
 #include "uibindings.hpp"
+#include "vfsbindings.hpp"
+#include "worldbindings.hpp"
 
 namespace MWLua
 {
-    struct CellsStore
-    {
-    };
-}
-
-namespace sol
-{
-    template <>
-    struct is_automagical<MWLua::CellsStore> : std::false_type
-    {
-    };
-}
-
-namespace MWLua
-{
-
-    static void checkGameInitialized(LuaUtil::LuaState* lua)
-    {
-        if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame)
-            throw std::runtime_error(
-                "This function cannot be used until the game is fully initialized.\n" + lua->debugTraceback());
-    }
-
-    static void addTimeBindings(sol::table& api, const Context& context, bool global)
-    {
-        MWWorld::DateTimeManager* timeManager = MWBase::Environment::get().getWorld()->getTimeManager();
-
-        api["getSimulationTime"] = [timeManager]() { return timeManager->getSimulationTime(); };
-        api["getSimulationTimeScale"] = [timeManager]() { return timeManager->getSimulationTimeScale(); };
-        api["getGameTime"] = [timeManager]() { return timeManager->getGameTime(); };
-        api["getGameTimeScale"] = [timeManager]() { return timeManager->getGameTimeScale(); };
-        api["isWorldPaused"] = [timeManager]() { return timeManager->isPaused(); };
-        api["getRealTime"] = []() {
-            return std::chrono::duration<double>(std::chrono::steady_clock::now().time_since_epoch()).count();
-        };
-
-        if (!global)
-            return;
-
-        api["setGameTimeScale"] = [timeManager](double scale) { timeManager->setGameTimeScale(scale); };
-        api["setSimulationTimeScale"] = [context, timeManager](float scale) {
-            context.mLuaManager->addAction([scale, timeManager] { timeManager->setSimulationTimeScale(scale); });
-        };
-
-        api["pause"]
-            = [timeManager](sol::optional<std::string_view> tag) { timeManager->pause(tag.value_or("paused")); };
-        api["unpause"]
-            = [timeManager](sol::optional<std::string_view> tag) { timeManager->unpause(tag.value_or("paused")); };
-        api["getPausedTags"] = [timeManager](sol::this_state lua) {
-            sol::table res(lua, sol::create);
-            for (const std::string& tag : timeManager->getPausedTags())
-                res[tag] = tag;
-            return res;
-        };
-    }
-
-    static sol::table initContentFilesBindings(sol::state_view& lua)
-    {
-        const std::vector<std::string>& contentList = MWBase::Environment::get().getWorld()->getContentFiles();
-        sol::table list(lua, sol::create);
-        for (size_t i = 0; i < contentList.size(); ++i)
-            list[i + 1] = Misc::StringUtils::lowerCase(contentList[i]);
-        sol::table res(lua, sol::create);
-        res["list"] = LuaUtil::makeReadOnly(list);
-        res["indexOf"] = [&contentList](std::string_view contentFile) -> sol::optional<int> {
-            for (size_t i = 0; i < contentList.size(); ++i)
-                if (Misc::StringUtils::ciEqual(contentList[i], contentFile))
-                    return i + 1;
-            return sol::nullopt;
-        };
-        res["has"] = [&contentList](std::string_view contentFile) -> bool {
-            for (size_t i = 0; i < contentList.size(); ++i)
-                if (Misc::StringUtils::ciEqual(contentList[i], contentFile))
-                    return true;
-            return false;
-        };
-        return LuaUtil::makeReadOnly(res);
-    }
-
-    static sol::table initCorePackage(const Context& context)
-    {
-        auto* lua = context.mLua;
-        sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 44;
-        api["quit"] = [lua]() {
-            Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
-            MWBase::Environment::get().getStateManager()->requestQuit();
-        };
-        api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData) {
-            context.mLuaEvents->addGlobalEvent(
-                { std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer) });
-        };
-        api["contentFiles"] = initContentFilesBindings(lua->sol());
-        api["sound"] = initCoreSoundBindings(context);
-        api["getFormId"] = [](std::string_view contentFile, unsigned int index) -> std::string {
-            const std::vector<std::string>& contentList = MWBase::Environment::get().getWorld()->getContentFiles();
-            for (size_t i = 0; i < contentList.size(); ++i)
-                if (Misc::StringUtils::ciEqual(contentList[i], contentFile))
-                    return ESM::RefId(ESM::FormId{ index, int(i) }).serializeText();
-            throw std::runtime_error("Content file not found: " + std::string(contentFile));
-        };
-        addTimeBindings(api, context, false);
-        api["magic"] = initCoreMagicBindings(context);
-        api["l10n"] = LuaUtil::initL10nLoader(lua->sol(), MWBase::Environment::get().getL10nManager());
-        const MWWorld::Store<ESM::GameSetting>* gmstStore
-            = &MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
-        api["getGMST"] = [lua = context.mLua, gmstStore](const std::string& setting) -> sol::object {
-            const ESM::GameSetting* gmst = gmstStore->search(setting);
-            if (gmst == nullptr)
-                return sol::nil;
-            const ESM::Variant& value = gmst->mValue;
-            switch (value.getType())
-            {
-                case ESM::VT_Float:
-                    return sol::make_object<float>(lua->sol(), value.getFloat());
-                case ESM::VT_Short:
-                case ESM::VT_Long:
-                case ESM::VT_Int:
-                    return sol::make_object<int>(lua->sol(), value.getInteger());
-                case ESM::VT_String:
-                    return sol::make_object<std::string>(lua->sol(), value.getString());
-                case ESM::VT_Unknown:
-                case ESM::VT_None:
-                    break;
-            }
-            return sol::nil;
-        };
-
-        // TODO: deprecate this and provide access to the store instead
-        sol::table skills(context.mLua->sol(), sol::create);
-        api["SKILL"] = LuaUtil::makeStrictReadOnly(skills);
-        for (int i = 0; i < ESM::Skill::Length; ++i)
-        {
-            ESM::RefId skill = ESM::Skill::indexToRefId(i);
-            std::string id = skill.serializeText();
-            std::string key = Misc::StringUtils::lowerCase(skill.getRefIdString());
-            // force first character to uppercase for backwards compatability
-            key[0] += 'A' - 'a';
-            skills[key] = id;
-        }
-
-        // TODO: deprecate this and provide access to the store instead
-        sol::table attributes(context.mLua->sol(), sol::create);
-        api["ATTRIBUTE"] = LuaUtil::makeStrictReadOnly(attributes);
-        for (int i = 0; i < ESM::Attribute::Length; ++i)
-        {
-            ESM::RefId attribute = ESM::Attribute::indexToRefId(i);
-            std::string id = attribute.serializeText();
-            std::string key = Misc::StringUtils::lowerCase(attribute.getRefIdString());
-            // force first character to uppercase for backwards compatability
-            key[0] += 'A' - 'a';
-            attributes[key] = id;
-        }
-
-        return LuaUtil::makeReadOnly(api);
-    }
-
-    static void addCellGetters(sol::table& api, const Context& context)
-    {
-        api["getCellByName"] = [](std::string_view name) {
-            return GCell{ &MWBase::Environment::get().getWorldModel()->getCell(name, /*forceLoad=*/false) };
-        };
-        api["getExteriorCell"] = [](int x, int y, sol::object cellOrName) {
-            ESM::RefId worldspace;
-            if (cellOrName.is<GCell>())
-                worldspace = cellOrName.as<GCell>().mStore->getCell()->getWorldSpace();
-            else if (cellOrName.is<std::string_view>() && !cellOrName.as<std::string_view>().empty())
-                worldspace = MWBase::Environment::get()
-                                 .getWorldModel()
-                                 ->getCell(cellOrName.as<std::string_view>())
-                                 .getCell()
-                                 ->getWorldSpace();
-            else
-                worldspace = ESM::Cell::sDefaultWorldspaceId;
-            return GCell{ &MWBase::Environment::get().getWorldModel()->getExterior(
-                ESM::ExteriorCellLocation(x, y, worldspace), /*forceLoad=*/false) };
-        };
-
-        const MWWorld::Store<ESM::Cell>* cells3Store = &MWBase::Environment::get().getESMStore()->get<ESM::Cell>();
-        const MWWorld::Store<ESM4::Cell>* cells4Store = &MWBase::Environment::get().getESMStore()->get<ESM4::Cell>();
-        sol::usertype<CellsStore> cells = context.mLua->sol().new_usertype<CellsStore>("Cells");
-        cells[sol::meta_function::length]
-            = [cells3Store, cells4Store](const CellsStore&) { return cells3Store->getSize() + cells4Store->getSize(); };
-        cells[sol::meta_function::index] = [cells3Store, cells4Store](const CellsStore&, size_t index) -> GCell {
-            index--; // Translate from Lua's 1-based indexing.
-            if (index < cells3Store->getSize())
-            {
-                const ESM::Cell* cellRecord = cells3Store->at(index);
-                return GCell{ &MWBase::Environment::get().getWorldModel()->getCell(
-                    cellRecord->mId, /*forceLoad=*/false) };
-            }
-            else
-            {
-                const ESM4::Cell* cellRecord = cells4Store->at(index - cells3Store->getSize());
-                return GCell{ &MWBase::Environment::get().getWorldModel()->getCell(
-                    cellRecord->mId, /*forceLoad=*/false) };
-            }
-        };
-        cells[sol::meta_function::pairs] = context.mLua->sol()["ipairsForArray"].template get<sol::function>();
-        cells[sol::meta_function::ipairs] = context.mLua->sol()["ipairsForArray"].template get<sol::function>();
-        api["cells"] = CellsStore{};
-    }
-
-    static sol::table initWorldPackage(const Context& context)
-    {
-        sol::table api(context.mLua->sol(), sol::create);
-        ObjectLists* objectLists = context.mObjectLists;
-        addTimeBindings(api, context, true);
-        addCellGetters(api, context);
-        api["mwscript"] = initMWScriptBindings(context);
-        api["activeActors"] = GObjectList{ objectLists->getActorsInScene() };
-        api["players"] = GObjectList{ objectLists->getPlayers() };
-        api["createObject"] = [lua = context.mLua](std::string_view recordId, sol::optional<int> count) -> GObject {
-            checkGameInitialized(lua);
-            MWWorld::ManualRef mref(*MWBase::Environment::get().getESMStore(), ESM::RefId::deserializeText(recordId));
-            const MWWorld::Ptr& ptr = mref.getPtr();
-            ptr.getRefData().disable();
-            MWWorld::CellStore& cell = MWBase::Environment::get().getWorldModel()->getDraftCell();
-            MWWorld::Ptr newPtr = ptr.getClass().copyToCell(ptr, cell, count.value_or(1));
-            return GObject(newPtr);
-        };
-        api["getObjectByFormId"] = [](std::string_view formIdStr) -> GObject {
-            ESM::RefId refId = ESM::RefId::deserializeText(formIdStr);
-            if (!refId.is<ESM::FormId>())
-                throw std::runtime_error("FormId expected, got " + std::string(formIdStr) + "; use core.getFormId");
-            return GObject(*refId.getIf<ESM::FormId>());
-        };
-
-        // Creates a new record in the world database.
-        api["createRecord"] = sol::overload(
-            [lua = context.mLua](const ESM::Activator& activator) -> const ESM::Activator* {
-                checkGameInitialized(lua);
-                return MWBase::Environment::get().getESMStore()->insert(activator);
-            },
-            [lua = context.mLua](const ESM::Armor& armor) -> const ESM::Armor* {
-                checkGameInitialized(lua);
-                return MWBase::Environment::get().getESMStore()->insert(armor);
-            },
-            [lua = context.mLua](const ESM::Clothing& clothing) -> const ESM::Clothing* {
-                checkGameInitialized(lua);
-                return MWBase::Environment::get().getESMStore()->insert(clothing);
-            },
-            [lua = context.mLua](const ESM::Book& book) -> const ESM::Book* {
-                checkGameInitialized(lua);
-                return MWBase::Environment::get().getESMStore()->insert(book);
-            },
-            [lua = context.mLua](const ESM::Miscellaneous& misc) -> const ESM::Miscellaneous* {
-                checkGameInitialized(lua);
-                return MWBase::Environment::get().getESMStore()->insert(misc);
-            },
-            [lua = context.mLua](const ESM::Potion& potion) -> const ESM::Potion* {
-                checkGameInitialized(lua);
-                return MWBase::Environment::get().getESMStore()->insert(potion);
-            },
-            [lua = context.mLua](const ESM::Weapon& weapon) -> const ESM::Weapon* {
-                checkGameInitialized(lua);
-                return MWBase::Environment::get().getESMStore()->insert(weapon);
-            });
-
-        api["_runStandardActivationAction"] = [context](const GObject& object, const GObject& actor) {
-            if (!object.ptr().getRefData().activate())
-                return;
-            context.mLuaManager->addAction(
-                [object, actor] {
-                    const MWWorld::Ptr& objPtr = object.ptr();
-                    const MWWorld::Ptr& actorPtr = actor.ptr();
-                    objPtr.getClass().activate(objPtr, actorPtr)->execute(actorPtr);
-                },
-                "_runStandardActivationAction");
-        };
-
-        return LuaUtil::makeReadOnly(api);
-    }
-
     std::map<std::string, sol::object> initCommonPackages(const Context& context)
     {
-        sol::state_view lua = context.mLua->sol();
+        sol::state_view lua = context.mLua->unsafeState();
         MWWorld::DateTimeManager* tm = MWBase::Environment::get().getWorld()->getTimeManager();
         return {
+            { "openmw.animation", initAnimationPackage(context) },
             { "openmw.async",
                 LuaUtil::getAsyncPackageInitializer(
                     lua, [tm] { return tm->getSimulationTime(); }, [tm] { return tm->getGameTime(); }) },
-            { "openmw.core", initCorePackage(context) },
-            { "openmw.types", initTypesPackage(context) },
+            { "openmw.markup", initMarkupPackage(context) },
             { "openmw.util", LuaUtil::initUtilPackage(lua) },
+            { "openmw.vfs", initVFSPackage(context) },
         };
     }
 
@@ -338,6 +47,8 @@ namespace MWLua
         initObjectBindingsForGlobalScripts(context);
         initCellBindingsForGlobalScripts(context);
         return {
+            { "openmw.core", initCorePackage(context) },
+            { "openmw.types", initTypesPackage(context) },
             { "openmw.world", initWorldPackage(context) },
         };
     }
@@ -348,6 +59,8 @@ namespace MWLua
         initCellBindingsForLocalScripts(context);
         LocalScripts::initializeSelfPackage(context);
         return {
+            { "openmw.core", initCorePackage(context) },
+            { "openmw.types", initTypesPackage(context) },
             { "openmw.nearby", initNearbyPackage(context) },
         };
     }
@@ -356,7 +69,7 @@ namespace MWLua
     {
         return {
             { "openmw.ambient", initAmbientPackage(context) },
-            { "openmw.camera", initCameraPackage(context.mLua->sol()) },
+            { "openmw.camera", initCameraPackage(context.sol()) },
             { "openmw.debug", initDebugPackage(context) },
             { "openmw.input", initInputPackage(context) },
             { "openmw.postprocessing", initPostprocessingPackage(context) },
@@ -364,4 +77,14 @@ namespace MWLua
         };
     }
 
+    std::map<std::string, sol::object> initMenuPackages(const Context& context)
+    {
+        return {
+            { "openmw.core", initCorePackage(context) },
+            { "openmw.ambient", initAmbientPackage(context) },
+            { "openmw.ui", initUserInterfacePackage(context) },
+            { "openmw.menu", initMenuPackage(context) },
+            { "openmw.input", initInputPackage(context) },
+        };
+    }
 }
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index e5d481d1eb..749987e5b2 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -12,14 +12,18 @@ namespace MWLua
     // Initialize Lua packages that are available for all scripts.
     std::map<std::string, sol::object> initCommonPackages(const Context&);
 
-    // Initialize Lua packages that are available only for global scripts.
+    // Initialize Lua packages that are available for global scripts (additionally to common packages).
     std::map<std::string, sol::object> initGlobalPackages(const Context&);
 
-    // Initialize Lua packages that are available only for local scripts (including player scripts).
+    // Initialize Lua packages that are available for local scripts (additionally to common packages).
     std::map<std::string, sol::object> initLocalPackages(const Context&);
 
-    // Initialize Lua packages that are available only for local scripts on the player.
+    // Initialize Lua packages that are available only for local scripts on the player (additionally to common and local
+    // packages).
     std::map<std::string, sol::object> initPlayerPackages(const Context&);
+
+    // Initialize Lua packages that are available only for menu scripts (additionally to common packages).
+    std::map<std::string, sol::object> initMenuPackages(const Context&);
 }
 
 #endif // MWLUA_LUABINDINGS_H
diff --git a/apps/openmw/mwlua/luaevents.cpp b/apps/openmw/mwlua/luaevents.cpp
index b036fea3b6..4ffb4fc1cc 100644
--- a/apps/openmw/mwlua/luaevents.cpp
+++ b/apps/openmw/mwlua/luaevents.cpp
@@ -13,6 +13,7 @@
 
 #include "globalscripts.hpp"
 #include "localscripts.hpp"
+#include "menuscripts.hpp"
 
 namespace MWLua
 {
@@ -23,6 +24,7 @@ namespace MWLua
         mLocalEventBatch.clear();
         mNewGlobalEventBatch.clear();
         mNewLocalEventBatch.clear();
+        mMenuEvents.clear();
     }
 
     void LuaEvents::finalizeEventBatch()
@@ -51,8 +53,15 @@ namespace MWLua
         mLocalEventBatch.clear();
     }
 
+    void LuaEvents::callMenuEventHandlers()
+    {
+        for (const Global& e : mMenuEvents)
+            mMenuScripts.receiveEvent(e.mEventName, e.mEventData);
+        mMenuEvents.clear();
+    }
+
     template <typename Event>
-    static void saveEvent(ESM::ESMWriter& esm, const ESM::RefNum& dest, const Event& event)
+    static void saveEvent(ESM::ESMWriter& esm, ESM::RefNum dest, const Event& event)
     {
         esm.writeHNString("LUAE", event.mEventName);
         esm.writeFormId(dest, true);
diff --git a/apps/openmw/mwlua/luaevents.hpp b/apps/openmw/mwlua/luaevents.hpp
index 5eeae46538..3890b45b6d 100644
--- a/apps/openmw/mwlua/luaevents.hpp
+++ b/apps/openmw/mwlua/luaevents.hpp
@@ -23,12 +23,14 @@ namespace MWLua
 {
 
     class GlobalScripts;
+    class MenuScripts;
 
     class LuaEvents
     {
     public:
-        explicit LuaEvents(GlobalScripts& globalScripts)
+        explicit LuaEvents(GlobalScripts& globalScripts, MenuScripts& menuScripts)
             : mGlobalScripts(globalScripts)
+            , mMenuScripts(menuScripts)
         {
         }
 
@@ -45,11 +47,13 @@ namespace MWLua
         };
 
         void addGlobalEvent(Global event) { mNewGlobalEventBatch.push_back(std::move(event)); }
+        void addMenuEvent(Global event) { mMenuEvents.push_back(std::move(event)); }
         void addLocalEvent(Local event) { mNewLocalEventBatch.push_back(std::move(event)); }
 
         void clear();
         void finalizeEventBatch();
         void callEventHandlers();
+        void callMenuEventHandlers();
 
         void load(lua_State* lua, ESM::ESMReader& esm, const std::map<int, int>& contentFileMapping,
             const LuaUtil::UserdataSerializer* serializer);
@@ -57,10 +61,12 @@ namespace MWLua
 
     private:
         GlobalScripts& mGlobalScripts;
+        MenuScripts& mMenuScripts;
         std::vector<Global> mNewGlobalEventBatch;
         std::vector<Local> mNewLocalEventBatch;
         std::vector<Global> mGlobalEventBatch;
         std::vector<Local> mLocalEventBatch;
+        std::vector<Global> mMenuEvents;
     };
 
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 7262d945c5..780ddaf9a9 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -18,14 +18,18 @@
 #include <components/l10n/manager.hpp>
 
 #include <components/lua_ui/content.hpp>
+#include <components/lua_ui/registerscriptsettings.hpp>
 #include <components/lua_ui/util.hpp>
 
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
+#include "../mwrender/bonegroup.hpp"
 #include "../mwrender/postprocessor.hpp"
 
 #include "../mwworld/datetimemanager.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/scene.hpp"
 #include "../mwworld/worldmodel.hpp"
@@ -62,69 +66,96 @@ namespace MWLua
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
     }
 
+    LuaManager::~LuaManager()
+    {
+        LuaUi::clearSettings();
+    }
+
     void LuaManager::initConfiguration()
     {
         mConfiguration.init(MWBase::Environment::get().getESMStore()->getLuaScriptsCfg());
         Log(Debug::Verbose) << "Lua scripts configuration (" << mConfiguration.size() << " scripts):";
         for (size_t i = 0; i < mConfiguration.size(); ++i)
             Log(Debug::Verbose) << "#" << i << " " << LuaUtil::scriptCfgToString(mConfiguration[i]);
+        mMenuScripts.setAutoStartConf(mConfiguration.getMenuConf());
         mGlobalScripts.setAutoStartConf(mConfiguration.getGlobalConf());
     }
 
     void LuaManager::init()
     {
-        Context context;
-        context.mIsGlobal = true;
-        context.mLuaManager = this;
-        context.mLua = &mLua;
-        context.mObjectLists = &mObjectLists;
-        context.mLuaEvents = &mLuaEvents;
-        context.mSerializer = mGlobalSerializer.get();
+        mLua.protectedCall([&](LuaUtil::LuaView& view) {
+            Context globalContext;
+            globalContext.mType = Context::Global;
+            globalContext.mLuaManager = this;
+            globalContext.mLua = &mLua;
+            globalContext.mObjectLists = &mObjectLists;
+            globalContext.mLuaEvents = &mLuaEvents;
+            globalContext.mSerializer = mGlobalSerializer.get();
 
-        Context localContext = context;
-        localContext.mIsGlobal = false;
-        localContext.mSerializer = mLocalSerializer.get();
+            Context localContext = globalContext;
+            localContext.mType = Context::Local;
+            localContext.mSerializer = mLocalSerializer.get();
 
-        for (const auto& [name, package] : initCommonPackages(context))
-            mLua.addCommonPackage(name, package);
-        for (const auto& [name, package] : initGlobalPackages(context))
-            mGlobalScripts.addPackage(name, package);
+            Context menuContext = globalContext;
+            menuContext.mType = Context::Menu;
 
-        mLocalPackages = initLocalPackages(localContext);
-        mPlayerPackages = initPlayerPackages(localContext);
-        mPlayerPackages.insert(mLocalPackages.begin(), mLocalPackages.end());
+            for (const auto& [name, package] : initCommonPackages(globalContext))
+                mLua.addCommonPackage(name, package);
+            for (const auto& [name, package] : initGlobalPackages(globalContext))
+                mGlobalScripts.addPackage(name, package);
+            for (const auto& [name, package] : initMenuPackages(menuContext))
+                mMenuScripts.addPackage(name, package);
 
-        LuaUtil::LuaStorage::initLuaBindings(mLua.sol());
-        mGlobalScripts.addPackage(
-            "openmw.storage", LuaUtil::LuaStorage::initGlobalPackage(mLua.sol(), &mGlobalStorage));
-        mLocalPackages["openmw.storage"] = LuaUtil::LuaStorage::initLocalPackage(mLua.sol(), &mGlobalStorage);
-        mPlayerPackages["openmw.storage"]
-            = LuaUtil::LuaStorage::initPlayerPackage(mLua.sol(), &mGlobalStorage, &mPlayerStorage);
+            mLocalPackages = initLocalPackages(localContext);
 
-        initConfiguration();
-        mInitialized = true;
+            mPlayerPackages = initPlayerPackages(localContext);
+            mPlayerPackages.insert(mLocalPackages.begin(), mLocalPackages.end());
+
+            LuaUtil::LuaStorage::initLuaBindings(view);
+            mGlobalScripts.addPackage("openmw.storage", LuaUtil::LuaStorage::initGlobalPackage(view, &mGlobalStorage));
+            mMenuScripts.addPackage(
+                "openmw.storage", LuaUtil::LuaStorage::initMenuPackage(view, &mGlobalStorage, &mPlayerStorage));
+            mLocalPackages["openmw.storage"] = LuaUtil::LuaStorage::initLocalPackage(view, &mGlobalStorage);
+            mPlayerPackages["openmw.storage"]
+                = LuaUtil::LuaStorage::initPlayerPackage(view, &mGlobalStorage, &mPlayerStorage);
+
+            mPlayerStorage.setActive(true);
+            mGlobalStorage.setActive(false);
+
+            initConfiguration();
+            mInitialized = true;
+            mMenuScripts.addAutoStartedScripts();
+        });
     }
 
     void LuaManager::loadPermanentStorage(const std::filesystem::path& userConfigPath)
     {
+        mPlayerStorage.setActive(true);
+        mGlobalStorage.setActive(true);
         const auto globalPath = userConfigPath / "global_storage.bin";
         const auto playerPath = userConfigPath / "player_storage.bin";
-        if (std::filesystem::exists(globalPath))
-            mGlobalStorage.load(globalPath);
-        if (std::filesystem::exists(playerPath))
-            mPlayerStorage.load(playerPath);
+
+        mLua.protectedCall([&](LuaUtil::LuaView& view) {
+            if (std::filesystem::exists(globalPath))
+                mGlobalStorage.load(view.sol(), globalPath);
+            if (std::filesystem::exists(playerPath))
+                mPlayerStorage.load(view.sol(), playerPath);
+        });
     }
 
     void LuaManager::savePermanentStorage(const std::filesystem::path& userConfigPath)
     {
-        mGlobalStorage.save(userConfigPath / "global_storage.bin");
-        mPlayerStorage.save(userConfigPath / "player_storage.bin");
+        mLua.protectedCall([&](LuaUtil::LuaView& view) {
+            if (mGlobalScriptsStarted)
+                mGlobalStorage.save(view.sol(), userConfigPath / "global_storage.bin");
+            mPlayerStorage.save(view.sol(), userConfigPath / "player_storage.bin");
+        });
     }
 
     void LuaManager::update()
     {
-        if (Settings::lua().mGcStepsPerFrame > 0)
-            lua_gc(mLua.sol(), LUA_GCSTEP, Settings::lua().mGcStepsPerFrame);
+        if (const int steps = Settings::lua().mGcStepsPerFrame; steps > 0)
+            lua_gc(mLua.unsafeState(), LUA_GCSTEP, steps);
 
         if (mPlayer.isEmpty())
             return; // The game is not started yet.
@@ -140,9 +171,12 @@ namespace MWLua
 
         mObjectLists.update();
 
-        std::erase_if(mActiveLocalScripts, [](const LocalScripts* l) {
-            return l->getPtrOrEmpty().isEmpty() || l->getPtrOrEmpty().getRefData().isDeleted();
-        });
+        for (auto scripts : mQueuedAutoStartedScripts)
+            scripts->addAutoStartedScripts();
+        mQueuedAutoStartedScripts.clear();
+
+        std::erase_if(mActiveLocalScripts,
+            [](const LocalScripts* l) { return l->getPtrOrEmpty().isEmpty() || l->getPtrOrEmpty().mRef->isDeleted(); });
 
         mGlobalScripts.statsNextFrame();
         for (LocalScripts* scripts : mActiveLocalScripts)
@@ -153,6 +187,7 @@ namespace MWLua
         MWWorld::DateTimeManager& timeManager = *MWBase::Environment::get().getWorld()->getTimeManager();
         if (!timeManager.isPaused())
         {
+            mMenuScripts.processTimers(timeManager.getSimulationTime(), timeManager.getGameTime());
             mGlobalScripts.processTimers(timeManager.getSimulationTime(), timeManager.getGameTime());
             for (LocalScripts* scripts : mActiveLocalScripts)
                 scripts->processTimers(timeManager.getSimulationTime(), timeManager.getGameTime());
@@ -175,6 +210,8 @@ namespace MWLua
                 scripts->update(frameDuration);
             mGlobalScripts.update(frameDuration);
         }
+
+        mLua.protectedCall([&](LuaUtil::LuaView& lua) { mScriptTracker.unloadInactiveScripts(lua); });
     }
 
     void LuaManager::objectTeleported(const MWWorld::Ptr& ptr)
@@ -204,9 +241,11 @@ namespace MWLua
 
     void LuaManager::synchronizedUpdate()
     {
-        if (mPlayer.isEmpty())
-            return; // The game is not started yet.
+        mLua.protectedCall([&](LuaUtil::LuaView&) { synchronizedUpdateUnsafe(); });
+    }
 
+    void LuaManager::synchronizedUpdateUnsafe()
+    {
         if (mNewGameStarted)
         {
             mNewGameStarted = false;
@@ -217,32 +256,56 @@ namespace MWLua
 
         // We apply input events in `synchronizedUpdate` rather than in `update` in order to reduce input latency.
         mProcessingInputEvents = true;
-        PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
+        PlayerScripts* playerScripts
+            = mPlayer.isEmpty() ? nullptr : dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
         MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
+
+        for (const auto& event : mMenuInputEvents)
+            mMenuScripts.processInputEvent(event);
+        mMenuInputEvents.clear();
         if (playerScripts && !windowManager->containsMode(MWGui::GM_MainMenu))
         {
             for (const auto& event : mInputEvents)
                 playerScripts->processInputEvent(event);
         }
         mInputEvents.clear();
+        mLuaEvents.callMenuEventHandlers();
+        double frameDuration = MWBase::Environment::get().getWorld()->getTimeManager()->isPaused()
+            ? 0.0
+            : MWBase::Environment::get().getFrameDuration();
+        mInputActions.update(frameDuration);
+        mMenuScripts.onFrame(frameDuration);
         if (playerScripts)
-            playerScripts->onFrame(MWBase::Environment::get().getWorld()->getTimeManager()->isPaused()
-                    ? 0.0
-                    : MWBase::Environment::get().getFrameDuration());
+            playerScripts->onFrame(frameDuration);
         mProcessingInputEvents = false;
 
-        for (const std::string& message : mUIMessages)
-            windowManager->messageBox(message);
+        for (const auto& [message, mode] : mUIMessages)
+            windowManager->messageBox(message, mode);
         mUIMessages.clear();
         for (auto& [msg, color] : mInGameConsoleMessages)
             windowManager->printToConsole(msg, "#" + color.toHex());
         mInGameConsoleMessages.clear();
 
         applyDelayedActions();
+
+        if (mReloadAllScriptsRequested)
+        {
+            // Reloading right after `applyDelayedActions` to guarantee that no delayed actions are currently queued.
+            reloadAllScriptsImpl();
+            mReloadAllScriptsRequested = false;
+        }
+
+        if (mDelayedUiModeChangedArg)
+        {
+            if (playerScripts)
+                playerScripts->uiModeChanged(*mDelayedUiModeChangedArg, true);
+            mDelayedUiModeChangedArg = std::nullopt;
+        }
     }
 
     void LuaManager::applyDelayedActions()
     {
+        mApplyingDelayedActions = true;
         for (DelayedAction& action : mActionQueue)
             action.apply();
         mActionQueue.clear();
@@ -250,32 +313,38 @@ namespace MWLua
         if (mTeleportPlayerAction)
             mTeleportPlayerAction->apply();
         mTeleportPlayerAction.reset();
+        mApplyingDelayedActions = false;
     }
 
     void LuaManager::clear()
     {
-        LuaUi::clearUserInterface();
+        LuaUi::clearGameInterface();
         mUiResourceManager.clear();
-        MWBase::Environment::get().getWindowManager()->setConsoleMode("");
         MWBase::Environment::get().getWorld()->getPostProcessor()->disableDynamicShaders();
         mActiveLocalScripts.clear();
         mLuaEvents.clear();
         mEngineEvents.clear();
         mInputEvents.clear();
+        mMenuInputEvents.clear();
         mObjectLists.clear();
         mGlobalScripts.removeAllScripts();
         mGlobalScriptsStarted = false;
         mNewGameStarted = false;
+        mDelayedUiModeChangedArg = std::nullopt;
         if (!mPlayer.isEmpty())
         {
             mPlayer.getCellRef().unsetRefNum();
             mPlayer.getRefData().setLuaScripts(nullptr);
             mPlayer = MWWorld::Ptr();
         }
+        mGlobalStorage.setActive(true);
         mGlobalStorage.clearTemporaryAndRemoveCallbacks();
+        mGlobalStorage.setActive(false);
         mPlayerStorage.clearTemporaryAndRemoveCallbacks();
+        mInputActions.clear();
+        mInputTriggers.clear();
         for (int i = 0; i < 5; ++i)
-            lua_gc(mLua.sol(), LUA_GCCOLLECT, 0);
+            lua_gc(mLua.unsafeState(), LUA_GCCOLLECT, 0);
     }
 
     void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
@@ -291,7 +360,7 @@ namespace MWLua
         if (!localScripts)
         {
             localScripts = createLocalScripts(ptr);
-            localScripts->addAutoStartedScripts();
+            mQueuedAutoStartedScripts.push_back(localScripts);
         }
         mActiveLocalScripts.insert(localScripts);
         mEngineEvents.addToQueue(EngineEvents::OnActive{ getId(ptr) });
@@ -299,6 +368,7 @@ namespace MWLua
 
     void LuaManager::newGameStarted()
     {
+        mGlobalStorage.setActive(true);
         mInputEvents.clear();
         mGlobalScripts.addAutoStartedScripts();
         mGlobalScriptsStarted = true;
@@ -307,18 +377,108 @@ namespace MWLua
 
     void LuaManager::gameLoaded()
     {
+        mGlobalStorage.setActive(true);
         if (!mGlobalScriptsStarted)
             mGlobalScripts.addAutoStartedScripts();
         mGlobalScriptsStarted = true;
+        mMenuScripts.stateChanged();
+    }
+
+    void LuaManager::gameEnded()
+    {
+        // TODO: disable scripts and global storage when the game is actually unloaded
+        // mGlobalStorage.setActive(false);
+        mMenuScripts.stateChanged();
+    }
+
+    void LuaManager::noGame()
+    {
+        clear();
+        mMenuScripts.stateChanged();
     }
 
     void LuaManager::uiModeChanged(const MWWorld::Ptr& arg)
     {
         if (mPlayer.isEmpty())
             return;
+        ObjectId argId = arg.isEmpty() ? ObjectId() : getId(arg);
+        if (mApplyingDelayedActions)
+        {
+            mDelayedUiModeChangedArg = argId;
+            return;
+        }
         PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
         if (playerScripts)
-            playerScripts->uiModeChanged(arg);
+            playerScripts->uiModeChanged(argId, false);
+    }
+
+    void LuaManager::actorDied(const MWWorld::Ptr& actor)
+    {
+        if (actor.isEmpty())
+            return;
+        mLuaEvents.addLocalEvent({ getId(actor), "Died", {} });
+    }
+
+    void LuaManager::useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force)
+    {
+        MWBase::Environment::get().getWorldModel()->registerPtr(object);
+        mEngineEvents.addToQueue(EngineEvents::OnUseItem{ getId(actor), getId(object), force });
+    }
+
+    void LuaManager::animationTextKey(const MWWorld::Ptr& actor, const std::string& key)
+    {
+        auto pos = key.find(": ");
+        if (pos != std::string::npos)
+            mEngineEvents.addToQueue(
+                EngineEvents::OnAnimationTextKey{ getId(actor), key.substr(0, pos), key.substr(pos + 2) });
+    }
+
+    void LuaManager::playAnimation(const MWWorld::Ptr& actor, const std::string& groupname,
+        const MWRender::AnimPriority& priority, int blendMask, bool autodisable, float speedmult,
+        std::string_view start, std::string_view stop, float startpoint, uint32_t loops, bool loopfallback)
+    {
+        mLua.protectedCall([&](LuaUtil::LuaView& view) {
+            sol::table options = view.newTable();
+            options["blendMask"] = blendMask;
+            options["autoDisable"] = autodisable;
+            options["speed"] = speedmult;
+            options["startKey"] = start;
+            options["stopKey"] = stop;
+            options["startPoint"] = startpoint;
+            options["loops"] = loops;
+            options["forceLoop"] = loopfallback;
+
+            bool priorityAsTable = false;
+            for (uint32_t i = 1; i < MWRender::sNumBlendMasks; i++)
+                if (priority[static_cast<MWRender::BoneGroup>(i)] != priority[static_cast<MWRender::BoneGroup>(0)])
+                    priorityAsTable = true;
+            if (priorityAsTable)
+            {
+                sol::table priorityTable = view.newTable();
+                for (uint32_t i = 0; i < MWRender::sNumBlendMasks; i++)
+                    priorityTable[static_cast<MWRender::BoneGroup>(i)] = priority[static_cast<MWRender::BoneGroup>(i)];
+                options["priority"] = priorityTable;
+            }
+            else
+                options["priority"] = priority[MWRender::BoneGroup_LowerBody];
+
+            // mEngineEvents.addToQueue(event);
+            //  Has to be called immediately, otherwise engine details that depend on animations playing immediately
+            //  break.
+            if (auto* scripts = actor.getRefData().getLuaScripts())
+                scripts->onPlayAnimation(groupname, options);
+        });
+    }
+
+    void LuaManager::skillUse(const MWWorld::Ptr& actor, ESM::RefId skillId, int useType, float scale)
+    {
+        mEngineEvents.addToQueue(EngineEvents::OnSkillUse{ getId(actor), skillId.serializeText(), useType, scale });
+    }
+
+    void LuaManager::skillLevelUp(const MWWorld::Ptr& actor, ESM::RefId skillId, std::string_view source)
+    {
+        mEngineEvents.addToQueue(
+            EngineEvents::OnSkillLevelUp{ getId(actor), skillId.serializeText(), std::string(source) });
     }
 
     void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr)
@@ -334,7 +494,7 @@ namespace MWLua
             if (!autoStartConf.empty())
             {
                 localScripts = createLocalScripts(ptr, std::move(autoStartConf));
-                localScripts->addAutoStartedScripts(); // TODO: put to a queue and apply on next `update()`
+                mQueuedAutoStartedScripts.push_back(localScripts);
             }
         }
         if (localScripts)
@@ -360,6 +520,7 @@ namespace MWLua
         {
             mInputEvents.push_back(event);
         }
+        mMenuInputEvents.push_back(event);
     }
 
     MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
@@ -400,7 +561,7 @@ namespace MWLua
         }
         else
         {
-            scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr)));
+            scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr)), &mScriptTracker);
             if (!autoStartConf.has_value())
                 autoStartConf = mConfiguration.getLocalConf(type, ptr.getCellRef().getRefId(), getId(ptr));
             scripts->setAutoStartConf(std::move(*autoStartConf));
@@ -441,9 +602,15 @@ namespace MWLua
             throw std::runtime_error("Last generated RefNum is invalid");
         MWBase::Environment::get().getWorldModel()->setLastGeneratedRefNum(lastGenerated);
 
+        // TODO: don't execute scripts right away, it will be necessary in multiplayer where global storage requires
+        // initialization. For now just set global storage as active slightly before it would be set by gameLoaded()
+        mGlobalStorage.setActive(true);
+
         ESM::LuaScripts globalScripts;
         globalScripts.load(reader);
-        mLuaEvents.load(mLua.sol(), reader, mContentFileMapping, mGlobalLoader.get());
+        mLua.protectedCall([&](LuaUtil::LuaView& view) {
+            mLuaEvents.load(view.sol(), reader, mContentFileMapping, mGlobalLoader.get());
+        });
 
         mGlobalScripts.setSavedDataDeserializer(mGlobalLoader.get());
         mGlobalScripts.load(globalScripts);
@@ -473,42 +640,66 @@ namespace MWLua
         scripts->setSerializer(mLocalSerializer.get());
         scripts->setSavedDataDeserializer(mLocalLoader.get());
         scripts->load(data);
-
-        // LiveCellRef is usually copied after loading, so this Ptr will become invalid and should be deregistered.
-        MWBase::Environment::get().getWorldModel()->deregisterPtr(ptr);
     }
 
-    void LuaManager::reloadAllScripts()
+    void LuaManager::reloadAllScriptsImpl()
     {
         Log(Debug::Info) << "Reload Lua";
 
-        LuaUi::clearUserInterface();
+        LuaUi::clearGameInterface();
+        LuaUi::clearMenuInterface();
+        LuaUi::clearSettings();
         MWBase::Environment::get().getWindowManager()->setConsoleMode("");
         MWBase::Environment::get().getL10nManager()->dropCache();
         mUiResourceManager.clear();
         mLua.dropScriptCache();
+        mInputActions.clear();
+        mInputTriggers.clear();
         initConfiguration();
 
-        { // Reload global scripts
+        ESM::LuaScripts globalData;
+
+        if (mGlobalScriptsStarted)
+        {
             mGlobalScripts.setSavedDataDeserializer(mGlobalSerializer.get());
-            ESM::LuaScripts data;
-            mGlobalScripts.save(data);
+            mGlobalScripts.save(globalData);
             mGlobalStorage.clearTemporaryAndRemoveCallbacks();
-            mGlobalScripts.load(data);
         }
 
+        std::unordered_map<ESM::RefNum, ESM::LuaScripts> localData;
+
         for (const auto& [id, ptr] : MWBase::Environment::get().getWorldModel()->getPtrRegistryView())
-        { // Reload local scripts
+        {
             LocalScripts* scripts = ptr.getRefData().getLuaScripts();
             if (scripts == nullptr)
                 continue;
             scripts->setSavedDataDeserializer(mLocalSerializer.get());
             ESM::LuaScripts data;
             scripts->save(data);
-            scripts->load(data);
+            localData[id] = std::move(data);
         }
+
+        mMenuScripts.removeAllScripts();
+
+        mPlayerStorage.clearTemporaryAndRemoveCallbacks();
+
+        mMenuScripts.addAutoStartedScripts();
+
+        for (const auto& [id, ptr] : MWBase::Environment::get().getWorldModel()->getPtrRegistryView())
+        {
+            LocalScripts* scripts = ptr.getRefData().getLuaScripts();
+            if (scripts == nullptr)
+                continue;
+            scripts->load(localData[id]);
+        }
+
         for (LocalScripts* scripts : mActiveLocalScripts)
             scripts->setActive(true);
+
+        if (mGlobalScriptsStarted)
+        {
+            mGlobalScripts.load(globalData);
+        }
     }
 
     void LuaManager::handleConsoleCommand(
@@ -517,16 +708,18 @@ namespace MWLua
         PlayerScripts* playerScripts = nullptr;
         if (!mPlayer.isEmpty())
             playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
-        if (!playerScripts)
+        bool processed = mMenuScripts.consoleCommand(consoleMode, command);
+        if (playerScripts)
         {
-            MWBase::Environment::get().getWindowManager()->printToConsole(
-                "You must enter a game session to run Lua commands\n", MWBase::WindowManager::sConsoleColor_Error);
-            return;
+            sol::object selected = sol::nil;
+            if (!selectedPtr.isEmpty())
+                mLua.protectedCall([&](LuaUtil::LuaView& view) {
+                    selected = sol::make_object(view.sol(), LObject(getId(selectedPtr)));
+                });
+            if (playerScripts->consoleCommand(consoleMode, command, selected))
+                processed = true;
         }
-        sol::object selected = sol::nil;
-        if (!selectedPtr.isEmpty())
-            selected = sol::make_object(mLua.sol(), LObject(getId(selectedPtr)));
-        if (!playerScripts->consoleCommand(consoleMode, command, selected))
+        if (!processed)
             MWBase::Environment::get().getWindowManager()->printToConsole(
                 "No Lua handlers for console\n", MWBase::WindowManager::sConsoleColor_Error);
     }
@@ -558,6 +751,8 @@ namespace MWLua
 
     void LuaManager::addAction(std::function<void()> action, std::string_view name)
     {
+        if (mApplyingDelayedActions)
+            throw std::runtime_error("DelayedAction is not allowed to create another DelayedAction");
         mActionQueue.emplace_back(&mLua, std::move(action), name);
     }
 
@@ -658,10 +853,11 @@ namespace MWLua
         for (size_t i = 0; i < mConfiguration.size(); ++i)
         {
             bool isGlobal = mConfiguration[i].mFlags & ESM::LuaScriptCfg::sGlobal;
+            bool isMenu = mConfiguration[i].mFlags & ESM::LuaScriptCfg::sMenu;
 
             out << std::left;
-            out << " " << std::setw(nameW) << mConfiguration[i].mScriptPath;
-            if (mConfiguration[i].mScriptPath.size() > nameW)
+            out << " " << std::setw(nameW) << mConfiguration[i].mScriptPath.value();
+            if (mConfiguration[i].mScriptPath.value().size() > nameW)
                 out << "\n " << std::setw(nameW) << ""; // if path is too long, break line
             out << std::right;
             out << std::setw(valueW) << static_cast<int64_t>(activeStats[i].mAvgInstructionCount);
@@ -670,13 +866,12 @@ namespace MWLua
 
             if (isGlobal)
                 out << std::setw(valueW * 2) << "NA (global script)";
+            else if (isMenu && (!selectedScripts || !selectedScripts->hasScript(i)))
+                out << std::setw(valueW * 2) << "NA (menu script)";
             else if (selectedPtr.isEmpty())
                 out << std::setw(valueW * 2) << "NA (not selected) ";
             else if (!selectedScripts || !selectedScripts->hasScript(i))
-            {
-                out << std::setw(valueW) << "-";
-                outMemSize(selectedStats[i].mMemoryUsage);
-            }
+                out << std::setw(valueW * 2) << "NA";
             else
             {
                 out << std::setw(valueW) << static_cast<int64_t>(selectedStats[i].mAvgInstructionCount);
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index d00fda9dda..3f2135e9c9 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -6,17 +6,21 @@
 #include <osg/Stats>
 #include <set>
 
+#include <components/lua/inputactions.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/scripttracker.hpp>
 #include <components/lua/storage.hpp>
 #include <components/lua_ui/resources.hpp>
 #include <components/misc/color.hpp>
 
 #include "../mwbase/luamanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "engineevents.hpp"
 #include "globalscripts.hpp"
 #include "localscripts.hpp"
 #include "luaevents.hpp"
+#include "menuscripts.hpp"
 #include "object.hpp"
 #include "objectlists.hpp"
 
@@ -33,6 +37,7 @@ namespace MWLua
         LuaManager(const VFS::Manager* vfs, const std::filesystem::path& libsDir);
         LuaManager(const LuaManager&) = delete;
         LuaManager(LuaManager&&) = delete;
+        ~LuaManager();
 
         // Called by engine.cpp when the environment is fully initialized.
         void init();
@@ -66,6 +71,8 @@ namespace MWLua
         // LuaManager queues these events and propagates to scripts on the next `update` call.
         void newGameStarted() override;
         void gameLoaded() override;
+        void gameEnded() override;
+        void noGame() override;
         void objectAddedToScene(const MWWorld::Ptr& ptr) override;
         void objectRemovedFromScene(const MWWorld::Ptr& ptr) override;
         void inputEvent(const InputEvent& event) override;
@@ -77,6 +84,14 @@ namespace MWLua
         {
             mEngineEvents.addToQueue(EngineEvents::OnActivate{ getId(actor), getId(object) });
         }
+        void useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force) override;
+        void animationTextKey(const MWWorld::Ptr& actor, const std::string& key) override;
+        void playAnimation(const MWWorld::Ptr& actor, const std::string& groupname,
+            const MWRender::AnimPriority& priority, int blendMask, bool autodisable, float speedmult,
+            std::string_view start, std::string_view stop, float startpoint, uint32_t loops,
+            bool loopfallback) override;
+        void skillUse(const MWWorld::Ptr& actor, ESM::RefId skillId, int useType, float scale) override;
+        void skillLevelUp(const MWWorld::Ptr& actor, ESM::RefId skillId, std::string_view source) override;
         void exteriorCreated(MWWorld::CellStore& cell) override
         {
             mEngineEvents.addToQueue(EngineEvents::OnNewExterior{ cell });
@@ -84,6 +99,7 @@ namespace MWLua
         void objectTeleported(const MWWorld::Ptr& ptr) override;
         void questUpdated(const ESM::RefId& questId, int stage) override;
         void uiModeChanged(const MWWorld::Ptr& arg) override;
+        void actorDied(const MWWorld::Ptr& actor) override;
 
         MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
 
@@ -92,7 +108,11 @@ namespace MWLua
 
         // Used only in Lua bindings
         void addCustomLocalScript(const MWWorld::Ptr&, int scriptId, std::string_view initData);
-        void addUIMessage(std::string_view message) { mUIMessages.emplace_back(message); }
+        void addUIMessage(
+            std::string_view message, MWGui::ShowInDialogueMode mode = MWGui::ShowInDialogueMode_IfPossible)
+        {
+            mUIMessages.emplace_back(message, mode);
+        }
         void addInGameConsoleMessage(const std::string& msg, const Misc::Color& color)
         {
             mInGameConsoleMessages.push_back({ msg, color });
@@ -112,8 +132,9 @@ namespace MWLua
         void loadLocalScripts(const MWWorld::Ptr& ptr, const ESM::LuaScripts& data) override;
         void setContentFileMapping(const std::map<int, int>& mapping) override { mContentFileMapping = mapping; }
 
-        // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
-        void reloadAllScripts() override;
+        // At the end of the next `synchronizedUpdate` drops script cache and reloads all scripts.
+        // Calls `onSave` and `onLoad` for every script.
+        void reloadAllScripts() override { mReloadAllScriptsRequested = true; }
 
         void handleConsoleCommand(
             const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr) override;
@@ -130,8 +151,9 @@ namespace MWLua
         template <class Arg>
         std::function<void(Arg)> wrapLuaCallback(const LuaUtil::Callback& c)
         {
-            return
-                [this, c](Arg arg) { this->queueCallback(c, sol::main_object(this->mLua.sol(), sol::in_place, arg)); };
+            return [this, c](Arg arg) {
+                this->queueCallback(c, sol::main_object(this->mLua.unsafeState(), sol::in_place, arg));
+            };
         }
 
         LuaUi::ResourceManager* uiResourceManager() { return &mUiResourceManager; }
@@ -141,30 +163,40 @@ namespace MWLua
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
         std::string formatResourceUsageStats() const override;
 
+        LuaUtil::InputAction::Registry& inputActions() { return mInputActions; }
+        LuaUtil::InputTrigger::Registry& inputTriggers() { return mInputTriggers; }
+
     private:
         void initConfiguration();
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr,
             std::optional<LuaUtil::ScriptIdsWithInitializationData> autoStartConf = std::nullopt);
+        void reloadAllScriptsImpl();
+        void synchronizedUpdateUnsafe();
 
         bool mInitialized = false;
         bool mGlobalScriptsStarted = false;
         bool mProcessingInputEvents = false;
+        bool mApplyingDelayedActions = false;
         bool mNewGameStarted = false;
+        bool mReloadAllScriptsRequested = false;
         LuaUtil::ScriptsConfiguration mConfiguration;
         LuaUtil::LuaState mLua;
         LuaUi::ResourceManager mUiResourceManager;
         std::map<std::string, sol::object> mLocalPackages;
         std::map<std::string, sol::object> mPlayerPackages;
 
+        MenuScripts mMenuScripts{ &mLua };
         GlobalScripts mGlobalScripts{ &mLua };
         std::set<LocalScripts*> mActiveLocalScripts;
+        std::vector<LocalScripts*> mQueuedAutoStartedScripts;
         ObjectLists mObjectLists;
 
         MWWorld::Ptr mPlayer;
 
-        LuaEvents mLuaEvents{ mGlobalScripts };
+        LuaEvents mLuaEvents{ mGlobalScripts, mMenuScripts };
         EngineEvents mEngineEvents{ mGlobalScripts };
         std::vector<MWBase::LuaManager::InputEvent> mInputEvents;
+        std::vector<MWBase::LuaManager::InputEvent> mMenuInputEvents;
 
         std::unique_ptr<LuaUtil::UserdataSerializer> mGlobalSerializer;
         std::unique_ptr<LuaUtil::UserdataSerializer> mLocalSerializer;
@@ -194,11 +226,17 @@ namespace MWLua
         };
         std::vector<DelayedAction> mActionQueue;
         std::optional<DelayedAction> mTeleportPlayerAction;
-        std::vector<std::string> mUIMessages;
+        std::vector<std::pair<std::string, MWGui::ShowInDialogueMode>> mUIMessages;
         std::vector<std::pair<std::string, Misc::Color>> mInGameConsoleMessages;
+        std::optional<ObjectId> mDelayedUiModeChangedArg;
 
-        LuaUtil::LuaStorage mGlobalStorage{ mLua.sol() };
-        LuaUtil::LuaStorage mPlayerStorage{ mLua.sol() };
+        LuaUtil::LuaStorage mGlobalStorage;
+        LuaUtil::LuaStorage mPlayerStorage;
+
+        LuaUtil::InputAction::Registry mInputActions;
+        LuaUtil::InputTrigger::Registry mInputTriggers;
+
+        LuaUtil::ScriptTracker mScriptTracker;
     };
 
 }
diff --git a/apps/openmw/mwlua/magicbindings.cpp b/apps/openmw/mwlua/magicbindings.cpp
index d1dab50574..7259d03f4c 100644
--- a/apps/openmw/mwlua/magicbindings.cpp
+++ b/apps/openmw/mwlua/magicbindings.cpp
@@ -11,25 +11,30 @@
 #include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadweap.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/color.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/strings/format.hpp>
 #include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwmechanics/activespells.hpp"
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/magiceffects.hpp"
 #include "../mwmechanics/spellutil.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/worldmodel.hpp"
 
 #include "localscripts.hpp"
 #include "luamanagerimp.hpp"
 #include "object.hpp"
 #include "objectvariant.hpp"
+#include "recordstore.hpp"
 
 namespace MWLua
 {
@@ -134,16 +139,12 @@ namespace MWLua
 
 namespace sol
 {
-    template <typename T>
-    struct is_automagical<typename MWWorld::Store<T>> : std::false_type
-    {
-    };
     template <>
     struct is_automagical<ESM::Spell> : std::false_type
     {
     };
     template <>
-    struct is_automagical<ESM::ENAMstruct> : std::false_type
+    struct is_automagical<ESM::IndexedENAMstruct> : std::false_type
     {
     };
     template <>
@@ -191,43 +192,58 @@ namespace MWLua
             return ESM::RefId::deserializeText(LuaUtil::cast<std::string_view>(recordOrId));
     }
 
+    static const ESM::Spell* toSpell(const sol::object& spellOrId)
+    {
+        if (spellOrId.is<ESM::Spell>())
+            return spellOrId.as<const ESM::Spell*>();
+        else
+        {
+            auto& store = MWBase::Environment::get().getWorld()->getStore();
+            auto refId = ESM::RefId::deserializeText(LuaUtil::cast<std::string_view>(spellOrId));
+            return store.get<ESM::Spell>().find(refId);
+        }
+    }
+
+    static sol::table effectParamsListToTable(lua_State* lua, const std::vector<ESM::IndexedENAMstruct>& effects)
+    {
+        sol::table res(lua, sol::create);
+        for (size_t i = 0; i < effects.size(); ++i)
+            res[LuaUtil::toLuaIndex(i)] = effects[i]; // ESM::IndexedENAMstruct (effect params)
+        return res;
+    }
+
     sol::table initCoreMagicBindings(const Context& context)
     {
-        sol::state_view& lua = context.mLua->sol();
+        sol::state_view lua = context.sol();
         sol::table magicApi(lua, sol::create);
 
         // Constants
-        magicApi["RANGE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, ESM::RangeType>({
-            { "Self", ESM::RT_Self },
-            { "Touch", ESM::RT_Touch },
-            { "Target", ESM::RT_Target },
-        }));
-        magicApi["SCHOOL"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            { "Alteration", 0 },
-            { "Conjuration", 1 },
-            { "Destruction", 2 },
-            { "Illusion", 3 },
-            { "Mysticism", 4 },
-            { "Restoration", 5 },
-        }));
+        magicApi["RANGE"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, ESM::RangeType>(lua,
+            {
+                { "Self", ESM::RT_Self },
+                { "Touch", ESM::RT_Touch },
+                { "Target", ESM::RT_Target },
+            }));
         magicApi["SPELL_TYPE"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, ESM::Spell::SpellType>({
-                { "Spell", ESM::Spell::ST_Spell },
-                { "Ability", ESM::Spell::ST_Ability },
-                { "Blight", ESM::Spell::ST_Blight },
-                { "Disease", ESM::Spell::ST_Disease },
-                { "Curse", ESM::Spell::ST_Curse },
-                { "Power", ESM::Spell::ST_Power },
-            }));
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, ESM::Spell::SpellType>(lua,
+                {
+                    { "Spell", ESM::Spell::ST_Spell },
+                    { "Ability", ESM::Spell::ST_Ability },
+                    { "Blight", ESM::Spell::ST_Blight },
+                    { "Disease", ESM::Spell::ST_Disease },
+                    { "Curse", ESM::Spell::ST_Curse },
+                    { "Power", ESM::Spell::ST_Power },
+                }));
         magicApi["ENCHANTMENT_TYPE"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, ESM::Enchantment::Type>({
-                { "CastOnce", ESM::Enchantment::Type::CastOnce },
-                { "CastOnStrike", ESM::Enchantment::Type::WhenStrikes },
-                { "CastOnUse", ESM::Enchantment::Type::WhenUsed },
-                { "ConstantEffect", ESM::Enchantment::Type::ConstantEffect },
-            }));
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, ESM::Enchantment::Type>(lua,
+                {
+                    { "CastOnce", ESM::Enchantment::Type::CastOnce },
+                    { "CastOnStrike", ESM::Enchantment::Type::WhenStrikes },
+                    { "CastOnUse", ESM::Enchantment::Type::WhenUsed },
+                    { "ConstantEffect", ESM::Enchantment::Type::ConstantEffect },
+                }));
 
-        sol::table effect(context.mLua->sol(), sol::create);
+        sol::table effect(lua, sol::create);
         magicApi["EFFECT_TYPE"] = LuaUtil::makeStrictReadOnly(effect);
         for (const auto& name : ESM::MagicEffect::sIndexNames)
         {
@@ -235,42 +251,18 @@ namespace MWLua
         }
 
         // Spell store
-        using SpellStore = MWWorld::Store<ESM::Spell>;
-        const SpellStore* spellStore = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>();
-        sol::usertype<SpellStore> spellStoreT = lua.new_usertype<SpellStore>("ESM3_SpellStore");
-        spellStoreT[sol::meta_function::to_string]
-            = [](const SpellStore& store) { return "ESM3_SpellStore{" + std::to_string(store.getSize()) + " spells}"; };
-        spellStoreT[sol::meta_function::length] = [](const SpellStore& store) { return store.getSize(); };
-        spellStoreT[sol::meta_function::index] = sol::overload(
-            [](const SpellStore& store, size_t index) -> const ESM::Spell* { return store.at(index - 1); },
-            [](const SpellStore& store, std::string_view spellId) -> const ESM::Spell* {
-                return store.find(ESM::RefId::deserializeText(spellId));
-            });
-        spellStoreT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
-        spellStoreT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
-
-        magicApi["spells"] = spellStore;
+        sol::table spells(lua, sol::create);
+        addRecordFunctionBinding<ESM::Spell>(spells, context);
+        magicApi["spells"] = LuaUtil::makeReadOnly(spells);
 
         // Enchantment store
-        using EnchantmentStore = MWWorld::Store<ESM::Enchantment>;
-        const EnchantmentStore* enchantmentStore
-            = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>();
-        sol::usertype<EnchantmentStore> enchantmentStoreT = lua.new_usertype<EnchantmentStore>("ESM3_EnchantmentStore");
-        enchantmentStoreT[sol::meta_function::to_string] = [](const EnchantmentStore& store) {
-            return "ESM3_EnchantmentStore{" + std::to_string(store.getSize()) + " enchantments}";
-        };
-        enchantmentStoreT[sol::meta_function::length] = [](const EnchantmentStore& store) { return store.getSize(); };
-        enchantmentStoreT[sol::meta_function::index] = sol::overload(
-            [](const EnchantmentStore& store, size_t index) -> const ESM::Enchantment* { return store.at(index - 1); },
-            [](const EnchantmentStore& store, std::string_view enchantmentId) -> const ESM::Enchantment* {
-                return store.find(ESM::RefId::deserializeText(enchantmentId));
-            });
-        enchantmentStoreT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
-        enchantmentStoreT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
-
-        magicApi["enchantments"] = enchantmentStore;
+        sol::table enchantments(lua, sol::create);
+        addRecordFunctionBinding<ESM::Enchantment>(enchantments, context);
+        magicApi["enchantments"] = LuaUtil::makeReadOnly(enchantments);
 
         // MagicEffect store
+        sol::table magicEffects(lua, sol::create);
+        magicApi["effects"] = LuaUtil::makeReadOnly(magicEffects);
         using MagicEffectStore = MWWorld::Store<ESM::MagicEffect>;
         const MagicEffectStore* magicEffectStore
             = &MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>();
@@ -279,10 +271,10 @@ namespace MWLua
             return "ESM3_MagicEffectStore{" + std::to_string(store.getSize()) + " effects}";
         };
         magicEffectStoreT[sol::meta_function::index] = sol::overload(
-            [](const MagicEffectStore& store, int id) -> const ESM::MagicEffect* { return store.find(id); },
+            [](const MagicEffectStore& store, int id) -> const ESM::MagicEffect* { return store.search(id); },
             [](const MagicEffectStore& store, std::string_view id) -> const ESM::MagicEffect* {
                 int index = ESM::MagicEffect::indexNameToIndex(id);
-                return store.find(index);
+                return store.search(index);
             });
         auto magicEffectsIter = [magicEffectStore](sol::this_state lua, const sol::object& /*store*/,
                                     sol::optional<int> id) -> std::tuple<sol::object, sol::object> {
@@ -302,8 +294,10 @@ namespace MWLua
         };
         magicEffectStoreT[sol::meta_function::pairs]
             = [iter = sol::make_object(lua, magicEffectsIter)] { return iter; };
+        magicEffectStoreT[sol::meta_function::ipairs]
+            = [iter = sol::make_object(lua, magicEffectsIter)] { return iter; };
 
-        magicApi["effects"] = magicEffectStore;
+        magicEffects["records"] = magicEffectStore;
 
         // Spell record
         auto spellT = lua.new_usertype<ESM::Spell>("ESM3_Spell");
@@ -313,11 +307,14 @@ namespace MWLua
         spellT["name"] = sol::readonly_property([](const ESM::Spell& rec) -> std::string_view { return rec.mName; });
         spellT["type"] = sol::readonly_property([](const ESM::Spell& rec) -> int { return rec.mData.mType; });
         spellT["cost"] = sol::readonly_property([](const ESM::Spell& rec) -> int { return rec.mData.mCost; });
-        spellT["effects"] = sol::readonly_property([&lua](const ESM::Spell& rec) -> sol::table {
-            sol::table res(lua, sol::create);
-            for (size_t i = 0; i < rec.mEffects.mList.size(); ++i)
-                res[i + 1] = rec.mEffects.mList[i]; // ESM::ENAMstruct (effect params)
-            return res;
+        spellT["alwaysSucceedFlag"] = sol::readonly_property(
+            [](const ESM::Spell& rec) -> bool { return !!(rec.mData.mFlags & ESM::Spell::F_Always); });
+        spellT["starterSpellFlag"] = sol::readonly_property(
+            [](const ESM::Spell& rec) -> bool { return !!(rec.mData.mFlags & ESM::Spell::F_PCStart); });
+        spellT["autocalcFlag"] = sol::readonly_property(
+            [](const ESM::Spell& rec) -> bool { return !!(rec.mData.mFlags & ESM::Spell::F_Autocalc); });
+        spellT["effects"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Spell& rec) -> sol::table {
+            return effectParamsListToTable(lua, rec.mEffects.mList);
         });
 
         // Enchantment record
@@ -332,50 +329,54 @@ namespace MWLua
         enchantT["cost"] = sol::readonly_property([](const ESM::Enchantment& rec) -> int { return rec.mData.mCost; });
         enchantT["charge"]
             = sol::readonly_property([](const ESM::Enchantment& rec) -> int { return rec.mData.mCharge; });
-        enchantT["effects"] = sol::readonly_property([&lua](const ESM::Enchantment& rec) -> sol::table {
-            sol::table res(lua, sol::create);
-            for (size_t i = 0; i < rec.mEffects.mList.size(); ++i)
-                res[i + 1] = rec.mEffects.mList[i]; // ESM::ENAMstruct (effect params)
-            return res;
-        });
+        enchantT["effects"]
+            = sol::readonly_property([lua = lua.lua_state()](const ESM::Enchantment& rec) -> sol::table {
+                  return effectParamsListToTable(lua, rec.mEffects.mList);
+              });
 
         // Effect params
-        auto effectParamsT = lua.new_usertype<ESM::ENAMstruct>("ESM3_EffectParams");
-        effectParamsT[sol::meta_function::to_string] = [magicEffectStore](const ESM::ENAMstruct& params) {
-            const ESM::MagicEffect* const rec = magicEffectStore->find(params.mEffectID);
+        auto effectParamsT = lua.new_usertype<ESM::IndexedENAMstruct>("ESM3_EffectParams");
+        effectParamsT[sol::meta_function::to_string] = [magicEffectStore](const ESM::IndexedENAMstruct& params) {
+            const ESM::MagicEffect* const rec = magicEffectStore->find(params.mData.mEffectID);
             return "ESM3_EffectParams[" + ESM::MagicEffect::indexToGmstString(rec->mIndex) + "]";
         };
-        effectParamsT["effect"]
-            = sol::readonly_property([magicEffectStore](const ESM::ENAMstruct& params) -> const ESM::MagicEffect* {
-                  return magicEffectStore->find(params.mEffectID);
-              });
+        effectParamsT["effect"] = sol::readonly_property(
+            [magicEffectStore](const ESM::IndexedENAMstruct& params) -> const ESM::MagicEffect* {
+                return magicEffectStore->find(params.mData.mEffectID);
+            });
+        effectParamsT["id"] = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> std::string {
+            auto name = ESM::MagicEffect::indexToName(params.mData.mEffectID);
+            return Misc::StringUtils::lowerCase(name);
+        });
         effectParamsT["affectedSkill"]
-            = sol::readonly_property([](const ESM::ENAMstruct& params) -> sol::optional<std::string> {
-                  ESM::RefId id = ESM::Skill::indexToRefId(params.mSkill);
+            = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> sol::optional<std::string> {
+                  ESM::RefId id = ESM::Skill::indexToRefId(params.mData.mSkill);
                   if (!id.empty())
                       return id.serializeText();
                   return sol::nullopt;
               });
         effectParamsT["affectedAttribute"]
-            = sol::readonly_property([](const ESM::ENAMstruct& params) -> sol::optional<std::string> {
-                  ESM::RefId id = ESM::Attribute::indexToRefId(params.mAttribute);
+            = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> sol::optional<std::string> {
+                  ESM::RefId id = ESM::Attribute::indexToRefId(params.mData.mAttribute);
                   if (!id.empty())
                       return id.serializeText();
                   return sol::nullopt;
               });
         effectParamsT["range"]
-            = sol::readonly_property([](const ESM::ENAMstruct& params) -> int { return params.mRange; });
+            = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> int { return params.mData.mRange; });
         effectParamsT["area"]
-            = sol::readonly_property([](const ESM::ENAMstruct& params) -> int { return params.mArea; });
+            = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> int { return params.mData.mArea; });
         effectParamsT["magnitudeMin"]
-            = sol::readonly_property([](const ESM::ENAMstruct& params) -> int { return params.mMagnMin; });
+            = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> int { return params.mData.mMagnMin; });
         effectParamsT["magnitudeMax"]
-            = sol::readonly_property([](const ESM::ENAMstruct& params) -> int { return params.mMagnMax; });
-        effectParamsT["duration"]
-            = sol::readonly_property([](const ESM::ENAMstruct& params) -> int { return params.mDuration; });
+            = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> int { return params.mData.mMagnMax; });
+        effectParamsT["duration"] = sol::readonly_property(
+            [](const ESM::IndexedENAMstruct& params) -> int { return params.mData.mDuration; });
+        effectParamsT["index"]
+            = sol::readonly_property([](const ESM::IndexedENAMstruct& params) -> int { return params.mIndex; });
 
         // MagicEffect record
-        auto magicEffectT = context.mLua->sol().new_usertype<ESM::MagicEffect>("ESM3_MagicEffect");
+        auto magicEffectT = lua.new_usertype<ESM::MagicEffect>("ESM3_MagicEffect");
 
         magicEffectT[sol::meta_function::to_string] = [](const ESM::MagicEffect& rec) {
             return "ESM3_MagicEffect[" + ESM::MagicEffect::indexToGmstString(rec.mIndex) + "]";
@@ -388,6 +389,27 @@ namespace MWLua
             auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
+        magicEffectT["particle"]
+            = sol::readonly_property([](const ESM::MagicEffect& rec) -> std::string_view { return rec.mParticle; });
+        magicEffectT["continuousVfx"] = sol::readonly_property([](const ESM::MagicEffect& rec) -> bool {
+            return (rec.mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
+        });
+        magicEffectT["areaSound"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mAreaSound.serializeText(); });
+        magicEffectT["boltSound"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mBoltSound.serializeText(); });
+        magicEffectT["castSound"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mCastSound.serializeText(); });
+        magicEffectT["hitSound"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mHitSound.serializeText(); });
+        magicEffectT["areaStatic"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mArea.serializeText(); });
+        magicEffectT["bolt"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mBolt.serializeText(); });
+        magicEffectT["castStatic"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mCasting.serializeText(); });
+        magicEffectT["hitStatic"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mHit.serializeText(); });
         magicEffectT["name"] = sol::readonly_property([](const ESM::MagicEffect& rec) -> std::string_view {
             return MWBase::Environment::get()
                 .getWorld()
@@ -397,20 +419,32 @@ namespace MWLua
                 ->mValue.getString();
         });
         magicEffectT["school"] = sol::readonly_property(
-            [](const ESM::MagicEffect& rec) -> int { return ESM::MagicSchool::skillRefIdToIndex(rec.mData.mSchool); });
+            [](const ESM::MagicEffect& rec) -> std::string { return rec.mData.mSchool.serializeText(); });
         magicEffectT["baseCost"]
             = sol::readonly_property([](const ESM::MagicEffect& rec) -> float { return rec.mData.mBaseCost; });
         magicEffectT["color"] = sol::readonly_property([](const ESM::MagicEffect& rec) -> Misc::Color {
             return Misc::Color(rec.mData.mRed / 255.f, rec.mData.mGreen / 255.f, rec.mData.mBlue / 255.f, 1.f);
         });
+        magicEffectT["hasDuration"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> bool { return !(rec.mData.mFlags & ESM::MagicEffect::NoDuration); });
+        magicEffectT["hasMagnitude"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> bool { return !(rec.mData.mFlags & ESM::MagicEffect::NoMagnitude); });
+        // TODO: Not self-explanatory. Needs either a better name or documentation. The description in
+        // loadmgef.hpp is uninformative.
+        magicEffectT["isAppliedOnce"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> bool { return rec.mData.mFlags & ESM::MagicEffect::AppliedOnce; });
         magicEffectT["harmful"] = sol::readonly_property(
             [](const ESM::MagicEffect& rec) -> bool { return rec.mData.mFlags & ESM::MagicEffect::Harmful; });
+        magicEffectT["casterLinked"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> bool { return rec.mData.mFlags & ESM::MagicEffect::CasterLinked; });
+        magicEffectT["nonRecastable"] = sol::readonly_property(
+            [](const ESM::MagicEffect& rec) -> bool { return rec.mData.mFlags & ESM::MagicEffect::NonRecastable; });
 
         // TODO: Should we expose it? What happens if a spell has several effects with different projectileSpeed?
         // magicEffectT["projectileSpeed"]
         //     = sol::readonly_property([](const ESM::MagicEffect& rec) -> float { return rec.mData.mSpeed; });
 
-        auto activeSpellEffectT = context.mLua->sol().new_usertype<ESM::ActiveEffect>("ActiveSpellEffect");
+        auto activeSpellEffectT = lua.new_usertype<ESM::ActiveEffect>("ActiveSpellEffect");
         activeSpellEffectT[sol::meta_function::to_string] = [](const ESM::ActiveEffect& effect) {
             return "ActiveSpellEffect[" + ESM::MagicEffect::indexToGmstString(effect.mEffectId) + "]";
         };
@@ -418,6 +452,8 @@ namespace MWLua
             auto name = ESM::MagicEffect::indexToName(effect.mEffectId);
             return Misc::StringUtils::lowerCase(name);
         });
+        activeSpellEffectT["index"]
+            = sol::readonly_property([](const ESM::ActiveEffect& effect) -> int { return effect.mEffectIndex; });
         activeSpellEffectT["name"] = sol::readonly_property([](const ESM::ActiveEffect& effect) -> std::string {
             return MWMechanics::EffectKey(effect.mEffectId, effect.getSkillOrAttribute()).toString();
         });
@@ -479,52 +515,71 @@ namespace MWLua
                   return effect.mDuration;
               });
 
-        auto activeSpellT = context.mLua->sol().new_usertype<ActiveSpell>("ActiveSpellParams");
+        auto activeSpellT = lua.new_usertype<ActiveSpell>("ActiveSpellParams");
         activeSpellT[sol::meta_function::to_string] = [](const ActiveSpell& activeSpell) {
-            return "ActiveSpellParams[" + activeSpell.mParams.getId().serializeText() + "]";
+            return "ActiveSpellParams[" + activeSpell.mParams.getSourceSpellId().serializeText() + "]";
         };
         activeSpellT["name"] = sol::readonly_property(
             [](const ActiveSpell& activeSpell) -> std::string_view { return activeSpell.mParams.getDisplayName(); });
-        activeSpellT["id"] = sol::readonly_property(
-            [](const ActiveSpell& activeSpell) -> std::string { return activeSpell.mParams.getId().serializeText(); });
-        activeSpellT["item"] = sol::readonly_property([&lua](const ActiveSpell& activeSpell) -> sol::object {
-            auto item = activeSpell.mParams.getItem();
-            if (!item.isSet())
-                return sol::nil;
-            auto itemPtr = MWBase::Environment::get().getWorldModel()->getPtr(item);
-            if (itemPtr.isEmpty())
-                return sol::nil;
-            if (activeSpell.mActor.isGObject())
-                return sol::make_object(lua, GObject(itemPtr));
-            else
-                return sol::make_object(lua, LObject(itemPtr));
+        activeSpellT["id"] = sol::readonly_property([](const ActiveSpell& activeSpell) -> std::string {
+            return activeSpell.mParams.getSourceSpellId().serializeText();
         });
-        activeSpellT["caster"] = sol::readonly_property([&lua](const ActiveSpell& activeSpell) -> sol::object {
-            auto caster
-                = MWBase::Environment::get().getWorld()->searchPtrViaActorId(activeSpell.mParams.getCasterActorId());
-            if (caster.isEmpty())
-                return sol::nil;
-            else
-            {
-                if (activeSpell.mActor.isGObject())
-                    return sol::make_object(lua, GObject(getId(caster)));
-                else
-                    return sol::make_object(lua, LObject(getId(caster)));
-            }
+        activeSpellT["item"]
+            = sol::readonly_property([lua = lua.lua_state()](const ActiveSpell& activeSpell) -> sol::object {
+                  auto item = activeSpell.mParams.getItem();
+                  if (!item.isSet())
+                      return sol::nil;
+                  auto itemPtr = MWBase::Environment::get().getWorldModel()->getPtr(item);
+                  if (itemPtr.isEmpty())
+                      return sol::nil;
+                  if (activeSpell.mActor.isGObject())
+                      return sol::make_object(lua, GObject(itemPtr));
+                  else
+                      return sol::make_object(lua, LObject(itemPtr));
+              });
+        activeSpellT["caster"]
+            = sol::readonly_property([lua = lua.lua_state()](const ActiveSpell& activeSpell) -> sol::object {
+                  auto caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(
+                      activeSpell.mParams.getCasterActorId());
+                  if (caster.isEmpty())
+                      return sol::nil;
+                  else
+                  {
+                      if (activeSpell.mActor.isGObject())
+                          return sol::make_object(lua, GObject(getId(caster)));
+                      else
+                          return sol::make_object(lua, LObject(getId(caster)));
+                  }
+              });
+        activeSpellT["effects"]
+            = sol::readonly_property([lua = lua.lua_state()](const ActiveSpell& activeSpell) -> sol::table {
+                  sol::table res(lua, sol::create);
+                  size_t tableIndex = 0;
+                  for (const ESM::ActiveEffect& effect : activeSpell.mParams.getEffects())
+                  {
+                      if (!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
+                          continue;
+                      res[++tableIndex] = effect; // ESM::ActiveEffect (effect params)
+                  }
+                  return res;
+              });
+        activeSpellT["fromEquipment"] = sol::readonly_property([](const ActiveSpell& activeSpell) -> bool {
+            return activeSpell.mParams.hasFlag(ESM::ActiveSpells::Flag_Equipment);
         });
-        activeSpellT["effects"] = sol::readonly_property([&lua](const ActiveSpell& activeSpell) -> sol::table {
-            sol::table res(lua, sol::create);
-            size_t tableIndex = 0;
-            for (const ESM::ActiveEffect& effect : activeSpell.mParams.getEffects())
-            {
-                if (!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
-                    continue;
-                res[++tableIndex] = effect; // ESM::ActiveEffect (effect params)
-            }
-            return res;
+        activeSpellT["temporary"] = sol::readonly_property([](const ActiveSpell& activeSpell) -> bool {
+            return activeSpell.mParams.hasFlag(ESM::ActiveSpells::Flag_Temporary);
+        });
+        activeSpellT["affectsBaseValues"] = sol::readonly_property([](const ActiveSpell& activeSpell) -> bool {
+            return activeSpell.mParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues);
+        });
+        activeSpellT["stackable"] = sol::readonly_property([](const ActiveSpell& activeSpell) -> bool {
+            return activeSpell.mParams.hasFlag(ESM::ActiveSpells::Flag_Stackable);
+        });
+        activeSpellT["activeSpellId"] = sol::readonly_property([](const ActiveSpell& activeSpell) -> std::string {
+            return activeSpell.mParams.getActiveSpellId().serializeText();
         });
 
-        auto activeEffectT = context.mLua->sol().new_usertype<ActiveEffect>("ActiveEffect");
+        auto activeEffectT = lua.new_usertype<ActiveEffect>("ActiveEffect");
 
         activeEffectT[sol::meta_function::to_string] = [](const ActiveEffect& effect) {
             return "ActiveEffect[" + ESM::MagicEffect::indexToGmstString(effect.key.mId) + "]";
@@ -561,25 +616,98 @@ namespace MWLua
         return LuaUtil::makeReadOnly(magicApi);
     }
 
+    static std::pair<std::string_view, std::vector<ESM::IndexedENAMstruct>> getNameAndMagicEffects(
+        const MWWorld::Ptr& actor, ESM::RefId id, const sol::table& effects, bool quiet)
+    {
+        std::vector<int32_t> effectIndexes;
+
+        for (const auto& entry : effects)
+        {
+            if (entry.second.is<int32_t>())
+                effectIndexes.push_back(entry.second.as<int32_t>());
+            else if (entry.second.is<ESM::IndexedENAMstruct>())
+                throw std::runtime_error("Error: Adding effects as enam structs is not implemented, use indexes.");
+            else
+                throw std::runtime_error("Unexpected entry in 'effects' table while trying to add to active effects");
+        }
+
+        const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore();
+
+        auto getEffectsFromIndexes = [&](const ESM::EffectList& effects) {
+            std::vector<ESM::IndexedENAMstruct> enams;
+            for (auto index : effectIndexes)
+                enams.push_back(effects.mList.at(index));
+            return enams;
+        };
+
+        auto getNameAndEffects = [&](auto* record) {
+            return std::pair<std::string_view, std::vector<ESM::IndexedENAMstruct>>(
+                record->mName, getEffectsFromIndexes(record->mEffects));
+        };
+        auto getNameAndEffectsEnch = [&](auto* record) {
+            auto* enchantment = esmStore.get<ESM::Enchantment>().find(record->mEnchant);
+            return std::pair<std::string_view, std::vector<ESM::IndexedENAMstruct>>(
+                record->mName, getEffectsFromIndexes(enchantment->mEffects));
+        };
+        switch (esmStore.find(id))
+        {
+            case ESM::REC_ALCH:
+                return getNameAndEffects(esmStore.get<ESM::Potion>().find(id));
+            case ESM::REC_INGR:
+            {
+                // Ingredients are a special case as their effect list is calculated on consumption.
+                const ESM::Ingredient* ingredient = esmStore.get<ESM::Ingredient>().find(id);
+                std::vector<ESM::IndexedENAMstruct> enams;
+                quiet = quiet || actor != MWMechanics::getPlayer();
+                for (uint32_t i = 0; i < effectIndexes.size(); i++)
+                {
+                    if (auto effect = MWMechanics::rollIngredientEffect(actor, ingredient, effectIndexes[i]))
+                        enams.push_back(effect->mList[0]);
+                }
+                if (enams.empty() && !quiet)
+                {
+                    // "X has no effect on you"
+                    std::string message = esmStore.get<ESM::GameSetting>().find("sNotifyMessage50")->mValue.getString();
+                    message = Misc::StringUtils::format(message, ingredient->mName);
+                    MWBase::Environment::get().getWindowManager()->messageBox(message);
+                }
+                return { ingredient->mName, std::move(enams) };
+            }
+            case ESM::REC_ARMO:
+                return getNameAndEffectsEnch(esmStore.get<ESM::Armor>().find(id));
+            case ESM::REC_BOOK:
+                return getNameAndEffectsEnch(esmStore.get<ESM::Book>().find(id));
+            case ESM::REC_CLOT:
+                return getNameAndEffectsEnch(esmStore.get<ESM::Clothing>().find(id));
+            case ESM::REC_WEAP:
+                return getNameAndEffectsEnch(esmStore.get<ESM::Weapon>().find(id));
+            default:
+                // esmStore.find doesn't find REC_SPELs
+            case ESM::REC_SPEL:
+                return getNameAndEffects(esmStore.get<ESM::Spell>().find(id));
+        }
+    }
+
     void addActorMagicBindings(sol::table& actor, const Context& context)
     {
+        auto lua = context.sol();
         const MWWorld::Store<ESM::Spell>* spellStore
             = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>();
 
         // types.Actor.spells(o)
         actor["spells"] = [](const sol::object& actor) { return ActorSpells{ actor }; };
-        auto spellsT = context.mLua->sol().new_usertype<ActorSpells>("ActorSpells");
+        auto spellsT = lua.new_usertype<ActorSpells>("ActorSpells");
         spellsT[sol::meta_function::to_string]
             = [](const ActorSpells& spells) { return "ActorSpells[" + spells.mActor.object().toString() + "]"; };
 
         actor["activeSpells"] = [](const sol::object& actor) { return ActorActiveSpells{ actor }; };
-        auto activeSpellsT = context.mLua->sol().new_usertype<ActorActiveSpells>("ActorActiveSpells");
+        auto activeSpellsT = lua.new_usertype<ActorActiveSpells>("ActorActiveSpells");
         activeSpellsT[sol::meta_function::to_string] = [](const ActorActiveSpells& spells) {
             return "ActorActiveSpells[" + spells.mActor.object().toString() + "]";
         };
 
         actor["activeEffects"] = [](const sol::object& actor) { return ActorActiveEffects{ actor }; };
-        auto activeEffectsT = context.mLua->sol().new_usertype<ActorActiveEffects>("ActorActiveEffects");
+        auto activeEffectsT = lua.new_usertype<ActorActiveEffects>("ActorActiveEffects");
         activeEffectsT[sol::meta_function::to_string] = [](const ActorActiveEffects& effects) {
             return "ActorActiveEffects[" + effects.mActor.object().toString() + "]";
         };
@@ -615,17 +743,55 @@ namespace MWLua
             context.mLuaManager->addAction([obj = Object(ptr), spellId]() {
                 const MWWorld::Ptr& ptr = obj.ptr();
                 auto& stats = ptr.getClass().getCreatureStats(ptr);
+
+                // We need to deselect any enchant items before we can select a spell otherwise the item will be
+                // reselected
+                const auto resetEnchantItem = [&]() {
+                    if (ptr.getClass().hasInventoryStore(ptr))
+                    {
+                        MWWorld::InventoryStore& inventory = ptr.getClass().getInventoryStore(ptr);
+                        inventory.setSelectedEnchantItem(inventory.end());
+                    }
+                };
+
+                if (spellId.empty())
+                {
+                    resetEnchantItem();
+                    if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                        MWBase::Environment::get().getWindowManager()->unsetSelectedSpell();
+                    else
+                        stats.getSpells().setSelectedSpell(ESM::RefId());
+                    return;
+                }
                 if (!stats.getSpells().hasSpell(spellId))
                     throw std::runtime_error("Actor doesn't know spell " + spellId.toDebugString());
+
+                resetEnchantItem();
                 if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
                 {
-                    int chance = 0;
-                    if (!spellId.empty())
-                        chance = MWMechanics::getSpellSuccessChance(spellId, ptr);
+                    int chance = MWMechanics::getSpellSuccessChance(spellId, ptr);
                     MWBase::Environment::get().getWindowManager()->setSelectedSpell(spellId, chance);
                 }
                 else
-                    ptr.getClass().getCreatureStats(ptr).getSpells().setSelectedSpell(spellId);
+                    stats.getSpells().setSelectedSpell(spellId);
+            });
+        };
+
+        actor["clearSelectedCastable"] = [context](const SelfObject& o) {
+            if (!o.ptr().getClass().isActor())
+                throw std::runtime_error("Actor expected");
+            context.mLuaManager->addAction([obj = Object(o.ptr())]() {
+                const MWWorld::Ptr& ptr = obj.ptr();
+                auto& stats = ptr.getClass().getCreatureStats(ptr);
+                if (ptr.getClass().hasInventoryStore(ptr))
+                {
+                    MWWorld::InventoryStore& inventory = ptr.getClass().getInventoryStore(ptr);
+                    inventory.setSelectedEnchantItem(inventory.end());
+                }
+                if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                    MWBase::Environment::get().getWindowManager()->unsetSelectedSpell();
+                else
+                    stats.getSpells().setSelectedSpell(ESM::RefId());
             });
         };
 
@@ -638,36 +804,36 @@ namespace MWLua
 
         // types.Actor.spells(o)[i]
         spellsT[sol::meta_function::index] = sol::overload(
-            [](const ActorSpells& spells, size_t index) -> sol::optional<const ESM::Spell*> {
+            [](const ActorSpells& spells, size_t index) -> const ESM::Spell* {
                 if (auto* store = spells.getStore())
-                    if (index <= store->count())
-                        return store->at(index - 1);
-                return sol::nullopt;
+                    if (index <= store->count() && index > 0)
+                        return store->at(LuaUtil::fromLuaIndex(index));
+                return nullptr;
             },
-            [spellStore](const ActorSpells& spells, std::string_view spellId) -> sol::optional<const ESM::Spell*> {
+            [spellStore](const ActorSpells& spells, std::string_view spellId) -> const ESM::Spell* {
                 if (auto* store = spells.getStore())
                 {
-                    const ESM::Spell* spell = spellStore->find(ESM::RefId::deserializeText(spellId));
-                    if (store->hasSpell(spell))
+                    const ESM::Spell* spell = spellStore->search(ESM::RefId::deserializeText(spellId));
+                    if (spell && store->hasSpell(spell))
                         return spell;
                 }
-                return sol::nullopt;
+                return nullptr;
             });
 
         // pairs(types.Actor.spells(o))
-        spellsT[sol::meta_function::pairs] = context.mLua->sol()["ipairsForArray"].template get<sol::function>();
+        spellsT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
 
         // ipairs(types.Actor.spells(o))
-        spellsT[sol::meta_function::ipairs] = context.mLua->sol()["ipairsForArray"].template get<sol::function>();
+        spellsT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
 
         // types.Actor.spells(o):add(id)
         spellsT["add"] = [context](const ActorSpells& spells, const sol::object& spellOrId) {
             if (spells.mActor.isLObject())
                 throw std::runtime_error("Local scripts can modify only spells of the actor they are attached to.");
-            context.mLuaManager->addAction([obj = spells.mActor.object(), id = toSpellId(spellOrId)]() {
+            context.mLuaManager->addAction([obj = spells.mActor.object(), spell = toSpell(spellOrId)]() {
                 const MWWorld::Ptr& ptr = obj.ptr();
                 if (ptr.getClass().isActor())
-                    ptr.getClass().getCreatureStats(ptr).getSpells().add(id);
+                    ptr.getClass().getCreatureStats(ptr).getSpells().add(spell, false);
             });
         };
 
@@ -675,10 +841,10 @@ namespace MWLua
         spellsT["remove"] = [context](const ActorSpells& spells, const sol::object& spellOrId) {
             if (spells.mActor.isLObject())
                 throw std::runtime_error("Local scripts can modify only spells of the actor they are attached to.");
-            context.mLuaManager->addAction([obj = spells.mActor.object(), id = toSpellId(spellOrId)]() {
+            context.mLuaManager->addAction([obj = spells.mActor.object(), spell = toSpell(spellOrId)]() {
                 const MWWorld::Ptr& ptr = obj.ptr();
                 if (ptr.getClass().isActor())
-                    ptr.getClass().getCreatureStats(ptr).getSpells().remove(id);
+                    ptr.getClass().getCreatureStats(ptr).getSpells().remove(spell, false);
             });
         };
 
@@ -693,6 +859,16 @@ namespace MWLua
             });
         };
 
+        // types.Actor.spells(o):canUsePower()
+        spellsT["canUsePower"] = [](const ActorSpells& spells, const sol::object& spellOrId) -> bool {
+            if (spells.mActor.isLObject())
+                throw std::runtime_error("Local scripts can modify only spells of the actor they are attached to.");
+            auto* spell = toSpell(spellOrId);
+            if (auto* store = spells.getStore())
+                return store->canUsePower(spell);
+            return false;
+        };
+
         // pairs(types.Actor.activeSpells(o))
         activeSpellsT["__pairs"] = [](sol::this_state ts, ActorActiveSpells& self) {
             sol::state_view lua(ts);
@@ -700,10 +876,10 @@ namespace MWLua
             return sol::as_function([lua, self]() mutable -> std::pair<sol::object, sol::object> {
                 if (!self.isEnd())
                 {
-                    auto id = sol::make_object(lua, self.mIterator->getId().serializeText());
+                    auto id = sol::make_object(lua, self.mIterator->getSourceSpellId().serializeText());
                     auto params = sol::make_object(lua, ActiveSpell{ self.mActor, *self.mIterator });
                     self.advance();
-                    return { params, params };
+                    return { id, params };
                 }
                 else
                 {
@@ -724,14 +900,97 @@ namespace MWLua
         };
 
         // types.Actor.activeSpells(o):remove(id)
-        activeSpellsT["remove"] = [](const ActorActiveSpells& spells, const sol::object& spellOrId) {
+        activeSpellsT["remove"] = [context](const ActorActiveSpells& spells, std::string_view idStr) {
+            if (spells.isLObject())
+                throw std::runtime_error("Local scripts can modify effect only on the actor they are attached to.");
+
+            context.mLuaManager->addAction([spells = spells, id = ESM::RefId::deserializeText(idStr)]() {
+                if (auto* store = spells.getStore())
+                {
+                    auto it = store->getActiveSpellById(id);
+                    if (it != store->end())
+                    {
+                        if (it->hasFlag(ESM::ActiveSpells::Flag_Temporary))
+                            store->removeEffectsByActiveSpellId(spells.mActor.ptr(), id);
+                        else
+                            throw std::runtime_error("Can only remove temporary effects.");
+                    }
+                }
+            });
+        };
+
+        // types.Actor.activeSpells(o):add(id, spellid, effects, options)
+        activeSpellsT["add"] = [](const ActorActiveSpells& spells, const sol::table& options) {
             if (spells.isLObject())
                 throw std::runtime_error("Local scripts can modify effect only on the actor they are attached to.");
 
-            auto id = toSpellId(spellOrId);
             if (auto* store = spells.getStore())
             {
-                store->removeEffects(spells.mActor.ptr(), id);
+                ESM::RefId id = ESM::RefId::deserializeText(options.get<std::string_view>("id"));
+                sol::optional<Object> item = options.get<sol::optional<Object>>("item");
+                ESM::RefNum itemId;
+                if (item)
+                    itemId = item->id();
+                sol::optional<Object> caster = options.get<sol::optional<Object>>("caster");
+                bool stackable = options.get_or("stackable", false);
+                bool ignoreReflect = options.get_or("ignoreReflect", false);
+                bool ignoreSpellAbsorption = options.get_or("ignoreSpellAbsorption", false);
+                bool ignoreResistances = options.get_or("ignoreResistances", false);
+                sol::table effects = options.get<sol::table>("effects");
+                bool quiet = options.get_or("quiet", false);
+                if (effects.empty())
+                    throw std::runtime_error("Error:  Parameter 'effects': cannot be an empty list/table");
+                const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore();
+                auto [name, enams] = getNameAndMagicEffects(spells.mActor.ptr(), id, effects, quiet);
+                name = options.get_or<std::string_view>("name", name);
+
+                MWWorld::Ptr casterPtr;
+                if (caster)
+                    casterPtr = caster->ptrOrEmpty();
+
+                bool affectsHealth = false;
+                MWMechanics::ActiveSpells::ActiveSpellParams params(casterPtr, id, name, itemId);
+                params.setFlag(ESM::ActiveSpells::Flag_Lua);
+                params.setFlag(ESM::ActiveSpells::Flag_Temporary);
+                if (stackable)
+                    params.setFlag(ESM::ActiveSpells::Flag_Stackable);
+
+                for (const ESM::IndexedENAMstruct& enam : enams)
+                {
+                    const ESM::MagicEffect* mgef = esmStore.get<ESM::MagicEffect>().find(enam.mData.mEffectID);
+                    MWMechanics::ActiveSpells::ActiveEffect effect;
+                    effect.mEffectId = enam.mData.mEffectID;
+                    effect.mArg = MWMechanics::EffectKey(enam.mData).mArg;
+                    effect.mMagnitude = 0.f;
+                    effect.mMinMagnitude = enam.mData.mMagnMin;
+                    effect.mMaxMagnitude = enam.mData.mMagnMax;
+                    effect.mEffectIndex = enam.mIndex;
+                    effect.mFlags = ESM::ActiveEffect::Flag_None;
+                    if (ignoreReflect)
+                        effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Reflect;
+                    if (ignoreSpellAbsorption)
+                        effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
+                    if (ignoreResistances)
+                        effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Resistances;
+
+                    bool hasDuration = !(mgef->mData.mFlags & ESM::MagicEffect::NoDuration);
+                    effect.mDuration = hasDuration ? static_cast<float>(enam.mData.mDuration) : 1.f;
+
+                    bool appliedOnce = mgef->mData.mFlags & ESM::MagicEffect::AppliedOnce;
+                    if (!appliedOnce)
+                        effect.mDuration = std::max(1.f, effect.mDuration);
+                    effect.mTimeLeft = effect.mDuration;
+                    params.getEffects().emplace_back(effect);
+
+                    affectsHealth = affectsHealth || mgef->mData.mFlags & ESM::MagicEffect::Harmful
+                        || effect.mEffectId == ESM::MagicEffect::RestoreHealth;
+                }
+                store->addSpell(params);
+                if (affectsHealth && casterPtr == MWMechanics::getPlayer())
+                    // If player is attempting to cast a harmful spell on or is healing a living target, show the
+                    // target's HP bar.
+                    // TODO: This should be moved to Lua once the HUD has been dehardcoded
+                    MWBase::Environment::get().getWindowManager()->setEnemy(spells.mActor.ptr());
             }
         };
 
@@ -742,8 +1001,13 @@ namespace MWLua
             sol::state_view lua(ts);
             self.reset();
             return sol::as_function([lua, self]() mutable -> std::pair<sol::object, sol::object> {
-                if (!self.isEnd())
+                while (!self.isEnd())
                 {
+                    if (self.mIterator->second.getBase() == 0 && self.mIterator->second.getModifier() == 0.f)
+                    {
+                        self.advance();
+                        continue;
+                    }
                     ActiveEffect effect = ActiveEffect{ self.mIterator->first, self.mIterator->second };
                     auto result = sol::make_object(lua, effect);
 
@@ -751,10 +1015,7 @@ namespace MWLua
                     self.advance();
                     return { key, result };
                 }
-                else
-                {
-                    return { sol::lua_nil, sol::lua_nil };
-                }
+                return { sol::lua_nil, sol::lua_nil };
             });
         };
 
@@ -796,7 +1057,7 @@ namespace MWLua
             if (auto* store = effects.getStore())
                 if (auto effect = store->get(key))
                     return ActiveEffect{ key, effect.value() };
-            return sol::nullopt;
+            return ActiveEffect{ key, MWMechanics::EffectParam() };
         };
 
         // types.Actor.activeEffects(o):removeEffect(id, ?arg)
@@ -812,13 +1073,10 @@ namespace MWLua
 
             // Note that, although this is member method of ActorActiveEffects and we are removing an effect (not a
             // spell), we still need to use the active spells store to purge this effect from active spells.
-            auto ptr = effects.mActor.ptr();
+            const auto& ptr = effects.mActor.ptr();
 
             auto& activeSpells = ptr.getClass().getCreatureStats(ptr).getActiveSpells();
             activeSpells.purgeEffect(ptr, key.mId, key.mArg);
-
-            // Now remove any leftover effects that have been added by script/console.
-            effects.getStore()->remove(key);
         };
 
         // types.Actor.activeEffects(o):set(value, id, ?arg)
diff --git a/apps/openmw/mwlua/markupbindings.cpp b/apps/openmw/mwlua/markupbindings.cpp
new file mode 100644
index 0000000000..9a3142cc3b
--- /dev/null
+++ b/apps/openmw/mwlua/markupbindings.cpp
@@ -0,0 +1,31 @@
+#include "markupbindings.hpp"
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/yamlloader.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/vfs/manager.hpp>
+#include <components/vfs/pathutil.hpp>
+
+#include "../mwbase/environment.hpp"
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initMarkupPackage(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table api(lua, sol::create);
+
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
+        api["loadYaml"] = [lua, vfs](std::string_view fileName) {
+            Files::IStreamPtr file = vfs->get(VFS::Path::Normalized(fileName));
+            return LuaUtil::loadYaml(*file, lua);
+        };
+        api["decodeYaml"]
+            = [lua](std::string_view inputData) { return LuaUtil::loadYaml(std::string(inputData), lua); };
+
+        return LuaUtil::makeReadOnly(api);
+    }
+}
diff --git a/apps/openmw/mwlua/markupbindings.hpp b/apps/openmw/mwlua/markupbindings.hpp
new file mode 100644
index 0000000000..9105ab5edf
--- /dev/null
+++ b/apps/openmw/mwlua/markupbindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_MARKUPBINDINGS_H
+#define MWLUA_MARKUPBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initMarkupPackage(const Context&);
+}
+
+#endif // MWLUA_MARKUPBINDINGS_H
diff --git a/apps/openmw/mwlua/menuscripts.cpp b/apps/openmw/mwlua/menuscripts.cpp
new file mode 100644
index 0000000000..32520c0822
--- /dev/null
+++ b/apps/openmw/mwlua/menuscripts.cpp
@@ -0,0 +1,126 @@
+#include "menuscripts.hpp"
+
+#include <components/lua/util.hpp>
+#include <components/misc/strings/lower.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/statemanager.hpp"
+#include "../mwstate/character.hpp"
+
+namespace MWLua
+{
+    static const MWState::Character* findCharacter(std::string_view characterDir)
+    {
+        MWBase::StateManager* manager = MWBase::Environment::get().getStateManager();
+        for (auto it = manager->characterBegin(); it != manager->characterEnd(); ++it)
+            if (it->getPath().filename() == characterDir)
+                return &*it;
+        return nullptr;
+    }
+
+    static const MWState::Slot* findSlot(const MWState::Character* character, std::string_view slotName)
+    {
+        if (!character)
+            return nullptr;
+        for (const MWState::Slot& slot : *character)
+            if (slot.mPath.filename() == slotName)
+                return &slot;
+        return nullptr;
+    }
+
+    sol::table initMenuPackage(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table api(lua, sol::create);
+
+        api["STATE"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWBase::StateManager::State>(lua,
+                {
+                    { "NoGame", MWBase::StateManager::State_NoGame },
+                    { "Running", MWBase::StateManager::State_Running },
+                    { "Ended", MWBase::StateManager::State_Ended },
+                }));
+
+        api["getState"] = []() -> int { return MWBase::Environment::get().getStateManager()->getState(); };
+
+        api["newGame"] = []() { MWBase::Environment::get().getStateManager()->requestNewGame(); };
+
+        api["loadGame"] = [](std::string_view dir, std::string_view slotName) {
+            const MWState::Character* character = findCharacter(dir);
+            const MWState::Slot* slot = findSlot(character, slotName);
+            if (!slot)
+                throw std::runtime_error("Save game slot not found: " + std::string(dir) + "/" + std::string(slotName));
+            MWBase::Environment::get().getStateManager()->requestLoad(slot->mPath);
+        };
+
+        api["deleteGame"] = [](std::string_view dir, std::string_view slotName) {
+            const MWState::Character* character = findCharacter(dir);
+            const MWState::Slot* slot = findSlot(character, slotName);
+            if (!slot)
+                throw std::runtime_error("Save game slot not found: " + std::string(dir) + "/" + std::string(slotName));
+            MWBase::Environment::get().getStateManager()->deleteGame(character, slot);
+        };
+
+        api["getCurrentSaveDir"] = []() -> sol::optional<std::string> {
+            MWBase::StateManager* manager = MWBase::Environment::get().getStateManager();
+            const MWState::Character* character = manager->getCurrentCharacter();
+            if (character)
+                return character->getPath().filename().string();
+            else
+                return sol::nullopt;
+        };
+
+        api["saveGame"] = [](std::string_view description, sol::optional<std::string_view> slotName) {
+            MWBase::StateManager* manager = MWBase::Environment::get().getStateManager();
+            const MWState::Character* character = manager->getCurrentCharacter();
+            const MWState::Slot* slot = nullptr;
+            if (slotName)
+                slot = findSlot(character, *slotName);
+            manager->saveGame(description, slot);
+        };
+
+        auto getSaves = [](sol::state_view lua, const MWState::Character& character) {
+            sol::table saves(lua, sol::create);
+            for (const MWState::Slot& slot : character)
+            {
+                sol::table slotInfo(lua, sol::create);
+                slotInfo["description"] = slot.mProfile.mDescription;
+                slotInfo["playerName"] = slot.mProfile.mPlayerName;
+                slotInfo["playerLevel"] = slot.mProfile.mPlayerLevel;
+                slotInfo["timePlayed"] = slot.mProfile.mTimePlayed;
+                sol::table contentFiles(lua, sol::create);
+                for (size_t i = 0; i < slot.mProfile.mContentFiles.size(); ++i)
+                    contentFiles[LuaUtil::toLuaIndex(i)] = Misc::StringUtils::lowerCase(slot.mProfile.mContentFiles[i]);
+
+                {
+                    auto system_time = std::chrono::system_clock::now()
+                        - (std::filesystem::file_time_type::clock::now() - slot.mTimeStamp);
+                    slotInfo["creationTime"] = std::chrono::duration<double>(system_time.time_since_epoch()).count();
+                }
+
+                slotInfo["contentFiles"] = contentFiles;
+                saves[slot.mPath.filename().string()] = slotInfo;
+            }
+            return saves;
+        };
+
+        api["getSaves"] = [getSaves](sol::this_state lua, std::string_view dir) -> sol::table {
+            const MWState::Character* character = findCharacter(dir);
+            if (!character)
+                throw std::runtime_error("Saves not found: " + std::string(dir));
+            return getSaves(lua, *character);
+        };
+
+        api["getAllSaves"] = [getSaves](sol::this_state lua) -> sol::table {
+            sol::table saves(lua, sol::create);
+            MWBase::StateManager* manager = MWBase::Environment::get().getStateManager();
+            for (auto it = manager->characterBegin(); it != manager->characterEnd(); ++it)
+                saves[it->getPath().filename().string()] = getSaves(lua, *it);
+            return saves;
+        };
+
+        api["quit"] = []() { MWBase::Environment::get().getStateManager()->requestQuit(); };
+
+        return LuaUtil::makeReadOnly(api);
+    }
+}
diff --git a/apps/openmw/mwlua/menuscripts.hpp b/apps/openmw/mwlua/menuscripts.hpp
new file mode 100644
index 0000000000..8721224413
--- /dev/null
+++ b/apps/openmw/mwlua/menuscripts.hpp
@@ -0,0 +1,57 @@
+#ifndef MWLUA_MENUSCRIPTS_H
+#define MWLUA_MENUSCRIPTS_H
+
+#include <SDL_events.h>
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/scriptscontainer.hpp>
+#include <components/sdlutil/events.hpp>
+
+#include "../mwbase/luamanager.hpp"
+
+#include "context.hpp"
+#include "inputprocessor.hpp"
+
+namespace MWLua
+{
+
+    sol::table initMenuPackage(const Context& context);
+
+    class MenuScripts : public LuaUtil::ScriptsContainer
+    {
+    public:
+        MenuScripts(LuaUtil::LuaState* lua)
+            : LuaUtil::ScriptsContainer(lua, "Menu")
+            , mInputProcessor(this)
+        {
+            registerEngineHandlers({ &mOnFrameHandlers, &mStateChanged, &mConsoleCommandHandlers, &mUiModeChanged });
+        }
+
+        void processInputEvent(const MWBase::LuaManager::InputEvent& event)
+        {
+            mInputProcessor.processInputEvent(event);
+        }
+
+        void onFrame(float dt) { callEngineHandlers(mOnFrameHandlers, dt); }
+
+        void stateChanged() { callEngineHandlers(mStateChanged); }
+
+        bool consoleCommand(const std::string& consoleMode, const std::string& command)
+        {
+            callEngineHandlers(mConsoleCommandHandlers, consoleMode, command);
+            return !mConsoleCommandHandlers.mList.empty();
+        }
+
+        void uiModeChanged() { callEngineHandlers(mUiModeChanged); }
+
+    private:
+        friend class MWLua::InputProcessor<MenuScripts>;
+        MWLua::InputProcessor<MenuScripts> mInputProcessor;
+        EngineHandlerList mOnFrameHandlers{ "onFrame" };
+        EngineHandlerList mStateChanged{ "onStateChanged" };
+        EngineHandlerList mConsoleCommandHandlers{ "onConsoleCommand" };
+        EngineHandlerList mUiModeChanged{ "_onUiModeChanged" };
+    };
+}
+
+#endif // MWLUA_GLOBALSCRIPTS_H
diff --git a/apps/openmw/mwlua/mwscriptbindings.cpp b/apps/openmw/mwlua/mwscriptbindings.cpp
index dbe02a9fed..90d24b39fe 100644
--- a/apps/openmw/mwlua/mwscriptbindings.cpp
+++ b/apps/openmw/mwlua/mwscriptbindings.cpp
@@ -1,12 +1,16 @@
 #include "mwscriptbindings.hpp"
 
+#include <components/compiler/locals.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/strings/lower.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwscript/globalscripts.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/worldimp.hpp"
 
 #include "object.hpp"
 
@@ -26,6 +30,16 @@ namespace MWLua
             else
                 return MWBase::Environment::get().getScriptManager()->getGlobalScripts().getLocals(mId);
         }
+        bool isRunning() const
+        {
+            if (mObj.has_value()) // local script
+            {
+                MWWorld::LocalScripts& localScripts = MWBase::Environment::get().getWorld()->getLocalScripts();
+                return localScripts.isRunning(mId, mObj->ptr());
+            }
+
+            return MWBase::Environment::get().getScriptManager()->getGlobalScripts().isRunning(mId);
+        }
     };
     struct MWScriptVariables
     {
@@ -43,14 +57,46 @@ namespace sol
     struct is_automagical<MWLua::MWScriptVariables> : std::false_type
     {
     };
+    template <>
+    struct is_automagical<ESM::Global> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
 
+    float getGlobalVariableValue(const std::string_view globalId)
+    {
+        char varType = MWBase::Environment::get().getWorld()->getGlobalVariableType(globalId);
+        if (varType == 'f')
+        {
+            return MWBase::Environment::get().getWorld()->getGlobalFloat(globalId);
+        }
+        else if (varType == 's' || varType == 'l')
+        {
+            return static_cast<float>(MWBase::Environment::get().getWorld()->getGlobalInt(globalId));
+        }
+        return 0;
+    }
+
+    void setGlobalVariableValue(const std::string_view globalId, float value)
+    {
+        char varType = MWBase::Environment::get().getWorld()->getGlobalVariableType(globalId);
+        if (varType == 'f')
+        {
+            MWBase::Environment::get().getWorld()->setGlobalFloat(globalId, value);
+        }
+        else if (varType == 's' || varType == 'l')
+        {
+            MWBase::Environment::get().getWorld()->setGlobalInt(globalId, value);
+        }
+    }
+
     sol::table initMWScriptBindings(const Context& context)
     {
-        sol::table api(context.mLua->sol(), sol::create);
+        sol::state_view lua = context.sol();
+        sol::table api(lua, sol::create);
 
         api["getGlobalScript"]
             = [](std::string_view recordId, sol::optional<GObject> player) -> sol::optional<MWScriptRef> {
@@ -76,11 +122,11 @@ namespace MWLua
         // api["getGlobalScripts"] = [](std::string_view recordId) -> list of scripts
         // api["getLocalScripts"] = [](const GObject& obj) -> list of scripts
 
-        sol::usertype<MWScriptRef> mwscript = context.mLua->sol().new_usertype<MWScriptRef>("MWScript");
-        sol::usertype<MWScriptVariables> mwscriptVars
-            = context.mLua->sol().new_usertype<MWScriptVariables>("MWScriptVariables");
+        sol::usertype<MWScriptRef> mwscript = lua.new_usertype<MWScriptRef>("MWScript");
+        sol::usertype<MWScriptVariables> mwscriptVars = lua.new_usertype<MWScriptVariables>("MWScriptVariables");
         mwscript[sol::meta_function::to_string]
             = [](const MWScriptRef& s) { return std::string("MWScript{") + s.mId.toDebugString() + "}"; };
+        mwscript["isRunning"] = sol::readonly_property([](const MWScriptRef& s) { return s.isRunning(); });
         mwscript["recordId"] = sol::readonly_property([](const MWScriptRef& s) { return s.mId.serializeText(); });
         mwscript["variables"] = sol::readonly_property([](const MWScriptRef& s) { return MWScriptVariables{ s }; });
         mwscript["object"] = sol::readonly_property([](const MWScriptRef& s) -> sol::optional<GObject> {
@@ -98,17 +144,140 @@ namespace MWLua
         });
         mwscript["player"] = sol::readonly_property(
             [](const MWScriptRef&) { return GObject(MWBase::Environment::get().getWorld()->getPlayerPtr()); });
-        mwscriptVars[sol::meta_function::index] = [](MWScriptVariables& s, std::string_view var) {
-            return s.mRef.getLocals().getVarAsDouble(s.mRef.mId, Misc::StringUtils::lowerCase(var));
-        };
-        mwscriptVars[sol::meta_function::new_index] = [](MWScriptVariables& s, std::string_view var, double val) {
-            MWScript::Locals& locals = s.mRef.getLocals();
-            if (!locals.setVar(s.mRef.mId, Misc::StringUtils::lowerCase(var), val))
-                throw std::runtime_error(
-                    "No variable \"" + std::string(var) + "\" in mwscript " + s.mRef.mId.toDebugString());
+        mwscriptVars[sol::meta_function::length]
+            = [](MWScriptVariables& s) { return s.mRef.getLocals().getSize(s.mRef.mId); };
+        mwscriptVars[sol::meta_function::index] = sol::overload(
+            [](MWScriptVariables& s, std::string_view var) -> sol::optional<double> {
+                if (s.mRef.getLocals().hasVar(s.mRef.mId, var))
+                    return s.mRef.getLocals().getVarAsDouble(s.mRef.mId, Misc::StringUtils::lowerCase(var));
+                else
+                    return sol::nullopt;
+            },
+            [](MWScriptVariables& s, std::size_t index) -> sol::optional<double> {
+                auto& locals = s.mRef.getLocals();
+                if (index < 1 || locals.getSize(s.mRef.mId) < index)
+                    return sol::nullopt;
+                if (index <= locals.mShorts.size())
+                    return locals.mShorts[index - 1];
+                index -= locals.mShorts.size();
+                if (index <= locals.mLongs.size())
+                    return locals.mLongs[index - 1];
+                index -= locals.mLongs.size();
+                if (index <= locals.mFloats.size())
+                    return locals.mFloats[index - 1];
+                return sol::nullopt;
+            });
+        mwscriptVars[sol::meta_function::new_index] = sol::overload(
+            [](MWScriptVariables& s, std::string_view var, double val) {
+                MWScript::Locals& locals = s.mRef.getLocals();
+                if (!locals.setVar(s.mRef.mId, Misc::StringUtils::lowerCase(var), val))
+                    throw std::runtime_error(
+                        "No variable \"" + std::string(var) + "\" in mwscript " + s.mRef.mId.toDebugString());
+            },
+            [](MWScriptVariables& s, std::size_t index, double val) {
+                auto& locals = s.mRef.getLocals();
+                if (index < 1 || locals.getSize(s.mRef.mId) < index)
+                    throw std::runtime_error("Index out of range in mwscript " + s.mRef.mId.toDebugString());
+                if (index <= locals.mShorts.size())
+                {
+                    locals.mShorts[index - 1] = static_cast<Interpreter::Type_Short>(val);
+                    return;
+                }
+                index -= locals.mShorts.size();
+                if (index <= locals.mLongs.size())
+                {
+                    locals.mLongs[index - 1] = static_cast<Interpreter::Type_Integer>(val);
+                    return;
+                }
+                index -= locals.mLongs.size();
+                if (index <= locals.mFloats.size())
+                    locals.mFloats[index - 1] = static_cast<Interpreter::Type_Float>(val);
+            });
+        mwscriptVars[sol::meta_function::pairs] = [](MWScriptVariables& s) {
+            std::size_t index = 0;
+            const auto& compilerLocals = MWBase::Environment::get().getScriptManager()->getLocals(s.mRef.mId);
+            auto& locals = s.mRef.getLocals();
+            std::size_t size = locals.getSize(s.mRef.mId);
+            return sol::as_function(
+                [&, index, size](sol::this_state ts) mutable -> sol::optional<std::tuple<std::string_view, double>> {
+                    if (index >= size)
+                        return sol::nullopt;
+                    auto i = index++;
+                    if (i < locals.mShorts.size())
+                        return std::make_tuple<std::string_view, double>(compilerLocals.get('s')[i], locals.mShorts[i]);
+                    i -= locals.mShorts.size();
+                    if (i < locals.mLongs.size())
+                        return std::make_tuple<std::string_view, double>(compilerLocals.get('l')[i], locals.mLongs[i]);
+                    i -= locals.mLongs.size();
+                    if (i < locals.mFloats.size())
+                        return std::make_tuple<std::string_view, double>(compilerLocals.get('f')[i], locals.mFloats[i]);
+                    return sol::nullopt;
+                });
         };
 
+        using GlobalStore = MWWorld::Store<ESM::Global>;
+        sol::usertype<GlobalStore> globalStoreT = lua.new_usertype<GlobalStore>("ESM3_GlobalStore");
+        const GlobalStore* globalStore = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Global>();
+        globalStoreT[sol::meta_function::to_string] = [](const GlobalStore& store) {
+            return "ESM3_GlobalStore{" + std::to_string(store.getSize()) + " globals}";
+        };
+        globalStoreT[sol::meta_function::length] = [](const GlobalStore& store) { return store.getSize(); };
+        globalStoreT[sol::meta_function::index] = sol::overload(
+            [](const GlobalStore& store, std::string_view globalId) -> sol::optional<float> {
+                auto g = store.search(ESM::RefId::deserializeText(globalId));
+                if (g == nullptr)
+                    return sol::nullopt;
+                return getGlobalVariableValue(globalId);
+            },
+            [](const GlobalStore& store, size_t index) -> sol::optional<float> {
+                if (index < 1 || store.getSize() < index)
+                    return sol::nullopt;
+                auto g = store.at(LuaUtil::fromLuaIndex(index));
+                if (g == nullptr)
+                    return sol::nullopt;
+                std::string globalId = g->mId.serializeText();
+                return getGlobalVariableValue(globalId);
+            });
+        globalStoreT[sol::meta_function::new_index] = sol::overload(
+            [](const GlobalStore& store, std::string_view globalId, float val) -> void {
+                auto g = store.search(ESM::RefId::deserializeText(globalId));
+                if (g == nullptr)
+                    throw std::runtime_error("No variable \"" + std::string(globalId) + "\" in GlobalStore");
+                setGlobalVariableValue(globalId, val);
+            },
+            [](const GlobalStore& store, size_t index, float val) {
+                if (index < 1 || store.getSize() < index)
+                    return;
+                auto g = store.at(LuaUtil::fromLuaIndex(index));
+                if (g == nullptr)
+                    return;
+                std::string globalId = g->mId.serializeText();
+                setGlobalVariableValue(globalId, val);
+            });
+        globalStoreT[sol::meta_function::pairs] = [](const GlobalStore& store) {
+            size_t index = 0;
+            return sol::as_function(
+                [index, &store](sol::this_state ts) mutable -> sol::optional<std::tuple<std::string, float>> {
+                    if (index >= store.getSize())
+                        return sol::nullopt;
+
+                    const ESM::Global* global = store.at(index++);
+                    if (!global)
+                        return sol::nullopt;
+
+                    std::string globalId = global->mId.serializeText();
+                    float value = getGlobalVariableValue(globalId);
+
+                    return std::make_tuple(globalId, value);
+                });
+        };
+        globalStoreT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
+        api["getGlobalVariables"] = [globalStore](sol::optional<GObject> player) {
+            if (player.has_value() && player->ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
+                throw std::runtime_error("First argument must either be a player or be missing");
+
+            return globalStore;
+        };
         return LuaUtil::makeReadOnly(api);
     }
-
 }
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 86c8ef31e8..df317ffeba 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -3,15 +3,44 @@
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/misc/constants.hpp>
 #include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwphysics/raycasting.hpp"
+#include "../mwworld/cell.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/scene.hpp"
 
 #include "luamanagerimp.hpp"
 #include "objectlists.hpp"
 
+namespace
+{
+    template <class T = MWWorld::Ptr>
+    std::vector<T> parseIgnoreList(const sol::table& options)
+    {
+        std::vector<T> ignore;
+
+        if (const auto& ignoreObj = options.get<sol::optional<MWLua::LObject>>("ignore"))
+        {
+            ignore.push_back(ignoreObj->ptr());
+        }
+        else if (const auto& ignoreTable = options.get<sol::optional<sol::table>>("ignore"))
+        {
+            ignoreTable->for_each([&](const auto& _, const sol::object& value) {
+                if (value.is<MWLua::LObject>())
+                {
+                    ignore.push_back(value.as<MWLua::LObject>().ptr());
+                }
+            });
+        }
+
+        return ignore;
+    }
+}
+
 namespace sol
 {
     template <>
@@ -24,11 +53,12 @@ namespace MWLua
 {
     sol::table initNearbyPackage(const Context& context)
     {
-        sol::table api(context.mLua->sol(), sol::create);
+        sol::state_view lua = context.sol();
+        sol::table api(lua, sol::create);
         ObjectLists* objectLists = context.mObjectLists;
 
         sol::usertype<MWPhysics::RayCastingResult> rayResult
-            = context.mLua->sol().new_usertype<MWPhysics::RayCastingResult>("RayCastingResult");
+            = lua.new_usertype<MWPhysics::RayCastingResult>("RayCastingResult");
         rayResult["hit"] = sol::readonly_property([](const MWPhysics::RayCastingResult& r) { return r.mHit; });
         rayResult["hitPos"]
             = sol::readonly_property([](const MWPhysics::RayCastingResult& r) -> sol::optional<osg::Vec3f> {
@@ -53,38 +83,42 @@ namespace MWLua
               });
 
         api["COLLISION_TYPE"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWPhysics::CollisionType>({
-                { "World", MWPhysics::CollisionType_World },
-                { "Door", MWPhysics::CollisionType_Door },
-                { "Actor", MWPhysics::CollisionType_Actor },
-                { "HeightMap", MWPhysics::CollisionType_HeightMap },
-                { "Projectile", MWPhysics::CollisionType_Projectile },
-                { "Water", MWPhysics::CollisionType_Water },
-                { "Default", MWPhysics::CollisionType_Default },
-                { "AnyPhysical", MWPhysics::CollisionType_AnyPhysical },
-                { "Camera", MWPhysics::CollisionType_CameraOnly },
-                { "VisualOnly", MWPhysics::CollisionType_VisualOnly },
-            }));
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWPhysics::CollisionType>(lua,
+                {
+                    { "World", MWPhysics::CollisionType_World },
+                    { "Door", MWPhysics::CollisionType_Door },
+                    { "Actor", MWPhysics::CollisionType_Actor },
+                    { "HeightMap", MWPhysics::CollisionType_HeightMap },
+                    { "Projectile", MWPhysics::CollisionType_Projectile },
+                    { "Water", MWPhysics::CollisionType_Water },
+                    { "Default", MWPhysics::CollisionType_Default },
+                    { "AnyPhysical", MWPhysics::CollisionType_AnyPhysical },
+                    { "Camera", MWPhysics::CollisionType_CameraOnly },
+                    { "VisualOnly", MWPhysics::CollisionType_VisualOnly },
+                }));
 
         api["castRay"] = [](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options) {
-            MWWorld::Ptr ignore;
+            std::vector<MWWorld::ConstPtr> ignore;
             int collisionType = MWPhysics::CollisionType_Default;
             float radius = 0;
             if (options)
             {
-                sol::optional<LObject> ignoreObj = options->get<sol::optional<LObject>>("ignore");
-                if (ignoreObj)
-                    ignore = ignoreObj->ptr();
+                ignore = parseIgnoreList<MWWorld::ConstPtr>(*options);
                 collisionType = options->get<sol::optional<int>>("collisionType").value_or(collisionType);
                 radius = options->get<sol::optional<float>>("radius").value_or(0);
             }
             const MWPhysics::RayCastingInterface* rayCasting = MWBase::Environment::get().getWorld()->getRayCasting();
             if (radius <= 0)
-                return rayCasting->castRay(from, to, ignore, std::vector<MWWorld::Ptr>(), collisionType);
+            {
+                return rayCasting->castRay(from, to, ignore, {}, collisionType);
+            }
             else
             {
-                if (!ignore.isEmpty())
-                    throw std::logic_error("Currently castRay doesn't support `ignore` when radius > 0");
+                for (const auto& ptr : ignore)
+                {
+                    if (!ptr.isEmpty())
+                        throw std::logic_error("Currently castRay doesn't support `ignore` when radius > 0");
+                }
                 return rayCasting->castSphere(from, to, radius, collisionType);
             }
         };
@@ -104,24 +138,40 @@ namespace MWLua
             //       and use this callback from the main thread at the beginning of the next frame processing.
             rayCasting->asyncCastRay(callback, from, to, ignore, std::vector<MWWorld::Ptr>(), collisionType);
         };*/
-        api["castRenderingRay"] = [manager = context.mLuaManager](const osg::Vec3f& from, const osg::Vec3f& to) {
+        api["castRenderingRay"] = [manager = context.mLuaManager](const osg::Vec3f& from, const osg::Vec3f& to,
+                                      const sol::optional<sol::table>& options) {
             if (!manager->isProcessingInputEvents())
             {
                 throw std::logic_error(
                     "castRenderingRay can be used only in player scripts during processing of input events; "
                     "use asyncCastRenderingRay instead.");
             }
+
+            std::vector<MWWorld::Ptr> ignore;
+            if (options.has_value())
+            {
+                ignore = parseIgnoreList(*options);
+            }
+
             MWPhysics::RayCastingResult res;
-            MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false);
+            MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false, ignore);
             return res;
         };
-        api["asyncCastRenderingRay"] = [context](
-                                           const sol::table& callback, const osg::Vec3f& from, const osg::Vec3f& to) {
-            context.mLuaManager->addAction([context, callback = LuaUtil::Callback::fromLua(callback), from, to] {
-                MWPhysics::RayCastingResult res;
-                MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false);
-                context.mLuaManager->queueCallback(callback, sol::main_object(context.mLua->sol(), sol::in_place, res));
-            });
+        api["asyncCastRenderingRay"] = [context](const sol::table& callback, const osg::Vec3f& from,
+                                           const osg::Vec3f& to, const sol::optional<sol::table>& options) {
+            std::vector<MWWorld::Ptr> ignore;
+            if (options.has_value())
+            {
+                ignore = parseIgnoreList(*options);
+            }
+
+            context.mLuaManager->addAction(
+                [context, ignore = std::move(ignore), callback = LuaUtil::Callback::fromLua(callback), from, to] {
+                    MWPhysics::RayCastingResult res;
+                    MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false, ignore);
+                    context.mLuaManager->queueCallback(
+                        callback, sol::main_object(context.mLua->unsafeState(), sol::in_place, res));
+                });
         };
 
         api["getObjectByFormId"] = [](std::string_view formIdStr) -> LObject {
@@ -139,32 +189,35 @@ namespace MWLua
         api["players"] = LObjectList{ objectLists->getPlayers() };
 
         api["NAVIGATOR_FLAGS"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, DetourNavigator::Flag>({
-                { "Walk", DetourNavigator::Flag_walk },
-                { "Swim", DetourNavigator::Flag_swim },
-                { "OpenDoor", DetourNavigator::Flag_openDoor },
-                { "UsePathgrid", DetourNavigator::Flag_usePathgrid },
-            }));
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, DetourNavigator::Flag>(lua,
+                {
+                    { "Walk", DetourNavigator::Flag_walk },
+                    { "Swim", DetourNavigator::Flag_swim },
+                    { "OpenDoor", DetourNavigator::Flag_openDoor },
+                    { "UsePathgrid", DetourNavigator::Flag_usePathgrid },
+                }));
 
         api["COLLISION_SHAPE_TYPE"] = LuaUtil::makeStrictReadOnly(
-            context.mLua->tableFromPairs<std::string_view, DetourNavigator::CollisionShapeType>({
-                { "Aabb", DetourNavigator::CollisionShapeType::Aabb },
-                { "RotatingBox", DetourNavigator::CollisionShapeType::RotatingBox },
-                { "Cylinder", DetourNavigator::CollisionShapeType::Cylinder },
-            }));
+            LuaUtil::tableFromPairs<std::string_view, DetourNavigator::CollisionShapeType>(lua,
+                {
+                    { "Aabb", DetourNavigator::CollisionShapeType::Aabb },
+                    { "RotatingBox", DetourNavigator::CollisionShapeType::RotatingBox },
+                    { "Cylinder", DetourNavigator::CollisionShapeType::Cylinder },
+                }));
 
         api["FIND_PATH_STATUS"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, DetourNavigator::Status>({
-                { "Success", DetourNavigator::Status::Success },
-                { "PartialPath", DetourNavigator::Status::PartialPath },
-                { "NavMeshNotFound", DetourNavigator::Status::NavMeshNotFound },
-                { "StartPolygonNotFound", DetourNavigator::Status::StartPolygonNotFound },
-                { "EndPolygonNotFound", DetourNavigator::Status::EndPolygonNotFound },
-                { "MoveAlongSurfaceFailed", DetourNavigator::Status::MoveAlongSurfaceFailed },
-                { "FindPathOverPolygonsFailed", DetourNavigator::Status::FindPathOverPolygonsFailed },
-                { "InitNavMeshQueryFailed", DetourNavigator::Status::InitNavMeshQueryFailed },
-                { "FindStraightPathFailed", DetourNavigator::Status::FindStraightPathFailed },
-            }));
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, DetourNavigator::Status>(lua,
+                {
+                    { "Success", DetourNavigator::Status::Success },
+                    { "PartialPath", DetourNavigator::Status::PartialPath },
+                    { "NavMeshNotFound", DetourNavigator::Status::NavMeshNotFound },
+                    { "StartPolygonNotFound", DetourNavigator::Status::StartPolygonNotFound },
+                    { "EndPolygonNotFound", DetourNavigator::Status::EndPolygonNotFound },
+                    { "MoveAlongSurfaceFailed", DetourNavigator::Status::MoveAlongSurfaceFailed },
+                    { "FindPathOverPolygonsFailed", DetourNavigator::Status::FindPathOverPolygonsFailed },
+                    { "InitNavMeshQueryFailed", DetourNavigator::Status::InitNavMeshQueryFailed },
+                    { "FindStraightPathFailed", DetourNavigator::Status::FindStraightPathFailed },
+                }));
 
         static const DetourNavigator::AgentBounds defaultAgentBounds{
             Settings::game().mActorCollisionShapeType,
@@ -174,7 +227,7 @@ namespace MWLua
             | DetourNavigator::Flag_swim | DetourNavigator::Flag_openDoor | DetourNavigator::Flag_usePathgrid;
 
         api["findPath"]
-            = [](const osg::Vec3f& source, const osg::Vec3f& destination, const sol::optional<sol::table>& options) {
+            = [lua](const osg::Vec3f& source, const osg::Vec3f& destination, const sol::optional<sol::table>& options) {
                   DetourNavigator::AgentBounds agentBounds = defaultAgentBounds;
                   DetourNavigator::Flags includeFlags = defaultIncludeFlags;
                   DetourNavigator::AreaCosts areaCosts{};
@@ -206,13 +259,15 @@ namespace MWLua
                           destinationTolerance = *v;
                   }
 
-                  std::vector<osg::Vec3f> result;
+                  std::vector<osg::Vec3f> path;
 
-                  const DetourNavigator::Status status = DetourNavigator::findPath(
-                      *MWBase::Environment::get().getWorld()->getNavigator(), agentBounds, source, destination,
-                      includeFlags, areaCosts, destinationTolerance, std::back_inserter(result));
+                  const DetourNavigator::Status status
+                      = DetourNavigator::findPath(*MWBase::Environment::get().getWorld()->getNavigator(), agentBounds,
+                          source, destination, includeFlags, areaCosts, destinationTolerance, std::back_inserter(path));
 
-                  return std::make_tuple(status, std::move(result));
+                  sol::table result(lua, sol::create);
+                  LuaUtil::copyVectorToTable(path, result);
+                  return std::make_tuple(status, result);
               };
 
         api["findRandomPointAroundCircle"] = [](const osg::Vec3f& position, float maxRadius,
@@ -262,6 +317,39 @@ namespace MWLua
                       *MWBase::Environment::get().getWorld()->getNavigator(), agentBounds, from, to, includeFlags);
               };
 
+        api["findNearestNavMeshPosition"] = [](const osg::Vec3f& position, const sol::optional<sol::table>& options) {
+            DetourNavigator::AgentBounds agentBounds = defaultAgentBounds;
+            std::optional<osg::Vec3f> searchAreaHalfExtents;
+            DetourNavigator::Flags includeFlags = defaultIncludeFlags;
+
+            if (options.has_value())
+            {
+                if (const auto& t = options->get<sol::optional<sol::table>>("agentBounds"))
+                {
+                    if (const auto& v = t->get<sol::optional<DetourNavigator::CollisionShapeType>>("shapeType"))
+                        agentBounds.mShapeType = *v;
+                    if (const auto& v = t->get<sol::optional<osg::Vec3f>>("halfExtents"))
+                        agentBounds.mHalfExtents = *v;
+                }
+                if (const auto& v = options->get<sol::optional<osg::Vec3f>>("searchAreaHalfExtents"))
+                    searchAreaHalfExtents = *v;
+                if (const auto& v = options->get<sol::optional<DetourNavigator::Flags>>("includeFlags"))
+                    includeFlags = *v;
+            }
+
+            if (!searchAreaHalfExtents.has_value())
+            {
+                const bool isEsm4 = MWBase::Environment::get().getWorldScene()->getCurrentCell()->getCell()->isEsm4();
+                const float halfExtents = isEsm4
+                    ? (1 + 2 * Constants::ESM4CellGridRadius) * Constants::ESM4CellSizeInUnits
+                    : (1 + 2 * Constants::CellGridRadius) * Constants::CellSizeInUnits;
+                searchAreaHalfExtents = osg::Vec3f(halfExtents, halfExtents, halfExtents);
+            }
+
+            return DetourNavigator::findNearestNavMeshPosition(*MWBase::Environment::get().getWorld()->getNavigator(),
+                agentBounds, position, *searchAreaHalfExtents, includeFlags);
+        };
+
         return LuaUtil::makeReadOnly(api);
     }
 }
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index fcf225de85..d032515314 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -16,7 +16,7 @@ namespace MWLua
     // ObjectId is a unique identifier of a game object.
     // It can change only if the order of content files was change.
     using ObjectId = ESM::RefNum;
-    inline const ObjectId& getId(const MWWorld::Ptr& ptr)
+    inline ObjectId getId(const MWWorld::Ptr& ptr)
     {
         return ptr.getCellRef().getRefNum();
     }
@@ -71,6 +71,12 @@ namespace MWLua
     {
         Obj mObj;
     };
+
+    template <typename Obj>
+    struct Owner
+    {
+        Obj mObj;
+    };
 }
 
 #endif // MWLUA_OBJECT_H
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 32bd0b95d4..6575a719f6 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -4,6 +4,7 @@
 #include <components/esm3/loadnpc.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/lua/shapes/box.hpp>
+#include <components/lua/util.hpp>
 #include <components/lua/utilpackage.hpp>
 #include <components/misc/convert.hpp>
 #include <components/misc/mathutil.hpp>
@@ -11,6 +12,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/localscripts.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/scene.hpp"
 #include "../mwworld/worldmodel.hpp"
@@ -19,6 +21,9 @@
 
 #include "../mwmechanics/creaturestats.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 #include "luaevents.hpp"
 #include "luamanagerimp.hpp"
 #include "types/types.hpp"
@@ -77,20 +82,25 @@ namespace MWLua
             return &wm->getExterior(ESM::positionToExteriorCellLocation(pos.x(), pos.y(), worldspace));
         }
 
-        void teleportPlayer(
-            MWWorld::CellStore* destCell, const osg::Vec3f& pos, const osg::Vec3f& rot, bool placeOnGround)
+        ESM::Position toPos(const osg::Vec3f& pos, const osg::Vec3f& rot)
         {
-            MWBase::World* world = MWBase::Environment::get().getWorld();
             ESM::Position esmPos;
             static_assert(sizeof(esmPos) == sizeof(osg::Vec3f) * 2);
             std::memcpy(esmPos.pos, &pos, sizeof(osg::Vec3f));
             std::memcpy(esmPos.rot, &rot, sizeof(osg::Vec3f));
+            return esmPos;
+        }
+
+        void teleportPlayer(
+            MWWorld::CellStore* destCell, const osg::Vec3f& pos, const osg::Vec3f& rot, bool placeOnGround)
+        {
+            MWBase::World* world = MWBase::Environment::get().getWorld();
             MWWorld::Ptr ptr = world->getPlayerPtr();
             auto& stats = ptr.getClass().getCreatureStats(ptr);
             stats.land(true);
             stats.setTeleported(true);
             world->getPlayer().setTeleported(true);
-            world->changeToCell(destCell->getCell()->getId(), esmPos, false);
+            world->changeToCell(destCell->getCell()->getId(), toPos(pos, rot), false);
             MWWorld::Ptr newPtr = world->getPlayerPtr();
             world->moveObject(newPtr, pos);
             world->rotateObject(newPtr, rot);
@@ -103,15 +113,38 @@ namespace MWLua
             const osg::Vec3f& rot, bool placeOnGround)
         {
             MWBase::World* world = MWBase::Environment::get().getWorld();
+            MWWorld::WorldModel* wm = MWBase::Environment::get().getWorldModel();
             const MWWorld::Class& cls = ptr.getClass();
             if (cls.isActor())
             {
-                auto& stats = ptr.getClass().getCreatureStats(ptr);
+                auto& stats = cls.getCreatureStats(ptr);
                 stats.land(false);
                 stats.setTeleported(true);
             }
-            MWWorld::Ptr newPtr = world->moveObject(ptr, destCell, pos);
-            world->rotateObject(newPtr, rot, MWBase::RotationFlag_none);
+            const MWWorld::CellStore* srcCell = ptr.getCell();
+            MWWorld::Ptr newPtr;
+            if (srcCell == &wm->getDraftCell())
+            {
+                newPtr = cls.moveToCell(ptr, *destCell, toPos(pos, rot));
+                ptr.getCellRef().unsetRefNum();
+                ptr.getRefData().setLuaScripts(nullptr);
+                ptr.getCellRef().setCount(0);
+                ESM::RefId script = cls.getScript(newPtr);
+                if (!script.empty())
+                    world->getLocalScripts().add(script, newPtr);
+                world->addContainerScripts(newPtr, newPtr.getCell());
+            }
+            else
+            {
+                newPtr = world->moveObject(ptr, destCell, pos);
+                if (srcCell == destCell)
+                {
+                    ESM::RefId script = cls.getScript(newPtr);
+                    if (!script.empty())
+                        world->getLocalScripts().add(script, newPtr);
+                }
+                world->rotateObject(newPtr, rot, MWBase::RotationFlag_none);
+            }
             if (placeOnGround)
                 world->adjustPosition(newPtr, true);
             if (cls.isDoor())
@@ -131,16 +164,16 @@ namespace MWLua
         void registerObjectList(const std::string& prefix, const Context& context)
         {
             using ListT = ObjectList<ObjectT>;
-            sol::state_view& lua = context.mLua->sol();
+            sol::state_view lua = context.sol();
             sol::usertype<ListT> listT = lua.new_usertype<ListT>(prefix + "ObjectList");
             listT[sol::meta_function::to_string]
                 = [](const ListT& list) { return "{" + std::to_string(list.mIds->size()) + " objects}"; };
             listT[sol::meta_function::length] = [](const ListT& list) { return list.mIds->size(); };
-            listT[sol::meta_function::index] = [](const ListT& list, size_t index) {
+            listT[sol::meta_function::index] = [](const ListT& list, size_t index) -> sol::optional<ObjectT> {
                 if (index > 0 && index <= list.mIds->size())
-                    return ObjectT((*list.mIds)[index - 1]);
+                    return ObjectT((*list.mIds)[LuaUtil::fromLuaIndex(index)]);
                 else
-                    throw std::runtime_error("Index out of range");
+                    return sol::nullopt;
             };
             listT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
             listT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
@@ -168,6 +201,79 @@ namespace MWLua
                 return Misc::Convert::makeOsgQuat(pos.rot);
         }
 
+        template <class ObjectT>
+        void addOwnerbindings(sol::usertype<ObjectT>& objectT, const std::string& prefix, const Context& context)
+        {
+            using OwnerT = Owner<ObjectT>;
+            sol::usertype<OwnerT> ownerT = context.sol().new_usertype<OwnerT>(prefix + "Owner");
+
+            ownerT[sol::meta_function::to_string] = [](const OwnerT& o) { return "Owner[" + o.mObj.toString() + "]"; };
+
+            auto getOwnerRecordId = [](const OwnerT& o) -> sol::optional<std::string> {
+                ESM::RefId owner = o.mObj.ptr().getCellRef().getOwner();
+                if (owner.empty())
+                    return sol::nullopt;
+                else
+                    return owner.serializeText();
+            };
+            auto setOwnerRecordId = [](const OwnerT& o, sol::optional<std::string_view> ownerId) {
+                if (std::is_same_v<ObjectT, LObject> && !dynamic_cast<const SelfObject*>(&o.mObj))
+                    throw std::runtime_error("Local scripts can set an owner only on self");
+                const MWWorld::Ptr& ptr = o.mObj.ptr();
+
+                if (!ownerId)
+                {
+                    ptr.getCellRef().setOwner(ESM::RefId());
+                    return;
+                }
+                ESM::RefId owner = ESM::RefId::deserializeText(*ownerId);
+                const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
+                if (!store.get<ESM::NPC>().search(owner))
+                    throw std::runtime_error("Invalid owner record id");
+                ptr.getCellRef().setOwner(owner);
+            };
+            ownerT["recordId"] = sol::property(getOwnerRecordId, setOwnerRecordId);
+
+            auto getOwnerFactionId = [](const OwnerT& o) -> sol::optional<std::string> {
+                ESM::RefId owner = o.mObj.ptr().getCellRef().getFaction();
+                if (owner.empty())
+                    return sol::nullopt;
+                else
+                    return owner.serializeText();
+            };
+            auto setOwnerFactionId = [](const OwnerT& o, sol::optional<std::string> ownerId) {
+                ESM::RefId ownerFac;
+                if (std::is_same_v<ObjectT, LObject> && !dynamic_cast<const SelfObject*>(&o.mObj))
+                    throw std::runtime_error("Local scripts can set an owner faction only on self");
+                if (!ownerId)
+                {
+                    o.mObj.ptr().getCellRef().setFaction(ESM::RefId());
+                    return;
+                }
+                ownerFac = ESM::RefId::deserializeText(*ownerId);
+                const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
+                if (!store.get<ESM::Faction>().search(ownerFac))
+                    throw std::runtime_error("Invalid owner faction id");
+                o.mObj.ptr().getCellRef().setFaction(ownerFac);
+            };
+            ownerT["factionId"] = sol::property(getOwnerFactionId, setOwnerFactionId);
+
+            auto getOwnerFactionRank = [](const OwnerT& o) -> sol::optional<size_t> {
+                int rank = o.mObj.ptr().getCellRef().getFactionRank();
+                if (rank < 0)
+                    return sol::nullopt;
+                return LuaUtil::toLuaIndex(rank);
+            };
+            auto setOwnerFactionRank = [](const OwnerT& o, sol::optional<size_t> factionRank) {
+                if (std::is_same_v<ObjectT, LObject> && !dynamic_cast<const SelfObject*>(&o.mObj))
+                    throw std::runtime_error("Local scripts can set an owner faction rank only on self");
+                o.mObj.ptr().getCellRef().setFactionRank(LuaUtil::fromLuaIndex(factionRank.value_or(0)));
+            };
+            ownerT["factionRank"] = sol::property(getOwnerFactionRank, setOwnerFactionRank);
+
+            objectT["owner"] = sol::readonly_property([](const ObjectT& object) { return OwnerT{ object }; });
+        }
+
         template <class ObjectT>
         void addBasicBindings(sol::usertype<ObjectT>& objectT, const Context& context)
         {
@@ -182,6 +288,13 @@ namespace MWLua
             objectT["isValid"] = [](const ObjectT& o) { return !o.ptrOrEmpty().isEmpty(); };
             objectT["recordId"] = sol::readonly_property(
                 [](const ObjectT& o) -> std::string { return o.ptr().getCellRef().getRefId().serializeText(); });
+            objectT["globalVariable"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<std::string> {
+                std::string_view globalVariable = o.ptr().getCellRef().getGlobalVariable();
+                if (globalVariable.empty())
+                    return sol::nullopt;
+                else
+                    return ESM::RefId::stringRefId(globalVariable).serializeText();
+            });
             objectT["cell"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<Cell<ObjectT>> {
                 const MWWorld::Ptr& ptr = o.ptr();
                 MWWorld::WorldModel* wm = MWBase::Environment::get().getWorldModel();
@@ -190,6 +303,13 @@ namespace MWLua
                 else
                     return sol::nullopt;
             });
+            objectT["parentContainer"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<ObjectT> {
+                const MWWorld::Ptr& ptr = o.ptr();
+                if (ptr.getContainerStore())
+                    return ObjectT(ptr.getContainerStore()->getPtr());
+                else
+                    return sol::nullopt;
+            });
             objectT["position"] = sol::readonly_property(
                 [](const ObjectT& o) -> osg::Vec3f { return o.ptr().getRefData().getPosition().asVec3(); });
             objectT["scale"]
@@ -209,73 +329,18 @@ namespace MWLua
                 return LuaUtil::Box{ bb.center(), bb._max - bb.center() };
             };
 
-            objectT["type"] = sol::readonly_property(
-                [types = getTypeToPackageTable(context.mLua->sol())](
-                    const ObjectT& o) mutable { return types[getLiveCellRefType(o.ptr().mRef)]; });
+            objectT["type"]
+                = sol::readonly_property([types = getTypeToPackageTable(context.sol())](const ObjectT& o) mutable {
+                      return types[getLiveCellRefType(o.ptr().mRef)];
+                  });
 
-            objectT["count"] = sol::readonly_property([](const ObjectT& o) { return o.ptr().getRefData().getCount(); });
+            objectT["count"] = sol::readonly_property([](const ObjectT& o) { return o.ptr().getCellRef().getCount(); });
             objectT[sol::meta_function::equal_to] = [](const ObjectT& a, const ObjectT& b) { return a.id() == b.id(); };
             objectT[sol::meta_function::to_string] = &ObjectT::toString;
             objectT["sendEvent"] = [context](const ObjectT& dest, std::string eventName, const sol::object& eventData) {
                 context.mLuaEvents->addLocalEvent(
                     { dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer) });
             };
-            auto getOwnerRecordId = [](const ObjectT& o) -> sol::optional<std::string> {
-                ESM::RefId owner = o.ptr().getCellRef().getOwner();
-                if (owner.empty())
-                    return sol::nullopt;
-                else
-                    return owner.serializeText();
-            };
-            auto setOwnerRecordId = [](const ObjectT& obj, sol::optional<std::string_view> ownerId) {
-                if (std::is_same_v<ObjectT, LObject> && !dynamic_cast<const SelfObject*>(&obj))
-                    throw std::runtime_error("Local scripts can set an owner only on self");
-                const MWWorld::Ptr& ptr = obj.ptr();
-
-                if (!ownerId)
-                {
-                    ptr.getCellRef().setOwner(ESM::RefId());
-                    return;
-                }
-                ESM::RefId owner = ESM::RefId::deserializeText(*ownerId);
-                const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
-                if (!store.get<ESM::NPC>().search(owner))
-                    throw std::runtime_error("Invalid owner record id");
-                ptr.getCellRef().setOwner(owner);
-            };
-            objectT["ownerRecordId"] = sol::property(getOwnerRecordId, setOwnerRecordId);
-
-            auto getOwnerFactionId = [](const ObjectT& o) -> sol::optional<std::string> {
-                ESM::RefId owner = o.ptr().getCellRef().getFaction();
-                if (owner.empty())
-                    return sol::nullopt;
-                else
-                    return owner.serializeText();
-            };
-            auto setOwnerFactionId = [](const ObjectT& object, sol::optional<std::string> ownerId) {
-                ESM::RefId ownerFac;
-                if (std::is_same_v<ObjectT, LObject> && !dynamic_cast<const SelfObject*>(&object))
-                    throw std::runtime_error("Local scripts can set an owner faction only on self");
-                if (!ownerId)
-                {
-                    object.ptr().getCellRef().setFaction(ESM::RefId());
-                    return;
-                }
-                ownerFac = ESM::RefId::deserializeText(*ownerId);
-                const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
-                if (!store.get<ESM::Faction>().search(ownerFac))
-                    throw std::runtime_error("Invalid owner faction id");
-                object.ptr().getCellRef().setFaction(ownerFac);
-            };
-            objectT["ownerFactionId"] = sol::property(getOwnerFactionId, setOwnerFactionId);
-
-            auto getOwnerFactionRank = [](const ObjectT& o) -> int { return o.ptr().getCellRef().getFactionRank(); };
-            auto setOwnerFactionRank = [](const ObjectT& object, int factionRank) {
-                if (std::is_same_v<ObjectT, LObject> && !dynamic_cast<const SelfObject*>(&object))
-                    throw std::runtime_error("Local scripts can set an owner faction rank only on self");
-                object.ptr().getCellRef().setFactionRank(factionRank);
-            };
-            objectT["ownerFactionRank"] = sol::property(getOwnerFactionRank, setOwnerFactionRank);
 
             objectT["activateBy"] = [](const ObjectT& object, const ObjectT& actor) {
                 const MWWorld::Ptr& objPtr = object.ptr();
@@ -291,10 +356,10 @@ namespace MWLua
 
             auto isEnabled = [](const ObjectT& o) { return o.ptr().getRefData().isEnabled(); };
             auto setEnabled = [context](const GObject& object, bool enable) {
-                if (enable && object.ptr().getRefData().isDeleted())
+                if (enable && object.ptr().mRef->isDeleted())
                     throw std::runtime_error("Object is removed");
                 context.mLuaManager->addAction([object, enable] {
-                    if (object.ptr().getRefData().isDeleted())
+                    if (object.ptr().mRef->isDeleted())
                         return;
                     if (object.ptr().isInCell())
                     {
@@ -325,7 +390,7 @@ namespace MWLua
                 };
                 objectT["addScript"] = [context](const GObject& object, std::string_view path, sol::object initData) {
                     const LuaUtil::ScriptsConfiguration& cfg = context.mLua->getConfiguration();
-                    std::optional<int> scriptId = cfg.findId(path);
+                    std::optional<int> scriptId = cfg.findId(VFS::Path::Normalized(path));
                     if (!scriptId)
                         throw std::runtime_error("Unknown script: " + std::string(path));
                     if (!(cfg[*scriptId].mFlags & ESM::LuaScriptCfg::sCustom))
@@ -342,7 +407,7 @@ namespace MWLua
                 };
                 objectT["hasScript"] = [lua = context.mLua](const GObject& object, std::string_view path) {
                     const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
-                    std::optional<int> scriptId = cfg.findId(path);
+                    std::optional<int> scriptId = cfg.findId(VFS::Path::Normalized(path));
                     if (!scriptId)
                         return false;
                     MWWorld::Ptr ptr = object.ptr();
@@ -354,7 +419,7 @@ namespace MWLua
                 };
                 objectT["removeScript"] = [lua = context.mLua](const GObject& object, std::string_view path) {
                     const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
-                    std::optional<int> scriptId = cfg.findId(path);
+                    std::optional<int> scriptId = cfg.findId(VFS::Path::Normalized(path));
                     if (!scriptId)
                         throw std::runtime_error("Unknown script: " + std::string(path));
                     MWWorld::Ptr ptr = object.ptr();
@@ -368,20 +433,23 @@ namespace MWLua
 
                 using DelayedRemovalFn = std::function<void(MWWorld::Ptr)>;
                 auto removeFn = [](const MWWorld::Ptr ptr, int countToRemove) -> std::optional<DelayedRemovalFn> {
-                    int currentCount = ptr.getRefData().getCount();
+                    int rawCount = ptr.getCellRef().getCount(false);
+                    int currentCount = std::abs(rawCount);
+                    int signedCountToRemove = (rawCount < 0 ? -1 : 1) * countToRemove;
+
                     if (countToRemove <= 0 || countToRemove > currentCount)
                         throw std::runtime_error("Can't remove " + std::to_string(countToRemove) + " of "
                             + std::to_string(currentCount) + " items");
-                    ptr.getRefData().setCount(currentCount - countToRemove); // Immediately change count
+                    ptr.getCellRef().setCount(rawCount - signedCountToRemove); // Immediately change count
                     if (!ptr.getContainerStore() && currentCount > countToRemove)
                         return std::nullopt;
                     // Delayed action to trigger side effects
-                    return [countToRemove](MWWorld::Ptr ptr) {
+                    return [signedCountToRemove](MWWorld::Ptr ptr) {
                         // Restore the original count
-                        ptr.getRefData().setCount(ptr.getRefData().getCount() + countToRemove);
+                        ptr.getCellRef().setCount(ptr.getCellRef().getCount(false) + signedCountToRemove);
                         // And now remove properly
                         if (ptr.getContainerStore())
-                            ptr.getContainerStore()->remove(ptr, countToRemove, false);
+                            ptr.getContainerStore()->remove(ptr, std::abs(signedCountToRemove), false);
                         else
                         {
                             MWBase::Environment::get().getWorld()->disable(ptr);
@@ -391,7 +459,7 @@ namespace MWLua
                 };
                 objectT["remove"] = [removeFn, context](const GObject& object, sol::optional<int> count) {
                     std::optional<DelayedRemovalFn> delayed
-                        = removeFn(object.ptr(), count.value_or(object.ptr().getRefData().getCount()));
+                        = removeFn(object.ptr(), count.value_or(object.ptr().getCellRef().getCount()));
                     if (delayed.has_value())
                         context.mLuaManager->addAction([fn = *delayed, object] { fn(object.ptr()); });
                 };
@@ -411,7 +479,7 @@ namespace MWLua
                 };
                 objectT["moveInto"] = [removeFn, context](const GObject& object, const sol::object& dest) {
                     const MWWorld::Ptr& ptr = object.ptr();
-                    int count = ptr.getRefData().getCount();
+                    int count = ptr.getCellRef().getCount();
                     MWWorld::Ptr destPtr;
                     if (dest.is<GObject>())
                         destPtr = dest.as<GObject>().ptr();
@@ -422,9 +490,9 @@ namespace MWLua
                     std::optional<DelayedRemovalFn> delayedRemovalFn = removeFn(ptr, count);
                     context.mLuaManager->addAction([item = object, count, cont = GObject(destPtr), delayedRemovalFn] {
                         const MWWorld::Ptr& oldPtr = item.ptr();
-                        auto& refData = oldPtr.getRefData();
+                        auto& refData = oldPtr.getCellRef();
                         refData.setCount(count); // temporarily undo removal to run ContainerStore::add
-                        refData.enable();
+                        oldPtr.getRefData().enable();
                         cont.ptr().getClass().getContainerStore(cont.ptr()).add(oldPtr, count, false);
                         refData.setCount(0);
                         if (delayedRemovalFn.has_value())
@@ -435,7 +503,7 @@ namespace MWLua
                                           const osg::Vec3f& pos, const sol::object& options) {
                     MWWorld::CellStore* cell = findCell(cellOrName, pos);
                     MWWorld::Ptr ptr = object.ptr();
-                    int count = ptr.getRefData().getCount();
+                    int count = ptr.getCellRef().getCount();
                     if (count == 0)
                         throw std::runtime_error("Object is either removed or already in the process of teleporting");
                     osg::Vec3f rot = ptr.getRefData().getPosition().asRotationVec3();
@@ -456,9 +524,9 @@ namespace MWLua
                         context.mLuaManager->addAction(
                             [object, cell, pos, rot, count, delayedRemovalFn, placeOnGround] {
                                 MWWorld::Ptr oldPtr = object.ptr();
-                                oldPtr.getRefData().setCount(count);
+                                oldPtr.getCellRef().setCount(count);
                                 MWWorld::Ptr newPtr = oldPtr.getClass().moveToCell(oldPtr, *cell);
-                                oldPtr.getRefData().setCount(0);
+                                oldPtr.getCellRef().setCount(0);
                                 newPtr.getRefData().disable();
                                 teleportNotPlayer(newPtr, cell, pos, rot, placeOnGround);
                                 delayedRemovalFn(oldPtr);
@@ -470,10 +538,10 @@ namespace MWLua
                             [cell, pos, rot, placeOnGround] { teleportPlayer(cell, pos, rot, placeOnGround); });
                     else
                     {
-                        ptr.getRefData().setCount(0);
+                        ptr.getCellRef().setCount(0);
                         context.mLuaManager->addAction(
                             [object, cell, pos, rot, count, placeOnGround] {
-                                object.ptr().getRefData().setCount(count);
+                                object.ptr().getCellRef().setCount(count);
                                 teleportNotPlayer(object.ptr(), cell, pos, rot, placeOnGround);
                             },
                             "TeleportAction");
@@ -486,12 +554,12 @@ namespace MWLua
         void addInventoryBindings(sol::usertype<ObjectT>& objectT, const std::string& prefix, const Context& context)
         {
             using InventoryT = Inventory<ObjectT>;
-            sol::usertype<InventoryT> inventoryT = context.mLua->sol().new_usertype<InventoryT>(prefix + "Inventory");
+            sol::usertype<InventoryT> inventoryT = context.sol().new_usertype<InventoryT>(prefix + "Inventory");
 
             inventoryT[sol::meta_function::to_string]
                 = [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
 
-            inventoryT["getAll"] = [ids = getPackageToTypeTable(context.mLua->sol())](
+            inventoryT["getAll"] = [ids = getPackageToTypeTable(context.mLua->unsafeState())](
                                        const InventoryT& inventory, sol::optional<sol::table> type) {
                 int mask = -1;
                 sol::optional<uint32_t> typeId = sol::nullopt;
@@ -558,13 +626,13 @@ namespace MWLua
                     MWBase::Environment::get().getWorldModel()->registerPtr(item);
                     list->push_back(getId(item));
                 }
-                return ObjectList<ObjectT>{ list };
+                return ObjectList<ObjectT>{ std::move(list) };
             };
 
             inventoryT["countOf"] = [](const InventoryT& inventory, std::string_view recordId) {
                 const MWWorld::Ptr& ptr = inventory.mObj.ptr();
                 MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
-                return store.count(ESM::RefId::stringRefId(recordId));
+                return store.count(ESM::RefId::deserializeText(recordId));
             };
             if constexpr (std::is_same_v<ObjectT, GObject>)
             {
@@ -582,7 +650,7 @@ namespace MWLua
             inventoryT["find"] = [](const InventoryT& inventory, std::string_view recordId) -> sol::optional<ObjectT> {
                 const MWWorld::Ptr& ptr = inventory.mObj.ptr();
                 MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
-                auto itemId = ESM::RefId::stringRefId(recordId);
+                auto itemId = ESM::RefId::deserializeText(recordId);
                 for (const MWWorld::Ptr& item : store)
                 {
                     if (item.getCellRef().getRefId() == itemId)
@@ -596,7 +664,7 @@ namespace MWLua
             inventoryT["findAll"] = [](const InventoryT& inventory, std::string_view recordId) {
                 const MWWorld::Ptr& ptr = inventory.mObj.ptr();
                 MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
-                auto itemId = ESM::RefId::stringRefId(recordId);
+                auto itemId = ESM::RefId::deserializeText(recordId);
                 ObjectIdList list = std::make_shared<std::vector<ObjectId>>();
                 for (const MWWorld::Ptr& item : store)
                 {
@@ -606,7 +674,7 @@ namespace MWLua
                         list->push_back(getId(item));
                     }
                 }
-                return ObjectList<ObjectT>{ list };
+                return ObjectList<ObjectT>{ std::move(list) };
             };
         }
 
@@ -614,9 +682,10 @@ namespace MWLua
         void initObjectBindings(const std::string& prefix, const Context& context)
         {
             sol::usertype<ObjectT> objectT
-                = context.mLua->sol().new_usertype<ObjectT>(prefix + "Object", sol::base_classes, sol::bases<Object>());
+                = context.sol().new_usertype<ObjectT>(prefix + "Object", sol::base_classes, sol::bases<Object>());
             addBasicBindings<ObjectT>(objectT, context);
             addInventoryBindings<ObjectT>(objectT, prefix, context);
+            addOwnerbindings<ObjectT>(objectT, prefix, context);
 
             registerObjectList<ObjectT>(prefix, context);
         }
diff --git a/apps/openmw/mwlua/objectlists.cpp b/apps/openmw/mwlua/objectlists.cpp
index 40b1ab93fa..d0bda5a644 100644
--- a/apps/openmw/mwlua/objectlists.cpp
+++ b/apps/openmw/mwlua/objectlists.cpp
@@ -7,7 +7,6 @@
 #include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 
 #include "../mwclass/container.hpp"
 
@@ -75,7 +74,7 @@ namespace MWLua
         if (mChanged)
         {
             mList->clear();
-            for (const ObjectId& id : mSet)
+            for (ObjectId id : mSet)
                 mList->push_back(id);
             mChanged = false;
         }
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index de48064734..ea7baccb76 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -7,6 +7,7 @@
 
 #include "../mwbase/luamanager.hpp"
 
+#include "inputprocessor.hpp"
 #include "localscripts.hpp"
 
 namespace MWLua
@@ -17,42 +18,14 @@ namespace MWLua
     public:
         PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj)
             : LocalScripts(lua, obj)
+            , mInputProcessor(this)
         {
-            registerEngineHandlers({ &mConsoleCommandHandlers, &mKeyPressHandlers, &mKeyReleaseHandlers,
-                &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers, &mActionHandlers, &mOnFrameHandlers,
-                &mTouchpadPressed, &mTouchpadReleased, &mTouchpadMoved, &mQuestUpdate, &mUiModeChanged });
+            registerEngineHandlers({ &mConsoleCommandHandlers, &mOnFrameHandlers, &mQuestUpdate, &mUiModeChanged });
         }
 
         void processInputEvent(const MWBase::LuaManager::InputEvent& event)
         {
-            using InputEvent = MWBase::LuaManager::InputEvent;
-            switch (event.mType)
-            {
-                case InputEvent::KeyPressed:
-                    callEngineHandlers(mKeyPressHandlers, std::get<SDL_Keysym>(event.mValue));
-                    break;
-                case InputEvent::KeyReleased:
-                    callEngineHandlers(mKeyReleaseHandlers, std::get<SDL_Keysym>(event.mValue));
-                    break;
-                case InputEvent::ControllerPressed:
-                    callEngineHandlers(mControllerButtonPressHandlers, std::get<int>(event.mValue));
-                    break;
-                case InputEvent::ControllerReleased:
-                    callEngineHandlers(mControllerButtonReleaseHandlers, std::get<int>(event.mValue));
-                    break;
-                case InputEvent::Action:
-                    callEngineHandlers(mActionHandlers, std::get<int>(event.mValue));
-                    break;
-                case InputEvent::TouchPressed:
-                    callEngineHandlers(mTouchpadPressed, std::get<SDLUtil::TouchEvent>(event.mValue));
-                    break;
-                case InputEvent::TouchReleased:
-                    callEngineHandlers(mTouchpadReleased, std::get<SDLUtil::TouchEvent>(event.mValue));
-                    break;
-                case InputEvent::TouchMoved:
-                    callEngineHandlers(mTouchpadMoved, std::get<SDLUtil::TouchEvent>(event.mValue));
-                    break;
-            }
+            mInputProcessor.processInputEvent(event);
         }
 
         void onFrame(float dt) { callEngineHandlers(mOnFrameHandlers, dt); }
@@ -66,25 +39,19 @@ namespace MWLua
         }
 
         // `arg` is either forwarded from MWGui::pushGuiMode or empty
-        void uiModeChanged(const MWWorld::Ptr& arg)
+        void uiModeChanged(ObjectId arg, bool byLuaAction)
         {
-            if (arg.isEmpty())
-                callEngineHandlers(mUiModeChanged);
+            if (arg.isZeroOrUnset())
+                callEngineHandlers(mUiModeChanged, byLuaAction);
             else
-                callEngineHandlers(mUiModeChanged, LObject(arg));
+                callEngineHandlers(mUiModeChanged, byLuaAction, LObject(arg));
         }
 
     private:
+        friend class MWLua::InputProcessor<PlayerScripts>;
+        InputProcessor<PlayerScripts> mInputProcessor;
         EngineHandlerList mConsoleCommandHandlers{ "onConsoleCommand" };
-        EngineHandlerList mKeyPressHandlers{ "onKeyPress" };
-        EngineHandlerList mKeyReleaseHandlers{ "onKeyRelease" };
-        EngineHandlerList mControllerButtonPressHandlers{ "onControllerButtonPress" };
-        EngineHandlerList mControllerButtonReleaseHandlers{ "onControllerButtonRelease" };
-        EngineHandlerList mActionHandlers{ "onInputAction" };
         EngineHandlerList mOnFrameHandlers{ "onFrame" };
-        EngineHandlerList mTouchpadPressed{ "onTouchPress" };
-        EngineHandlerList mTouchpadReleased{ "onTouchRelease" };
-        EngineHandlerList mTouchpadMoved{ "onTouchMove" };
         EngineHandlerList mQuestUpdate{ "onQuestUpdate" };
         EngineHandlerList mUiModeChanged{ "_onUiModeChanged" };
     };
diff --git a/apps/openmw/mwlua/postprocessingbindings.cpp b/apps/openmw/mwlua/postprocessingbindings.cpp
index 5ce37d13da..e64bf0fa9e 100644
--- a/apps/openmw/mwlua/postprocessingbindings.cpp
+++ b/apps/openmw/mwlua/postprocessingbindings.cpp
@@ -1,5 +1,7 @@
 #include "postprocessingbindings.hpp"
 
+#include <components/lua/util.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwrender/postprocessor.hpp"
@@ -78,14 +80,14 @@ namespace MWLua
 
             for (size_t i = 0; i < *targetSize; ++i)
             {
-                sol::object obj = table[i + 1];
+                sol::object obj = table[LuaUtil::toLuaIndex(i)];
                 if (!obj.is<T>())
                     throw std::runtime_error("Invalid type for uniform array");
                 values.push_back(obj.as<T>());
             }
 
             context.mLuaManager->addAction(
-                [=] {
+                [shader, name, values = std::move(values)] {
                     MWBase::Environment::get().getWorld()->getPostProcessor()->setUniform(shader.mShader, name, values);
                 },
                 "SetUniformShaderAction");
@@ -94,9 +96,10 @@ namespace MWLua
 
     sol::table initPostprocessingPackage(const Context& context)
     {
-        sol::table api(context.mLua->sol(), sol::create);
+        sol::state_view lua = context.sol();
+        sol::table api(lua, sol::create);
 
-        sol::usertype<Shader> shader = context.mLua->sol().new_usertype<Shader>("Shader");
+        sol::usertype<Shader> shader = lua.new_usertype<Shader>("Shader");
         shader[sol::meta_function::to_string] = [](const Shader& shader) { return shader.toString(); };
 
         shader["enable"] = [context](Shader& shader, sol::optional<int> optPos) {
diff --git a/apps/openmw/mwlua/racebindings.cpp b/apps/openmw/mwlua/racebindings.cpp
new file mode 100644
index 0000000000..b5c4d6093f
--- /dev/null
+++ b/apps/openmw/mwlua/racebindings.cpp
@@ -0,0 +1,116 @@
+#include "racebindings.hpp"
+
+#include <components/esm/attr.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/lua/luastate.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwworld/esmstore.hpp"
+
+#include "idcollectionbindings.hpp"
+#include "types/types.hpp"
+
+namespace
+{
+    struct RaceAttributes
+    {
+        const ESM::Race& mRace;
+        const sol::state_view mLua;
+
+        sol::table getAttribute(ESM::RefId id) const
+        {
+            sol::table res(mLua, sol::create);
+            res["male"] = mRace.mData.getAttribute(id, true);
+            res["female"] = mRace.mData.getAttribute(id, false);
+            return LuaUtil::makeReadOnly(res);
+        }
+    };
+}
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Race> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<RaceAttributes> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+    sol::table initRaceRecordBindings(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table races(lua, sol::create);
+        addRecordFunctionBinding<ESM::Race>(races, context);
+
+        auto raceT = lua.new_usertype<ESM::Race>("ESM3_Race");
+        raceT[sol::meta_function::to_string]
+            = [](const ESM::Race& rec) -> std::string { return "ESM3_Race[" + rec.mId.toDebugString() + "]"; };
+        raceT["id"] = sol::readonly_property([](const ESM::Race& rec) { return rec.mId.serializeText(); });
+        raceT["name"] = sol::readonly_property([](const ESM::Race& rec) -> std::string_view { return rec.mName; });
+        raceT["description"]
+            = sol::readonly_property([](const ESM::Race& rec) -> std::string_view { return rec.mDescription; });
+        raceT["spells"] = sol::readonly_property(
+            [lua](const ESM::Race& rec) -> sol::table { return createReadOnlyRefIdTable(lua, rec.mPowers.mList); });
+        raceT["skills"] = sol::readonly_property([lua](const ESM::Race& rec) -> sol::table {
+            sol::table res(lua, sol::create);
+            for (const auto& skillBonus : rec.mData.mBonus)
+            {
+                ESM::RefId skill = ESM::Skill::indexToRefId(skillBonus.mSkill);
+                if (!skill.empty())
+                    res[skill.serializeText()] = skillBonus.mBonus;
+            }
+            return res;
+        });
+        raceT["isPlayable"] = sol::readonly_property(
+            [](const ESM::Race& rec) -> bool { return rec.mData.mFlags & ESM::Race::Playable; });
+        raceT["isBeast"]
+            = sol::readonly_property([](const ESM::Race& rec) -> bool { return rec.mData.mFlags & ESM::Race::Beast; });
+        raceT["height"] = sol::readonly_property([lua](const ESM::Race& rec) -> sol::table {
+            sol::table res(lua, sol::create);
+            res["male"] = rec.mData.mMaleHeight;
+            res["female"] = rec.mData.mFemaleHeight;
+            return LuaUtil::makeReadOnly(res);
+        });
+        raceT["weight"] = sol::readonly_property([lua](const ESM::Race& rec) -> sol::table {
+            sol::table res(lua, sol::create);
+            res["male"] = rec.mData.mMaleWeight;
+            res["female"] = rec.mData.mFemaleWeight;
+            return LuaUtil::makeReadOnly(res);
+        });
+
+        raceT["attributes"] = sol::readonly_property([lua](const ESM::Race& rec) -> RaceAttributes {
+            return { rec, lua };
+        });
+
+        auto attributesT = lua.new_usertype<RaceAttributes>("ESM3_RaceAttributes");
+        const auto& store = MWBase::Environment::get().getESMStore()->get<ESM::Attribute>();
+        attributesT[sol::meta_function::index]
+            = [&](const RaceAttributes& attributes, std::string_view stringId) -> sol::optional<sol::table> {
+            ESM::RefId id = ESM::RefId::deserializeText(stringId);
+            if (!store.search(id))
+                return sol::nullopt;
+            return attributes.getAttribute(id);
+        };
+        attributesT[sol::meta_function::pairs] = [&](sol::this_state ts, RaceAttributes& attributes) {
+            auto iterator = store.begin();
+            return sol::as_function(
+                [iterator, attributes,
+                    &store]() mutable -> std::pair<sol::optional<std::string>, sol::optional<sol::table>> {
+                    if (iterator != store.end())
+                    {
+                        ESM::RefId id = iterator->mId;
+                        ++iterator;
+                        return { id.serializeText(), attributes.getAttribute(id) };
+                    }
+                    return { sol::nullopt, sol::nullopt };
+                });
+        };
+
+        return LuaUtil::makeReadOnly(races);
+    }
+}
diff --git a/apps/openmw/mwlua/racebindings.hpp b/apps/openmw/mwlua/racebindings.hpp
new file mode 100644
index 0000000000..43ba9237c5
--- /dev/null
+++ b/apps/openmw/mwlua/racebindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_RACEBINDINGS_H
+#define MWLUA_RACEBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initRaceRecordBindings(const Context& context);
+}
+
+#endif // MWLUA_RACEBINDINGS_H
diff --git a/apps/openmw/mwlua/recordstore.hpp b/apps/openmw/mwlua/recordstore.hpp
new file mode 100644
index 0000000000..aed84a1271
--- /dev/null
+++ b/apps/openmw/mwlua/recordstore.hpp
@@ -0,0 +1,64 @@
+#ifndef MWLUA_RECORDSTORE_H
+#define MWLUA_RECORDSTORE_H
+
+#include <sol/sol.hpp>
+
+#include <components/esm/defs.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
+
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
+#include "apps/openmw/mwworld/store.hpp"
+
+#include "context.hpp"
+#include "object.hpp"
+
+namespace sol
+{
+    // Ensure sol does not try to create the automatic Container or usertype bindings for Store.
+    // They include write operations and we want the store to be read-only.
+    template <typename T>
+    struct is_automagical<typename MWWorld::Store<T>> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+    template <class T>
+    void addRecordFunctionBinding(
+        sol::table& table, const Context& context, const std::string& recordName = std::string(T::getRecordType()))
+    {
+        const MWWorld::Store<T>& store = MWBase::Environment::get().getESMStore()->get<T>();
+
+        table["record"] = sol::overload([](const Object& obj) -> const T* { return obj.ptr().get<T>()->mBase; },
+            [&store](std::string_view id) -> const T* { return store.search(ESM::RefId::deserializeText(id)); });
+
+        // Define a custom user type for the store.
+        // Provide the interface of a read-only array.
+        using StoreT = MWWorld::Store<T>;
+        sol::state_view lua = context.sol();
+        sol::usertype<StoreT> storeT = lua.new_usertype<StoreT>(recordName + "WorldStore");
+        storeT[sol::meta_function::to_string] = [recordName](const StoreT& store) {
+            return "{" + std::to_string(store.getSize()) + " " + recordName + " records}";
+        };
+        storeT[sol::meta_function::length] = [](const StoreT& store) { return store.getSize(); };
+        storeT[sol::meta_function::index] = sol::overload(
+            [](const StoreT& store, size_t index) -> const T* {
+                if (index == 0 || index > store.getSize())
+                    return nullptr;
+                return store.at(LuaUtil::fromLuaIndex(index));
+            },
+            [](const StoreT& store, std::string_view id) -> const T* {
+                return store.search(ESM::RefId::deserializeText(id));
+            });
+        storeT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
+        storeT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
+
+        // Provide access to the store.
+        table["records"] = &store;
+    }
+}
+#endif // MWLUA_RECORDSTORE_H
diff --git a/apps/openmw/mwlua/soundbindings.cpp b/apps/openmw/mwlua/soundbindings.cpp
index 355ede9f27..09309803d3 100644
--- a/apps/openmw/mwlua/soundbindings.cpp
+++ b/apps/openmw/mwlua/soundbindings.cpp
@@ -1,4 +1,5 @@
 #include "soundbindings.hpp"
+#include "recordstore.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -11,6 +12,7 @@
 #include <components/vfs/pathutil.hpp>
 
 #include "luamanagerimp.hpp"
+#include "objectvariant.hpp"
 
 namespace
 {
@@ -23,6 +25,32 @@ namespace
         float mTimeOffset = 0.f;
     };
 
+    struct StreamMusicArgs
+    {
+        float mFade = 1.f;
+    };
+
+    MWWorld::Ptr getMutablePtrOrThrow(const MWLua::ObjectVariant& variant)
+    {
+        if (variant.isLObject())
+            throw std::runtime_error("Local scripts can only modify object they are attached to.");
+
+        MWWorld::Ptr ptr = variant.ptr();
+        if (ptr.isEmpty())
+            throw std::runtime_error("Invalid object");
+
+        return ptr;
+    }
+
+    MWWorld::Ptr getPtrOrThrow(const MWLua::ObjectVariant& variant)
+    {
+        MWWorld::Ptr ptr = variant.ptr();
+        if (ptr.isEmpty())
+            throw std::runtime_error("Invalid object");
+
+        return ptr;
+    }
+
     PlaySoundArgs getPlaySoundArgs(const sol::optional<sol::table>& options)
     {
         PlaySoundArgs args;
@@ -55,13 +83,28 @@ namespace
             return MWSound::PlayMode::NoEnvNoScaling;
         return MWSound::PlayMode::NoEnv;
     }
+
+    StreamMusicArgs getStreamMusicArgs(const sol::optional<sol::table>& options)
+    {
+        StreamMusicArgs args;
+
+        if (options.has_value())
+        {
+            args.mFade = options->get_or("fadeOut", 1.f);
+        }
+        return args;
+    }
 }
 
 namespace MWLua
 {
     sol::table initAmbientPackage(const Context& context)
     {
-        sol::table api(context.mLua->sol(), sol::create);
+        sol::state_view lua = context.sol();
+        if (lua["openmw_ambient"] != sol::nil)
+            return lua["openmw_ambient"];
+
+        sol::table api(lua, sol::create);
 
         api["playSound"] = [](std::string_view soundId, const sol::optional<sol::table>& options) {
             auto args = getPlaySoundArgs(options);
@@ -95,88 +138,102 @@ namespace MWLua
             return MWBase::Environment::get().getSoundManager()->getSoundPlaying(MWWorld::Ptr(), fileName);
         };
 
-        return LuaUtil::makeReadOnly(api);
+        api["streamMusic"] = [](std::string_view fileName, const sol::optional<sol::table>& options) {
+            auto args = getStreamMusicArgs(options);
+            MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+            sndMgr->streamMusic(VFS::Path::Normalized(fileName), MWSound::MusicType::Normal, args.mFade);
+        };
+
+        api["say"]
+            = [luaManager = context.mLuaManager](std::string_view fileName, sol::optional<std::string_view> text) {
+                  MWBase::Environment::get().getSoundManager()->say(VFS::Path::Normalized(fileName));
+                  if (text)
+                      luaManager->addUIMessage(*text);
+              };
+
+        api["stopSay"] = []() { MWBase::Environment::get().getSoundManager()->stopSay(MWWorld::ConstPtr()); };
+        api["isSayActive"]
+            = []() { return MWBase::Environment::get().getSoundManager()->sayActive(MWWorld::ConstPtr()); };
+
+        api["isMusicPlaying"] = []() { return MWBase::Environment::get().getSoundManager()->isMusicPlaying(); };
+
+        api["stopMusic"] = []() {
+            MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+            if (sndMgr->getMusicType() == MWSound::MusicType::MWScript)
+                return;
+
+            sndMgr->stopMusic();
+        };
+
+        lua["openmw_ambient"] = LuaUtil::makeReadOnly(api);
+        return lua["openmw_ambient"];
     }
 
     sol::table initCoreSoundBindings(const Context& context)
     {
-        sol::state_view& lua = context.mLua->sol();
+        sol::state_view lua = context.sol();
         sol::table api(lua, sol::create);
 
+        api["isEnabled"] = []() { return MWBase::Environment::get().getSoundManager()->isEnabled(); };
+
         api["playSound3d"]
-            = [](std::string_view soundId, const Object& object, const sol::optional<sol::table>& options) {
+            = [](std::string_view soundId, const sol::object& object, const sol::optional<sol::table>& options) {
                   auto args = getPlaySoundArgs(options);
                   auto playMode = getPlayMode(args, true);
 
                   ESM::RefId sound = ESM::RefId::deserializeText(soundId);
+                  MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
 
                   MWBase::Environment::get().getSoundManager()->playSound3D(
-                      object.ptr(), sound, args.mVolume, args.mPitch, MWSound::Type::Sfx, playMode, args.mTimeOffset);
+                      ptr, sound, args.mVolume, args.mPitch, MWSound::Type::Sfx, playMode, args.mTimeOffset);
               };
         api["playSoundFile3d"]
-            = [](std::string_view fileName, const Object& object, const sol::optional<sol::table>& options) {
+            = [](std::string_view fileName, const sol::object& object, const sol::optional<sol::table>& options) {
                   auto args = getPlaySoundArgs(options);
                   auto playMode = getPlayMode(args, true);
+                  MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
 
-                  MWBase::Environment::get().getSoundManager()->playSound3D(object.ptr(), fileName, args.mVolume,
-                      args.mPitch, MWSound::Type::Sfx, playMode, args.mTimeOffset);
+                  MWBase::Environment::get().getSoundManager()->playSound3D(
+                      ptr, fileName, args.mVolume, args.mPitch, MWSound::Type::Sfx, playMode, args.mTimeOffset);
               };
 
-        api["stopSound3d"] = [](std::string_view soundId, const Object& object) {
+        api["stopSound3d"] = [](std::string_view soundId, const sol::object& object) {
             ESM::RefId sound = ESM::RefId::deserializeText(soundId);
-            MWBase::Environment::get().getSoundManager()->stopSound3D(object.ptr(), sound);
+            MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+            MWBase::Environment::get().getSoundManager()->stopSound3D(ptr, sound);
         };
-        api["stopSoundFile3d"] = [](std::string_view fileName, const Object& object) {
-            MWBase::Environment::get().getSoundManager()->stopSound3D(object.ptr(), fileName);
+        api["stopSoundFile3d"] = [](std::string_view fileName, const sol::object& object) {
+            MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+            MWBase::Environment::get().getSoundManager()->stopSound3D(ptr, fileName);
         };
 
-        api["isSoundPlaying"] = [](std::string_view soundId, const Object& object) {
+        api["isSoundPlaying"] = [](std::string_view soundId, const sol::object& object) {
             ESM::RefId sound = ESM::RefId::deserializeText(soundId);
-            return MWBase::Environment::get().getSoundManager()->getSoundPlaying(object.ptr(), sound);
+            const MWWorld::Ptr& ptr = getPtrOrThrow(ObjectVariant(object));
+            return MWBase::Environment::get().getSoundManager()->getSoundPlaying(ptr, sound);
         };
-        api["isSoundFilePlaying"] = [](std::string_view fileName, const Object& object) {
-            return MWBase::Environment::get().getSoundManager()->getSoundPlaying(object.ptr(), fileName);
+        api["isSoundFilePlaying"] = [](std::string_view fileName, const sol::object& object) {
+            const MWWorld::Ptr& ptr = getPtrOrThrow(ObjectVariant(object));
+            return MWBase::Environment::get().getSoundManager()->getSoundPlaying(ptr, fileName);
         };
 
-        api["say"] = sol::overload(
-            [luaManager = context.mLuaManager](
-                std::string_view fileName, const Object& object, sol::optional<std::string_view> text) {
-                MWBase::Environment::get().getSoundManager()->say(object.ptr(), std::string(fileName));
-                if (text)
-                    luaManager->addUIMessage(*text);
-            },
-            [luaManager = context.mLuaManager](std::string_view fileName, sol::optional<std::string_view> text) {
-                MWBase::Environment::get().getSoundManager()->say(std::string(fileName));
-                if (text)
-                    luaManager->addUIMessage(*text);
-            });
-        api["stopSay"] = sol::overload(
-            [](const Object& object) {
-                const MWWorld::Ptr& objPtr = object.ptr();
-                MWBase::Environment::get().getSoundManager()->stopSay(objPtr);
-            },
-            []() { MWBase::Environment::get().getSoundManager()->stopSay(MWWorld::ConstPtr()); });
-        api["isSayActive"] = sol::overload(
-            [](const Object& object) {
-                const MWWorld::Ptr& objPtr = object.ptr();
-                return MWBase::Environment::get().getSoundManager()->sayActive(objPtr);
-            },
-            []() { return MWBase::Environment::get().getSoundManager()->sayActive(MWWorld::ConstPtr()); });
+        api["say"] = [luaManager = context.mLuaManager](
+                         std::string_view fileName, const sol::object& object, sol::optional<std::string_view> text) {
+            MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+            MWBase::Environment::get().getSoundManager()->say(ptr, VFS::Path::Normalized(fileName));
+            if (text)
+                luaManager->addUIMessage(*text);
+        };
+        api["stopSay"] = [](const sol::object& object) {
+            MWWorld::Ptr ptr = getMutablePtrOrThrow(ObjectVariant(object));
+            MWBase::Environment::get().getSoundManager()->stopSay(ptr);
+        };
+        api["isSayActive"] = [](const sol::object& object) {
+            const MWWorld::Ptr& ptr = getPtrOrThrow(ObjectVariant(object));
+            return MWBase::Environment::get().getSoundManager()->sayActive(ptr);
+        };
 
-        using SoundStore = MWWorld::Store<ESM::Sound>;
-        sol::usertype<SoundStore> soundStoreT = lua.new_usertype<SoundStore>("ESM3_SoundStore");
-        soundStoreT[sol::meta_function::to_string]
-            = [](const SoundStore& store) { return "ESM3_SoundStore{" + std::to_string(store.getSize()) + " sounds}"; };
-        soundStoreT[sol::meta_function::length] = [](const SoundStore& store) { return store.getSize(); };
-        soundStoreT[sol::meta_function::index] = sol::overload(
-            [](const SoundStore& store, size_t index) -> const ESM::Sound* { return store.at(index - 1); },
-            [](const SoundStore& store, std::string_view soundId) -> const ESM::Sound* {
-                return store.find(ESM::RefId::deserializeText(soundId));
-            });
-        soundStoreT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
-        soundStoreT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
-
-        api["sounds"] = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>();
+        addRecordFunctionBinding<ESM::Sound>(api, context);
 
         // Sound record
         auto soundT = lua.new_usertype<ESM::Sound>("ESM3_Sound");
@@ -190,7 +247,7 @@ namespace MWLua
         soundT["maxRange"]
             = sol::readonly_property([](const ESM::Sound& rec) -> unsigned char { return rec.mData.mMaxRange; });
         soundT["fileName"] = sol::readonly_property([](const ESM::Sound& rec) -> std::string {
-            return VFS::Path::normalizeFilename(Misc::ResourceHelpers::correctSoundPath(rec.mSound));
+            return Misc::ResourceHelpers::correctSoundPath(VFS::Path::Normalized(rec.mSound)).value();
         });
 
         return LuaUtil::makeReadOnly(api);
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index c202e9dc33..317ffbd406 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -8,6 +8,8 @@
 
 #include <components/esm3/loadclas.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "context.hpp"
 #include "localscripts.hpp"
@@ -20,6 +22,7 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "objectvariant.hpp"
+#include "recordstore.hpp"
 
 namespace
 {
@@ -28,7 +31,7 @@ namespace
     using Index = const SelfObject::CachedStat::Index&;
 
     template <class T>
-    auto addIndexedAccessor(Index index)
+    auto addIndexedAccessor(auto index)
     {
         return [index](const sol::object& o) { return T::create(ObjectVariant(o), index); };
     }
@@ -51,7 +54,7 @@ namespace
             if (it != self->mStatsCache.end())
                 return it->second;
         }
-        return sol::make_object(context.mLua->sol(), getter(obj.ptr()));
+        return sol::make_object(context.mLua->unsafeState(), getter(obj.ptr()));
     }
 }
 
@@ -70,6 +73,96 @@ namespace MWLua
             "StatUpdateAction");
     }
 
+    static void setCreatureValue(Index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+    {
+        auto& stats = ptr.getClass().getCreatureStats(ptr);
+        if (prop == "current")
+            stats.setLevel(LuaUtil::cast<int>(value));
+    }
+
+    static void setNpcValue(Index index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+    {
+        auto& stats = ptr.getClass().getNpcStats(ptr);
+        if (prop == "progress")
+            stats.setLevelProgress(LuaUtil::cast<int>(value));
+        else if (prop == "skillIncreasesForAttribute")
+            stats.setSkillIncreasesForAttribute(
+                *std::get<ESM::RefId>(index).getIf<ESM::StringRefId>(), LuaUtil::cast<int>(value));
+        else if (prop == "skillIncreasesForSpecialization")
+            stats.setSkillIncreasesForSpecialization(
+                static_cast<ESM::Class::Specialization>(std::get<int>(index)), LuaUtil::cast<int>(value));
+    }
+
+    class SkillIncreasesForAttributeStats
+    {
+        ObjectVariant mObject;
+
+    public:
+        SkillIncreasesForAttributeStats(ObjectVariant object)
+            : mObject(std::move(object))
+        {
+        }
+
+        sol::object get(const Context& context, ESM::StringRefId attributeId) const
+        {
+            const auto& ptr = mObject.ptr();
+            if (!ptr.getClass().isNpc())
+                return sol::nil;
+
+            return getValue(context, mObject, &setNpcValue, attributeId, "skillIncreasesForAttribute",
+                [attributeId](const MWWorld::Ptr& ptr) {
+                    return ptr.getClass().getNpcStats(ptr).getSkillIncreasesForAttribute(attributeId);
+                });
+        }
+
+        void set(const Context& context, ESM::StringRefId attributeId, const sol::object& value) const
+        {
+            const auto& ptr = mObject.ptr();
+            if (!ptr.getClass().isNpc())
+                return;
+
+            SelfObject* obj = mObject.asSelfObject();
+            addStatUpdateAction(context.mLuaManager, *obj);
+            obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, attributeId, "skillIncreasesForAttribute" }] = value;
+        }
+    };
+
+    class SkillIncreasesForSpecializationStats
+    {
+        ObjectVariant mObject;
+
+    public:
+        SkillIncreasesForSpecializationStats(ObjectVariant object)
+            : mObject(std::move(object))
+        {
+        }
+
+        sol::object get(const Context& context, int specialization) const
+        {
+            const auto& ptr = mObject.ptr();
+            if (!ptr.getClass().isNpc())
+                return sol::nil;
+
+            return getValue(context, mObject, &setNpcValue, specialization, "skillIncreasesForSpecialization",
+                [specialization](const MWWorld::Ptr& ptr) {
+                    return ptr.getClass().getNpcStats(ptr).getSkillIncreasesForSpecialization(
+                        static_cast<ESM::Class::Specialization>(specialization));
+                });
+        }
+
+        void set(const Context& context, int specialization, const sol::object& value) const
+        {
+            const auto& ptr = mObject.ptr();
+            if (!ptr.getClass().isNpc())
+                return;
+
+            SelfObject* obj = mObject.asSelfObject();
+            addStatUpdateAction(context.mLuaManager, *obj);
+            obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, specialization, "skillIncreasesForSpecialization" }]
+                = value;
+        }
+    };
+
     class LevelStat
     {
         ObjectVariant mObject;
@@ -82,7 +175,7 @@ namespace MWLua
     public:
         sol::object getCurrent(const Context& context) const
         {
-            return getValue(context, mObject, &LevelStat::setValue, 0, "current",
+            return getValue(context, mObject, &setCreatureValue, std::monostate{}, "current",
                 [](const MWWorld::Ptr& ptr) { return ptr.getClass().getCreatureStats(ptr).getLevel(); });
         }
 
@@ -90,7 +183,7 @@ namespace MWLua
         {
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &LevelStat::setValue, 0, "current" }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &setCreatureValue, std::monostate{}, "current" }] = value;
         }
 
         sol::object getProgress(const Context& context) const
@@ -98,7 +191,30 @@ namespace MWLua
             const auto& ptr = mObject.ptr();
             if (!ptr.getClass().isNpc())
                 return sol::nil;
-            return sol::make_object(context.mLua->sol(), ptr.getClass().getNpcStats(ptr).getLevelProgress());
+
+            return getValue(context, mObject, &setNpcValue, std::monostate{}, "progress",
+                [](const MWWorld::Ptr& ptr) { return ptr.getClass().getNpcStats(ptr).getLevelProgress(); });
+        }
+
+        void setProgress(const Context& context, const sol::object& value) const
+        {
+            const auto& ptr = mObject.ptr();
+            if (!ptr.getClass().isNpc())
+                return;
+
+            SelfObject* obj = mObject.asSelfObject();
+            addStatUpdateAction(context.mLuaManager, *obj);
+            obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, std::monostate{}, "progress" }] = value;
+        }
+
+        SkillIncreasesForAttributeStats getSkillIncreasesForAttributeStats() const
+        {
+            return SkillIncreasesForAttributeStats{ mObject };
+        }
+
+        SkillIncreasesForSpecializationStats getSkillIncreasesForSpecializationStats() const
+        {
+            return SkillIncreasesForSpecializationStats{ mObject };
         }
 
         static std::optional<LevelStat> create(ObjectVariant object, Index)
@@ -107,13 +223,6 @@ namespace MWLua
                 return {};
             return LevelStat{ std::move(object) };
         }
-
-        static void setValue(Index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
-        {
-            auto& stats = ptr.getClass().getCreatureStats(ptr);
-            if (prop == "current")
-                stats.setLevel(LuaUtil::cast<int>(value));
-        }
     };
 
     class DynamicStat
@@ -316,10 +425,74 @@ namespace MWLua
             stats.setSkill(id, stat);
         }
     };
+
+    class AIStat
+    {
+        ObjectVariant mObject;
+        MWMechanics::AiSetting mIndex;
+
+        AIStat(ObjectVariant object, MWMechanics::AiSetting index)
+            : mObject(std::move(object))
+            , mIndex(index)
+        {
+        }
+
+    public:
+        template <class G>
+        sol::object get(const Context& context, std::string_view prop, G getter) const
+        {
+            return getValue(context, mObject, &AIStat::setValue, static_cast<int>(mIndex), prop,
+                [this, getter](const MWWorld::Ptr& ptr) {
+                    return (ptr.getClass().getCreatureStats(ptr).getAiSetting(mIndex).*getter)();
+                });
+        }
+
+        int getModified(const Context& context) const
+        {
+            auto base = LuaUtil::cast<int>(get(context, "base", &MWMechanics::Stat<int>::getBase));
+            auto modifier = LuaUtil::cast<int>(get(context, "modifier", &MWMechanics::Stat<int>::getModifier));
+            return std::max(0, base + modifier);
+        }
+
+        static std::optional<AIStat> create(ObjectVariant object, MWMechanics::AiSetting index)
+        {
+            if (!object.ptr().getClass().isActor())
+                return {};
+            return AIStat{ std::move(object), index };
+        }
+
+        void cache(const Context& context, std::string_view prop, const sol::object& value) const
+        {
+            SelfObject* obj = mObject.asSelfObject();
+            addStatUpdateAction(context.mLuaManager, *obj);
+            obj->mStatsCache[SelfObject::CachedStat{ &AIStat::setValue, static_cast<int>(mIndex), prop }] = value;
+        }
+
+        static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+        {
+            auto index = static_cast<MWMechanics::AiSetting>(std::get<int>(i));
+            auto& stats = ptr.getClass().getCreatureStats(ptr);
+            auto stat = stats.getAiSetting(index);
+            int intValue = LuaUtil::cast<int>(value);
+            if (prop == "base")
+                stat.setBase(intValue);
+            else if (prop == "modifier")
+                stat.setModifier(intValue);
+            stats.setAiSetting(index, stat);
+        }
+    };
 }
 
 namespace sol
 {
+    template <>
+    struct is_automagical<MWLua::SkillIncreasesForAttributeStats> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<MWLua::SkillIncreasesForSpecializationStats> : std::false_type
+    {
+    };
     template <>
     struct is_automagical<MWLua::LevelStat> : std::false_type
     {
@@ -336,61 +509,197 @@ namespace sol
     struct is_automagical<MWLua::SkillStat> : std::false_type
     {
     };
+    template <>
+    struct is_automagical<ESM::Attribute> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<ESM::Skill> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<ESM::MagicSchool> : std::false_type
+    {
+    };
+    template <>
+    struct is_automagical<MWLua::AIStat> : std::false_type
+    {
+    };
 }
 
 namespace MWLua
 {
     void addActorStatsBindings(sol::table& actor, const Context& context)
     {
-        sol::table stats(context.mLua->sol(), sol::create);
+        sol::state_view lua = context.sol();
+        sol::table stats(lua, sol::create);
         actor["stats"] = LuaUtil::makeReadOnly(stats);
 
-        auto levelStatT = context.mLua->sol().new_usertype<LevelStat>("LevelStat");
+        auto skillIncreasesForAttributeStatsT
+            = lua.new_usertype<SkillIncreasesForAttributeStats>("SkillIncreasesForAttributeStats");
+        for (const auto& attribute : MWBase::Environment::get().getESMStore()->get<ESM::Attribute>())
+        {
+            skillIncreasesForAttributeStatsT[ESM::RefId(attribute.mId).serializeText()] = sol::property(
+                [=](const SkillIncreasesForAttributeStats& stat) { return stat.get(context, attribute.mId); },
+                [=](const SkillIncreasesForAttributeStats& stat, const sol::object& value) {
+                    stat.set(context, attribute.mId, value);
+                });
+        }
+        // ESM::Class::specializationIndexToLuaId.at(rec.mData.mSpecialization)
+        auto skillIncreasesForSpecializationStatsT
+            = lua.new_usertype<SkillIncreasesForSpecializationStats>("skillIncreasesForSpecializationStats");
+        for (int i = 0; i < 3; i++)
+        {
+            std::string_view index = ESM::Class::specializationIndexToLuaId.at(i);
+            skillIncreasesForSpecializationStatsT[index]
+                = sol::property([=](const SkillIncreasesForSpecializationStats& stat) { return stat.get(context, i); },
+                    [=](const SkillIncreasesForSpecializationStats& stat, const sol::object& value) {
+                        stat.set(context, i, value);
+                    });
+        }
+
+        auto levelStatT = lua.new_usertype<LevelStat>("LevelStat");
         levelStatT["current"] = sol::property([context](const LevelStat& stat) { return stat.getCurrent(context); },
             [context](const LevelStat& stat, const sol::object& value) { stat.setCurrent(context, value); });
-        levelStatT["progress"] = sol::property([context](const LevelStat& stat) { return stat.getProgress(context); });
+        levelStatT["progress"] = sol::property([context](const LevelStat& stat) { return stat.getProgress(context); },
+            [context](const LevelStat& stat, const sol::object& value) { stat.setProgress(context, value); });
+        levelStatT["skillIncreasesForAttribute"]
+            = sol::readonly_property([](const LevelStat& stat) { return stat.getSkillIncreasesForAttributeStats(); });
+        levelStatT["skillIncreasesForSpecialization"] = sol::readonly_property(
+            [](const LevelStat& stat) { return stat.getSkillIncreasesForSpecializationStats(); });
         stats["level"] = addIndexedAccessor<LevelStat>(0);
 
-        auto dynamicStatT = context.mLua->sol().new_usertype<DynamicStat>("DynamicStat");
+        auto dynamicStatT = lua.new_usertype<DynamicStat>("DynamicStat");
         addProp(context, dynamicStatT, "base", &MWMechanics::DynamicStat<float>::getBase);
         addProp(context, dynamicStatT, "current", &MWMechanics::DynamicStat<float>::getCurrent);
         addProp(context, dynamicStatT, "modifier", &MWMechanics::DynamicStat<float>::getModifier);
-        sol::table dynamic(context.mLua->sol(), sol::create);
+        sol::table dynamic(lua, sol::create);
         stats["dynamic"] = LuaUtil::makeReadOnly(dynamic);
         dynamic["health"] = addIndexedAccessor<DynamicStat>(0);
         dynamic["magicka"] = addIndexedAccessor<DynamicStat>(1);
         dynamic["fatigue"] = addIndexedAccessor<DynamicStat>(2);
 
-        auto attributeStatT = context.mLua->sol().new_usertype<AttributeStat>("AttributeStat");
+        auto attributeStatT = lua.new_usertype<AttributeStat>("AttributeStat");
         addProp(context, attributeStatT, "base", &MWMechanics::AttributeValue::getBase);
         addProp(context, attributeStatT, "damage", &MWMechanics::AttributeValue::getDamage);
         attributeStatT["modified"]
-            = sol::property([=](const AttributeStat& stat) { return stat.getModified(context); });
+            = sol::readonly_property([=](const AttributeStat& stat) { return stat.getModified(context); });
         addProp(context, attributeStatT, "modifier", &MWMechanics::AttributeValue::getModifier);
-        sol::table attributes(context.mLua->sol(), sol::create);
+        sol::table attributes(lua, sol::create);
         stats["attributes"] = LuaUtil::makeReadOnly(attributes);
         for (const ESM::Attribute& attribute : MWBase::Environment::get().getESMStore()->get<ESM::Attribute>())
             attributes[ESM::RefId(attribute.mId).serializeText()] = addIndexedAccessor<AttributeStat>(attribute.mId);
+
+        auto aiStatT = lua.new_usertype<AIStat>("AIStat");
+        addProp(context, aiStatT, "base", &MWMechanics::Stat<int>::getBase);
+        addProp(context, aiStatT, "modifier", &MWMechanics::Stat<int>::getModifier);
+        aiStatT["modified"] = sol::readonly_property([=](const AIStat& stat) { return stat.getModified(context); });
+        sol::table ai(lua, sol::create);
+        stats["ai"] = LuaUtil::makeReadOnly(ai);
+        ai["alarm"] = addIndexedAccessor<AIStat>(MWMechanics::AiSetting::Alarm);
+        ai["fight"] = addIndexedAccessor<AIStat>(MWMechanics::AiSetting::Fight);
+        ai["flee"] = addIndexedAccessor<AIStat>(MWMechanics::AiSetting::Flee);
+        ai["hello"] = addIndexedAccessor<AIStat>(MWMechanics::AiSetting::Hello);
     }
 
     void addNpcStatsBindings(sol::table& npc, const Context& context)
     {
-        sol::table npcStats(context.mLua->sol(), sol::create);
-        sol::table baseMeta(context.mLua->sol(), sol::create);
+        sol::state_view lua = context.sol();
+        sol::table npcStats(lua, sol::create);
+        sol::table baseMeta(lua, sol::create);
         baseMeta[sol::meta_function::index] = LuaUtil::getMutableFromReadOnly(npc["baseType"]["stats"]);
         npcStats[sol::metatable_key] = baseMeta;
         npc["stats"] = LuaUtil::makeReadOnly(npcStats);
 
-        auto skillStatT = context.mLua->sol().new_usertype<SkillStat>("SkillStat");
+        auto skillStatT = lua.new_usertype<SkillStat>("SkillStat");
         addProp(context, skillStatT, "base", &MWMechanics::SkillValue::getBase);
         addProp(context, skillStatT, "damage", &MWMechanics::SkillValue::getDamage);
-        skillStatT["modified"] = sol::property([=](const SkillStat& stat) { return stat.getModified(context); });
+        skillStatT["modified"]
+            = sol::readonly_property([=](const SkillStat& stat) { return stat.getModified(context); });
         addProp(context, skillStatT, "modifier", &MWMechanics::SkillValue::getModifier);
         skillStatT["progress"] = sol::property([context](const SkillStat& stat) { return stat.getProgress(context); },
             [context](const SkillStat& stat, const sol::object& value) { stat.cache(context, "progress", value); });
-        sol::table skills(context.mLua->sol(), sol::create);
+        sol::table skills(lua, sol::create);
         npcStats["skills"] = LuaUtil::makeReadOnly(skills);
         for (const ESM::Skill& skill : MWBase::Environment::get().getESMStore()->get<ESM::Skill>())
             skills[ESM::RefId(skill.mId).serializeText()] = addIndexedAccessor<SkillStat>(skill.mId);
     }
+
+    sol::table initCoreStatsBindings(const Context& context)
+    {
+        sol::state_view lua = context.sol();
+        sol::table statsApi(lua, sol::create);
+        auto* vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
+        sol::table attributes(lua, sol::create);
+        addRecordFunctionBinding<ESM::Attribute>(attributes, context);
+        statsApi["Attribute"] = LuaUtil::makeReadOnly(attributes);
+        statsApi["Attribute"][sol::metatable_key][sol::meta_function::to_string] = ESM::Attribute::getRecordType;
+
+        auto attributeT = lua.new_usertype<ESM::Attribute>("Attribute");
+        attributeT[sol::meta_function::to_string]
+            = [](const ESM::Attribute& rec) { return "ESM3_Attribute[" + rec.mId.toDebugString() + "]"; };
+        attributeT["id"] = sol::readonly_property(
+            [](const ESM::Attribute& rec) -> std::string { return ESM::RefId{ rec.mId }.serializeText(); });
+        attributeT["name"]
+            = sol::readonly_property([](const ESM::Attribute& rec) -> std::string_view { return rec.mName; });
+        attributeT["description"]
+            = sol::readonly_property([](const ESM::Attribute& rec) -> std::string_view { return rec.mDescription; });
+        attributeT["icon"] = sol::readonly_property([vfs](const ESM::Attribute& rec) -> std::string {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
+
+        sol::table skills(lua, sol::create);
+        addRecordFunctionBinding<ESM::Skill>(skills, context);
+        statsApi["Skill"] = LuaUtil::makeReadOnly(skills);
+        statsApi["Skill"][sol::metatable_key][sol::meta_function::to_string] = ESM::Skill::getRecordType;
+
+        auto skillT = lua.new_usertype<ESM::Skill>("Skill");
+        skillT[sol::meta_function::to_string]
+            = [](const ESM::Skill& rec) { return "ESM3_Skill[" + rec.mId.toDebugString() + "]"; };
+        skillT["id"] = sol::readonly_property(
+            [](const ESM::Skill& rec) -> std::string { return ESM::RefId{ rec.mId }.serializeText(); });
+        skillT["name"] = sol::readonly_property([](const ESM::Skill& rec) -> std::string_view { return rec.mName; });
+        skillT["description"]
+            = sol::readonly_property([](const ESM::Skill& rec) -> std::string_view { return rec.mDescription; });
+        skillT["specialization"] = sol::readonly_property([](const ESM::Skill& rec) -> std::string_view {
+            return ESM::Class::specializationIndexToLuaId.at(rec.mData.mSpecialization);
+        });
+        skillT["icon"] = sol::readonly_property([vfs](const ESM::Skill& rec) -> std::string {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
+        skillT["school"] = sol::readonly_property([](const ESM::Skill& rec) -> const ESM::MagicSchool* {
+            if (!rec.mSchool)
+                return nullptr;
+            return &*rec.mSchool;
+        });
+        skillT["attribute"] = sol::readonly_property([](const ESM::Skill& rec) -> std::string {
+            return ESM::Attribute::indexToRefId(rec.mData.mAttribute).serializeText();
+        });
+        skillT["skillGain"] = sol::readonly_property([lua](const ESM::Skill& rec) -> sol::table {
+            sol::table res(lua, sol::create);
+            int index = 1;
+            for (auto skillGain : rec.mData.mUseValue)
+                res[index++] = skillGain;
+            return res;
+        });
+
+        auto schoolT = lua.new_usertype<ESM::MagicSchool>("MagicSchool");
+        schoolT[sol::meta_function::to_string]
+            = [](const ESM::MagicSchool& rec) { return "ESM3_MagicSchool[" + rec.mName + "]"; };
+        schoolT["name"]
+            = sol::readonly_property([](const ESM::MagicSchool& rec) -> std::string_view { return rec.mName; });
+        schoolT["areaSound"] = sol::readonly_property(
+            [](const ESM::MagicSchool& rec) -> std::string { return rec.mAreaSound.serializeText(); });
+        schoolT["boltSound"] = sol::readonly_property(
+            [](const ESM::MagicSchool& rec) -> std::string { return rec.mBoltSound.serializeText(); });
+        schoolT["castSound"] = sol::readonly_property(
+            [](const ESM::MagicSchool& rec) -> std::string { return rec.mCastSound.serializeText(); });
+        schoolT["failureSound"] = sol::readonly_property(
+            [](const ESM::MagicSchool& rec) -> std::string { return rec.mFailureSound.serializeText(); });
+        schoolT["hitSound"] = sol::readonly_property(
+            [](const ESM::MagicSchool& rec) -> std::string { return rec.mHitSound.serializeText(); });
+
+        return LuaUtil::makeReadOnly(statsApi);
+    }
 }
diff --git a/apps/openmw/mwlua/stats.hpp b/apps/openmw/mwlua/stats.hpp
index 8c5824cc71..4ce2f6b5eb 100644
--- a/apps/openmw/mwlua/stats.hpp
+++ b/apps/openmw/mwlua/stats.hpp
@@ -9,6 +9,7 @@ namespace MWLua
 
     void addActorStatsBindings(sol::table& actor, const Context& context);
     void addNpcStatsBindings(sol::table& npc, const Context& context);
+    sol::table initCoreStatsBindings(const Context& context);
 }
 
 #endif
diff --git a/apps/openmw/mwlua/types/activator.cpp b/apps/openmw/mwlua/types/activator.cpp
index 9fec22b221..a366256899 100644
--- a/apps/openmw/mwlua/types/activator.cpp
+++ b/apps/openmw/mwlua/types/activator.cpp
@@ -1,14 +1,13 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadacti.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-
 namespace sol
 {
     template <>
@@ -22,11 +21,19 @@ namespace
     ESM::Activator tableToActivator(const sol::table& rec)
     {
         ESM::Activator activator;
-        activator.mName = rec["name"];
-        activator.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
-        std::string_view scriptId = rec["mwscript"].get<std::string_view>();
-        activator.mScript = ESM::RefId::deserializeText(scriptId);
-        activator.mRecordFlags = 0;
+        if (rec["template"] != sol::nil)
+            activator = LuaUtil::cast<ESM::Activator>(rec["template"]);
+        else
+            activator.blank();
+        if (rec["name"] != sol::nil)
+            activator.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            activator.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            activator.mScript = ESM::RefId::deserializeText(scriptId);
+        }
         return activator;
     }
 }
@@ -35,21 +42,18 @@ namespace MWLua
 {
     void addActivatorBindings(sol::table activator, const Context& context)
     {
-        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
         activator["createRecordDraft"] = tableToActivator;
         addRecordFunctionBinding<ESM::Activator>(activator, context);
 
-        sol::usertype<ESM::Activator> record = context.mLua->sol().new_usertype<ESM::Activator>("ESM3_Activator");
+        sol::usertype<ESM::Activator> record = context.sol().new_usertype<ESM::Activator>("ESM3_Activator");
         record[sol::meta_function::to_string]
             = [](const ESM::Activator& rec) { return "ESM3_Activator[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Activator& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property([](const ESM::Activator& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
         });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Activator& rec) -> std::string { return rec.mScript.serializeText(); });
     }
 }
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index 08fd98c41c..02686684e8 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -4,9 +4,13 @@
 
 #include <components/detournavigator/agentbounds.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/settings/values.hpp>
 
+#include "apps/openmw/mwbase/environment.hpp"
 #include "apps/openmw/mwbase/mechanicsmanager.hpp"
 #include "apps/openmw/mwbase/windowmanager.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwmechanics/actorutil.hpp"
 #include "apps/openmw/mwmechanics/creaturestats.hpp"
 #include "apps/openmw/mwmechanics/drawstate.hpp"
 #include "apps/openmw/mwworld/class.hpp"
@@ -35,7 +39,7 @@ namespace MWLua
             itemPtr = MWBase::Environment::get().getWorldModel()->getPtr(std::get<ObjectId>(item));
             if (old_it != store.end() && *old_it == itemPtr)
                 return { old_it, true }; // already equipped
-            if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0
+            if (itemPtr.isEmpty() || itemPtr.getCellRef().getCount() == 0
                 || itemPtr.getContainerStore() != static_cast<const MWWorld::ContainerStore*>(&store))
             {
                 Log(Debug::Warning) << "Object" << std::get<ObjectId>(item).toString() << " is not in inventory";
@@ -49,7 +53,7 @@ namespace MWLua
             if (old_it != store.end() && old_it->getCellRef().getRefId() == recordId)
                 return { old_it, true }; // already equipped
             itemPtr = store.search(recordId);
-            if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)
+            if (itemPtr.isEmpty() || itemPtr.getCellRef().getCount() == 0)
             {
                 Log(Debug::Warning) << "There is no object with recordId='" << stringId << "' in inventory";
                 return { store.end(), false };
@@ -66,11 +70,12 @@ namespace MWLua
 
     static void setEquipment(const MWWorld::Ptr& actor, const Equipment& equipment)
     {
+        bool isPlayer = actor == MWBase::Environment::get().getWorld()->getPlayerPtr();
         MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
         std::array<bool, MWWorld::InventoryStore::Slots> usedSlots;
         std::fill(usedSlots.begin(), usedSlots.end(), false);
 
-        auto tryEquipToSlot = [&store, &usedSlots](int slot, const EquipmentItem& item) -> bool {
+        auto tryEquipToSlot = [&store, &usedSlots, isPlayer](int slot, const EquipmentItem& item) -> bool {
             auto [it, alreadyEquipped] = findInInventory(store, item, slot);
             if (alreadyEquipped)
                 return true;
@@ -93,7 +98,22 @@ namespace MWLua
                 slot = *firstAllowed;
             }
 
-            store.equip(slot, it);
+            bool skipEquip = false;
+
+            if (isPlayer)
+            {
+                const ESM::RefId& script = itemPtr.getClass().getScript(itemPtr);
+                if (!script.empty())
+                {
+                    MWScript::Locals& locals = itemPtr.getRefData().getLocals();
+                    locals.setVarByInt(script, "onpcequip", 1);
+                    skipEquip = locals.getIntVar(script, "pcskipequip") == 1;
+                }
+            }
+
+            if (!skipEquip)
+                store.equip(slot, it);
+
             return requestedSlotIsAllowed; // return true if equipped to requested slot and false if slot was changed
         };
 
@@ -152,13 +172,15 @@ namespace MWLua
 
     void addActorBindings(sol::table actor, const Context& context)
     {
+        sol::state_view lua = context.sol();
         actor["STANCE"]
-            = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWMechanics::DrawState>({
-                { "Nothing", MWMechanics::DrawState::Nothing },
-                { "Weapon", MWMechanics::DrawState::Weapon },
-                { "Spell", MWMechanics::DrawState::Spell },
-            }));
-        actor["EQUIPMENT_SLOT"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>(
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWMechanics::DrawState>(lua,
+                {
+                    { "Nothing", MWMechanics::DrawState::Nothing },
+                    { "Weapon", MWMechanics::DrawState::Weapon },
+                    { "Spell", MWMechanics::DrawState::Spell },
+                }));
+        actor["EQUIPMENT_SLOT"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(lua,
             { { "Helmet", MWWorld::InventoryStore::Slot_Helmet }, { "Cuirass", MWWorld::InventoryStore::Slot_Cuirass },
                 { "Greaves", MWWorld::InventoryStore::Slot_Greaves },
                 { "LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron },
@@ -254,7 +276,8 @@ namespace MWLua
             {
                 ei = LuaUtil::cast<std::string>(item);
             }
-            context.mLuaManager->addAction([obj = Object(ptr), ei = ei] { setSelectedEnchantedItem(obj.ptr(), ei); },
+            context.mLuaManager->addAction(
+                [obj = Object(ptr), ei = std::move(ei)] { setSelectedEnchantedItem(obj.ptr(), ei); },
                 "setSelectedEnchantedItemAction");
         };
 
@@ -358,6 +381,39 @@ namespace MWLua
             result["halfExtents"] = agentBounds.mHalfExtents;
             return result;
         };
+        actor["isInActorsProcessingRange"] = [](const Object& o) {
+            const MWWorld::Ptr player = MWMechanics::getPlayer();
+            const auto& target = o.ptr();
+            if (target == player)
+                return true;
+
+            if (!target.getClass().isActor())
+                throw std::runtime_error("Actor expected");
+
+            if (target.getCell()->getCell()->getWorldSpace() != player.getCell()->getCell()->getWorldSpace())
+                return false;
+
+            const int actorsProcessingRange = Settings::game().mActorsProcessingRange;
+            const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
+
+            const float dist = (playerPos - target.getRefData().getPosition().asVec3()).length();
+            return dist <= actorsProcessingRange;
+        };
+
+        actor["isDead"] = [](const Object& o) {
+            const auto& target = o.ptr();
+            return target.getClass().getCreatureStats(target).isDead();
+        };
+
+        actor["isDeathFinished"] = [](const Object& o) {
+            const auto& target = o.ptr();
+            return target.getClass().getCreatureStats(target).isDeathAnimationFinished();
+        };
+
+        actor["getEncumbrance"] = [](const Object& actor) -> float {
+            const MWWorld::Ptr ptr = actor.ptr();
+            return ptr.getClass().getEncumbrance(ptr);
+        };
 
         addActorStatsBindings(actor, context);
         addActorMagicBindings(actor, context);
diff --git a/apps/openmw/mwlua/types/actor.hpp b/apps/openmw/mwlua/types/actor.hpp
new file mode 100644
index 0000000000..425e44451b
--- /dev/null
+++ b/apps/openmw/mwlua/types/actor.hpp
@@ -0,0 +1,84 @@
+#ifndef MWLUA_ACTOR_H
+#define MWLUA_ACTOR_H
+
+#include <sol/sol.hpp>
+
+#include <components/esm/defs.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/lua/utilpackage.hpp>
+#include <components/misc/convert.hpp>
+#include <components/resource/resourcesystem.hpp>
+
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
+
+#include "../context.hpp"
+
+namespace MWLua
+{
+
+    template <class T>
+    void addActorServicesBindings(sol::usertype<T>& record, const Context& context)
+    {
+        record["servicesOffered"] = sol::readonly_property([context](const T& rec) -> sol::table {
+            sol::state_view lua = context.sol();
+            sol::table providedServices(lua, sol::create);
+            constexpr std::array<std::pair<int, std::string_view>, 19> serviceNames = { { { ESM::NPC::Spells,
+                                                                                              "Spells" },
+                { ESM::NPC::Spellmaking, "Spellmaking" }, { ESM::NPC::Enchanting, "Enchanting" },
+                { ESM::NPC::Training, "Training" }, { ESM::NPC::Repair, "Repair" }, { ESM::NPC::AllItems, "Barter" },
+                { ESM::NPC::Weapon, "Weapon" }, { ESM::NPC::Armor, "Armor" }, { ESM::NPC::Clothing, "Clothing" },
+                { ESM::NPC::Books, "Books" }, { ESM::NPC::Ingredients, "Ingredients" }, { ESM::NPC::Picks, "Picks" },
+                { ESM::NPC::Probes, "Probes" }, { ESM::NPC::Lights, "Lights" }, { ESM::NPC::Apparatus, "Apparatus" },
+                { ESM::NPC::RepairItem, "RepairItem" }, { ESM::NPC::Misc, "Misc" }, { ESM::NPC::Potions, "Potions" },
+                { ESM::NPC::MagicItems, "MagicItems" } } };
+
+            int services = rec.mAiData.mServices;
+            if constexpr (std::is_same_v<T, ESM::NPC>)
+            {
+                if (rec.mFlags & ESM::NPC::Autocalc)
+                    services
+                        = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(rec.mClass)->mData.mServices;
+            }
+            for (const auto& [flag, name] : serviceNames)
+            {
+                providedServices[name] = (services & flag) != 0;
+            }
+            providedServices["Travel"] = !rec.getTransport().empty();
+            return LuaUtil::makeReadOnly(providedServices);
+        });
+
+        record["travelDestinations"] = sol::readonly_property([context](const T& rec) -> sol::table {
+            sol::state_view lua = context.sol();
+            sol::table travelDests(lua, sol::create);
+            if (!rec.getTransport().empty())
+            {
+                int index = 1;
+                for (const auto& dest : rec.getTransport())
+                {
+                    sol::table travelDest(lua, sol::create);
+
+                    ESM::RefId cellId;
+                    if (dest.mCellName.empty())
+                    {
+                        const ESM::ExteriorCellLocation cellIndex
+                            = ESM::positionToExteriorCellLocation(dest.mPos.pos[0], dest.mPos.pos[1]);
+                        cellId = ESM::RefId::esm3ExteriorCell(cellIndex.mX, cellIndex.mY);
+                    }
+                    else
+                        cellId = ESM::RefId::stringRefId(dest.mCellName);
+                    travelDest["rotation"] = LuaUtil::asTransform(Misc::Convert::makeOsgQuat(dest.mPos.rot));
+                    travelDest["position"] = dest.mPos.asVec3();
+                    travelDest["cellId"] = cellId.serializeText();
+
+                    travelDests[index] = LuaUtil::makeReadOnly(travelDest);
+                    index++;
+                }
+            }
+            return LuaUtil::makeReadOnly(travelDests);
+        });
+    }
+}
+#endif // MWLUA_ACTOR_H
diff --git a/apps/openmw/mwlua/types/apparatus.cpp b/apps/openmw/mwlua/types/apparatus.cpp
index 10bdbcdd29..c9953d87ad 100644
--- a/apps/openmw/mwlua/types/apparatus.cpp
+++ b/apps/openmw/mwlua/types/apparatus.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadappa.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -21,28 +22,29 @@ namespace MWLua
 {
     void addApparatusBindings(sol::table apparatus, const Context& context)
     {
-        apparatus["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            { "MortarPestle", ESM::Apparatus::MortarPestle },
-            { "Alembic", ESM::Apparatus::Alembic },
-            { "Calcinator", ESM::Apparatus::Calcinator },
-            { "Retort", ESM::Apparatus::Retort },
-        }));
+        sol::state_view lua = context.sol();
+        apparatus["TYPE"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(lua,
+            {
+                { "MortarPestle", ESM::Apparatus::MortarPestle },
+                { "Alembic", ESM::Apparatus::Alembic },
+                { "Calcinator", ESM::Apparatus::Calcinator },
+                { "Retort", ESM::Apparatus::Retort },
+            }));
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         addRecordFunctionBinding<ESM::Apparatus>(apparatus, context);
 
-        sol::usertype<ESM::Apparatus> record = context.mLua->sol().new_usertype<ESM::Apparatus>("ESM3_Apparatus");
+        sol::usertype<ESM::Apparatus> record = lua.new_usertype<ESM::Apparatus>("ESM3_Apparatus");
         record[sol::meta_function::to_string]
             = [](const ESM::Apparatus& rec) { return "ESM3_Apparatus[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property([](const ESM::Apparatus& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
         });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Apparatus& rec) -> std::string { return rec.mScript.serializeText(); });
         record["icon"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
diff --git a/apps/openmw/mwlua/types/armor.cpp b/apps/openmw/mwlua/types/armor.cpp
index 9f28f56e2f..0acb517dbe 100644
--- a/apps/openmw/mwlua/types/armor.cpp
+++ b/apps/openmw/mwlua/types/armor.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadarmo.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -22,25 +23,45 @@ namespace
     ESM::Armor tableToArmor(const sol::table& rec)
     {
         ESM::Armor armor;
-        armor.mName = rec["name"];
-        armor.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
-        armor.mIcon = rec["icon"];
-        std::string_view enchantId = rec["enchant"].get<std::string_view>();
-        armor.mEnchant = ESM::RefId::deserializeText(enchantId);
-        std::string_view scriptId = rec["mwscript"].get<std::string_view>();
-        armor.mScript = ESM::RefId::deserializeText(scriptId);
-
-        armor.mData.mWeight = rec["weight"];
-        armor.mData.mValue = rec["value"];
-        int armorType = rec["type"].get<int>();
-        if (armorType >= 0 && armorType <= ESM::Armor::RBracer)
-            armor.mData.mType = armorType;
+        if (rec["template"] != sol::nil)
+            armor = LuaUtil::cast<ESM::Armor>(rec["template"]);
         else
-            throw std::runtime_error("Invalid Armor Type provided: " + std::to_string(armorType));
-        armor.mData.mHealth = rec["health"];
-        armor.mData.mArmor = rec["baseArmor"];
-        armor.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
-        armor.mRecordFlags = 0;
+            armor.blank();
+        if (rec["name"] != sol::nil)
+            armor.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            armor.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["icon"] != sol::nil)
+            armor.mIcon = rec["icon"];
+        if (rec["enchant"] != sol::nil)
+        {
+            std::string_view enchantId = rec["enchant"].get<std::string_view>();
+            armor.mEnchant = ESM::RefId::deserializeText(enchantId);
+        }
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            armor.mScript = ESM::RefId::deserializeText(scriptId);
+        }
+
+        if (rec["weight"] != sol::nil)
+            armor.mData.mWeight = rec["weight"];
+        if (rec["value"] != sol::nil)
+            armor.mData.mValue = rec["value"];
+        if (rec["type"] != sol::nil)
+        {
+            int armorType = rec["type"].get<int>();
+            if (armorType >= 0 && armorType <= ESM::Armor::RBracer)
+                armor.mData.mType = armorType;
+            else
+                throw std::runtime_error("Invalid Armor Type provided: " + std::to_string(armorType));
+        }
+        if (rec["health"] != sol::nil)
+            armor.mData.mHealth = rec["health"];
+        if (rec["baseArmor"] != sol::nil)
+            armor.mData.mArmor = rec["baseArmor"];
+        if (rec["enchantCapacity"] != sol::nil)
+            armor.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
 
         return armor;
     }
@@ -50,41 +71,41 @@ namespace MWLua
 {
     void addArmorBindings(sol::table armor, const Context& context)
     {
-        armor["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            { "Helmet", ESM::Armor::Helmet },
-            { "Cuirass", ESM::Armor::Cuirass },
-            { "LPauldron", ESM::Armor::LPauldron },
-            { "RPauldron", ESM::Armor::RPauldron },
-            { "Greaves", ESM::Armor::Greaves },
-            { "Boots", ESM::Armor::Boots },
-            { "LGauntlet", ESM::Armor::LGauntlet },
-            { "RGauntlet", ESM::Armor::RGauntlet },
-            { "Shield", ESM::Armor::Shield },
-            { "LBracer", ESM::Armor::LBracer },
-            { "RBracer", ESM::Armor::RBracer },
-        }));
+        sol::state_view lua = context.sol();
+        armor["TYPE"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(lua,
+            {
+                { "Helmet", ESM::Armor::Helmet },
+                { "Cuirass", ESM::Armor::Cuirass },
+                { "LPauldron", ESM::Armor::LPauldron },
+                { "RPauldron", ESM::Armor::RPauldron },
+                { "Greaves", ESM::Armor::Greaves },
+                { "Boots", ESM::Armor::Boots },
+                { "LGauntlet", ESM::Armor::LGauntlet },
+                { "RGauntlet", ESM::Armor::RGauntlet },
+                { "Shield", ESM::Armor::Shield },
+                { "LBracer", ESM::Armor::LBracer },
+                { "RBracer", ESM::Armor::RBracer },
+            }));
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         addRecordFunctionBinding<ESM::Armor>(armor, context);
 
         armor["createRecordDraft"] = tableToArmor;
-        sol::usertype<ESM::Armor> record = context.mLua->sol().new_usertype<ESM::Armor>("ESM3_Armor");
+        sol::usertype<ESM::Armor> record = lua.new_usertype<ESM::Armor>("ESM3_Armor");
         record[sol::meta_function::to_string]
             = [](const ESM::Armor& rec) -> std::string { return "ESM3_Armor[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Armor& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Armor& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Armor& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
         record["icon"] = sol::readonly_property([vfs](const ESM::Armor& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
-        record["enchant"]
-            = sol::readonly_property([](const ESM::Armor& rec) -> std::string { return rec.mEnchant.serializeText(); });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Armor& rec) -> std::string { return rec.mScript.serializeText(); });
+        record["enchant"] = sol::readonly_property(
+            [](const ESM::Armor& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mEnchant); });
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Armor& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["weight"] = sol::readonly_property([](const ESM::Armor& rec) -> float { return rec.mData.mWeight; });
         record["value"] = sol::readonly_property([](const ESM::Armor& rec) -> int { return rec.mData.mValue; });
         record["type"] = sol::readonly_property([](const ESM::Armor& rec) -> int { return rec.mData.mType; });
diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
index 9501691a72..b133a90c3a 100644
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -1,17 +1,17 @@
 #include "types.hpp"
 
-#include <components/misc/strings/algorithm.hpp>
-#include <components/misc/strings/lower.hpp>
+#include "modelproperty.hpp"
 
 #include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadskil.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/misc/strings/lower.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-#include <components/esm3/loadskil.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -27,30 +27,54 @@ namespace
     ESM::Book tableToBook(const sol::table& rec)
     {
         ESM::Book book;
-        book.mName = rec["name"];
-        book.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
-        book.mIcon = rec["icon"];
-        book.mText = rec["text"];
-        std::string_view enchantId = rec["enchant"].get<std::string_view>();
-        book.mEnchant = ESM::RefId::deserializeText(enchantId);
-
-        book.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
-        std::string_view scriptId = rec["mwscript"].get<std::string_view>();
-        book.mScript = ESM::RefId::deserializeText(scriptId);
-        book.mData.mWeight = rec["weight"];
-        book.mData.mValue = rec["value"];
-        book.mData.mIsScroll = rec["isScroll"];
-        book.mRecordFlags = 0;
-
-        ESM::RefId skill = ESM::RefId::deserializeText(rec["skill"].get<std::string_view>());
-
-        book.mData.mSkillId = -1;
-        if (!skill.empty())
+        if (rec["template"] != sol::nil)
+            book = LuaUtil::cast<ESM::Book>(rec["template"]);
+        else
         {
-            book.mData.mSkillId = ESM::Skill::refIdToIndex(skill);
-            if (book.mData.mSkillId == -1)
-                throw std::runtime_error("Incorrect skill: " + skill.toDebugString());
+            book.blank();
+            book.mData.mSkillId = -1;
         }
+        if (rec["name"] != sol::nil)
+            book.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            book.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["icon"] != sol::nil)
+            book.mIcon = rec["icon"];
+        if (rec["text"] != sol::nil)
+            book.mText = rec["text"];
+        if (rec["enchant"] != sol::nil)
+        {
+            std::string_view enchantId = rec["enchant"].get<std::string_view>();
+            book.mEnchant = ESM::RefId::deserializeText(enchantId);
+        }
+
+        if (rec["enchantCapacity"] != sol::nil)
+            book.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            book.mScript = ESM::RefId::deserializeText(scriptId);
+        }
+        if (rec["weight"] != sol::nil)
+            book.mData.mWeight = rec["weight"];
+        if (rec["value"] != sol::nil)
+            book.mData.mValue = rec["value"];
+        if (rec["isScroll"] != sol::nil)
+            book.mData.mIsScroll = rec["isScroll"] ? 1 : 0;
+
+        if (rec["skill"] != sol::nil)
+        {
+            ESM::RefId skill = ESM::RefId::deserializeText(rec["skill"].get<std::string_view>());
+
+            book.mData.mSkillId = -1;
+            if (!skill.empty())
+            {
+                book.mData.mSkillId = ESM::Skill::refIdToIndex(skill);
+                if (book.mData.mSkillId == -1)
+                    throw std::runtime_error("Incorrect skill: " + skill.toDebugString());
+            }
+        }
+
         return book;
     }
 }
@@ -59,9 +83,10 @@ namespace MWLua
 {
     void addBookBindings(sol::table book, const Context& context)
     {
+        sol::state_view lua = context.sol();
         // types.book.SKILL is deprecated (core.SKILL should be used instead)
         // TODO: Remove book.SKILL after branching 0.49
-        sol::table skill(context.mLua->sol(), sol::create);
+        sol::table skill(lua, sol::create);
         book["SKILL"] = LuaUtil::makeStrictReadOnly(skill);
         book["createRecordDraft"] = tableToBook;
         for (int id = 0; id < ESM::Skill::Length; ++id)
@@ -74,23 +99,21 @@ namespace MWLua
 
         addRecordFunctionBinding<ESM::Book>(book, context);
 
-        sol::usertype<ESM::Book> record = context.mLua->sol().new_usertype<ESM::Book>("ESM3_Book");
+        sol::usertype<ESM::Book> record = lua.new_usertype<ESM::Book>("ESM3_Book");
         record[sol::meta_function::to_string]
             = [](const ESM::Book& rec) { return "ESM3_Book[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mScript.serializeText(); });
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Book& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["icon"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["text"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mText; });
-        record["enchant"]
-            = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mEnchant.serializeText(); });
+        record["enchant"] = sol::readonly_property(
+            [](const ESM::Book& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mEnchant); });
         record["isScroll"] = sol::readonly_property([](const ESM::Book& rec) -> bool { return rec.mData.mIsScroll; });
         record["value"] = sol::readonly_property([](const ESM::Book& rec) -> int { return rec.mData.mValue; });
         record["weight"] = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mWeight; });
@@ -98,9 +121,7 @@ namespace MWLua
             = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mEnchant * 0.1f; });
         record["skill"] = sol::readonly_property([](const ESM::Book& rec) -> sol::optional<std::string> {
             ESM::RefId skill = ESM::Skill::indexToRefId(rec.mData.mSkillId);
-            if (!skill.empty())
-                return skill.serializeText();
-            return sol::nullopt;
+            return LuaUtil::serializeRefId(skill);
         });
     }
 }
diff --git a/apps/openmw/mwlua/types/clothing.cpp b/apps/openmw/mwlua/types/clothing.cpp
index 9bdd579286..0085f05198 100644
--- a/apps/openmw/mwlua/types/clothing.cpp
+++ b/apps/openmw/mwlua/types/clothing.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadclot.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -22,22 +23,42 @@ namespace
     ESM::Clothing tableToClothing(const sol::table& rec)
     {
         ESM::Clothing clothing;
-        clothing.mName = rec["name"];
-        clothing.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
-        clothing.mIcon = rec["icon"];
-        std::string_view scriptId = rec["mwscript"].get<std::string_view>();
-        clothing.mScript = ESM::RefId::deserializeText(scriptId);
-        clothing.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
-        std::string_view enchantId = rec["enchant"].get<std::string_view>();
-        clothing.mEnchant = ESM::RefId::deserializeText(enchantId);
-        clothing.mData.mWeight = rec["weight"];
-        clothing.mData.mValue = rec["value"];
-        clothing.mRecordFlags = 0;
-        int clothingType = rec["type"].get<int>();
-        if (clothingType >= 0 && clothingType <= ESM::Clothing::Amulet)
-            clothing.mData.mType = clothingType;
+        if (rec["template"] != sol::nil)
+            clothing = LuaUtil::cast<ESM::Clothing>(rec["template"]);
         else
-            throw std::runtime_error("Invalid Clothing Type provided: " + std::to_string(clothingType));
+            clothing.blank();
+
+        if (rec["name"] != sol::nil)
+            clothing.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            clothing.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["icon"] != sol::nil)
+            clothing.mIcon = rec["icon"];
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            clothing.mScript = ESM::RefId::deserializeText(scriptId);
+        }
+
+        if (rec["enchant"] != sol::nil)
+        {
+            std::string_view enchantId = rec["enchant"].get<std::string_view>();
+            clothing.mEnchant = ESM::RefId::deserializeText(enchantId);
+        }
+        if (rec["enchantCapacity"] != sol::nil)
+            clothing.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
+        if (rec["weight"] != sol::nil)
+            clothing.mData.mWeight = rec["weight"];
+        if (rec["value"] != sol::nil)
+            clothing.mData.mValue = rec["value"];
+        if (rec["type"] != sol::nil)
+        {
+            int clothingType = rec["type"].get<int>();
+            if (clothingType >= 0 && clothingType <= ESM::Clothing::Amulet)
+                clothing.mData.mType = clothingType;
+            else
+                throw std::runtime_error("Invalid Clothing Type provided: " + std::to_string(clothingType));
+        }
         return clothing;
     }
 }
@@ -47,39 +68,41 @@ namespace MWLua
     {
         clothing["createRecordDraft"] = tableToClothing;
 
-        clothing["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            { "Amulet", ESM::Clothing::Amulet },
-            { "Belt", ESM::Clothing::Belt },
-            { "LGlove", ESM::Clothing::LGlove },
-            { "Pants", ESM::Clothing::Pants },
-            { "RGlove", ESM::Clothing::RGlove },
-            { "Ring", ESM::Clothing::Ring },
-            { "Robe", ESM::Clothing::Robe },
-            { "Shirt", ESM::Clothing::Shirt },
-            { "Shoes", ESM::Clothing::Shoes },
-            { "Skirt", ESM::Clothing::Skirt },
-        }));
+        sol::state_view lua = context.sol();
+        clothing["TYPE"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(lua,
+            {
+                { "Amulet", ESM::Clothing::Amulet },
+                { "Belt", ESM::Clothing::Belt },
+                { "LGlove", ESM::Clothing::LGlove },
+                { "Pants", ESM::Clothing::Pants },
+                { "RGlove", ESM::Clothing::RGlove },
+                { "Ring", ESM::Clothing::Ring },
+                { "Robe", ESM::Clothing::Robe },
+                { "Shirt", ESM::Clothing::Shirt },
+                { "Shoes", ESM::Clothing::Shoes },
+                { "Skirt", ESM::Clothing::Skirt },
+            }));
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         addRecordFunctionBinding<ESM::Clothing>(clothing, context);
 
-        sol::usertype<ESM::Clothing> record = context.mLua->sol().new_usertype<ESM::Clothing>("ESM3_Clothing");
+        sol::usertype<ESM::Clothing> record = lua.new_usertype<ESM::Clothing>("ESM3_Clothing");
         record[sol::meta_function::to_string]
             = [](const ESM::Clothing& rec) -> std::string { return "ESM3_Clothing[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Clothing& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Clothing& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Clothing& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
         record["icon"] = sol::readonly_property([vfs](const ESM::Clothing& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
-        record["enchant"] = sol::readonly_property(
-            [](const ESM::Clothing& rec) -> std::string { return rec.mEnchant.serializeText(); });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Clothing& rec) -> std::string { return rec.mScript.serializeText(); });
+        record["enchant"] = sol::readonly_property([](const ESM::Clothing& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mEnchant);
+        });
+        record["mwscript"] = sol::readonly_property([](const ESM::Clothing& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
+        });
         record["weight"] = sol::readonly_property([](const ESM::Clothing& rec) -> float { return rec.mData.mWeight; });
         record["value"] = sol::readonly_property([](const ESM::Clothing& rec) -> int { return rec.mData.mValue; });
         record["type"] = sol::readonly_property([](const ESM::Clothing& rec) -> int { return rec.mData.mType; });
diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
index dd246a73d5..9d3821ca48 100644
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -1,14 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadcont.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/class.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwworld/class.hpp"
 
 namespace sol
 {
@@ -31,31 +31,34 @@ namespace MWLua
         container["content"] = sol::overload([](const LObject& o) { return Inventory<LObject>{ o }; },
             [](const GObject& o) { return Inventory<GObject>{ o }; });
         container["inventory"] = container["content"];
-        container["encumbrance"] = [](const Object& obj) -> float {
+        container["getEncumbrance"] = [](const Object& obj) -> float {
             const MWWorld::Ptr& ptr = containerPtr(obj);
             return ptr.getClass().getEncumbrance(ptr);
         };
-        container["capacity"] = [](const Object& obj) -> float {
+        container["encumbrance"] = container["getEncumbrance"]; // for compatibility; should be removed later
+        container["getCapacity"] = [](const Object& obj) -> float {
             const MWWorld::Ptr& ptr = containerPtr(obj);
             return ptr.getClass().getCapacity(ptr);
         };
-
-        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        container["capacity"] = container["getCapacity"]; // for compatibility; should be removed later
 
         addRecordFunctionBinding<ESM::Container>(container, context);
 
-        sol::usertype<ESM::Container> record = context.mLua->sol().new_usertype<ESM::Container>("ESM3_Container");
+        sol::usertype<ESM::Container> record = context.sol().new_usertype<ESM::Container>("ESM3_Container");
         record[sol::meta_function::to_string] = [](const ESM::Container& rec) -> std::string {
             return "ESM3_Container[" + rec.mId.toDebugString() + "]";
         };
         record["id"]
             = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Container& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property([](const ESM::Container& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
         });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Container& rec) -> std::string { return rec.mScript.serializeText(); });
         record["weight"] = sol::readonly_property([](const ESM::Container& rec) -> float { return rec.mWeight; });
+        record["isOrganic"] = sol::readonly_property(
+            [](const ESM::Container& rec) -> bool { return rec.mFlags & ESM::Container::Organic; });
+        record["isRespawning"] = sol::readonly_property(
+            [](const ESM::Container& rec) -> bool { return rec.mFlags & ESM::Container::Respawn; });
     }
 }
diff --git a/apps/openmw/mwlua/types/creature.cpp b/apps/openmw/mwlua/types/creature.cpp
index 08c0dd021c..4ebc658eb9 100644
--- a/apps/openmw/mwlua/types/creature.cpp
+++ b/apps/openmw/mwlua/types/creature.cpp
@@ -1,14 +1,15 @@
 #include "types.hpp"
 
+#include "../stats.hpp"
+#include "actor.hpp"
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadcrea.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-
 namespace sol
 {
     template <>
@@ -21,32 +22,59 @@ namespace MWLua
 {
     void addCreatureBindings(sol::table creature, const Context& context)
     {
-        creature["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            { "Creatures", ESM::Creature::Creatures },
-            { "Daedra", ESM::Creature::Daedra },
-            { "Undead", ESM::Creature::Undead },
-            { "Humanoid", ESM::Creature::Humanoid },
-        }));
-
-        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        sol::state_view lua = context.sol();
+        creature["TYPE"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(lua,
+            {
+                { "Creatures", ESM::Creature::Creatures },
+                { "Daedra", ESM::Creature::Daedra },
+                { "Undead", ESM::Creature::Undead },
+                { "Humanoid", ESM::Creature::Humanoid },
+            }));
 
         addRecordFunctionBinding<ESM::Creature>(creature, context);
 
-        sol::usertype<ESM::Creature> record = context.mLua->sol().new_usertype<ESM::Creature>("ESM3_Creature");
+        sol::usertype<ESM::Creature> record = lua.new_usertype<ESM::Creature>("ESM3_Creature");
         record[sol::meta_function::to_string]
             = [](const ESM::Creature& rec) { return "ESM3_Creature[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Creature& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property([](const ESM::Creature& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
         });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Creature& rec) -> std::string { return rec.mScript.serializeText(); });
         record["baseCreature"] = sol::readonly_property(
             [](const ESM::Creature& rec) -> std::string { return rec.mOriginal.serializeText(); });
         record["soulValue"] = sol::readonly_property([](const ESM::Creature& rec) -> int { return rec.mData.mSoul; });
         record["type"] = sol::readonly_property([](const ESM::Creature& rec) -> int { return rec.mData.mType; });
         record["baseGold"] = sol::readonly_property([](const ESM::Creature& rec) -> int { return rec.mData.mGold; });
+        record["combatSkill"]
+            = sol::readonly_property([](const ESM::Creature& rec) -> int { return rec.mData.mCombat; });
+        record["magicSkill"] = sol::readonly_property([](const ESM::Creature& rec) -> int { return rec.mData.mMagic; });
+        record["stealthSkill"]
+            = sol::readonly_property([](const ESM::Creature& rec) -> int { return rec.mData.mStealth; });
+        record["attack"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Creature& rec) -> sol::table {
+            sol::table res(lua, sol::create);
+            int index = 1;
+            for (auto attack : rec.mData.mAttack)
+                res[index++] = attack;
+            return LuaUtil::makeReadOnly(res);
+        });
+        record["canFly"] = sol::readonly_property(
+            [](const ESM::Creature& rec) -> bool { return rec.mFlags & ESM::Creature::Flies; });
+        record["canSwim"] = sol::readonly_property(
+            [](const ESM::Creature& rec) -> bool { return rec.mFlags & ESM::Creature::Swims; });
+        record["canUseWeapons"] = sol::readonly_property(
+            [](const ESM::Creature& rec) -> bool { return rec.mFlags & ESM::Creature::Weapon; });
+        record["canWalk"] = sol::readonly_property(
+            [](const ESM::Creature& rec) -> bool { return rec.mFlags & ESM::Creature::Walks; });
+        record["isBiped"] = sol::readonly_property(
+            [](const ESM::Creature& rec) -> bool { return rec.mFlags & ESM::Creature::Bipedal; });
+        record["isEssential"] = sol::readonly_property(
+            [](const ESM::Creature& rec) -> bool { return rec.mFlags & ESM::Creature::Essential; });
+        record["isRespawning"] = sol::readonly_property(
+            [](const ESM::Creature& rec) -> bool { return rec.mFlags & ESM::Creature::Respawn; });
+
+        addActorServicesBindings<ESM::Creature>(record, context);
     }
 }
diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
index 5a2cfc8aee..58a53a7124 100644
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -1,13 +1,18 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
+#include "../localscripts.hpp"
+
 #include <components/esm3/loaddoor.hpp>
 #include <components/esm4/loaddoor.hpp>
+#include <components/lua/util.hpp>
 #include <components/lua/utilpackage.hpp>
 #include <components/misc/convert.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include "apps/openmw/mwworld/esmstore.hpp"
+#include "apps/openmw/mwworld/class.hpp"
 #include "apps/openmw/mwworld/worldmodel.hpp"
 
 namespace sol
@@ -38,6 +43,47 @@ namespace MWLua
 
     void addDoorBindings(sol::table door, const Context& context)
     {
+        sol::state_view lua = context.sol();
+        door["STATE"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWWorld::DoorState>(lua,
+            {
+                { "Idle", MWWorld::DoorState::Idle },
+                { "Opening", MWWorld::DoorState::Opening },
+                { "Closing", MWWorld::DoorState::Closing },
+            }));
+        door["getDoorState"] = [](const Object& o) -> MWWorld::DoorState {
+            const MWWorld::Ptr& door = doorPtr(o);
+            return door.getClass().getDoorState(door);
+        };
+        door["isOpen"] = [](const Object& o) {
+            const MWWorld::Ptr& door = doorPtr(o);
+            bool doorIsIdle = door.getClass().getDoorState(door) == MWWorld::DoorState::Idle;
+            bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2];
+
+            return doorIsIdle && doorIsOpen;
+        };
+        door["isClosed"] = [](const Object& o) {
+            const MWWorld::Ptr& door = doorPtr(o);
+            bool doorIsIdle = door.getClass().getDoorState(door) == MWWorld::DoorState::Idle;
+            bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2];
+
+            return doorIsIdle && !doorIsOpen;
+        };
+        door["activateDoor"] = [](const Object& o, sol::optional<bool> openState) {
+            bool allowChanges
+                = dynamic_cast<const GObject*>(&o) != nullptr || dynamic_cast<const SelfObject*>(&o) != nullptr;
+            if (!allowChanges)
+                throw std::runtime_error("Can only be used in global scripts or in local scripts on self.");
+
+            const MWWorld::Ptr& door = doorPtr(o);
+            auto world = MWBase::Environment::get().getWorld();
+
+            if (!openState.has_value())
+                world->activateDoor(door);
+            else if (*openState)
+                world->activateDoor(door, MWWorld::DoorState::Opening);
+            else
+                world->activateDoor(door, MWWorld::DoorState::Closing);
+        };
         door["isTeleport"] = [](const Object& o) { return doorPtr(o).getCellRef().getTeleport(); };
         door["destPosition"]
             = [](const Object& o) -> osg::Vec3f { return doorPtr(o).getCellRef().getDoorDest().asVec3(); };
@@ -55,21 +101,17 @@ namespace MWLua
                 return sol::make_object(lua, LCell{ &cell });
         };
 
-        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
         addRecordFunctionBinding<ESM::Door>(door, context);
 
-        sol::usertype<ESM::Door> record = context.mLua->sol().new_usertype<ESM::Door>("ESM3_Door");
+        sol::usertype<ESM::Door> record = lua.new_usertype<ESM::Door>("ESM3_Door");
         record[sol::meta_function::to_string]
             = [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Door& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mScript.serializeText(); });
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Door& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["openSound"] = sol::readonly_property(
             [](const ESM::Door& rec) -> std::string { return rec.mOpenSound.serializeText(); });
         record["closeSound"] = sol::readonly_property(
@@ -95,20 +137,16 @@ namespace MWLua
                 return sol::make_object(lua, LCell{ &cell });
         };
 
-        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
         addRecordFunctionBinding<ESM4::Door>(door, context, "ESM4Door");
 
-        sol::usertype<ESM4::Door> record = context.mLua->sol().new_usertype<ESM4::Door>("ESM4_Door");
+        sol::usertype<ESM4::Door> record = context.sol().new_usertype<ESM4::Door>("ESM4_Door");
         record[sol::meta_function::to_string] = [](const ESM4::Door& rec) -> std::string {
             return "ESM4_Door[" + ESM::RefId(rec.mId).toDebugString() + "]";
         };
         record["id"] = sol::readonly_property(
             [](const ESM4::Door& rec) -> std::string { return ESM::RefId(rec.mId).serializeText(); });
         record["name"] = sol::readonly_property([](const ESM4::Door& rec) -> std::string { return rec.mFullName; });
-        record["model"] = sol::readonly_property([vfs](const ESM4::Door& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
         record["isAutomatic"] = sol::readonly_property(
             [](const ESM4::Door& rec) -> bool { return rec.mDoorFlags & ESM4::Door::Flag_AutomaticDoor; });
     }
diff --git a/apps/openmw/mwlua/types/ingredient.cpp b/apps/openmw/mwlua/types/ingredient.cpp
index 31791a19ea..8e52a82b19 100644
--- a/apps/openmw/mwlua/types/ingredient.cpp
+++ b/apps/openmw/mwlua/types/ingredient.cpp
@@ -1,15 +1,15 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadingr.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
-
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -26,40 +26,40 @@ namespace MWLua
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         addRecordFunctionBinding<ESM::Ingredient>(ingredient, context);
-
-        sol::usertype<ESM::Ingredient> record = context.mLua->sol().new_usertype<ESM::Ingredient>(("ESM3_Ingredient"));
+        sol::state_view lua = context.sol();
+        sol::usertype<ESM::Ingredient> record = lua.new_usertype<ESM::Ingredient>(("ESM3_Ingredient"));
         record[sol::meta_function::to_string]
             = [](const ESM::Ingredient& rec) { return "ESM3_Ingredient[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Ingredient& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Ingredient& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property([](const ESM::Ingredient& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
         });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Ingredient& rec) -> std::string { return rec.mScript.serializeText(); });
         record["icon"] = sol::readonly_property([vfs](const ESM::Ingredient& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["weight"]
             = sol::readonly_property([](const ESM::Ingredient& rec) -> float { return rec.mData.mWeight; });
         record["value"] = sol::readonly_property([](const ESM::Ingredient& rec) -> int { return rec.mData.mValue; });
-        record["effects"] = sol::readonly_property([context](const ESM::Ingredient& rec) -> sol::table {
-            sol::table res(context.mLua->sol(), sol::create);
+        record["effects"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Ingredient& rec) -> sol::table {
+            sol::table res(lua, sol::create);
             for (size_t i = 0; i < 4; ++i)
             {
                 if (rec.mData.mEffectID[i] < 0)
                     continue;
-                ESM::ENAMstruct effect;
-                effect.mEffectID = rec.mData.mEffectID[i];
-                effect.mSkill = rec.mData.mSkills[i];
-                effect.mAttribute = rec.mData.mAttributes[i];
-                effect.mRange = ESM::RT_Self;
-                effect.mArea = 0;
-                effect.mDuration = 0;
-                effect.mMagnMin = 0;
-                effect.mMagnMax = 0;
-                res[i + 1] = effect;
+                ESM::IndexedENAMstruct effect;
+                effect.mData.mEffectID = rec.mData.mEffectID[i];
+                effect.mData.mSkill = rec.mData.mSkills[i];
+                effect.mData.mAttribute = rec.mData.mAttributes[i];
+                effect.mData.mRange = ESM::RT_Self;
+                effect.mData.mArea = 0;
+                effect.mData.mDuration = 0;
+                effect.mData.mMagnMin = 0;
+                effect.mData.mMagnMax = 0;
+                effect.mIndex = i;
+                res[LuaUtil::toLuaIndex(i)] = effect;
             }
             return res;
         });
diff --git a/apps/openmw/mwlua/types/item.cpp b/apps/openmw/mwlua/types/item.cpp
index 2b77b6a7c8..ba995a9808 100644
--- a/apps/openmw/mwlua/types/item.cpp
+++ b/apps/openmw/mwlua/types/item.cpp
@@ -1,16 +1,32 @@
 #include <sol/sol.hpp>
 
+#include "../../mwmechanics/spellutil.hpp"
 #include "../../mwworld/class.hpp"
 
+#include "../itemdata.hpp"
+
 #include "types.hpp"
 
 namespace MWLua
 {
-    void addItemBindings(sol::table item)
+    void addItemBindings(sol::table item, const Context& context)
     {
-        item["getEnchantmentCharge"]
-            = [](const Object& object) { return object.ptr().getCellRef().getEnchantmentCharge(); };
-        item["setEnchantmentCharge"]
-            = [](const GObject& object, float charge) { object.ptr().getCellRef().setEnchantmentCharge(charge); };
+        // Deprecated. Moved to itemData; should be removed later
+        item["getEnchantmentCharge"] = [](const Object& object) -> sol::optional<float> {
+            float charge = object.ptr().getCellRef().getEnchantmentCharge();
+            if (charge == -1)
+                return sol::nullopt;
+            else
+                return charge;
+        };
+        item["setEnchantmentCharge"] = [](const GObject& object, sol::optional<float> charge) {
+            object.ptr().getCellRef().setEnchantmentCharge(charge.value_or(-1));
+        };
+        item["isRestocking"]
+            = [](const Object& object) -> bool { return object.ptr().getCellRef().getCount(false) < 0; };
+
+        item["isCarriable"] = [](const Object& object) -> bool { return object.ptr().getClass().isItem(object.ptr()); };
+
+        addItemDataBindings(item, context);
     }
 }
diff --git a/apps/openmw/mwlua/types/levelledlist.cpp b/apps/openmw/mwlua/types/levelledlist.cpp
index cb3bd7a6bc..fd848d9121 100644
--- a/apps/openmw/mwlua/types/levelledlist.cpp
+++ b/apps/openmw/mwlua/types/levelledlist.cpp
@@ -1,6 +1,7 @@
 #include "types.hpp"
 
 #include <components/esm3/loadlevlist.hpp>
+#include <components/lua/util.hpp>
 
 #include "../../mwbase/environment.hpp"
 #include "../../mwbase/world.hpp"
@@ -22,7 +23,7 @@ namespace MWLua
 {
     void addLevelledCreatureBindings(sol::table list, const Context& context)
     {
-        auto& state = context.mLua->sol();
+        auto state = context.sol();
         auto item = state.new_usertype<ESM::LevelledListBase::LevelItem>("ESM3_LevelledListItem");
         item["id"] = sol::readonly_property(
             [](const ESM::LevelledListBase::LevelItem& rec) -> std::string { return rec.mId.serializeText(); });
@@ -45,7 +46,7 @@ namespace MWLua
         record["creatures"] = sol::readonly_property([&](const ESM::CreatureLevList& rec) -> sol::table {
             sol::table res(state, sol::create);
             for (size_t i = 0; i < rec.mList.size(); ++i)
-                res[i + 1] = rec.mList[i];
+                res[LuaUtil::toLuaIndex(i)] = rec.mList[i];
             return res;
         });
         record["calculateFromAllLevels"] = sol::readonly_property(
diff --git a/apps/openmw/mwlua/types/light.cpp b/apps/openmw/mwlua/types/light.cpp
index 347bb61641..41a0bf8d4a 100644
--- a/apps/openmw/mwlua/types/light.cpp
+++ b/apps/openmw/mwlua/types/light.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadligh.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -17,6 +18,65 @@ namespace sol
     };
 }
 
+namespace
+{
+    void setRecordFlag(const sol::table& rec, const std::string& key, int flag, ESM::Light& record)
+    {
+        if (auto luaFlag = rec[key]; luaFlag != sol::nil)
+        {
+            if (luaFlag)
+            {
+                record.mData.mFlags |= flag;
+            }
+            else
+            {
+                record.mData.mFlags &= ~flag;
+            }
+        }
+    }
+    // Populates a light struct from a Lua table.
+    ESM::Light tableToLight(const sol::table& rec)
+    {
+        ESM::Light light;
+        if (rec["template"] != sol::nil)
+            light = LuaUtil::cast<ESM::Light>(rec["template"]);
+        else
+            light.blank();
+        if (rec["name"] != sol::nil)
+            light.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            light.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["icon"] != sol::nil)
+            light.mIcon = rec["icon"];
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            light.mScript = ESM::RefId::deserializeText(scriptId);
+        }
+        if (rec["weight"] != sol::nil)
+            light.mData.mWeight = rec["weight"];
+        if (rec["value"] != sol::nil)
+            light.mData.mValue = rec["value"];
+        if (rec["duration"] != sol::nil)
+            light.mData.mTime = rec["duration"];
+        if (rec["radius"] != sol::nil)
+            light.mData.mRadius = rec["radius"];
+        if (rec["color"] != sol::nil)
+            light.mData.mColor = rec["color"];
+        setRecordFlag(rec, "isCarriable", ESM::Light::Carry, light);
+        setRecordFlag(rec, "isDynamic", ESM::Light::Dynamic, light);
+        setRecordFlag(rec, "isFire", ESM::Light::Fire, light);
+        setRecordFlag(rec, "isFlicker", ESM::Light::Flicker, light);
+        setRecordFlag(rec, "isFlickerSlow", ESM::Light::FlickerSlow, light);
+        setRecordFlag(rec, "isNegative", ESM::Light::Negative, light);
+        setRecordFlag(rec, "isOffByDefault", ESM::Light::OffDefault, light);
+        setRecordFlag(rec, "isPulse", ESM::Light::Pulse, light);
+        setRecordFlag(rec, "isPulseSlow", ESM::Light::PulseSlow, light);
+
+        return light;
+    }
+}
+
 namespace MWLua
 {
     void addLightBindings(sol::table light, const Context& context)
@@ -24,23 +84,22 @@ namespace MWLua
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         addRecordFunctionBinding<ESM::Light>(light, context);
+        light["createRecordDraft"] = tableToLight;
 
-        sol::usertype<ESM::Light> record = context.mLua->sol().new_usertype<ESM::Light>("ESM3_Light");
+        sol::usertype<ESM::Light> record = context.sol().new_usertype<ESM::Light>("ESM3_Light");
         record[sol::meta_function::to_string]
             = [](const ESM::Light& rec) -> std::string { return "ESM3_Light[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Light& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Light& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
         record["icon"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["sound"]
             = sol::readonly_property([](const ESM::Light& rec) -> std::string { return rec.mSound.serializeText(); });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Light& rec) -> std::string { return rec.mScript.serializeText(); });
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["weight"] = sol::readonly_property([](const ESM::Light& rec) -> float { return rec.mData.mWeight; });
         record["value"] = sol::readonly_property([](const ESM::Light& rec) -> int { return rec.mData.mValue; });
         record["duration"] = sol::readonly_property([](const ESM::Light& rec) -> int { return rec.mData.mTime; });
@@ -48,5 +107,21 @@ namespace MWLua
         record["color"] = sol::readonly_property([](const ESM::Light& rec) -> int { return rec.mData.mColor; });
         record["isCarriable"] = sol::readonly_property(
             [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::Carry; });
+        record["isDynamic"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::Dynamic; });
+        record["isFire"]
+            = sol::readonly_property([](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::Fire; });
+        record["isFlicker"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::Flicker; });
+        record["isFlickerSlow"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::FlickerSlow; });
+        record["isNegative"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::Negative; });
+        record["isOffByDefault"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::OffDefault; });
+        record["isPulse"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::Pulse; });
+        record["isPulseSlow"] = sol::readonly_property(
+            [](const ESM::Light& rec) -> bool { return rec.mData.mFlags & ESM::Light::PulseSlow; });
     }
 }
diff --git a/apps/openmw/mwlua/types/lockable.cpp b/apps/openmw/mwlua/types/lockable.cpp
index e7413edef5..2569f42ee4 100644
--- a/apps/openmw/mwlua/types/lockable.cpp
+++ b/apps/openmw/mwlua/types/lockable.cpp
@@ -1,11 +1,11 @@
-
 #include "types.hpp"
+
 #include <components/esm3/loadmisc.hpp>
 #include <components/esm3/loadspel.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwworld/esmstore.hpp"
 
 namespace MWLua
 {
diff --git a/apps/openmw/mwlua/types/lockpick.cpp b/apps/openmw/mwlua/types/lockpick.cpp
index 786471461a..3f41c65df2 100644
--- a/apps/openmw/mwlua/types/lockpick.cpp
+++ b/apps/openmw/mwlua/types/lockpick.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadlock.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -25,17 +26,16 @@ namespace MWLua
 
         addRecordFunctionBinding<ESM::Lockpick>(lockpick, context);
 
-        sol::usertype<ESM::Lockpick> record = context.mLua->sol().new_usertype<ESM::Lockpick>("ESM3_Lockpick");
+        sol::usertype<ESM::Lockpick> record = context.sol().new_usertype<ESM::Lockpick>("ESM3_Lockpick");
         record[sol::meta_function::to_string]
             = [](const ESM::Lockpick& rec) { return "ESM3_Lockpick[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property([](const ESM::Lockpick& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
         });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Lockpick& rec) -> std::string { return rec.mScript.serializeText(); });
         record["icon"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
diff --git a/apps/openmw/mwlua/types/misc.cpp b/apps/openmw/mwlua/types/misc.cpp
index 461444abff..ef89464a2c 100644
--- a/apps/openmw/mwlua/types/misc.cpp
+++ b/apps/openmw/mwlua/types/misc.cpp
@@ -1,14 +1,16 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadmisc.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
 
 namespace sol
 {
@@ -24,15 +26,25 @@ namespace
     ESM::Miscellaneous tableToMisc(const sol::table& rec)
     {
         ESM::Miscellaneous misc;
-        misc.mName = rec["name"];
-        misc.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
-        misc.mIcon = rec["icon"];
-        std::string_view scriptId = rec["mwscript"].get<std::string_view>();
-        misc.mScript = ESM::RefId::deserializeText(scriptId);
-        misc.mData.mWeight = rec["weight"];
-        misc.mData.mValue = rec["value"];
-        misc.mData.mFlags = 0;
-        misc.mRecordFlags = 0;
+        if (rec["template"] != sol::nil)
+            misc = LuaUtil::cast<ESM::Miscellaneous>(rec["template"]);
+        else
+            misc.blank();
+        if (rec["name"] != sol::nil)
+            misc.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            misc.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["icon"] != sol::nil)
+            misc.mIcon = rec["icon"];
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            misc.mScript = ESM::RefId::deserializeText(scriptId);
+        }
+        if (rec["weight"] != sol::nil)
+            misc.mData.mWeight = rec["weight"];
+        if (rec["value"] != sol::nil)
+            misc.mData.mValue = rec["value"];
         return misc;
     }
 }
@@ -46,6 +58,7 @@ namespace MWLua
         addRecordFunctionBinding<ESM::Miscellaneous>(miscellaneous, context);
         miscellaneous["createRecordDraft"] = tableToMisc;
 
+        // Deprecated. Moved to itemData; should be removed later
         miscellaneous["setSoul"] = [](const GObject& object, std::string_view soulId) {
             ESM::RefId creature = ESM::RefId::deserializeText(soulId);
             const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@@ -60,24 +73,20 @@ namespace MWLua
         };
         miscellaneous["getSoul"] = [](const Object& object) -> sol::optional<std::string> {
             ESM::RefId soul = object.ptr().getCellRef().getSoul();
-            if (soul.empty())
-                return sol::nullopt;
-            else
-                return soul.serializeText();
+            return LuaUtil::serializeRefId(soul);
         };
         miscellaneous["soul"] = miscellaneous["getSoul"]; // for compatibility; should be removed later
-        sol::usertype<ESM::Miscellaneous> record
-            = context.mLua->sol().new_usertype<ESM::Miscellaneous>("ESM3_Miscellaneous");
+
+        sol::usertype<ESM::Miscellaneous> record = context.sol().new_usertype<ESM::Miscellaneous>("ESM3_Miscellaneous");
         record[sol::meta_function::to_string]
             = [](const ESM::Miscellaneous& rec) { return "ESM3_Miscellaneous[" + rec.mId.toDebugString() + "]"; };
         record["id"] = sol::readonly_property(
             [](const ESM::Miscellaneous& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> sol::optional<std::string> {
+            return LuaUtil::serializeRefId(rec.mScript);
         });
-        record["mwscript"] = sol::readonly_property(
-            [](const ESM::Miscellaneous& rec) -> std::string { return rec.mScript.serializeText(); });
         record["icon"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
diff --git a/apps/openmw/mwlua/types/modelproperty.hpp b/apps/openmw/mwlua/types/modelproperty.hpp
new file mode 100644
index 0000000000..7bb473ad81
--- /dev/null
+++ b/apps/openmw/mwlua/types/modelproperty.hpp
@@ -0,0 +1,21 @@
+#ifndef OPENMW_APPS_OPENMW_MWLUA_TYPES_MODELPROPERTY_H
+#define OPENMW_APPS_OPENMW_MWLUA_TYPES_MODELPROPERTY_H
+
+#include <components/misc/resourcehelpers.hpp>
+#include <components/vfs/pathutil.hpp>
+
+#include <sol/property.hpp>
+#include <sol/usertype.hpp>
+
+namespace MWLua
+{
+    template <class T>
+    void addModelProperty(sol::usertype<T>& recordType)
+    {
+        recordType["model"] = sol::readonly_property([](const T& recordValue) -> std::string {
+            return Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(recordValue.mModel)).value();
+        });
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwlua/types/npc.cpp b/apps/openmw/mwlua/types/npc.cpp
index 06bcab243b..7cfcf6d704 100644
--- a/apps/openmw/mwlua/types/npc.cpp
+++ b/apps/openmw/mwlua/types/npc.cpp
@@ -1,14 +1,24 @@
 #include "types.hpp"
 
+#include "actor.hpp"
+#include "modelproperty.hpp"
+
+#include <components/esm3/loadfact.hpp>
 #include <components/esm3/loadnpc.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwmechanics/npcstats.hpp>
-#include <apps/openmw/mwworld/class.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwbase/mechanicsmanager.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwmechanics/npcstats.hpp"
+#include "apps/openmw/mwworld/class.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
 
+#include "../classbindings.hpp"
+#include "../localscripts.hpp"
+#include "../racebindings.hpp"
 #include "../stats.hpp"
 
 namespace sol
@@ -19,6 +29,44 @@ namespace sol
     };
 }
 
+namespace
+{
+    size_t getValidRanksCount(const ESM::Faction* faction)
+    {
+        if (!faction)
+            return 0;
+
+        for (size_t i = 0; i < faction->mRanks.size(); i++)
+        {
+            if (faction->mRanks[i].empty())
+                return i;
+        }
+
+        return faction->mRanks.size();
+    }
+
+    ESM::RefId parseFactionId(std::string_view faction)
+    {
+        ESM::RefId id = ESM::RefId::deserializeText(faction);
+        const MWWorld::ESMStore* store = MWBase::Environment::get().getESMStore();
+        if (!store->get<ESM::Faction>().search(id))
+            throw std::runtime_error("Faction '" + std::string(faction) + "' does not exist");
+        return id;
+    }
+
+    void verifyPlayer(const MWLua::Object& o)
+    {
+        if (o.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
+            throw std::runtime_error("The argument must be a player!");
+    }
+
+    void verifyNpc(const MWWorld::Class& cls)
+    {
+        if (!cls.isNpc())
+            throw std::runtime_error("The argument must be a NPC!");
+    }
+}
+
 namespace MWLua
 {
     void addNpcBindings(sol::table npc, const Context& context)
@@ -27,7 +75,9 @@ namespace MWLua
 
         addRecordFunctionBinding<ESM::NPC>(npc, context);
 
-        sol::usertype<ESM::NPC> record = context.mLua->sol().new_usertype<ESM::NPC>("ESM3_NPC");
+        sol::state_view lua = context.sol();
+
+        sol::usertype<ESM::NPC> record = lua.new_usertype<ESM::NPC>("ESM3_NPC");
         record[sol::meta_function::to_string]
             = [](const ESM::NPC& rec) { return "ESM3_NPC[" + rec.mId.toDebugString() + "]"; };
         record["id"]
@@ -37,14 +87,25 @@ namespace MWLua
             = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mRace.serializeText(); });
         record["class"]
             = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mClass.serializeText(); });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mScript.serializeText(); });
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::NPC& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["hair"]
             = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mHair.serializeText(); });
+        record["baseDisposition"]
+            = sol::readonly_property([](const ESM::NPC& rec) -> int { return (int)rec.mNpdt.mDisposition; });
         record["head"]
             = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mHead.serializeText(); });
+        addModelProperty(record);
+        record["isEssential"]
+            = sol::readonly_property([](const ESM::NPC& rec) -> bool { return rec.mFlags & ESM::NPC::Essential; });
         record["isMale"] = sol::readonly_property([](const ESM::NPC& rec) -> bool { return rec.isMale(); });
+        record["isRespawning"]
+            = sol::readonly_property([](const ESM::NPC& rec) -> bool { return rec.mFlags & ESM::NPC::Respawn; });
         record["baseGold"] = sol::readonly_property([](const ESM::NPC& rec) -> int { return rec.mNpdt.mGold; });
+        addActorServicesBindings<ESM::NPC>(record, context);
+
+        npc["classes"] = initClassRecordBindings(context);
+        npc["races"] = initRaceRecordBindings(context);
 
         // This function is game-specific, in future we should replace it with something more universal.
         npc["isWerewolf"] = [](const Object& o) {
@@ -54,5 +115,247 @@ namespace MWLua
             else
                 throw std::runtime_error("NPC or Player expected");
         };
+
+        npc["getDisposition"] = [](const Object& o, const Object& player) -> int {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            verifyPlayer(player);
+            verifyNpc(cls);
+            return MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(o.ptr());
+        };
+
+        npc["getBaseDisposition"] = [](const Object& o, const Object& player) -> int {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            verifyPlayer(player);
+            verifyNpc(cls);
+            return cls.getNpcStats(o.ptr()).getBaseDisposition();
+        };
+
+        npc["setBaseDisposition"] = [](Object& o, const Object& player, int value) {
+            if (dynamic_cast<LObject*>(&o) && !dynamic_cast<SelfObject*>(&o))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Class& cls = o.ptr().getClass();
+            verifyPlayer(player);
+            verifyNpc(cls);
+            cls.getNpcStats(o.ptr()).setBaseDisposition(value);
+        };
+
+        npc["modifyBaseDisposition"] = [](Object& o, const Object& player, int value) {
+            if (dynamic_cast<LObject*>(&o) && !dynamic_cast<SelfObject*>(&o))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Class& cls = o.ptr().getClass();
+            verifyPlayer(player);
+            verifyNpc(cls);
+            auto& stats = cls.getNpcStats(o.ptr());
+            stats.setBaseDisposition(stats.getBaseDisposition() + value);
+        };
+
+        npc["getFactionRank"] = [](const Object& actor, std::string_view faction) -> size_t {
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            const MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+            if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                if (npcStats.isInFaction(factionId))
+                {
+                    int factionRank = npcStats.getFactionRank(factionId);
+                    return LuaUtil::toLuaIndex(factionRank);
+                }
+            }
+            else
+            {
+                ESM::RefId primaryFactionId = ptr.getClass().getPrimaryFaction(ptr);
+                if (factionId == primaryFactionId)
+                    return LuaUtil::toLuaIndex(ptr.getClass().getPrimaryFactionRank(ptr));
+            }
+            return 0;
+        };
+
+        npc["setFactionRank"] = [](Object& actor, std::string_view faction, int value) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            const ESM::Faction* factionPtr
+                = MWBase::Environment::get().getESMStore()->get<ESM::Faction>().find(factionId);
+
+            auto ranksCount = static_cast<int>(getValidRanksCount(factionPtr));
+            if (value <= 0 || value > ranksCount)
+                throw std::runtime_error("Requested rank does not exist");
+
+            auto targetRank = LuaUtil::fromLuaIndex(std::clamp(value, 1, ranksCount));
+
+            if (ptr != MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                ESM::RefId primaryFactionId = ptr.getClass().getPrimaryFaction(ptr);
+                if (factionId != primaryFactionId)
+                    throw std::runtime_error("Only players can modify ranks in non-primary factions");
+            }
+
+            MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+            if (!npcStats.isInFaction(factionId))
+                throw std::runtime_error("Target actor is not a member of faction " + factionId.toDebugString());
+
+            npcStats.setFactionRank(factionId, targetRank);
+        };
+
+        npc["modifyFactionRank"] = [](Object& actor, std::string_view faction, int value) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            if (value == 0)
+                return;
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            const ESM::Faction* factionPtr
+                = MWBase::Environment::get().getESMStore()->get<ESM::Faction>().search(factionId);
+            if (!factionPtr)
+                return;
+
+            auto ranksCount = static_cast<int>(getValidRanksCount(factionPtr));
+
+            MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+
+            if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                int currentRank = npcStats.getFactionRank(factionId);
+                if (currentRank >= 0)
+                    npcStats.setFactionRank(factionId, std::clamp(currentRank + value, 0, ranksCount - 1));
+                else
+                    throw std::runtime_error("Target actor is not a member of faction " + factionId.toDebugString());
+
+                return;
+            }
+
+            ESM::RefId primaryFactionId = ptr.getClass().getPrimaryFaction(ptr);
+            if (factionId != primaryFactionId)
+                throw std::runtime_error("Only players can modify ranks in non-primary factions");
+
+            // If we already changed rank for this NPC, modify current rank in the NPC stats.
+            // Otherwise take rank from base NPC record, adjust it and put it to NPC data.
+            int currentRank = npcStats.getFactionRank(factionId);
+            if (currentRank < 0)
+            {
+                currentRank = ptr.getClass().getPrimaryFactionRank(ptr);
+                npcStats.joinFaction(factionId);
+            }
+
+            npcStats.setFactionRank(factionId, std::clamp(currentRank + value, 0, ranksCount - 1));
+        };
+
+        npc["joinFaction"] = [](Object& actor, std::string_view faction) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+                int currentRank = npcStats.getFactionRank(factionId);
+                if (currentRank < 0)
+                    npcStats.joinFaction(factionId);
+                return;
+            }
+
+            throw std::runtime_error("Only player can join factions");
+        };
+
+        npc["leaveFaction"] = [](Object& actor, std::string_view faction) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                ptr.getClass().getNpcStats(ptr).setFactionRank(factionId, -1);
+                return;
+            }
+
+            throw std::runtime_error("Only player can leave factions");
+        };
+
+        npc["getFactionReputation"] = [](const Object& actor, std::string_view faction) {
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            return ptr.getClass().getNpcStats(ptr).getFactionReputation(factionId);
+        };
+
+        npc["setFactionReputation"] = [](Object& actor, std::string_view faction, int value) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            ptr.getClass().getNpcStats(ptr).setFactionReputation(factionId, value);
+        };
+
+        npc["modifyFactionReputation"] = [](Object& actor, std::string_view faction, int value) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+
+            MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+            int existingReputation = npcStats.getFactionReputation(factionId);
+            npcStats.setFactionReputation(factionId, existingReputation + value);
+        };
+
+        npc["expel"] = [](Object& actor, std::string_view faction) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+            ptr.getClass().getNpcStats(ptr).expell(factionId, false);
+        };
+        npc["clearExpelled"] = [](Object& actor, std::string_view faction) {
+            if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
+                throw std::runtime_error("Local scripts can modify only self");
+
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+            ptr.getClass().getNpcStats(ptr).clearExpelled(factionId);
+        };
+        npc["isExpelled"] = [](const Object& actor, std::string_view faction) {
+            const MWWorld::Ptr ptr = actor.ptr();
+            ESM::RefId factionId = parseFactionId(faction);
+            return ptr.getClass().getNpcStats(ptr).getExpelled(factionId);
+        };
+        npc["getFactions"] = [](sol::this_state lua, const Object& actor) {
+            const MWWorld::Ptr ptr = actor.ptr();
+            MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+            sol::table res(lua, sol::create);
+            if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+            {
+                for (const auto& [factionId, _] : npcStats.getFactionRanks())
+                    res.add(factionId.serializeText());
+                return res;
+            }
+
+            ESM::RefId primaryFactionId = ptr.getClass().getPrimaryFaction(ptr);
+            if (primaryFactionId.empty())
+                return res;
+
+            res.add(primaryFactionId.serializeText());
+
+            return res;
+        };
+        npc["getCapacity"] = [](const Object& actor) -> float {
+            const MWWorld::Ptr ptr = actor.ptr();
+            return ptr.getClass().getCapacity(ptr);
+        };
     }
 }
diff --git a/apps/openmw/mwlua/types/player.cpp b/apps/openmw/mwlua/types/player.cpp
index 5e44b47f1a..15dc719f2e 100644
--- a/apps/openmw/mwlua/types/player.cpp
+++ b/apps/openmw/mwlua/types/player.cpp
@@ -1,11 +1,20 @@
 #include "types.hpp"
 
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadfact.hpp>
+
+#include "../birthsignbindings.hpp"
 #include "../luamanagerimp.hpp"
-#include <apps/openmw/mwbase/journal.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwmechanics/npcstats.hpp>
-#include <apps/openmw/mwworld/class.hpp>
-#include <apps/openmw/mwworld/globals.hpp>
+
+#include "apps/openmw/mwbase/inputmanager.hpp"
+#include "apps/openmw/mwbase/journal.hpp"
+#include "apps/openmw/mwbase/mechanicsmanager.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwmechanics/npcstats.hpp"
+#include "apps/openmw/mwworld/class.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
+#include "apps/openmw/mwworld/globals.hpp"
+#include "apps/openmw/mwworld/player.hpp"
 
 namespace MWLua
 {
@@ -32,29 +41,62 @@ namespace sol
     };
 }
 
+namespace
+{
+    ESM::RefId toBirthSignId(const sol::object& recordOrId)
+    {
+        if (recordOrId.is<ESM::BirthSign>())
+            return recordOrId.as<const ESM::BirthSign*>()->mId;
+        std::string_view textId = LuaUtil::cast<std::string_view>(recordOrId);
+        ESM::RefId id = ESM::RefId::deserializeText(textId);
+        if (!MWBase::Environment::get().getESMStore()->get<ESM::BirthSign>().search(id))
+            throw std::runtime_error("Failed to find birth sign: " + std::string(textId));
+        return id;
+    }
+
+    ESM::RefId parseFactionId(std::string_view faction)
+    {
+        ESM::RefId id = ESM::RefId::deserializeText(faction);
+        if (!MWBase::Environment::get().getESMStore()->get<ESM::Faction>().search(id))
+            return ESM::RefId();
+        return id;
+    }
+}
+
 namespace MWLua
 {
+    static void verifyPlayer(const Object& player)
+    {
+        if (player.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
+            throw std::runtime_error("The argument must be a player!");
+    }
 
-    void addPlayerQuestBindings(sol::table& player, const Context& context)
+    static void verifyNpc(const MWWorld::Class& cls)
+    {
+        if (!cls.isNpc())
+            throw std::runtime_error("The argument must be a NPC!");
+    }
+
+    void addPlayerBindings(sol::table player, const Context& context)
     {
         MWBase::Journal* const journal = MWBase::Environment::get().getJournal();
 
         player["quests"] = [](const Object& player) {
-            if (player.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
-                throw std::runtime_error("The argument must be a player!");
+            verifyPlayer(player);
             bool allowChanges = dynamic_cast<const GObject*>(&player) != nullptr
                 || dynamic_cast<const SelfObject*>(&player) != nullptr;
             return Quests{ .mMutable = allowChanges };
         };
-        sol::usertype<Quests> quests = context.mLua->sol().new_usertype<Quests>("Quests");
+        sol::state_view lua = context.sol();
+        sol::usertype<Quests> quests = lua.new_usertype<Quests>("Quests");
         quests[sol::meta_function::to_string] = [](const Quests& quests) { return "Quests"; };
-        quests[sol::meta_function::index] = sol::overload([](const Quests& quests, std::string_view questId) -> Quest {
+        quests[sol::meta_function::index] = [](const Quests& quests, std::string_view questId) -> sol::optional<Quest> {
             ESM::RefId quest = ESM::RefId::deserializeText(questId);
-            const ESM::Dialogue* dial = MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>().find(quest);
-            if (dial->mType != ESM::Dialogue::Journal)
-                throw std::runtime_error("Not a quest:" + std::string(questId));
+            const ESM::Dialogue* dial = MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>().search(quest);
+            if (dial == nullptr || dial->mType != ESM::Dialogue::Journal)
+                return sol::nullopt;
             return Quest{ .mQuestId = quest, .mMutable = quests.mMutable };
-        });
+        };
         quests[sol::meta_function::pairs] = [journal](const Quests& quests) {
             std::vector<ESM::RefId> ids;
             for (auto it = journal->questBegin(); it != journal->questEnd(); ++it)
@@ -69,7 +111,7 @@ namespace MWLua
             };
         };
 
-        sol::usertype<Quest> quest = context.mLua->sol().new_usertype<Quest>("Quest");
+        sol::usertype<Quest> quest = lua.new_usertype<Quest>("Quest");
         quest[sol::meta_function::to_string]
             = [](const Quest& quest) { return "Quest[" + quest.mQuestId.serializeText() + "]"; };
 
@@ -111,7 +153,7 @@ namespace MWLua
             // The journal mwscript function has a try function here, we will make the lua function throw an
             // error. However, the addAction will cause it to error outside of this function.
             context.mLuaManager->addAction(
-                [actor, q, stage] {
+                [actor = std::move(actor), q, stage] {
                     MWWorld::Ptr actorPtr;
                     if (actor)
                         actorPtr = actor->ptr();
@@ -119,17 +161,102 @@ namespace MWLua
                 },
                 "addJournalEntryAction");
         };
-    }
 
-    void addPlayerBindings(sol::table player, const Context& context)
-    {
+        player["CONTROL_SWITCH"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, std::string_view>(lua,
+                {
+                    { "Controls", "playercontrols" },
+                    { "Fighting", "playerfighting" },
+                    { "Jumping", "playerjumping" },
+                    { "Looking", "playerlooking" },
+                    { "Magic", "playermagic" },
+                    { "ViewMode", "playerviewswitch" },
+                    { "VanityMode", "vanitymode" },
+                }));
+
+        MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
+        player["getControlSwitch"] = [input](const Object& player, std::string_view key) {
+            verifyPlayer(player);
+            return input->getControlSwitch(key);
+        };
+        player["setControlSwitch"] = [input](const Object& player, std::string_view key, bool v) {
+            verifyPlayer(player);
+            if (dynamic_cast<const LObject*>(&player) && !dynamic_cast<const SelfObject*>(&player))
+                throw std::runtime_error("Only player and global scripts can toggle control switches.");
+            input->toggleControlSwitch(key, v);
+        };
+        player["isTeleportingEnabled"] = [](const Object& player) -> bool {
+            verifyPlayer(player);
+            return MWBase::Environment::get().getWorld()->isTeleportingEnabled();
+        };
+        player["setTeleportingEnabled"] = [](const Object& player, bool state) {
+            verifyPlayer(player);
+            if (dynamic_cast<const LObject*>(&player) && !dynamic_cast<const SelfObject*>(&player))
+                throw std::runtime_error("Only player and global scripts can toggle teleportation.");
+            MWBase::Environment::get().getWorld()->enableTeleporting(state);
+        };
+        player["sendMenuEvent"] = [context](const Object& player, std::string eventName, const sol::object& eventData) {
+            verifyPlayer(player);
+            context.mLuaEvents->addMenuEvent({ std::move(eventName), LuaUtil::serialize(eventData) });
+        };
+
         player["getCrimeLevel"] = [](const Object& o) -> int {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getNpcStats(o.ptr()).getBounty();
         };
+        player["setCrimeLevel"] = [](const Object& o, int amount) {
+            verifyPlayer(o);
+            if (!dynamic_cast<const GObject*>(&o))
+                throw std::runtime_error("Only global scripts can change crime level");
+            const MWWorld::Class& cls = o.ptr().getClass();
+            cls.getNpcStats(o.ptr()).setBounty(amount);
+            if (amount == 0)
+                MWBase::Environment::get().getWorld()->getPlayer().recordCrimeId();
+        };
         player["isCharGenFinished"] = [](const Object&) -> bool {
             return MWBase::Environment::get().getWorld()->getGlobalFloat(MWWorld::Globals::sCharGenState) == -1;
         };
-        addPlayerQuestBindings(player, context);
+
+        player["OFFENSE_TYPE"]
+            = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(context.sol(),
+                { { "Theft", MWBase::MechanicsManager::OffenseType::OT_Theft },
+                    { "Assault", MWBase::MechanicsManager::OffenseType::OT_Assault },
+                    { "Murder", MWBase::MechanicsManager::OffenseType::OT_Murder },
+                    { "Trespassing", MWBase::MechanicsManager::OffenseType::OT_Trespassing },
+                    { "SleepingInOwnedBed", MWBase::MechanicsManager::OffenseType::OT_SleepingInOwnedBed },
+                    { "Pickpocket", MWBase::MechanicsManager::OffenseType::OT_Pickpocket } }));
+        player["_runStandardCommitCrime"] = [](const Object& o, const sol::optional<Object> victim, int type,
+                                                std::string_view faction, int arg = 0, bool victimAware = false) {
+            verifyPlayer(o);
+            if (victim.has_value() && !victim->ptrOrEmpty().isEmpty())
+                verifyNpc(victim->ptrOrEmpty().getClass());
+            if (!dynamic_cast<const GObject*>(&o))
+                throw std::runtime_error("Only global scripts can commit crime");
+            if (type < 0 || type > MWBase::MechanicsManager::OffenseType::OT_Pickpocket)
+                throw std::runtime_error("Invalid offense type");
+
+            ESM::RefId factionId = parseFactionId(faction);
+            // If the faction is provided but not found, error out
+            if (faction != "" && factionId == ESM::RefId())
+                throw std::runtime_error("Faction does not exist");
+
+            MWWorld::Ptr victimObj = nullptr;
+            if (victim.has_value())
+                victimObj = victim->ptrOrEmpty();
+            return MWBase::Environment::get().getMechanicsManager()->commitCrime(o.ptr(), victimObj,
+                static_cast<MWBase::MechanicsManager::OffenseType>(type), factionId, arg, victimAware);
+        };
+
+        player["birthSigns"] = initBirthSignRecordBindings(context);
+        player["getBirthSign"] = [](const Object& player) -> std::string {
+            verifyPlayer(player);
+            return MWBase::Environment::get().getWorld()->getPlayer().getBirthSign().serializeText();
+        };
+        player["setBirthSign"] = [](const Object& player, const sol::object& recordOrId) {
+            verifyPlayer(player);
+            if (!dynamic_cast<const GObject*>(&player))
+                throw std::runtime_error("Only global scripts can change birth signs");
+            MWBase::Environment::get().getWorld()->getPlayer().setBirthSign(toBirthSignId(recordOrId));
+        };
     }
 }
diff --git a/apps/openmw/mwlua/types/potion.cpp b/apps/openmw/mwlua/types/potion.cpp
index badf611bc7..4d04c8bb13 100644
--- a/apps/openmw/mwlua/types/potion.cpp
+++ b/apps/openmw/mwlua/types/potion.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadalch.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -23,20 +24,36 @@ namespace
     ESM::Potion tableToPotion(const sol::table& rec)
     {
         ESM::Potion potion;
-        potion.mName = rec["name"];
-        potion.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
-        potion.mIcon = rec["icon"];
-        std::string_view scriptId = rec["mwscript"].get<std::string_view>();
-        potion.mScript = ESM::RefId::deserializeText(scriptId);
-        potion.mData.mWeight = rec["weight"];
-        potion.mData.mValue = rec["value"];
-        potion.mData.mAutoCalc = 0;
-        potion.mRecordFlags = 0;
-        sol::table effectsTable = rec["effects"];
-        size_t numEffects = effectsTable.size();
-        potion.mEffects.mList.resize(numEffects);
-        for (size_t i = 0; i < numEffects; ++i)
-            potion.mEffects.mList[i] = LuaUtil::cast<ESM::ENAMstruct>(effectsTable[i + 1]);
+        if (rec["template"] != sol::nil)
+            potion = LuaUtil::cast<ESM::Potion>(rec["template"]);
+        else
+            potion.blank();
+        if (rec["name"] != sol::nil)
+            potion.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            potion.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["icon"] != sol::nil)
+            potion.mIcon = rec["icon"];
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            potion.mScript = ESM::RefId::deserializeText(scriptId);
+        }
+        if (rec["weight"] != sol::nil)
+            potion.mData.mWeight = rec["weight"];
+        if (rec["value"] != sol::nil)
+            potion.mData.mValue = rec["value"];
+        if (rec["effects"] != sol::nil)
+        {
+            sol::table effectsTable = rec["effects"];
+            size_t numEffects = effectsTable.size();
+            potion.mEffects.mList.resize(numEffects);
+            for (size_t i = 0; i < numEffects; ++i)
+            {
+                potion.mEffects.mList[i] = LuaUtil::cast<ESM::IndexedENAMstruct>(effectsTable[LuaUtil::toLuaIndex(i)]);
+            }
+            potion.mEffects.updateIndexes();
+        }
         return potion;
     }
 }
@@ -54,26 +71,25 @@ namespace MWLua
         potion["createRecordDraft"] = tableToPotion;
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-        sol::usertype<ESM::Potion> record = context.mLua->sol().new_usertype<ESM::Potion>("ESM3_Potion");
+        sol::state_view lua = context.sol();
+        sol::usertype<ESM::Potion> record = lua.new_usertype<ESM::Potion>("ESM3_Potion");
         record[sol::meta_function::to_string]
             = [](const ESM::Potion& rec) { return "ESM3_Potion[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
         record["icon"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mScript.serializeText(); });
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Potion& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["weight"] = sol::readonly_property([](const ESM::Potion& rec) -> float { return rec.mData.mWeight; });
         record["value"] = sol::readonly_property([](const ESM::Potion& rec) -> int { return rec.mData.mValue; });
-        record["effects"] = sol::readonly_property([context](const ESM::Potion& rec) -> sol::table {
-            sol::table res(context.mLua->sol(), sol::create);
+        record["effects"] = sol::readonly_property([lua = lua.lua_state()](const ESM::Potion& rec) -> sol::table {
+            sol::table res(lua, sol::create);
             for (size_t i = 0; i < rec.mEffects.mList.size(); ++i)
-                res[i + 1] = rec.mEffects.mList[i]; // ESM::ENAMstruct (effect params)
+                res[LuaUtil::toLuaIndex(i)] = rec.mEffects.mList[i]; // ESM::IndexedENAMstruct (effect params)
             return res;
         });
     }
diff --git a/apps/openmw/mwlua/types/probe.cpp b/apps/openmw/mwlua/types/probe.cpp
index 668e58c98c..4467f6617a 100644
--- a/apps/openmw/mwlua/types/probe.cpp
+++ b/apps/openmw/mwlua/types/probe.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadprob.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -25,17 +26,15 @@ namespace MWLua
 
         addRecordFunctionBinding<ESM::Probe>(probe, context);
 
-        sol::usertype<ESM::Probe> record = context.mLua->sol().new_usertype<ESM::Probe>("ESM3_Probe");
+        sol::usertype<ESM::Probe> record = context.sol().new_usertype<ESM::Probe>("ESM3_Probe");
         record[sol::meta_function::to_string]
             = [](const ESM::Probe& rec) { return "ESM3_Probe[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mScript.serializeText(); });
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Probe& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["icon"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
diff --git a/apps/openmw/mwlua/types/repair.cpp b/apps/openmw/mwlua/types/repair.cpp
index 75d0a17c49..af95d187a8 100644
--- a/apps/openmw/mwlua/types/repair.cpp
+++ b/apps/openmw/mwlua/types/repair.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadrepa.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -25,17 +26,15 @@ namespace MWLua
 
         addRecordFunctionBinding<ESM::Repair>(repair, context);
 
-        sol::usertype<ESM::Repair> record = context.mLua->sol().new_usertype<ESM::Repair>("ESM3_Repair");
+        sol::usertype<ESM::Repair> record = context.sol().new_usertype<ESM::Repair>("ESM3_Repair");
         record[sol::meta_function::to_string]
             = [](const ESM::Repair& rec) { return "ESM3_Repair[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mScript.serializeText(); });
+        addModelProperty(record);
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Repair& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["icon"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
diff --git a/apps/openmw/mwlua/types/static.cpp b/apps/openmw/mwlua/types/static.cpp
index 76dac4fa00..7a4c0866eb 100644
--- a/apps/openmw/mwlua/types/static.cpp
+++ b/apps/openmw/mwlua/types/static.cpp
@@ -1,14 +1,12 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadstat.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-
 namespace sol
 {
     template <>
@@ -21,17 +19,13 @@ namespace MWLua
 {
     void addStaticBindings(sol::table stat, const Context& context)
     {
-        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
         addRecordFunctionBinding<ESM::Static>(stat, context);
 
-        sol::usertype<ESM::Static> record = context.mLua->sol().new_usertype<ESM::Static>("ESM3_Static");
+        sol::usertype<ESM::Static> record = context.sol().new_usertype<ESM::Static>("ESM3_Static");
         record[sol::meta_function::to_string]
             = [](const ESM::Static& rec) -> std::string { return "ESM3_Static[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Static& rec) -> std::string { return rec.mId.serializeText(); });
-        record["model"] = sol::readonly_property([vfs](const ESM::Static& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
     }
 }
diff --git a/apps/openmw/mwlua/types/terminal.cpp b/apps/openmw/mwlua/types/terminal.cpp
index b0f8e3be0b..8abd52da74 100644
--- a/apps/openmw/mwlua/types/terminal.cpp
+++ b/apps/openmw/mwlua/types/terminal.cpp
@@ -1,13 +1,13 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm4/loadterm.hpp>
 #include <components/lua/utilpackage.hpp>
 #include <components/misc/convert.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include "apps/openmw/mwworld/esmstore.hpp"
-
 namespace sol
 {
     template <>
@@ -21,12 +21,9 @@ namespace MWLua
 
     void addESM4TerminalBindings(sol::table term, const Context& context)
     {
-
-        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
         addRecordFunctionBinding<ESM4::Terminal>(term, context, "ESM4Terminal");
 
-        sol::usertype<ESM4::Terminal> record = context.mLua->sol().new_usertype<ESM4::Terminal>("ESM4_Terminal");
+        sol::usertype<ESM4::Terminal> record = context.sol().new_usertype<ESM4::Terminal>("ESM4_Terminal");
         record[sol::meta_function::to_string] = [](const ESM4::Terminal& rec) -> std::string {
             return "ESM4_Terminal[" + ESM::RefId(rec.mId).toDebugString() + "]";
         };
@@ -38,8 +35,6 @@ namespace MWLua
         record["resultText"]
             = sol::readonly_property([](const ESM4::Terminal& rec) -> std::string { return rec.mResultText; });
         record["name"] = sol::readonly_property([](const ESM4::Terminal& rec) -> std::string { return rec.mFullName; });
-        record["model"] = sol::readonly_property([vfs](const ESM4::Terminal& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
     }
 }
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index 6095053eee..c7b0b6e9c4 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -42,12 +42,16 @@ namespace MWLua
         constexpr std::string_view ESM4Clothing = "ESM4Clothing";
         constexpr std::string_view ESM4Container = "ESM4Container";
         constexpr std::string_view ESM4Door = "ESM4Door";
+        constexpr std::string_view ESM4Flora = "ESM4Flora";
         constexpr std::string_view ESM4Furniture = "ESM4Furniture";
         constexpr std::string_view ESM4Ingredient = "ESM4Ingredient";
+        constexpr std::string_view ESM4ItemMod = "ESM4ItemMod";
         constexpr std::string_view ESM4Light = "ESM4Light";
         constexpr std::string_view ESM4MiscItem = "ESM4Miscellaneous";
+        constexpr std::string_view ESM4MovableStatic = "ESM4MovableStatic";
         constexpr std::string_view ESM4Potion = "ESM4Potion";
         constexpr std::string_view ESM4Static = "ESM4Static";
+        constexpr std::string_view ESM4StaticCollection = "ESM4StaticCollection";
         constexpr std::string_view ESM4Terminal = "ESM4Terminal";
         constexpr std::string_view ESM4Tree = "ESM4Tree";
         constexpr std::string_view ESM4Weapon = "ESM4Weapon";
@@ -85,12 +89,16 @@ namespace MWLua
             { ESM::REC_CLOT4, ObjectTypeName::ESM4Clothing },
             { ESM::REC_CONT4, ObjectTypeName::ESM4Container },
             { ESM::REC_DOOR4, ObjectTypeName::ESM4Door },
+            { ESM::REC_FLOR4, ObjectTypeName::ESM4Flora },
             { ESM::REC_FURN4, ObjectTypeName::ESM4Furniture },
             { ESM::REC_INGR4, ObjectTypeName::ESM4Ingredient },
+            { ESM::REC_IMOD4, ObjectTypeName::ESM4ItemMod },
             { ESM::REC_LIGH4, ObjectTypeName::ESM4Light },
             { ESM::REC_MISC4, ObjectTypeName::ESM4MiscItem },
+            { ESM::REC_MSTT4, ObjectTypeName::ESM4MovableStatic },
             { ESM::REC_ALCH4, ObjectTypeName::ESM4Potion },
             { ESM::REC_STAT4, ObjectTypeName::ESM4Static },
+            { ESM::REC_SCOL4, ObjectTypeName::ESM4StaticCollection },
             { ESM::REC_TERM4, ObjectTypeName::ESM4Terminal },
             { ESM::REC_TREE4, ObjectTypeName::ESM4Tree },
             { ESM::REC_WEAP4, ObjectTypeName::ESM4Weapon },
@@ -157,18 +165,22 @@ namespace MWLua
 
     sol::table initTypesPackage(const Context& context)
     {
-        auto* lua = context.mLua;
-        sol::table types(lua->sol(), sol::create);
+        auto lua = context.sol();
+
+        if (lua["openmw_types"] != sol::nil)
+            return lua["openmw_types"];
+
+        sol::table types(lua, sol::create);
         auto addType = [&](std::string_view name, std::vector<ESM::RecNameInts> recTypes,
                            std::optional<std::string_view> base = std::nullopt) -> sol::table {
-            sol::table t(lua->sol(), sol::create);
+            sol::table t(lua, sol::create);
             sol::table ro = LuaUtil::makeReadOnly(t);
             sol::table meta = ro[sol::metatable_key];
             meta[sol::meta_function::to_string] = [name]() { return name; };
             if (base)
             {
                 t["baseType"] = types[*base];
-                sol::table baseMeta(lua->sol(), sol::create);
+                sol::table baseMeta(lua, sol::create);
                 baseMeta[sol::meta_function::index] = LuaUtil::getMutableFromReadOnly(types[*base]);
                 t[sol::metatable_key] = baseMeta;
             }
@@ -185,9 +197,11 @@ namespace MWLua
 
         addActorBindings(
             addType(ObjectTypeName::Actor, { ESM::REC_INTERNAL_PLAYER, ESM::REC_CREA, ESM::REC_NPC_ }), context);
-        addItemBindings(addType(ObjectTypeName::Item,
-            { ESM::REC_ARMO, ESM::REC_BOOK, ESM::REC_CLOT, ESM::REC_INGR, ESM::REC_LIGH, ESM::REC_MISC, ESM::REC_ALCH,
-                ESM::REC_WEAP, ESM::REC_APPA, ESM::REC_LOCK, ESM::REC_PROB, ESM::REC_REPA }));
+        addItemBindings(
+            addType(ObjectTypeName::Item,
+                { ESM::REC_ARMO, ESM::REC_BOOK, ESM::REC_CLOT, ESM::REC_INGR, ESM::REC_LIGH, ESM::REC_MISC,
+                    ESM::REC_ALCH, ESM::REC_WEAP, ESM::REC_APPA, ESM::REC_LOCK, ESM::REC_PROB, ESM::REC_REPA }),
+            context);
         addLockableBindings(
             addType(ObjectTypeName::Lockable, { ESM::REC_CONT, ESM::REC_DOOR, ESM::REC_CONT4, ESM::REC_DOOR4 }));
 
@@ -223,18 +237,22 @@ namespace MWLua
         addType(ObjectTypeName::ESM4Clothing, { ESM::REC_CLOT4 });
         addType(ObjectTypeName::ESM4Container, { ESM::REC_CONT4 });
         addESM4DoorBindings(addType(ObjectTypeName::ESM4Door, { ESM::REC_DOOR4 }, ObjectTypeName::Lockable), context);
+        addType(ObjectTypeName::ESM4Flora, { ESM::REC_FLOR4 });
         addType(ObjectTypeName::ESM4Furniture, { ESM::REC_FURN4 });
         addType(ObjectTypeName::ESM4Ingredient, { ESM::REC_INGR4 });
+        addType(ObjectTypeName::ESM4ItemMod, { ESM::REC_IMOD4 });
         addType(ObjectTypeName::ESM4Light, { ESM::REC_LIGH4 });
         addType(ObjectTypeName::ESM4MiscItem, { ESM::REC_MISC4 });
+        addType(ObjectTypeName::ESM4MovableStatic, { ESM::REC_MSTT4 });
         addType(ObjectTypeName::ESM4Potion, { ESM::REC_ALCH4 });
         addType(ObjectTypeName::ESM4Static, { ESM::REC_STAT4 });
+        addType(ObjectTypeName::ESM4StaticCollection, { ESM::REC_SCOL4 });
         addESM4TerminalBindings(addType(ObjectTypeName::ESM4Terminal, { ESM::REC_TERM4 }), context);
         addType(ObjectTypeName::ESM4Tree, { ESM::REC_TREE4 });
         addType(ObjectTypeName::ESM4Weapon, { ESM::REC_WEAP4 });
 
-        sol::table typeToPackage = getTypeToPackageTable(context.mLua->sol());
-        sol::table packageToType = getPackageToTypeTable(context.mLua->sol());
+        sol::table typeToPackage = getTypeToPackageTable(lua);
+        sol::table packageToType = getPackageToTypeTable(lua);
         for (const auto& [type, name] : luaObjectTypeInfo)
         {
             sol::object t = types[name];
@@ -244,6 +262,7 @@ namespace MWLua
             packageToType[t] = type;
         }
 
-        return LuaUtil::makeReadOnly(types);
+        lua["openmw_types"] = LuaUtil::makeReadOnly(types);
+        return lua["openmw_types"];
     }
 }
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 8cd126b007..76bd2848e0 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -6,23 +6,8 @@
 #include <components/esm/defs.hpp>
 #include <components/lua/luastate.hpp>
 
-#include "apps/openmw/mwbase/environment.hpp"
-#include "apps/openmw/mwbase/world.hpp"
-#include "apps/openmw/mwworld/esmstore.hpp"
-#include "apps/openmw/mwworld/store.hpp"
-
 #include "../context.hpp"
-#include "../object.hpp"
-
-namespace sol
-{
-    // Ensure sol does not try to create the automatic Container or usertype bindings for Store.
-    // They include write operations and we want the store to be read-only.
-    template <typename T>
-    struct is_automagical<typename MWWorld::Store<T>> : std::false_type
-    {
-    };
-}
+#include "../recordstore.hpp"
 
 namespace MWLua
 {
@@ -47,7 +32,7 @@ namespace MWLua
     void addBookBindings(sol::table book, const Context& context);
     void addContainerBindings(sol::table container, const Context& context);
     void addDoorBindings(sol::table door, const Context& context);
-    void addItemBindings(sol::table item);
+    void addItemBindings(sol::table item, const Context& context);
     void addActorBindings(sol::table actor, const Context& context);
     void addWeaponBindings(sol::table weapon, const Context& context);
     void addNpcBindings(sol::table npc, const Context& context);
@@ -69,34 +54,6 @@ namespace MWLua
 
     void addESM4DoorBindings(sol::table door, const Context& context);
     void addESM4TerminalBindings(sol::table term, const Context& context);
-
-    template <class T>
-    void addRecordFunctionBinding(
-        sol::table& table, const Context& context, const std::string& recordName = std::string(T::getRecordType()))
-    {
-        const MWWorld::Store<T>& store = MWBase::Environment::get().getESMStore()->get<T>();
-
-        table["record"] = sol::overload([](const Object& obj) -> const T* { return obj.ptr().get<T>()->mBase; },
-            [&store](std::string_view id) -> const T* { return store.find(ESM::RefId::deserializeText(id)); });
-
-        // Define a custom user type for the store.
-        // Provide the interface of a read-only array.
-        using StoreT = MWWorld::Store<T>;
-        sol::state_view& lua = context.mLua->sol();
-        sol::usertype<StoreT> storeT = lua.new_usertype<StoreT>(recordName + "WorldStore");
-        storeT[sol::meta_function::to_string] = [recordName](const StoreT& store) {
-            return "{" + std::to_string(store.getSize()) + " " + recordName + " records}";
-        };
-        storeT[sol::meta_function::length] = [](const StoreT& store) { return store.getSize(); };
-        storeT[sol::meta_function::index] = [](const StoreT& store, size_t index) -> const T* {
-            return store.at(index - 1); // Translate from Lua's 1-based indexing.
-        };
-        storeT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
-        storeT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
-
-        // Provide access to the store.
-        table["records"] = &store;
-    }
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
index 1cbe9b1d26..d5c52c8c4f 100644
--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -1,13 +1,14 @@
 #include "types.hpp"
 
+#include "modelproperty.hpp"
+
 #include <components/esm3/loadweap.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/lua/util.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
 
 namespace sol
 {
@@ -16,7 +17,6 @@ namespace sol
     {
     };
 }
-#include <components/resource/resourcesystem.hpp>
 
 namespace
 {
@@ -24,37 +24,74 @@ namespace
     ESM::Weapon tableToWeapon(const sol::table& rec)
     {
         ESM::Weapon weapon;
-        weapon.mName = rec["name"];
-        weapon.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
-        weapon.mIcon = rec["icon"];
-        std::string_view enchantId = rec["enchant"].get<std::string_view>();
-        weapon.mEnchant = ESM::RefId::deserializeText(enchantId);
-        std::string_view scriptId = rec["mwscript"].get<std::string_view>();
-        weapon.mScript = ESM::RefId::deserializeText(scriptId);
-        weapon.mData.mFlags = 0;
-        weapon.mRecordFlags = 0;
-        if (rec["isMagical"])
-            weapon.mData.mFlags |= ESM::Weapon::Magical;
-        if (rec["isSilver"])
-            weapon.mData.mFlags |= ESM::Weapon::Silver;
-        int weaponType = rec["type"].get<int>();
-        if (weaponType >= 0 && weaponType <= ESM::Weapon::MarksmanThrown)
-            weapon.mData.mType = weaponType;
+        if (rec["template"] != sol::nil)
+            weapon = LuaUtil::cast<ESM::Weapon>(rec["template"]);
         else
-            throw std::runtime_error("Invalid Weapon Type provided: " + std::to_string(weaponType));
+            weapon.blank();
 
-        weapon.mData.mWeight = rec["weight"];
-        weapon.mData.mValue = rec["value"];
-        weapon.mData.mHealth = rec["health"];
-        weapon.mData.mSpeed = rec["speed"];
-        weapon.mData.mReach = rec["reach"];
-        weapon.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
-        weapon.mData.mChop[0] = rec["chopMinDamage"];
-        weapon.mData.mChop[1] = rec["chopMaxDamage"];
-        weapon.mData.mSlash[0] = rec["slashMinDamage"];
-        weapon.mData.mSlash[1] = rec["slashMaxDamage"];
-        weapon.mData.mThrust[0] = rec["thrustMinDamage"];
-        weapon.mData.mThrust[1] = rec["thrustMaxDamage"];
+        if (rec["name"] != sol::nil)
+            weapon.mName = rec["name"];
+        if (rec["model"] != sol::nil)
+            weapon.mModel = Misc::ResourceHelpers::meshPathForESM3(rec["model"].get<std::string_view>());
+        if (rec["icon"] != sol::nil)
+            weapon.mIcon = rec["icon"];
+        if (rec["enchant"] != sol::nil)
+        {
+            std::string_view enchantId = rec["enchant"].get<std::string_view>();
+            weapon.mEnchant = ESM::RefId::deserializeText(enchantId);
+        }
+        if (rec["mwscript"] != sol::nil)
+        {
+            std::string_view scriptId = rec["mwscript"].get<std::string_view>();
+            weapon.mScript = ESM::RefId::deserializeText(scriptId);
+        }
+        if (auto isMagical = rec["isMagical"]; isMagical != sol::nil)
+        {
+            if (isMagical)
+                weapon.mData.mFlags |= ESM::Weapon::Magical;
+            else
+                weapon.mData.mFlags &= ~ESM::Weapon::Magical;
+        }
+        if (auto isSilver = rec["isSilver"]; isSilver != sol::nil)
+        {
+            if (isSilver)
+                weapon.mData.mFlags |= ESM::Weapon::Silver;
+            else
+                weapon.mData.mFlags &= ~ESM::Weapon::Silver;
+        }
+
+        if (rec["type"] != sol::nil)
+        {
+            int weaponType = rec["type"].get<int>();
+            if (weaponType >= 0 && weaponType <= ESM::Weapon::MarksmanThrown)
+                weapon.mData.mType = weaponType;
+            else
+                throw std::runtime_error("Invalid Weapon Type provided: " + std::to_string(weaponType));
+        }
+        if (rec["weight"] != sol::nil)
+            weapon.mData.mWeight = rec["weight"];
+        if (rec["value"] != sol::nil)
+            weapon.mData.mValue = rec["value"];
+        if (rec["health"] != sol::nil)
+            weapon.mData.mHealth = rec["health"];
+        if (rec["speed"] != sol::nil)
+            weapon.mData.mSpeed = rec["speed"];
+        if (rec["reach"] != sol::nil)
+            weapon.mData.mReach = rec["reach"];
+        if (rec["enchantCapacity"] != sol::nil)
+            weapon.mData.mEnchant = std::round(rec["enchantCapacity"].get<float>() * 10);
+        if (rec["chopMinDamage"] != sol::nil)
+            weapon.mData.mChop[0] = rec["chopMinDamage"];
+        if (rec["chopMaxDamage"] != sol::nil)
+            weapon.mData.mChop[1] = rec["chopMaxDamage"];
+        if (rec["slashMinDamage"] != sol::nil)
+            weapon.mData.mSlash[0] = rec["slashMinDamage"];
+        if (rec["slashMaxDamage"] != sol::nil)
+            weapon.mData.mSlash[1] = rec["slashMaxDamage"];
+        if (rec["thrustMinDamage"] != sol::nil)
+            weapon.mData.mThrust[0] = rec["thrustMinDamage"];
+        if (rec["thrustMaxDamage"] != sol::nil)
+            weapon.mData.mThrust[1] = rec["thrustMaxDamage"];
 
         return weapon;
     }
@@ -64,44 +101,44 @@ namespace MWLua
 {
     void addWeaponBindings(sol::table weapon, const Context& context)
     {
-        weapon["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            { "ShortBladeOneHand", ESM::Weapon::ShortBladeOneHand },
-            { "LongBladeOneHand", ESM::Weapon::LongBladeOneHand },
-            { "LongBladeTwoHand", ESM::Weapon::LongBladeTwoHand },
-            { "BluntOneHand", ESM::Weapon::BluntOneHand },
-            { "BluntTwoClose", ESM::Weapon::BluntTwoClose },
-            { "BluntTwoWide", ESM::Weapon::BluntTwoWide },
-            { "SpearTwoWide", ESM::Weapon::SpearTwoWide },
-            { "AxeOneHand", ESM::Weapon::AxeOneHand },
-            { "AxeTwoHand", ESM::Weapon::AxeTwoHand },
-            { "MarksmanBow", ESM::Weapon::MarksmanBow },
-            { "MarksmanCrossbow", ESM::Weapon::MarksmanCrossbow },
-            { "MarksmanThrown", ESM::Weapon::MarksmanThrown },
-            { "Arrow", ESM::Weapon::Arrow },
-            { "Bolt", ESM::Weapon::Bolt },
-        }));
+        sol::state_view lua = context.sol();
+        weapon["TYPE"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, int>(lua,
+            {
+                { "ShortBladeOneHand", ESM::Weapon::ShortBladeOneHand },
+                { "LongBladeOneHand", ESM::Weapon::LongBladeOneHand },
+                { "LongBladeTwoHand", ESM::Weapon::LongBladeTwoHand },
+                { "BluntOneHand", ESM::Weapon::BluntOneHand },
+                { "BluntTwoClose", ESM::Weapon::BluntTwoClose },
+                { "BluntTwoWide", ESM::Weapon::BluntTwoWide },
+                { "SpearTwoWide", ESM::Weapon::SpearTwoWide },
+                { "AxeOneHand", ESM::Weapon::AxeOneHand },
+                { "AxeTwoHand", ESM::Weapon::AxeTwoHand },
+                { "MarksmanBow", ESM::Weapon::MarksmanBow },
+                { "MarksmanCrossbow", ESM::Weapon::MarksmanCrossbow },
+                { "MarksmanThrown", ESM::Weapon::MarksmanThrown },
+                { "Arrow", ESM::Weapon::Arrow },
+                { "Bolt", ESM::Weapon::Bolt },
+            }));
 
         auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         addRecordFunctionBinding<ESM::Weapon>(weapon, context);
         weapon["createRecordDraft"] = tableToWeapon;
 
-        sol::usertype<ESM::Weapon> record = context.mLua->sol().new_usertype<ESM::Weapon>("ESM3_Weapon");
+        sol::usertype<ESM::Weapon> record = lua.new_usertype<ESM::Weapon>("ESM3_Weapon");
         record[sol::meta_function::to_string]
             = [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId.toDebugString() + "]"; };
         record["id"]
             = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mId.serializeText(); });
         record["name"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string {
-            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
-        });
+        addModelProperty(record);
         record["icon"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string {
             return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["enchant"] = sol::readonly_property(
-            [](const ESM::Weapon& rec) -> std::string { return rec.mEnchant.serializeText(); });
-        record["mwscript"]
-            = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mScript.serializeText(); });
+            [](const ESM::Weapon& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mEnchant); });
+        record["mwscript"] = sol::readonly_property(
+            [](const ESM::Weapon& rec) -> sol::optional<std::string> { return LuaUtil::serializeRefId(rec.mScript); });
         record["isMagical"] = sol::readonly_property(
             [](const ESM::Weapon& rec) -> bool { return rec.mData.mFlags & ESM::Weapon::Magical; });
         record["isSilver"] = sol::readonly_property(
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index eba761ed97..9652df1238 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -1,5 +1,6 @@
 #include "uibindings.hpp"
 
+#include <components/lua/util.hpp>
 #include <components/lua_ui/alignment.hpp>
 #include <components/lua_ui/content.hpp>
 #include <components/lua_ui/element.hpp>
@@ -36,18 +37,7 @@ namespace MWLua
             }
         }
 
-        // Lua arrays index from 1
-        inline size_t fromLuaIndex(size_t i)
-        {
-            return i - 1;
-        }
-        inline size_t toLuaIndex(size_t i)
-        {
-            return i + 1;
-        }
-
         const std::unordered_map<MWGui::GuiMode, std::string_view> modeToName{
-            { MWGui::GM_Settings, "SettingsMenu" },
             { MWGui::GM_Inventory, "Interface" },
             { MWGui::GM_Container, "Container" },
             { MWGui::GM_Companion, "Companion" },
@@ -90,35 +80,41 @@ namespace MWLua
         }();
     }
 
-    sol::table initUserInterfacePackage(const Context& context)
+    sol::table registerUiApi(const Context& context)
     {
+        sol::state_view lua = context.sol();
+        bool menu = context.mType == Context::Menu;
+
         MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
 
-        auto element = context.mLua->sol().new_usertype<LuaUi::Element>("Element");
-        element["layout"] = sol::property([](LuaUi::Element& element) { return element.mLayout; },
-            [](LuaUi::Element& element, const sol::table& layout) { element.mLayout = layout; });
-        element["update"] = [luaManager = context.mLuaManager](const std::shared_ptr<LuaUi::Element>& element) {
-            if (element->mDestroy || element->mUpdate)
-                return;
-            element->mUpdate = true;
-            luaManager->addAction([element] { wrapAction(element, [&] { element->update(); }); }, "Update UI");
+        sol::table api(lua, sol::create);
+        api["_setHudVisibility"] = [luaManager = context.mLuaManager](bool state) {
+            luaManager->addAction([state] { MWBase::Environment::get().getWindowManager()->setHudVisibility(state); });
         };
-        element["destroy"] = [luaManager = context.mLuaManager](const std::shared_ptr<LuaUi::Element>& element) {
-            if (element->mDestroy)
-                return;
-            element->mDestroy = true;
-            luaManager->addAction([element] { wrapAction(element, [&] { element->destroy(); }); }, "Destroy UI");
-        };
-
-        sol::table api = context.mLua->newTable();
+        api["_isHudVisible"] = []() -> bool { return MWBase::Environment::get().getWindowManager()->isHudVisible(); };
         api["showMessage"]
-            = [luaManager = context.mLuaManager](std::string_view message) { luaManager->addUIMessage(message); };
-        api["CONSOLE_COLOR"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string, Misc::Color>({
-            { "Default", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Default.substr(1)) },
-            { "Error", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Error.substr(1)) },
-            { "Success", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Success.substr(1)) },
-            { "Info", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Info.substr(1)) },
-        }));
+            = [luaManager = context.mLuaManager](std::string_view message, const sol::optional<sol::table>& options) {
+                  MWGui::ShowInDialogueMode mode = MWGui::ShowInDialogueMode_IfPossible;
+                  if (options.has_value())
+                  {
+                      auto showInDialogue = options->get<sol::optional<bool>>("showInDialogue");
+                      if (showInDialogue.has_value())
+                      {
+                          if (*showInDialogue)
+                              mode = MWGui::ShowInDialogueMode_Only;
+                          else
+                              mode = MWGui::ShowInDialogueMode_Never;
+                      }
+                  }
+                  luaManager->addUIMessage(message, mode);
+              };
+        api["CONSOLE_COLOR"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string, Misc::Color>(lua,
+            {
+                { "Default", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Default.substr(1)) },
+                { "Error", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Error.substr(1)) },
+                { "Success", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Success.substr(1)) },
+                { "Info", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Info.substr(1)) },
+            }));
         api["printToConsole"]
             = [luaManager = context.mLuaManager](const std::string& message, const Misc::Color& color) {
                   luaManager->addInGameConsoleMessage(message + "\n", color);
@@ -126,6 +122,7 @@ namespace MWLua
         api["setConsoleMode"] = [luaManager = context.mLuaManager, windowManager](std::string_view mode) {
             luaManager->addAction([mode = std::string(mode), windowManager] { windowManager->setConsoleMode(mode); });
         };
+        api["getConsoleMode"] = [windowManager]() -> std::string_view { return windowManager->getConsoleMode(); };
         api["setConsoleSelectedObject"] = [luaManager = context.mLuaManager, windowManager](const sol::object& obj) {
             if (obj == sol::nil)
                 luaManager->addAction([windowManager] { windowManager->setConsoleSelectedObject(MWWorld::Ptr()); });
@@ -138,38 +135,33 @@ namespace MWLua
             }
         };
         api["content"] = LuaUi::loadContentConstructor(context.mLua);
-        api["create"] = [luaManager = context.mLuaManager](const sol::table& layout) {
-            auto element = LuaUi::Element::make(layout);
+
+        api["create"] = [luaManager = context.mLuaManager, menu](const sol::table& layout) {
+            auto element = LuaUi::Element::make(layout, menu);
             luaManager->addAction([element] { wrapAction(element, [&] { element->create(); }); }, "Create UI");
             return element;
         };
-        api["updateAll"] = [context]() {
-            LuaUi::Element::forEach([](LuaUi::Element* e) { e->mUpdate = true; });
-            context.mLuaManager->addAction(
-                []() { LuaUi::Element::forEach([](LuaUi::Element* e) { e->update(); }); }, "Update all UI elements");
+
+        api["updateAll"] = [luaManager = context.mLuaManager, menu]() {
+            LuaUi::Element::forEach(menu, [](LuaUi::Element* e) {
+                if (e->mState == LuaUi::Element::Created)
+                    e->mState = LuaUi::Element::Update;
+            });
+            luaManager->addAction([menu]() { LuaUi::Element::forEach(menu, [](LuaUi::Element* e) { e->update(); }); },
+                "Update all menu UI elements");
         };
         api["_getMenuTransparency"] = []() -> float { return Settings::gui().mMenuTransparency; };
 
-        auto uiLayer = context.mLua->sol().new_usertype<LuaUi::Layer>("UiLayer");
-        uiLayer["name"] = sol::property([](LuaUi::Layer& self) { return self.name(); });
-        uiLayer["size"] = sol::property([](LuaUi::Layer& self) { return self.size(); });
-        uiLayer[sol::meta_function::to_string]
-            = [](LuaUi::Layer& self) { return Misc::StringUtils::format("UiLayer(%s)", self.name()); };
-
-        sol::table layers = context.mLua->newTable();
-        layers[sol::meta_function::length] = []() { return LuaUi::Layer::count(); };
-        layers[sol::meta_function::index] = [](size_t index) {
-            index = fromLuaIndex(index);
-            return LuaUi::Layer(index);
-        };
-        layers["indexOf"] = [](std::string_view name) -> sol::optional<size_t> {
+        sol::table layersTable(lua, sol::create);
+        layersTable["indexOf"] = [](std::string_view name) -> sol::optional<size_t> {
             size_t index = LuaUi::Layer::indexOf(name);
             if (index == LuaUi::Layer::count())
                 return sol::nullopt;
             else
-                return toLuaIndex(index);
+                return LuaUtil::toLuaIndex(index);
         };
-        layers["insertAfter"] = [context](std::string_view afterName, std::string_view name, const sol::object& opt) {
+        layersTable["insertAfter"] = [context](
+                                         std::string_view afterName, std::string_view name, const sol::object& opt) {
             LuaUi::Layer::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
             size_t index = LuaUi::Layer::indexOf(afterName);
@@ -178,7 +170,8 @@ namespace MWLua
             index++;
             context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
-        layers["insertBefore"] = [context](std::string_view beforename, std::string_view name, const sol::object& opt) {
+        layersTable["insertBefore"] = [context](
+                                          std::string_view beforename, std::string_view name, const sol::object& opt) {
             LuaUi::Layer::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
             size_t index = LuaUi::Layer::indexOf(beforename);
@@ -186,6 +179,16 @@ namespace MWLua
                 throw std::logic_error(std::string("Layer not found"));
             context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
+        sol::table layers = LuaUtil::makeReadOnly(layersTable);
+        sol::table layersMeta = layers[sol::metatable_key];
+        layersMeta[sol::meta_function::length] = []() { return LuaUi::Layer::count(); };
+        layersMeta[sol::meta_function::index] = sol::overload(
+            [](const sol::object& self, size_t index) {
+                index = LuaUtil::fromLuaIndex(index);
+                return LuaUi::Layer(index);
+            },
+            [layersTable](
+                const sol::object& self, std::string_view key) { return layersTable.raw_get<sol::object>(key); });
         {
             auto pairs = [layers](const sol::object&) {
                 auto next = [](const sol::table& l, size_t i) -> sol::optional<std::tuple<size_t, LuaUi::Layer>> {
@@ -196,21 +199,22 @@ namespace MWLua
                 };
                 return std::make_tuple(next, layers, 0);
             };
-            layers[sol::meta_function::pairs] = pairs;
-            layers[sol::meta_function::ipairs] = pairs;
+            layersMeta[sol::meta_function::pairs] = pairs;
+            layersMeta[sol::meta_function::ipairs] = pairs;
         }
-        api["layers"] = LuaUtil::makeReadOnly(layers);
+        api["layers"] = layers;
 
-        sol::table typeTable = context.mLua->newTable();
+        sol::table typeTable(lua, sol::create);
         for (const auto& it : LuaUi::widgetTypeToName())
             typeTable.set(it.second, it.first);
         api["TYPE"] = LuaUtil::makeStrictReadOnly(typeTable);
 
-        api["ALIGNMENT"] = LuaUtil::makeStrictReadOnly(
-            context.mLua->tableFromPairs<std::string_view, LuaUi::Alignment>({ { "Start", LuaUi::Alignment::Start },
-                { "Center", LuaUi::Alignment::Center }, { "End", LuaUi::Alignment::End } }));
+        api["ALIGNMENT"] = LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, LuaUi::Alignment>(lua,
+            { { "Start", LuaUi::Alignment::Start }, { "Center", LuaUi::Alignment::Center },
+                { "End", LuaUi::Alignment::End } }));
 
         api["registerSettingsPage"] = &LuaUi::registerSettingsPage;
+        api["removeSettingsPage"] = &LuaUi::removeSettingsPage;
 
         api["texture"] = [luaManager = context.mLuaManager](const sol::table& options) {
             LuaUi::TextureData data;
@@ -225,13 +229,10 @@ namespace MWLua
             sol::object size = LuaUtil::getFieldOrNil(options, "size");
             if (size.is<osg::Vec2f>())
                 data.mSize = size.as<osg::Vec2f>();
-            return luaManager->uiResourceManager()->registerTexture(data);
+            return luaManager->uiResourceManager()->registerTexture(std::move(data));
         };
 
-        api["screenSize"] = []() {
-            return osg::Vec2f(
-                Settings::Manager::getInt("resolution x", "Video"), Settings::Manager::getInt("resolution y", "Video"));
-        };
+        api["screenSize"] = []() { return osg::Vec2f(Settings::video().mResolutionX, Settings::video().mResolutionY); };
 
         api["_getAllUiModes"] = [](sol::this_state lua) {
             sol::table res(lua, sol::create);
@@ -250,9 +251,9 @@ namespace MWLua
             = [windowManager, luaManager = context.mLuaManager](sol::table modes, sol::optional<LObject> arg) {
                   std::vector<MWGui::GuiMode> newStack(modes.size());
                   for (unsigned i = 0; i < newStack.size(); ++i)
-                      newStack[i] = nameToMode.at(LuaUtil::cast<std::string_view>(modes[i + 1]));
+                      newStack[i] = nameToMode.at(LuaUtil::cast<std::string_view>(modes[LuaUtil::toLuaIndex(i)]));
                   luaManager->addAction(
-                      [windowManager, newStack, arg]() {
+                      [windowManager, newStack = std::move(newStack), arg = std::move(arg)]() {
                           MWWorld::Ptr ptr;
                           if (arg.has_value())
                               ptr = arg->ptr();
@@ -263,7 +264,7 @@ namespace MWLua
                           // TODO: Maybe disallow opening/closing special modes (main menu, settings, loading screen)
                           // from player scripts. Add new Lua context "menu" that can do it.
                           for (unsigned i = stack.size() - common; i > 0; i--)
-                              windowManager->popGuiMode();
+                              windowManager->popGuiMode(true);
                           if (common == newStack.size() && !newStack.empty() && arg.has_value())
                               windowManager->pushGuiMode(newStack.back(), ptr);
                           for (unsigned i = common; i < newStack.size(); ++i)
@@ -289,9 +290,54 @@ namespace MWLua
               };
 
         // TODO
-        // api["_showHUD"] = [](bool) {};
         // api["_showMouseCursor"] = [](bool) {};
 
-        return LuaUtil::makeReadOnly(api);
+        return api;
+    }
+
+    sol::table initUserInterfacePackage(const Context& context)
+    {
+        if (context.initializeOnce("openmw_ui_usertypes"))
+        {
+            auto element = context.sol().new_usertype<LuaUi::Element>("UiElement");
+            element[sol::meta_function::to_string] = [](const LuaUi::Element& element) {
+                std::stringstream res;
+                res << "UiElement";
+                if (element.mLayer != "")
+                    res << "[" << element.mLayer << "]";
+                return res.str();
+            };
+            element["layout"] = sol::property([](const LuaUi::Element& element) { return element.mLayout; },
+                [](LuaUi::Element& element, const sol::table& layout) { element.mLayout = layout; });
+            element["update"] = [luaManager = context.mLuaManager](const std::shared_ptr<LuaUi::Element>& element) {
+                if (element->mState != LuaUi::Element::Created)
+                    return;
+                element->mState = LuaUi::Element::Update;
+                luaManager->addAction([element] { wrapAction(element, [&] { element->update(); }); }, "Update UI");
+            };
+            element["destroy"] = [luaManager = context.mLuaManager](const std::shared_ptr<LuaUi::Element>& element) {
+                if (element->mState == LuaUi::Element::Destroyed)
+                    return;
+                element->mState = LuaUi::Element::Destroy;
+                luaManager->addAction(
+                    [element] { wrapAction(element, [&] { LuaUi::Element::erase(element.get()); }); }, "Destroy UI");
+            };
+
+            auto uiLayer = context.sol().new_usertype<LuaUi::Layer>("UiLayer");
+            uiLayer["name"]
+                = sol::readonly_property([](LuaUi::Layer& self) -> std::string_view { return self.name(); });
+            uiLayer["size"] = sol::readonly_property([](LuaUi::Layer& self) { return self.size(); });
+            uiLayer[sol::meta_function::to_string]
+                = [](LuaUi::Layer& self) { return Misc::StringUtils::format("UiLayer(%s)", self.name()); };
+        }
+
+        sol::object cached = context.getTypePackage("openmw_ui");
+        if (cached != sol::nil)
+            return cached;
+        else
+        {
+            sol::table api = LuaUtil::makeReadOnly(registerUiApi(context));
+            return context.setTypePackage(api, "openmw_ui");
+        }
     }
 }
diff --git a/apps/openmw/mwlua/userdataserializer.cpp b/apps/openmw/mwlua/userdataserializer.cpp
index 6565ee0bde..478f725d7c 100644
--- a/apps/openmw/mwlua/userdataserializer.cpp
+++ b/apps/openmw/mwlua/userdataserializer.cpp
@@ -52,7 +52,7 @@ namespace MWLua
             {
                 std::vector<ESM::RefNum> buf;
                 buf.reserve(objList->size());
-                for (const ESM::RefNum& v : *objList)
+                for (ESM::RefNum v : *objList)
                     buf.push_back({ Misc::toLittleEndian(v.mIndex), Misc::toLittleEndian(v.mContentFile) });
                 append(out, sObjListTypeName, buf.data(), buf.size() * sizeof(ESM::RefNum));
             }
diff --git a/apps/openmw/mwlua/vfsbindings.cpp b/apps/openmw/mwlua/vfsbindings.cpp
new file mode 100644
index 0000000000..3186db26ca
--- /dev/null
+++ b/apps/openmw/mwlua/vfsbindings.cpp
@@ -0,0 +1,355 @@
+#include "vfsbindings.hpp"
+
+#include <sol/object.hpp>
+
+#include <components/files/istreamptr.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/settings/values.hpp>
+#include <components/vfs/manager.hpp>
+#include <components/vfs/pathutil.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
+
+#include "../mwbase/environment.hpp"
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    namespace
+    {
+        // Too many arguments may cause stack corruption and crash.
+        constexpr std::size_t sMaximumReadArguments = 20;
+
+        // Print a message if we read a large chunk of file to string.
+        constexpr std::size_t sFileSizeWarningThreshold = 1024 * 1024;
+
+        struct FileHandle
+        {
+        public:
+            FileHandle(Files::IStreamPtr stream, std::string_view fileName)
+            {
+                mFilePtr = std::move(stream);
+                mFileName = fileName;
+            }
+
+            Files::IStreamPtr mFilePtr;
+            std::string mFileName;
+        };
+
+        std::ios_base::seekdir getSeekDir(FileHandle& self, std::string_view whence)
+        {
+            if (whence == "cur")
+                return std::ios_base::cur;
+            if (whence == "set")
+                return std::ios_base::beg;
+            if (whence == "end")
+                return std::ios_base::end;
+
+            throw std::runtime_error(
+                "Error when handling '" + self.mFileName + "': invalid seek direction: '" + std::string(whence) + "'.");
+        }
+
+        size_t getBytesLeftInStream(Files::IStreamPtr& file)
+        {
+            auto oldPos = file->tellg();
+            file->seekg(0, std::ios_base::end);
+            auto newPos = file->tellg();
+            file->seekg(oldPos, std::ios_base::beg);
+
+            return newPos - oldPos;
+        }
+
+        void printLargeDataMessage(FileHandle& file, size_t size)
+        {
+            if (!file.mFilePtr || !Settings::lua().mLuaDebug || size < sFileSizeWarningThreshold)
+                return;
+
+            Log(Debug::Verbose) << "Read a large data chunk (" << size << " bytes) from '" << file.mFileName << "'.";
+        }
+
+        sol::object readFile(sol::this_state lua, FileHandle& file)
+        {
+            std::ostringstream os;
+            if (file.mFilePtr && file.mFilePtr->peek() != EOF)
+                os << file.mFilePtr->rdbuf();
+
+            auto result = os.str();
+            printLargeDataMessage(file, result.size());
+            return sol::make_object<std::string>(lua, std::move(result));
+        }
+
+        sol::object readLineFromFile(sol::this_state lua, FileHandle& file)
+        {
+            std::string result;
+            if (file.mFilePtr && std::getline(*file.mFilePtr, result))
+            {
+                printLargeDataMessage(file, result.size());
+                return sol::make_object<std::string>(lua, result);
+            }
+
+            return sol::nil;
+        }
+
+        sol::object readNumberFromFile(sol::this_state lua, Files::IStreamPtr& file)
+        {
+            double number = 0;
+            if (file && *file >> number)
+                return sol::make_object<double>(lua, number);
+
+            return sol::nil;
+        }
+
+        sol::object readCharactersFromFile(sol::this_state lua, FileHandle& file, size_t count)
+        {
+            if (count <= 0 && file.mFilePtr->peek() != EOF)
+                return sol::make_object<std::string>(lua, std::string());
+
+            auto bytesLeft = getBytesLeftInStream(file.mFilePtr);
+            if (bytesLeft <= 0)
+                return sol::nil;
+
+            if (count > bytesLeft)
+                count = bytesLeft;
+
+            std::string result(count, '\0');
+            if (file.mFilePtr->read(&result[0], count))
+            {
+                printLargeDataMessage(file, result.size());
+                return sol::make_object<std::string>(lua, result);
+            }
+
+            return sol::nil;
+        }
+
+        void validateFile(const FileHandle& self)
+        {
+            if (self.mFilePtr)
+                return;
+
+            throw std::runtime_error("Error when handling '" + self.mFileName + "': attempt to use a closed file.");
+        }
+
+        sol::variadic_results seek(
+            sol::this_state lua, FileHandle& self, std::ios_base::seekdir dir, std::streamoff off)
+        {
+            sol::variadic_results values;
+            try
+            {
+                self.mFilePtr->seekg(off, dir);
+                if (self.mFilePtr->fail() || self.mFilePtr->bad())
+                {
+                    auto msg = "Failed to seek in file '" + self.mFileName + "'";
+                    values.push_back(sol::nil);
+                    values.push_back(sol::make_object<std::string>(lua, msg));
+                }
+                else
+                {
+                    // tellg returns std::streampos which is not required to be a numeric type. It is required to be
+                    // convertible to std::streamoff which is a number
+                    values.push_back(sol::make_object<std::streamoff>(lua, self.mFilePtr->tellg()));
+                }
+            }
+            catch (std::exception& e)
+            {
+                auto msg = "Failed to seek in file '" + self.mFileName + "': " + std::string(e.what());
+                values.push_back(sol::nil);
+                values.push_back(sol::make_object<std::string>(lua, msg));
+            }
+
+            return values;
+        }
+    }
+
+    sol::table initVFSPackage(const Context& context)
+    {
+        sol::table api(context.mLua->unsafeState(), sol::create);
+
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
+        sol::usertype<FileHandle> handle = context.sol().new_usertype<FileHandle>("FileHandle");
+        handle["fileName"]
+            = sol::readonly_property([](const FileHandle& self) -> std::string_view { return self.mFileName; });
+        handle[sol::meta_function::to_string] = [](const FileHandle& self) {
+            return "FileHandle{'" + self.mFileName + "'" + (!self.mFilePtr ? ", closed" : "") + "}";
+        };
+        handle["seek"] = sol::overload(
+            [](sol::this_state lua, FileHandle& self, std::string_view whence, sol::optional<long> offset) {
+                validateFile(self);
+
+                auto off = static_cast<std::streamoff>(offset.value_or(0));
+                auto dir = getSeekDir(self, whence);
+
+                return seek(lua, self, dir, off);
+            },
+            [](sol::this_state lua, FileHandle& self, sol::optional<long> offset) {
+                validateFile(self);
+
+                auto off = static_cast<std::streamoff>(offset.value_or(0));
+
+                return seek(lua, self, std::ios_base::cur, off);
+            });
+        handle["lines"] = [](sol::this_state lua, FileHandle& self) {
+            return sol::as_function([&lua, &self]() mutable {
+                validateFile(self);
+                return readLineFromFile(lua, self);
+            });
+        };
+
+        api["lines"] = [vfs](sol::this_state lua, std::string_view fileName) {
+            auto normalizedName = VFS::Path::normalizeFilename(fileName);
+            return sol::as_function(
+                [lua, file = FileHandle(vfs->getNormalized(normalizedName), normalizedName)]() mutable {
+                    validateFile(file);
+                    auto result = readLineFromFile(lua, file);
+                    if (result == sol::nil)
+                        file.mFilePtr.reset();
+
+                    return result;
+                });
+        };
+
+        handle["close"] = [](sol::this_state lua, FileHandle& self) {
+            sol::variadic_results values;
+            try
+            {
+                self.mFilePtr.reset();
+                if (self.mFilePtr)
+                {
+                    auto msg = "Can not close file '" + self.mFileName + "': file handle is still opened.";
+                    values.push_back(sol::nil);
+                    values.push_back(sol::make_object<std::string>(lua, msg));
+                }
+                else
+                    values.push_back(sol::make_object<bool>(lua, true));
+            }
+            catch (std::exception& e)
+            {
+                auto msg = "Can not close file '" + self.mFileName + "': " + std::string(e.what());
+                values.push_back(sol::nil);
+                values.push_back(sol::make_object<std::string>(lua, msg));
+            }
+
+            return values;
+        };
+
+        handle["read"] = [](sol::this_state lua, FileHandle& self, const sol::variadic_args args) {
+            validateFile(self);
+
+            if (args.size() > sMaximumReadArguments)
+                throw std::runtime_error(
+                    "Error when handling '" + self.mFileName + "': too many arguments for 'read'.");
+
+            sol::variadic_results values;
+            // If there are no arguments, read a string
+            if (args.size() == 0)
+            {
+                values.push_back(readLineFromFile(lua, self));
+                return values;
+            }
+
+            bool success = true;
+            size_t i = 0;
+            for (i = 0; i < args.size() && success; i++)
+            {
+                if (args[i].is<std::string_view>())
+                {
+                    auto format = args[i].as<std::string_view>();
+
+                    if (format == "*a" || format == "*all")
+                    {
+                        values.push_back(readFile(lua, self));
+                        continue;
+                    }
+
+                    if (format == "*n" || format == "*number")
+                    {
+                        auto result = readNumberFromFile(lua, self.mFilePtr);
+                        values.push_back(result);
+                        if (result == sol::nil)
+                            success = false;
+                        continue;
+                    }
+
+                    if (format == "*l" || format == "*line")
+                    {
+                        auto result = readLineFromFile(lua, self);
+                        values.push_back(result);
+                        if (result == sol::nil)
+                            success = false;
+                        continue;
+                    }
+
+                    throw std::runtime_error("Error when handling '" + self.mFileName + "': bad argument #"
+                        + std::to_string(i + 1) + " to 'read' (invalid format)");
+                }
+                else if (args[i].is<int>())
+                {
+                    int number = args[i].as<int>();
+                    auto result = readCharactersFromFile(lua, self, number);
+                    values.push_back(result);
+                    if (result == sol::nil)
+                        success = false;
+                }
+            }
+
+            // We should return nil if we just reached the end of stream
+            if (!success && self.mFilePtr->eof())
+                return values;
+
+            if (!success && (self.mFilePtr->fail() || self.mFilePtr->bad()))
+            {
+                auto msg = "Error when handling '" + self.mFileName + "': can not read data for argument #"
+                    + std::to_string(i);
+                values.push_back(sol::make_object<std::string>(lua, msg));
+            }
+
+            return values;
+        };
+
+        api["open"] = [vfs](sol::this_state lua, std::string_view fileName) {
+            sol::variadic_results values;
+            try
+            {
+                auto normalizedName = VFS::Path::normalizeFilename(fileName);
+                auto handle = FileHandle(vfs->getNormalized(normalizedName), normalizedName);
+                values.push_back(sol::make_object<FileHandle>(lua, std::move(handle)));
+            }
+            catch (std::exception& e)
+            {
+                auto msg = "Can not open file: " + std::string(e.what());
+                values.push_back(sol::nil);
+                values.push_back(sol::make_object<std::string>(lua, msg));
+            }
+
+            return values;
+        };
+
+        api["type"] = sol::overload(
+            [](const FileHandle& handle) -> std::string {
+                if (handle.mFilePtr)
+                    return "file";
+
+                return "closed file";
+            },
+            [](const sol::object&) -> sol::object { return sol::nil; });
+
+        api["fileExists"]
+            = [vfs](std::string_view fileName) -> bool { return vfs->exists(VFS::Path::Normalized(fileName)); };
+        api["pathsWithPrefix"] = [vfs](std::string_view prefix) {
+            auto iterator = vfs->getRecursiveDirectoryIterator(prefix);
+            return sol::as_function([iterator, current = iterator.begin()]() mutable -> sol::optional<std::string> {
+                if (current != iterator.end())
+                {
+                    const std::string& result = *current;
+                    ++current;
+                    return result;
+                }
+
+                return sol::nullopt;
+            });
+        };
+
+        return LuaUtil::makeReadOnly(api);
+    }
+}
diff --git a/apps/openmw/mwlua/vfsbindings.hpp b/apps/openmw/mwlua/vfsbindings.hpp
new file mode 100644
index 0000000000..b251db6fd4
--- /dev/null
+++ b/apps/openmw/mwlua/vfsbindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_VFSBINDINGS_H
+#define MWLUA_VFSBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initVFSPackage(const Context&);
+}
+
+#endif // MWLUA_VFSBINDINGS_H
diff --git a/apps/openmw/mwlua/worker.cpp b/apps/openmw/mwlua/worker.cpp
index e8b06cf210..5639cc89ed 100644
--- a/apps/openmw/mwlua/worker.cpp
+++ b/apps/openmw/mwlua/worker.cpp
@@ -2,18 +2,17 @@
 
 #include "luamanagerimp.hpp"
 
-#include <apps/openmw/profile.hpp>
+#include "apps/openmw/profile.hpp"
 
 #include <components/debug/debuglog.hpp>
 #include <components/settings/values.hpp>
 
-#include <osgViewer/Viewer>
+#include <cassert>
 
 namespace MWLua
 {
-    Worker::Worker(LuaManager& manager, osgViewer::Viewer& viewer)
+    Worker::Worker(LuaManager& manager)
         : mManager(manager)
-        , mViewer(viewer)
     {
         if (Settings::lua().mLuaNumThreads > 0)
             mThread = std::thread([this] { run(); });
@@ -29,26 +28,26 @@ namespace MWLua
         }
     }
 
-    void Worker::allowUpdate()
+    void Worker::allowUpdate(osg::Timer_t frameStart, unsigned frameNumber, osg::Stats& stats)
     {
         if (!mThread)
             return;
         {
             std::lock_guard<std::mutex> lk(mMutex);
-            mUpdateRequest = true;
+            mUpdateRequest = UpdateRequest{ .mFrameStart = frameStart, .mFrameNumber = frameNumber, .mStats = &stats };
         }
         mCV.notify_one();
     }
 
-    void Worker::finishUpdate()
+    void Worker::finishUpdate(osg::Timer_t frameStart, unsigned frameNumber, osg::Stats& stats)
     {
         if (mThread)
         {
             std::unique_lock<std::mutex> lk(mMutex);
-            mCV.wait(lk, [&] { return !mUpdateRequest; });
+            mCV.wait(lk, [&] { return !mUpdateRequest.has_value(); });
         }
         else
-            update();
+            update(frameStart, frameNumber, stats);
     }
 
     void Worker::join()
@@ -64,12 +63,10 @@ namespace MWLua
         }
     }
 
-    void Worker::update()
+    void Worker::update(osg::Timer_t frameStart, unsigned frameNumber, osg::Stats& stats)
     {
-        const osg::Timer_t frameStart = mViewer.getStartTick();
-        const unsigned int frameNumber = mViewer.getFrameStamp()->getFrameNumber();
-        OMW::ScopedProfile<OMW::UserStatsType::Lua> profile(
-            frameStart, frameNumber, *osg::Timer::instance(), *mViewer.getViewerStats());
+        const osg::Timer* const timer = osg::Timer::instance();
+        OMW::ScopedProfile<OMW::UserStatsType::Lua> profile(frameStart, frameNumber, *timer, stats);
 
         mManager.update();
     }
@@ -79,20 +76,22 @@ namespace MWLua
         while (true)
         {
             std::unique_lock<std::mutex> lk(mMutex);
-            mCV.wait(lk, [&] { return mUpdateRequest || mJoinRequest; });
+            mCV.wait(lk, [&] { return mUpdateRequest.has_value() || mJoinRequest; });
             if (mJoinRequest)
                 break;
 
+            assert(mUpdateRequest.has_value());
+
             try
             {
-                update();
+                update(mUpdateRequest->mFrameStart, mUpdateRequest->mFrameNumber, *mUpdateRequest->mStats);
             }
-            catch (std::exception& e)
+            catch (const std::exception& e)
             {
                 Log(Debug::Error) << "Failed to update LuaManager: " << e.what();
             }
 
-            mUpdateRequest = false;
+            mUpdateRequest.reset();
             lk.unlock();
             mCV.notify_one();
         }
diff --git a/apps/openmw/mwlua/worker.hpp b/apps/openmw/mwlua/worker.hpp
index fed625e1f1..58d69afe71 100644
--- a/apps/openmw/mwlua/worker.hpp
+++ b/apps/openmw/mwlua/worker.hpp
@@ -1,14 +1,17 @@
 #ifndef OPENMW_MWLUA_WORKER_H
 #define OPENMW_MWLUA_WORKER_H
 
+#include <osg/Timer>
+#include <osg/ref_ptr>
+
 #include <condition_variable>
 #include <mutex>
 #include <optional>
 #include <thread>
 
-namespace osgViewer
+namespace osg
 {
-    class Viewer;
+    class Stats;
 }
 
 namespace MWLua
@@ -18,26 +21,32 @@ namespace MWLua
     class Worker
     {
     public:
-        explicit Worker(LuaManager& manager, osgViewer::Viewer& viewer);
+        explicit Worker(LuaManager& manager);
 
         ~Worker();
 
-        void allowUpdate();
+        void allowUpdate(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
-        void finishUpdate();
+        void finishUpdate(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
         void join();
 
     private:
-        void update();
+        struct UpdateRequest
+        {
+            osg::Timer_t mFrameStart;
+            unsigned mFrameNumber;
+            osg::ref_ptr<osg::Stats> mStats;
+        };
+
+        void update(osg::Timer_t frameStart, unsigned frameNumber, osg::Stats& stats);
 
         void run() noexcept;
 
         LuaManager& mManager;
-        osgViewer::Viewer& mViewer;
         std::mutex mMutex;
         std::condition_variable mCV;
-        bool mUpdateRequest = false;
+        std::optional<UpdateRequest> mUpdateRequest;
         bool mJoinRequest = false;
         std::optional<std::thread> mThread;
     };
diff --git a/apps/openmw/mwlua/worldbindings.cpp b/apps/openmw/mwlua/worldbindings.cpp
new file mode 100644
index 0000000000..ac7bd307cf
--- /dev/null
+++ b/apps/openmw/mwlua/worldbindings.cpp
@@ -0,0 +1,228 @@
+#include "worldbindings.hpp"
+
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/lua/luastate.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/statemanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwworld/action.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/datetimemanager.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/manualref.hpp"
+#include "../mwworld/store.hpp"
+#include "../mwworld/worldmodel.hpp"
+
+#include "luamanagerimp.hpp"
+
+#include "animationbindings.hpp"
+#include "corebindings.hpp"
+#include "mwscriptbindings.hpp"
+
+namespace MWLua
+{
+    struct CellsStore
+    {
+    };
+}
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWLua::CellsStore> : std::false_type
+    {
+    };
+}
+
+namespace MWLua
+{
+
+    static void checkGameInitialized(LuaUtil::LuaState* lua)
+    {
+        if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame)
+            throw std::runtime_error(
+                "This function cannot be used until the game is fully initialized.\n" + lua->debugTraceback());
+    }
+
+    static void addWorldTimeBindings(sol::table& api, const Context& context)
+    {
+        MWWorld::DateTimeManager* timeManager = MWBase::Environment::get().getWorld()->getTimeManager();
+
+        api["setGameTimeScale"] = [timeManager](double scale) { timeManager->setGameTimeScale(scale); };
+        api["setSimulationTimeScale"] = [context, timeManager](float scale) {
+            context.mLuaManager->addAction([scale, timeManager] { timeManager->setSimulationTimeScale(scale); });
+        };
+
+        api["pause"]
+            = [timeManager](sol::optional<std::string_view> tag) { timeManager->pause(tag.value_or("paused")); };
+        api["unpause"]
+            = [timeManager](sol::optional<std::string_view> tag) { timeManager->unpause(tag.value_or("paused")); };
+        api["getPausedTags"] = [timeManager](sol::this_state lua) {
+            sol::table res(lua, sol::create);
+            for (const std::string& tag : timeManager->getPausedTags())
+                res[tag] = tag;
+            return res;
+        };
+    }
+
+    static void addCellGetters(sol::table& api, const Context& context)
+    {
+        api["getCellByName"] = [](std::string_view name) {
+            return GCell{ &MWBase::Environment::get().getWorldModel()->getCell(name, /*forceLoad=*/false) };
+        };
+        api["getCellById"] = [](std::string_view stringId) {
+            return GCell{ &MWBase::Environment::get().getWorldModel()->getCell(
+                ESM::RefId::deserializeText(stringId), /*forceLoad=*/false) };
+        };
+        api["getExteriorCell"] = [](int x, int y, sol::object cellOrName) {
+            ESM::RefId worldspace;
+            if (cellOrName.is<GCell>())
+                worldspace = cellOrName.as<GCell>().mStore->getCell()->getWorldSpace();
+            else if (cellOrName.is<std::string_view>() && !cellOrName.as<std::string_view>().empty())
+                worldspace = MWBase::Environment::get()
+                                 .getWorldModel()
+                                 ->getCell(cellOrName.as<std::string_view>())
+                                 .getCell()
+                                 ->getWorldSpace();
+            else
+                worldspace = ESM::Cell::sDefaultWorldspaceId;
+            return GCell{ &MWBase::Environment::get().getWorldModel()->getExterior(
+                ESM::ExteriorCellLocation(x, y, worldspace), /*forceLoad=*/false) };
+        };
+
+        const MWWorld::Store<ESM::Cell>* cells3Store = &MWBase::Environment::get().getESMStore()->get<ESM::Cell>();
+        const MWWorld::Store<ESM4::Cell>* cells4Store = &MWBase::Environment::get().getESMStore()->get<ESM4::Cell>();
+        auto view = context.sol();
+        sol::usertype<CellsStore> cells = view.new_usertype<CellsStore>("Cells");
+        cells[sol::meta_function::length]
+            = [cells3Store, cells4Store](const CellsStore&) { return cells3Store->getSize() + cells4Store->getSize(); };
+        cells[sol::meta_function::index]
+            = [cells3Store, cells4Store](const CellsStore&, size_t index) -> sol::optional<GCell> {
+            if (index > cells3Store->getSize() + cells3Store->getSize() || index == 0)
+                return sol::nullopt;
+
+            index--; // Translate from Lua's 1-based indexing.
+            if (index < cells3Store->getSize())
+            {
+                const ESM::Cell* cellRecord = cells3Store->at(index);
+                return GCell{ &MWBase::Environment::get().getWorldModel()->getCell(
+                    cellRecord->mId, /*forceLoad=*/false) };
+            }
+            else
+            {
+                const ESM4::Cell* cellRecord = cells4Store->at(index - cells3Store->getSize());
+                return GCell{ &MWBase::Environment::get().getWorldModel()->getCell(
+                    cellRecord->mId, /*forceLoad=*/false) };
+            }
+        };
+        cells[sol::meta_function::pairs] = view["ipairsForArray"].template get<sol::function>();
+        cells[sol::meta_function::ipairs] = view["ipairsForArray"].template get<sol::function>();
+        api["cells"] = CellsStore{};
+    }
+
+    sol::table initWorldPackage(const Context& context)
+    {
+        sol::table api(context.mLua->unsafeState(), sol::create);
+
+        addCoreTimeBindings(api, context);
+        addWorldTimeBindings(api, context);
+        addCellGetters(api, context);
+        api["mwscript"] = initMWScriptBindings(context);
+
+        ObjectLists* objectLists = context.mObjectLists;
+        api["activeActors"] = GObjectList{ objectLists->getActorsInScene() };
+        api["players"] = GObjectList{ objectLists->getPlayers() };
+
+        api["createObject"] = [lua = context.mLua](std::string_view recordId, sol::optional<int> count) -> GObject {
+            checkGameInitialized(lua);
+            MWWorld::ManualRef mref(*MWBase::Environment::get().getESMStore(), ESM::RefId::deserializeText(recordId));
+            const MWWorld::Ptr& ptr = mref.getPtr();
+            ptr.getRefData().disable();
+            MWWorld::CellStore& cell = MWBase::Environment::get().getWorldModel()->getDraftCell();
+            MWWorld::Ptr newPtr = ptr.getClass().copyToCell(ptr, cell, count.value_or(1));
+            return GObject(newPtr);
+        };
+        api["getObjectByFormId"] = [](std::string_view formIdStr) -> GObject {
+            ESM::RefId refId = ESM::RefId::deserializeText(formIdStr);
+            if (!refId.is<ESM::FormId>())
+                throw std::runtime_error("FormId expected, got " + std::string(formIdStr) + "; use core.getFormId");
+            return GObject(*refId.getIf<ESM::FormId>());
+        };
+
+        // Creates a new record in the world database.
+        api["createRecord"] = sol::overload(
+            [lua = context.mLua](const ESM::Activator& activator) -> const ESM::Activator* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(activator);
+            },
+            [lua = context.mLua](const ESM::Armor& armor) -> const ESM::Armor* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(armor);
+            },
+            [lua = context.mLua](const ESM::Clothing& clothing) -> const ESM::Clothing* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(clothing);
+            },
+            [lua = context.mLua](const ESM::Book& book) -> const ESM::Book* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(book);
+            },
+            [lua = context.mLua](const ESM::Miscellaneous& misc) -> const ESM::Miscellaneous* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(misc);
+            },
+            [lua = context.mLua](const ESM::Potion& potion) -> const ESM::Potion* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(potion);
+            },
+            [lua = context.mLua](const ESM::Weapon& weapon) -> const ESM::Weapon* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(weapon);
+            },
+            [lua = context.mLua](const ESM::Light& light) -> const ESM::Light* {
+                checkGameInitialized(lua);
+                return MWBase::Environment::get().getESMStore()->insert(light);
+            });
+
+        api["_runStandardActivationAction"] = [context](const GObject& object, const GObject& actor) {
+            if (!object.ptr().getRefData().activate())
+                return;
+            context.mLuaManager->addAction(
+                [object, actor] {
+                    const MWWorld::Ptr& objPtr = object.ptr();
+                    const MWWorld::Ptr& actorPtr = actor.ptr();
+                    objPtr.getClass().activate(objPtr, actorPtr)->execute(actorPtr);
+                },
+                "_runStandardActivationAction");
+        };
+        api["_runStandardUseAction"] = [context](const GObject& object, const GObject& actor, bool force) {
+            context.mLuaManager->addAction(
+                [object, actor, force] {
+                    const MWWorld::Ptr& actorPtr = actor.ptr();
+                    const MWWorld::Ptr& objectPtr = object.ptr();
+                    if (actorPtr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                        MWBase::Environment::get().getWindowManager()->useItem(objectPtr, force);
+                    else
+                    {
+                        std::unique_ptr<MWWorld::Action> action = objectPtr.getClass().use(objectPtr, force);
+                        action->execute(actorPtr, true);
+                    }
+                },
+                "_runStandardUseAction");
+        };
+
+        api["vfx"] = initWorldVfxBindings(context);
+
+        return LuaUtil::makeReadOnly(api);
+    }
+}
diff --git a/apps/openmw/mwlua/worldbindings.hpp b/apps/openmw/mwlua/worldbindings.hpp
new file mode 100644
index 0000000000..4bd2318b68
--- /dev/null
+++ b/apps/openmw/mwlua/worldbindings.hpp
@@ -0,0 +1,13 @@
+#ifndef MWLUA_WORLDBINDINGS_H
+#define MWLUA_WORLDBINDINGS_H
+
+#include <sol/forward.hpp>
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    sol::table initWorldPackage(const Context&);
+}
+
+#endif // MWLUA_WORLDBINDINGS_H
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index decbae765b..3cee16f29f 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -8,6 +8,7 @@
 
 #include <components/misc/strings/algorithm.hpp>
 
+#include <components/esm/generatedrefid.hpp>
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadstat.hpp>
@@ -49,16 +50,17 @@ namespace
     void addEffects(
         std::vector<ESM::ActiveEffect>& effects, const ESM::EffectList& list, bool ignoreResistances = false)
     {
-        int currentEffectIndex = 0;
         for (const auto& enam : list.mList)
         {
+            if (enam.mData.mRange != ESM::RT_Self)
+                continue;
             ESM::ActiveEffect effect;
-            effect.mEffectId = enam.mEffectID;
-            effect.mArg = MWMechanics::EffectKey(enam).mArg;
+            effect.mEffectId = enam.mData.mEffectID;
+            effect.mArg = MWMechanics::EffectKey(enam.mData).mArg;
             effect.mMagnitude = 0.f;
-            effect.mMinMagnitude = enam.mMagnMin;
-            effect.mMaxMagnitude = enam.mMagnMax;
-            effect.mEffectIndex = currentEffectIndex++;
+            effect.mMinMagnitude = enam.mData.mMagnMin;
+            effect.mMaxMagnitude = enam.mData.mMagnMax;
+            effect.mEffectIndex = enam.mIndex;
             effect.mFlags = ESM::ActiveEffect::Flag_None;
             if (ignoreResistances)
                 effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Resistances;
@@ -82,12 +84,13 @@ namespace MWMechanics
         mActiveSpells.mIterating = false;
     }
 
-    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const CastSpell& cast, const MWWorld::Ptr& caster)
-        : mId(cast.mId)
-        , mDisplayName(cast.mSourceName)
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(
+        const MWWorld::Ptr& caster, const ESM::RefId& id, std::string_view sourceName, ESM::RefNum item)
+        : mSourceSpellId(id)
+        , mDisplayName(sourceName)
         , mCasterActorId(-1)
-        , mItem(cast.mItem)
-        , mType(cast.mType)
+        , mItem(item)
+        , mFlags()
         , mWorsenings(-1)
     {
         if (!caster.isEmpty() && caster.getClass().isActor())
@@ -96,48 +99,52 @@ namespace MWMechanics
 
     ActiveSpells::ActiveSpellParams::ActiveSpellParams(
         const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances)
-        : mId(spell->mId)
+        : mSourceSpellId(spell->mId)
         , mDisplayName(spell->mName)
         , mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
-        , mType(spell->mData.mType == ESM::Spell::ST_Ability ? ESM::ActiveSpells::Type_Ability
-                                                             : ESM::ActiveSpells::Type_Permanent)
+        , mFlags()
         , mWorsenings(-1)
     {
         assert(spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power);
+        setFlag(ESM::ActiveSpells::Flag_SpellStore);
+        if (spell->mData.mType == ESM::Spell::ST_Ability)
+            setFlag(ESM::ActiveSpells::Flag_AffectsBaseValues);
         addEffects(mEffects, spell->mEffects, ignoreResistances);
     }
 
     ActiveSpells::ActiveSpellParams::ActiveSpellParams(
         const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, const MWWorld::Ptr& actor)
-        : mId(item.getCellRef().getRefId())
+        : mSourceSpellId(item.getCellRef().getRefId())
         , mDisplayName(item.getClass().getName(item))
         , mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
         , mItem(item.getCellRef().getRefNum())
-        , mType(ESM::ActiveSpells::Type_Enchantment)
+        , mFlags()
         , mWorsenings(-1)
     {
         assert(enchantment->mData.mType == ESM::Enchantment::ConstantEffect);
         addEffects(mEffects, enchantment->mEffects);
+        setFlag(ESM::ActiveSpells::Flag_Equipment);
     }
 
     ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ESM::ActiveSpells::ActiveSpellParams& params)
-        : mId(params.mId)
+        : mActiveSpellId(params.mActiveSpellId)
+        , mSourceSpellId(params.mSourceSpellId)
         , mEffects(params.mEffects)
         , mDisplayName(params.mDisplayName)
         , mCasterActorId(params.mCasterActorId)
         , mItem(params.mItem)
-        , mType(params.mType)
+        , mFlags(params.mFlags)
         , mWorsenings(params.mWorsenings)
         , mNextWorsening({ params.mNextWorsening })
     {
     }
 
     ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ActiveSpellParams& params, const MWWorld::Ptr& actor)
-        : mId(params.mId)
+        : mSourceSpellId(params.mSourceSpellId)
         , mDisplayName(params.mDisplayName)
         , mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
         , mItem(params.mItem)
-        , mType(params.mType)
+        , mFlags(params.mFlags)
         , mWorsenings(-1)
     {
     }
@@ -145,17 +152,23 @@ namespace MWMechanics
     ESM::ActiveSpells::ActiveSpellParams ActiveSpells::ActiveSpellParams::toEsm() const
     {
         ESM::ActiveSpells::ActiveSpellParams params;
-        params.mId = mId;
+        params.mActiveSpellId = mActiveSpellId;
+        params.mSourceSpellId = mSourceSpellId;
         params.mEffects = mEffects;
         params.mDisplayName = mDisplayName;
         params.mCasterActorId = mCasterActorId;
         params.mItem = mItem;
-        params.mType = mType;
+        params.mFlags = mFlags;
         params.mWorsenings = mWorsenings;
         params.mNextWorsening = mNextWorsening.toEsm();
         return params;
     }
 
+    void ActiveSpells::ActiveSpellParams::setFlag(ESM::ActiveSpells::Flags flag)
+    {
+        mFlags = static_cast<ESM::ActiveSpells::Flags>(mFlags | flag);
+    }
+
     void ActiveSpells::ActiveSpellParams::worsen()
     {
         ++mWorsenings;
@@ -174,6 +187,35 @@ namespace MWMechanics
         mWorsenings = -1;
     }
 
+    ESM::RefId ActiveSpells::ActiveSpellParams::getEnchantment() const
+    {
+        // Enchantment id is not stored directly. Instead the enchanted item is stored.
+        const auto& store = MWBase::Environment::get().getESMStore();
+        switch (store->find(mSourceSpellId))
+        {
+            case ESM::REC_ARMO:
+                return store->get<ESM::Armor>().find(mSourceSpellId)->mEnchant;
+            case ESM::REC_BOOK:
+                return store->get<ESM::Book>().find(mSourceSpellId)->mEnchant;
+            case ESM::REC_CLOT:
+                return store->get<ESM::Clothing>().find(mSourceSpellId)->mEnchant;
+            case ESM::REC_WEAP:
+                return store->get<ESM::Weapon>().find(mSourceSpellId)->mEnchant;
+            default:
+                return {};
+        }
+    }
+
+    const ESM::Spell* ActiveSpells::ActiveSpellParams::getSpell() const
+    {
+        return MWBase::Environment::get().getESMStore()->get<ESM::Spell>().search(getSourceSpellId());
+    }
+
+    bool ActiveSpells::ActiveSpellParams::hasFlag(ESM::ActiveSpells::Flags flags) const
+    {
+        return static_cast<ESM::ActiveSpells::Flags>(mFlags & flags) == flags;
+    }
+
     void ActiveSpells::update(const MWWorld::Ptr& ptr, float duration)
     {
         if (mIterating)
@@ -184,8 +226,7 @@ namespace MWMechanics
         // Erase no longer active spells and effects
         for (auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
         {
-            if (spellIt->mType != ESM::ActiveSpells::Type_Temporary
-                && spellIt->mType != ESM::ActiveSpells::Type_Consumable)
+            if (!spellIt->hasFlag(ESM::ActiveSpells::Flag_Temporary))
             {
                 ++spellIt;
                 continue;
@@ -225,9 +266,13 @@ namespace MWMechanics
         {
             if (spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power
                 && !isSpellActive(spell->mId))
+            {
                 mSpells.emplace_back(ActiveSpellParams{ spell, ptr });
+                mSpells.back().setActiveSpellId(MWBase::Environment::get().getESMStore()->generateId());
+            }
         }
 
+        bool updateSpellWindow = false;
         if (ptr.getClass().hasInventoryStore(ptr)
             && !(creatureStats.isDead() && !creatureStats.isDeathAnimationFinished()))
         {
@@ -250,8 +295,8 @@ namespace MWMechanics
                     if (std::find_if(mSpells.begin(), mSpells.end(),
                             [&](const ActiveSpellParams& params) {
                                 return params.mItem == slot->getCellRef().getRefNum()
-                                    && params.mType == ESM::ActiveSpells::Type_Enchantment
-                                    && params.mId == slot->getCellRef().getRefId();
+                                    && params.hasFlag(ESM::ActiveSpells::Flag_Equipment)
+                                    && params.mSourceSpellId == slot->getCellRef().getRefId();
                             })
                         != mSpells.end())
                         continue;
@@ -259,11 +304,12 @@ namespace MWMechanics
                     // invisibility manually
                     purgeEffect(ptr, ESM::MagicEffect::Invisibility);
                     applyPurges(ptr);
-                    const ActiveSpellParams& params
-                        = mSpells.emplace_back(ActiveSpellParams{ *slot, enchantment, ptr });
+                    ActiveSpellParams& params = mSpells.emplace_back(ActiveSpellParams{ *slot, enchantment, ptr });
+                    params.setActiveSpellId(MWBase::Environment::get().getESMStore()->generateId());
                     for (const auto& effect : params.mEffects)
                         MWMechanics::playEffects(
                             ptr, *world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId), playNonLooping);
+                    updateSpellWindow = true;
                 }
             }
         }
@@ -322,9 +368,10 @@ namespace MWMechanics
                 MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
                 if (animation && !reflectStatic->mModel.empty())
                 {
-                    const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                    animation->addEffect(Misc::ResourceHelpers::correctMeshPath(reflectStatic->mModel, vfs),
-                        ESM::MagicEffect::Reflect, false);
+                    const VFS::Path::Normalized reflectStaticModel
+                        = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(reflectStatic->mModel));
+                    animation->addEffect(
+                        reflectStaticModel, ESM::MagicEffect::indexToName(ESM::MagicEffect::Reflect), false);
                 }
                 caster.getClass().getCreatureStats(caster).getActiveSpells().addSpell(*reflected);
             }
@@ -332,12 +379,11 @@ namespace MWMechanics
                 continue;
 
             bool remove = false;
-            if (spellIt->mType == ESM::ActiveSpells::Type_Ability
-                || spellIt->mType == ESM::ActiveSpells::Type_Permanent)
+            if (spellIt->hasFlag(ESM::ActiveSpells::Flag_SpellStore))
             {
                 try
                 {
-                    remove = !spells.hasSpell(spellIt->mId);
+                    remove = !spells.hasSpell(spellIt->mSourceSpellId);
                 }
                 catch (const std::runtime_error& e)
                 {
@@ -345,9 +391,9 @@ namespace MWMechanics
                     Log(Debug::Error) << "Removing active effect: " << e.what();
                 }
             }
-            else if (spellIt->mType == ESM::ActiveSpells::Type_Enchantment)
+            else if (spellIt->hasFlag(ESM::ActiveSpells::Flag_Equipment))
             {
-                // Remove constant effect enchantments that have been unequipped
+                // Remove effects tied to equipment that has been unequipped
                 const auto& store = ptr.getClass().getInventoryStore(ptr);
                 remove = true;
                 for (int slotIndex = 0; slotIndex < MWWorld::InventoryStore::Slots; slotIndex++)
@@ -368,6 +414,7 @@ namespace MWMechanics
                 for (const auto& effect : params.mEffects)
                     onMagicEffectRemoved(ptr, params, effect);
                 applyPurges(ptr, &spellIt);
+                updateSpellWindow = true;
                 continue;
             }
             ++spellIt;
@@ -380,15 +427,23 @@ namespace MWMechanics
             if (creatureStats.getMagicEffects().getOrDefault(effect).getMagnitude() > 0.f)
                 creatureStats.getAiSequence().stopCombat();
         }
+
+        if (ptr == player && updateSpellWindow)
+        {
+            // Something happened with the spell list -- possibly while the game is paused,
+            // so we want to make the spell window get the memo.
+            // We don't normally want to do this, so this targets constant enchantments.
+            MWBase::Environment::get().getWindowManager()->updateSpellWindow();
+        }
     }
 
     void ActiveSpells::addToSpells(const MWWorld::Ptr& ptr, const ActiveSpellParams& spell)
     {
-        if (spell.mType != ESM::ActiveSpells::Type_Consumable)
+        if (!spell.hasFlag(ESM::ActiveSpells::Flag_Stackable))
         {
             auto found = std::find_if(mSpells.begin(), mSpells.end(), [&](const auto& existing) {
-                return spell.mId == existing.mId && spell.mCasterActorId == existing.mCasterActorId
-                    && spell.mItem == existing.mItem;
+                return spell.mSourceSpellId == existing.mSourceSpellId
+                    && spell.mCasterActorId == existing.mCasterActorId && spell.mItem == existing.mItem;
             });
             if (found != mSpells.end())
             {
@@ -401,6 +456,7 @@ namespace MWMechanics
             }
         }
         mSpells.emplace_back(spell);
+        mSpells.back().setActiveSpellId(MWBase::Environment::get().getESMStore()->generateId());
     }
 
     ActiveSpells::ActiveSpells()
@@ -418,10 +474,19 @@ namespace MWMechanics
         return mSpells.end();
     }
 
+    ActiveSpells::TIterator ActiveSpells::getActiveSpellById(const ESM::RefId& id)
+    {
+        for (TIterator it = begin(); it != end(); it++)
+            if (it->getActiveSpellId() == id)
+                return it;
+        return end();
+    }
+
     bool ActiveSpells::isSpellActive(const ESM::RefId& id) const
     {
-        return std::find_if(mSpells.begin(), mSpells.end(), [&](const auto& spell) { return spell.mId == id; })
-            != mSpells.end();
+        return std::find_if(mSpells.begin(), mSpells.end(), [&](const auto& spell) {
+            return spell.mSourceSpellId == id;
+        }) != mSpells.end();
     }
 
     bool ActiveSpells::isEnchantmentActive(const ESM::RefId& id) const
@@ -430,21 +495,8 @@ namespace MWMechanics
         if (store->get<ESM::Enchantment>().search(id) == nullptr)
             return false;
 
-        // Enchantment id is not stored directly. Instead the enchanted item is stored.
         return std::find_if(mSpells.begin(), mSpells.end(), [&](const auto& spell) {
-            switch (store->find(spell.mId))
-            {
-                case ESM::REC_ARMO:
-                    return store->get<ESM::Armor>().find(spell.mId)->mEnchant == id;
-                case ESM::REC_BOOK:
-                    return store->get<ESM::Book>().find(spell.mId)->mEnchant == id;
-                case ESM::REC_CLOT:
-                    return store->get<ESM::Clothing>().find(spell.mId)->mEnchant == id;
-                case ESM::REC_WEAP:
-                    return store->get<ESM::Weapon>().find(spell.mId)->mEnchant == id;
-                default:
-                    return false;
-            }
+            return spell.getEnchantment() == id;
         }) != mSpells.end();
     }
 
@@ -543,9 +595,14 @@ namespace MWMechanics
         return removedCurrentSpell;
     }
 
-    void ActiveSpells::removeEffects(const MWWorld::Ptr& ptr, const ESM::RefId& id)
+    void ActiveSpells::removeEffectsBySourceSpellId(const MWWorld::Ptr& ptr, const ESM::RefId& id)
     {
-        purge([=](const ActiveSpellParams& params) { return params.mId == id; }, ptr);
+        purge([=](const ActiveSpellParams& params) { return params.mSourceSpellId == id; }, ptr);
+    }
+
+    void ActiveSpells::removeEffectsByActiveSpellId(const MWWorld::Ptr& ptr, const ESM::RefId& id)
+    {
+        purge([=](const ActiveSpellParams& params) { return params.mActiveSpellId == id; }, ptr);
     }
 
     void ActiveSpells::purgeEffect(const MWWorld::Ptr& ptr, int effectId, ESM::RefId effectArg)
@@ -590,19 +647,19 @@ namespace MWMechanics
     void ActiveSpells::readState(const ESM::ActiveSpells& state)
     {
         for (const ESM::ActiveSpells::ActiveSpellParams& spell : state.mSpells)
+        {
             mSpells.emplace_back(ActiveSpellParams{ spell });
+            // Generate ID for older saves that didn't have any.
+            if (mSpells.back().getActiveSpellId().empty())
+                mSpells.back().setActiveSpellId(MWBase::Environment::get().getESMStore()->generateId());
+        }
         for (const ESM::ActiveSpells::ActiveSpellParams& spell : state.mQueue)
             mQueue.emplace_back(ActiveSpellParams{ spell });
     }
 
     void ActiveSpells::unloadActor(const MWWorld::Ptr& ptr)
     {
-        purge(
-            [](const auto& spell) {
-                return spell.getType() == ESM::ActiveSpells::Type_Consumable
-                    || spell.getType() == ESM::ActiveSpells::Type_Temporary;
-            },
-            ptr);
+        purge([](const auto& spell) { return spell.hasFlag(ESM::ActiveSpells::Flag_Temporary); }, ptr);
         mQueue.clear();
     }
 }
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 87497d9d7a..e4fa60ddb6 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -33,12 +33,13 @@ namespace MWMechanics
         using ActiveEffect = ESM::ActiveEffect;
         class ActiveSpellParams
         {
-            ESM::RefId mId;
+            ESM::RefId mActiveSpellId;
+            ESM::RefId mSourceSpellId;
             std::vector<ActiveEffect> mEffects;
             std::string mDisplayName;
             int mCasterActorId;
             ESM::RefNum mItem;
-            ESM::ActiveSpells::EffectType mType;
+            ESM::ActiveSpells::Flags mFlags;
             int mWorsenings;
             MWWorld::TimeStamp mNextWorsening;
             MWWorld::Ptr mSource;
@@ -57,15 +58,17 @@ namespace MWMechanics
             friend class ActiveSpells;
 
         public:
-            ActiveSpellParams(const CastSpell& cast, const MWWorld::Ptr& caster);
+            ActiveSpellParams(
+                const MWWorld::Ptr& caster, const ESM::RefId& id, std::string_view sourceName, ESM::RefNum item);
 
-            const ESM::RefId& getId() const { return mId; }
+            ESM::RefId getActiveSpellId() const { return mActiveSpellId; }
+            void setActiveSpellId(ESM::RefId id) { mActiveSpellId = id; }
+
+            const ESM::RefId& getSourceSpellId() const { return mSourceSpellId; }
 
             const std::vector<ActiveEffect>& getEffects() const { return mEffects; }
             std::vector<ActiveEffect>& getEffects() { return mEffects; }
 
-            ESM::ActiveSpells::EffectType getType() const { return mType; }
-
             int getCasterActorId() const { return mCasterActorId; }
 
             int getWorsenings() const { return mWorsenings; }
@@ -73,6 +76,11 @@ namespace MWMechanics
             const std::string& getDisplayName() const { return mDisplayName; }
 
             ESM::RefNum getItem() const { return mItem; }
+            ESM::RefId getEnchantment() const;
+
+            const ESM::Spell* getSpell() const;
+            bool hasFlag(ESM::ActiveSpells::Flags flags) const;
+            void setFlag(ESM::ActiveSpells::Flags flags);
 
             // Increments worsenings count and sets the next timestamp
             void worsen();
@@ -92,6 +100,8 @@ namespace MWMechanics
 
         TIterator end() const;
 
+        TIterator getActiveSpellById(const ESM::RefId& id);
+
         void update(const MWWorld::Ptr& ptr, float duration);
 
     private:
@@ -131,7 +141,9 @@ namespace MWMechanics
         void addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor);
 
         /// Removes the active effects from this spell/potion/.. with \a id
-        void removeEffects(const MWWorld::Ptr& ptr, const ESM::RefId& id);
+        void removeEffectsBySourceSpellId(const MWWorld::Ptr& ptr, const ESM::RefId& id);
+        /// Removes the active effects of a specific active spell
+        void removeEffectsByActiveSpellId(const MWWorld::Ptr& ptr, const ESM::RefId& id);
 
         /// Remove all active effects with this effect id
         void purgeEffect(const MWWorld::Ptr& ptr, int effectId, ESM::RefId effectArg = {});
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ec53bdec71..bb3273981d 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -39,12 +39,15 @@
 
 #include "../mwrender/vismask.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "actor.hpp"
 #include "actorutil.hpp"
 #include "aicombataction.hpp"
 #include "aifollow.hpp"
 #include "aipursue.hpp"
 #include "aiwander.hpp"
+#include "attacktype.hpp"
 #include "character.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
@@ -211,11 +214,8 @@ namespace
                 const ESM::Static* const fx
                     = world->getStore().get<ESM::Static>().search(ESM::RefId::stringRefId("VFX_Soul_Trap"));
                 if (fx != nullptr)
-                {
-                    const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                    world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), "",
+                    world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(fx->mModel)), "",
                         creature.getRefData().getPosition().asVec3());
-                }
 
                 MWBase::Environment::get().getSoundManager()->playSound3D(
                     creature.getRefData().getPosition().asVec3(), ESM::RefId::stringRefId("conjuration hit"), 1.f, 1.f);
@@ -240,6 +240,23 @@ namespace MWMechanics
 
     namespace
     {
+        std::string_view attackTypeName(AttackType attackType)
+        {
+            switch (attackType)
+            {
+                case AttackType::NoAttack:
+                case AttackType::Any:
+                    return {};
+                case AttackType::Chop:
+                    return "chop";
+                case AttackType::Slash:
+                    return "slash";
+                case AttackType::Thrust:
+                    return "thrust";
+            }
+            throw std::logic_error("Invalid attack type value: " + std::to_string(static_cast<int>(attackType)));
+        }
+
         float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration,
             const osg::Vec3f& halfExtents)
         {
@@ -364,7 +381,11 @@ namespace MWMechanics
                 mov.mSpeedFactor = osg::Vec2(controls.mMovement, controls.mSideMovement).length();
                 stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, controls.mRun);
                 stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, controls.mSneak);
-                stats.setAttackingOrSpell((controls.mUse & 1) == 1);
+
+                AttackType attackType = static_cast<AttackType>(controls.mUse);
+                stats.setAttackingOrSpell(attackType != AttackType::NoAttack);
+                stats.setAttackType(attackTypeName(attackType));
+
                 controls.mChanged = false;
             }
             // For the player we don't need to copy these values to Lua because mwinput doesn't change them.
@@ -513,7 +534,8 @@ namespace MWMechanics
             if (greetingTimer >= GREETING_SHOULD_START)
             {
                 greetingState = Greet_InProgress;
-                MWBase::Environment::get().getDialogueManager()->say(actor, ESM::RefId::stringRefId("hello"));
+                if (!MWBase::Environment::get().getDialogueManager()->say(actor, ESM::RefId::stringRefId("hello")))
+                    greetingState = Greet_Done;
                 greetingTimer = 0;
             }
         }
@@ -580,8 +602,8 @@ namespace MWMechanics
         }
     }
 
-    void Actors::engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2,
-        std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies, bool againstPlayer) const
+    void Actors::engageCombat(
+        const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, SidingCache& cachedAllies, bool againstPlayer) const
     {
         // No combat for totally static creatures
         if (!actor1.getClass().isMobile(actor1))
@@ -609,9 +631,7 @@ namespace MWMechanics
 
         // Get actors allied with actor1. Includes those following or escorting actor1, actors following or escorting
         // those actors, (recursive) and any actor currently being followed or escorted by actor1
-        std::set<MWWorld::Ptr> allies1;
-
-        getActorsSidingWith(actor1, allies1, cachedAllies);
+        const std::set<MWWorld::Ptr>& allies1 = cachedAllies.getActorsSidingWith(actor1);
 
         const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
         // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and
@@ -623,7 +643,7 @@ namespace MWMechanics
 
             if (creatureStats2.matchesActorId(ally.getClass().getCreatureStats(ally).getHitAttemptActorId()))
             {
-                mechanicsManager->startCombat(actor1, actor2);
+                mechanicsManager->startCombat(actor1, actor2, &cachedAllies.getActorsSidingWith(actor2));
                 // Also set the same hit attempt actor. Otherwise, if fighting the player, they may stop combat
                 // if the player gets out of reach, while the ally would continue combat with the player
                 creatureStats1.setHitAttemptActorId(ally.getClass().getCreatureStats(ally).getHitAttemptActorId());
@@ -636,9 +656,8 @@ namespace MWMechanics
                 aggressive = true;
         }
 
-        std::set<MWWorld::Ptr> playerAllies;
         MWWorld::Ptr player = MWMechanics::getPlayer();
-        getActorsSidingWith(player, playerAllies, cachedAllies);
+        const std::set<MWWorld::Ptr>& playerAllies = cachedAllies.getActorsSidingWith(player);
 
         bool isPlayerFollowerOrEscorter = playerAllies.find(actor1) != playerAllies.end();
 
@@ -649,20 +668,17 @@ namespace MWMechanics
             // Check that actor2 is in combat with actor1
             if (creatureStats2.getAiSequence().isInCombat(actor1))
             {
-                std::set<MWWorld::Ptr> allies2;
-
-                getActorsSidingWith(actor2, allies2, cachedAllies);
-
+                const std::set<MWWorld::Ptr>& allies2 = cachedAllies.getActorsSidingWith(actor2);
                 // Check that an ally of actor2 is also in combat with actor1
                 for (const MWWorld::Ptr& ally2 : allies2)
                 {
                     if (ally2 != actor2 && ally2.getClass().getCreatureStats(ally2).getAiSequence().isInCombat(actor1))
                     {
-                        mechanicsManager->startCombat(actor1, actor2);
+                        mechanicsManager->startCombat(actor1, actor2, &allies2);
                         // Also have actor1's allies start combat
                         for (const MWWorld::Ptr& ally1 : allies1)
                             if (ally1 != player)
-                                mechanicsManager->startCombat(ally1, actor2);
+                                mechanicsManager->startCombat(ally1, actor2, &allies2);
                         return;
                     }
                 }
@@ -707,10 +723,9 @@ namespace MWMechanics
             }
         }
 
-        // Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter
+        // Make guards go aggressive with creatures and werewolves that are in combat
         const auto world = MWBase::Environment::get().getWorld();
-        if (!aggressive && actor1.getClass().isClass(actor1, "Guard") && !actor2.getClass().isNpc()
-            && creatureStats2.getAiSequence().isInCombat())
+        if (!aggressive && actor1.getClass().isClass(actor1, "Guard") && creatureStats2.getAiSequence().isInCombat())
         {
             // Check if the creature is too far
             static const float fAlarmRadius
@@ -718,20 +733,30 @@ namespace MWMechanics
             if (sqrDist > fAlarmRadius * fAlarmRadius)
                 return;
 
-            bool followerOrEscorter = false;
-            for (const auto& package : creatureStats2.getAiSequence())
+            bool targetIsCreature = !actor2.getClass().isNpc();
+            if (targetIsCreature || actor2.getClass().getNpcStats(actor2).isWerewolf())
             {
-                // The follow package must be first or have nothing but combat before it
-                if (package->sideWithTarget())
+                bool followerOrEscorter = false;
+                // ...unless the creature has allies
+                if (targetIsCreature)
                 {
-                    followerOrEscorter = true;
-                    break;
+                    for (const auto& package : creatureStats2.getAiSequence())
+                    {
+                        // The follow package must be first or have nothing but combat before it
+                        if (package->sideWithTarget())
+                        {
+                            followerOrEscorter = true;
+                            break;
+                        }
+                        else if (package->getTypeId() != MWMechanics::AiPackageTypeId::Combat)
+                            break;
+                    }
                 }
-                else if (package->getTypeId() != MWMechanics::AiPackageTypeId::Combat)
-                    break;
+                // Morrowind also checks "known werewolf" flag, but the player is never in combat
+                // so this code is unreachable for the player
+                if (!followerOrEscorter)
+                    aggressive = true;
             }
-            if (!followerOrEscorter)
-                aggressive = true;
         }
 
         // If any of the above conditions turned actor1 aggressive towards actor2, do an awareness check. If it passes,
@@ -741,7 +766,7 @@ namespace MWMechanics
             bool LOS = world->getLOS(actor1, actor2) && mechanicsManager->awarenessCheck(actor2, actor1);
 
             if (LOS)
-                mechanicsManager->startCombat(actor1, actor2);
+                mechanicsManager->startCombat(actor1, actor2, &cachedAllies.getActorsSidingWith(actor2));
         }
     }
 
@@ -1087,7 +1112,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::updateCrimePursuit(const MWWorld::Ptr& ptr, float duration) const
+    void Actors::updateCrimePursuit(const MWWorld::Ptr& ptr, float duration, SidingCache& cachedAllies) const
     {
         const MWWorld::Ptr player = getPlayer();
         if (ptr == player)
@@ -1127,7 +1152,7 @@ namespace MWMechanics
                     = esmStore.get<ESM::GameSetting>().find("iCrimeThresholdMultiplier")->mValue.getInteger();
                 if (playerStats.getBounty() >= cutoff * iCrimeThresholdMultiplier)
                 {
-                    mechanicsManager->startCombat(ptr, player);
+                    mechanicsManager->startCombat(ptr, player, &cachedAllies.getActorsSidingWith(player));
                     creatureStats.setHitAttemptActorId(
                         playerClass.getCreatureStats(player)
                             .getActorId()); // Stops the guard from quitting combat if player is unreachable
@@ -1155,6 +1180,9 @@ namespace MWMechanics
                 creatureStats.setAlarmed(false);
                 creatureStats.setAiSetting(AiSetting::Fight, ptr.getClass().getBaseFightRating(ptr));
 
+                // Restore original disposition
+                npcStats.setCrimeDispositionModifier(0);
+
                 // Update witness crime id
                 npcStats.setCrimeId(-1);
             }
@@ -1225,11 +1253,11 @@ namespace MWMechanics
         }
     }
 
-    void Actors::castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool manualSpell) const
+    void Actors::castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool scriptedSpell) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
-            iter->second->getCharacterController().castSpell(spellId, manualSpell);
+            iter->second->getCharacterController().castSpell(spellId, scriptedSpell);
     }
 
     bool Actors::isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) const
@@ -1285,51 +1313,6 @@ namespace MWMechanics
         }
     }
 
-    void Actors::updateCombatMusic()
-    {
-        const MWWorld::Ptr player = getPlayer();
-        const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
-        bool hasHostiles = false; // need to know this to play Battle music
-        const bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
-
-        if (aiActive)
-        {
-            const int actorsProcessingRange = Settings::game().mActorsProcessingRange;
-            for (const Actor& actor : mActors)
-            {
-                if (actor.getPtr() == player)
-                    continue;
-
-                const bool inProcessingRange
-                    = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2()
-                    <= actorsProcessingRange * actorsProcessingRange;
-                if (inProcessingRange)
-                {
-                    MWMechanics::CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
-                    if (!stats.isDead() && stats.getAiSequence().isInCombat())
-                    {
-                        hasHostiles = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        // check if we still have any player enemies to switch music
-        if (mCurrentMusic != MusicType::Explore && !hasHostiles
-            && !(player.getClass().getCreatureStats(player).isDead()
-                && MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
-        {
-            MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
-            mCurrentMusic = MusicType::Explore;
-        }
-        else if (mCurrentMusic != MusicType::Battle && hasHostiles)
-        {
-            MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
-            mCurrentMusic = MusicType::Battle;
-        }
-    }
-
     void Actors::predictAndAvoidCollisions(float duration) const
     {
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
@@ -1511,8 +1494,7 @@ namespace MWMechanics
 
             /// \todo move update logic to Actor class where appropriate
 
-            std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>
-                cachedAllies; // will be filled as engageCombat iterates
+            SidingCache cachedAllies{ *this, true }; // will be filled as engageCombat iterates
 
             const bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
             const int attackedByPlayerId = player.getClass().getCreatureStats(player).getHitAttemptActorId();
@@ -1523,7 +1505,6 @@ namespace MWMechanics
                 if (!playerHitAttemptActor.isInCell())
                     player.getClass().getCreatureStats(player).setHitAttemptActorId(-1);
             }
-            const bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
             const int actorsProcessingRange = Settings::game().mActorsProcessingRange;
 
             // AI and magic effects update
@@ -1600,7 +1581,7 @@ namespace MWMechanics
                             updateHeadTracking(actor.getPtr(), mActors, isPlayer, ctrl);
 
                         if (actor.getPtr().getClass().isNpc() && !isPlayer)
-                            updateCrimePursuit(actor.getPtr(), duration);
+                            updateCrimePursuit(actor.getPtr(), duration, cachedAllies);
 
                         if (!isPlayer)
                         {
@@ -1675,8 +1656,7 @@ namespace MWMechanics
                 world->setActorActive(actor.getPtr(), true);
 
                 const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
-                if (!isDead && (!godmode || !isPlayer)
-                    && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
+                if (!isDead && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
                     ctrl.skipAnim();
 
                 // Handle player last, in case a cell transition occurs by casting a teleportation spell
@@ -1735,8 +1715,6 @@ namespace MWMechanics
             killDeadActors();
             updateSneaking(playerCharacter, duration);
         }
-
-        updateCombatMusic();
     }
 
     void Actors::notifyDied(const MWWorld::Ptr& actor)
@@ -1744,6 +1722,8 @@ namespace MWMechanics
         actor.getClass().getCreatureStats(actor).notifyDied();
 
         ++mDeathCount[actor.getCellRef().getRefId()];
+
+        MWBase::Environment::get().getLuaManager()->actorDied(actor);
     }
 
     void Actors::resurrect(const MWWorld::Ptr& ptr) const
@@ -1805,8 +1785,6 @@ namespace MWMechanics
                 {
                     // player's death animation is over
                     MWBase::Environment::get().getStateManager()->askLoadRecent();
-                    // Play Death Music if it was the player dying
-                    MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
                 }
                 else
                 {
@@ -1827,12 +1805,9 @@ namespace MWMechanics
             const ESM::Static* fx = MWBase::Environment::get().getESMStore()->get<ESM::Static>().search(
                 ESM::RefId::stringRefId("VFX_Summon_End"));
             if (fx)
-            {
-                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 MWBase::Environment::get().getWorld()->spawnEffect(
-                    Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), "",
+                    Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(fx->mModel)), "",
                     ptr.getRefData().getPosition().asVec3());
-            }
 
             // Remove the summoned creature's summoned creatures as well
             MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
@@ -1889,6 +1864,9 @@ namespace MWMechanics
                     > actorsProcessingRange * actorsProcessingRange)
                 continue;
 
+            // Get rid of effects pending removal so they are not applied when resting
+            updateMagicEffects(actor.getPtr());
+
             adjustMagicEffects(actor.getPtr(), duration);
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(actor.getPtr());
@@ -1968,7 +1946,7 @@ namespace MWMechanics
                 mSneakSkillTimer = 0.f;
 
             if (avoidedNotice && mSneakSkillTimer == 0.f)
-                player.getClass().skillUsageSucceeded(player, ESM::Skill::Sneak, 0);
+                player.getClass().skillUsageSucceeded(player, ESM::Skill::Sneak, ESM::Skill::Sneak_AvoidNotice);
 
             if (!detected)
                 MWBase::Environment::get().getWindowManager()->setSneakVisibility(true);
@@ -2011,12 +1989,12 @@ namespace MWMechanics
     }
 
     bool Actors::playAnimationGroup(
-        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist) const
+        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, uint32_t number, bool scripted) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
         {
-            return iter->second->getCharacterController().playGroup(groupName, mode, number, persist);
+            return iter->second->getCharacterController().playGroup(groupName, mode, number, scripted);
         }
         else
         {
@@ -2025,6 +2003,24 @@ namespace MWMechanics
             return false;
         }
     }
+
+    bool Actors::playAnimationGroupLua(const MWWorld::Ptr& ptr, std::string_view groupName, uint32_t loops, float speed,
+        std::string_view startKey, std::string_view stopKey, bool forceLoop)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            return iter->second->getCharacterController().playGroupLua(
+                groupName, speed, startKey, stopKey, loops, forceLoop);
+        return false;
+    }
+
+    void Actors::enableLuaAnimations(const MWWorld::Ptr& ptr, bool enable)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            iter->second->getCharacterController().enableLuaAnimations(enable);
+    }
+
     void Actors::skipAnimation(const MWWorld::Ptr& ptr) const
     {
         const auto iter = mIndex.find(ptr.mRef);
@@ -2040,12 +2036,27 @@ namespace MWMechanics
         return false;
     }
 
+    bool Actors::checkScriptedAnimationPlaying(const MWWorld::Ptr& ptr) const
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            return iter->second->getCharacterController().isScriptedAnimPlaying();
+        return false;
+    }
+
     void Actors::persistAnimationStates() const
     {
         for (const Actor& actor : mActors)
             actor.getCharacterController().persistAnimationState();
     }
 
+    void Actors::clearAnimationQueue(const MWWorld::Ptr& ptr, bool clearScripted)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            iter->second->getCharacterController().clearAnimQueue(clearScripted);
+    }
+
     void Actors::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const
     {
         for (const Actor& actor : mActors)
@@ -2088,7 +2099,7 @@ namespace MWMechanics
             for (const auto& package : stats.getAiSequence())
             {
                 if (excludeInfighting && !sameActor && package->getTypeId() == AiPackageTypeId::Combat
-                    && package->getTarget() == actorPtr)
+                    && package->targetIs(actorPtr))
                     break;
                 if (package->sideWithTarget() && !package->getTarget().isEmpty())
                 {
@@ -2101,10 +2112,14 @@ namespace MWMechanics
                             if (ally.getClass().getCreatureStats(ally).getAiSequence().getCombatTargets(enemies)
                                 && std::find(enemies.begin(), enemies.end(), actorPtr) != enemies.end())
                                 break;
+                            enemies.clear();
+                            if (actorPtr.getClass().getCreatureStats(actorPtr).getAiSequence().getCombatTargets(enemies)
+                                && std::find(enemies.begin(), enemies.end(), ally) != enemies.end())
+                                break;
                         }
                         list.push_back(package->getTarget());
                     }
-                    else if (package->getTarget() == actorPtr)
+                    else if (package->targetIs(actorPtr))
                     {
                         list.push_back(iteratedActor);
                     }
@@ -2123,7 +2138,7 @@ namespace MWMechanics
         std::vector<MWWorld::Ptr> list;
         forEachFollowingPackage(
             mActors, actorPtr, getPlayer(), [&](const Actor& actor, const std::shared_ptr<AiPackage>& package) {
-                if (package->followTargetThroughDoors() && package->getTarget() == actorPtr)
+                if (package->followTargetThroughDoors() && package->targetIs(actorPtr))
                     list.push_back(actor.getPtr());
                 else if (package->getTypeId() != AiPackageTypeId::Combat
                     && package->getTypeId() != AiPackageTypeId::Wander)
@@ -2150,38 +2165,12 @@ namespace MWMechanics
                 getActorsSidingWith(follower, out, excludeInfighting);
     }
 
-    void Actors::getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out,
-        std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies) const
-    {
-        // If we have already found actor's allies, use the cache
-        std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>::const_iterator search = cachedAllies.find(actor);
-        if (search != cachedAllies.end())
-            out.insert(search->second.begin(), search->second.end());
-        else
-        {
-            for (const MWWorld::Ptr& follower : getActorsSidingWith(actor, true))
-                if (out.insert(follower).second && follower != actor)
-                    getActorsSidingWith(follower, out, cachedAllies);
-
-            // Cache ptrs and their sets of allies
-            cachedAllies.insert(std::make_pair(actor, out));
-            for (const MWWorld::Ptr& iter : out)
-            {
-                if (iter == actor)
-                    continue;
-                search = cachedAllies.find(iter);
-                if (search == cachedAllies.end())
-                    cachedAllies.insert(std::make_pair(iter, out));
-            }
-        }
-    }
-
     std::vector<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr& actor) const
     {
         std::vector<int> list;
         forEachFollowingPackage(
             mActors, actor, getPlayer(), [&](const Actor&, const std::shared_ptr<AiPackage>& package) {
-                if (package->followTargetThroughDoors() && package->getTarget() == actor)
+                if (package->followTargetThroughDoors() && package->targetIs(actor))
                 {
                     list.push_back(static_cast<const AiFollow*>(package.get())->getFollowIndex());
                     return false;
@@ -2199,7 +2188,7 @@ namespace MWMechanics
         std::map<int, MWWorld::Ptr> map;
         forEachFollowingPackage(
             mActors, actor, getPlayer(), [&](const Actor& otherActor, const std::shared_ptr<AiPackage>& package) {
-                if (package->followTargetThroughDoors() && package->getTarget() == actor)
+                if (package->followTargetThroughDoors() && package->targetIs(actor))
                 {
                     const int index = static_cast<const AiFollow*>(package.get())->getFollowIndex();
                     map[index] = otherActor.getPtr();
@@ -2374,4 +2363,32 @@ namespace MWMechanics
             seq.fastForward(ptr);
         }
     }
+
+    const std::set<MWWorld::Ptr>& SidingCache::getActorsSidingWith(const MWWorld::Ptr& actor)
+    {
+        // If we have already found actor's allies, use the cache
+        auto search = mCache.find(actor);
+        if (search != mCache.end())
+            return search->second;
+        std::set<MWWorld::Ptr>& out = mCache[actor];
+        for (const MWWorld::Ptr& follower : mActors.getActorsSidingWith(actor, mExcludeInfighting))
+        {
+            if (out.insert(follower).second && follower != actor)
+            {
+                const auto& allies = getActorsSidingWith(follower);
+                out.insert(allies.begin(), allies.end());
+            }
+        }
+
+        // Cache ptrs and their sets of allies
+        for (const MWWorld::Ptr& iter : out)
+        {
+            if (iter == actor)
+                continue;
+            search = mCache.find(iter);
+            if (search == mCache.end())
+                mCache.emplace(iter, out);
+        }
+        return out;
+    }
 }
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 1c5799159e..b575ec2827 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -36,6 +36,7 @@ namespace MWMechanics
     class Actor;
     class CharacterController;
     class CreatureStats;
+    class SidingCache;
 
     class Actors
     {
@@ -66,7 +67,7 @@ namespace MWMechanics
 
         void resurrect(const MWWorld::Ptr& ptr) const;
 
-        void castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool manualSpell = false) const;
+        void castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool scriptedSpell = false) const;
 
         void updateActor(const MWWorld::Ptr& old, const MWWorld::Ptr& ptr) const;
         ///< Updates an actor with a new Ptr
@@ -74,9 +75,6 @@ namespace MWMechanics
         void dropActors(const MWWorld::CellStore* cellStore, const MWWorld::Ptr& ignore);
         ///< Deregister all actors (except for \a ignore) in the given cell.
 
-        void updateCombatMusic();
-        ///< Update combat music state
-
         void update(float duration, bool paused);
         ///< Update actor stats and store desired velocity vectors in \a movement
 
@@ -115,11 +113,16 @@ namespace MWMechanics
 
         void forceStateUpdate(const MWWorld::Ptr& ptr) const;
 
-        bool playAnimationGroup(
-            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist = false) const;
+        bool playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, uint32_t number,
+            bool scripted = false) const;
+        bool playAnimationGroupLua(const MWWorld::Ptr& ptr, std::string_view groupName, uint32_t loops, float speed,
+            std::string_view startKey, std::string_view stopKey, bool forceLoop);
+        void enableLuaAnimations(const MWWorld::Ptr& ptr, bool enable);
         void skipAnimation(const MWWorld::Ptr& ptr) const;
         bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) const;
+        bool checkScriptedAnimationPlaying(const MWWorld::Ptr& ptr) const;
         void persistAnimationStates() const;
+        void clearAnimationQueue(const MWWorld::Ptr& ptr, bool clearScripted);
 
         void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const;
 
@@ -165,13 +168,6 @@ namespace MWMechanics
         bool isTurningToPlayer(const MWWorld::Ptr& ptr) const;
 
     private:
-        enum class MusicType
-        {
-            Title,
-            Explore,
-            Battle
-        };
-
         std::map<ESM::RefId, int> mDeathCount;
         std::list<Actor> mActors;
         std::map<const MWWorld::LiveCellRefBase*, std::list<Actor>::iterator> mIndex;
@@ -182,7 +178,6 @@ namespace MWMechanics
         float mTimerUpdateHello = 0;
         float mSneakTimer = 0; // Times update of sneak icon
         float mSneakSkillTimer = 0; // Times sneak skill progress from "avoid notice"
-        MusicType mCurrentMusic = MusicType::Title;
 
         void updateVisibility(const MWWorld::Ptr& ptr, CharacterController& ctrl) const;
 
@@ -190,7 +185,7 @@ namespace MWMechanics
 
         void calculateRestoration(const MWWorld::Ptr& ptr, float duration) const;
 
-        void updateCrimePursuit(const MWWorld::Ptr& ptr, float duration) const;
+        void updateCrimePursuit(const MWWorld::Ptr& ptr, float duration, SidingCache& cachedAllies) const;
 
         void killDeadActors();
 
@@ -202,13 +197,25 @@ namespace MWMechanics
             @Notes: If againstPlayer = true then actor2 should be the Player.
                     If one of the combatants is creature it should be actor1.
         */
-        void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2,
-            std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies, bool againstPlayer) const;
+        void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, SidingCache& cachedAllies,
+            bool againstPlayer) const;
+    };
 
-        /// Recursive version of getActorsSidingWith that takes, adds to and returns a cache of
-        /// actors mapped to their allies. Excludes infighting
-        void getActorsSidingWith(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out,
-            std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies) const;
+    class SidingCache
+    {
+        const Actors& mActors;
+        const bool mExcludeInfighting;
+        std::map<MWWorld::Ptr, std::set<MWWorld::Ptr>> mCache;
+
+    public:
+        SidingCache(const Actors& actors, bool excludeInfighting)
+            : mActors(actors)
+            , mExcludeInfighting(excludeInfighting)
+        {
+        }
+
+        /// Recursive version of getActorsSidingWith that takes, returns a cached set of allies
+        const std::set<MWWorld::Ptr>& getActorsSidingWith(const MWWorld::Ptr& actor);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actorutil.cpp b/apps/openmw/mwmechanics/actorutil.cpp
index c414ff3032..2d2980075e 100644
--- a/apps/openmw/mwmechanics/actorutil.cpp
+++ b/apps/openmw/mwmechanics/actorutil.cpp
@@ -39,6 +39,6 @@ namespace MWMechanics
     {
         const MagicEffects& magicEffects = actor.getClass().getCreatureStats(actor).getMagicEffects();
         return (magicEffects.getOrDefault(ESM::MagicEffect::Invisibility).getMagnitude() > 0)
-            || (magicEffects.getOrDefault(ESM::MagicEffect::Chameleon).getMagnitude() > 75);
+            || (magicEffects.getOrDefault(ESM::MagicEffect::Chameleon).getMagnitude() >= 75);
     }
 }
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 31abda44c2..be4fe5e674 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -30,7 +30,7 @@ namespace MWMechanics
 
         // Stop if the target doesn't exist
         // Really we should be checking whether the target is currently registered with the MechanicsManager
-        if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
+        if (target == MWWorld::Ptr() || !target.getCellRef().getCount() || !target.getRefData().isEnabled())
             return true;
 
         // Turn to target and move to it directly, without pathfinding.
diff --git a/apps/openmw/mwmechanics/aicast.cpp b/apps/openmw/mwmechanics/aicast.cpp
index 249ca97326..6384d70c06 100644
--- a/apps/openmw/mwmechanics/aicast.cpp
+++ b/apps/openmw/mwmechanics/aicast.cpp
@@ -25,11 +25,11 @@ namespace MWMechanics
     }
 }
 
-MWMechanics::AiCast::AiCast(const ESM::RefId& targetId, const ESM::RefId& spellId, bool manualSpell)
+MWMechanics::AiCast::AiCast(const ESM::RefId& targetId, const ESM::RefId& spellId, bool scriptedSpell)
     : mTargetId(targetId)
     , mSpellId(spellId)
     , mCasting(false)
-    , mManual(manualSpell)
+    , mScripted(scriptedSpell)
     , mDistance(getInitialDistance(spellId))
 {
 }
@@ -49,7 +49,7 @@ bool MWMechanics::AiCast::execute(const MWWorld::Ptr& actor, MWMechanics::Charac
         if (target.isEmpty())
             return true;
 
-        if (!mManual
+        if (!mScripted
             && !pathTo(actor, target.getRefData().getPosition().asVec3(), duration,
                 characterController.getSupportedMovementDirections(), mDistance))
         {
@@ -85,7 +85,7 @@ bool MWMechanics::AiCast::execute(const MWWorld::Ptr& actor, MWMechanics::Charac
 
     if (!mCasting)
     {
-        MWBase::Environment::get().getMechanicsManager()->castSpell(actor, mSpellId, mManual);
+        MWBase::Environment::get().getMechanicsManager()->castSpell(actor, mSpellId, mScripted);
         mCasting = true;
         return false;
     }
diff --git a/apps/openmw/mwmechanics/aicast.hpp b/apps/openmw/mwmechanics/aicast.hpp
index 435458cc0f..649c5a4d34 100644
--- a/apps/openmw/mwmechanics/aicast.hpp
+++ b/apps/openmw/mwmechanics/aicast.hpp
@@ -15,7 +15,7 @@ namespace MWMechanics
     class AiCast final : public TypedAiPackage<AiCast>
     {
     public:
-        AiCast(const ESM::RefId& targetId, const ESM::RefId& spellId, bool manualSpell = false);
+        AiCast(const ESM::RefId& targetId, const ESM::RefId& spellId, bool scriptedSpell = false);
 
         bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state,
             float duration) override;
@@ -37,7 +37,7 @@ namespace MWMechanics
         const ESM::RefId mTargetId;
         const ESM::RefId mSpellId;
         bool mCasting;
-        const bool mManual;
+        const bool mScripted;
         const float mDistance;
     };
 }
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index dbe83eab42..2399961a3a 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -23,6 +23,7 @@
 #include "actorutil.hpp"
 #include "aicombataction.hpp"
 #include "character.hpp"
+#include "combat.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
 #include "pathgrid.hpp"
@@ -114,7 +115,7 @@ namespace MWMechanics
         if (target.isEmpty())
             return true;
 
-        if (!target.getRefData().getCount()
+        if (!target.getCellRef().getCount()
             || !target.getRefData().isEnabled() // Really we should be checking whether the target is currently
                                                 // registered with the MechanicsManager
             || target.getClass().getCreatureStats(target).isDead())
@@ -242,7 +243,7 @@ namespace MWMechanics
         const osg::Vec3f vActorPos(pos.asVec3());
         const osg::Vec3f vTargetPos(target.getRefData().getPosition().asVec3());
 
-        float distToTarget = MWBase::Environment::get().getWorld()->getHitDistance(actor, target);
+        float distToTarget = getDistanceToBounds(actor, target);
 
         storage.mReadyToAttack = (currentAction->isAttackingOrSpell() && distToTarget <= rangeAttack && storage.mLOS);
 
@@ -269,7 +270,15 @@ namespace MWMechanics
         {
             storage.startCombatMove(isRangedCombat, distToTarget, rangeAttack, actor, target);
             // start new attack
-            storage.startAttackIfReady(actor, characterController, weapon, isRangedCombat);
+            bool canShout = true;
+            ESM::RefId spellId = storage.mCurrentAction->getSpell();
+            if (!spellId.empty())
+            {
+                const ESM::Spell* spell = MWBase::Environment::get().getESMStore()->get<ESM::Spell>().find(spellId);
+                if (spell->mEffects.mList.empty() || spell->mEffects.mList[0].mData.mRange != ESM::RT_Target)
+                    canShout = false;
+            }
+            storage.startAttackIfReady(actor, characterController, weapon, isRangedCombat, canShout);
         }
 
         // If actor uses custom destination it has to try to rebuild path because environment can change
@@ -282,8 +291,8 @@ namespace MWMechanics
             const MWBase::World* world = MWBase::Environment::get().getWorld();
             // Try to build path to the target.
             const auto agentBounds = world->getPathfindingAgentBounds(actor);
-            const auto navigatorFlags = getNavigatorFlags(actor);
-            const auto areaCosts = getAreaCosts(actor);
+            const DetourNavigator::Flags navigatorFlags = getNavigatorFlags(actor);
+            const DetourNavigator::AreaCosts areaCosts = getAreaCosts(actor, navigatorFlags);
             const ESM::Pathgrid* pathgrid = world->getStore().get<ESM::Pathgrid>().search(*actor.getCell()->getCell());
             const auto& pathGridGraph = getPathGridGraph(pathgrid);
             mPathFinder.buildPath(actor, vActorPos, vTargetPos, actor.getCell(), pathGridGraph, agentBounds,
@@ -477,8 +486,7 @@ namespace MWMechanics
 
     MWWorld::Ptr AiCombat::getTarget() const
     {
-        if (mCachedTarget.isEmpty() || mCachedTarget.getRefData().isDeleted()
-            || !mCachedTarget.getRefData().isEnabled())
+        if (mCachedTarget.isEmpty() || mCachedTarget.mRef->isDeleted() || !mCachedTarget.getRefData().isEnabled())
         {
             mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
         }
@@ -635,7 +643,7 @@ namespace MWMechanics
     }
 
     void AiCombatStorage::startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController,
-        const ESM::Weapon* weapon, bool distantCombat)
+        const ESM::Weapon* weapon, bool distantCombat, bool canShout)
     {
         if (mReadyToAttack && characterController.readyToStartAttack())
         {
@@ -658,12 +666,15 @@ namespace MWMechanics
                     baseDelay = store.get<ESM::GameSetting>().find("fCombatDelayNPC")->mValue.getFloat();
                 }
 
-                // Say a provoking combat phrase
-                const int iVoiceAttackOdds
-                    = store.get<ESM::GameSetting>().find("iVoiceAttackOdds")->mValue.getInteger();
-                if (Misc::Rng::roll0to99(prng) < iVoiceAttackOdds)
+                if (canShout)
                 {
-                    MWBase::Environment::get().getDialogueManager()->say(actor, ESM::RefId::stringRefId("attack"));
+                    // Say a provoking combat phrase
+                    const int iVoiceAttackOdds
+                        = store.get<ESM::GameSetting>().find("iVoiceAttackOdds")->mValue.getInteger();
+                    if (Misc::Rng::roll0to99(prng) < iVoiceAttackOdds)
+                    {
+                        MWBase::Environment::get().getDialogueManager()->say(actor, ESM::RefId::stringRefId("attack"));
+                    }
                 }
                 mAttackCooldown = std::min(baseDelay + 0.01 * Misc::Rng::roll0to99(prng), baseDelay + 0.9);
             }
@@ -707,7 +718,7 @@ namespace MWMechanics
         mFleeDest = ESM::Pathgrid::Point(0, 0, 0);
     }
 
-    bool AiCombatStorage::isFleeing()
+    bool AiCombatStorage::isFleeing() const
     {
         return mFleeState != FleeState_None;
     }
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 92d380dbd8..d5a9c3464c 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -64,13 +64,13 @@ namespace MWMechanics
         void updateCombatMove(float duration);
         void stopCombatMove();
         void startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController,
-            const ESM::Weapon* weapon, bool distantCombat);
+            const ESM::Weapon* weapon, bool distantCombat, bool canShout);
         void updateAttack(const MWWorld::Ptr& actor, CharacterController& characterController);
         void stopAttack();
 
         void startFleeing();
         void stopFleeing();
-        bool isFleeing();
+        bool isFleeing() const;
     };
 
     /// \brief Causes the actor to fight another actor
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index a7bcd1a0df..91d2a9bbb8 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -176,34 +176,35 @@ namespace MWMechanics
             return bestAction;
         }
 
-        if (actor.getClass().hasInventoryStore(actor))
+        const bool hasInventoryStore = actor.getClass().hasInventoryStore(actor);
+        MWWorld::ContainerStore& store = actor.getClass().getContainerStore(actor);
+        for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
         {
-            MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
-
-            for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+            if (it->getType() == ESM::Potion::sRecordId)
             {
-                if (it->getType() == ESM::Potion::sRecordId)
+                float rating = ratePotion(*it, actor);
+                if (rating > bestActionRating)
                 {
-                    float rating = ratePotion(*it, actor);
-                    if (rating > bestActionRating)
-                    {
-                        bestActionRating = rating;
-                        bestAction = std::make_unique<ActionPotion>(*it);
-                        antiFleeRating = std::numeric_limits<float>::max();
-                    }
-                }
-                else if (!it->getClass().getEnchantment(*it).empty())
-                {
-                    float rating = rateMagicItem(*it, actor, enemy);
-                    if (rating > bestActionRating)
-                    {
-                        bestActionRating = rating;
-                        bestAction = std::make_unique<ActionEnchantedItem>(it);
-                        antiFleeRating = std::numeric_limits<float>::max();
-                    }
+                    bestActionRating = rating;
+                    bestAction = std::make_unique<ActionPotion>(*it);
+                    antiFleeRating = std::numeric_limits<float>::max();
                 }
             }
+            // TODO remove inventory store check, creatures should be able to use enchanted items they cannot equip
+            else if (hasInventoryStore && !it->getClass().getEnchantment(*it).empty())
+            {
+                float rating = rateMagicItem(*it, actor, enemy);
+                if (rating > bestActionRating)
+                {
+                    bestActionRating = rating;
+                    bestAction = std::make_unique<ActionEnchantedItem>(it);
+                    antiFleeRating = std::numeric_limits<float>::max();
+                }
+            }
+        }
 
+        if (hasInventoryStore)
+        {
             MWWorld::Ptr bestArrow;
             float bestArrowRating = rateAmmo(actor, enemy, bestArrow, ESM::Weapon::Arrow);
 
@@ -354,14 +355,14 @@ namespace MWMechanics
             {
                 const ESM::Spell* spell
                     = MWBase::Environment::get().getESMStore()->get<ESM::Spell>().find(selectedSpellId);
-                for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spell->mEffects.mList.begin();
+                for (std::vector<ESM::IndexedENAMstruct>::const_iterator effectIt = spell->mEffects.mList.begin();
                      effectIt != spell->mEffects.mList.end(); ++effectIt)
                 {
-                    if (effectIt->mRange == ESM::RT_Target)
+                    if (effectIt->mData.mRange == ESM::RT_Target)
                     {
                         const ESM::MagicEffect* effect
                             = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(
-                                effectIt->mEffectID);
+                                effectIt->mData.mEffectID);
                         dist = effect->mData.mSpeed;
                         break;
                     }
@@ -374,14 +375,14 @@ namespace MWMechanics
                 {
                     const ESM::Enchantment* ench
                         = MWBase::Environment::get().getESMStore()->get<ESM::Enchantment>().find(enchId);
-                    for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = ench->mEffects.mList.begin();
+                    for (std::vector<ESM::IndexedENAMstruct>::const_iterator effectIt = ench->mEffects.mList.begin();
                          effectIt != ench->mEffects.mList.end(); ++effectIt)
                     {
-                        if (effectIt->mRange == ESM::RT_Target)
+                        if (effectIt->mData.mRange == ESM::RT_Target)
                         {
                             const ESM::MagicEffect* effect
                                 = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(
-                                    effectIt->mEffectID);
+                                    effectIt->mData.mEffectID);
                             dist = effect->mData.mSpeed;
                             break;
                         }
diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp
index 05d2a18e25..9eb7df211a 100644
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@@ -16,6 +16,7 @@ namespace MWMechanics
         virtual float getCombatRange(bool& isRanged) const = 0;
         virtual float getActionCooldown() const { return 0.f; }
         virtual const ESM::Weapon* getWeapon() const { return nullptr; }
+        virtual ESM::RefId getSpell() const { return {}; }
         virtual bool isAttackingOrSpell() const { return true; }
         virtual bool isFleeing() const { return false; }
     };
@@ -43,6 +44,7 @@ namespace MWMechanics
         void prepare(const MWWorld::Ptr& actor) override;
 
         float getCombatRange(bool& isRanged) const override;
+        ESM::RefId getSpell() const override { return mSpellId; }
     };
 
     class ActionEnchantedItem : public Action
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index e1d657a207..9e6df46340 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -1,5 +1,6 @@
 #include "aiescort.hpp"
 
+#include <components/esm/util.hpp>
 #include <components/esm3/aisequence.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/misc/algorithm.hpp>
@@ -30,8 +31,6 @@ namespace MWMechanics
         , mZ(z)
         , mDuration(duration)
         , mRemainingDuration(static_cast<float>(duration))
-        , mCellX(std::numeric_limits<int>::max())
-        , mCellY(std::numeric_limits<int>::max())
     {
         mTargetActorRefId = actorId;
     }
@@ -45,8 +44,6 @@ namespace MWMechanics
         , mZ(z)
         , mDuration(duration)
         , mRemainingDuration(static_cast<float>(duration))
-        , mCellX(std::numeric_limits<int>::max())
-        , mCellY(std::numeric_limits<int>::max())
     {
         mTargetActorRefId = actorId;
     }
@@ -59,8 +56,6 @@ namespace MWMechanics
         , mZ(escort->mData.mZ)
         , mDuration(escort->mData.mDuration)
         , mRemainingDuration(escort->mRemainingDuration)
-        , mCellX(std::numeric_limits<int>::max())
-        , mCellY(std::numeric_limits<int>::max())
     {
         mTargetActorRefId = escort->mTargetId;
         mTargetActorId = escort->mTargetActorId;
@@ -96,6 +91,19 @@ namespace MWMechanics
 
         if ((leaderPos - followerPos).length2() <= mMaxDist * mMaxDist)
         {
+            // TESCS allows the creation of Escort packages without a specific destination
+            constexpr float nowhere = std::numeric_limits<float>::max();
+            if (mX == nowhere || mY == nowhere)
+                return true;
+            if (mZ == nowhere)
+            {
+                if (mCellId.empty()
+                    && ESM::positionToExteriorCellLocation(mX, mY)
+                        == actor.getCell()->getCell()->getExteriorCellLocation())
+                    return false;
+                return true;
+            }
+
             const osg::Vec3f dest(mX, mY, mZ);
             if (pathTo(actor, dest, duration, characterController.getSupportedMovementDirections(), maxHalfExtent))
             {
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index e22752446d..d88ecac6a5 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -51,6 +51,8 @@ namespace MWMechanics
 
         osg::Vec3f getDestination() const override { return osg::Vec3f(mX, mY, mZ); }
 
+        std::optional<float> getDuration() const override { return mDuration; }
+
     private:
         const std::string mCellId;
         const float mX;
@@ -59,9 +61,6 @@ namespace MWMechanics
         float mMaxDist = 450;
         const float mDuration; // In hours
         float mRemainingDuration; // In hours
-
-        const int mCellX;
-        const int mCellY;
     };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index b78c1fd6ee..b4779dc900 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -99,7 +99,7 @@ namespace MWMechanics
 
         // Target is not here right now, wait for it to return
         // Really we should be checking whether the target is currently registered with the MechanicsManager
-        if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
+        if (target == MWWorld::Ptr() || !target.getCellRef().getCount() || !target.getRefData().isEnabled())
             return false;
 
         actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
@@ -119,21 +119,6 @@ namespace MWMechanics
         const osg::Vec3f targetPos(target.getRefData().getPosition().asVec3());
         const osg::Vec3f targetDir = targetPos - actorPos;
 
-        // AiFollow requires the target to be in range and within sight for the initial activation
-        if (!mActive)
-        {
-            storage.mTimer -= duration;
-
-            if (storage.mTimer < 0)
-            {
-                if (targetDir.length2() < 500 * 500 && MWBase::Environment::get().getWorld()->getLOS(actor, target))
-                    mActive = true;
-                storage.mTimer = 0.5f;
-            }
-        }
-        if (!mActive)
-            return false;
-
         // In the original engine the first follower stays closer to the player than any subsequent followers.
         // Followers beyond the first usually attempt to stand inside each other.
         osg::Vec3f::value_type floatingDistance = 0;
@@ -152,6 +137,23 @@ namespace MWMechanics
         floatingDistance += getHalfExtents(actor) * 2;
         short followDistance = static_cast<short>(floatingDistance);
 
+        // AiFollow requires the target to be in range and within sight for the initial activation
+        if (!mActive)
+        {
+            storage.mTimer -= duration;
+
+            if (storage.mTimer < 0)
+            {
+                float activeRange = followDistance + 384.f;
+                if (targetDir.length2() < activeRange * activeRange
+                    && MWBase::Environment::get().getWorld()->getLOS(actor, target))
+                    mActive = true;
+                storage.mTimer = 0.5f;
+            }
+        }
+        if (!mActive)
+            return false;
+
         if (!mAlwaysFollow) // Update if you only follow for a bit
         {
             // Check if we've run out of time
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 183c30bfb7..4bcfc7dedd 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -9,6 +9,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/cellstore.hpp"
@@ -63,7 +64,7 @@ MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
 {
     if (!mCachedTarget.isEmpty())
     {
-        if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
+        if (mCachedTarget.mRef->isDeleted() || !mCachedTarget.getRefData().isEnabled())
             mCachedTarget = MWWorld::Ptr();
         else
             return mCachedTarget;
@@ -97,6 +98,26 @@ MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
     return mCachedTarget;
 }
 
+bool MWMechanics::AiPackage::targetIs(const MWWorld::Ptr& ptr) const
+{
+    if (mTargetActorId == -2)
+        return ptr.isEmpty();
+    else if (mTargetActorId == -1)
+    {
+        if (mTargetActorRefId.empty())
+        {
+            mTargetActorId = -2;
+            return ptr.isEmpty();
+        }
+        if (!ptr.isEmpty() && ptr.getCellRef().getRefId() == mTargetActorRefId)
+            return getTarget() == ptr;
+        return false;
+    }
+    if (ptr.isEmpty() || !ptr.getClass().isActor())
+        return false;
+    return ptr.getClass().getCreatureStats(ptr).getActorId() == mTargetActorId;
+}
+
 void MWMechanics::AiPackage::reset()
 {
     // reset all members
@@ -120,12 +141,12 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     MWBase::World* world = MWBase::Environment::get().getWorld();
     const DetourNavigator::AgentBounds agentBounds = world->getPathfindingAgentBounds(actor);
 
-    /// Stops the actor when it gets too close to a unloaded cell
-    //... At current time, this test is unnecessary. AI shuts down when actor is more than "actors processing range"
-    // setting value
-    //... units from player, and exterior cells are 8192 units long and wide.
+    /// Stops the actor when it gets too close to a unloaded cell or when the actor is playing a scripted animation
+    //... At current time, the first test is unnecessary. AI shuts down when actor is more than
+    //... "actors processing range" setting value units from player, and exterior cells are 8192 units long and wide.
     //... But AI processing distance may increase in the future.
-    if (isNearInactiveCell(position))
+    if (isNearInactiveCell(position)
+        || MWBase::Environment::get().getMechanicsManager()->checkScriptedAnimationPlaying(actor))
     {
         actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
@@ -157,8 +178,10 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
             {
                 const ESM::Pathgrid* pathgrid
                     = world->getStore().get<ESM::Pathgrid>().search(*actor.getCell()->getCell());
+                const DetourNavigator::Flags navigatorFlags = getNavigatorFlags(actor);
+                const DetourNavigator::AreaCosts areaCosts = getAreaCosts(actor, navigatorFlags);
                 mPathFinder.buildLimitedPath(actor, position, dest, actor.getCell(), getPathGridGraph(pathgrid),
-                    agentBounds, getNavigatorFlags(actor), getAreaCosts(actor), endTolerance, pathType);
+                    agentBounds, navigatorFlags, areaCosts, endTolerance, pathType);
                 mRotateOnTheRunChecks = 3;
 
                 // give priority to go directly on target if there is minimal opportunity
@@ -486,14 +509,12 @@ DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::
     return result;
 }
 
-DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::Ptr& actor) const
+DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(
+    const MWWorld::Ptr& actor, DetourNavigator::Flags flags) const
 {
     DetourNavigator::AreaCosts costs;
-    const DetourNavigator::Flags flags = getNavigatorFlags(actor);
     const MWWorld::Class& actorClass = actor.getClass();
 
-    const float swimSpeed = (flags & DetourNavigator::Flag_swim) == 0 ? 0.0f : actorClass.getSwimSpeed(actor);
-
     const float walkSpeed = [&] {
         if ((flags & DetourNavigator::Flag_walk) == 0)
             return 0.0f;
@@ -502,6 +523,14 @@ DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::P
         return actorClass.getRunSpeed(actor);
     }();
 
+    const float swimSpeed = [&] {
+        if ((flags & DetourNavigator::Flag_swim) == 0)
+            return 0.0f;
+        if (hasWaterWalking(actor))
+            return walkSpeed;
+        return actorClass.getSwimSpeed(actor);
+    }();
+
     const float maxSpeed = std::max(swimSpeed, walkSpeed);
 
     if (maxSpeed == 0)
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index fa018609e4..ca33f5dc90 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -87,6 +87,8 @@ namespace MWMechanics
 
         /// Get the target actor the AI is targeted at (not applicable to all AI packages, default return empty Ptr)
         virtual MWWorld::Ptr getTarget() const;
+        /// Optimized version of getTarget() == ptr
+        virtual bool targetIs(const MWWorld::Ptr& ptr) const;
 
         /// Get the destination point of the AI package (not applicable to all AI packages, default return (0, 0, 0))
         virtual osg::Vec3f getDestination(const MWWorld::Ptr& actor) const { return osg::Vec3f(0, 0, 0); }
@@ -108,6 +110,10 @@ namespace MWMechanics
 
         virtual osg::Vec3f getDestination() const { return osg::Vec3f(0, 0, 0); }
 
+        virtual std::optional<int> getDistance() const { return std::nullopt; }
+
+        virtual std::optional<float> getDuration() const { return std::nullopt; }
+
         /// Return true if any loaded actor with this AI package must be active.
         bool alwaysActive() const { return mOptions.mAlwaysActive; }
 
@@ -150,7 +156,7 @@ namespace MWMechanics
 
         DetourNavigator::Flags getNavigatorFlags(const MWWorld::Ptr& actor) const;
 
-        DetourNavigator::AreaCosts getAreaCosts(const MWWorld::Ptr& actor) const;
+        DetourNavigator::AreaCosts getAreaCosts(const MWWorld::Ptr& actor, DetourNavigator::Flags flags) const;
 
         const AiPackageTypeId mTypeId;
         const Options mOptions;
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 2ae4ce5def..461db45133 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -12,6 +12,7 @@
 #include "actorutil.hpp"
 #include "character.hpp"
 #include "creaturestats.hpp"
+#include "npcstats.hpp"
 
 namespace MWMechanics
 {
@@ -37,7 +38,7 @@ namespace MWMechanics
 
         // Stop if the target doesn't exist
         // Really we should be checking whether the target is currently registered with the MechanicsManager
-        if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
+        if (target == MWWorld::Ptr() || !target.getCellRef().getCount() || !target.getRefData().isEnabled())
             return true;
 
         if (isTargetMagicallyHidden(target)
@@ -47,6 +48,9 @@ namespace MWMechanics
         if (target.getClass().getCreatureStats(target).isDead())
             return true;
 
+        if (target.getClass().getNpcStats(target).getBounty() <= 0)
+            return true;
+
         actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
 
         // Set the target destination
@@ -79,7 +83,7 @@ namespace MWMechanics
     {
         if (!mCachedTarget.isEmpty())
         {
-            if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
+            if (mCachedTarget.mRef->isDeleted() || !mCachedTarget.getRefData().isEnabled())
                 mCachedTarget = MWWorld::Ptr();
             else
                 return mCachedTarget;
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index b58927c993..019aaf7c0a 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -6,6 +6,8 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/aisequence.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwworld/class.hpp"
 #include "actorutil.hpp"
 #include "aiactivate.hpp"
@@ -17,6 +19,7 @@
 #include "aipursue.hpp"
 #include "aitravel.hpp"
 #include "aiwander.hpp"
+#include "creaturestats.hpp"
 
 namespace MWMechanics
 {
@@ -79,7 +82,11 @@ namespace MWMechanics
     void AiSequence::onPackageRemoved(const AiPackage& package)
     {
         if (package.getTypeId() == AiPackageTypeId::Combat)
+        {
             mNumCombatPackages--;
+            if (mNumCombatPackages == 0)
+                mResetFriendlyHits = true;
+        }
         else if (package.getTypeId() == AiPackageTypeId::Pursue)
             mNumPursuitPackages--;
 
@@ -135,6 +142,15 @@ namespace MWMechanics
         return mNumPursuitPackages > 0;
     }
 
+    bool AiSequence::isFleeing() const
+    {
+        if (!isInCombat())
+            return false;
+
+        const AiCombatStorage* storage = mAiState.getPtr<AiCombatStorage>();
+        return storage && storage->isFleeing();
+    }
+
     bool AiSequence::isEngagedWithActor() const
     {
         if (!isInCombat())
@@ -164,11 +180,11 @@ namespace MWMechanics
         if (!isInCombat())
             return false;
 
-        for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
+        for (const auto& package : mPackages)
         {
-            if ((*it)->getTypeId() == AiPackageTypeId::Combat)
+            if (package->getTypeId() == AiPackageTypeId::Combat)
             {
-                if ((*it)->getTarget() == actor)
+                if (package->targetIs(actor))
                     return true;
             }
         }
@@ -234,6 +250,12 @@ namespace MWMechanics
             return;
         }
 
+        if (mResetFriendlyHits)
+        {
+            actor.getClass().getCreatureStats(actor).resetFriendlyHits();
+            mResetFriendlyHits = false;
+        }
+
         if (mPackages.empty())
         {
             mLastAiPackage = AiPackageTypeId::None;
@@ -272,7 +294,9 @@ namespace MWMechanics
                 }
                 else
                 {
-                    float rating = MWMechanics::getBestActionRating(actor, target);
+                    float rating = 0.f;
+                    if (MWMechanics::canFight(actor, target))
+                        rating = MWMechanics::getBestActionRating(actor, target);
 
                     const ESM::Position& targetPos = target.getRefData().getPosition();
 
@@ -354,7 +378,20 @@ namespace MWMechanics
 
         // Stop combat when a non-combat AI package is added
         if (isActualAiPackage(package.getTypeId()))
+        {
+            if (package.getTypeId() == MWMechanics::AiPackageTypeId::Follow
+                || package.getTypeId() == MWMechanics::AiPackageTypeId::Escort)
+            {
+                const auto& mechanicsManager = MWBase::Environment::get().getMechanicsManager();
+                std::vector<MWWorld::Ptr> newAllies = mechanicsManager->getActorsSidingWith(package.getTarget());
+                std::vector<MWWorld::Ptr> allies = mechanicsManager->getActorsSidingWith(actor);
+                for (const auto& ally : allies)
+                    ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(newAllies);
+                for (const auto& ally : newAllies)
+                    ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(allies);
+            }
             stopCombat();
+        }
 
         // We should return a wandering actor back after combat, casting or pursuit.
         // The same thing for actors without AI packages.
@@ -456,7 +493,7 @@ namespace MWMechanics
             {
                 ESM::AITarget data = esmPackage.mTarget;
                 package = std::make_unique<MWMechanics::AiEscort>(ESM::RefId::stringRefId(data.mId.toStringView()),
-                    data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
+                    esmPackage.mCellName, data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
             }
             else if (esmPackage.mType == ESM::AI_Travel)
             {
@@ -473,7 +510,7 @@ namespace MWMechanics
             {
                 ESM::AITarget data = esmPackage.mTarget;
                 package = std::make_unique<MWMechanics::AiFollow>(ESM::RefId::stringRefId(data.mId.toStringView()),
-                    data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
+                    esmPackage.mCellName, data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
             }
 
             onPackageAdded(*package);
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index ab3cc11e2c..5e7e521a40 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -39,6 +39,7 @@ namespace MWMechanics
 
         /// Finished with top AIPackage, set for one frame
         bool mDone{};
+        bool mResetFriendlyHits{};
 
         int mNumCombatPackages{};
         int mNumPursuitPackages{};
@@ -117,6 +118,9 @@ namespace MWMechanics
         /// Is there any pursuit package.
         bool isInPursuit() const;
 
+        /// Is the actor fleeing?
+        bool isFleeing() const;
+
         /// Removes all packages using the specified id.
         void removePackagesById(AiPackageTypeId id);
 
@@ -129,9 +133,6 @@ namespace MWMechanics
         /// Are we in combat with this particular actor?
         bool isInCombat(const MWWorld::Ptr& actor) const;
 
-        bool canAddTarget(const ESM::Position& actorPos, float distToTarget) const;
-        ///< Function assumes that actor can have only 1 target apart player
-
         /// Removes all combat packages until first non-combat or stack empty.
         void stopCombat();
 
diff --git a/apps/openmw/mwmechanics/aistate.hpp b/apps/openmw/mwmechanics/aistate.hpp
index d79469a9a0..f2ce17fd9c 100644
--- a/apps/openmw/mwmechanics/aistate.hpp
+++ b/apps/openmw/mwmechanics/aistate.hpp
@@ -38,6 +38,13 @@ namespace MWMechanics
             return *result;
         }
 
+        /// \brief returns pointer to stored object in the desired type
+        template <class Derived>
+        Derived* getPtr() const
+        {
+            return dynamic_cast<Derived*>(mStorage.get());
+        }
+
         template <class Derived>
         void copy(DerivedClassStorage& destination) const
         {
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 30756ade35..3c299c1490 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -86,7 +86,7 @@ namespace MWMechanics
             return MWBase::Environment::get()
                 .getWorld()
                 ->getRayCasting()
-                ->castRay(position, visibleDestination, actor, {}, mask)
+                ->castRay(position, visibleDestination, { actor }, {}, mask)
                 .mHit;
         }
 
@@ -224,12 +224,14 @@ namespace MWMechanics
             {
                 const auto agentBounds = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(actor);
                 constexpr float endTolerance = 0;
+                const DetourNavigator::Flags navigatorFlags = getNavigatorFlags(actor);
+                const DetourNavigator::AreaCosts areaCosts = getAreaCosts(actor, navigatorFlags);
                 mPathFinder.buildPath(actor, pos.asVec3(), mDestination, actor.getCell(), getPathGridGraph(pathgrid),
-                    agentBounds, getNavigatorFlags(actor), getAreaCosts(actor), endTolerance, PathType::Full);
+                    agentBounds, navigatorFlags, areaCosts, endTolerance, PathType::Full);
             }
 
             if (mPathFinder.isPathConstructed())
-                storage.setState(AiWanderStorage::Wander_Walking);
+                storage.setState(AiWanderStorage::Wander_Walking, !mUsePathgrid);
         }
 
         if (!cStats.getMovementFlag(CreatureStats::Flag_ForceJump)
@@ -367,8 +369,8 @@ namespace MWMechanics
         const auto world = MWBase::Environment::get().getWorld();
         const auto agentBounds = world->getPathfindingAgentBounds(actor);
         const auto navigator = world->getNavigator();
-        const auto navigatorFlags = getNavigatorFlags(actor);
-        const auto areaCosts = getAreaCosts(actor);
+        const DetourNavigator::Flags navigatorFlags = getNavigatorFlags(actor);
+        const DetourNavigator::AreaCosts areaCosts = getAreaCosts(actor, navigatorFlags);
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
 
         do
@@ -453,27 +455,37 @@ namespace MWMechanics
     void AiWander::doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration,
         MWWorld::MovementDirectionFlags supportedMovementDirections, AiWanderStorage& storage)
     {
-        switch (storage.mState)
+        // Attempt to fast forward to the next state instead of remaining in an intermediate state for a frame
+        for (int i = 0; i < 2; ++i)
         {
-            case AiWanderStorage::Wander_IdleNow:
-                onIdleStatePerFrameActions(actor, duration, storage);
-                break;
+            switch (storage.mState)
+            {
+                case AiWanderStorage::Wander_IdleNow:
+                {
+                    onIdleStatePerFrameActions(actor, duration, storage);
+                    if (storage.mState != AiWanderStorage::Wander_ChooseAction)
+                        return;
+                    continue;
+                }
+                case AiWanderStorage::Wander_Walking:
+                    onWalkingStatePerFrameActions(actor, duration, supportedMovementDirections, storage);
+                    return;
 
-            case AiWanderStorage::Wander_Walking:
-                onWalkingStatePerFrameActions(actor, duration, supportedMovementDirections, storage);
-                break;
+                case AiWanderStorage::Wander_ChooseAction:
+                {
+                    onChooseActionStatePerFrameActions(actor, storage);
+                    if (storage.mState != AiWanderStorage::Wander_IdleNow)
+                        return;
+                    continue;
+                }
+                case AiWanderStorage::Wander_MoveNow:
+                    return; // nothing to do
 
-            case AiWanderStorage::Wander_ChooseAction:
-                onChooseActionStatePerFrameActions(actor, storage);
-                break;
-
-            case AiWanderStorage::Wander_MoveNow:
-                break; // nothing to do
-
-            default:
-                // should never get here
-                assert(false);
-                break;
+                default:
+                    // should never get here
+                    assert(false);
+                    return;
+            }
         }
     }
 
@@ -499,7 +511,7 @@ namespace MWMechanics
         if (!checkIdle(actor, storage.mIdleAnimation) && (greetingState == Greet_Done || greetingState == Greet_None))
         {
             if (mPathFinder.isPathConstructed())
-                storage.setState(AiWanderStorage::Wander_Walking);
+                storage.setState(AiWanderStorage::Wander_Walking, !mUsePathgrid);
             else
                 storage.setState(AiWanderStorage::Wander_ChooseAction);
         }
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 6d5bd7f8cd..aed7214f4d 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -113,6 +113,14 @@ namespace MWMechanics
 
         bool isStationary() const { return mDistance == 0; }
 
+        std::optional<int> getDistance() const override { return mDistance; }
+
+        std::optional<float> getDuration() const override { return static_cast<float>(mDuration); }
+
+        const std::vector<unsigned char>& getIdle() const { return mIdle; }
+
+        static std::string_view getIdleGroupName(size_t index) { return sIdleSelectToGroupName[index]; }
+
     private:
         void stopWalking(const MWWorld::Ptr& actor);
 
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 914de6da2b..4be48296a9 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -24,45 +24,64 @@
 #include "creaturestats.hpp"
 #include "magiceffects.hpp"
 
+namespace
+{
+    constexpr size_t sNumEffects = 4;
+
+    std::optional<MWMechanics::EffectKey> toKey(const ESM::Ingredient& ingredient, size_t i)
+    {
+        if (ingredient.mData.mEffectID[i] < 0)
+            return {};
+        ESM::RefId arg = ESM::Skill::indexToRefId(ingredient.mData.mSkills[i]);
+        if (arg.empty())
+            arg = ESM::Attribute::indexToRefId(ingredient.mData.mAttributes[i]);
+        return MWMechanics::EffectKey(ingredient.mData.mEffectID[i], arg);
+    }
+
+    bool containsEffect(const ESM::Ingredient& ingredient, const MWMechanics::EffectKey& effect)
+    {
+        for (size_t j = 0; j < sNumEffects; ++j)
+        {
+            if (toKey(ingredient, j) == effect)
+                return true;
+        }
+        return false;
+    }
+}
+
 MWMechanics::Alchemy::Alchemy()
     : mValue(0)
-    , mPotionName("")
 {
 }
 
-std::set<MWMechanics::EffectKey> MWMechanics::Alchemy::listEffects() const
+std::vector<MWMechanics::EffectKey> MWMechanics::Alchemy::listEffects() const
 {
-    std::map<EffectKey, int> effects;
-
-    for (TIngredientsIterator iter(mIngredients.begin()); iter != mIngredients.end(); ++iter)
+    // We care about the order of these effects as each effect can affect the next when applied.
+    // The player can affect effect order by placing ingredients into different slots
+    std::vector<EffectKey> effects;
+    for (size_t slotI = 0; slotI < mIngredients.size() - 1; ++slotI)
     {
-        if (!iter->isEmpty())
+        if (mIngredients[slotI].isEmpty())
+            continue;
+        const ESM::Ingredient* ingredient = mIngredients[slotI].get<ESM::Ingredient>()->mBase;
+        for (size_t slotJ = slotI + 1; slotJ < mIngredients.size(); ++slotJ)
         {
-            const MWWorld::LiveCellRef<ESM::Ingredient>* ingredient = iter->get<ESM::Ingredient>();
-
-            std::set<EffectKey> seenEffects;
-
-            for (int i = 0; i < 4; ++i)
-                if (ingredient->mBase->mData.mEffectID[i] != -1)
+            if (mIngredients[slotJ].isEmpty())
+                continue;
+            const ESM::Ingredient* ingredient2 = mIngredients[slotJ].get<ESM::Ingredient>()->mBase;
+            for (size_t i = 0; i < sNumEffects; ++i)
+            {
+                if (const auto key = toKey(*ingredient, i))
                 {
-                    ESM::RefId arg = ESM::Skill::indexToRefId(ingredient->mBase->mData.mSkills[i]);
-                    if (arg.empty())
-                        arg = ESM::Attribute::indexToRefId(ingredient->mBase->mData.mAttributes[i]);
-                    EffectKey key(ingredient->mBase->mData.mEffectID[i], arg);
-
-                    if (seenEffects.insert(key).second)
-                        ++effects[key];
+                    if (std::find(effects.begin(), effects.end(), *key) != effects.end())
+                        continue;
+                    if (containsEffect(*ingredient2, *key))
+                        effects.push_back(*key);
                 }
+            }
         }
     }
-
-    std::set<EffectKey> effects2;
-
-    for (std::map<EffectKey, int>::const_iterator iter(effects.begin()); iter != effects.end(); ++iter)
-        if (iter->second > 1)
-            effects2.insert(iter->first);
-
-    return effects2;
+    return effects;
 }
 
 void MWMechanics::Alchemy::applyTools(int flags, float& value) const
@@ -133,7 +152,7 @@ void MWMechanics::Alchemy::updateEffects()
         return;
 
     // find effects
-    std::set<EffectKey> effects(listEffects());
+    std::vector<EffectKey> effects = listEffects();
 
     // general alchemy factor
     float x = getAlchemyFactor();
@@ -150,14 +169,14 @@ void MWMechanics::Alchemy::updateEffects()
         x * MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>().find("iAlchemyMod")->mValue.getFloat());
 
     // build quantified effect list
-    for (std::set<EffectKey>::const_iterator iter(effects.begin()); iter != effects.end(); ++iter)
+    for (const auto& effectKey : effects)
     {
         const ESM::MagicEffect* magicEffect
-            = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(iter->mId);
+            = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effectKey.mId);
 
         if (magicEffect->mData.mBaseCost <= 0)
         {
-            const std::string os = "invalid base cost for magic effect " + std::to_string(iter->mId);
+            const std::string os = "invalid base cost for magic effect " + std::to_string(effectKey.mId);
             throw std::runtime_error(os);
         }
 
@@ -198,15 +217,15 @@ void MWMechanics::Alchemy::updateEffects()
         if (magnitude > 0 && duration > 0)
         {
             ESM::ENAMstruct effect;
-            effect.mEffectID = iter->mId;
+            effect.mEffectID = effectKey.mId;
 
             effect.mAttribute = -1;
             effect.mSkill = -1;
 
             if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill)
-                effect.mSkill = ESM::Skill::refIdToIndex(iter->mArg);
+                effect.mSkill = ESM::Skill::refIdToIndex(effectKey.mArg);
             else if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute)
-                effect.mAttribute = ESM::Attribute::refIdToIndex(iter->mArg);
+                effect.mAttribute = ESM::Attribute::refIdToIndex(effectKey.mArg);
 
             effect.mRange = 0;
             effect.mArea = 0;
@@ -231,7 +250,7 @@ const ESM::Potion* MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) co
 
         if (iter->mName != toFind.mName || iter->mScript != toFind.mScript
             || iter->mData.mWeight != toFind.mData.mWeight || iter->mData.mValue != toFind.mData.mValue
-            || iter->mData.mAutoCalc != toFind.mData.mAutoCalc)
+            || iter->mData.mFlags != toFind.mData.mFlags)
             continue;
 
         // Don't choose an ID that came from the content files, would have unintended side effects
@@ -241,15 +260,15 @@ const ESM::Potion* MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) co
 
         bool mismatch = false;
 
-        for (int i = 0; i < static_cast<int>(iter->mEffects.mList.size()); ++i)
+        for (size_t i = 0; i < iter->mEffects.mList.size(); ++i)
         {
-            const ESM::ENAMstruct& first = iter->mEffects.mList[i];
+            const ESM::IndexedENAMstruct& first = iter->mEffects.mList[i];
             const ESM::ENAMstruct& second = mEffects[i];
 
-            if (first.mEffectID != second.mEffectID || first.mArea != second.mArea || first.mRange != second.mRange
-                || first.mSkill != second.mSkill || first.mAttribute != second.mAttribute
-                || first.mMagnMin != second.mMagnMin || first.mMagnMax != second.mMagnMax
-                || first.mDuration != second.mDuration)
+            if (first.mData.mEffectID != second.mEffectID || first.mData.mArea != second.mArea
+                || first.mData.mRange != second.mRange || first.mData.mSkill != second.mSkill
+                || first.mData.mAttribute != second.mAttribute || first.mData.mMagnMin != second.mMagnMin
+                || first.mData.mMagnMax != second.mMagnMax || first.mData.mDuration != second.mDuration)
             {
                 mismatch = true;
                 break;
@@ -270,7 +289,7 @@ void MWMechanics::Alchemy::removeIngredients()
         {
             iter->getContainerStore()->remove(*iter, 1);
 
-            if (iter->getRefData().getCount() < 1)
+            if (iter->getCellRef().getCount() < 1)
                 *iter = MWWorld::Ptr();
         }
 
@@ -291,7 +310,7 @@ void MWMechanics::Alchemy::addPotion(const std::string& name)
         newRecord.mData.mWeight /= countIngredients();
 
     newRecord.mData.mValue = mValue;
-    newRecord.mData.mAutoCalc = 0;
+    newRecord.mData.mFlags = 0;
     newRecord.mRecordFlags = 0;
 
     newRecord.mName = name;
@@ -305,7 +324,7 @@ void MWMechanics::Alchemy::addPotion(const std::string& name)
     newRecord.mModel = "m\\misc_potion_" + std::string(meshes[index]) + "_01.nif";
     newRecord.mIcon = "m\\tx_potion_" + std::string(meshes[index]) + "_01.dds";
 
-    newRecord.mEffects.mList = mEffects;
+    newRecord.mEffects.populate(mEffects);
 
     const ESM::Potion* record = getRecord(newRecord);
     if (!record)
@@ -316,7 +335,7 @@ void MWMechanics::Alchemy::addPotion(const std::string& name)
 
 void MWMechanics::Alchemy::increaseSkill()
 {
-    mAlchemist.getClass().skillUsageSucceeded(mAlchemist, ESM::Skill::Alchemy, 0);
+    mAlchemist.getClass().skillUsageSucceeded(mAlchemist, ESM::Skill::Alchemy, ESM::Skill::Alchemy_CreatePotion);
 }
 
 float MWMechanics::Alchemy::getAlchemyFactor() const
@@ -350,7 +369,7 @@ int MWMechanics::Alchemy::countPotionsToBrew() const
     for (TIngredientsIterator iter(beginIngredients()); iter != endIngredients(); ++iter)
         if (!iter->isEmpty())
         {
-            int count = iter->getRefData().getCount();
+            int count = iter->getCellRef().getCount();
             if ((count > 0 && count < toBrew) || toBrew < 0)
                 toBrew = count;
         }
@@ -368,6 +387,8 @@ void MWMechanics::Alchemy::setAlchemist(const MWWorld::Ptr& npc)
 
     mTools.resize(4);
 
+    std::vector<MWWorld::Ptr> prevTools(mTools);
+
     std::fill(mTools.begin(), mTools.end(), MWWorld::Ptr());
 
     mEffects.clear();
@@ -384,6 +405,12 @@ void MWMechanics::Alchemy::setAlchemist(const MWWorld::Ptr& npc)
         if (type < 0 || type >= static_cast<int>(mTools.size()))
             throw std::runtime_error("invalid apparatus type");
 
+        if (prevTools[type] == *iter)
+            mTools[type] = *iter; // prefer the previous tool if still in the container
+
+        if (!mTools[type].isEmpty() && !prevTools[type].isEmpty() && mTools[type] == prevTools[type])
+            continue;
+
         if (!mTools[type].isEmpty())
             if (ref->mBase->mData.mQuality <= mTools[type].get<ESM::Apparatus>()->mBase->mData.mQuality)
                 continue;
@@ -415,7 +442,6 @@ MWMechanics::Alchemy::TIngredientsIterator MWMechanics::Alchemy::endIngredients(
 void MWMechanics::Alchemy::clear()
 {
     mAlchemist = MWWorld::Ptr();
-    mTools.clear();
     mIngredients.clear();
     mEffects.clear();
     setPotionName("");
@@ -452,15 +478,33 @@ int MWMechanics::Alchemy::addIngredient(const MWWorld::Ptr& ingredient)
     return slot;
 }
 
-void MWMechanics::Alchemy::removeIngredient(int index)
+void MWMechanics::Alchemy::removeIngredient(size_t index)
 {
-    if (index >= 0 && index < static_cast<int>(mIngredients.size()))
+    if (index < mIngredients.size())
     {
         mIngredients[index] = MWWorld::Ptr();
         updateEffects();
     }
 }
 
+void MWMechanics::Alchemy::addApparatus(const MWWorld::Ptr& apparatus)
+{
+    int32_t slot = apparatus.get<ESM::Apparatus>()->mBase->mData.mType;
+
+    mTools[slot] = apparatus;
+
+    updateEffects();
+}
+
+void MWMechanics::Alchemy::removeApparatus(size_t index)
+{
+    if (index < mTools.size())
+    {
+        mTools[index] = MWWorld::Ptr();
+        updateEffects();
+    }
+}
+
 MWMechanics::Alchemy::TEffectsIterator MWMechanics::Alchemy::beginEffects() const
 {
     return mEffects.begin();
@@ -510,6 +554,8 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::create(const std::string& nam
     if (readyStatus != Result_Success)
         return readyStatus;
 
+    MWBase::Environment::get().getWorld()->breakInvisibility(mAlchemist);
+
     Result result = Result_RandomFailure;
     int brewedCount = 0;
     for (int i = 0; i < count; ++i)
@@ -551,7 +597,7 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::createSingle()
 
 std::string MWMechanics::Alchemy::suggestPotionName()
 {
-    std::set<MWMechanics::EffectKey> effects = listEffects();
+    std::vector<MWMechanics::EffectKey> effects = listEffects();
     if (effects.empty())
         return {};
 
@@ -568,11 +614,11 @@ std::vector<std::string> MWMechanics::Alchemy::effectsDescription(const MWWorld:
     const static auto fWortChanceValue = store->get<ESM::GameSetting>().find("fWortChanceValue")->mValue.getFloat();
     const auto& data = item->mData;
 
-    for (auto i = 0; i < 4; ++i)
+    for (size_t i = 0; i < sNumEffects; ++i)
     {
         const auto effectID = data.mEffectID[i];
 
-        if (alchemySkill < fWortChanceValue * (i + 1))
+        if (alchemySkill < fWortChanceValue * static_cast<int>(i + 1))
             break;
 
         if (effectID != -1)
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index ab6225e544..373ca8b887 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -1,7 +1,6 @@
 #ifndef GAME_MWMECHANICS_ALCHEMY_H
 #define GAME_MWMECHANICS_ALCHEMY_H
 
-#include <set>
 #include <vector>
 
 #include <components/esm3/effectlist.hpp>
@@ -110,7 +109,7 @@ namespace MWMechanics
         void setPotionName(const std::string& name);
         ///< Set name of potion to create
 
-        std::set<EffectKey> listEffects() const;
+        std::vector<EffectKey> listEffects() const;
         ///< List all effects shared by at least two ingredients.
 
         int addIngredient(const MWWorld::Ptr& ingredient);
@@ -119,9 +118,15 @@ namespace MWMechanics
         /// \return Slot index or -1, if adding failed because of no free slot or the ingredient type being
         /// listed already.
 
-        void removeIngredient(int index);
+        void addApparatus(const MWWorld::Ptr& apparatus);
+        ///< Add apparatus into the appropriate slot.
+
+        void removeIngredient(size_t index);
         ///< Remove ingredient from slot (calling this function on an empty slot is a no-op).
 
+        void removeApparatus(size_t index);
+        ///< Remove apparatus from slot.
+
         std::string suggestPotionName();
         ///< Suggest a name for the potion, based on the current effects
 
diff --git a/apps/openmw/mwmechanics/attacktype.hpp b/apps/openmw/mwmechanics/attacktype.hpp
new file mode 100644
index 0000000000..3824f5bbe7
--- /dev/null
+++ b/apps/openmw/mwmechanics/attacktype.hpp
@@ -0,0 +1,16 @@
+#ifndef OPENMW_MWMECHANICS_ATTACKTYPE_H
+#define OPENMW_MWMECHANICS_ATTACKTYPE_H
+
+namespace MWMechanics
+{
+    enum class AttackType
+    {
+        NoAttack,
+        Any,
+        Chop,
+        Slash,
+        Thrust
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/autocalcspell.cpp b/apps/openmw/mwmechanics/autocalcspell.cpp
index 6581aacdd2..5bab25fbe5 100644
--- a/apps/openmw/mwmechanics/autocalcspell.cpp
+++ b/apps/openmw/mwmechanics/autocalcspell.cpp
@@ -74,7 +74,8 @@ namespace MWMechanics
             ESM::RefId school;
             float skillTerm;
             calcWeakestSchool(&spell, actorSkills, school, skillTerm);
-            assert(!school.empty());
+            if (school.empty())
+                continue;
             SchoolCaps& cap = schoolCaps[school];
 
             if (cap.mReachedLimit && spellCost <= cap.mMinCost)
@@ -220,7 +221,7 @@ namespace MWMechanics
         for (const auto& spellEffect : spell->mEffects.mList)
         {
             const ESM::MagicEffect* magicEffect
-                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(spellEffect.mEffectID);
+                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(spellEffect.mData.mEffectID);
             static const int iAutoSpellAttSkillMin = MWBase::Environment::get()
                                                          .getESMStore()
                                                          ->get<ESM::GameSetting>()
@@ -229,7 +230,7 @@ namespace MWMechanics
 
             if ((magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill))
             {
-                ESM::RefId skill = ESM::Skill::indexToRefId(spellEffect.mSkill);
+                ESM::RefId skill = ESM::Skill::indexToRefId(spellEffect.mData.mSkill);
                 auto found = actorSkills.find(skill);
                 if (found == actorSkills.end() || found->second.getBase() < iAutoSpellAttSkillMin)
                     return false;
@@ -237,7 +238,7 @@ namespace MWMechanics
 
             if ((magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute))
             {
-                ESM::RefId attribute = ESM::Attribute::indexToRefId(spellEffect.mAttribute);
+                ESM::RefId attribute = ESM::Attribute::indexToRefId(spellEffect.mData.mAttribute);
                 auto found = actorAttributes.find(attribute);
                 if (found == actorAttributes.end() || found->second.getBase() < iAutoSpellAttSkillMin)
                     return false;
@@ -252,22 +253,22 @@ namespace MWMechanics
     {
         // Morrowind for some reason uses a formula slightly different from magicka cost calculation
         float minChance = std::numeric_limits<float>::max();
-        for (const ESM::ENAMstruct& effect : spell->mEffects.mList)
+        for (const ESM::IndexedENAMstruct& effect : spell->mEffects.mList)
         {
             const ESM::MagicEffect* magicEffect
-                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effect.mEffectID);
+                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effect.mData.mEffectID);
 
             int minMagn = 1;
             int maxMagn = 1;
             if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
             {
-                minMagn = effect.mMagnMin;
-                maxMagn = effect.mMagnMax;
+                minMagn = effect.mData.mMagnMin;
+                maxMagn = effect.mData.mMagnMax;
             }
 
             int duration = 0;
             if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
-                duration = effect.mDuration;
+                duration = effect.mData.mDuration;
             if (!(magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce))
                 duration = std::max(1, duration);
 
@@ -280,10 +281,10 @@ namespace MWMechanics
             float x = 0.5 * (std::max(1, minMagn) + std::max(1, maxMagn));
             x *= 0.1 * magicEffect->mData.mBaseCost;
             x *= 1 + duration;
-            x += 0.05 * std::max(1, effect.mArea) * magicEffect->mData.mBaseCost;
+            x += 0.05 * std::max(1, effect.mData.mArea) * magicEffect->mData.mBaseCost;
             x *= fEffectCostMult;
 
-            if (effect.mRange == ESM::RT_Target)
+            if (effect.mData.mRange == ESM::RT_Target)
                 x *= 1.5f;
 
             float s = 0.f;
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 823dd0f598..c0359881b6 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -20,6 +20,7 @@
 #include "character.hpp"
 
 #include <array>
+#include <unordered_set>
 
 #include <components/esm/records.hpp>
 #include <components/misc/mathutil.hpp>
@@ -35,6 +36,7 @@
 #include "../mwrender/animation.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -269,7 +271,7 @@ namespace
             case CharState_IdleSwim:
                 return Priority_SwimIdle;
             case CharState_IdleSneak:
-                priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_SneakIdleLowerBody;
+                priority[MWRender::BoneGroup_LowerBody] = Priority_SneakIdleLowerBody;
                 [[fallthrough]];
             default:
                 return priority;
@@ -353,6 +355,7 @@ namespace MWMechanics
     {
         clearStateAnimation(mCurrentMovement);
         mMovementState = CharState_None;
+        mMovementAnimationHasMovement = false;
     }
 
     void CharacterController::resetCurrentIdleState()
@@ -442,8 +445,8 @@ namespace MWMechanics
         {
             mHitState = CharState_Block;
             priority = Priority_Hit;
-            priority[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
-            priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
+            priority[MWRender::BoneGroup_LeftArm] = Priority_Block;
+            priority[MWRender::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
             startKey = "block start";
             stopKey = "block stop";
         }
@@ -480,8 +483,8 @@ namespace MWMechanics
             return;
         }
 
-        mAnimation->play(
-            mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
+        playBlendedAnimation(mCurrentHit, priority, MWRender::BlendMask_All, true, 1, startKey, stopKey, 0.0f,
+            std::numeric_limits<uint32_t>::max());
     }
 
     void CharacterController::refreshJumpAnims(JumpingState jump, bool force)
@@ -500,7 +503,7 @@ namespace MWMechanics
         std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
         std::string jumpAnimName = "jump";
         jumpAnimName += weapShortGroup;
-        MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
+        MWRender::Animation::BlendMask jumpmask = MWRender::BlendMask_All;
         if (!weapShortGroup.empty() && !mAnimation->hasAnimation(jumpAnimName))
             jumpAnimName = fallbackShortWeaponGroup("jump", &jumpmask);
 
@@ -518,10 +521,10 @@ namespace MWMechanics
 
         mCurrentJump = jumpAnimName;
         if (mJumpState == JumpState_InAir)
-            mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false, 1.0f, startAtLoop ? "loop start" : "start",
-                "stop", 0.f, ~0ul);
+            playBlendedAnimation(jumpAnimName, Priority_Jump, jumpmask, false, 1.0f,
+                startAtLoop ? "loop start" : "start", "stop", 0.f, std::numeric_limits<uint32_t>::max());
         else if (mJumpState == JumpState_Landing)
-            mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true, 1.0f, "loop stop", "stop", 0.0f, 0);
+            playBlendedAnimation(jumpAnimName, Priority_Jump, jumpmask, true, 1.0f, "loop stop", "stop", 0.0f, 0);
     }
 
     bool CharacterController::onOpen() const
@@ -537,8 +540,8 @@ namespace MWMechanics
             if (mAnimation->isPlaying("containerclose"))
                 return false;
 
-            mAnimation->play("containeropen", Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f,
-                "start", "stop", 0.f, 0);
+            mAnimation->play(
+                "containeropen", Priority_Scripted, MWRender::BlendMask_All, false, 1.0f, "start", "stop", 0.f, 0);
             if (mAnimation->isPlaying("containeropen"))
                 return false;
         }
@@ -558,8 +561,8 @@ namespace MWMechanics
             if (animPlaying)
                 startPoint = 1.f - complete;
 
-            mAnimation->play("containerclose", Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f,
-                "start", "stop", startPoint, 0);
+            mAnimation->play("containerclose", Priority_Scripted, MWRender::BlendMask_All, false, 1.0f, "start", "stop",
+                startPoint, 0);
         }
     }
 
@@ -598,7 +601,7 @@ namespace MWMechanics
         if (!isRealWeapon(mWeaponType))
         {
             if (blendMask != nullptr)
-                *blendMask = MWRender::Animation::BlendMask_LowerBody;
+                *blendMask = MWRender::BlendMask_LowerBody;
 
             return baseGroupName;
         }
@@ -617,13 +620,13 @@ namespace MWMechanics
 
         // Special case for crossbows - we should apply 1h animations a fallback only for lower body
         if (mWeaponType == ESM::Weapon::MarksmanCrossbow && blendMask != nullptr)
-            *blendMask = MWRender::Animation::BlendMask_LowerBody;
+            *blendMask = MWRender::BlendMask_LowerBody;
 
         if (!mAnimation->hasAnimation(groupName))
         {
             groupName = baseGroupName;
             if (blendMask != nullptr)
-                *blendMask = MWRender::Animation::BlendMask_LowerBody;
+                *blendMask = MWRender::BlendMask_LowerBody;
         }
 
         return groupName;
@@ -656,7 +659,7 @@ namespace MWMechanics
             }
         }
 
-        MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
+        MWRender::Animation::BlendMask movemask = MWRender::BlendMask_All;
 
         std::string_view weapShortGroup = getWeaponShortGroup(mWeaponType);
 
@@ -682,7 +685,7 @@ namespace MWMechanics
             if (!mAnimation->hasAnimation(weapMovementAnimName))
                 weapMovementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
 
-            movementAnimName = weapMovementAnimName;
+            movementAnimName = std::move(weapMovementAnimName);
         }
 
         if (!mAnimation->hasAnimation(movementAnimName))
@@ -705,10 +708,10 @@ namespace MWMechanics
         if (!mCurrentMovement.empty() && movementAnimName == mCurrentMovement)
             mAnimation->getInfo(mCurrentMovement, &startpoint);
 
-        mMovementAnimationControlled = true;
+        mMovementAnimationHasMovement = true;
 
         clearStateAnimation(mCurrentMovement);
-        mCurrentMovement = movementAnimName;
+        mCurrentMovement = std::move(movementAnimName);
 
         // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
         // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
@@ -743,12 +746,12 @@ namespace MWMechanics
                 bool sneaking = mMovementState == CharState_SneakForward || mMovementState == CharState_SneakBack
                     || mMovementState == CharState_SneakLeft || mMovementState == CharState_SneakRight;
                 mMovementAnimSpeed = (sneaking ? 33.5452f : (isRunning() ? 222.857f : 154.064f));
-                mMovementAnimationControlled = false;
+                mMovementAnimationHasMovement = false;
             }
         }
 
-        mAnimation->play(
-            mCurrentMovement, Priority_Movement, movemask, false, 1.f, "start", "stop", startpoint, ~0ul, true);
+        playBlendedAnimation(mCurrentMovement, Priority_Movement, movemask, false, 1.f, "start", "stop", startpoint,
+            std::numeric_limits<uint32_t>::max(), true);
     }
 
     void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
@@ -776,7 +779,7 @@ namespace MWMechanics
         }
 
         MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
-        size_t numLoops = std::numeric_limits<size_t>::max();
+        size_t numLoops = std::numeric_limits<uint32_t>::max();
 
         // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
         // "idle"+weapon or "idle".
@@ -796,7 +799,7 @@ namespace MWMechanics
                 weapIdleGroup += weapShortGroup;
                 if (!mAnimation->hasAnimation(weapIdleGroup))
                     weapIdleGroup = fallbackShortWeaponGroup(idleGroup);
-                idleGroup = weapIdleGroup;
+                idleGroup = std::move(weapIdleGroup);
 
                 // play until the Loop Stop key 2 to 5 times, then play until the Stop key
                 // this replicates original engine behavior for the "Idle1h" 1st-person animation
@@ -818,16 +821,16 @@ namespace MWMechanics
             mAnimation->getInfo(mCurrentIdle, &startPoint);
 
         clearStateAnimation(mCurrentIdle);
-        mCurrentIdle = idleGroup;
-        mAnimation->play(mCurrentIdle, priority, MWRender::Animation::BlendMask_All, false, 1.0f, "start", "stop",
-            startPoint, numLoops, true);
+        mCurrentIdle = std::move(idleGroup);
+        playBlendedAnimation(
+            mCurrentIdle, priority, MWRender::BlendMask_All, false, 1.0f, "start", "stop", startPoint, numLoops, true);
     }
 
     void CharacterController::refreshCurrentAnims(
         CharacterState idle, CharacterState movement, JumpingState jump, bool force)
     {
-        // If the current animation is persistent, do not touch it
-        if (isPersistentAnimPlaying())
+        // If the current animation is scripted, do not touch it
+        if (isScriptedAnimPlaying())
             return;
 
         refreshHitRecoilAnims();
@@ -852,10 +855,9 @@ namespace MWMechanics
         resetCurrentHitState();
         resetCurrentIdleState();
         resetCurrentJumpState();
-        mMovementAnimationControlled = true;
 
-        mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::BlendMask_All, false, 1.0f, "start",
-            "stop", startpoint, 0);
+        playBlendedAnimation(
+            mCurrentDeath, Priority_Death, MWRender::BlendMask_All, false, 1.0f, "start", "stop", startpoint, 0);
     }
 
     CharacterState CharacterController::chooseRandomDeathState() const
@@ -882,7 +884,7 @@ namespace MWMechanics
             mDeathState = chooseRandomDeathState();
 
         // Do not interrupt scripted animation by death
-        if (isPersistentAnimPlaying())
+        if (isScriptedAnimPlaying())
             return;
 
         playDeath(startpoint, mDeathState);
@@ -997,6 +999,8 @@ namespace MWMechanics
     {
         std::string_view evt = key->second;
 
+        MWBase::Environment::get().getLuaManager()->animationTextKey(mPtr, key->second);
+
         if (evt.substr(0, 7) == "sound: ")
         {
             MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
@@ -1056,17 +1060,23 @@ namespace MWMechanics
         std::string_view action = evt.substr(groupname.size() + 2);
         if (action == "equip attach")
         {
-            if (groupname == "shield")
-                mAnimation->showCarriedLeft(true);
-            else
-                mAnimation->showWeapons(true);
+            if (mUpperBodyState == UpperBodyState::Equipping)
+            {
+                if (groupname == "shield")
+                    mAnimation->showCarriedLeft(true);
+                else
+                    mAnimation->showWeapons(true);
+            }
         }
         else if (action == "unequip detach")
         {
-            if (groupname == "shield")
-                mAnimation->showCarriedLeft(false);
-            else
-                mAnimation->showWeapons(false);
+            if (mUpperBodyState == UpperBodyState::Unequipping)
+            {
+                if (groupname == "shield")
+                    mAnimation->showCarriedLeft(false);
+                else
+                    mAnimation->showWeapons(false);
+            }
         }
         else if (action == "chop hit" || action == "slash hit" || action == "thrust hit" || action == "hit")
         {
@@ -1151,8 +1161,8 @@ namespace MWMechanics
         else if (groupname == "spellcast" && action == mAttackType + " release")
         {
             if (mCanCast)
-                MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingManualSpell);
-            mCastingManualSpell = false;
+                MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingScriptedSpell);
+            mCastingScriptedSpell = false;
             mCanCast = false;
         }
         else if (groupname == "containeropen" && action == "loot")
@@ -1166,9 +1176,14 @@ namespace MWMechanics
 
     void CharacterController::updateIdleStormState(bool inwater) const
     {
-        if (!mAnimation->hasAnimation("idlestorm") || mUpperBodyState != UpperBodyState::None || inwater)
+        if (!mAnimation->hasAnimation("idlestorm"))
+            return;
+
+        bool animPlaying = mAnimation->isPlaying("idlestorm");
+        if (mUpperBodyState != UpperBodyState::None || inwater)
         {
-            mAnimation->disable("idlestorm");
+            if (animPlaying)
+                mAnimation->disable("idlestorm");
             return;
         }
 
@@ -1181,10 +1196,11 @@ namespace MWMechanics
             characterDirection.normalize();
             if (stormDirection * characterDirection < -0.5f)
             {
-                if (!mAnimation->isPlaying("idlestorm"))
+                if (!animPlaying)
                 {
-                    int mask = MWRender::Animation::BlendMask_Torso | MWRender::Animation::BlendMask_RightArm;
-                    mAnimation->play("idlestorm", Priority_Storm, mask, true, 1.0f, "start", "stop", 0.0f, ~0ul);
+                    int mask = MWRender::BlendMask_Torso | MWRender::BlendMask_RightArm;
+                    playBlendedAnimation("idlestorm", Priority_Storm, mask, true, 1.0f, "start", "stop", 0.0f,
+                        std::numeric_limits<uint32_t>::max(), true);
                 }
                 else
                 {
@@ -1194,7 +1210,7 @@ namespace MWMechanics
             }
         }
 
-        if (mAnimation->isPlaying("idlestorm"))
+        if (animPlaying)
         {
             mAnimation->setLoopingEnabled("idlestorm", false);
         }
@@ -1243,6 +1259,10 @@ namespace MWMechanics
 
     bool CharacterController::updateWeaponState()
     {
+        // If the current animation is scripted, we can't do anything here.
+        if (isScriptedAnimPlaying())
+            return false;
+
         const auto world = MWBase::Environment::get().getWorld();
         auto& prng = world->getPrng();
         MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
@@ -1312,8 +1332,8 @@ namespace MWMechanics
                 if (mAnimation->isPlaying("shield"))
                     mAnimation->disable("shield");
 
-                mAnimation->play("torch", Priority_Torch, MWRender::Animation::BlendMask_LeftArm, false, 1.0f, "start",
-                    "stop", 0.0f, std::numeric_limits<size_t>::max(), true);
+                playBlendedAnimation("torch", Priority_Torch, MWRender::BlendMask_LeftArm, false, 1.0f, "start", "stop",
+                    0.0f, std::numeric_limits<uint32_t>::max(), true);
             }
             else if (mAnimation->isPlaying("torch"))
             {
@@ -1321,10 +1341,14 @@ namespace MWMechanics
             }
         }
 
-        // For biped actors, blend weapon animations with lower body animations with higher priority
-        MWRender::Animation::AnimPriority priorityWeapon(Priority_Weapon);
+        MWRender::Animation::AnimPriority priorityWeapon(Priority_Default);
         if (cls.isBipedal(mPtr))
-            priorityWeapon[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
+        {
+            // For bipeds, blend weapon animations with lower body animations with higher priority
+            // For non-bipeds, movement takes priority
+            priorityWeapon = Priority_Weapon;
+            priorityWeapon[MWRender::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
+        }
 
         bool forcestateupdate = false;
 
@@ -1346,7 +1370,7 @@ namespace MWMechanics
         if (!isKnockedOut() && !isKnockedDown() && !isRecovery())
         {
             std::string weapgroup;
-            if ((!isWerewolf || mWeaponType != ESM::Weapon::Spell) && weaptype != mWeaponType
+            if (((!isWerewolf && cls.isBipedal(mPtr)) || mWeaponType != ESM::Weapon::Spell) && weaptype != mWeaponType
                 && mUpperBodyState <= UpperBodyState::AttackWindUp && mUpperBodyState != UpperBodyState::Unequipping
                 && !isStillWeapon)
             {
@@ -1355,19 +1379,20 @@ namespace MWMechanics
                 {
                     // Note: we do not disable unequipping animation automatically to avoid body desync
                     weapgroup = getWeaponAnimation(mWeaponType);
-                    int unequipMask = MWRender::Animation::BlendMask_All;
+                    int unequipMask = MWRender::BlendMask_All;
                     bool useShieldAnims = mAnimation->useShieldAnimations();
                     if (useShieldAnims && mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell
                         && !(mWeaponType == ESM::Weapon::None && weaptype == ESM::Weapon::Spell))
                     {
-                        unequipMask = unequipMask | ~MWRender::Animation::BlendMask_LeftArm;
-                        mAnimation->play("shield", Priority_Block, MWRender::Animation::BlendMask_LeftArm, true, 1.0f,
+                        unequipMask = unequipMask | ~MWRender::BlendMask_LeftArm;
+                        playBlendedAnimation("shield", Priority_Block, MWRender::BlendMask_LeftArm, true, 1.0f,
                             "unequip start", "unequip stop", 0.0f, 0);
                     }
                     else if (mWeaponType == ESM::Weapon::HandToHand)
                         mAnimation->showCarriedLeft(false);
 
-                    mAnimation->play(
+                    mAnimation->disable(weapgroup);
+                    playBlendedAnimation(
                         weapgroup, priorityWeapon, unequipMask, false, 1.0f, "unequip start", "unequip stop", 0.0f, 0);
                     mUpperBodyState = UpperBodyState::Unequipping;
 
@@ -1413,16 +1438,19 @@ namespace MWMechanics
                         if (weaptype != ESM::Weapon::None)
                         {
                             mAnimation->showWeapons(false);
-                            int equipMask = MWRender::Animation::BlendMask_All;
+                            int equipMask = MWRender::BlendMask_All;
                             if (useShieldAnims && weaptype != ESM::Weapon::Spell)
                             {
-                                equipMask = equipMask | ~MWRender::Animation::BlendMask_LeftArm;
-                                mAnimation->play("shield", Priority_Block, MWRender::Animation::BlendMask_LeftArm, true,
-                                    1.0f, "equip start", "equip stop", 0.0f, 0);
+                                equipMask = equipMask | ~MWRender::BlendMask_LeftArm;
+                                playBlendedAnimation("shield", Priority_Block, MWRender::BlendMask_LeftArm, true, 1.0f,
+                                    "equip start", "equip stop", 0.0f, 0);
                             }
 
-                            mAnimation->play(
-                                weapgroup, priorityWeapon, equipMask, true, 1.0f, "equip start", "equip stop", 0.0f, 0);
+                            if (weaptype != ESM::Weapon::Spell || cls.isBipedal(mPtr))
+                            {
+                                playBlendedAnimation(weapgroup, priorityWeapon, equipMask, true, 1.0f, "equip start",
+                                    "equip stop", 0.0f, 0);
+                            }
                             mUpperBodyState = UpperBodyState::Equipping;
 
                             // If we do not have the "equip attach" key, show weapon manually.
@@ -1476,10 +1504,6 @@ namespace MWMechanics
                 sndMgr->stopSound3D(mPtr, wolfRun);
         }
 
-        // Combat for actors with persistent animations obviously will be buggy
-        if (isPersistentAnimPlaying())
-            return forcestateupdate;
-
         float complete = 0.f;
         bool animPlaying = false;
         ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
@@ -1516,9 +1540,9 @@ namespace MWMechanics
                     bool isMagicItem = false;
 
                     // Play hand VFX and allow castSpell use (assuming an animation is going to be played) if
-                    // spellcasting is successful. Manual spellcasting bypasses restrictions.
+                    // spellcasting is successful. Scripted spellcasting bypasses restrictions.
                     MWWorld::SpellCastState spellCastResult = MWWorld::SpellCastState::Success;
-                    if (!mCastingManualSpell)
+                    if (!mCastingScriptedSpell)
                         spellCastResult = world->startSpellCast(mPtr);
                     mCanCast = spellCastResult == MWWorld::SpellCastState::Success;
 
@@ -1548,9 +1572,9 @@ namespace MWMechanics
                     else if (!spellid.empty() && spellCastResult != MWWorld::SpellCastState::PowerAlreadyUsed)
                     {
                         world->breakInvisibility(mPtr);
-                        MWMechanics::CastSpell cast(mPtr, {}, false, mCastingManualSpell);
+                        MWMechanics::CastSpell cast(mPtr, {}, false, mCastingScriptedSpell);
 
-                        const std::vector<ESM::ENAMstruct>* effects{ nullptr };
+                        const std::vector<ESM::IndexedENAMstruct>* effects{ nullptr };
                         const MWWorld::ESMStore& store = world->getStore();
                         if (isMagicItem)
                         {
@@ -1564,66 +1588,64 @@ namespace MWMechanics
                             effects = &spell->mEffects.mList;
                             cast.playSpellCastingEffects(spell);
                         }
-                        if (mCanCast)
+                        if (!effects->empty())
                         {
-                            const ESM::MagicEffect* effect = store.get<ESM::MagicEffect>().find(
-                                effects->back().mEffectID); // use last effect of list for color of VFX_Hands
-
-                            const ESM::Static* castStatic
-                                = world->getStore().get<ESM::Static>().find(ESM::RefId::stringRefId("VFX_Hands"));
-
-                            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
-                            if (!effects->empty())
+                            if (mCanCast)
                             {
+                                const ESM::MagicEffect* effect = store.get<ESM::MagicEffect>().find(
+                                    effects->back().mData.mEffectID); // use last effect of list for color of VFX_Hands
+
+                                const ESM::Static* castStatic
+                                    = world->getStore().get<ESM::Static>().find(ESM::RefId::stringRefId("VFX_Hands"));
+
+                                const VFS::Path::Normalized castStaticModel
+                                    = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(castStatic->mModel));
+
                                 if (mAnimation->getNode("Bip01 L Hand"))
                                     mAnimation->addEffect(
-                                        Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), -1, false,
-                                        "Bip01 L Hand", effect->mParticle);
+                                        castStaticModel.value(), "", false, "Bip01 L Hand", effect->mParticle);
 
                                 if (mAnimation->getNode("Bip01 R Hand"))
                                     mAnimation->addEffect(
-                                        Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), -1, false,
-                                        "Bip01 R Hand", effect->mParticle);
+                                        castStaticModel.value(), "", false, "Bip01 R Hand", effect->mParticle);
                             }
-                        }
+                            // first effect used for casting animation
+                            const ESM::ENAMstruct& firstEffect = effects->front().mData;
 
-                        const ESM::ENAMstruct& firstEffect = effects->at(0); // first effect used for casting animation
-
-                        std::string startKey;
-                        std::string stopKey;
-                        if (isRandomAttackAnimation(mCurrentWeapon))
-                        {
-                            startKey = "start";
-                            stopKey = "stop";
-                            if (mCanCast)
-                                world->castSpell(
-                                    mPtr, mCastingManualSpell); // No "release" text key to use, so cast immediately
-                            mCastingManualSpell = false;
-                            mCanCast = false;
-                        }
-                        else
-                        {
-                            switch (firstEffect.mRange)
+                            std::string startKey;
+                            std::string stopKey;
+                            if (isRandomAttackAnimation(mCurrentWeapon))
                             {
-                                case 0:
-                                    mAttackType = "self";
-                                    break;
-                                case 1:
-                                    mAttackType = "touch";
-                                    break;
-                                case 2:
-                                    mAttackType = "target";
-                                    break;
+                                startKey = "start";
+                                stopKey = "stop";
+                                if (mCanCast)
+                                    world->castSpell(mPtr,
+                                        mCastingScriptedSpell); // No "release" text key to use, so cast immediately
+                                mCastingScriptedSpell = false;
+                                mCanCast = false;
                             }
+                            else
+                            {
+                                switch (firstEffect.mRange)
+                                {
+                                    case 0:
+                                        mAttackType = "self";
+                                        break;
+                                    case 1:
+                                        mAttackType = "touch";
+                                        break;
+                                    case 2:
+                                        mAttackType = "target";
+                                        break;
+                                }
 
-                            startKey = mAttackType + " start";
-                            stopKey = mAttackType + " stop";
+                                startKey = mAttackType + " start";
+                                stopKey = mAttackType + " stop";
+                            }
+                            playBlendedAnimation(mCurrentWeapon, priorityWeapon, MWRender::BlendMask_All, false, 1,
+                                startKey, stopKey, 0.0f, 0);
+                            mUpperBodyState = UpperBodyState::Casting;
                         }
-
-                        mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false, 1,
-                            startKey, stopKey, 0.0f, 0);
-                        mUpperBodyState = UpperBodyState::Casting;
                     }
                     else
                     {
@@ -1635,6 +1657,10 @@ namespace MWMechanics
                     std::string startKey = "start";
                     std::string stopKey = "stop";
 
+                    MWBase::LuaManager::ActorControls* actorControls
+                        = MWBase::Environment::get().getLuaManager()->getActorControls(mPtr);
+                    const bool aiInactive
+                        = actorControls->mDisableAI || !MWBase::Environment::get().getMechanicsManager()->isAIActive();
                     if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon))
                     {
                         if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
@@ -1658,6 +1684,13 @@ namespace MWMechanics
                                 mAttackType = getMovementBasedAttackType();
                             }
                         }
+                        else if (aiInactive)
+                        {
+                            mAttackType = getDesiredAttackType();
+                            if (mAttackType == "")
+                                mAttackType = getRandomAttackType();
+                        }
+
                         // else if (mPtr != getPlayer()) use mAttackType set by AiCombat
                         startKey = mAttackType + ' ' + startKey;
                         stopKey = mAttackType + " max attack";
@@ -1672,8 +1705,8 @@ namespace MWMechanics
                     mAttackVictim = MWWorld::Ptr();
                     mAttackHitPos = osg::Vec3f();
 
-                    mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false,
-                        weapSpeed, startKey, stopKey, 0.0f, 0);
+                    playBlendedAnimation(mCurrentWeapon, priorityWeapon, MWRender::BlendMask_All, false, weapSpeed,
+                        startKey, stopKey, 0.0f, 0);
                 }
             }
 
@@ -1746,7 +1779,7 @@ namespace MWMechanics
                 }
 
                 mAnimation->disable(mCurrentWeapon);
-                mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false, weapSpeed,
+                playBlendedAnimation(mCurrentWeapon, priorityWeapon, MWRender::BlendMask_All, false, weapSpeed,
                     mAttackType + " max attack", mAttackType + ' ' + hit, startPoint, 0);
             }
 
@@ -1772,11 +1805,7 @@ namespace MWMechanics
 
                 if (animPlaying)
                     mAnimation->disable(mCurrentWeapon);
-                MWRender::Animation::AnimPriority priorityFollow(priorityWeapon);
-                // Follow animations have lower priority than movement for non-biped creatures, logic be damned
-                if (!cls.isBipedal(mPtr))
-                    priorityFollow = Priority_Default;
-                mAnimation->play(mCurrentWeapon, priorityFollow, MWRender::Animation::BlendMask_All, false, weapSpeed,
+                playBlendedAnimation(mCurrentWeapon, priorityWeapon, MWRender::BlendMask_All, false, weapSpeed,
                     mAttackType + ' ' + start, mAttackType + ' ' + stop, 0.0f, 0);
                 mUpperBodyState = UpperBodyState::AttackEnd;
 
@@ -1847,23 +1876,70 @@ namespace MWMechanics
 
     void CharacterController::updateAnimQueue()
     {
-        if (mAnimQueue.size() > 1)
+        if (mAnimQueue.empty())
+            return;
+
+        if (!mAnimation->isPlaying(mAnimQueue.front().mGroup))
         {
-            if (mAnimation->isPlaying(mAnimQueue.front().mGroup) == false)
+            // Playing animations through mwscript is weird. If an animation is
+            // a looping animation (idle or other cyclical animations), then they
+            // will end as expected. However, if they are non-looping animations, they
+            // will stick around forever or until another animation appears in the queue.
+            bool shouldPlayOrRestart = mAnimQueue.size() > 1;
+            if (shouldPlayOrRestart || !mAnimQueue.front().mScripted
+                || (mAnimQueue.front().mLoopCount == 0 && mAnimQueue.front().mLooping))
             {
+                mAnimation->setPlayScriptedOnly(false);
                 mAnimation->disable(mAnimQueue.front().mGroup);
                 mAnimQueue.pop_front();
-
-                bool loopfallback = mAnimQueue.front().mGroup.starts_with("idle");
-                mAnimation->play(mAnimQueue.front().mGroup, Priority_Default, MWRender::Animation::BlendMask_All, false,
-                    1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback);
+                shouldPlayOrRestart = true;
             }
+            else
+                // A non-looping animation will stick around forever, so only restart if the animation
+                // actually was removed for some reason.
+                shouldPlayOrRestart = !mAnimation->getInfo(mAnimQueue.front().mGroup)
+                    && mAnimation->hasAnimation(mAnimQueue.front().mGroup);
+
+            if (shouldPlayOrRestart)
+            {
+                // Move on to the remaining items of the queue
+                playAnimQueue();
+            }
+        }
+        else
+        {
+            float complete;
+            size_t loopcount;
+            mAnimation->getInfo(mAnimQueue.front().mGroup, &complete, nullptr, &loopcount);
+            mAnimQueue.front().mLoopCount = loopcount;
+            mAnimQueue.front().mTime = complete;
         }
 
         if (!mAnimQueue.empty())
             mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, mAnimQueue.size() <= 1);
     }
 
+    void CharacterController::playAnimQueue(bool loopStart)
+    {
+        if (!mAnimQueue.empty())
+        {
+            clearStateAnimation(mCurrentIdle);
+            mIdleState = CharState_SpecialIdle;
+            auto priority = mAnimQueue.front().mScripted ? Priority_Scripted : Priority_Default;
+            mAnimation->setPlayScriptedOnly(mAnimQueue.front().mScripted);
+            if (mAnimQueue.front().mScripted)
+                mAnimation->play(mAnimQueue.front().mGroup, priority, MWRender::BlendMask_All, false,
+                    mAnimQueue.front().mSpeed, (loopStart ? "loop start" : mAnimQueue.front().mStartKey),
+                    mAnimQueue.front().mStopKey, mAnimQueue.front().mTime, mAnimQueue.front().mLoopCount,
+                    mAnimQueue.front().mLooping);
+            else
+                playBlendedAnimation(mAnimQueue.front().mGroup, priority, MWRender::BlendMask_All, false,
+                    mAnimQueue.front().mSpeed, (loopStart ? "loop start" : mAnimQueue.front().mStartKey),
+                    mAnimQueue.front().mStopKey, mAnimQueue.front().mTime, mAnimQueue.front().mLoopCount,
+                    mAnimQueue.front().mLooping);
+        }
+    }
+
     void CharacterController::update(float duration)
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
@@ -1884,7 +1960,7 @@ namespace MWMechanics
         {
             const ESM::NPC* npc = mPtr.get<ESM::NPC>()->mBase;
             const ESM::Race* race = world->getStore().get<ESM::Race>().find(npc->mRace);
-            float weight = npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
+            float weight = npc->isMale() ? race->mData.mMaleWeight : race->mData.mFemaleWeight;
             scale *= weight;
         }
 
@@ -1978,7 +2054,8 @@ namespace MWMechanics
             float effectiveRotation = rot.z();
             bool canMove = cls.getMaxSpeed(mPtr) > 0;
             const bool turnToMovementDirection = Settings::game().mTurnToMovementDirection;
-            if (!turnToMovementDirection || isFirstPersonPlayer)
+            const bool isBiped = mPtr.getClass().isBipedal(mPtr);
+            if (!isBiped || !turnToMovementDirection || isFirstPersonPlayer)
             {
                 movementSettings.mIsStrafing = std::abs(vec.x()) > std::abs(vec.y()) * 2;
                 stats.setSideMovementAngle(0);
@@ -2018,7 +2095,7 @@ namespace MWMechanics
             vec.x() *= speed;
             vec.y() *= speed;
 
-            if (isKnockedOut() || isKnockedDown() || isRecovery())
+            if (isKnockedOut() || isKnockedDown() || isRecovery() || isScriptedAnimPlaying())
                 vec = osg::Vec3f();
 
             CharacterState movestate = CharState_None;
@@ -2036,7 +2113,7 @@ namespace MWMechanics
                         mSecondsOfSwimming += duration;
                         while (mSecondsOfSwimming > 1)
                         {
-                            cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 1);
+                            cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, ESM::Skill::Athletics_SwimOneSecond);
                             mSecondsOfSwimming -= 1;
                         }
                     }
@@ -2045,7 +2122,7 @@ namespace MWMechanics
                         mSecondsOfRunning += duration;
                         while (mSecondsOfRunning > 1)
                         {
-                            cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 0);
+                            cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, ESM::Skill::Athletics_RunOneSecond);
                             mSecondsOfRunning -= 1;
                         }
                     }
@@ -2092,6 +2169,15 @@ namespace MWMechanics
 
             bool wasInJump = mInJump;
             mInJump = false;
+            const float jumpHeight = cls.getJump(mPtr);
+            if (jumpHeight <= 0.f || sneak || inwater || flying || !solid)
+            {
+                vec.z() = 0.f;
+                // Following code might assign some vertical movement regardless, need to reset this manually
+                // This is used for jumping detection
+                movementSettings.mPosition[2] = 0;
+            }
+
             if (!inwater && !flying && solid)
             {
                 // In the air (either getting up —ascending part of jump— or falling).
@@ -2110,20 +2196,16 @@ namespace MWMechanics
                     vec.z() = 0.0f;
                 }
                 // Started a jump.
-                else if (mJumpState != JumpState_InAir && vec.z() > 0.f && !sneak)
+                else if (mJumpState != JumpState_InAir && vec.z() > 0.f)
                 {
-                    float z = cls.getJump(mPtr);
-                    if (z > 0.f)
+                    mInJump = true;
+                    if (vec.x() == 0 && vec.y() == 0)
+                        vec.z() = jumpHeight;
+                    else
                     {
-                        mInJump = true;
-                        if (vec.x() == 0 && vec.y() == 0)
-                            vec.z() = z;
-                        else
-                        {
-                            osg::Vec3f lat(vec.x(), vec.y(), 0.0f);
-                            lat.normalize();
-                            vec = osg::Vec3f(lat.x(), lat.y(), 1.0f) * z * 0.707f;
-                        }
+                        osg::Vec3f lat(vec.x(), vec.y(), 0.0f);
+                        lat.normalize();
+                        vec = osg::Vec3f(lat.x(), lat.y(), 1.0f) * jumpHeight * 0.707f;
                     }
                 }
             }
@@ -2163,7 +2245,7 @@ namespace MWMechanics
                         {
                             // report acrobatics progression
                             if (isPlayer)
-                                cls.skillUsageSucceeded(mPtr, ESM::Skill::Acrobatics, 1);
+                                cls.skillUsageSucceeded(mPtr, ESM::Skill::Acrobatics, ESM::Skill::Acrobatics_Fall);
                         }
                     }
 
@@ -2185,8 +2267,6 @@ namespace MWMechanics
                 if (mAnimation->isPlaying(mCurrentJump))
                     jumpstate = JumpState_Landing;
 
-                vec.x() *= scale;
-                vec.y() *= scale;
                 vec.z() = 0.0f;
 
                 if (movementSettings.mIsStrafing)
@@ -2219,7 +2299,7 @@ namespace MWMechanics
 
                     // It seems only bipedal actors use turning animations.
                     // Also do not use turning animations in the first-person view and when sneaking.
-                    if (!sneak && !isFirstPersonPlayer && mPtr.getClass().isBipedal(mPtr))
+                    if (!sneak && !isFirstPersonPlayer && isBiped)
                     {
                         if (effectiveRotation > rotationThreshold)
                             movestate = inwater ? CharState_SwimTurnRight : CharState_TurnRight;
@@ -2229,7 +2309,7 @@ namespace MWMechanics
                 }
             }
 
-            if (turnToMovementDirection && !isFirstPersonPlayer
+            if (turnToMovementDirection && !isFirstPersonPlayer && isBiped
                 && (movestate == CharState_SwimRunForward || movestate == CharState_SwimWalkForward
                     || movestate == CharState_SwimRunBack || movestate == CharState_SwimWalkBack))
             {
@@ -2263,7 +2343,7 @@ namespace MWMechanics
             }
             else
             {
-                if (mPtr.getClass().isBipedal(mPtr))
+                if (isBiped)
                 {
                     if (mTurnAnimationThreshold > 0)
                         mTurnAnimationThreshold -= duration;
@@ -2286,17 +2366,16 @@ namespace MWMechanics
                 jumpstate = JumpState_None;
             }
 
-            if (mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle))
-            {
-                if (inwater)
-                    idlestate = CharState_IdleSwim;
-                else if (sneak && !mInJump)
-                    idlestate = CharState_IdleSneak;
-                else
-                    idlestate = CharState_Idle;
-            }
+            updateAnimQueue();
+            if (!mAnimQueue.empty())
+                idlestate = CharState_SpecialIdle;
+            else if (sneak && !mInJump)
+                idlestate = CharState_IdleSneak;
             else
-                updateAnimQueue();
+                idlestate = CharState_Idle;
+
+            if (inwater)
+                idlestate = CharState_IdleSwim;
 
             if (!mSkipAnim)
             {
@@ -2304,9 +2383,6 @@ namespace MWMechanics
                 updateIdleStormState(inwater);
             }
 
-            if (mInJump)
-                mMovementAnimationControlled = false;
-
             if (isTurning())
             {
                 // Adjust animation speed from 1.0 to 1.5 multiplier
@@ -2323,7 +2399,8 @@ namespace MWMechanics
                 const float speedMult = speed / mMovementAnimSpeed;
                 mAnimation->adjustSpeedMult(mCurrentMovement, std::min(maxSpeedMult, speedMult));
                 // Make sure the actual speed is the "expected" speed even though the animation is slower
-                scale *= std::max(1.f, speedMult / maxSpeedMult);
+                if (isMovementAnimationControlled())
+                    scale *= std::max(1.f, speedMult / maxSpeedMult);
             }
 
             if (!mSkipAnim)
@@ -2342,20 +2419,17 @@ namespace MWMechanics
                     }
                 }
 
-                if (!mMovementAnimationControlled)
-                    world->queueMovement(mPtr, vec);
+                updateHeadTracking(duration);
             }
 
             movement = vec;
             movementSettings.mPosition[0] = movementSettings.mPosition[1] = 0;
+
+            // Can't reset jump state (mPosition[2]) here in full; we don't know for sure whether the PhysicsSystem will
+            // actually handle it in this frame due to the fixed minimum timestep used for the physics update. It will
+            // be reset in PhysicsSystem::move once the jump is handled.
             if (movement.z() == 0.f)
                 movementSettings.mPosition[2] = 0;
-            // Can't reset jump state (mPosition[2]) here in full; we don't know for sure whether the PhysicSystem will
-            // actually handle it in this frame due to the fixed minimum timestep used for the physics update. It will
-            // be reset in PhysicSystem::move once the jump is handled.
-
-            if (!mSkipAnim)
-                updateHeadTracking(duration);
         }
         else if (cls.getCreatureStats(mPtr).isDead())
         {
@@ -2369,50 +2443,63 @@ namespace MWMechanics
             }
         }
 
-        bool isPersist = isPersistentAnimPlaying();
-        osg::Vec3f moved = mAnimation->runAnimation(mSkipAnim && !isPersist ? 0.f : duration);
-        if (duration > 0.0f)
-            moved /= duration;
-        else
-            moved = osg::Vec3f(0.f, 0.f, 0.f);
+        osg::Vec3f movementFromAnimation
+            = mAnimation->runAnimation(mSkipAnim && !isScriptedAnimPlaying() ? 0.f : duration);
 
-        moved.x() *= scale;
-        moved.y() *= scale;
-
-        // Ensure we're moving in generally the right direction...
-        if (speed > 0.f && moved != osg::Vec3f())
+        if (mPtr.getClass().isActor() && !isScriptedAnimPlaying())
         {
-            float l = moved.length();
-            if (std::abs(movement.x() - moved.x()) > std::abs(moved.x()) / 2
-                || std::abs(movement.y() - moved.y()) > std::abs(moved.y()) / 2
-                || std::abs(movement.z() - moved.z()) > std::abs(moved.z()) / 2)
+            if (isMovementAnimationControlled())
             {
-                moved = movement;
-                // For some creatures getSpeed doesn't work, so we adjust speed to the animation.
-                // TODO: Fix Creature::getSpeed.
-                float newLength = moved.length();
-                if (newLength > 0 && !cls.isNpc())
-                    moved *= (l / newLength);
-            }
-        }
+                if (duration != 0.f && movementFromAnimation != osg::Vec3f())
+                {
+                    movementFromAnimation /= duration;
 
-        if (mFloatToSurface && cls.isActor())
-        {
-            if (cls.getCreatureStats(mPtr).isDead()
-                || (!godmode
-                    && cls.getCreatureStats(mPtr)
-                            .getMagicEffects()
-                            .getOrDefault(ESM::MagicEffect::Paralyze)
-                            .getModifier()
-                        > 0))
+                    // Ensure we're moving in the right general direction.
+                    // In vanilla, all horizontal movement is taken from animations, even when moving diagonally (which
+                    // doesn't have a corresponding animation). So to achieve diagonal movement, we have to rotate the
+                    // movement taken from the animation to the intended direction.
+                    //
+                    // Note that while a complete movement animation cycle will have a well defined direction, no
+                    // individual frame will, and therefore we have to determine the direction based on the currently
+                    // playing cycle instead.
+                    if (speed > 0.f)
+                    {
+                        float animMovementAngle = getAnimationMovementDirection();
+                        float targetMovementAngle = std::atan2(-movement.x(), movement.y());
+                        float diff = targetMovementAngle - animMovementAngle;
+                        movementFromAnimation = osg::Quat(diff, osg::Vec3f(0, 0, 1)) * movementFromAnimation;
+                    }
+
+                    movement = movementFromAnimation;
+                }
+                else
+                {
+                    movement = osg::Vec3f();
+                }
+            }
+            else if (mSkipAnim)
             {
-                moved.z() = 1.0;
+                movement = osg::Vec3f();
             }
-        }
 
-        // Update movement
-        if (mMovementAnimationControlled && mPtr.getClass().isActor())
-            world->queueMovement(mPtr, moved);
+            if (mFloatToSurface && world->isSwimming(mPtr))
+            {
+                if (cls.getCreatureStats(mPtr).isDead()
+                    || (!godmode
+                        && cls.getCreatureStats(mPtr)
+                                .getMagicEffects()
+                                .getOrDefault(ESM::MagicEffect::Paralyze)
+                                .getModifier()
+                            > 0))
+                {
+                    movement.z() = 1.0;
+                }
+            }
+
+            movement.x() *= scale;
+            movement.y() *= scale;
+            world->queueMovement(mPtr, movement);
+        }
 
         mSkipAnim = false;
 
@@ -2426,7 +2513,8 @@ namespace MWMechanics
         state.mScriptedAnims.clear();
         for (AnimationQueue::const_iterator iter = mAnimQueue.begin(); iter != mAnimQueue.end(); ++iter)
         {
-            if (!iter->mPersist)
+            // TODO: Probably want to presist lua animations too
+            if (!iter->mScripted)
                 continue;
 
             ESM::AnimationState::ScriptedAnimation anim;
@@ -2434,10 +2522,11 @@ namespace MWMechanics
 
             if (iter == mAnimQueue.begin())
             {
-                anim.mLoopCount = mAnimation->getCurrentLoopCount(anim.mGroup);
                 float complete;
-                mAnimation->getInfo(anim.mGroup, &complete, nullptr);
+                size_t loopcount;
+                mAnimation->getInfo(anim.mGroup, &complete, nullptr, &loopcount);
                 anim.mTime = complete;
+                anim.mLoopCount = loopcount;
             }
             else
             {
@@ -2461,47 +2550,58 @@ namespace MWMechanics
             {
                 AnimationQueueEntry entry;
                 entry.mGroup = iter->mGroup;
-                entry.mLoopCount = iter->mLoopCount;
-                entry.mPersist = true;
+                entry.mLoopCount
+                    = static_cast<uint32_t>(std::min<uint64_t>(iter->mLoopCount, std::numeric_limits<uint32_t>::max()));
+                entry.mLooping = mAnimation->isLoopingAnimation(entry.mGroup);
+                entry.mScripted = true;
+                entry.mStartKey = "start";
+                entry.mStopKey = "stop";
+                entry.mSpeed = 1.f;
+                entry.mTime = iter->mTime;
+                if (iter->mAbsolute)
+                {
+                    float start = mAnimation->getTextKeyTime(iter->mGroup + ": start");
+                    float stop = mAnimation->getTextKeyTime(iter->mGroup + ": stop");
+                    float time = std::clamp(iter->mTime, start, stop);
+                    entry.mTime = (time - start) / (stop - start);
+                }
 
                 mAnimQueue.push_back(entry);
             }
 
-            const ESM::AnimationState::ScriptedAnimation& anim = state.mScriptedAnims.front();
-            float complete = anim.mTime;
-            if (anim.mAbsolute)
-            {
-                float start = mAnimation->getTextKeyTime(anim.mGroup + ": start");
-                float stop = mAnimation->getTextKeyTime(anim.mGroup + ": stop");
-                float time = std::clamp(anim.mTime, start, stop);
-                complete = (time - start) / (stop - start);
-            }
-
-            clearStateAnimation(mCurrentIdle);
-            mIdleState = CharState_SpecialIdle;
-
-            bool loopfallback = mAnimQueue.front().mGroup.starts_with("idle");
-            mAnimation->play(anim.mGroup, Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f, "start",
-                "stop", complete, anim.mLoopCount, loopfallback);
+            playAnimQueue();
         }
     }
 
-    bool CharacterController::playGroup(std::string_view groupname, int mode, int count, bool persist)
+    void CharacterController::playBlendedAnimation(const std::string& groupname, const MWRender::AnimPriority& priority,
+        int blendMask, bool autodisable, float speedmult, std::string_view start, std::string_view stop,
+        float startpoint, uint32_t loops, bool loopfallback) const
+    {
+        if (mLuaAnimations)
+            MWBase::Environment::get().getLuaManager()->playAnimation(mPtr, groupname, priority, blendMask, autodisable,
+                speedmult, start, stop, startpoint, loops, loopfallback);
+        else
+            mAnimation->play(
+                groupname, priority, blendMask, autodisable, speedmult, start, stop, startpoint, loops, loopfallback);
+    }
+
+    bool CharacterController::playGroup(std::string_view groupname, int mode, uint32_t count, bool scripted)
     {
         if (!mAnimation || !mAnimation->hasAnimation(groupname))
             return false;
 
-        // We should not interrupt persistent animations by non-persistent ones
-        if (isPersistentAnimPlaying() && !persist)
+        // We should not interrupt scripted animations with non-scripted ones
+        if (isScriptedAnimPlaying() && !scripted)
             return true;
 
-        // If this animation is a looped animation (has a "loop start" key) that is already playing
+        bool looping = mAnimation->isLoopingAnimation(groupname);
+
+        // If this animation is a looped animation that is already playing
         // and has not yet reached the end of the loop, allow it to continue animating with its existing loop count
         // and remove any other animations that were queued.
         // This emulates observed behavior from the original allows the script "OutsideBanner" to animate banners
         // correctly.
-        if (!mAnimQueue.empty() && mAnimQueue.front().mGroup == groupname
-            && mAnimation->getTextKeyTime(mAnimQueue.front().mGroup + ": loop start") >= 0
+        if (!mAnimQueue.empty() && mAnimQueue.front().mGroup == groupname && looping
             && mAnimation->isPlaying(groupname))
         {
             float endOfLoop = mAnimation->getTextKeyTime(mAnimQueue.front().mGroup + ": loop stop");
@@ -2516,51 +2616,92 @@ namespace MWMechanics
             }
         }
 
-        count = std::max(count, 1);
+        // The loop count in vanilla is weird.
+        // if played with a count of 0, all objects play exactly once from start to stop.
+        // But if the count is x > 0, actors and non-actors behave differently. actors will loop
+        // exactly x times, while non-actors will loop x+1 instead.
+        if (mPtr.getClass().isActor() && count > 0)
+            count--;
 
         AnimationQueueEntry entry;
         entry.mGroup = groupname;
-        entry.mLoopCount = count - 1;
-        entry.mPersist = persist;
+        entry.mLoopCount = count;
+        entry.mTime = 0.f;
+        // "PlayGroup idle" is a special case, used to remove to stop scripted animations playing
+        entry.mScripted = (scripted && groupname != "idle");
+        entry.mLooping = looping;
+        entry.mSpeed = 1.f;
+        entry.mStartKey = ((mode == 2) ? "loop start" : "start");
+        entry.mStopKey = "stop";
+
+        bool playImmediately = false;
 
         if (mode != 0 || mAnimQueue.empty() || !isAnimPlaying(mAnimQueue.front().mGroup))
         {
-            clearAnimQueue(persist);
+            clearAnimQueue(scripted);
 
-            clearStateAnimation(mCurrentIdle);
-
-            mIdleState = CharState_SpecialIdle;
-            bool loopfallback = entry.mGroup.starts_with("idle");
-            mAnimation->play(groupname, persist && groupname != "idle" ? Priority_Persistent : Priority_Default,
-                MWRender::Animation::BlendMask_All, false, 1.0f, ((mode == 2) ? "loop start" : "start"), "stop", 0.0f,
-                count - 1, loopfallback);
+            playImmediately = true;
         }
         else
         {
             mAnimQueue.resize(1);
         }
 
-        // "PlayGroup idle" is a special case, used to remove to stop scripted animations playing
-        if (groupname == "idle")
-            entry.mPersist = false;
-
         mAnimQueue.push_back(entry);
 
+        if (playImmediately)
+            playAnimQueue(mode == 2);
+
         return true;
     }
 
+    bool CharacterController::playGroupLua(std::string_view groupname, float speed, std::string_view startKey,
+        std::string_view stopKey, uint32_t loops, bool forceLoop)
+    {
+        // Note: In mwscript, "idle" is a special case used to clear the anim queue.
+        // In lua we offer an explicit clear method instead so this method does not treat "idle" special.
+
+        if (!mAnimation || !mAnimation->hasAnimation(groupname))
+            return false;
+
+        AnimationQueueEntry entry;
+        entry.mGroup = groupname;
+        // Note: MWScript gives one less loop to actors than non-actors.
+        // But this is the Lua version. We don't need to reproduce this weirdness here.
+        entry.mLoopCount = loops;
+        entry.mStartKey = startKey;
+        entry.mStopKey = stopKey;
+        entry.mLooping = mAnimation->isLoopingAnimation(groupname) || forceLoop;
+        entry.mScripted = true;
+        entry.mSpeed = speed;
+        entry.mTime = 0;
+
+        if (mAnimQueue.size() > 1)
+            mAnimQueue.resize(1);
+        mAnimQueue.push_back(entry);
+
+        if (mAnimQueue.size() == 1)
+            playAnimQueue();
+
+        return true;
+    }
+
+    void CharacterController::enableLuaAnimations(bool enable)
+    {
+        mLuaAnimations = enable;
+    }
+
     void CharacterController::skipAnim()
     {
         mSkipAnim = true;
     }
 
-    bool CharacterController::isPersistentAnimPlaying() const
+    bool CharacterController::isScriptedAnimPlaying() const
     {
+        // If the front of the anim queue is scripted, morrowind treats it as if it's
+        // still playing even if it's actually done.
         if (!mAnimQueue.empty())
-        {
-            const AnimationQueueEntry& first = mAnimQueue.front();
-            return first.mPersist && isAnimPlaying(first.mGroup);
-        }
+            return mAnimQueue.front().mScripted;
 
         return false;
     }
@@ -2572,21 +2713,39 @@ namespace MWMechanics
         return mAnimation->isPlaying(groupName);
     }
 
-    void CharacterController::clearAnimQueue(bool clearPersistAnims)
+    bool CharacterController::isMovementAnimationControlled() const
+    {
+        if (mHitState != CharState_None)
+            return true;
+
+        if (Settings::game().mPlayerMovementIgnoresAnimation && mPtr == getPlayer())
+            return false;
+
+        if (mInJump)
+            return false;
+
+        bool movementAnimationControlled = mIdleState != CharState_None;
+        if (mMovementState != CharState_None)
+            movementAnimationControlled = mMovementAnimationHasMovement;
+        return movementAnimationControlled;
+    }
+
+    void CharacterController::clearAnimQueue(bool clearScriptedAnims)
     {
         // Do not interrupt scripted animations, if we want to keep them
-        if ((!isPersistentAnimPlaying() || clearPersistAnims) && !mAnimQueue.empty())
+        if ((!isScriptedAnimPlaying() || clearScriptedAnims) && !mAnimQueue.empty())
             mAnimation->disable(mAnimQueue.front().mGroup);
 
-        if (clearPersistAnims)
+        if (clearScriptedAnims)
         {
+            mAnimation->setPlayScriptedOnly(false);
             mAnimQueue.clear();
             return;
         }
 
         for (AnimationQueue::iterator it = mAnimQueue.begin(); it != mAnimQueue.end();)
         {
-            if (!it->mPersist)
+            if (!it->mScripted)
                 it = mAnimQueue.erase(it);
             else
                 ++it;
@@ -2602,7 +2761,7 @@ namespace MWMechanics
         // Make sure we canceled the current attack or spellcasting,
         // because we disabled attack animations anyway.
         mCanCast = false;
-        mCastingManualSpell = false;
+        mCastingScriptedSpell = false;
         setAttackingOrSpell(false);
         if (mUpperBodyState != UpperBodyState::None)
             mUpperBodyState = UpperBodyState::WeaponEquipped;
@@ -2614,6 +2773,8 @@ namespace MWMechanics
             playRandomDeath();
         }
 
+        updateAnimQueue();
+
         mAnimation->runAnimation(0.f);
     }
 
@@ -2652,18 +2813,20 @@ namespace MWMechanics
         // as it's extremely spread out (ActiveSpells, Spells, InventoryStore effects, etc...) so we do it here.
 
         // Stop any effects that are no longer active
-        std::vector<int> effects;
-        mAnimation->getLoopingEffects(effects);
+        std::vector<std::string_view> effects = mAnimation->getLoopingEffects();
 
-        for (int effectId : effects)
+        for (std::string_view effectId : effects)
         {
-            if (mPtr.getClass().getCreatureStats(mPtr).isDeathAnimationFinished()
-                || mPtr.getClass()
-                        .getCreatureStats(mPtr)
-                        .getMagicEffects()
-                        .getOrDefault(MWMechanics::EffectKey(effectId))
-                        .getMagnitude()
-                    <= 0)
+            auto index = ESM::MagicEffect::indexNameToIndex(effectId);
+
+            if (index >= 0
+                && (mPtr.getClass().getCreatureStats(mPtr).isDeathAnimationFinished()
+                    || mPtr.getClass()
+                            .getCreatureStats(mPtr)
+                            .getMagicEffects()
+                            .getOrDefault(MWMechanics::EffectKey(index))
+                            .getMagnitude()
+                        <= 0))
                 mAnimation->removeEffect(effectId);
         }
     }
@@ -2750,7 +2913,7 @@ namespace MWMechanics
 
     bool CharacterController::isCastingSpell() const
     {
-        return mCastingManualSpell || mUpperBodyState == UpperBodyState::Casting;
+        return mCastingScriptedSpell || mUpperBodyState == UpperBodyState::Casting;
     }
 
     bool CharacterController::isReadyToBlock() const
@@ -2804,10 +2967,10 @@ namespace MWMechanics
         mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(attackingOrSpell);
     }
 
-    void CharacterController::castSpell(const ESM::RefId& spellId, bool manualSpell)
+    void CharacterController::castSpell(const ESM::RefId& spellId, bool scriptedSpell)
     {
         setAttackingOrSpell(true);
-        mCastingManualSpell = manualSpell;
+        mCastingScriptedSpell = scriptedSpell;
         ActionSpell action = ActionSpell(spellId);
         action.prepare(mPtr);
     }
@@ -2852,6 +3015,11 @@ namespace MWMechanics
         return mPtr.getClass().getCreatureStats(mPtr).getAttackingOrSpell();
     }
 
+    std::string_view CharacterController::getDesiredAttackType() const
+    {
+        return mPtr.getClass().getCreatureStats(mPtr).getAttackType();
+    }
+
     void CharacterController::setActive(int active) const
     {
         mAnimation->setActive(active);
@@ -2883,6 +3051,39 @@ namespace MWMechanics
             MWBase::Environment::get().getSoundManager()->playSound3D(mPtr, *soundId, volume, pitch);
     }
 
+    float CharacterController::getAnimationMovementDirection() const
+    {
+        switch (mMovementState)
+        {
+            case CharState_RunLeft:
+            case CharState_SneakLeft:
+            case CharState_SwimWalkLeft:
+            case CharState_SwimRunLeft:
+            case CharState_WalkLeft:
+                return osg::PI_2f;
+            case CharState_RunRight:
+            case CharState_SneakRight:
+            case CharState_SwimWalkRight:
+            case CharState_SwimRunRight:
+            case CharState_WalkRight:
+                return -osg::PI_2f;
+            case CharState_RunForward:
+            case CharState_SneakForward:
+            case CharState_SwimRunForward:
+            case CharState_SwimWalkForward:
+            case CharState_WalkForward:
+                return mAnimation->getLegsYawRadians();
+            case CharState_RunBack:
+            case CharState_SneakBack:
+            case CharState_SwimWalkBack:
+            case CharState_SwimRunBack:
+            case CharState_WalkBack:
+                return mAnimation->getLegsYawRadians() - osg::PIf;
+            default:
+                return 0.0f;
+        }
+    }
+
     void CharacterController::updateHeadTracking(float duration)
     {
         const osg::Node* head = mAnimation->getNode("Bip01 Head");
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 5a676e3f6d..f043419a81 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -40,7 +40,7 @@ namespace MWMechanics
         Priority_Torch,
         Priority_Storm,
         Priority_Death,
-        Priority_Persistent,
+        Priority_Scripted,
 
         Num_Priorities
     };
@@ -134,11 +134,17 @@ namespace MWMechanics
         struct AnimationQueueEntry
         {
             std::string mGroup;
-            size_t mLoopCount;
-            bool mPersist;
+            uint32_t mLoopCount;
+            float mTime;
+            bool mLooping;
+            bool mScripted;
+            std::string mStartKey;
+            std::string mStopKey;
+            float mSpeed;
         };
         typedef std::deque<AnimationQueueEntry> AnimationQueue;
         AnimationQueue mAnimQueue;
+        bool mLuaAnimations{ false };
 
         CharacterState mIdleState{ CharState_None };
         std::string mCurrentIdle;
@@ -147,7 +153,7 @@ namespace MWMechanics
         std::string mCurrentMovement;
         float mMovementAnimSpeed{ 0.f };
         bool mAdjustMovementAnimSpeed{ false };
-        bool mMovementAnimationControlled{ true };
+        bool mMovementAnimationHasMovement{ false };
 
         CharacterState mDeathState{ CharState_None };
         std::string mCurrentDeath;
@@ -186,7 +192,7 @@ namespace MWMechanics
 
         bool mCanCast{ false };
 
-        bool mCastingManualSpell{ false };
+        bool mCastingScriptedSpell{ false };
 
         bool mIsMovingBackward{ false };
         osg::Vec2f mSmoothedSpeed;
@@ -207,17 +213,16 @@ namespace MWMechanics
         void refreshMovementAnims(CharacterState movement, bool force = false);
         void refreshIdleAnims(CharacterState idle, bool force = false);
 
-        void clearAnimQueue(bool clearPersistAnims = false);
-
         bool updateWeaponState();
         void updateIdleStormState(bool inwater) const;
 
         std::string chooseRandomAttackAnimation() const;
         static bool isRandomAttackAnimation(std::string_view group);
 
-        bool isPersistentAnimPlaying() const;
+        bool isMovementAnimationControlled() const;
 
         void updateAnimQueue();
+        void playAnimQueue(bool useLoopStart = false);
 
         void updateHeadTracking(float duration);
 
@@ -242,6 +247,8 @@ namespace MWMechanics
         bool getAttackingOrSpell() const;
         void setAttackingOrSpell(bool attackingOrSpell) const;
 
+        std::string_view getDesiredAttackType() const;
+
         void prepareHit();
 
     public:
@@ -269,9 +276,17 @@ namespace MWMechanics
         void persistAnimationState() const;
         void unpersistAnimationState();
 
-        bool playGroup(std::string_view groupname, int mode, int count, bool persist = false);
+        void playBlendedAnimation(const std::string& groupname, const MWRender::AnimPriority& priority, int blendMask,
+            bool autodisable, float speedmult, std::string_view start, std::string_view stop, float startpoint,
+            uint32_t loops, bool loopfallback = false) const;
+        bool playGroup(std::string_view groupname, int mode, uint32_t count, bool scripted = false);
+        bool playGroupLua(std::string_view groupname, float speed, std::string_view startKey, std::string_view stopKey,
+            uint32_t loops, bool forceLoop);
+        void enableLuaAnimations(bool enable);
         void skipAnim();
         bool isAnimPlaying(std::string_view groupName) const;
+        bool isScriptedAnimPlaying() const;
+        void clearAnimQueue(bool clearScriptedAnims = false);
 
         enum KillResult
         {
@@ -299,7 +314,7 @@ namespace MWMechanics
         bool isAttackingOrSpell() const;
 
         void setVisibility(float visibility) const;
-        void castSpell(const ESM::RefId& spellId, bool manualSpell = false);
+        void castSpell(const ESM::RefId& spellId, bool scriptedSpell = false);
         void setAIAttackType(std::string_view attackType);
         static std::string_view getRandomAttackType();
 
@@ -318,6 +333,8 @@ namespace MWMechanics
 
         void playSwishSound() const;
 
+        float getAnimationMovementDirection() const;
+
         MWWorld::MovementDirectionFlags getSupportedMovementDirections() const;
     };
 }
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 1c9c0c1dee..5d283214a3 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -10,6 +10,7 @@
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadsoun.hpp>
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -134,6 +135,15 @@ namespace MWMechanics
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         if (Misc::Rng::roll0to99(prng) < x)
         {
+            MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
+            const ESM::RefId skill = shield->getClass().getEquipmentSkill(*shield);
+            if (skill == ESM::Skill::LightArmor)
+                sndMgr->playSound3D(blocker, ESM::RefId::stringRefId("Light Armor Hit"), 1.0f, 1.0f);
+            else if (skill == ESM::Skill::MediumArmor)
+                sndMgr->playSound3D(blocker, ESM::RefId::stringRefId("Medium Armor Hit"), 1.0f, 1.0f);
+            else if (skill == ESM::Skill::HeavyArmor)
+                sndMgr->playSound3D(blocker, ESM::RefId::stringRefId("Heavy Armor Hit"), 1.0f, 1.0f);
+
             // Reduce shield durability by incoming damage
             int shieldhealth = shield->getClass().getItemHealth(*shield);
 
@@ -157,7 +167,7 @@ namespace MWMechanics
             blockerStats.setBlock(true);
 
             if (blocker == getPlayer())
-                blocker.getClass().skillUsageSucceeded(blocker, ESM::Skill::Block, 0);
+                blocker.getClass().skillUsageSucceeded(blocker, ESM::Skill::Block, ESM::Skill::Block_Success);
 
             return true;
         }
@@ -230,19 +240,22 @@ namespace MWMechanics
 
             if (Misc::Rng::roll0to99(world->getPrng()) >= getHitChance(attacker, victim, skillValue))
             {
-                victim.getClass().onHit(victim, damage, false, projectile, attacker, osg::Vec3f(), false);
+                victim.getClass().onHit(victim, damage, false, projectile, attacker, osg::Vec3f(), false,
+                    MWMechanics::DamageSourceType::Ranged);
                 MWMechanics::reduceWeaponCondition(damage, false, weapon, attacker);
                 return;
             }
 
-            const unsigned char* attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
-            damage = attack[0] + ((attack[1] - attack[0]) * attackStrength); // Bow/crossbow damage
-
-            // Arrow/bolt damage
-            // NB in case of thrown weapons, we are applying the damage twice since projectile == weapon
-            attack = projectile.get<ESM::Weapon>()->mBase->mData.mChop;
-            damage += attack[0] + ((attack[1] - attack[0]) * attackStrength);
-
+            {
+                const auto& attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
+                damage = attack[0] + ((attack[1] - attack[0]) * attackStrength); // Bow/crossbow damage
+            }
+            {
+                // Arrow/bolt damage
+                // NB in case of thrown weapons, we are applying the damage twice since projectile == weapon
+                const auto& attack = projectile.get<ESM::Weapon>()->mBase->mData.mChop;
+                damage += attack[0] + ((attack[1] - attack[0]) * attackStrength);
+            }
             adjustWeaponDamage(damage, weapon, attacker);
         }
 
@@ -256,7 +269,7 @@ namespace MWMechanics
             applyWerewolfDamageMult(victim, projectile, damage);
 
             if (attacker == getPlayer())
-                attacker.getClass().skillUsageSucceeded(attacker, weaponSkill, 0);
+                attacker.getClass().skillUsageSucceeded(attacker, weaponSkill, ESM::Skill::Weapon_SuccessfulHit);
 
             const MWMechanics::AiSequence& sequence = victim.getClass().getCreatureStats(victim).getAiSequence();
             bool unaware = attacker == getPlayer() && !sequence.isInCombat()
@@ -286,7 +299,8 @@ namespace MWMechanics
                     victim.getClass().getContainerStore(victim).add(projectile, 1);
             }
 
-            victim.getClass().onHit(victim, damage, true, projectile, attacker, hitPosition, true);
+            victim.getClass().onHit(
+                victim, damage, true, projectile, attacker, hitPosition, true, MWMechanics::DamageSourceType::Ranged);
         }
     }
 
@@ -551,4 +565,142 @@ namespace MWMechanics
             return distanceIgnoreZ(lhs, rhs);
         return distance(lhs, rhs);
     }
+
+    float getDistanceToBounds(const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
+    {
+        osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
+        osg::Vec3f targetPos(target.getRefData().getPosition().asVec3());
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+
+        float dist = (targetPos - actorPos).length();
+        dist -= world->getHalfExtents(actor).y();
+        dist -= world->getHalfExtents(target).y();
+        return dist;
+    }
+
+    std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(const MWWorld::Ptr& actor, float reach)
+    {
+        // Lasciate ogne speranza, voi ch'entrate
+        MWWorld::Ptr result;
+        osg::Vec3f hitPos;
+        float minDist = std::numeric_limits<float>::max();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Store<ESM::GameSetting>& store = world->getStore().get<ESM::GameSetting>();
+
+        // These GMSTs are not in degrees. They're tolerance angle sines multiplied by 90.
+        // With the default values of 60, the actual tolerance angles are roughly 41.8 degrees.
+        // Don't think too hard about it. In this place, thinking can cause permanent damage to your mental health.
+        const float fCombatAngleXY = store.find("fCombatAngleXY")->mValue.getFloat() / 90.f;
+        const float fCombatAngleZ = store.find("fCombatAngleZ")->mValue.getFloat() / 90.f;
+
+        const ESM::Position& posdata = actor.getRefData().getPosition();
+        const osg::Vec3f actorPos(posdata.asVec3());
+        const osg::Vec3f actorDirXY = osg::Quat(posdata.rot[2], osg::Vec3(0, 0, -1)) * osg::Vec3f(0, 1, 0);
+        // Only the player can look up, apparently.
+        const float actorVerticalAngle = actor == getPlayer() ? -std::sin(posdata.rot[0]) : 0.f;
+        const float actorEyeLevel = world->getHalfExtents(actor, true).z() * 2.f * 0.85f;
+        const osg::Vec3f actorEyePos{ actorPos.x(), actorPos.y(), actorPos.z() + actorEyeLevel };
+        const bool canMoveByZ = canActorMoveByZAxis(actor);
+
+        // The player can target any active actor, non-playable actors only target their targets
+        std::vector<MWWorld::Ptr> targets;
+        if (actor != getPlayer())
+            actor.getClass().getCreatureStats(actor).getAiSequence().getCombatTargets(targets);
+        else
+            MWBase::Environment::get().getMechanicsManager()->getActorsInRange(
+                actorPos, Settings::game().mActorsProcessingRange, targets);
+
+        for (MWWorld::Ptr& target : targets)
+        {
+            if (actor == target || target.getClass().getCreatureStats(target).isDead())
+                continue;
+            const float dist = getDistanceToBounds(actor, target);
+            const osg::Vec3f targetPos(target.getRefData().getPosition().asVec3());
+            if (dist >= reach || dist >= minDist || std::abs(targetPos.z() - actorPos.z()) >= reach)
+                continue;
+
+            // Horizontal angle checks.
+            osg::Vec2f actorToTargetXY{ targetPos.x() - actorPos.x(), targetPos.y() - actorPos.y() };
+            actorToTargetXY.normalize();
+
+            // Use dot product to check if the target is behind first...
+            if (actorToTargetXY.x() * actorDirXY.x() + actorToTargetXY.y() * actorDirXY.y() <= 0.f)
+                continue;
+
+            // And then perp dot product to calculate the hit angle sine.
+            // This gives us a horizontal hit range of [-asin(fCombatAngleXY / 90); asin(fCombatAngleXY / 90)]
+            if (std::abs(actorToTargetXY.x() * actorDirXY.y() - actorToTargetXY.y() * actorDirXY.x()) > fCombatAngleXY)
+                continue;
+
+            // Vertical angle checks. Nice cliff racer hack, Todd.
+            if (!canMoveByZ)
+            {
+                // The idea is that the body should always be possible to hit.
+                // fCombatAngleZ is the tolerance for hitting the target's feet or head.
+                osg::Vec3f actorToTargetFeet = targetPos - actorEyePos;
+                osg::Vec3f actorToTargetHead = actorToTargetFeet;
+                actorToTargetFeet.normalize();
+                actorToTargetHead.z() += world->getHalfExtents(target, true).z() * 2.f;
+                actorToTargetHead.normalize();
+
+                if (actorVerticalAngle - actorToTargetHead.z() > fCombatAngleZ
+                    || actorVerticalAngle - actorToTargetFeet.z() < -fCombatAngleZ)
+                    continue;
+            }
+
+            // Gotta use physics somehow!
+            if (!world->getLOS(actor, target))
+                continue;
+
+            minDist = dist;
+            result = target;
+        }
+
+        // This hit position is currently used for spawning the blood effect.
+        // Morrowind does this elsewhere, but roughly at the same time
+        // and it would be hard to track the original hit results outside of this function
+        // without code duplication
+        // The idea is to use a random point on a plane in front of the target
+        // that is defined by its width and height
+        if (!result.isEmpty())
+        {
+            osg::Vec3f resultPos(result.getRefData().getPosition().asVec3());
+            osg::Vec3f dirToActor = actorPos - resultPos;
+            dirToActor.normalize();
+
+            hitPos = resultPos + dirToActor * world->getHalfExtents(result).y();
+            // -25% to 25% of width
+            float xOffset = Misc::Rng::deviate(0.f, 0.25f, world->getPrng());
+            // 20% to 100% of height
+            float zOffset = Misc::Rng::deviate(0.6f, 0.4f, world->getPrng());
+            hitPos.x() += world->getHalfExtents(result).x() * 2.f * xOffset;
+            hitPos.z() += world->getHalfExtents(result).z() * 2.f * zOffset;
+        }
+
+        return std::make_pair(result, hitPos);
+    }
+
+    bool friendlyHit(const MWWorld::Ptr& attacker, const MWWorld::Ptr& target, bool complain)
+    {
+        const MWWorld::Ptr& player = getPlayer();
+        if (attacker != player)
+            return false;
+
+        std::set<MWWorld::Ptr> followersAttacker;
+        MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(attacker, followersAttacker);
+        if (followersAttacker.find(target) == followersAttacker.end())
+            return false;
+
+        MWMechanics::CreatureStats& statsTarget = target.getClass().getCreatureStats(target);
+        if (statsTarget.getAiSequence().isInCombat())
+            return true;
+        statsTarget.friendlyHit();
+        if (statsTarget.getFriendlyHits() >= 4)
+            return false;
+
+        if (complain)
+            MWBase::Environment::get().getDialogueManager()->say(target, ESM::RefId::stringRefId("hit"));
+        return true;
+    }
+
 }
diff --git a/apps/openmw/mwmechanics/combat.hpp b/apps/openmw/mwmechanics/combat.hpp
index 2e7caf6189..92033c7e77 100644
--- a/apps/openmw/mwmechanics/combat.hpp
+++ b/apps/openmw/mwmechanics/combat.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_MECHANICS_COMBAT_H
 #define OPENMW_MECHANICS_COMBAT_H
 
+#include <utility>
+
 namespace osg
 {
     class Vec3f;
@@ -59,6 +61,13 @@ namespace MWMechanics
 
     float getAggroDistance(const MWWorld::Ptr& actor, const osg::Vec3f& lhs, const osg::Vec3f& rhs);
 
+    // Cursed distance calculation used for combat proximity and hit checks in Morrowind
+    float getDistanceToBounds(const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
+
+    // Similarly cursed hit target selection
+    std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(const MWWorld::Ptr& actor, float reach);
+
+    bool friendlyHit(const MWWorld::Ptr& attacker, const MWWorld::Ptr& target, bool complain);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 757bdf7c49..b18bca98d5 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -20,31 +20,6 @@ namespace MWMechanics
     int CreatureStats::sActorId = 0;
 
     CreatureStats::CreatureStats()
-        : mDrawState(DrawState::Nothing)
-        , mDead(false)
-        , mDeathAnimationFinished(false)
-        , mDied(false)
-        , mMurdered(false)
-        , mFriendlyHits(0)
-        , mTalkedTo(false)
-        , mAlarmed(false)
-        , mAttacked(false)
-        , mKnockdown(false)
-        , mKnockdownOneFrame(false)
-        , mKnockdownOverOneFrame(false)
-        , mHitRecovery(false)
-        , mBlock(false)
-        , mMovementFlags(0)
-        , mFallHeight(0)
-        , mLastRestock(0, 0)
-        , mGoldPool(0)
-        , mActorId(-1)
-        , mHitAttemptActorId(-1)
-        , mDeathAnimation(-1)
-        , mTimeOfDeath()
-        , mSideMovementAngle(0)
-        , mLevel(0)
-        , mAttackingOrSpell(false)
     {
         for (const ESM::Attribute& attribute : MWBase::Environment::get().getESMStore()->get<ESM::Attribute>())
         {
@@ -241,6 +216,11 @@ namespace MWMechanics
 
     bool CreatureStats::isParalyzed() const
     {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Ptr player = world->getPlayerPtr();
+        if (world->getGodModeState() && this == &player.getClass().getCreatureStats(player))
+            return false;
+
         return mMagicEffects.getOrDefault(ESM::MagicEffect::Paralyze).getMagnitude() > 0;
     }
 
@@ -319,6 +299,11 @@ namespace MWMechanics
         ++mFriendlyHits;
     }
 
+    void CreatureStats::resetFriendlyHits()
+    {
+        mFriendlyHits = 0;
+    }
+
     bool CreatureStats::hasTalkedToPlayer() const
     {
         return mTalkedTo;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index f0a834bd33..f65e1a000f 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -39,30 +39,30 @@ namespace MWMechanics
     class CreatureStats
     {
         static int sActorId;
-        DrawState mDrawState;
         std::map<ESM::RefId, AttributeValue> mAttributes;
         DynamicStat<float> mDynamic[3]; // health, magicka, fatigue
+        DrawState mDrawState = DrawState::Nothing;
         Spells mSpells;
         ActiveSpells mActiveSpells;
         MagicEffects mMagicEffects;
         Stat<int> mAiSettings[4];
         AiSequence mAiSequence;
-        bool mDead;
-        bool mDeathAnimationFinished;
-        bool mDied; // flag for OnDeath script function
-        bool mMurdered;
-        int mFriendlyHits;
-        bool mTalkedTo;
-        bool mAlarmed;
-        bool mAttacked;
-        bool mKnockdown;
-        bool mKnockdownOneFrame;
-        bool mKnockdownOverOneFrame;
-        bool mHitRecovery;
-        bool mBlock;
-        unsigned int mMovementFlags;
+        bool mDead = false;
+        bool mDeathAnimationFinished = false;
+        bool mDied = false; // flag for OnDeath script function
+        bool mMurdered = false;
+        int mFriendlyHits = 0;
+        bool mTalkedTo = false;
+        bool mAlarmed = false;
+        bool mAttacked = false;
+        bool mKnockdown = false;
+        bool mKnockdownOneFrame = false;
+        bool mKnockdownOverOneFrame = false;
+        bool mHitRecovery = false;
+        bool mBlock = false;
+        unsigned int mMovementFlags = 0;
 
-        float mFallHeight;
+        float mFallHeight = 0.f;
 
         ESM::RefId mLastHitObject; // The last object to hit this actor
         ESM::RefId mLastHitAttemptObject; // The last object to attempt to hit this actor
@@ -71,21 +71,17 @@ namespace MWMechanics
         MWWorld::TimeStamp mLastRestock;
 
         // The pool of merchant gold (not in inventory)
-        int mGoldPool;
+        int mGoldPool = 0;
 
-        int mActorId;
-        int mHitAttemptActorId; // Stores an actor that attacked this actor. Only one is stored at a time,
-                                // and it is not changed if a different actor attacks. It is cleared when combat ends.
-
-        // The index of the death animation that was played, or -1 if none played
-        signed char mDeathAnimation;
-
-        MWWorld::TimeStamp mTimeOfDeath;
+        int mActorId = -1;
+        // Stores an actor that attacked this actor. Only one is stored at a time, and it is not changed if a different
+        // actor attacks. It is cleared when combat ends.
+        int mHitAttemptActorId = -1;
 
         // The difference between view direction and lower body direction.
-        float mSideMovementAngle;
+        float mSideMovementAngle = 0;
 
-        bool mTeleported = false;
+        MWWorld::TimeStamp mTimeOfDeath;
 
     private:
         std::multimap<int, int> mSummonedCreatures; // <Effect, ActorId>
@@ -95,8 +91,15 @@ namespace MWMechanics
         std::vector<int> mSummonGraveyard;
 
     protected:
-        int mLevel;
-        bool mAttackingOrSpell;
+        std::string mAttackType;
+        int mLevel = 0;
+        bool mAttackingOrSpell = false;
+
+    private:
+        // The index of the death animation that was played, or -1 if none played
+        signed char mDeathAnimation = -1;
+
+        bool mTeleported = false;
 
     public:
         CreatureStats();
@@ -130,6 +133,7 @@ namespace MWMechanics
         const MagicEffects& getMagicEffects() const;
 
         bool getAttackingOrSpell() const { return mAttackingOrSpell; }
+        std::string_view getAttackType() const { return mAttackType; }
 
         int getLevel() const;
 
@@ -156,6 +160,8 @@ namespace MWMechanics
 
         void setAttackingOrSpell(bool attackingOrSpell) { mAttackingOrSpell = attackingOrSpell; }
 
+        void setAttackType(std::string_view attackType) { mAttackType = attackType; }
+
         void setLevel(int level);
 
         void setAiSetting(AiSetting index, Stat<int> value);
@@ -200,6 +206,8 @@ namespace MWMechanics
         void friendlyHit();
         ///< Increase number of friendly hits by one.
 
+        void resetFriendlyHits();
+
         bool hasTalkedToPlayer() const;
         ///< Has this creature talked with the player before?
 
@@ -294,7 +302,7 @@ namespace MWMechanics
         bool wasTeleported() const { return mTeleported; }
         void setTeleported(bool v) { mTeleported = v; }
 
-        const std::map<ESM::RefId, AttributeValue> getAttributes() const { return mAttributes; }
+        const std::map<ESM::RefId, AttributeValue>& getAttributes() const { return mAttributes; }
     };
 }
 
diff --git a/apps/openmw/mwmechanics/damagesourcetype.hpp b/apps/openmw/mwmechanics/damagesourcetype.hpp
new file mode 100644
index 0000000000..e140a8106f
--- /dev/null
+++ b/apps/openmw/mwmechanics/damagesourcetype.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_MWMECHANICS_DAMAGESOURCETYPE_H
+#define OPENMW_MWMECHANICS_DAMAGESOURCETYPE_H
+
+namespace MWMechanics
+{
+    enum class DamageSourceType
+    {
+        Unspecified,
+        Melee,
+        Ranged,
+        Magical,
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 13894146b3..7d0007f9e3 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -84,7 +84,8 @@ namespace MWMechanics
             if (getEnchantChance() <= (Misc::Rng::roll0to99(prng)))
                 return false;
 
-            mEnchanter.getClass().skillUsageSucceeded(mEnchanter, ESM::Skill::Enchant, 2);
+            mEnchanter.getClass().skillUsageSucceeded(
+                mEnchanter, ESM::Skill::Enchant, ESM::Skill::Enchant_CreateMagicItem);
         }
 
         enchantment.mEffects = mEffectList;
@@ -197,13 +198,13 @@ namespace MWMechanics
 
         float enchantmentCost = 0.f;
         float cost = 0.f;
-        for (const ESM::ENAMstruct& effect : mEffectList.mList)
+        for (const ESM::IndexedENAMstruct& effect : mEffectList.mList)
         {
-            float baseCost = (store.get<ESM::MagicEffect>().find(effect.mEffectID))->mData.mBaseCost;
-            int magMin = std::max(1, effect.mMagnMin);
-            int magMax = std::max(1, effect.mMagnMax);
-            int area = std::max(1, effect.mArea);
-            float duration = static_cast<float>(effect.mDuration);
+            float baseCost = (store.get<ESM::MagicEffect>().find(effect.mData.mEffectID))->mData.mBaseCost;
+            int magMin = std::max(1, effect.mData.mMagnMin);
+            int magMax = std::max(1, effect.mData.mMagnMax);
+            int area = std::max(1, effect.mData.mArea);
+            float duration = static_cast<float>(effect.mData.mDuration);
             if (mCastStyle == ESM::Enchantment::ConstantEffect)
                 duration = fEnchantmentConstantDurationMult;
 
@@ -211,7 +212,7 @@ namespace MWMechanics
 
             cost = std::max(1.f, cost);
 
-            if (effect.mRange == ESM::RT_Target)
+            if (effect.mData.mRange == ESM::RT_Target)
                 cost *= 1.5f;
 
             enchantmentCost += precise ? cost : std::floor(cost);
@@ -243,13 +244,7 @@ namespace MWMechanics
 
             for (int i = 0; i < static_cast<int>(iter->mEffects.mList.size()); ++i)
             {
-                const ESM::ENAMstruct& first = iter->mEffects.mList[i];
-                const ESM::ENAMstruct& second = toFind.mEffects.mList[i];
-
-                if (first.mEffectID != second.mEffectID || first.mArea != second.mArea || first.mRange != second.mRange
-                    || first.mSkill != second.mSkill || first.mAttribute != second.mAttribute
-                    || first.mMagnMin != second.mMagnMin || first.mMagnMax != second.mMagnMax
-                    || first.mDuration != second.mDuration)
+                if (iter->mEffects.mList[i] != toFind.mEffects.mList[i])
                 {
                     mismatch = true;
                     break;
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 0d626c9e11..c2afef7c0d 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -48,7 +48,7 @@ namespace MWMechanics
     std::string EffectKey::toString() const
     {
         const auto& store = MWBase::Environment::get().getESMStore();
-        const ESM::MagicEffect* magicEffect = store->get<ESM::MagicEffect>().search(mId);
+        const ESM::MagicEffect* magicEffect = store->get<ESM::MagicEffect>().find(mId);
         return getMagicEffectString(
             *magicEffect, store->get<ESM::Attribute>().search(mArg), store->get<ESM::Skill>().search(mArg));
     }
@@ -64,6 +64,11 @@ namespace MWMechanics
         return left.mArg < right.mArg;
     }
 
+    bool operator==(const EffectKey& left, const EffectKey& right)
+    {
+        return left.mId == right.mId && left.mArg == right.mArg;
+    }
+
     float EffectParam::getMagnitude() const
     {
         return mBase + mModifier;
diff --git a/apps/openmw/mwmechanics/magiceffects.hpp b/apps/openmw/mwmechanics/magiceffects.hpp
index b9831c0250..4fe5d9fd4e 100644
--- a/apps/openmw/mwmechanics/magiceffects.hpp
+++ b/apps/openmw/mwmechanics/magiceffects.hpp
@@ -38,6 +38,7 @@ namespace MWMechanics
     };
 
     bool operator<(const EffectKey& left, const EffectKey& right);
+    bool operator==(const EffectKey& left, const EffectKey& right);
 
     struct EffectParam
     {
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index ff720345bc..46f6440ae6 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1,5 +1,7 @@
 #include "mechanicsmanagerimp.hpp"
 
+#include <cassert>
+
 #include <osg/Stats>
 
 #include <components/misc/rng.hpp>
@@ -22,11 +24,15 @@
 
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "actor.hpp"
+#include "actors.hpp"
 #include "actorutil.hpp"
 #include "aicombat.hpp"
 #include "aipursue.hpp"
@@ -131,14 +137,9 @@ namespace MWMechanics
         for (size_t i = 0; i < player->mNpdt.mSkills.size(); ++i)
             npcStats.getSkill(ESM::Skill::indexToRefId(i)).setBase(player->mNpdt.mSkills[i]);
 
-        creatureStats.setAttribute(ESM::Attribute::Strength, player->mNpdt.mStrength);
-        creatureStats.setAttribute(ESM::Attribute::Intelligence, player->mNpdt.mIntelligence);
-        creatureStats.setAttribute(ESM::Attribute::Willpower, player->mNpdt.mWillpower);
-        creatureStats.setAttribute(ESM::Attribute::Agility, player->mNpdt.mAgility);
-        creatureStats.setAttribute(ESM::Attribute::Speed, player->mNpdt.mSpeed);
-        creatureStats.setAttribute(ESM::Attribute::Endurance, player->mNpdt.mEndurance);
-        creatureStats.setAttribute(ESM::Attribute::Personality, player->mNpdt.mPersonality);
-        creatureStats.setAttribute(ESM::Attribute::Luck, player->mNpdt.mLuck);
+        for (size_t i = 0; i < player->mNpdt.mAttributes.size(); ++i)
+            npcStats.setAttribute(ESM::Attribute::indexToRefId(i), player->mNpdt.mSkills[i]);
+
         const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore();
 
         // race
@@ -149,12 +150,7 @@ namespace MWMechanics
             bool male = (player->mFlags & ESM::NPC::Female) == 0;
 
             for (const ESM::Attribute& attribute : esmStore.get<ESM::Attribute>())
-            {
-                const ESM::Race::MaleFemale& value
-                    = race->mData.mAttributeValues[static_cast<size_t>(ESM::Attribute::refIdToIndex(attribute.mId))];
-
-                creatureStats.setAttribute(attribute.mId, male ? value.mMale : value.mFemale);
-            }
+                creatureStats.setAttribute(attribute.mId, race->mData.getAttribute(attribute.mId, male));
 
             for (const ESM::Skill& skill : esmStore.get<ESM::Skill>())
             {
@@ -266,10 +262,10 @@ namespace MWMechanics
             mObjects.addObject(ptr);
     }
 
-    void MechanicsManager::castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool manualSpell)
+    void MechanicsManager::castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool scriptedSpell)
     {
         if (ptr.getClass().isActor())
-            mActors.castSpell(ptr, spellId, manualSpell);
+            mActors.castSpell(ptr, spellId, scriptedSpell);
     }
 
     void MechanicsManager::remove(const MWWorld::Ptr& ptr, bool keepActive)
@@ -477,8 +473,8 @@ namespace MWMechanics
 
     int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp)
     {
-        const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
-        float x = static_cast<float>(npcSkill.getBaseDisposition());
+        const MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+        float x = static_cast<float>(npcStats.getBaseDisposition() + npcStats.getCrimeDispositionModifier());
 
         MWWorld::LiveCellRef<ESM::NPC>* npc = ptr.get<ESM::NPC>();
         MWWorld::Ptr playerPtr = getPlayer();
@@ -753,12 +749,27 @@ namespace MWMechanics
     }
 
     bool MechanicsManager::playAnimationGroup(
-        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist)
+        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, uint32_t number, bool scripted)
     {
         if (ptr.getClass().isActor())
-            return mActors.playAnimationGroup(ptr, groupName, mode, number, persist);
+            return mActors.playAnimationGroup(ptr, groupName, mode, number, scripted);
         else
-            return mObjects.playAnimationGroup(ptr, groupName, mode, number, persist);
+            return mObjects.playAnimationGroup(ptr, groupName, mode, number, scripted);
+    }
+    bool MechanicsManager::playAnimationGroupLua(const MWWorld::Ptr& ptr, std::string_view groupName, uint32_t loops,
+        float speed, std::string_view startKey, std::string_view stopKey, bool forceLoop)
+    {
+        if (ptr.getClass().isActor())
+            return mActors.playAnimationGroupLua(ptr, groupName, loops, speed, startKey, stopKey, forceLoop);
+        else
+            return mObjects.playAnimationGroupLua(ptr, groupName, loops, speed, startKey, stopKey, forceLoop);
+    }
+    void MechanicsManager::enableLuaAnimations(const MWWorld::Ptr& ptr, bool enable)
+    {
+        if (ptr.getClass().isActor())
+            mActors.enableLuaAnimations(ptr, enable);
+        else
+            mObjects.enableLuaAnimations(ptr, enable);
     }
     void MechanicsManager::skipAnimation(const MWWorld::Ptr& ptr)
     {
@@ -775,6 +786,14 @@ namespace MWMechanics
             return false;
     }
 
+    bool MechanicsManager::checkScriptedAnimationPlaying(const MWWorld::Ptr& ptr) const
+    {
+        if (ptr.getClass().isActor())
+            return mActors.checkScriptedAnimationPlaying(ptr);
+
+        return false;
+    }
+
     bool MechanicsManager::onOpen(const MWWorld::Ptr& ptr)
     {
         if (ptr.getClass().isActor())
@@ -795,6 +814,14 @@ namespace MWMechanics
         mObjects.persistAnimationStates();
     }
 
+    void MechanicsManager::clearAnimationQueue(const MWWorld::Ptr& ptr, bool clearScripted)
+    {
+        if (ptr.getClass().isActor())
+            mActors.clearAnimationQueue(ptr, clearScripted);
+        else
+            mObjects.clearAnimationQueue(ptr, clearScripted);
+    }
+
     void MechanicsManager::updateMagicEffects(const MWWorld::Ptr& ptr)
     {
         mActors.updateMagicEffects(ptr);
@@ -819,14 +846,12 @@ namespace MWMechanics
         mAI = true;
     }
 
-    bool MechanicsManager::isBoundItem(const MWWorld::Ptr& item)
+    namespace
     {
-        static std::set<ESM::RefId> boundItemIDCache;
-
-        // If this is empty then we haven't executed the GMST cache logic yet; or there isn't any sMagicBound* GMST's
-        // for some reason
-        if (boundItemIDCache.empty())
+        std::set<ESM::RefId> makeBoundItemIdCache()
         {
+            std::set<ESM::RefId> boundItemIDCache;
+
             // Build a list of known bound item ID's
             const MWWorld::Store<ESM::GameSetting>& gameSettings
                 = MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
@@ -843,15 +868,16 @@ namespace MWMechanics
 
                 boundItemIDCache.insert(ESM::RefId::stringRefId(currentGMSTValue));
             }
+
+            return boundItemIDCache;
         }
+    }
 
-        // Perform bound item check and assign the Flag_Bound bit if it passes
-        const ESM::RefId& tempItemID = item.getCellRef().getRefId();
+    bool MechanicsManager::isBoundItem(const MWWorld::Ptr& item)
+    {
+        static const std::set<ESM::RefId> boundItemIdCache = makeBoundItemIdCache();
 
-        if (boundItemIDCache.count(tempItemID) != 0)
-            return true;
-
-        return false;
+        return boundItemIdCache.find(item.getCellRef().getRefId()) != boundItemIdCache.end();
     }
 
     bool MechanicsManager::isAllowedToUse(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim)
@@ -1026,7 +1052,7 @@ namespace MWMechanics
             if (stolenIt == mStolenItems.end())
                 continue;
             OwnerMap& owners = stolenIt->second;
-            int itemCount = it->getRefData().getCount();
+            int itemCount = it->getCellRef().getCount();
             for (OwnerMap::iterator ownerIt = owners.begin(); ownerIt != owners.end();)
             {
                 int toRemove = std::min(itemCount, ownerIt->second);
@@ -1038,7 +1064,7 @@ namespace MWMechanics
                     ++ownerIt;
             }
 
-            int toMove = it->getRefData().getCount() - itemCount;
+            int toMove = it->getCellRef().getCount() - itemCount;
 
             containerStore.add(*it, toMove);
             store.remove(*it, toMove);
@@ -1088,15 +1114,21 @@ namespace MWMechanics
             }
         }
 
-        if (!(item.getCellRef().getRefId() == MWWorld::ContainerStore::sGoldId))
+        const bool isGold = item.getClass().isGold(item);
+        if (!isGold)
         {
             if (victim.isEmpty()
-                || (victim.getClass().isActor() && victim.getRefData().getCount() > 0
+                || (victim.getClass().isActor() && victim.getCellRef().getCount() > 0
                     && !victim.getClass().getCreatureStats(victim).isDead()))
                 mStolenItems[item.getCellRef().getRefId()][owner] += count;
         }
         if (alarm)
-            commitCrime(ptr, victim, OT_Theft, ownerCellRef->getFaction(), item.getClass().getValue(item) * count);
+        {
+            int value = count;
+            if (!isGold)
+                value *= item.getClass().getValue(item);
+            commitCrime(ptr, victim, OT_Theft, ownerCellRef->getFaction(), value);
+        }
     }
 
     bool MechanicsManager::commitCrime(const MWWorld::Ptr& player, const MWWorld::Ptr& victim, OffenseType type,
@@ -1159,9 +1191,9 @@ namespace MWMechanics
                 && !victim.getClass().getCreatureStats(victim).getAiSequence().hasPackage(AiPackageTypeId::Pursue))
                 reported = reportCrime(player, victim, type, ESM::RefId(), arg);
 
+            // TODO: combat should be started with an "unaware" flag, which makes the victim flee?
             if (!reported)
-                startCombat(victim,
-                    player); // TODO: combat should be started with an "unaware" flag, which makes the victim flee?
+                startCombat(victim, player, &playerFollowers);
         }
         return crimeSeen;
     }
@@ -1291,67 +1323,140 @@ namespace MWMechanics
             if (!canReportCrime(actor, victim, playerFollowers))
                 continue;
 
-            if (reported && actor.getClass().isClass(actor, "guard"))
+            NpcStats& observerStats = actor.getClass().getNpcStats(actor);
+
+            int alarm = observerStats.getAiSetting(AiSetting::Alarm).getBase();
+            float alarmTerm = 0.01f * alarm;
+
+            bool isActorVictim = actor == victim;
+            float dispTerm = isActorVictim ? dispVictim : disp;
+
+            bool isActorGuard = actor.getClass().isClass(actor, "guard");
+
+            int currentDisposition = getDerivedDisposition(actor);
+
+            bool isPermanent = false;
+            bool applyOnlyIfHostile = false;
+            int dispositionModifier = 0;
+            // Murdering and trespassing seem to do not affect disposition
+            if (type == OT_Theft)
+            {
+                dispositionModifier = static_cast<int>(dispTerm * alarmTerm);
+            }
+            else if (type == OT_Pickpocket)
+            {
+                if (alarm >= 100 && isActorGuard)
+                    dispositionModifier = static_cast<int>(dispTerm);
+                else if (isActorVictim && isActorGuard)
+                {
+                    isPermanent = true;
+                    dispositionModifier = static_cast<int>(dispTerm * alarmTerm);
+                }
+                else if (isActorVictim)
+                {
+                    isPermanent = true;
+                    dispositionModifier = static_cast<int>(dispTerm);
+                }
+            }
+            else if (type == OT_Assault)
+            {
+                if (isActorVictim && !isActorGuard)
+                {
+                    isPermanent = true;
+                    dispositionModifier = static_cast<int>(dispTerm);
+                }
+                else if (alarm >= 100)
+                    dispositionModifier = static_cast<int>(dispTerm);
+                else if (isActorVictim && isActorGuard)
+                {
+                    isPermanent = true;
+                    dispositionModifier = static_cast<int>(dispTerm * alarmTerm);
+                }
+                else
+                {
+                    applyOnlyIfHostile = true;
+                    dispositionModifier = static_cast<int>(dispTerm * alarmTerm);
+                }
+            }
+
+            bool setCrimeId = false;
+            if (isPermanent && dispositionModifier != 0 && !applyOnlyIfHostile)
+            {
+                setCrimeId = true;
+                dispositionModifier = std::clamp(dispositionModifier, -currentDisposition, 100 - currentDisposition);
+                int baseDisposition = observerStats.getBaseDisposition();
+                observerStats.setBaseDisposition(baseDisposition + dispositionModifier);
+            }
+            else if (dispositionModifier != 0 && !applyOnlyIfHostile)
+            {
+                setCrimeId = true;
+                dispositionModifier = std::clamp(dispositionModifier, -currentDisposition, 100 - currentDisposition);
+                observerStats.modCrimeDispositionModifier(dispositionModifier);
+            }
+
+            if (isActorGuard && alarm >= 100)
             {
                 // Mark as Alarmed for dialogue
-                actor.getClass().getCreatureStats(actor).setAlarmed(true);
+                observerStats.setAlarmed(true);
 
-                // Set the crime ID, which we will use to calm down participants
-                // once the bounty has been paid.
-                actor.getClass().getNpcStats(actor).setCrimeId(id);
+                setCrimeId = true;
 
-                if (!actor.getClass().getCreatureStats(actor).getAiSequence().isInPursuit())
+                if (!observerStats.getAiSequence().isInPursuit())
                 {
-                    actor.getClass().getCreatureStats(actor).getAiSequence().stack(AiPursue(player), actor);
+                    observerStats.getAiSequence().stack(AiPursue(player), actor);
                 }
             }
             else
             {
-                float dispTerm = (actor == victim) ? dispVictim : disp;
-
-                float alarmTerm
-                    = 0.01f * actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Alarm).getBase();
-                if (type == OT_Pickpocket && alarmTerm <= 0)
+                // If Alarm is 0, treat it like 100 to calculate a Fight modifier for a victim of pickpocketing.
+                // Observers which do not try to arrest player do not care about pickpocketing at all.
+                if (type == OT_Pickpocket && isActorVictim && alarmTerm == 0.0)
                     alarmTerm = 1.0;
+                else if (type == OT_Pickpocket && !isActorVictim)
+                    alarmTerm = 0.0;
 
-                if (actor != victim)
-                    dispTerm *= alarmTerm;
-
-                float fightTerm = static_cast<float>((actor == victim) ? fightVictim : fight);
+                float fightTerm = static_cast<float>(isActorVictim ? fightVictim : fight);
                 fightTerm += getFightDispositionBias(dispTerm);
                 fightTerm += getFightDistanceBias(actor, player);
                 fightTerm *= alarmTerm;
 
-                const int observerFightRating
-                    = actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Fight).getBase();
+                const int observerFightRating = observerStats.getAiSetting(AiSetting::Fight).getBase();
                 if (observerFightRating + fightTerm > 100)
                     fightTerm = static_cast<float>(100 - observerFightRating);
                 fightTerm = std::max(0.f, fightTerm);
 
                 if (observerFightRating + fightTerm >= 100)
                 {
-                    startCombat(actor, player);
+                    if (dispositionModifier != 0 && applyOnlyIfHostile)
+                    {
+                        dispositionModifier
+                            = std::clamp(dispositionModifier, -currentDisposition, 100 - currentDisposition);
+                        observerStats.modCrimeDispositionModifier(dispositionModifier);
+                    }
+
+                    startCombat(actor, player, &playerFollowers);
 
-                    NpcStats& observerStats = actor.getClass().getNpcStats(actor);
                     // Apply aggression value to the base Fight rating, so that the actor can continue fighting
                     // after a Calm spell wears off
                     observerStats.setAiSetting(AiSetting::Fight, observerFightRating + static_cast<int>(fightTerm));
 
-                    observerStats.setBaseDisposition(observerStats.getBaseDisposition() + static_cast<int>(dispTerm));
-
-                    // Set the crime ID, which we will use to calm down participants
-                    // once the bounty has been paid.
-                    observerStats.setCrimeId(id);
+                    setCrimeId = true;
 
                     // Mark as Alarmed for dialogue
                     observerStats.setAlarmed(true);
                 }
             }
+
+            // Set the crime ID, which we will use to calm down participants
+            // once the bounty has been paid and restore their disposition to player character.
+            if (setCrimeId)
+                observerStats.setCrimeId(id);
         }
 
         if (reported)
         {
-            player.getClass().getNpcStats(player).setBounty(player.getClass().getNpcStats(player).getBounty() + arg);
+            player.getClass().getNpcStats(player).setBounty(
+                std::max(0, player.getClass().getNpcStats(player).getBounty() + arg));
 
             // If committing a crime against a faction member, expell from the faction
             if (!victim.isEmpty() && victim.getClass().isNpc())
@@ -1361,7 +1466,7 @@ namespace MWMechanics
                 const std::map<ESM::RefId, int>& playerRanks = player.getClass().getNpcStats(player).getFactionRanks();
                 if (playerRanks.find(factionID) != playerRanks.end())
                 {
-                    player.getClass().getNpcStats(player).expell(factionID);
+                    player.getClass().getNpcStats(player).expell(factionID, true);
                 }
             }
             else if (!factionId.empty())
@@ -1369,7 +1474,7 @@ namespace MWMechanics
                 const std::map<ESM::RefId, int>& playerRanks = player.getClass().getNpcStats(player).getFactionRanks();
                 if (playerRanks.find(factionId) != playerRanks.end())
                 {
-                    player.getClass().getNpcStats(player).expell(factionId);
+                    player.getClass().getNpcStats(player).expell(factionId, true);
                 }
             }
 
@@ -1380,7 +1485,7 @@ namespace MWMechanics
                 // Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back.
                 // Note: accidental or collateral damage attacks are ignored.
                 if (!victim.getClass().getCreatureStats(victim).getAiSequence().isInPursuit())
-                    startCombat(victim, player);
+                    startCombat(victim, player, &playerFollowers);
 
                 // Set the crime ID, which we will use to calm down participants
                 // once the bounty has been paid.
@@ -1397,26 +1502,10 @@ namespace MWMechanics
         if (target == player || !attacker.getClass().isActor())
             return false;
 
-        MWMechanics::CreatureStats& statsTarget = target.getClass().getCreatureStats(target);
-        if (attacker == player)
-        {
-            std::set<MWWorld::Ptr> followersAttacker;
-            getActorsSidingWith(attacker, followersAttacker);
-            if (followersAttacker.find(target) != followersAttacker.end())
-            {
-                statsTarget.friendlyHit();
-
-                if (statsTarget.getFriendlyHits() < 4)
-                {
-                    MWBase::Environment::get().getDialogueManager()->say(target, ESM::RefId::stringRefId("hit"));
-                    return false;
-                }
-            }
-        }
-
         if (canCommitCrimeAgainst(target, attacker))
             commitCrime(attacker, target, MWBase::MechanicsManager::OT_Assault);
 
+        MWMechanics::CreatureStats& statsTarget = target.getClass().getCreatureStats(target);
         AiSequence& seq = statsTarget.getAiSequence();
 
         if (!attacker.isEmpty()
@@ -1441,14 +1530,14 @@ namespace MWMechanics
 
                 if (!peaceful)
                 {
-                    startCombat(target, attacker);
+                    SidingCache cachedAllies{ mActors, false };
+                    const std::set<MWWorld::Ptr>& attackerAllies = cachedAllies.getActorsSidingWith(attacker);
+                    startCombat(target, attacker, &attackerAllies);
                     // Force friendly actors into combat to prevent infighting between followers
-                    std::set<MWWorld::Ptr> followersTarget;
-                    getActorsSidingWith(target, followersTarget);
-                    for (const auto& follower : followersTarget)
+                    for (const auto& follower : cachedAllies.getActorsSidingWith(target))
                     {
                         if (follower != attacker && follower != player)
-                            startCombat(follower, attacker);
+                            startCombat(follower, attacker, &attackerAllies);
                     }
                 }
             }
@@ -1459,10 +1548,13 @@ namespace MWMechanics
 
     bool MechanicsManager::canCommitCrimeAgainst(const MWWorld::Ptr& target, const MWWorld::Ptr& attacker)
     {
-        const MWMechanics::AiSequence& seq = target.getClass().getCreatureStats(target).getAiSequence();
-        return target.getClass().isNpc() && !attacker.isEmpty() && !seq.isInCombat(attacker)
-            && !isAggressive(target, attacker) && !seq.isEngagedWithActor()
-            && !target.getClass().getCreatureStats(target).getAiSequence().isInPursuit();
+        const MWWorld::Class& cls = target.getClass();
+        const MWMechanics::CreatureStats& stats = cls.getCreatureStats(target);
+        const MWMechanics::AiSequence& seq = stats.getAiSequence();
+        return cls.isNpc() && !attacker.isEmpty() && !seq.isInCombat(attacker) && !isAggressive(target, attacker)
+            && !seq.isEngagedWithActor() && !stats.getAiSequence().isInPursuit()
+            && !cls.getNpcStats(target).isWerewolf()
+            && stats.getMagicEffects().getOrDefault(ESM::MagicEffect::Vampirism).getMagnitude() <= 0;
     }
 
     void MechanicsManager::actorKilled(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker)
@@ -1569,7 +1661,8 @@ namespace MWMechanics
         return (Misc::Rng::roll0to99(prng) >= target);
     }
 
-    void MechanicsManager::startCombat(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target)
+    void MechanicsManager::startCombat(
+        const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, const std::set<MWWorld::Ptr>* targetAllies)
     {
         CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
@@ -1583,9 +1676,36 @@ namespace MWMechanics
             // We don't care about dialogue filters since the target is invalid.
             // We still want to play the combat taunt.
             MWBase::Environment::get().getDialogueManager()->say(ptr, ESM::RefId::stringRefId("attack"));
+            if (!stats.getAiSequence().isInCombat())
+                stats.resetFriendlyHits();
             return;
         }
 
+        const bool inCombat = stats.getAiSequence().isInCombat();
+        bool shout = !inCombat;
+        if (inCombat)
+        {
+            const auto isInCombatWithOneOf = [&](const auto& allies) {
+                for (const MWWorld::Ptr& ally : allies)
+                {
+                    if (stats.getAiSequence().isInCombat(ally))
+                        return true;
+                }
+                return false;
+            };
+            if (targetAllies)
+                shout = !isInCombatWithOneOf(*targetAllies);
+            else
+            {
+                shout = stats.getAiSequence().isInCombat(target);
+                if (!shout)
+                {
+                    std::set<MWWorld::Ptr> sidingActors;
+                    getActorsSidingWith(target, sidingActors);
+                    shout = !isInCombatWithOneOf(sidingActors);
+                }
+            }
+        }
         stats.getAiSequence().stack(MWMechanics::AiCombat(target), ptr);
         if (target == getPlayer())
         {
@@ -1620,7 +1740,8 @@ namespace MWMechanics
         }
 
         // Must be done after the target is set up, so that CreatureTargetted dialogue filter works properly
-        MWBase::Environment::get().getDialogueManager()->say(ptr, ESM::RefId::stringRefId("attack"));
+        if (shout)
+            MWBase::Environment::get().getDialogueManager()->say(ptr, ESM::RefId::stringRefId("attack"));
     }
 
     void MechanicsManager::stopCombat(const MWWorld::Ptr& actor)
@@ -1830,11 +1951,7 @@ namespace MWMechanics
 
             // Transforming removes all temporary effects
             actor.getClass().getCreatureStats(actor).getActiveSpells().purge(
-                [](const auto& params) {
-                    return params.getType() == ESM::ActiveSpells::Type_Consumable
-                        || params.getType() == ESM::ActiveSpells::Type_Temporary;
-                },
-                actor);
+                [](const auto& params) { return params.hasFlag(ESM::ActiveSpells::Flag_Temporary); }, actor);
             mActors.updateActor(actor, 0.f);
 
             if (werewolf)
@@ -1888,7 +2005,8 @@ namespace MWMechanics
 
                 if (reported)
                 {
-                    npcStats.setBounty(npcStats.getBounty() + gmst.find("iWereWolfBounty")->mValue.getInteger());
+                    npcStats.setBounty(
+                        std::max(0, npcStats.getBounty() + gmst.find("iWereWolfBounty")->mValue.getInteger()));
                 }
             }
         }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 748965a682..4b0126cd34 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -11,6 +11,11 @@
 #include "npcstats.hpp"
 #include "objects.hpp"
 
+namespace MWSound
+{
+    enum class MusicType;
+}
+
 namespace MWWorld
 {
     class CellStore;
@@ -100,7 +105,8 @@ namespace MWMechanics
         bool awarenessCheck(const MWWorld::Ptr& ptr, const MWWorld::Ptr& observer) override;
 
         /// Makes \a ptr fight \a target. Also shouts a combat taunt.
-        void startCombat(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) override;
+        void startCombat(
+            const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, const std::set<MWWorld::Ptr>* targetAllies) override;
 
         void stopCombat(const MWWorld::Ptr& ptr) override;
 
@@ -134,11 +140,16 @@ namespace MWMechanics
 
         /// Attempt to play an animation group
         /// @return Success or error
-        bool playAnimationGroup(
-            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist = false) override;
+        bool playAnimationGroup(const MWWorld::Ptr& ptr, std::string_view groupName, int mode, uint32_t number,
+            bool scripted = false) override;
+        bool playAnimationGroupLua(const MWWorld::Ptr& ptr, std::string_view groupName, uint32_t loops, float speed,
+            std::string_view startKey, std::string_view stopKey, bool forceLoop) override;
+        void enableLuaAnimations(const MWWorld::Ptr& ptr, bool enable) override;
         void skipAnimation(const MWWorld::Ptr& ptr) override;
         bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) override;
+        bool checkScriptedAnimationPlaying(const MWWorld::Ptr& ptr) const override;
         void persistAnimationStates() override;
+        void clearAnimationQueue(const MWWorld::Ptr& ptr, bool clearScripted) override;
 
         /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
         /// paused we may want to do it manually (after equipping permanent enchantment)
@@ -189,7 +200,7 @@ namespace MWMechanics
         /// Is \a ptr casting spell or using weapon now?
         bool isAttackingOrSpell(const MWWorld::Ptr& ptr) const override;
 
-        void castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool manualSpell = false) override;
+        void castSpell(const MWWorld::Ptr& ptr, const ESM::RefId& spellId, bool scriptedSpell = false) override;
 
         void processChangedSettings(const Settings::CategorySettingVector& settings) override;
 
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 3427e460c3..eceaf8b482 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -20,6 +20,7 @@
 
 MWMechanics::NpcStats::NpcStats()
     : mDisposition(0)
+    , mCrimeDispositionModifier(0)
     , mReputation(0)
     , mCrimeId(-1)
     , mBounty(0)
@@ -43,6 +44,21 @@ void MWMechanics::NpcStats::setBaseDisposition(int disposition)
     mDisposition = disposition;
 }
 
+int MWMechanics::NpcStats::getCrimeDispositionModifier() const
+{
+    return mCrimeDispositionModifier;
+}
+
+void MWMechanics::NpcStats::setCrimeDispositionModifier(int value)
+{
+    mCrimeDispositionModifier = value;
+}
+
+void MWMechanics::NpcStats::modCrimeDispositionModifier(int value)
+{
+    mCrimeDispositionModifier += value;
+}
+
 const MWMechanics::SkillValue& MWMechanics::NpcStats::getSkill(ESM::RefId id) const
 {
     auto it = mSkills.find(id);
@@ -112,14 +128,17 @@ bool MWMechanics::NpcStats::getExpelled(const ESM::RefId& factionID) const
     return mExpelled.find(factionID) != mExpelled.end();
 }
 
-void MWMechanics::NpcStats::expell(const ESM::RefId& factionID)
+void MWMechanics::NpcStats::expell(const ESM::RefId& factionID, bool printMessage)
 {
     if (mExpelled.find(factionID) == mExpelled.end())
     {
+        mExpelled.insert(factionID);
+        if (!printMessage)
+            return;
+
         std::string message = "#{sExpelledMessage}";
         message += MWBase::Environment::get().getESMStore()->get<ESM::Faction>().find(factionID)->mName;
         MWBase::Environment::get().getWindowManager()->messageBox(message);
-        mExpelled.insert(factionID);
     }
 }
 
@@ -190,95 +209,16 @@ float MWMechanics::NpcStats::getSkillProgressRequirement(ESM::RefId id, const ES
     return progressRequirement;
 }
 
-void MWMechanics::NpcStats::useSkill(ESM::RefId id, const ESM::Class& class_, int usageType, float extraFactor)
-{
-    const ESM::Skill* skill = MWBase::Environment::get().getESMStore()->get<ESM::Skill>().find(id);
-    float skillGain = 1;
-    if (usageType >= 4)
-        throw std::runtime_error("skill usage type out of range");
-    if (usageType >= 0)
-    {
-        skillGain = skill->mData.mUseValue[usageType];
-        if (skillGain < 0)
-            throw std::runtime_error("invalid skill gain factor");
-    }
-    skillGain *= extraFactor;
-
-    MWMechanics::SkillValue& value = getSkill(skill->mId);
-
-    value.setProgress(value.getProgress() + skillGain);
-
-    if (int(value.getProgress()) >= int(getSkillProgressRequirement(skill->mId, class_)))
-    {
-        // skill levelled up
-        increaseSkill(skill->mId, class_, false);
-    }
-}
-
-void MWMechanics::NpcStats::increaseSkill(ESM::RefId id, const ESM::Class& class_, bool preserveProgress, bool readBook)
-{
-    const ESM::Skill* skill = MWBase::Environment::get().getESMStore()->get<ESM::Skill>().find(id);
-    float base = getSkill(skill->mId).getBase();
-
-    if (base >= 100.f)
-        return;
-
-    base += 1;
-
-    const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
-
-    // is this a minor or major skill?
-    int increase = gmst.find("iLevelupMiscMultAttriubte")->mValue.getInteger(); // Note: GMST has a typo
-    int index = ESM::Skill::refIdToIndex(skill->mId);
-    for (const auto& skills : class_.mData.mSkills)
-    {
-        if (skills[0] == index)
-        {
-            mLevelProgress += gmst.find("iLevelUpMinorMult")->mValue.getInteger();
-            increase = gmst.find("iLevelUpMinorMultAttribute")->mValue.getInteger();
-            break;
-        }
-        else if (skills[1] == index)
-        {
-            mLevelProgress += gmst.find("iLevelUpMajorMult")->mValue.getInteger();
-            increase = gmst.find("iLevelUpMajorMultAttribute")->mValue.getInteger();
-            break;
-        }
-    }
-
-    mSkillIncreases[ESM::Attribute::indexToRefId(skill->mData.mAttribute)] += increase;
-
-    mSpecIncreases[skill->mData.mSpecialization] += gmst.find("iLevelupSpecialization")->mValue.getInteger();
-
-    // Play sound & skill progress notification
-    /// \todo check if character is the player, if levelling is ever implemented for NPCs
-    MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("skillraise"));
-
-    std::string message{ MWBase::Environment::get().getWindowManager()->getGameSettingString("sNotifyMessage39", {}) };
-    message = Misc::StringUtils::format(
-        message, MyGUI::TextIterator::toTagsString(skill->mName).asUTF8(), static_cast<int>(base));
-
-    if (readBook)
-        message = "#{sBookSkillMessage}\n" + message;
-
-    MWBase::Environment::get().getWindowManager()->messageBox(message, MWGui::ShowInDialogueMode_Never);
-
-    if (mLevelProgress >= gmst.find("iLevelUpTotal")->mValue.getInteger())
-    {
-        // levelup is possible now
-        MWBase::Environment::get().getWindowManager()->messageBox("#{sLevelUpMsg}", MWGui::ShowInDialogueMode_Never);
-    }
-
-    getSkill(skill->mId).setBase(base);
-    if (!preserveProgress)
-        getSkill(skill->mId).setProgress(0);
-}
-
 int MWMechanics::NpcStats::getLevelProgress() const
 {
     return mLevelProgress;
 }
 
+void MWMechanics::NpcStats::setLevelProgress(int progress)
+{
+    mLevelProgress = progress;
+}
+
 void MWMechanics::NpcStats::levelUp()
 {
     const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
@@ -325,11 +265,33 @@ int MWMechanics::NpcStats::getLevelupAttributeMultiplier(ESM::Attribute::Attribu
     return MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>().find(gmst.str())->mValue.getInteger();
 }
 
-int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(int spec) const
+int MWMechanics::NpcStats::getSkillIncreasesForAttribute(ESM::Attribute::AttributeID attribute) const
+{
+    auto it = mSkillIncreases.find(attribute);
+    if (it == mSkillIncreases.end())
+        return 0;
+    return it->second;
+}
+
+void MWMechanics::NpcStats::setSkillIncreasesForAttribute(ESM::Attribute::AttributeID attribute, int increases)
+{
+    if (increases == 0)
+        mSkillIncreases.erase(attribute);
+    else
+        mSkillIncreases[attribute] = increases;
+}
+
+int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(ESM::Class::Specialization spec) const
 {
     return mSpecIncreases[spec];
 }
 
+void MWMechanics::NpcStats::setSkillIncreasesForSpecialization(ESM::Class::Specialization spec, int increases)
+{
+    assert(spec >= 0 && spec < 3);
+    mSpecIncreases[spec] = increases;
+}
+
 void MWMechanics::NpcStats::flagAsUsed(const ESM::RefId& id)
 {
     mUsedIds.insert(id);
@@ -461,6 +423,7 @@ void MWMechanics::NpcStats::writeState(ESM::NpcStats& state) const
         state.mFactions[iter->first].mRank = iter->second;
 
     state.mDisposition = mDisposition;
+    state.mCrimeDispositionModifier = mCrimeDispositionModifier;
 
     for (const auto& [id, value] : mSkills)
     {
@@ -488,7 +451,12 @@ void MWMechanics::NpcStats::writeState(ESM::NpcStats& state) const
 
     state.mSkillIncrease.fill(0);
     for (const auto& [key, value] : mSkillIncreases)
-        state.mSkillIncrease[static_cast<size_t>(ESM::Attribute::refIdToIndex(key))] = value;
+    {
+        // TODO extend format
+        auto index = ESM::Attribute::refIdToIndex(key);
+        assert(index >= 0);
+        state.mSkillIncrease[static_cast<size_t>(index)] = value;
+    }
 
     for (size_t i = 0; i < state.mSpecIncreases.size(); ++i)
         state.mSpecIncreases[i] = mSpecIncreases[i];
@@ -520,6 +488,7 @@ void MWMechanics::NpcStats::readState(const ESM::NpcStats& state)
         }
 
     mDisposition = state.mDisposition;
+    mCrimeDispositionModifier = state.mCrimeDispositionModifier;
 
     for (size_t i = 0; i < state.mSkills.size(); ++i)
     {
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index cae94414c9..f94744cb71 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -3,6 +3,7 @@
 
 #include "creaturestats.hpp"
 #include <components/esm/refid.hpp>
+#include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadskil.hpp>
 #include <map>
 #include <set>
@@ -22,6 +23,7 @@ namespace MWMechanics
     class NpcStats : public CreatureStats
     {
         int mDisposition;
+        int mCrimeDispositionModifier;
         std::map<ESM::RefId, SkillValue> mSkills; // SkillValue.mProgress used by the player only
 
         int mReputation;
@@ -54,6 +56,10 @@ namespace MWMechanics
         int getBaseDisposition() const;
         void setBaseDisposition(int disposition);
 
+        int getCrimeDispositionModifier() const;
+        void setCrimeDispositionModifier(int value);
+        void modCrimeDispositionModifier(int value);
+
         int getReputation() const;
         void setReputation(int reputation);
 
@@ -74,23 +80,22 @@ namespace MWMechanics
 
         const std::set<ESM::RefId>& getExpelled() const { return mExpelled; }
         bool getExpelled(const ESM::RefId& factionID) const;
-        void expell(const ESM::RefId& factionID);
+        void expell(const ESM::RefId& factionID, bool printMessage);
         void clearExpelled(const ESM::RefId& factionID);
 
         bool isInFaction(const ESM::RefId& faction) const;
 
         float getSkillProgressRequirement(ESM::RefId id, const ESM::Class& class_) const;
 
-        void useSkill(ESM::RefId id, const ESM::Class& class_, int usageType = -1, float extraFactor = 1.f);
-        ///< Increase skill by usage.
-
-        void increaseSkill(ESM::RefId id, const ESM::Class& class_, bool preserveProgress, bool readBook = false);
-
         int getLevelProgress() const;
+        void setLevelProgress(int progress);
 
         int getLevelupAttributeMultiplier(ESM::Attribute::AttributeID attribute) const;
+        int getSkillIncreasesForAttribute(ESM::Attribute::AttributeID attribute) const;
+        void setSkillIncreasesForAttribute(ESM::Attribute::AttributeID, int increases);
 
-        int getSkillIncreasesForSpecialization(int spec) const;
+        int getSkillIncreasesForSpecialization(ESM::Class::Specialization spec) const;
+        void setSkillIncreasesForSpecialization(ESM::Class::Specialization spec, int increases);
 
         void levelUp();
 
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index ab981dd459..12d342666b 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -99,12 +99,12 @@ namespace MWMechanics
     }
 
     bool Objects::playAnimationGroup(
-        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist)
+        const MWWorld::Ptr& ptr, std::string_view groupName, int mode, uint32_t number, bool scripted)
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
         {
-            return iter->second->playGroup(groupName, mode, number, persist);
+            return iter->second->playGroup(groupName, mode, number, scripted);
         }
         else
         {
@@ -113,6 +113,23 @@ namespace MWMechanics
             return false;
         }
     }
+
+    bool Objects::playAnimationGroupLua(const MWWorld::Ptr& ptr, std::string_view groupName, uint32_t loops,
+        float speed, std::string_view startKey, std::string_view stopKey, bool forceLoop)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            return iter->second->playGroupLua(groupName, speed, startKey, stopKey, loops, forceLoop);
+        return false;
+    }
+
+    void Objects::enableLuaAnimations(const MWWorld::Ptr& ptr, bool enable)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            iter->second->enableLuaAnimations(enable);
+    }
+
     void Objects::skipAnimation(const MWWorld::Ptr& ptr)
     {
         const auto iter = mIndex.find(ptr.mRef);
@@ -126,6 +143,13 @@ namespace MWMechanics
             object.persistAnimationState();
     }
 
+    void Objects::clearAnimationQueue(const MWWorld::Ptr& ptr, bool clearScripted)
+    {
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
+            iter->second->clearAnimQueue(clearScripted);
+    }
+
     void Objects::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const
     {
         for (const CharacterController& object : mObjects)
diff --git a/apps/openmw/mwmechanics/objects.hpp b/apps/openmw/mwmechanics/objects.hpp
index 8b5962109c..31c2768b1b 100644
--- a/apps/openmw/mwmechanics/objects.hpp
+++ b/apps/openmw/mwmechanics/objects.hpp
@@ -46,9 +46,13 @@ namespace MWMechanics
         void onClose(const MWWorld::Ptr& ptr);
 
         bool playAnimationGroup(
-            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, int number, bool persist = false);
+            const MWWorld::Ptr& ptr, std::string_view groupName, int mode, uint32_t number, bool scripted = false);
+        bool playAnimationGroupLua(const MWWorld::Ptr& ptr, std::string_view groupName, uint32_t loops, float speed,
+            std::string_view startKey, std::string_view stopKey, bool forceLoop);
+        void enableLuaAnimations(const MWWorld::Ptr& ptr, bool enable);
         void skipAnimation(const MWWorld::Ptr& ptr);
         void persistAnimationStates();
+        void clearAnimationQueue(const MWWorld::Ptr& ptr, bool clearScripted);
 
         void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const;
 
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 4afaf7c2d5..a6eb4f9c24 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -49,47 +49,61 @@ namespace MWMechanics
             return true;
     }
 
-    const MWWorld::Ptr getNearbyDoor(const MWWorld::Ptr& actor, float minDist)
+    struct GetNearbyDoorVisitor
     {
-        MWWorld::CellStore* cell = actor.getCell();
+        MWWorld::Ptr mResult;
 
-        // Check all the doors in this cell
-        const MWWorld::CellRefList<ESM::Door>& doors = cell->getReadOnlyDoors();
-        osg::Vec3f pos(actor.getRefData().getPosition().asVec3());
-        pos.z() = 0;
-
-        osg::Vec3f actorDir = (actor.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0));
-
-        for (const auto& ref : doors.mList)
+        GetNearbyDoorVisitor(const MWWorld::Ptr& actor, const float minDist)
+            : mPos(actor.getRefData().getPosition().asVec3())
+            , mDir(actor.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0, 1, 0))
+            , mMinDist(minDist)
         {
+            mPos.z() = 0;
+            mDir.normalize();
+        }
+
+        bool operator()(const MWWorld::Ptr& ptr)
+        {
+            MWWorld::LiveCellRef<ESM::Door>& ref = *static_cast<MWWorld::LiveCellRef<ESM::Door>*>(ptr.getBase());
+            if (!ptr.getRefData().isEnabled() || ref.isDeleted())
+                return true;
+
+            if (ptr.getClass().getDoorState(ptr) != MWWorld::DoorState::Idle)
+                return true;
+
+            const float doorRot = ref.mData.getPosition().rot[2] - ptr.getCellRef().getPosition().rot[2];
+            if (doorRot != 0)
+                return true;
+
             osg::Vec3f doorPos(ref.mData.getPosition().asVec3());
-
-            // FIXME: cast
-            const MWWorld::Ptr doorPtr
-                = MWWorld::Ptr(&const_cast<MWWorld::LiveCellRef<ESM::Door>&>(ref), actor.getCell());
-
-            const auto doorState = doorPtr.getClass().getDoorState(doorPtr);
-            float doorRot = ref.mData.getPosition().rot[2] - doorPtr.getCellRef().getPosition().rot[2];
-
-            if (doorState != MWWorld::DoorState::Idle || doorRot != 0)
-                continue; // the door is already opened/opening
-
             doorPos.z() = 0;
 
-            float angle = std::acos(actorDir * (doorPos - pos) / (actorDir.length() * (doorPos - pos).length()));
+            osg::Vec3f actorToDoor = doorPos - mPos;
+            // Door is not close enough
+            if (actorToDoor.length2() > mMinDist * mMinDist)
+                return true;
+
+            actorToDoor.normalize();
+            const float angle = std::acos(mDir * actorToDoor);
 
             // Allow 60 degrees angle between actor and door
             if (angle < -osg::PI / 3 || angle > osg::PI / 3)
-                continue;
+                return true;
 
-            // Door is not close enough
-            if ((pos - doorPos).length2() > minDist * minDist)
-                continue;
-
-            return doorPtr; // found, stop searching
+            mResult = ptr;
+            return false; // found, stop searching
         }
 
-        return MWWorld::Ptr(); // none found
+    private:
+        osg::Vec3f mPos, mDir;
+        float mMinDist;
+    };
+
+    const MWWorld::Ptr getNearbyDoor(const MWWorld::Ptr& actor, float minDist)
+    {
+        GetNearbyDoorVisitor visitor(actor, minDist);
+        actor.getCell()->forEachType<ESM::Door>(visitor);
+        return visitor.mResult;
     }
 
     bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination, bool ignorePlayer,
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 44566d3b45..0f688686cd 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -8,7 +8,7 @@
 #include <components/detournavigator/areatype.hpp>
 #include <components/detournavigator/flags.hpp>
 #include <components/detournavigator/status.hpp>
-#include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 #include <components/esm3/loadpgrd.hpp>
 
 namespace MWWorld
diff --git a/apps/openmw/mwmechanics/pathgrid.cpp b/apps/openmw/mwmechanics/pathgrid.cpp
index 8282e32e81..980c0c660f 100644
--- a/apps/openmw/mwmechanics/pathgrid.cpp
+++ b/apps/openmw/mwmechanics/pathgrid.cpp
@@ -1,5 +1,6 @@
 #include "pathgrid.hpp"
 
+#include <algorithm>
 #include <list>
 #include <set>
 
diff --git a/apps/openmw/mwmechanics/recharge.cpp b/apps/openmw/mwmechanics/recharge.cpp
index fc8a0e8a72..7b0ad75d3c 100644
--- a/apps/openmw/mwmechanics/recharge.cpp
+++ b/apps/openmw/mwmechanics/recharge.cpp
@@ -38,12 +38,14 @@ namespace MWMechanics
 
     bool rechargeItem(const MWWorld::Ptr& item, const MWWorld::Ptr& gem)
     {
-        if (!gem.getRefData().getCount())
+        if (!gem.getCellRef().getCount())
             return false;
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
 
+        MWBase::Environment::get().getWorld()->breakInvisibility(player);
+
         float luckTerm = 0.1f * stats.getAttribute(ESM::Attribute::Luck).getModified();
         if (luckTerm < 1 || luckTerm > 10)
             luckTerm = 1;
@@ -82,10 +84,10 @@ namespace MWMechanics
             MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Enchant Fail"));
         }
 
-        player.getClass().skillUsageSucceeded(player, ESM::Skill::Enchant, 0);
+        player.getClass().skillUsageSucceeded(player, ESM::Skill::Enchant, ESM::Skill::Enchant_Recharge);
         gem.getContainerStore()->remove(gem, 1);
 
-        if (gem.getRefData().getCount() == 0)
+        if (gem.getCellRef().getCount() == 0)
         {
             std::string message = MWBase::Environment::get()
                                       .getESMStore()
diff --git a/apps/openmw/mwmechanics/repair.cpp b/apps/openmw/mwmechanics/repair.cpp
index 4894b93e7f..914fa0b542 100644
--- a/apps/openmw/mwmechanics/repair.cpp
+++ b/apps/openmw/mwmechanics/repair.cpp
@@ -22,6 +22,8 @@ namespace MWMechanics
         MWWorld::Ptr player = getPlayer();
         MWWorld::LiveCellRef<ESM::Repair>* ref = mTool.get<ESM::Repair>();
 
+        MWBase::Environment::get().getWorld()->breakInvisibility(player);
+
         // unstack tool if required
         player.getClass().getContainerStore(player).unstack(mTool);
 
@@ -68,7 +70,7 @@ namespace MWMechanics
                 stacked->getRefData().getLocals().setVarByInt(script, "onpcrepair", 1);
 
             // increase skill
-            player.getClass().skillUsageSucceeded(player, ESM::Skill::Armorer, 0);
+            player.getClass().skillUsageSucceeded(player, ESM::Skill::Armorer, ESM::Skill::Armorer_Repair);
 
             MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Repair"));
             MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairSuccess}");
diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp
index a13131cae6..0fb8a95699 100644
--- a/apps/openmw/mwmechanics/security.cpp
+++ b/apps/openmw/mwmechanics/security.cpp
@@ -64,7 +64,7 @@ namespace MWMechanics
                 lock.getCellRef().unlock();
                 resultMessage = "#{sLockSuccess}";
                 resultSound = "Open Lock";
-                mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, 1);
+                mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, ESM::Skill::Security_PickLock);
             }
             else
                 resultMessage = "#{sLockFail}";
@@ -115,7 +115,7 @@ namespace MWMechanics
 
                 resultSound = "Disarm Trap";
                 resultMessage = "#{sTrapSuccess}";
-                mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, 0);
+                mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, ESM::Skill::Security_DisarmTrap);
             }
             else
                 resultMessage = "#{sTrapFail}";
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 52e371b6e9..dd3892e2d9 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -29,11 +29,11 @@
 namespace MWMechanics
 {
     CastSpell::CastSpell(
-        const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile, const bool manualSpell)
+        const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile, const bool scriptedSpell)
         : mCaster(caster)
         , mTarget(target)
         , mFromProjectile(fromProjectile)
-        , mManualSpell(manualSpell)
+        , mScriptedSpell(scriptedSpell)
     {
     }
 
@@ -41,22 +41,19 @@ namespace MWMechanics
         const ESM::EffectList& effects, const MWWorld::Ptr& ignore, ESM::RangeType rangeType) const
     {
         const auto world = MWBase::Environment::get().getWorld();
-        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-        std::map<MWWorld::Ptr, std::vector<ESM::ENAMstruct>> toApply;
-        int index = -1;
-        for (const ESM::ENAMstruct& effectInfo : effects.mList)
+        std::map<MWWorld::Ptr, std::vector<ESM::IndexedENAMstruct>> toApply;
+        for (const ESM::IndexedENAMstruct& effectInfo : effects.mList)
         {
-            ++index;
-            const ESM::MagicEffect* effect = world->getStore().get<ESM::MagicEffect>().find(effectInfo.mEffectID);
+            const ESM::MagicEffect* effect = world->getStore().get<ESM::MagicEffect>().find(effectInfo.mData.mEffectID);
 
-            if (effectInfo.mRange != rangeType
-                || (effectInfo.mArea <= 0 && !ignore.isEmpty() && ignore.getClass().isActor()))
+            if (effectInfo.mData.mRange != rangeType
+                || (effectInfo.mData.mArea <= 0 && !ignore.isEmpty() && ignore.getClass().isActor()))
                 continue; // Not right range type, or not area effect and hit an actor
 
-            if (mFromProjectile && effectInfo.mArea <= 0)
+            if (mFromProjectile && effectInfo.mData.mArea <= 0)
                 continue; // Don't play explosion for projectiles with 0-area effects
 
-            if (!mFromProjectile && effectInfo.mRange == ESM::RT_Touch && !ignore.isEmpty()
+            if (!mFromProjectile && effectInfo.mData.mRange == ESM::RT_Touch && !ignore.isEmpty()
                 && !ignore.getClass().isActor() && !ignore.getClass().hasToolTip(ignore)
                 && (mCaster.isEmpty() || mCaster.getClass().isActor()))
                 continue; // Don't play explosion for touch spells on non-activatable objects except when spell is from
@@ -71,16 +68,17 @@ namespace MWMechanics
 
             const std::string& texture = effect->mParticle;
 
-            if (effectInfo.mArea <= 0)
+            if (effectInfo.mData.mArea <= 0)
             {
-                if (effectInfo.mRange == ESM::RT_Target)
+                if (effectInfo.mData.mRange == ESM::RT_Target)
                     world->spawnEffect(
-                        Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, vfs), texture, mHitPosition, 1.0f);
+                        Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(areaStatic->mModel)), texture,
+                        mHitPosition, 1.0f);
                 continue;
             }
             else
-                world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, vfs), texture,
-                    mHitPosition, static_cast<float>(effectInfo.mArea * 2));
+                world->spawnEffect(Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(areaStatic->mModel)),
+                    texture, mHitPosition, static_cast<float>(effectInfo.mData.mArea * 2));
 
             // Play explosion sound (make sure to use NoTrack, since we will delete the projectile now)
             {
@@ -96,7 +94,7 @@ namespace MWMechanics
             std::vector<MWWorld::Ptr> objects;
             static const int unitsPerFoot = ceil(Constants::UnitsPerFoot);
             MWBase::Environment::get().getMechanicsManager()->getObjectsInRange(
-                mHitPosition, static_cast<float>(effectInfo.mArea * unitsPerFoot), objects);
+                mHitPosition, static_cast<float>(effectInfo.mData.mArea * unitsPerFoot), objects);
             for (const MWWorld::Ptr& affected : objects)
             {
                 // Ignore actors without collisions here, otherwise it will be possible to hit actors outside processing
@@ -105,13 +103,6 @@ namespace MWMechanics
                     continue;
 
                 auto& list = toApply[affected];
-                while (list.size() < static_cast<std::size_t>(index))
-                {
-                    // Insert dummy effects to preserve indices
-                    auto& dummy = list.emplace_back(effectInfo);
-                    dummy.mRange = ESM::RT_Self;
-                    assert(dummy.mRange != rangeType);
-                }
                 list.push_back(effectInfo);
             }
         }
@@ -152,45 +143,34 @@ namespace MWMechanics
     void CastSpell::inflict(
         const MWWorld::Ptr& target, const ESM::EffectList& effects, ESM::RangeType range, bool exploded) const
     {
+        bool targetIsDeadActor = false;
         const bool targetIsActor = !target.isEmpty() && target.getClass().isActor();
         if (targetIsActor)
         {
-            // Early-out for characters that have departed.
             const auto& stats = target.getClass().getCreatureStats(target);
             if (stats.isDead() && stats.isDeathAnimationFinished())
-                return;
+                targetIsDeadActor = true;
         }
 
         // If none of the effects need to apply, we can early-out
         bool found = false;
         bool containsRecastable = false;
-        std::vector<const ESM::MagicEffect*> magicEffects;
-        magicEffects.reserve(effects.mList.size());
         const auto& store = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>();
-        for (const ESM::ENAMstruct& effect : effects.mList)
+        for (const ESM::IndexedENAMstruct& effect : effects.mList)
         {
-            if (effect.mRange == range)
+            if (effect.mData.mRange == range)
             {
                 found = true;
-                const ESM::MagicEffect* magicEffect = store.find(effect.mEffectID);
-                // caster needs to be an actor for linked effects (e.g. Absorb)
-                if (magicEffect->mData.mFlags & ESM::MagicEffect::CasterLinked
-                    && (mCaster.isEmpty() || !mCaster.getClass().isActor()))
-                {
-                    magicEffects.push_back(nullptr);
-                    continue;
-                }
+                const ESM::MagicEffect* magicEffect = store.find(effect.mData.mEffectID);
                 if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NonRecastable))
                     containsRecastable = true;
-                magicEffects.push_back(magicEffect);
             }
-            else
-                magicEffects.push_back(nullptr);
         }
         if (!found)
             return;
 
-        ActiveSpells::ActiveSpellParams params(*this, mCaster);
+        ActiveSpells::ActiveSpellParams params(mCaster, mId, mSourceName, mItem);
+        params.setFlag(mFlags);
         bool castByPlayer = (!mCaster.isEmpty() && mCaster == getPlayer());
 
         const ActiveSpells* targetSpells = nullptr;
@@ -205,31 +185,35 @@ namespace MWMechanics
             return;
         }
 
-        for (size_t currentEffectIndex = 0; !target.isEmpty() && currentEffectIndex < effects.mList.size();
-             ++currentEffectIndex)
+        for (auto& enam : effects.mList)
         {
-            const ESM::ENAMstruct& enam = effects.mList[currentEffectIndex];
-            if (enam.mRange != range)
-                continue;
+            if (target.isEmpty())
+                break;
 
-            const ESM::MagicEffect* magicEffect = magicEffects[currentEffectIndex];
+            if (enam.mData.mRange != range)
+                continue;
+            const ESM::MagicEffect* magicEffect = store.find(enam.mData.mEffectID);
             if (!magicEffect)
                 continue;
+            // caster needs to be an actor for linked effects (e.g. Absorb)
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::CasterLinked
+                && (mCaster.isEmpty() || !mCaster.getClass().isActor()))
+                continue;
 
             ActiveSpells::ActiveEffect effect;
-            effect.mEffectId = enam.mEffectID;
-            effect.mArg = MWMechanics::EffectKey(enam).mArg;
+            effect.mEffectId = enam.mData.mEffectID;
+            effect.mArg = MWMechanics::EffectKey(enam.mData).mArg;
             effect.mMagnitude = 0.f;
-            effect.mMinMagnitude = enam.mMagnMin;
-            effect.mMaxMagnitude = enam.mMagnMax;
+            effect.mMinMagnitude = enam.mData.mMagnMin;
+            effect.mMaxMagnitude = enam.mData.mMagnMax;
             effect.mTimeLeft = 0.f;
-            effect.mEffectIndex = static_cast<int>(currentEffectIndex);
+            effect.mEffectIndex = enam.mIndex;
             effect.mFlags = ESM::ActiveEffect::Flag_None;
-            if (mManualSpell)
+            if (mScriptedSpell)
                 effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Reflect;
 
             bool hasDuration = !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration);
-            effect.mDuration = hasDuration ? static_cast<float>(enam.mDuration) : 1.f;
+            effect.mDuration = hasDuration ? static_cast<float>(enam.mData.mDuration) : 1.f;
 
             bool appliedOnce = magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce;
             if (!appliedOnce)
@@ -241,8 +225,8 @@ namespace MWMechanics
             params.getEffects().emplace_back(effect);
 
             bool effectAffectsHealth = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful
-                || enam.mEffectID == ESM::MagicEffect::RestoreHealth;
-            if (castByPlayer && target != mCaster && targetIsActor && effectAffectsHealth)
+                || enam.mData.mEffectID == ESM::MagicEffect::RestoreHealth;
+            if (castByPlayer && target != mCaster && targetIsActor && !targetIsDeadActor && effectAffectsHealth)
             {
                 // If player is attempting to cast a harmful spell on or is healing a living target, show the target's
                 // HP bar.
@@ -263,7 +247,10 @@ namespace MWMechanics
             if (!params.getEffects().empty())
             {
                 if (targetIsActor)
-                    target.getClass().getCreatureStats(target).getActiveSpells().addSpell(params);
+                {
+                    if (!targetIsDeadActor)
+                        target.getClass().getCreatureStats(target).getActiveSpells().addSpell(params);
+                }
                 else
                 {
                     // Apply effects instantly. We can ignore effect deletion since the entire params object gets
@@ -337,7 +324,7 @@ namespace MWMechanics
                     ESM::RefId school = ESM::Skill::Alteration;
                     if (!enchantment->mEffects.mList.empty())
                     {
-                        short effectId = enchantment->mEffects.mList.front().mEffectID;
+                        short effectId = enchantment->mEffects.mList.front().mData.mEffectID;
                         const ESM::MagicEffect* magicEffect = store->get<ESM::MagicEffect>().find(effectId);
                         school = magicEffect->mData.mSchool;
                     }
@@ -355,7 +342,7 @@ namespace MWMechanics
         if (type == ESM::Enchantment::WhenUsed)
         {
             if (mCaster == getPlayer())
-                mCaster.getClass().skillUsageSucceeded(mCaster, ESM::Skill::Enchant, 1);
+                mCaster.getClass().skillUsageSucceeded(mCaster, ESM::Skill::Enchant, ESM::Skill::Enchant_UseMagicItem);
         }
         else if (type == ESM::Enchantment::CastOnce)
         {
@@ -365,7 +352,7 @@ namespace MWMechanics
         else if (type == ESM::Enchantment::WhenStrikes)
         {
             if (mCaster == getPlayer())
-                mCaster.getClass().skillUsageSucceeded(mCaster, ESM::Skill::Enchant, 3);
+                mCaster.getClass().skillUsageSucceeded(mCaster, ESM::Skill::Enchant, ESM::Skill::Enchant_CastOnStrike);
         }
 
         if (isProjectile)
@@ -388,9 +375,13 @@ namespace MWMechanics
     {
         mSourceName = potion->mName;
         mId = potion->mId;
-        mType = ESM::ActiveSpells::Type_Consumable;
+        mFlags = static_cast<ESM::ActiveSpells::Flags>(
+            ESM::ActiveSpells::Flag_Temporary | ESM::ActiveSpells::Flag_Stackable);
 
-        inflict(mCaster, potion->mEffects, ESM::RT_Self);
+        // Ignore range and don't apply area of effect
+        inflict(mCaster, potion->mEffects, ESM::RT_Self, true);
+        inflict(mCaster, potion->mEffects, ESM::RT_Touch, true);
+        inflict(mCaster, potion->mEffects, ESM::RT_Target, true);
 
         return true;
     }
@@ -404,7 +395,7 @@ namespace MWMechanics
 
         bool godmode = mCaster == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
 
-        if (mCaster.getClass().isActor() && !mAlwaysSucceed && !mManualSpell)
+        if (mCaster.getClass().isActor() && !mAlwaysSucceed && !mScriptedSpell)
         {
             school = getSpellSchool(spell, mCaster);
 
@@ -439,8 +430,8 @@ namespace MWMechanics
                 stats.getSpells().usePower(spell);
         }
 
-        if (!mManualSpell && mCaster == getPlayer() && spellIncreasesSkill(spell))
-            mCaster.getClass().skillUsageSucceeded(mCaster, school, 0);
+        if (!mScriptedSpell && mCaster == getPlayer() && spellIncreasesSkill(spell))
+            mCaster.getClass().skillUsageSucceeded(mCaster, school, ESM::Skill::Spellcast_Success);
 
         // A non-actor doesn't play its spell cast effects from a character controller, so play them here
         if (!mCaster.getClass().isActor())
@@ -459,62 +450,27 @@ namespace MWMechanics
     bool CastSpell::cast(const ESM::Ingredient* ingredient)
     {
         mId = ingredient->mId;
-        mType = ESM::ActiveSpells::Type_Consumable;
+        mFlags = static_cast<ESM::ActiveSpells::Flags>(
+            ESM::ActiveSpells::Flag_Temporary | ESM::ActiveSpells::Flag_Stackable);
         mSourceName = ingredient->mName;
 
-        ESM::ENAMstruct effect;
-        effect.mEffectID = ingredient->mData.mEffectID[0];
-        effect.mSkill = ingredient->mData.mSkills[0];
-        effect.mAttribute = ingredient->mData.mAttributes[0];
-        effect.mRange = ESM::RT_Self;
-        effect.mArea = 0;
+        auto effect = rollIngredientEffect(mCaster, ingredient, mCaster != getPlayer());
 
-        const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
-        const auto magicEffect = store.get<ESM::MagicEffect>().find(effect.mEffectID);
-        const MWMechanics::CreatureStats& creatureStats = mCaster.getClass().getCreatureStats(mCaster);
-
-        float x = (mCaster.getClass().getSkill(mCaster, ESM::Skill::Alchemy)
-                      + 0.2f * creatureStats.getAttribute(ESM::Attribute::Intelligence).getModified()
-                      + 0.1f * creatureStats.getAttribute(ESM::Attribute::Luck).getModified())
-            * creatureStats.getFatigueTerm();
-
-        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-        int roll = Misc::Rng::roll0to99(prng);
-        if (roll > x)
+        if (effect)
+            inflict(mCaster, *effect, ESM::RT_Self);
+        else
         {
             // "X has no effect on you"
-            std::string message = store.get<ESM::GameSetting>().find("sNotifyMessage50")->mValue.getString();
+            std::string message = MWBase::Environment::get()
+                                      .getESMStore()
+                                      ->get<ESM::GameSetting>()
+                                      .find("sNotifyMessage50")
+                                      ->mValue.getString();
             message = Misc::StringUtils::format(message, ingredient->mName);
             MWBase::Environment::get().getWindowManager()->messageBox(message);
             return false;
         }
 
-        float magnitude = 0;
-        float y = roll / std::min(x, 100.f);
-        y *= 0.25f * x;
-        if (magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
-            effect.mDuration = 1;
-        else
-            effect.mDuration = static_cast<int>(y);
-        if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
-        {
-            if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
-                magnitude = floor((0.05f * y) / (0.1f * magicEffect->mData.mBaseCost));
-            else
-                magnitude = floor(y / (0.1f * magicEffect->mData.mBaseCost));
-            magnitude = std::max(1.f, magnitude);
-        }
-        else
-            magnitude = 1;
-
-        effect.mMagnMax = static_cast<int>(magnitude);
-        effect.mMagnMin = static_cast<int>(magnitude);
-
-        ESM::EffectList effects;
-        effects.mList.push_back(effect);
-
-        inflict(mCaster, effects, ESM::RT_Self);
-
         return true;
     }
 
@@ -528,15 +484,14 @@ namespace MWMechanics
         playSpellCastingEffects(spell->mEffects.mList);
     }
 
-    void CastSpell::playSpellCastingEffects(const std::vector<ESM::ENAMstruct>& effects) const
+    void CastSpell::playSpellCastingEffects(const std::vector<ESM::IndexedENAMstruct>& effects) const
     {
         const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
-        std::vector<std::string> addedEffects;
-        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        std::vector<VFS::Path::Normalized> addedEffects;
 
-        for (const ESM::ENAMstruct& effectData : effects)
+        for (const ESM::IndexedENAMstruct& effectData : effects)
         {
-            const auto effect = store.get<ESM::MagicEffect>().find(effectData.mEffectID);
+            const auto effect = store.get<ESM::MagicEffect>().find(effectData.mData.mEffectID);
 
             const ESM::Static* castStatic;
 
@@ -545,17 +500,18 @@ namespace MWMechanics
             else
                 castStatic = store.get<ESM::Static>().find(ESM::RefId::stringRefId("VFX_DefaultCast"));
 
+            VFS::Path::Normalized castStaticModel
+                = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(castStatic->mModel));
+
             // check if the effect was already added
-            if (std::find(addedEffects.begin(), addedEffects.end(),
-                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs))
-                != addedEffects.end())
+            if (std::find(addedEffects.begin(), addedEffects.end(), castStaticModel) != addedEffects.end())
                 continue;
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
             if (animation)
             {
-                animation->addEffect(Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), effect->mIndex,
-                    false, {}, effect->mParticle);
+                animation->addEffect(castStaticModel.value(), ESM::MagicEffect::indexToName(effect->mIndex), false, {},
+                    effect->mParticle);
             }
             else
             {
@@ -584,14 +540,13 @@ namespace MWMechanics
                     scale *= npcScaleVec.z();
                 }
                 scale = std::max(scale, 1.f);
-                MWBase::Environment::get().getWorld()->spawnEffect(
-                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), effect->mParticle, pos, scale);
+                MWBase::Environment::get().getWorld()->spawnEffect(castStaticModel, effect->mParticle, pos, scale);
             }
 
             if (animation && !mCaster.getClass().isActor())
-                animation->addSpellCastGlow(effect);
+                animation->addSpellCastGlow(effect->getColor());
 
-            addedEffects.push_back(Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs));
+            addedEffects.push_back(std::move(castStaticModel));
 
             MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
             if (!effect->mCastSound.empty())
@@ -629,9 +584,10 @@ namespace MWMechanics
             // Don't play particle VFX unless the effect is new or it should be looping.
             if (playNonLooping || loop)
             {
-                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                anim->addEffect(Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), magicEffect.mIndex,
-                    loop, {}, magicEffect.mParticle);
+                const VFS::Path::Normalized castStaticModel
+                    = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(castStatic->mModel));
+                anim->addEffect(castStaticModel.value(), ESM::MagicEffect::indexToName(magicEffect.mIndex), loop, {},
+                    magicEffect.mParticle);
             }
         }
     }
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 8f10066e04..23d3b80713 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -26,7 +26,7 @@ namespace MWMechanics
         MWWorld::Ptr mCaster; // May be empty
         MWWorld::Ptr mTarget; // May be empty
 
-        void playSpellCastingEffects(const std::vector<ESM::ENAMstruct>& effects) const;
+        void playSpellCastingEffects(const std::vector<ESM::IndexedENAMstruct>& effects) const;
 
         void explodeSpell(const ESM::EffectList& effects, const MWWorld::Ptr& ignore, ESM::RangeType rangeType) const;
 
@@ -41,13 +41,13 @@ namespace MWMechanics
             false
         }; // Always succeed spells casted by NPCs/creatures regardless of their chance (default: false)
         bool mFromProjectile; // True if spell is cast by enchantment of some projectile (arrow, bolt or thrown weapon)
-        bool mManualSpell; // True if spell is casted from script and ignores some checks (mana level, success chance,
-                           // etc.)
+        bool mScriptedSpell; // True if spell is casted from script and ignores some checks (mana level, success chance,
+                             // etc.)
         ESM::RefNum mItem;
-        ESM::ActiveSpells::EffectType mType{ ESM::ActiveSpells::Type_Temporary };
+        ESM::ActiveSpells::Flags mFlags{ ESM::ActiveSpells::Flag_Temporary };
 
         CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile = false,
-            const bool manualSpell = false);
+            const bool scriptedSpell = false);
 
         bool cast(const ESM::Spell* spell);
 
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 253c4015b5..7035c7f61c 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -279,26 +279,28 @@ namespace
         return false;
     }
 
-    void absorbSpell(const ESM::RefId& spellId, const MWWorld::Ptr& caster, const MWWorld::Ptr& target)
+    void absorbSpell(const MWMechanics::ActiveSpells::ActiveSpellParams& spellParams, const MWWorld::Ptr& caster,
+        const MWWorld::Ptr& target)
     {
         const auto& esmStore = *MWBase::Environment::get().getESMStore();
         const ESM::Static* absorbStatic = esmStore.get<ESM::Static>().find(ESM::RefId::stringRefId("VFX_Absorb"));
         MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
         if (animation && !absorbStatic->mModel.empty())
         {
-            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-            animation->addEffect(Misc::ResourceHelpers::correctMeshPath(absorbStatic->mModel, vfs),
-                ESM::MagicEffect::SpellAbsorption, false);
+            const VFS::Path::Normalized absorbStaticModel
+                = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(absorbStatic->mModel));
+            animation->addEffect(
+                absorbStaticModel.value(), ESM::MagicEffect::indexToName(ESM::MagicEffect::SpellAbsorption), false);
         }
-        const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(spellId);
+
         int spellCost = 0;
-        if (spell)
+        if (const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(spellParams.getSourceSpellId()))
         {
             spellCost = MWMechanics::calcSpellCost(*spell);
         }
         else
         {
-            const ESM::Enchantment* enchantment = esmStore.get<ESM::Enchantment>().search(spellId);
+            const ESM::Enchantment* enchantment = esmStore.get<ESM::Enchantment>().search(spellParams.getEnchantment());
             if (enchantment)
                 spellCost = MWMechanics::getEffectiveEnchantmentCastCost(*enchantment, caster);
         }
@@ -317,8 +319,7 @@ namespace
         auto& stats = target.getClass().getCreatureStats(target);
         auto& magnitudes = stats.getMagicEffects();
         // Apply reflect and spell absorption
-        if (target != caster && spellParams.getType() != ESM::ActiveSpells::Type_Enchantment
-            && spellParams.getType() != ESM::ActiveSpells::Type_Permanent)
+        if (target != caster && spellParams.hasFlag(ESM::ActiveSpells::Flag_Temporary))
         {
             bool canReflect = !(magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable)
                 && !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Reflect)
@@ -345,7 +346,7 @@ namespace
                         {
                             if (canAbsorb && Misc::Rng::roll0to99(prng) < activeEffect.mMagnitude)
                             {
-                                absorbSpell(spellParams.getId(), caster, target);
+                                absorbSpell(spellParams, caster, target);
                                 return MWMechanics::MagicApplicationResult::Type::REMOVED;
                             }
                         }
@@ -356,13 +357,13 @@ namespace
         // Notify the target actor they've been hit
         bool isHarmful = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful;
         if (target.getClass().isActor() && target != caster && !caster.isEmpty() && isHarmful)
-            target.getClass().onHit(target, 0.0f, true, MWWorld::Ptr(), caster, osg::Vec3f(), true);
+            target.getClass().onHit(
+                target, 0.0f, true, MWWorld::Ptr(), caster, osg::Vec3f(), true, MWMechanics::DamageSourceType::Magical);
         // Apply resistances
         if (!(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Resistances))
         {
-            const ESM::Spell* spell = nullptr;
-            if (spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
-                spell = MWBase::Environment::get().getESMStore()->get<ESM::Spell>().search(spellParams.getId());
+            const ESM::Spell* spell
+                = spellParams.hasFlag(ESM::ActiveSpells::Flag_Temporary) ? spellParams.getSpell() : nullptr;
             float magnitudeMult
                 = MWMechanics::getEffectMultiplier(effect.mEffectId, target, caster, spell, &magnitudes);
             if (magnitudeMult == 0)
@@ -431,10 +432,9 @@ namespace MWMechanics
                 // Dispel removes entire spells at once
                 target.getClass().getCreatureStats(target).getActiveSpells().purge(
                     [magnitude = effect.mMagnitude](const ActiveSpells::ActiveSpellParams& params) {
-                        if (params.getType() == ESM::ActiveSpells::Type_Temporary)
+                        if (params.hasFlag(ESM::ActiveSpells::Flag_Temporary))
                         {
-                            const ESM::Spell* spell
-                                = MWBase::Environment::get().getESMStore()->get<ESM::Spell>().search(params.getId());
+                            const ESM::Spell* spell = params.getSpell();
                             if (spell && spell->mData.mType == ESM::Spell::ST_Spell)
                             {
                                 auto& prng = MWBase::Environment::get().getWorld()->getPrng();
@@ -457,13 +457,14 @@ namespace MWMechanics
                     if (!caster.isEmpty())
                     {
                         MWRender::Animation* anim = world->getAnimation(caster);
-                        anim->removeEffect(effect.mEffectId);
+                        anim->removeEffect(ESM::MagicEffect::indexToName(effect.mEffectId));
                         const ESM::Static* fx
                             = world->getStore().get<ESM::Static>().search(ESM::RefId::stringRefId("VFX_Summon_end"));
-                        if (fx)
+                        if (fx != nullptr)
                         {
-                            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                            anim->addEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), -1);
+                            const VFS::Path::Normalized fxModel
+                                = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(fx->mModel));
+                            anim->addEffect(fxModel.value(), "");
                         }
                     }
                 }
@@ -495,7 +496,7 @@ namespace MWMechanics
                         if (!caster.isEmpty())
                         {
                             MWRender::Animation* anim = world->getAnimation(caster);
-                            anim->removeEffect(effect.mEffectId);
+                            anim->removeEffect(ESM::MagicEffect::indexToName(effect.mEffectId));
                         }
                     }
                 }
@@ -559,6 +560,10 @@ namespace MWMechanics
                 modifyAiSetting(
                     target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
                 break;
+            case ESM::MagicEffect::Charm:
+                if (!target.getClass().isNpc())
+                    invalid = true;
+                break;
             case ESM::MagicEffect::Sound:
                 if (target == getPlayer())
                 {
@@ -646,7 +651,7 @@ namespace MWMechanics
                     else if (effect.mEffectId == ESM::MagicEffect::DamageFatigue)
                         index = 2;
                     // Damage "Dynamic" abilities reduce the base value
-                    if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                    if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                         modDynamicStat(target, index, -effect.mMagnitude);
                     else
                     {
@@ -667,7 +672,7 @@ namespace MWMechanics
                 else if (!godmode)
                 {
                     // Damage Skill abilities reduce base skill :todd:
-                    if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                    if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                     {
                         auto& npcStats = target.getClass().getNpcStats(target);
                         SkillValue& skill = npcStats.getSkill(effect.getSkillOrAttribute());
@@ -717,8 +722,8 @@ namespace MWMechanics
                 if (!godmode)
                 {
                     int index = effect.mEffectId - ESM::MagicEffect::DrainHealth;
-                    adjustDynamicStat(
-                        target, index, -effect.mMagnitude, Settings::game().mUncappedDamageFatigue && index == 2);
+                    // Unlike Absorb and Damage effects Drain effects can bring stats below zero
+                    adjustDynamicStat(target, index, -effect.mMagnitude, true);
                     if (index == 0)
                         receivedMagicDamage = affectedHealth = true;
                 }
@@ -726,7 +731,7 @@ namespace MWMechanics
             case ESM::MagicEffect::FortifyHealth:
             case ESM::MagicEffect::FortifyMagicka:
             case ESM::MagicEffect::FortifyFatigue:
-                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                     modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, effect.mMagnitude);
                 else
                     adjustDynamicStat(
@@ -738,7 +743,7 @@ namespace MWMechanics
                 break;
             case ESM::MagicEffect::FortifyAttribute:
                 // Abilities affect base stats, but not for drain
-                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                 {
                     auto& creatureStats = target.getClass().getCreatureStats(target);
                     auto attribute = effect.getSkillOrAttribute();
@@ -758,7 +763,7 @@ namespace MWMechanics
             case ESM::MagicEffect::FortifySkill:
                 if (!target.getClass().isNpc())
                     invalid = true;
-                else if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                else if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                 {
                     // Abilities affect base stats, but not for drain
                     auto& npcStats = target.getClass().getNpcStats(target);
@@ -923,11 +928,14 @@ namespace MWMechanics
             {
                 MWRender::Animation* animation = world->getAnimation(target);
                 if (animation)
-                    animation->addSpellCastGlow(magicEffect);
+                    animation->addSpellCastGlow(magicEffect->getColor());
                 int magnitude = static_cast<int>(roll(effect));
                 if (target.getCellRef().getLockLevel()
                     < magnitude) // If the door is not already locked to a higher value, lock it to spell magnitude
                 {
+                    MWBase::Environment::get().getSoundManager()->playSound3D(
+                        target, ESM::RefId::stringRefId("Open Lock"), 1.f, 1.f);
+
                     if (caster == getPlayer())
                         MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicLockSuccess}");
                     target.getCellRef().lock(magnitude);
@@ -945,7 +953,7 @@ namespace MWMechanics
 
                 MWRender::Animation* animation = world->getAnimation(target);
                 if (animation)
-                    animation->addSpellCastGlow(magicEffect);
+                    animation->addSpellCastGlow(magicEffect->getColor());
                 int magnitude = static_cast<int>(roll(effect));
                 if (target.getCellRef().getLockLevel() <= magnitude)
                 {
@@ -983,7 +991,7 @@ namespace MWMechanics
                 return { MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth };
             auto& stats = target.getClass().getCreatureStats(target);
             auto& magnitudes = stats.getMagicEffects();
-            if (spellParams.getType() != ESM::ActiveSpells::Type_Ability
+            if (!spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues)
                 && !(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
             {
                 MagicApplicationResult::Type result
@@ -996,10 +1004,9 @@ namespace MWMechanics
                 oldMagnitude = effect.mMagnitude;
             else
             {
-                if (spellParams.getType() != ESM::ActiveSpells::Type_Enchantment)
-                    playEffects(target, *magicEffect,
-                        spellParams.getType() == ESM::ActiveSpells::Type_Consumable
-                            || spellParams.getType() == ESM::ActiveSpells::Type_Temporary);
+                if (!spellParams.hasFlag(ESM::ActiveSpells::Flag_Equipment)
+                    && !spellParams.hasFlag(ESM::ActiveSpells::Flag_Lua))
+                    playEffects(target, *magicEffect, spellParams.hasFlag(ESM::ActiveSpells::Flag_Temporary));
                 if (effect.mEffectId == ESM::MagicEffect::Soultrap && !target.getClass().isNpc()
                     && target.getType() == ESM::Creature::sRecordId
                     && target.get<ESM::Creature>()->mBase->mData.mSoul == 0 && caster == getPlayer())
@@ -1014,8 +1021,7 @@ namespace MWMechanics
                 if (effect.mDuration != 0)
                 {
                     float mult = dt;
-                    if (spellParams.getType() == ESM::ActiveSpells::Type_Consumable
-                        || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+                    if (spellParams.hasFlag(ESM::ActiveSpells::Flag_Temporary))
                         mult = std::min(effect.mTimeLeft, dt);
                     effect.mMagnitude *= mult;
                 }
@@ -1043,7 +1049,7 @@ namespace MWMechanics
             effect.mFlags |= ESM::ActiveEffect::Flag_Remove;
             auto anim = world->getAnimation(target);
             if (anim)
-                anim->removeEffect(effect.mEffectId);
+                anim->removeEffect(ESM::MagicEffect::indexToName(effect.mEffectId));
         }
         else
             effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
@@ -1193,7 +1199,7 @@ namespace MWMechanics
             case ESM::MagicEffect::FortifyHealth:
             case ESM::MagicEffect::FortifyMagicka:
             case ESM::MagicEffect::FortifyFatigue:
-                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                     modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, -effect.mMagnitude);
                 else
                     adjustDynamicStat(
@@ -1204,7 +1210,7 @@ namespace MWMechanics
                 break;
             case ESM::MagicEffect::FortifyAttribute:
                 // Abilities affect base stats, but not for drain
-                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                 {
                     auto& creatureStats = target.getClass().getCreatureStats(target);
                     auto attribute = effect.getSkillOrAttribute();
@@ -1220,7 +1226,7 @@ namespace MWMechanics
                 break;
             case ESM::MagicEffect::FortifySkill:
                 // Abilities affect base stats, but not for drain
-                if (spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                if (spellParams.hasFlag(ESM::ActiveSpells::Flag_AffectsBaseValues))
                 {
                     auto& npcStats = target.getClass().getNpcStats(target);
                     auto& skill = npcStats.getSkill(effect.getSkillOrAttribute());
@@ -1285,7 +1291,7 @@ namespace MWMechanics
         {
             auto anim = MWBase::Environment::get().getWorld()->getAnimation(target);
             if (anim)
-                anim->removeEffect(effect.mEffectId);
+                anim->removeEffect(ESM::MagicEffect::indexToName(effect.mEffectId));
         }
     }
 
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index 776381e6b2..7041254c4e 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -34,7 +34,7 @@ namespace
             if (effectFilter == -1)
             {
                 const ESM::Spell* spell
-                    = MWBase::Environment::get().getESMStore()->get<ESM::Spell>().search(it->getId());
+                    = MWBase::Environment::get().getESMStore()->get<ESM::Spell>().search(it->getSourceSpellId());
                 if (!spell || spell->mData.mType != ESM::Spell::ST_Spell)
                     continue;
             }
@@ -67,7 +67,7 @@ namespace
         const MWMechanics::ActiveSpells& activeSpells = actor.getClass().getCreatureStats(actor).getActiveSpells();
         for (MWMechanics::ActiveSpells::TIterator it = activeSpells.begin(); it != activeSpells.end(); ++it)
         {
-            if (it->getId() != spellId)
+            if (it->getSourceSpellId() != spellId)
                 continue;
 
             const MWMechanics::ActiveSpells::ActiveSpellParams& params = *it;
@@ -85,7 +85,7 @@ namespace
         int actorId = caster.getClass().getCreatureStats(caster).getActorId();
         const auto& active = target.getClass().getCreatureStats(target).getActiveSpells();
         return std::find_if(active.begin(), active.end(), [&](const auto& spell) {
-            return spell.getCasterActorId() == actorId && spell.getId() == id;
+            return spell.getCasterActorId() == actorId && spell.getSourceSpellId() == id;
         }) != active.end();
     }
 
@@ -110,13 +110,13 @@ namespace MWMechanics
     int getRangeTypes(const ESM::EffectList& effects)
     {
         int types = 0;
-        for (std::vector<ESM::ENAMstruct>::const_iterator it = effects.mList.begin(); it != effects.mList.end(); ++it)
+        for (const ESM::IndexedENAMstruct& effect : effects.mList)
         {
-            if (it->mRange == ESM::RT_Self)
+            if (effect.mData.mRange == ESM::RT_Self)
                 types |= RangeTypes::Self;
-            else if (it->mRange == ESM::RT_Touch)
+            else if (effect.mData.mRange == ESM::RT_Touch)
                 types |= RangeTypes::Touch;
-            else if (it->mRange == ESM::RT_Target)
+            else if (effect.mData.mRange == ESM::RT_Target)
                 types |= RangeTypes::Target;
         }
         return types;
@@ -440,12 +440,12 @@ namespace MWMechanics
                     // NB: this currently assumes the hardcoded magic effect flags are used
                     const float magnitude = (effect.mMagnMin + effect.mMagnMax) / 2.f;
                     const float toHeal = magnitude * std::max(1, effect.mDuration);
-                    const float damage = current.getModified() - current.getCurrent();
+                    const float damage = std::max(current.getModified() - current.getCurrent(), 0.f);
                     float priority = 0.f;
                     if (effect.mEffectID == ESM::MagicEffect::RestoreHealth)
                         priority = 4.f;
                     else if (effect.mEffectID == ESM::MagicEffect::RestoreMagicka)
-                        priority = std::max(0.1f, getRestoreMagickaPriority(actor));
+                        priority = getRestoreMagickaPriority(actor);
                     else if (effect.mEffectID == ESM::MagicEffect::RestoreFatigue)
                         priority = 2.f;
                     float overheal = 0.f;
@@ -456,9 +456,8 @@ namespace MWMechanics
                         heal = damage;
                     }
 
-                    priority = (std::pow(priority + heal / current.getModified(), damage * 4.f / current.getModified())
-                                   - priority - overheal / current.getModified())
-                        / priority;
+                    priority = (priority - 1.f) / 2.f * std::pow((damage / current.getModified() + 0.6f), priority * 2)
+                        + priority * (heal - 2.f * overheal) / current.getModified() - 0.5f;
                     rating = priority;
                 }
                 break;
@@ -735,12 +734,12 @@ namespace MWMechanics
         static const float fAIMagicSpellMult = gmst.find("fAIMagicSpellMult")->mValue.getFloat();
         static const float fAIRangeMagicSpellMult = gmst.find("fAIRangeMagicSpellMult")->mValue.getFloat();
 
-        for (const ESM::ENAMstruct& effect : list.mList)
+        for (const ESM::IndexedENAMstruct& effect : list.mList)
         {
-            float effectRating = rateEffect(effect, actor, enemy);
+            float effectRating = rateEffect(effect.mData, actor, enemy);
             if (useSpellMult)
             {
-                if (effect.mRange == ESM::RT_Target)
+                if (effect.mData.mRange == ESM::RT_Target)
                     effectRating *= fAIRangeMagicSpellMult;
                 else
                     effectRating *= fAIMagicSpellMult;
@@ -760,10 +759,10 @@ namespace MWMechanics
 
         float mult = fAIMagicSpellMult;
 
-        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spell->mEffects.mList.begin();
+        for (std::vector<ESM::IndexedENAMstruct>::const_iterator effectIt = spell->mEffects.mList.begin();
              effectIt != spell->mEffects.mList.end(); ++effectIt)
         {
-            if (effectIt->mRange == ESM::RT_Target)
+            if (effectIt->mData.mRange == ESM::RT_Target)
             {
                 if (!MWBase::Environment::get().getWorld()->isSwimming(enemy))
                     mult = fAIRangeMagicSpellMult;
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 12da7cdde8..d2baedab0f 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -60,14 +60,17 @@ namespace MWMechanics
         return std::find(mSpells.begin(), mSpells.end(), spell) != mSpells.end();
     }
 
-    void Spells::add(const ESM::Spell* spell)
+    void Spells::add(const ESM::Spell* spell, bool modifyBase)
     {
-        mSpellList->add(spell);
+        if (modifyBase)
+            mSpellList->add(spell);
+        else
+            addSpell(spell);
     }
 
-    void Spells::add(const ESM::RefId& spellId)
+    void Spells::add(const ESM::RefId& spellId, bool modifyBase)
     {
-        add(SpellList::getSpell(spellId));
+        add(SpellList::getSpell(spellId), modifyBase);
     }
 
     void Spells::addSpell(const ESM::Spell* spell)
@@ -76,13 +79,17 @@ namespace MWMechanics
             mSpells.emplace_back(spell);
     }
 
-    void Spells::remove(const ESM::RefId& spellId)
+    void Spells::remove(const ESM::RefId& spellId, bool modifyBase)
     {
-        const auto spell = SpellList::getSpell(spellId);
-        removeSpell(spell);
-        mSpellList->remove(spell);
+        remove(SpellList::getSpell(spellId), modifyBase);
+    }
 
-        if (spellId == mSelectedSpell)
+    void Spells::remove(const ESM::Spell* spell, bool modifyBase)
+    {
+        removeSpell(spell);
+        if (modifyBase)
+            mSpellList->remove(spell);
+        if (spell->mId == mSelectedSpell)
             mSelectedSpell = ESM::RefId();
     }
 
@@ -174,7 +181,7 @@ namespace MWMechanics
     {
         for (const auto& effectIt : spell->mEffects.mList)
         {
-            if (effectIt.mEffectID == ESM::MagicEffect::Corprus)
+            if (effectIt.mData.mEffectID == ESM::MagicEffect::Corprus)
             {
                 return true;
             }
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 685823b131..36c50b47c3 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -74,24 +74,25 @@ namespace MWMechanics
         bool hasSpell(const ESM::RefId& spell) const;
         bool hasSpell(const ESM::Spell* spell) const;
 
-        void add(const ESM::RefId& spell);
+        void add(const ESM::RefId& spell, bool modifyBase = true);
         ///< Adding a spell that is already listed in *this is a no-op.
 
-        void add(const ESM::Spell* spell);
+        void add(const ESM::Spell* spell, bool modifyBase = true);
         ///< Adding a spell that is already listed in *this is a no-op.
 
-        void remove(const ESM::RefId& spell);
+        void remove(const ESM::RefId& spell, bool modifyBase = true);
+        void remove(const ESM::Spell* spell, bool modifyBase = true);
         ///< If the spell to be removed is the selected spell, the selected spell will be changed to
-        /// no spell (empty string).
+        /// no spell (empty id).
 
         void clear(bool modifyBase = false);
-        ///< Remove all spells of al types.
+        ///< Remove all spells of all types.
 
         void setSelectedSpell(const ESM::RefId& spellId);
         ///< This function does not verify, if the spell is available.
 
         const ESM::RefId& getSelectedSpell() const;
-        ///< May return an empty string.
+        ///< May return an empty id.
 
         bool hasCommonDisease() const;
 
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index 2a63a3a444..022aaec262 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -2,7 +2,9 @@
 
 #include <limits>
 
+#include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadingr.hpp>
 #include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -22,13 +24,13 @@ namespace MWMechanics
         {
             float cost = 0;
 
-            for (const ESM::ENAMstruct& effect : list.mList)
+            for (const ESM::IndexedENAMstruct& effect : list.mList)
             {
-                float effectCost = std::max(0.f, MWMechanics::calcEffectCost(effect, nullptr, method));
+                float effectCost = std::max(0.f, MWMechanics::calcEffectCost(effect.mData, nullptr, method));
 
                 // This is applied to the whole spell cost for each effect when
                 // creating spells, but is only applied on the effect itself in TES:CS.
-                if (effect.mRange == ESM::RT_Target)
+                if (effect.mData.mRange == ESM::RT_Target)
                     effectCost *= 1.5;
 
                 cost += effectCost;
@@ -48,7 +50,7 @@ namespace MWMechanics
         bool appliedOnce = magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce;
         int minMagn = hasMagnitude ? effect.mMagnMin : 1;
         int maxMagn = hasMagnitude ? effect.mMagnMax : 1;
-        if (method != EffectCostMethod::GameEnchantment)
+        if (method == EffectCostMethod::PlayerSpell || method == EffectCostMethod::GameSpell)
         {
             minMagn = std::max(1, minMagn);
             maxMagn = std::max(1, maxMagn);
@@ -57,21 +59,28 @@ namespace MWMechanics
         if (!appliedOnce)
             duration = std::max(1, duration);
         static const float fEffectCostMult = store.get<ESM::GameSetting>().find("fEffectCostMult")->mValue.getFloat();
+        static const float iAlchemyMod = store.get<ESM::GameSetting>().find("iAlchemyMod")->mValue.getFloat();
 
         int durationOffset = 0;
         int minArea = 0;
+        float costMult = fEffectCostMult;
         if (method == EffectCostMethod::PlayerSpell)
         {
             durationOffset = 1;
             minArea = 1;
         }
+        else if (method == EffectCostMethod::GamePotion)
+        {
+            minArea = 1;
+            costMult = iAlchemyMod;
+        }
 
         float x = 0.5 * (minMagn + maxMagn);
         x *= 0.1 * magicEffect->mData.mBaseCost;
         x *= durationOffset + duration;
         x += 0.05 * std::max(minArea, effect.mArea) * magicEffect->mData.mBaseCost;
 
-        return x * fEffectCostMult;
+        return x * costMult;
     }
 
     int calcSpellCost(const ESM::Spell& spell)
@@ -140,25 +149,93 @@ namespace MWMechanics
         return enchantment.mData.mCharge;
     }
 
+    int getPotionValue(const ESM::Potion& potion)
+    {
+        if (potion.mData.mFlags & ESM::Potion::Autocalc)
+        {
+            float cost = getTotalCost(potion.mEffects, EffectCostMethod::GamePotion);
+            return std::round(cost);
+        }
+        return potion.mData.mValue;
+    }
+
+    std::optional<ESM::EffectList> rollIngredientEffect(
+        MWWorld::Ptr caster, const ESM::Ingredient* ingredient, uint32_t index)
+    {
+        if (index >= 4)
+            throw std::range_error("Index out of range");
+
+        ESM::ENAMstruct effect;
+        effect.mEffectID = ingredient->mData.mEffectID[index];
+        effect.mSkill = ingredient->mData.mSkills[index];
+        effect.mAttribute = ingredient->mData.mAttributes[index];
+        effect.mRange = ESM::RT_Self;
+        effect.mArea = 0;
+
+        if (effect.mEffectID < 0)
+            return std::nullopt;
+
+        const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
+        const auto magicEffect = store.get<ESM::MagicEffect>().find(effect.mEffectID);
+        const MWMechanics::CreatureStats& creatureStats = caster.getClass().getCreatureStats(caster);
+
+        float x = (caster.getClass().getSkill(caster, ESM::Skill::Alchemy)
+                      + 0.2f * creatureStats.getAttribute(ESM::Attribute::Intelligence).getModified()
+                      + 0.1f * creatureStats.getAttribute(ESM::Attribute::Luck).getModified())
+            * creatureStats.getFatigueTerm();
+
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::roll0to99(prng);
+        if (roll > x)
+        {
+            return std::nullopt;
+        }
+
+        float magnitude = 0;
+        float y = roll / std::min(x, 100.f);
+        y *= 0.25f * x;
+        if (magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
+            effect.mDuration = 1;
+        else
+            effect.mDuration = static_cast<int>(y);
+        if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
+        {
+            if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
+                magnitude = floor((0.05f * y) / (0.1f * magicEffect->mData.mBaseCost));
+            else
+                magnitude = floor(y / (0.1f * magicEffect->mData.mBaseCost));
+            magnitude = std::max(1.f, magnitude);
+        }
+        else
+            magnitude = 1;
+
+        effect.mMagnMax = static_cast<int>(magnitude);
+        effect.mMagnMin = static_cast<int>(magnitude);
+
+        ESM::EffectList effects;
+        effects.mList.push_back({ effect, index });
+        return effects;
+    }
+
     float calcSpellBaseSuccessChance(const ESM::Spell* spell, const MWWorld::Ptr& actor, ESM::RefId* effectiveSchool)
     {
         // Morrowind for some reason uses a formula slightly different from magicka cost calculation
         float y = std::numeric_limits<float>::max();
         float lowestSkill = 0;
 
-        for (const ESM::ENAMstruct& effect : spell->mEffects.mList)
+        for (const ESM::IndexedENAMstruct& effect : spell->mEffects.mList)
         {
-            float x = static_cast<float>(effect.mDuration);
+            float x = static_cast<float>(effect.mData.mDuration);
             const auto magicEffect
-                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effect.mEffectID);
+                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effect.mData.mEffectID);
 
             if (!(magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce))
                 x = std::max(1.f, x);
 
             x *= 0.1f * magicEffect->mData.mBaseCost;
-            x *= 0.5f * (effect.mMagnMin + effect.mMagnMax);
-            x += effect.mArea * 0.05f * magicEffect->mData.mBaseCost;
-            if (effect.mRange == ESM::RT_Target)
+            x *= 0.5f * (effect.mData.mMagnMin + effect.mData.mMagnMax);
+            x += effect.mData.mArea * 0.05f * magicEffect->mData.mBaseCost;
+            if (effect.mData.mRange == ESM::RT_Target)
                 x *= 1.5f;
             static const float fEffectCostMult = MWBase::Environment::get()
                                                      .getESMStore()
diff --git a/apps/openmw/mwmechanics/spellutil.hpp b/apps/openmw/mwmechanics/spellutil.hpp
index a332a231e6..fb9d14c8a5 100644
--- a/apps/openmw/mwmechanics/spellutil.hpp
+++ b/apps/openmw/mwmechanics/spellutil.hpp
@@ -3,11 +3,16 @@
 
 #include <components/esm3/loadskil.hpp>
 
+#include <optional>
+
 namespace ESM
 {
+    struct EffectList;
     struct ENAMstruct;
     struct Enchantment;
+    struct Ingredient;
     struct MagicEffect;
+    struct Potion;
     struct Spell;
 }
 
@@ -23,6 +28,7 @@ namespace MWMechanics
         GameSpell,
         PlayerSpell,
         GameEnchantment,
+        GamePotion,
     };
 
     float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect = nullptr,
@@ -33,6 +39,10 @@ namespace MWMechanics
     int getEffectiveEnchantmentCastCost(const ESM::Enchantment& enchantment, const MWWorld::Ptr& actor);
     int getEnchantmentCharge(const ESM::Enchantment& enchantment);
 
+    int getPotionValue(const ESM::Potion& potion);
+    std::optional<ESM::EffectList> rollIngredientEffect(
+        MWWorld::Ptr caster, const ESM::Ingredient* ingredient, uint32_t index = 0);
+
     /**
      * @param spell spell to cast
      * @param actor calculate spell success chance for this actor (depends on actor's skills)
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 2af5a2dc83..78d4976040 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -90,27 +90,24 @@ namespace MWMechanics
             {
                 auto world = MWBase::Environment::get().getWorld();
                 MWWorld::ManualRef ref(world->getStore(), creatureID, 1);
+                MWWorld::Ptr placed = world->safePlaceObject(ref.getPtr(), summoner, summoner.getCell(), 0, 120.f);
 
-                MWMechanics::CreatureStats& summonedCreatureStats
-                    = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
+                MWMechanics::CreatureStats& summonedCreatureStats = placed.getClass().getCreatureStats(placed);
 
                 // Make the summoned creature follow its master and help in fights
                 AiFollow package(summoner);
-                summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
+                summonedCreatureStats.getAiSequence().stack(package, placed);
                 creatureActorId = summonedCreatureStats.getActorId();
 
-                MWWorld::Ptr placed = world->safePlaceObject(ref.getPtr(), summoner, summoner.getCell(), 0, 120.f);
-
                 MWRender::Animation* anim = world->getAnimation(placed);
                 if (anim)
                 {
                     const ESM::Static* fx
                         = world->getStore().get<ESM::Static>().search(ESM::RefId::stringRefId("VFX_Summon_Start"));
                     if (fx)
-                    {
-                        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                        anim->addEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), -1, false);
-                    }
+                        anim->addEffect(
+                            Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(fx->mModel)).value(), "",
+                            false);
                 }
             }
             catch (std::exception& e)
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
deleted file mode 100644
index 9500897f25..0000000000
--- a/apps/openmw/mwmechanics/trading.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include "trading.hpp"
-
-#include <components/misc/rng.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
-
-#include "creaturestats.hpp"
-
-namespace MWMechanics
-{
-    Trading::Trading() {}
-
-    bool Trading::haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer)
-    {
-        // accept if merchant offer is better than player offer
-        if (playerOffer <= merchantOffer)
-        {
-            return true;
-        }
-
-        // reject if npc is a creature
-        if (merchant.getType() != ESM::NPC::sRecordId)
-        {
-            return false;
-        }
-
-        const MWWorld::Store<ESM::GameSetting>& gmst
-            = MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
-
-        // Is the player buying?
-        bool buying = (merchantOffer < 0);
-        int a = std::abs(merchantOffer);
-        int b = std::abs(playerOffer);
-        int d = (buying) ? int(100 * (a - b) / a) : int(100 * (b - a) / b);
-
-        int clampedDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(merchant);
-
-        const MWMechanics::CreatureStats& merchantStats = merchant.getClass().getCreatureStats(merchant);
-        const MWMechanics::CreatureStats& playerStats = player.getClass().getCreatureStats(player);
-
-        float a1 = static_cast<float>(player.getClass().getSkill(player, ESM::Skill::Mercantile));
-        float b1 = 0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified();
-        float c1 = 0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified();
-        float d1 = static_cast<float>(merchant.getClass().getSkill(merchant, ESM::Skill::Mercantile));
-        float e1 = 0.1f * merchantStats.getAttribute(ESM::Attribute::Luck).getModified();
-        float f1 = 0.2f * merchantStats.getAttribute(ESM::Attribute::Personality).getModified();
-
-        float dispositionTerm = gmst.find("fDispositionMod")->mValue.getFloat() * (clampedDisposition - 50);
-        float pcTerm = (dispositionTerm + a1 + b1 + c1) * playerStats.getFatigueTerm();
-        float npcTerm = (d1 + e1 + f1) * merchantStats.getFatigueTerm();
-        float x = gmst.find("fBargainOfferMulti")->mValue.getFloat() * d
-            + gmst.find("fBargainOfferBase")->mValue.getFloat() + int(pcTerm - npcTerm);
-
-        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-        int roll = Misc::Rng::rollDice(100, prng) + 1;
-
-        // reject if roll fails
-        // (or if player tries to buy things and get money)
-        if (roll > x || (merchantOffer < 0 && 0 < playerOffer))
-        {
-            return false;
-        }
-
-        // apply skill gain on successful barter
-        float skillGain = 0.f;
-        int finalPrice = std::abs(playerOffer);
-        int initialMerchantOffer = std::abs(merchantOffer);
-
-        if (!buying && (finalPrice > initialMerchantOffer))
-        {
-            skillGain = std::floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
-        }
-        else if (buying && (finalPrice < initialMerchantOffer))
-        {
-            skillGain = std::floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer);
-        }
-        player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);
-
-        return true;
-    }
-}
diff --git a/apps/openmw/mwmechanics/trading.hpp b/apps/openmw/mwmechanics/trading.hpp
deleted file mode 100644
index e30b82f5e8..0000000000
--- a/apps/openmw/mwmechanics/trading.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef OPENMW_MECHANICS_TRADING_H
-#define OPENMW_MECHANICS_TRADING_H
-
-namespace MWWorld
-{
-    class Ptr;
-}
-
-namespace MWMechanics
-{
-    class Trading
-    {
-    public:
-        Trading();
-
-        bool haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer);
-    };
-}
-
-#endif
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index e0584afcd4..dd83db286f 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -118,13 +118,17 @@ namespace MWMechanics
         }
 
         int value = 50.f;
-        if (actor.getClass().isNpc())
-        {
-            ESM::RefId skill = item.getClass().getEquipmentSkill(item);
-            if (!skill.empty())
-                value = actor.getClass().getSkill(actor, skill);
-        }
-        else
+        ESM::RefId skill = item.getClass().getEquipmentSkill(item);
+        if (!skill.empty())
+            value = actor.getClass().getSkill(actor, skill);
+        // Prefer hand-to-hand if our skill is 0 (presumably due to magic)
+        if (value <= 0.f)
+            return 0.f;
+        // Note that a creature with a dagger and 0 Stealth will forgo the weapon despite using Combat for hit chance.
+        // The same creature will use a sword provided its Combat stat isn't 0. We're using the "skill" value here to
+        // decide whether to use the weapon at all, but adjusting the final rating based on actual hit chance - i.e. the
+        // Combat stat.
+        if (!actor.getClass().isNpc())
         {
             MWWorld::LiveCellRef<ESM::Creature>* ref = actor.get<ESM::Creature>();
             value = ref->mBase->mData.mCombat;
diff --git a/apps/openmw/mwmechanics/weapontype.cpp b/apps/openmw/mwmechanics/weapontype.cpp
index 9dd5842f58..8c51629803 100644
--- a/apps/openmw/mwmechanics/weapontype.cpp
+++ b/apps/openmw/mwmechanics/weapontype.cpp
@@ -8,6 +8,8 @@
 
 #include <components/esm3/loadweap.hpp>
 
+#include <set>
+
 namespace MWMechanics
 {
     template <enum ESM::Weapon::Type>
@@ -416,4 +418,18 @@ namespace MWMechanics
 
         return &Weapon<ESM::Weapon::ShortBladeOneHand>::getValue();
     }
+
+    std::vector<std::string_view> getAllWeaponTypeShortGroups()
+    {
+        // Go via a set to eliminate duplicates.
+        std::set<std::string_view> shortGroupSet;
+        for (int type = ESM::Weapon::Type::First; type <= ESM::Weapon::Type::Last; type++)
+        {
+            std::string_view shortGroup = getWeaponType(type)->mShortGroup;
+            if (!shortGroup.empty())
+                shortGroupSet.insert(shortGroup);
+        }
+
+        return std::vector<std::string_view>(shortGroupSet.begin(), shortGroupSet.end());
+    }
 }
diff --git a/apps/openmw/mwmechanics/weapontype.hpp b/apps/openmw/mwmechanics/weapontype.hpp
index db7b3013f6..efe404d327 100644
--- a/apps/openmw/mwmechanics/weapontype.hpp
+++ b/apps/openmw/mwmechanics/weapontype.hpp
@@ -1,6 +1,9 @@
 #ifndef GAME_MWMECHANICS_WEAPONTYPE_H
 #define GAME_MWMECHANICS_WEAPONTYPE_H
 
+#include <string_view>
+#include <vector>
+
 namespace ESM
 {
     struct WeaponType;
@@ -21,6 +24,8 @@ namespace MWMechanics
     MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int* weaptype);
 
     const ESM::WeaponType* getWeaponType(const int weaponType);
+
+    std::vector<std::string_view> getAllWeaponTypeShortGroups();
 }
 
 #endif
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index dec055d68f..e1efe6d242 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -102,7 +102,11 @@ namespace MWPhysics
         updateScaleUnsafe();
 
         if (!mRotationallyInvariant)
-            mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
+        {
+            const SceneUtil::PositionAttitudeTransform* baseNode = mPtr.getRefData().getBaseNode();
+            if (baseNode)
+                mRotation = baseNode->getAttitude();
+        }
 
         addCollisionMask(getCollisionMask());
         updateCollisionObjectPositionUnsafe();
diff --git a/apps/openmw/mwphysics/actorconvexcallback.cpp b/apps/openmw/mwphysics/actorconvexcallback.cpp
index db077beb31..72bb0eff46 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@@ -9,35 +9,28 @@
 
 namespace MWPhysics
 {
-    class ActorOverlapTester : public btCollisionWorld::ContactResultCallback
+    namespace
     {
-    public:
-        bool overlapping = false;
-
-        btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap, int partId0,
-            int index0, const btCollisionObjectWrapper* colObj1Wrap, int partId1, int index1) override
+        struct ActorOverlapTester : public btCollisionWorld::ContactResultCallback
         {
-            if (cp.getDistance() <= 0.0f)
-                overlapping = true;
-            return btScalar(1);
-        }
-    };
+            bool mOverlapping = false;
 
-    ActorConvexCallback::ActorConvexCallback(
-        const btCollisionObject* me, const btVector3& motion, btScalar minCollisionDot, const btCollisionWorld* world)
-        : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0))
-        , mMe(me)
-        , mMotion(motion)
-        , mMinCollisionDot(minCollisionDot)
-        , mWorld(world)
-    {
+            btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* /*colObj0Wrap*/,
+                int /*partId0*/, int /*index0*/, const btCollisionObjectWrapper* /*colObj1Wrap*/, int /*partId1*/,
+                int /*index1*/) override
+            {
+                if (cp.getDistance() <= 0.0f)
+                    mOverlapping = true;
+                return 1;
+            }
+        };
     }
 
     btScalar ActorConvexCallback::addSingleResult(
         btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
     {
         if (convexResult.m_hitCollisionObject == mMe)
-            return btScalar(1);
+            return 1;
 
         // override data for actor-actor collisions
         // vanilla Morrowind seems to make overlapping actors collide as though they are both cylinders with a diameter
@@ -52,7 +45,7 @@ namespace MWPhysics
                 const_cast<btCollisionObject*>(mMe), const_cast<btCollisionObject*>(convexResult.m_hitCollisionObject),
                 isOverlapping);
 
-            if (isOverlapping.overlapping)
+            if (isOverlapping.mOverlapping)
             {
                 auto originA = Misc::Convert::toOsg(mMe->getWorldTransform().getOrigin());
                 auto originB = Misc::Convert::toOsg(convexResult.m_hitCollisionObject->getWorldTransform().getOrigin());
@@ -73,7 +66,7 @@ namespace MWPhysics
                 }
                 else
                 {
-                    return btScalar(1);
+                    return 1;
                 }
             }
         }
@@ -82,10 +75,10 @@ namespace MWPhysics
         {
             auto* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
             if (!projectileHolder->isActive())
-                return btScalar(1);
+                return 1;
             if (projectileHolder->isValidTarget(mMe))
                 projectileHolder->hit(mMe, convexResult.m_hitPointLocal, convexResult.m_hitNormalLocal);
-            return btScalar(1);
+            return 1;
         }
 
         btVector3 hitNormalWorld;
@@ -101,7 +94,7 @@ namespace MWPhysics
         // dot product of the motion vector against the collision contact normal
         btScalar dotCollision = mMotion.dot(hitNormalWorld);
         if (dotCollision <= mMinCollisionDot)
-            return btScalar(1);
+            return 1;
 
         return ClosestConvexResultCallback::addSingleResult(convexResult, normalInWorldSpace);
     }
diff --git a/apps/openmw/mwphysics/actorconvexcallback.hpp b/apps/openmw/mwphysics/actorconvexcallback.hpp
index 4b9ab1a8a4..8442097a09 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.hpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.hpp
@@ -10,8 +10,15 @@ namespace MWPhysics
     class ActorConvexCallback : public btCollisionWorld::ClosestConvexResultCallback
     {
     public:
-        ActorConvexCallback(const btCollisionObject* me, const btVector3& motion, btScalar minCollisionDot,
-            const btCollisionWorld* world);
+        explicit ActorConvexCallback(const btCollisionObject* me, const btVector3& motion, btScalar minCollisionDot,
+            const btCollisionWorld* world)
+            : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0))
+            , mMe(me)
+            , mMotion(motion)
+            , mMinCollisionDot(minCollisionDot)
+            , mWorld(world)
+        {
+        }
 
         btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace) override;
 
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index 30a42bc3b8..b63cd568a8 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -1,7 +1,6 @@
 #include "closestnotmerayresultcallback.hpp"
 
 #include <algorithm>
-#include <utility>
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
@@ -9,19 +8,11 @@
 
 namespace MWPhysics
 {
-    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me,
-        std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to)
-        : btCollisionWorld::ClosestRayResultCallback(from, to)
-        , mMe(me)
-        , mTargets(std::move(targets))
-    {
-    }
-
     btScalar ClosestNotMeRayResultCallback::addSingleResult(
         btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace)
     {
         const auto* hitObject = rayResult.m_collisionObject;
-        if (hitObject == mMe)
+        if (std::find(mIgnoreList.begin(), mIgnoreList.end(), hitObject) != mIgnoreList.end())
             return 1.f;
 
         if (hitObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor && !mTargets.empty())
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
index e6f5c45d36..660f24424d 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWPHYSICS_CLOSESTNOTMERAYRESULTCALLBACK_H
 #define OPENMW_MWPHYSICS_CLOSESTNOTMERAYRESULTCALLBACK_H
 
-#include <vector>
+#include <span>
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
@@ -14,14 +14,19 @@ namespace MWPhysics
     class ClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
     {
     public:
-        ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*> targets,
-            const btVector3& from, const btVector3& to);
+        explicit ClosestNotMeRayResultCallback(std::span<const btCollisionObject*> ignore,
+            std::span<const btCollisionObject*> targets, const btVector3& from, const btVector3& to)
+            : btCollisionWorld::ClosestRayResultCallback(from, to)
+            , mIgnoreList(ignore)
+            , mTargets(targets)
+        {
+        }
 
         btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace) override;
 
     private:
-        const btCollisionObject* mMe;
-        const std::vector<const btCollisionObject*> mTargets;
+        const std::span<const btCollisionObject*> mIgnoreList;
+        const std::span<const btCollisionObject*> mTargets;
     };
 }
 
diff --git a/apps/openmw/mwphysics/contacttestresultcallback.cpp b/apps/openmw/mwphysics/contacttestresultcallback.cpp
index dae0a65af0..45d1127de4 100644
--- a/apps/openmw/mwphysics/contacttestresultcallback.cpp
+++ b/apps/openmw/mwphysics/contacttestresultcallback.cpp
@@ -8,13 +8,8 @@
 
 namespace MWPhysics
 {
-    ContactTestResultCallback::ContactTestResultCallback(const btCollisionObject* testedAgainst)
-        : mTestedAgainst(testedAgainst)
-    {
-    }
-
     btScalar ContactTestResultCallback::addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* col0Wrap,
-        int partId0, int index0, const btCollisionObjectWrapper* col1Wrap, int partId1, int index1)
+        int /*partId0*/, int /*index0*/, const btCollisionObjectWrapper* col1Wrap, int /*partId1*/, int /*index1*/)
     {
         const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
         if (collisionObject == mTestedAgainst)
diff --git a/apps/openmw/mwphysics/contacttestresultcallback.hpp b/apps/openmw/mwphysics/contacttestresultcallback.hpp
index ae900e0208..a9ba06368c 100644
--- a/apps/openmw/mwphysics/contacttestresultcallback.hpp
+++ b/apps/openmw/mwphysics/contacttestresultcallback.hpp
@@ -14,15 +14,19 @@ namespace MWPhysics
 {
     class ContactTestResultCallback : public btCollisionWorld::ContactResultCallback
     {
-        const btCollisionObject* mTestedAgainst;
-
     public:
-        ContactTestResultCallback(const btCollisionObject* testedAgainst);
+        explicit ContactTestResultCallback(const btCollisionObject* testedAgainst)
+            : mTestedAgainst(testedAgainst)
+        {
+        }
 
         btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* col0Wrap, int partId0, int index0,
             const btCollisionObjectWrapper* col1Wrap, int partId1, int index1) override;
 
         std::vector<ContactPoint> mResult;
+
+    private:
+        const btCollisionObject* mTestedAgainst;
     };
 }
 
diff --git a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
deleted file mode 100644
index 766ca79796..0000000000
--- a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "deepestnotmecontacttestresultcallback.hpp"
-
-#include <algorithm>
-
-#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
-
-#include "collisiontype.hpp"
-
-namespace MWPhysics
-{
-
-    DeepestNotMeContactTestResultCallback::DeepestNotMeContactTestResultCallback(
-        const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& origin)
-        : mMe(me)
-        , mTargets(targets)
-        , mOrigin(origin)
-        , mLeastDistSqr(std::numeric_limits<float>::max())
-    {
-    }
-
-    btScalar DeepestNotMeContactTestResultCallback::addSingleResult(btManifoldPoint& cp,
-        const btCollisionObjectWrapper* col0Wrap, int partId0, int index0, const btCollisionObjectWrapper* col1Wrap,
-        int partId1, int index1)
-    {
-        const btCollisionObject* collisionObject = col1Wrap->m_collisionObject;
-        if (collisionObject != mMe)
-        {
-            if (collisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor
-                && !mTargets.empty())
-            {
-                if ((std::find(mTargets.begin(), mTargets.end(), collisionObject) == mTargets.end()))
-                    return 0.f;
-            }
-
-            btScalar distsqr = mOrigin.distance2(cp.getPositionWorldOnA());
-            if (!mObject || distsqr < mLeastDistSqr)
-            {
-                mObject = collisionObject;
-                mLeastDistSqr = distsqr;
-                mContactPoint = cp.getPositionWorldOnA();
-                mContactNormal = cp.m_normalWorldOnB;
-            }
-        }
-
-        return 0.f;
-    }
-}
diff --git a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.hpp b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.hpp
deleted file mode 100644
index d22a79e643..0000000000
--- a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef OPENMW_MWPHYSICS_DEEPESTNOTMECONTACTTESTRESULTCALLBACK_H
-#define OPENMW_MWPHYSICS_DEEPESTNOTMECONTACTTESTRESULTCALLBACK_H
-
-#include <vector>
-
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
-
-class btCollisionObject;
-
-namespace MWPhysics
-{
-    class DeepestNotMeContactTestResultCallback : public btCollisionWorld::ContactResultCallback
-    {
-        const btCollisionObject* mMe;
-        const std::vector<const btCollisionObject*> mTargets;
-
-        // Store the real origin, since the shape's origin is its center
-        btVector3 mOrigin;
-
-    public:
-        const btCollisionObject* mObject{ nullptr };
-        btVector3 mContactPoint{ 0, 0, 0 };
-        btVector3 mContactNormal{ 0, 0, 0 };
-        btScalar mLeastDistSqr;
-
-        DeepestNotMeContactTestResultCallback(
-            const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& origin);
-
-        btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* col0Wrap, int partId0, int index0,
-            const btCollisionObjectWrapper* col1Wrap, int partId1, int index1) override;
-    };
-}
-
-#endif
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index c0b5014b31..554cd7586a 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -15,6 +15,7 @@
 #include "collisiontype.hpp"
 #include "constants.hpp"
 #include "contacttestwrapper.h"
+#include "object.hpp"
 #include "physicssystem.hpp"
 #include "projectile.hpp"
 #include "projectileconvexcallback.hpp"
@@ -31,53 +32,58 @@ namespace MWPhysics
         return obj->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor;
     }
 
-    class ContactCollectionCallback : public btCollisionWorld::ContactResultCallback
+    namespace
     {
-    public:
-        ContactCollectionCallback(const btCollisionObject* me, osg::Vec3f velocity)
-            : mMe(me)
+        class ContactCollectionCallback : public btCollisionWorld::ContactResultCallback
         {
-            m_collisionFilterGroup = me->getBroadphaseHandle()->m_collisionFilterGroup;
-            m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask & ~CollisionType_Projectile;
-            mVelocity = Misc::Convert::toBullet(velocity);
-        }
-        btScalar addSingleResult(btManifoldPoint& contact, const btCollisionObjectWrapper* colObj0Wrap, int partId0,
-            int index0, const btCollisionObjectWrapper* colObj1Wrap, int partId1, int index1) override
-        {
-            if (isActor(colObj0Wrap->getCollisionObject()) && isActor(colObj1Wrap->getCollisionObject()))
-                return 0.0;
-            // ignore overlap if we're moving in the same direction as it would push us out (don't change this to >=,
-            // that would break detection when not moving)
-            if (contact.m_normalWorldOnB.dot(mVelocity) > 0.0)
-                return 0.0;
-            auto delta = contact.m_normalWorldOnB * -contact.m_distance1;
-            mContactSum += delta;
-            mMaxX = std::max(std::abs(delta.x()), mMaxX);
-            mMaxY = std::max(std::abs(delta.y()), mMaxY);
-            mMaxZ = std::max(std::abs(delta.z()), mMaxZ);
-            if (contact.m_distance1 < mDistance)
+        public:
+            explicit ContactCollectionCallback(const btCollisionObject& me, const osg::Vec3f& velocity)
+                : mVelocity(Misc::Convert::toBullet(velocity))
             {
-                mDistance = contact.m_distance1;
-                mNormal = contact.m_normalWorldOnB;
-                mDelta = delta;
-                return mDistance;
+                m_collisionFilterGroup = me.getBroadphaseHandle()->m_collisionFilterGroup;
+                m_collisionFilterMask = me.getBroadphaseHandle()->m_collisionFilterMask & ~CollisionType_Projectile;
             }
-            else
+
+            btScalar addSingleResult(btManifoldPoint& contact, const btCollisionObjectWrapper* colObj0Wrap,
+                int /*partId0*/, int /*index0*/, const btCollisionObjectWrapper* colObj1Wrap, int /*partId1*/,
+                int /*index1*/) override
             {
-                return 0.0;
+                if (isActor(colObj0Wrap->getCollisionObject()) && isActor(colObj1Wrap->getCollisionObject()))
+                    return 0.0;
+                // ignore overlap if we're moving in the same direction as it would push us out (don't change this to
+                // >=, that would break detection when not moving)
+                if (contact.m_normalWorldOnB.dot(mVelocity) > 0.0)
+                    return 0.0;
+                auto delta = contact.m_normalWorldOnB * -contact.m_distance1;
+                mContactSum += delta;
+                mMaxX = std::max(std::abs(delta.x()), mMaxX);
+                mMaxY = std::max(std::abs(delta.y()), mMaxY);
+                mMaxZ = std::max(std::abs(delta.z()), mMaxZ);
+                if (contact.m_distance1 < mDistance)
+                {
+                    mDistance = contact.m_distance1;
+                    mNormal = contact.m_normalWorldOnB;
+                    mDelta = delta;
+                    return mDistance;
+                }
+                else
+                {
+                    return 0.0;
+                }
             }
-        }
-        btScalar mMaxX = 0.0;
-        btScalar mMaxY = 0.0;
-        btScalar mMaxZ = 0.0;
-        btVector3 mContactSum{ 0.0, 0.0, 0.0 };
-        btVector3 mNormal{ 0.0, 0.0, 0.0 }; // points towards "me"
-        btVector3 mDelta{ 0.0, 0.0, 0.0 }; // points towards "me"
-        btScalar mDistance = 0.0; // negative or zero
-    protected:
-        btVector3 mVelocity;
-        const btCollisionObject* mMe;
-    };
+
+            btScalar mMaxX = 0.0;
+            btScalar mMaxY = 0.0;
+            btScalar mMaxZ = 0.0;
+            btVector3 mContactSum{ 0.0, 0.0, 0.0 };
+            btVector3 mNormal{ 0.0, 0.0, 0.0 }; // points towards "me"
+            btVector3 mDelta{ 0.0, 0.0, 0.0 }; // points towards "me"
+            btScalar mDistance = 0.0; // negative or zero
+
+        protected:
+            btVector3 mVelocity;
+        };
+    }
 
     osg::Vec3f MovementSolver::traceDown(const MWWorld::Ptr& ptr, const osg::Vec3f& position, Actor* actor,
         btCollisionWorld* collisionWorld, float maxHeight)
@@ -172,15 +178,10 @@ namespace MWPhysics
         // Now that we have the effective movement vector, apply wind forces to it
         if (worldData.mIsInStorm && velocity.length() > 0)
         {
-            osg::Vec3f stormDirection = worldData.mStormDirection;
-            float angleDegrees = osg::RadiansToDegrees(
-                std::acos(stormDirection * velocity / (stormDirection.length() * velocity.length())));
-            static const float fStromWalkMult = MWBase::Environment::get()
-                                                    .getESMStore()
-                                                    ->get<ESM::GameSetting>()
-                                                    .find("fStromWalkMult")
-                                                    ->mValue.getFloat();
-            velocity *= 1.f - (fStromWalkMult * (angleDegrees / 180.f));
+            const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
+            const float fStromWalkMult = store.get<ESM::GameSetting>().find("fStromWalkMult")->mValue.getFloat();
+            const float angleCos = worldData.mStormDirection * velocity / velocity.length();
+            velocity *= 1.f + fStromWalkMult * angleCos;
         }
 
         Stepper stepper(collisionWorld, actor.mCollisionObject);
@@ -243,11 +244,20 @@ namespace MWPhysics
             float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + actor.mHalfExtentsZ;
             osg::Vec3f oldPosition = newPosition;
             bool usedStepLogic = false;
-            if (hitHeight < Constants::sStepSizeUp && !isActor(tracer.mHitObject))
+            if (!isActor(tracer.mHitObject))
             {
-                // Try to step up onto it.
-                // NOTE: this modifies newPosition and velocity on its own if successful
-                usedStepLogic = stepper.step(newPosition, velocity, remainingTime, seenGround, iterations == 0);
+                if (hitHeight < Constants::sStepSizeUp)
+                {
+                    // Try to step up onto it.
+                    // NOTE: this modifies newPosition and velocity on its own if successful
+                    usedStepLogic = stepper.step(newPosition, velocity, remainingTime, seenGround, iterations == 0);
+                }
+                auto* ptrHolder = static_cast<PtrHolder*>(tracer.mHitObject->getUserPointer());
+                if (Object* hitObject = dynamic_cast<Object*>(ptrHolder))
+                {
+                    hitObject->addCollision(
+                        actor.mIsPlayer ? ScriptedCollisionType_Player : ScriptedCollisionType_Actor);
+                }
             }
             if (usedStepLogic)
             {
@@ -444,8 +454,10 @@ namespace MWPhysics
         if (btFrom == btTo)
             return;
 
+        assert(projectile.mProjectile != nullptr);
+
         ProjectileConvexCallback resultCallback(
-            projectile.mCaster, projectile.mCollisionObject, btFrom, btTo, projectile.mProjectile);
+            projectile.mCaster, projectile.mCollisionObject, btFrom, btTo, *projectile.mProjectile);
         resultCallback.m_collisionFilterMask = CollisionType_AnyPhysical;
         resultCallback.m_collisionFilterGroup = CollisionType_Projectile;
 
@@ -514,7 +526,7 @@ namespace MWPhysics
             newTransform.setOrigin(Misc::Convert::toBullet(goodPosition));
             actor.mCollisionObject->setWorldTransform(newTransform);
 
-            ContactCollectionCallback callback{ actor.mCollisionObject, velocity };
+            ContactCollectionCallback callback(*actor.mCollisionObject, velocity);
             ContactTestWrapper::contactTest(
                 const_cast<btCollisionWorld*>(collisionWorld), actor.mCollisionObject, callback);
             return callback;
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 653380decf..aafefe7019 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -16,8 +16,8 @@
 
 #include "components/debug/debuglog.hpp"
 #include "components/misc/convert.hpp"
-#include "components/settings/settings.hpp"
 #include <components/misc/barrier.hpp>
+#include <components/settings/values.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
@@ -275,10 +275,13 @@ namespace
                 if (mAdvanceSimulation)
                 {
                     MWWorld::Ptr standingOn;
-                    auto* ptrHolder
-                        = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
-                    if (ptrHolder)
-                        standingOn = ptrHolder->getPtr();
+                    if (frameData.mStandingOn != nullptr)
+                    {
+                        auto* const ptrHolder
+                            = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
+                        if (ptrHolder != nullptr)
+                            standingOn = ptrHolder->getPtr();
+                    }
                     actor->setStandingOnPtr(standingOn);
                     // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the
                     // change
@@ -314,7 +317,7 @@ namespace MWPhysics
 
         LockingPolicy detectLockingPolicy()
         {
-            if (Settings::Manager::getInt("async num threads", "Physics") < 1)
+            if (Settings::physics().mAsyncNumThreads < 1)
                 return LockingPolicy::NoLocks;
             if (getMaxBulletSupportedThreads() > 1)
                 return LockingPolicy::AllowSharedLocks;
@@ -331,8 +334,8 @@ namespace MWPhysics
                 case LockingPolicy::ExclusiveLocksOnly:
                     return 1;
                 case LockingPolicy::AllowSharedLocks:
-                    return std::clamp<unsigned>(
-                        Settings::Manager::getInt("async num threads", "Physics"), 0, getMaxBulletSupportedThreads());
+                    return static_cast<unsigned>(std::clamp<int>(
+                        Settings::physics().mAsyncNumThreads, 0, static_cast<int>(getMaxBulletSupportedThreads())));
             }
 
             throw std::runtime_error("Unsupported LockingPolicy: "
@@ -407,7 +410,7 @@ namespace MWPhysics
         , mNumThreads(getNumThreads(mLockingPolicy))
         , mNumJobs(0)
         , mRemainingSteps(0)
-        , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
+        , mLOSCacheExpiry(Settings::physics().mLineofsightKeepInactiveCache)
         , mAdvanceSimulation(false)
         , mNextJob(0)
         , mNextLOS(0)
@@ -650,15 +653,15 @@ namespace MWPhysics
     void PhysicsTaskScheduler::addCollisionObject(
         btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask)
     {
-        mCollisionObjects.insert(collisionObject);
         MaybeExclusiveLock lock(mCollisionWorldMutex, mLockingPolicy);
+        mCollisionObjects.insert(collisionObject);
         mCollisionWorld->addCollisionObject(collisionObject, collisionFilterGroup, collisionFilterMask);
     }
 
     void PhysicsTaskScheduler::removeCollisionObject(btCollisionObject* collisionObject)
     {
-        mCollisionObjects.erase(collisionObject);
         MaybeExclusiveLock lock(mCollisionWorldMutex, mLockingPolicy);
+        mCollisionObjects.erase(collisionObject);
         mCollisionWorld->removeCollisionObject(collisionObject);
     }
 
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 57f3711096..579211b489 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -3,7 +3,9 @@
 
 #include <atomic>
 #include <condition_variable>
+#include <memory>
 #include <optional>
+#include <set>
 #include <shared_mutex>
 #include <thread>
 #include <unordered_set>
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 6e0e2cdc7f..5936083f1d 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -23,6 +23,7 @@ namespace MWPhysics
         , mPosition(ptr.getRefData().getPosition().asVec3())
         , mRotation(rotation)
         , mTaskScheduler(scheduler)
+        , mCollidedWith(ScriptedCollisionType_None)
     {
         mCollisionObject = BulletHelpers::makeCollisionObject(mShapeInstance->mCollisionShape.get(),
             Misc::Convert::toBullet(mPosition), Misc::Convert::toBullet(rotation));
@@ -110,6 +111,9 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
+        if (!mPtr.getRefData().getBaseNode())
+            return false;
+
         assert(mShapeInstance->mCollisionShape->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->mCollisionShape.get());
@@ -137,6 +141,7 @@ namespace MWPhysics
 
             osg::NodePath& nodePath = nodePathFound->second;
             osg::Matrixf matrix = osg::computeLocalToWorld(nodePath);
+            btVector3 scale = Misc::Convert::toBullet(matrix.getScale());
             matrix.orthoNormalize(matrix);
 
             btTransform transform;
@@ -145,8 +150,15 @@ namespace MWPhysics
                 for (int j = 0; j < 3; ++j)
                     transform.getBasis()[i][j] = matrix(j, i); // NB column/row major difference
 
-            // Note: we can not apply scaling here for now since we treat scaled shapes
-            // as new shapes (btScaledBvhTriangleMeshShape) with 1.0 scale for now
+            btCollisionShape* childShape = compound->getChildShape(shapeIndex);
+            btVector3 newScale = compound->getLocalScaling() * scale;
+
+            if (childShape->getLocalScaling() != newScale)
+            {
+                childShape->setLocalScaling(newScale);
+                result = true;
+            }
+
             if (!(transform == compound->getChildTransform(shapeIndex)))
             {
                 compound->updateChildTransform(shapeIndex, transform);
@@ -155,4 +167,20 @@ namespace MWPhysics
         }
         return result;
     }
+
+    bool Object::collidedWith(ScriptedCollisionType type) const
+    {
+        return mCollidedWith & type;
+    }
+
+    void Object::addCollision(ScriptedCollisionType type)
+    {
+        std::unique_lock<std::mutex> lock(mPositionMutex);
+        mCollidedWith |= type;
+    }
+
+    void Object::resetCollisions()
+    {
+        mCollidedWith = ScriptedCollisionType_None;
+    }
 }
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index 875f12d879..15b7c46926 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -18,6 +18,14 @@ namespace MWPhysics
 {
     class PhysicsTaskScheduler;
 
+    enum ScriptedCollisionType : char
+    {
+        ScriptedCollisionType_None = 0,
+        ScriptedCollisionType_Actor = 1,
+        // Note that this isn't 3, colliding with a player doesn't count as colliding with an actor
+        ScriptedCollisionType_Player = 2
+    };
+
     class Object final : public PtrHolder
     {
     public:
@@ -38,6 +46,9 @@ namespace MWPhysics
         /// @brief update object shape
         /// @return true if shape changed
         bool animateCollisionShapes();
+        bool collidedWith(ScriptedCollisionType type) const;
+        void addCollision(ScriptedCollisionType type);
+        void resetCollisions();
 
     private:
         osg::ref_ptr<Resource::BulletShapeInstance> mShapeInstance;
@@ -50,6 +61,7 @@ namespace MWPhysics
         bool mTransformUpdatePending = false;
         mutable std::mutex mPositionMutex;
         PhysicsTaskScheduler* mTaskScheduler;
+        char mCollidedWith;
     };
 }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5f13fef571..e236db4633 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -49,7 +49,6 @@
 
 #include "closestnotmerayresultcallback.hpp"
 #include "contacttestresultcallback.hpp"
-#include "deepestnotmecontacttestresultcallback.hpp"
 #include "hasspherecollisioncallback.hpp"
 #include "heightfield.hpp"
 #include "movementsolver.hpp"
@@ -69,7 +68,7 @@ namespace
         // Advance acrobatics and set flag for GetPCJumping
         if (isPlayer)
         {
-            ptr.getClass().skillUsageSucceeded(ptr, ESM::Skill::Acrobatics, 0);
+            ptr.getClass().skillUsageSucceeded(ptr, ESM::Skill::Acrobatics, ESM::Skill::Acrobatics_Jump);
             MWBase::Environment::get().getWorld()->getPlayer().setJumping(true);
         }
 
@@ -94,8 +93,9 @@ namespace
 namespace MWPhysics
 {
     PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
-        : mShapeManager(std::make_unique<Resource::BulletShapeManager>(
-            resourceSystem->getVFS(), resourceSystem->getSceneManager(), resourceSystem->getNifFileManager()))
+        : mShapeManager(
+            std::make_unique<Resource::BulletShapeManager>(resourceSystem->getVFS(), resourceSystem->getSceneManager(),
+                resourceSystem->getNifFileManager(), Settings::cells().mCacheExpiryDelay))
         , mResourceSystem(resourceSystem)
         , mDebugDrawEnabled(false)
         , mTimeAccum(0.0f)
@@ -191,95 +191,9 @@ namespace MWPhysics
         return true;
     }
 
-    std::pair<MWWorld::Ptr, osg::Vec3f> PhysicsSystem::getHitContact(const MWWorld::ConstPtr& actor,
-        const osg::Vec3f& origin, const osg::Quat& orient, float queryDistance, std::vector<MWWorld::Ptr>& targets)
-    {
-        // First of all, try to hit where you aim to
-        int hitmask = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor;
-        RayCastingResult result = castRay(origin, origin + (orient * osg::Vec3f(0.0f, queryDistance, 0.0f)), actor,
-            targets, hitmask, CollisionType_Actor);
-
-        if (result.mHit)
-        {
-            reportCollision(Misc::Convert::toBullet(result.mHitPos), Misc::Convert::toBullet(result.mHitNormal));
-            return std::make_pair(result.mHitObject, result.mHitPos);
-        }
-
-        // Use cone shape as fallback
-        const MWWorld::Store<ESM::GameSetting>& store
-            = MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
-
-        btConeShape shape(osg::DegreesToRadians(store.find("fCombatAngleXY")->mValue.getFloat() / 2.0f), queryDistance);
-        shape.setLocalScaling(btVector3(
-            1, 1, osg::DegreesToRadians(store.find("fCombatAngleZ")->mValue.getFloat() / 2.0f) / shape.getRadius()));
-
-        // The shape origin is its center, so we have to move it forward by half the length. The
-        // real origin will be provided to getFilteredContact to find the closest.
-        osg::Vec3f center = origin + (orient * osg::Vec3f(0.0f, queryDistance * 0.5f, 0.0f));
-
-        btCollisionObject object;
-        object.setCollisionShape(&shape);
-        object.setWorldTransform(btTransform(Misc::Convert::toBullet(orient), Misc::Convert::toBullet(center)));
-
-        const btCollisionObject* me = nullptr;
-        std::vector<const btCollisionObject*> targetCollisionObjects;
-
-        const Actor* physactor = getActor(actor);
-        if (physactor)
-            me = physactor->getCollisionObject();
-
-        if (!targets.empty())
-        {
-            for (MWWorld::Ptr& target : targets)
-            {
-                const Actor* targetActor = getActor(target);
-                if (targetActor)
-                    targetCollisionObjects.push_back(targetActor->getCollisionObject());
-            }
-        }
-
-        DeepestNotMeContactTestResultCallback resultCallback(
-            me, targetCollisionObjects, Misc::Convert::toBullet(origin));
-        resultCallback.m_collisionFilterGroup = CollisionType_Actor;
-        resultCallback.m_collisionFilterMask
-            = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor;
-        mTaskScheduler->contactTest(&object, resultCallback);
-
-        if (resultCallback.mObject)
-        {
-            PtrHolder* holder = static_cast<PtrHolder*>(resultCallback.mObject->getUserPointer());
-            if (holder)
-            {
-                reportCollision(resultCallback.mContactPoint, resultCallback.mContactNormal);
-                return std::make_pair(holder->getPtr(), Misc::Convert::toOsg(resultCallback.mContactPoint));
-            }
-        }
-        return std::make_pair(MWWorld::Ptr(), osg::Vec3f());
-    }
-
-    float PhysicsSystem::getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const
-    {
-        btCollisionObject* targetCollisionObj = nullptr;
-        const Actor* actor = getActor(target);
-        if (actor)
-            targetCollisionObj = actor->getCollisionObject();
-        if (!targetCollisionObj)
-            return 0.f;
-
-        btTransform rayFrom;
-        rayFrom.setIdentity();
-        rayFrom.setOrigin(Misc::Convert::toBullet(point));
-
-        auto hitpoint = mTaskScheduler->getHitPoint(rayFrom, targetCollisionObj);
-        if (hitpoint)
-            return (point - Misc::Convert::toOsg(*hitpoint)).length();
-
-        // didn't hit the target. this could happen if point is already inside the collision box
-        return 0.f;
-    }
-
     RayCastingResult PhysicsSystem::castRay(const osg::Vec3f& from, const osg::Vec3f& to,
-        const MWWorld::ConstPtr& ignore, const std::vector<MWWorld::Ptr>& targets, int mask, int group) const
+        const std::vector<MWWorld::ConstPtr>& ignore, const std::vector<MWWorld::Ptr>& targets, int mask,
+        int group) const
     {
         if (from == to)
         {
@@ -290,19 +204,22 @@ namespace MWPhysics
         btVector3 btFrom = Misc::Convert::toBullet(from);
         btVector3 btTo = Misc::Convert::toBullet(to);
 
-        const btCollisionObject* me = nullptr;
+        std::vector<const btCollisionObject*> ignoreList;
         std::vector<const btCollisionObject*> targetCollisionObjects;
 
-        if (!ignore.isEmpty())
+        for (const auto& ptr : ignore)
         {
-            const Actor* actor = getActor(ignore);
-            if (actor)
-                me = actor->getCollisionObject();
-            else
+            if (!ptr.isEmpty())
             {
-                const Object* object = getObject(ignore);
-                if (object)
-                    me = object->getCollisionObject();
+                const Actor* actor = getActor(ptr);
+                if (actor)
+                    ignoreList.push_back(actor->getCollisionObject());
+                else
+                {
+                    const Object* object = getObject(ptr);
+                    if (object)
+                        ignoreList.push_back(object->getCollisionObject());
+                }
             }
         }
 
@@ -316,7 +233,7 @@ namespace MWPhysics
             }
         }
 
-        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo);
+        ClosestNotMeRayResultCallback resultCallback(ignoreList, targetCollisionObjects, btFrom, btTo);
         resultCallback.m_collisionFilterGroup = group;
         resultCallback.m_collisionFilterMask = mask;
 
@@ -490,14 +407,14 @@ namespace MWPhysics
     }
 
     void PhysicsSystem::addObject(
-        const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType)
+        const MWWorld::Ptr& ptr, VFS::Path::NormalizedView mesh, osg::Quat rotation, int collisionType)
     {
         if (ptr.mRef->mData.mPhysicsPostponed)
             return;
 
-        std::string animationMesh = mesh;
-        if (ptr.getClass().useAnim())
-            animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
+        const VFS::Path::Normalized animationMesh = ptr.getClass().useAnim()
+            ? Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS())
+            : VFS::Path::Normalized(mesh);
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(animationMesh);
         if (!shapeInstance || !shapeInstance->mCollisionShape)
             return;
@@ -643,9 +560,10 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsSystem::addActor(const MWWorld::Ptr& ptr, const std::string& mesh)
+    void PhysicsSystem::addActor(const MWWorld::Ptr& ptr, VFS::Path::NormalizedView mesh)
     {
-        std::string animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
+        const VFS::Path::Normalized animationMesh
+            = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
         osg::ref_ptr<const Resource::BulletShape> shape = mShapeManager->getShape(animationMesh);
 
         // Try to get shape from basic model as fallback for creatures
@@ -671,7 +589,7 @@ namespace MWPhysics
     }
 
     int PhysicsSystem::addProjectile(
-        const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius)
+        const MWWorld::Ptr& caster, const osg::Vec3f& position, VFS::Path::NormalizedView mesh, bool computeRadius)
     {
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         assert(shapeInstance);
@@ -759,12 +677,13 @@ namespace MWPhysics
             // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
             const float slowFall
                 = 1.f - std::clamp(effects.getOrDefault(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f, 0.f, 1.f);
-            const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
+            const bool isPlayer = ptr == world->getPlayerConstPtr();
+            const bool godmode = isPlayer && world->getGodModeState();
             const bool inert = stats.isDead()
                 || (!godmode && stats.getMagicEffects().getOrDefault(ESM::MagicEffect::Paralyze).getModifier() > 0);
 
             simulations.emplace_back(ActorSimulation{
-                physicActor, ActorFrameData{ *physicActor, inert, waterCollision, slowFall, waterlevel } });
+                physicActor, ActorFrameData{ *physicActor, inert, waterCollision, slowFall, waterlevel, isPlayer } });
 
             // if the simulation will run, a jump request will be fulfilled. Update mechanics accordingly.
             if (willSimulate)
@@ -794,6 +713,8 @@ namespace MWPhysics
                 changed = false;
             }
         }
+        for (auto& [_, object] : mObjects)
+            object->resetCollisions();
 
 #ifndef BT_NO_PROFILE
         CProfileManager::Reset();
@@ -868,10 +789,12 @@ namespace MWPhysics
         }
     }
 
-    bool PhysicsSystem::isActorCollidingWith(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const
+    bool PhysicsSystem::isObjectCollidingWith(const MWWorld::ConstPtr& object, ScriptedCollisionType type) const
     {
-        std::vector<MWWorld::Ptr> collisions = getCollisions(object, CollisionType_World, CollisionType_Actor);
-        return (std::find(collisions.begin(), collisions.end(), actor) != collisions.end());
+        auto found = mObjects.find(object.mRef);
+        if (found != mObjects.end())
+            return found->second->collidedWith(type);
+        return false;
     }
 
     void PhysicsSystem::getActorsCollidingWith(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const
@@ -976,7 +899,8 @@ namespace MWPhysics
             mDebugDrawer->addCollision(position, normal);
     }
 
-    ActorFrameData::ActorFrameData(Actor& actor, bool inert, bool waterCollision, float slowFall, float waterlevel)
+    ActorFrameData::ActorFrameData(
+        Actor& actor, bool inert, bool waterCollision, float slowFall, float waterlevel, bool isPlayer)
         : mPosition()
         , mStandingOn(nullptr)
         , mIsOnGround(actor.getOnGround())
@@ -1003,6 +927,7 @@ namespace MWPhysics
         , mIsAquatic(actor.getPtr().getClass().isPureWaterCreature(actor.getPtr()))
         , mWaterCollision(waterCollision)
         , mSkipCollisionDetection(!actor.getCollisionMode())
+        , mIsPlayer(isPlayer)
     {
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index e4c1b63776..546d72676e 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -1,12 +1,12 @@
 #ifndef OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 #define OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 
+#include <algorithm>
 #include <array>
 #include <functional>
 #include <map>
 #include <memory>
 #include <optional>
-#include <set>
 #include <span>
 #include <unordered_map>
 #include <variant>
@@ -16,7 +16,7 @@
 #include <osg/Timer>
 #include <osg/ref_ptr>
 
-#include <components/esm/util.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include "../mwworld/ptr.hpp"
 
@@ -56,6 +56,7 @@ namespace MWPhysics
     class Actor;
     class PhysicsTaskScheduler;
     class Projectile;
+    enum ScriptedCollisionType : char;
 
     using ActorMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Actor>>;
 
@@ -79,7 +80,7 @@ namespace MWPhysics
 
     struct ActorFrameData
     {
-        ActorFrameData(Actor& actor, bool inert, bool waterCollision, float slowFall, float waterlevel);
+        ActorFrameData(Actor& actor, bool inert, bool waterCollision, float slowFall, float waterlevel, bool isPlayer);
         osg::Vec3f mPosition;
         osg::Vec3f mInertia;
         const btCollisionObject* mStandingOn;
@@ -102,6 +103,7 @@ namespace MWPhysics
         const bool mIsAquatic;
         const bool mWaterCollision;
         const bool mSkipCollisionDetection;
+        const bool mIsPlayer;
     };
 
     struct ProjectileFrameData
@@ -159,12 +161,12 @@ namespace MWPhysics
         void setWaterHeight(float height);
         void disableWater();
 
-        void addObject(const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation,
+        void addObject(const MWWorld::Ptr& ptr, VFS::Path::NormalizedView mesh, osg::Quat rotation,
             int collisionType = CollisionType_World);
-        void addActor(const MWWorld::Ptr& ptr, const std::string& mesh);
+        void addActor(const MWWorld::Ptr& ptr, VFS::Path::NormalizedView mesh);
 
         int addProjectile(
-            const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius);
+            const MWWorld::Ptr& caster, const osg::Vec3f& position, VFS::Path::NormalizedView mesh, bool computeRadius);
         void setCaster(int projectileId, const MWWorld::Ptr& caster);
         void removeProjectile(const int projectileId);
 
@@ -207,21 +209,11 @@ namespace MWPhysics
             const MWWorld::ConstPtr& ptr, int collisionGroup, int collisionMask) const;
         osg::Vec3f traceDown(const MWWorld::Ptr& ptr, const osg::Vec3f& position, float maxHeight);
 
-        std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(const MWWorld::ConstPtr& actor, const osg::Vec3f& origin,
-            const osg::Quat& orientation, float queryDistance, std::vector<MWWorld::Ptr>& targets);
-
-        /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
-        /// target vector hits the collision shape and then calculates distance from the intersection point.
-        /// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be
-        /// successful. \note Only Actor targets are supported at the moment.
-        float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const override;
-
-        /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all
-        /// other actors.
+        /// @param ignore Optional, a list of Ptr to ignore in the list of results. targets are actors to filter for,
+        /// ignoring all other actors.
         RayCastingResult castRay(const osg::Vec3f& from, const osg::Vec3f& to,
-            const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
-            const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(), int mask = CollisionType_Default,
-            int group = 0xff) const override;
+            const std::vector<MWWorld::ConstPtr>& ignore = {}, const std::vector<MWWorld::Ptr>& targets = {},
+            int mask = CollisionType_Default, int group = 0xff) const override;
         using RayCastingInterface::castRay;
 
         RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
@@ -267,9 +259,8 @@ namespace MWPhysics
         /// Get the handle of all actors standing on \a object in this frame.
         void getActorsStandingOn(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const;
 
-        /// Return true if \a actor has collided with \a object in this frame.
-        /// This will detect running into objects, but will not detect climbing stairs, stepping up a small object, etc.
-        bool isActorCollidingWith(const MWWorld::Ptr& actor, const MWWorld::ConstPtr& object) const;
+        /// Return true if an object of the given type has collided with this object
+        bool isObjectCollidingWith(const MWWorld::ConstPtr& object, ScriptedCollisionType type) const;
 
         /// Get the handle of all actors colliding with \a object in this frame.
         void getActorsCollidingWith(const MWWorld::ConstPtr& object, std::vector<MWWorld::Ptr>& out) const;
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.cpp b/apps/openmw/mwphysics/projectileconvexcallback.cpp
index d7e80b4698..913a3edb0c 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.cpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.cpp
@@ -6,16 +6,6 @@
 
 namespace MWPhysics
 {
-    ProjectileConvexCallback::ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me,
-        const btVector3& from, const btVector3& to, Projectile* proj)
-        : btCollisionWorld::ClosestConvexResultCallback(from, to)
-        , mCaster(caster)
-        , mMe(me)
-        , mProjectile(proj)
-    {
-        assert(mProjectile);
-    }
-
     btScalar ProjectileConvexCallback::addSingleResult(
         btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace)
     {
@@ -33,25 +23,25 @@ namespace MWPhysics
         {
             case CollisionType_Actor:
             {
-                if (!mProjectile->isValidTarget(hitObject))
+                if (!mProjectile.isValidTarget(hitObject))
                     return 1.f;
                 break;
             }
             case CollisionType_Projectile:
             {
                 auto* target = static_cast<Projectile*>(hitObject->getUserPointer());
-                if (!mProjectile->isValidTarget(target->getCasterCollisionObject()))
+                if (!mProjectile.isValidTarget(target->getCasterCollisionObject()))
                     return 1.f;
                 target->hit(mMe, m_hitPointWorld, m_hitNormalWorld);
                 break;
             }
             case CollisionType_Water:
             {
-                mProjectile->setHitWater();
+                mProjectile.setHitWater();
                 break;
             }
         }
-        mProjectile->hit(hitObject, m_hitPointWorld, m_hitNormalWorld);
+        mProjectile.hit(hitObject, m_hitPointWorld, m_hitNormalWorld);
 
         return result.m_hitFraction;
     }
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.hpp b/apps/openmw/mwphysics/projectileconvexcallback.hpp
index 3cd304bab0..d75ace22af 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.hpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.hpp
@@ -12,15 +12,21 @@ namespace MWPhysics
     class ProjectileConvexCallback : public btCollisionWorld::ClosestConvexResultCallback
     {
     public:
-        ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me, const btVector3& from,
-            const btVector3& to, Projectile* proj);
+        explicit ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me,
+            const btVector3& from, const btVector3& to, Projectile& projectile)
+            : btCollisionWorld::ClosestConvexResultCallback(from, to)
+            , mCaster(caster)
+            , mMe(me)
+            , mProjectile(projectile)
+        {
+        }
 
         btScalar addSingleResult(btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace) override;
 
     private:
         const btCollisionObject* mCaster;
         const btCollisionObject* mMe;
-        Projectile* mProjectile;
+        Projectile& mProjectile;
     };
 }
 
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index 4a56e9bf33..78b6ab4678 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -23,22 +23,15 @@ namespace MWPhysics
     public:
         virtual ~RayCastingInterface() = default;
 
-        /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
-        /// target vector hits the collision shape and then calculates distance from the intersection point.
-        /// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be
-        /// successful. \note Only Actor targets are supported at the moment.
-        virtual float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const = 0;
-
-        /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all
-        /// other actors.
+        /// @param ignore Optional, a list of Ptr to ignore in the list of results. targets are actors to filter for,
+        /// ignoring all other actors.
         virtual RayCastingResult castRay(const osg::Vec3f& from, const osg::Vec3f& to,
-            const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
-            const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(), int mask = CollisionType_Default,
-            int group = 0xff) const = 0;
+            const std::vector<MWWorld::ConstPtr>& ignore = {}, const std::vector<MWWorld::Ptr>& targets = {},
+            int mask = CollisionType_Default, int group = 0xff) const = 0;
 
         RayCastingResult castRay(const osg::Vec3f& from, const osg::Vec3f& to, int mask) const
         {
-            return castRay(from, to, MWWorld::ConstPtr(), std::vector<MWWorld::Ptr>(), mask);
+            return castRay(from, to, {}, {}, mask);
         }
 
         virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 600ae6f0ed..9d68bf9bbd 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -35,6 +35,7 @@
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/ptr.hpp"
 
+#include "actorutil.hpp"
 #include "vismask.hpp"
 
 namespace MWRender
@@ -66,7 +67,7 @@ namespace MWRender
     }
 
     PartHolderPtr ActorAnimation::attachMesh(
-        const std::string& model, std::string_view bonename, bool enchantedGlow, osg::Vec4f* glowColor)
+        VFS::Path::NormalizedView model, std::string_view bonename, const osg::Vec4f* glowColor)
     {
         osg::Group* parent = getBoneByName(bonename);
         if (!parent)
@@ -79,14 +80,14 @@ namespace MWRender
         if (found == nodeMap.end())
             return {};
 
-        if (enchantedGlow)
+        if (glowColor != nullptr)
             mGlowUpdater = SceneUtil::addEnchantedGlow(instance, mResourceSystem, *glowColor);
 
         return std::make_unique<PartHolder>(instance);
     }
 
     osg::ref_ptr<osg::Node> ActorAnimation::attach(
-        const std::string& model, std::string_view bonename, std::string_view bonefilter, bool isLight)
+        VFS::Path::NormalizedView model, std::string_view bonename, std::string_view bonefilter, bool isLight)
     {
         osg::ref_ptr<const osg::Node> templateNode = mResourceSystem->getSceneManager()->getTemplate(model);
 
@@ -101,7 +102,7 @@ namespace MWRender
                 templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager(), &rotation);
         }
         return SceneUtil::attach(
-            templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager());
+            std::move(templateNode), mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager());
     }
 
     std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const
@@ -130,12 +131,11 @@ namespace MWRender
                     if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor)
                         return std::string();
                     if (!bodypart->mModel.empty())
-                        return Misc::ResourceHelpers::correctMeshPath(
-                            bodypart->mModel, MWBase::Environment::get().getResourceSystem()->getVFS());
+                        return Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(bodypart->mModel)).value();
                 }
             }
         }
-        return shield.getClass().getModel(shield);
+        return shield.getClass().getCorrectedModel(shield);
     }
 
     std::string ActorAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
@@ -145,8 +145,7 @@ namespace MWRender
         if (mesh.empty())
             return mesh;
 
-        std::string holsteredName = mesh;
-        holsteredName = holsteredName.replace(holsteredName.size() - 4, 4, "_sh.nif");
+        const VFS::Path::Normalized holsteredName(addSuffixBeforeExtension(mesh, "_sh"));
         if (mResourceSystem->getVFS()->exists(holsteredName))
         {
             osg::ref_ptr<osg::Node> shieldTemplate = mResourceSystem->getSceneManager()->getInstance(holsteredName);
@@ -217,21 +216,20 @@ namespace MWRender
                 return;
         }
 
-        std::string mesh = getSheathedShieldMesh(*shield);
+        const VFS::Path::Normalized mesh = getSheathedShieldMesh(*shield);
         if (mesh.empty())
             return;
 
-        std::string_view boneName = "Bip01 AttachShield";
-        osg::Vec4f glowColor = shield->getClass().getEnchantmentColor(*shield);
-        std::string holsteredName = mesh;
-        holsteredName = holsteredName.replace(holsteredName.size() - 4, 4, "_sh.nif");
-        bool isEnchanted = !shield->getClass().getEnchantment(*shield).empty();
+        constexpr std::string_view boneName = "Bip01 AttachShield";
+        const bool isEnchanted = !shield->getClass().getEnchantment(*shield).empty();
+        const osg::Vec4f glowColor = isEnchanted ? shield->getClass().getEnchantmentColor(*shield) : osg::Vec4f();
+        const VFS::Path::Normalized holsteredName = addSuffixBeforeExtension(mesh, "_sh");
 
         // If we have no dedicated sheath model, use basic shield model as fallback.
         if (!mResourceSystem->getVFS()->exists(holsteredName))
-            mHolsteredShield = attachMesh(mesh, boneName, isEnchanted, &glowColor);
+            mHolsteredShield = attachMesh(mesh, boneName, isEnchanted ? &glowColor : nullptr);
         else
-            mHolsteredShield = attachMesh(holsteredName, boneName, isEnchanted, &glowColor);
+            mHolsteredShield = attachMesh(holsteredName, boneName, isEnchanted ? &glowColor : nullptr);
 
         if (!mHolsteredShield)
             return;
@@ -315,6 +313,7 @@ namespace MWRender
         if (node == nullptr)
             return;
 
+        // This is used to avoid playing animations intended for equipped weapons on holstered weapons.
         SceneUtil::ForceControllerSourcesVisitor removeVisitor(std::make_shared<NullAnimationTime>());
         node->accept(removeVisitor);
     }
@@ -336,28 +335,29 @@ namespace MWRender
 
         // Since throwing weapons stack themselves, do not show such weapon itself
         int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
-        if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
+        auto weaponClass = MWMechanics::getWeaponType(type)->mWeaponClass;
+        if (weaponClass == ESM::WeaponType::Thrown)
             showHolsteredWeapons = false;
 
-        std::string mesh = weapon->getClass().getModel(*weapon);
-        std::string scabbardName = mesh;
-
-        std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
-        if (mesh.empty() || boneName.empty())
+        const VFS::Path::Normalized mesh = weapon->getClass().getCorrectedModel(*weapon);
+        if (mesh.empty())
             return;
 
-        // If the scabbard is not found, use a weapon mesh as fallback.
-        // Note: it is unclear how to handle time for controllers attached to bodyparts, so disable them for now.
-        // We use the similar approach for other bodyparts.
-        scabbardName = scabbardName.replace(scabbardName.size() - 4, 4, "_sh.nif");
-        bool isEnchanted = !weapon->getClass().getEnchantment(*weapon).empty();
+        const std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
+        if (boneName.empty())
+            return;
+
+        // If the scabbard is not found, use the weapon mesh as fallback.
+        const VFS::Path::Normalized scabbardName = addSuffixBeforeExtension(mesh, "_sh");
+        const bool isEnchanted = !weapon->getClass().getEnchantment(*weapon).empty();
         if (!mResourceSystem->getVFS()->exists(scabbardName))
         {
             if (showHolsteredWeapons)
             {
-                osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
-                mScabbard = attachMesh(mesh, boneName, isEnchanted, &glowColor);
-                if (mScabbard)
+                const osg::Vec4f glowColor
+                    = isEnchanted ? weapon->getClass().getEnchantmentColor(*weapon) : osg::Vec4f();
+                mScabbard = attachMesh(mesh, boneName, isEnchanted ? &glowColor : nullptr);
+                if (mScabbard && weaponClass == ESM::WeaponType::Ranged)
                     resetControllers(mScabbard->getNode());
             }
 
@@ -365,7 +365,7 @@ namespace MWRender
         }
 
         mScabbard = attachMesh(scabbardName, boneName);
-        if (mScabbard)
+        if (mScabbard && weaponClass == ESM::WeaponType::Ranged)
             resetControllers(mScabbard->getNode());
 
         osg::Group* weaponNode = getBoneByName("Bip01 Weapon");
@@ -387,7 +387,9 @@ namespace MWRender
             {
                 osg::ref_ptr<osg::Node> fallbackNode
                     = mResourceSystem->getSceneManager()->getInstance(mesh, weaponNode);
-                resetControllers(fallbackNode);
+
+                if (weaponClass == ESM::WeaponType::Ranged)
+                    resetControllers(fallbackNode);
             }
 
             if (isEnchanted)
@@ -411,7 +413,7 @@ namespace MWRender
         if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
             return;
 
-        std::string mesh = weapon->getClass().getModel(*weapon);
+        std::string_view mesh = weapon->getClass().getModel(*weapon);
         std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
         if (mesh.empty() || boneName.empty())
             return;
@@ -428,7 +430,7 @@ namespace MWRender
         const auto& weaponType = MWMechanics::getWeaponType(type);
         if (weaponType->mWeaponClass == ESM::WeaponType::Thrown)
         {
-            ammoCount = ammo->getRefData().getCount();
+            ammoCount = ammo->getCellRef().getCount();
             osg::Group* throwingWeaponNode = getBoneByName(weaponType->mAttachBone);
             if (throwingWeaponNode && throwingWeaponNode->getNumChildren())
                 ammoCount--;
@@ -441,7 +443,7 @@ namespace MWRender
             if (ammo == inv.end())
                 return;
 
-            ammoCount = ammo->getRefData().getCount();
+            ammoCount = ammo->getCellRef().getCount();
             bool arrowAttached = isArrowAttached();
             if (arrowAttached)
                 ammoCount--;
@@ -468,7 +470,7 @@ namespace MWRender
 
         // Add new ones
         osg::Vec4f glowColor = ammo->getClass().getEnchantmentColor(*ammo);
-        std::string model = ammo->getClass().getModel(*ammo);
+        const VFS::Path::Normalized model(ammo->getClass().getCorrectedModel(*ammo));
         for (unsigned int i = 0; i < ammoCount; ++i)
         {
             osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();
@@ -516,7 +518,7 @@ namespace MWRender
             ItemLightMap::iterator iter = mItemLights.find(item);
             if (iter != mItemLights.end())
             {
-                if (!item.getRefData().getCount())
+                if (!item.getCellRef().getCount())
                 {
                     removeHiddenItemLight(item);
                 }
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index b6586d4eab..0182df9370 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -5,6 +5,8 @@
 
 #include <osg/ref_ptr>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "../mwworld/containerstore.hpp"
 
 #include "animation.hpp"
@@ -45,21 +47,18 @@ namespace MWRender
 
     protected:
         osg::Group* getBoneByName(std::string_view boneName) const;
-        virtual void updateHolsteredWeapon(bool showHolsteredWeapons);
-        virtual void updateHolsteredShield(bool showCarriedLeft);
-        virtual void updateQuiver();
+        void updateHolsteredWeapon(bool showHolsteredWeapons);
+        void updateHolsteredShield(bool showCarriedLeft);
+        void updateQuiver();
         std::string getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const;
         virtual std::string getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const;
-        virtual std::string_view getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon);
-        virtual PartHolderPtr attachMesh(
-            const std::string& model, std::string_view bonename, bool enchantedGlow, osg::Vec4f* glowColor);
-        virtual PartHolderPtr attachMesh(const std::string& model, std::string_view bonename)
-        {
-            osg::Vec4f stubColor = osg::Vec4f(0, 0, 0, 0);
-            return attachMesh(model, bonename, false, &stubColor);
-        }
+        std::string_view getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon);
+
+        PartHolderPtr attachMesh(
+            VFS::Path::NormalizedView model, std::string_view bonename, const osg::Vec4f* glowColor = nullptr);
+
         osg::ref_ptr<osg::Node> attach(
-            const std::string& model, std::string_view bonename, std::string_view bonefilter, bool isLight);
+            VFS::Path::NormalizedView model, std::string_view bonename, std::string_view bonefilter, bool isLight);
 
         PartHolderPtr mScabbard;
         PartHolderPtr mHolsteredShield;
diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index 68cf73fb52..2a36e99f79 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -1,12 +1,17 @@
 #include "actorspaths.hpp"
+
 #include "vismask.hpp"
 
 #include <components/detournavigator/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/agentpath.hpp>
+#include <components/sceneutil/detourdebugdraw.hpp>
 
+#include <osg/LineWidth>
+#include <osg/Material>
 #include <osg/PositionAttitudeTransform>
+#include <osg/StateSet>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -15,9 +20,32 @@
 
 namespace MWRender
 {
+    namespace
+    {
+        osg::ref_ptr<osg::StateSet> makeGroupStateSet()
+        {
+            osg::ref_ptr<osg::Material> material = new osg::Material;
+            material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+
+            osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
+            stateSet->setAttribute(material);
+            return stateSet;
+        }
+
+        osg::ref_ptr<osg::StateSet> makeDebugDrawStateSet()
+        {
+            osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
+            stateSet->setAttributeAndModes(new osg::LineWidth());
+
+            return stateSet;
+        }
+    }
+
     ActorsPaths::ActorsPaths(const osg::ref_ptr<osg::Group>& root, bool enabled)
         : mRootNode(root)
         , mEnabled(enabled)
+        , mGroupStateSet(makeGroupStateSet())
+        , mDebugDrawStateSet(makeDebugDrawStateSet())
     {
     }
 
@@ -48,14 +76,15 @@ namespace MWRender
         if (group != mGroups.end())
             mRootNode->removeChild(group->second.mNode);
 
-        auto newGroup = SceneUtil::createAgentPathGroup(path, agentBounds, start, end, settings.mRecast);
-        if (newGroup)
-        {
-            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(newGroup, "debug");
-            newGroup->setNodeMask(Mask_Debug);
-            mRootNode->addChild(newGroup);
-            mGroups[actor.mRef] = Group{ actor.mCell, std::move(newGroup) };
-        }
+        osg::ref_ptr<osg::Group> newGroup
+            = SceneUtil::createAgentPathGroup(path, agentBounds, start, end, settings.mRecast, mDebugDrawStateSet);
+        newGroup->setNodeMask(Mask_Debug);
+        newGroup->setStateSet(mGroupStateSet);
+
+        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(newGroup, "debug");
+
+        mRootNode->addChild(newGroup);
+        mGroups.insert_or_assign(group, actor.mRef, Group{ actor.mCell, std::move(newGroup) });
     }
 
     void ActorsPaths::remove(const MWWorld::ConstPtr& actor)
diff --git a/apps/openmw/mwrender/actorspaths.hpp b/apps/openmw/mwrender/actorspaths.hpp
index d18197b974..61f246c777 100644
--- a/apps/openmw/mwrender/actorspaths.hpp
+++ b/apps/openmw/mwrender/actorspaths.hpp
@@ -1,17 +1,17 @@
 #ifndef OPENMW_MWRENDER_AGENTSPATHS_H
 #define OPENMW_MWRENDER_AGENTSPATHS_H
 
-#include <apps/openmw/mwworld/ptr.hpp>
+#include "apps/openmw/mwworld/ptr.hpp"
 
 #include <osg/ref_ptr>
 
 #include <deque>
 #include <map>
-#include <unordered_map>
 
 namespace osg
 {
     class Group;
+    class StateSet;
 }
 
 namespace DetourNavigator
@@ -56,6 +56,8 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mRootNode;
         Groups mGroups;
         bool mEnabled;
+        osg::ref_ptr<osg::StateSet> mGroupStateSet;
+        osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
     };
 }
 
diff --git a/apps/openmw/mwrender/actorutil.cpp b/apps/openmw/mwrender/actorutil.cpp
new file mode 100644
index 0000000000..3cb8adb8aa
--- /dev/null
+++ b/apps/openmw/mwrender/actorutil.cpp
@@ -0,0 +1,52 @@
+#include "actorutil.hpp"
+
+#include <components/settings/values.hpp>
+#include <components/vfs/pathutil.hpp>
+
+namespace MWRender
+{
+    const std::string& getActorSkeleton(bool firstPerson, bool isFemale, bool isBeast, bool isWerewolf)
+    {
+        if (!firstPerson)
+        {
+            if (isWerewolf)
+                return Settings::models().mWolfskin.get().value();
+            else if (isBeast)
+                return Settings::models().mBaseanimkna.get().value();
+            else if (isFemale)
+                return Settings::models().mBaseanimfemale.get().value();
+            else
+                return Settings::models().mBaseanim.get().value();
+        }
+        else
+        {
+            if (isWerewolf)
+                return Settings::models().mWolfskin1st.get().value();
+            else if (isBeast)
+                return Settings::models().mBaseanimkna1st.get().value();
+            else if (isFemale)
+                return Settings::models().mBaseanimfemale1st.get().value();
+            else
+                return Settings::models().mXbaseanim1st.get().value();
+        }
+    }
+
+    bool isDefaultActorSkeleton(std::string_view model)
+    {
+        return VFS::Path::pathEqual(Settings::models().mBaseanimkna.get(), model)
+            || VFS::Path::pathEqual(Settings::models().mBaseanimfemale.get(), model)
+            || VFS::Path::pathEqual(Settings::models().mBaseanim.get(), model);
+    }
+
+    std::string addSuffixBeforeExtension(const std::string& filename, const std::string& suffix)
+    {
+        size_t dotPos = filename.rfind('.');
+
+        // No extension found; return the original filename with suffix appended
+        if (dotPos == std::string::npos)
+            return filename + suffix;
+
+        // Insert the suffix before the dot (extension) and return the new filename
+        return filename.substr(0, dotPos) + suffix + filename.substr(dotPos);
+    }
+}
diff --git a/apps/openmw/mwrender/actorutil.hpp b/apps/openmw/mwrender/actorutil.hpp
new file mode 100644
index 0000000000..6a5ab12dea
--- /dev/null
+++ b/apps/openmw/mwrender/actorutil.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_APPS_OPENMW_MWRENDER_ACTORUTIL_H
+#define OPENMW_APPS_OPENMW_MWRENDER_ACTORUTIL_H
+
+#include <string>
+#include <string_view>
+
+namespace MWRender
+{
+    const std::string& getActorSkeleton(bool firstPerson, bool female, bool beast, bool werewolf);
+    bool isDefaultActorSkeleton(std::string_view model);
+    std::string addSuffixBeforeExtension(const std::string& filename, const std::string& suffix);
+}
+
+#endif
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 74ec8e6d78..2b5092087a 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -5,7 +5,6 @@
 #include <limits>
 
 #include <osg/BlendFunc>
-#include <osg/ColorMaski>
 #include <osg/LightModel>
 #include <osg/Material>
 #include <osg/MatrixTransform>
@@ -14,8 +13,12 @@
 #include <osgParticle/ParticleProcessor>
 #include <osgParticle/ParticleSystem>
 
+#include <osgAnimation/Bone>
+#include <osgAnimation/UpdateBone>
+
 #include <components/debug/debuglog.hpp>
 
+#include <components/resource/animblendrulesmanager.hpp>
 #include <components/resource/keyframemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 
@@ -25,16 +28,17 @@
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadrace.hpp>
 #include <components/esm4/loadligh.hpp>
+
 #include <components/misc/constants.hpp>
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/sceneutil/lightcommon.hpp>
-
-#include <components/sceneutil/keyframe.hpp>
 
 #include <components/vfs/manager.hpp>
+#include <components/vfs/pathutil.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 
-#include <components/sceneutil/actorutil.hpp>
+#include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/lightcommon.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
@@ -46,6 +50,7 @@
 #include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
@@ -53,7 +58,9 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/character.hpp" // FIXME: for MWMechanics::Priority
+#include "../mwmechanics/weapontype.hpp"
 
+#include "actorutil.hpp"
 #include "rotatecontroller.hpp"
 #include "util.hpp"
 #include "vismask.hpp"
@@ -300,11 +307,10 @@ namespace
         RemoveCallbackVisitor()
             : RemoveVisitor()
             , mHasMagicEffects(false)
-            , mEffectId(-1)
         {
         }
 
-        RemoveCallbackVisitor(int effectId)
+        RemoveCallbackVisitor(std::string_view effectId)
             : RemoveVisitor()
             , mHasMagicEffects(false)
             , mEffectId(effectId)
@@ -323,7 +329,7 @@ namespace
                 MWRender::UpdateVfxCallback* vfxCallback = dynamic_cast<MWRender::UpdateVfxCallback*>(callback);
                 if (vfxCallback)
                 {
-                    bool toRemove = mEffectId < 0 || vfxCallback->mParams.mEffectId == mEffectId;
+                    bool toRemove = mEffectId == "" || vfxCallback->mParams.mEffectId == mEffectId;
                     if (toRemove)
                         mToRemove.emplace_back(group.asNode(), group.getParent(0));
                     else
@@ -337,7 +343,7 @@ namespace
         void apply(osg::Geometry&) override {}
 
     private:
-        int mEffectId;
+        std::string_view mEffectId;
     };
 
     class FindVfxCallbacksVisitor : public osg::NodeVisitor
@@ -347,11 +353,10 @@ namespace
 
         FindVfxCallbacksVisitor()
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-            , mEffectId(-1)
         {
         }
 
-        FindVfxCallbacksVisitor(int effectId)
+        FindVfxCallbacksVisitor(std::string_view effectId)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
             , mEffectId(effectId)
         {
@@ -367,7 +372,7 @@ namespace
                 MWRender::UpdateVfxCallback* vfxCallback = dynamic_cast<MWRender::UpdateVfxCallback*>(callback);
                 if (vfxCallback)
                 {
-                    if (mEffectId < 0 || vfxCallback->mParams.mEffectId == mEffectId)
+                    if (mEffectId == "" || vfxCallback->mParams.mEffectId == mEffectId)
                     {
                         mCallbacks.push_back(vfxCallback);
                     }
@@ -381,20 +386,77 @@ namespace
         void apply(osg::Geometry&) override {}
 
     private:
-        int mEffectId;
+        std::string_view mEffectId;
     };
 
-    osg::ref_ptr<osg::LightModel> getVFXLightModelInstance()
+    namespace
     {
-        static osg::ref_ptr<osg::LightModel> lightModel = nullptr;
-
-        if (!lightModel)
+        osg::ref_ptr<osg::LightModel> makeVFXLightModelInstance()
         {
-            lightModel = new osg::LightModel;
+            osg::ref_ptr<osg::LightModel> lightModel = new osg::LightModel;
             lightModel->setAmbientIntensity({ 1, 1, 1, 1 });
+            return lightModel;
         }
 
-        return lightModel;
+        const osg::ref_ptr<osg::LightModel>& getVFXLightModelInstance()
+        {
+            static const osg::ref_ptr<osg::LightModel> lightModel = makeVFXLightModelInstance();
+            return lightModel;
+        }
+    }
+
+    void assignBoneBlendCallbackRecursive(MWRender::BoneAnimBlendController* controller, osg::Node* parent, bool isRoot)
+    {
+        // Attempt to cast node to an osgAnimation::Bone
+        if (!isRoot && dynamic_cast<osgAnimation::Bone*>(parent))
+        {
+            // Wrapping in a custom callback object allows for nested callback chaining, otherwise it has link to self
+            // issues we need to share the base BoneAnimBlendController as that contains blending information and is
+            // guaranteed to update before
+            osgAnimation::Bone* bone = static_cast<osgAnimation::Bone*>(parent);
+            osg::ref_ptr<osg::Callback> cb = new MWRender::BoneAnimBlendControllerWrapper(controller, bone);
+
+            // Ensure there is no other AnimBlendController - this can happen when using
+            // multiple animations with different roots, such as NPC animation
+            osg::Callback* updateCb = bone->getUpdateCallback();
+            while (updateCb)
+            {
+                if (dynamic_cast<MWRender::BoneAnimBlendController*>(updateCb))
+                {
+                    osg::ref_ptr<osg::Callback> nextCb = updateCb->getNestedCallback();
+                    bone->removeUpdateCallback(updateCb);
+                    updateCb = nextCb;
+                }
+                else
+                {
+                    updateCb = updateCb->getNestedCallback();
+                }
+            }
+
+            // Find UpdateBone callback and bind to just after that (order is important)
+            // NOTE: if it doesn't have an UpdateBone callback, we shouldn't be doing blending!
+            updateCb = bone->getUpdateCallback();
+            while (updateCb)
+            {
+                if (dynamic_cast<osgAnimation::UpdateBone*>(updateCb))
+                {
+                    // Override the immediate callback after the UpdateBone
+                    osg::ref_ptr<osg::Callback> lastCb = updateCb->getNestedCallback();
+                    updateCb->setNestedCallback(cb);
+                    if (lastCb)
+                        cb->setNestedCallback(lastCb);
+                    break;
+                }
+
+                updateCb = updateCb->getNestedCallback();
+            }
+        }
+
+        // Traverse child bones if this is a group
+        osg::Group* group = parent->asGroup();
+        if (group)
+            for (unsigned int i = 0; i < group->getNumChildren(); ++i)
+                assignBoneBlendCallbackRecursive(controller, group->getChild(i), false);
     }
 }
 
@@ -446,9 +508,11 @@ namespace MWRender
 
         typedef std::map<std::string, osg::ref_ptr<SceneUtil::KeyframeController>> ControllerMap;
 
-        ControllerMap mControllerMap[Animation::sNumBlendMasks];
+        ControllerMap mControllerMap[sNumBlendMasks];
 
         const SceneUtil::TextKeyMap& getTextKeys() const;
+
+        osg::ref_ptr<const SceneUtil::AnimBlendRules> mAnimBlendRules;
     };
 
     void UpdateVfxCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
@@ -529,6 +593,8 @@ namespace MWRender
         , mBodyPitchRadians(0.f)
         , mHasMagicEffects(false)
         , mAlpha(1.f)
+        , mPlayScriptedOnly(false)
+        , mRequiresBoneMap(false)
     {
         for (size_t i = 0; i < sNumBlendMasks; i++)
             mAnimationTimePtr[i] = std::make_shared<AnimationTime>();
@@ -592,46 +658,57 @@ namespace MWRender
         return mKeyframes->mTextKeys;
     }
 
-    void Animation::loadAllAnimationsInFolder(const std::string& model, const std::string& baseModel)
+    void Animation::loadAdditionalAnimations(VFS::Path::NormalizedView model, const std::string& baseModel)
     {
-        std::string animationPath = model;
-        if (animationPath.find("meshes") == 0)
-        {
-            animationPath.replace(0, 6, "animations");
-        }
-        animationPath.replace(animationPath.size() - 3, 3, "/");
+        constexpr VFS::Path::NormalizedView meshes("meshes/");
+        if (!model.value().starts_with(meshes.value()))
+            return;
 
-        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
+        std::string path(model.value());
+
+        constexpr VFS::Path::NormalizedView animations("animations/");
+        path.replace(0, meshes.value().size(), animations.value());
+
+        const std::string::size_type extensionStart = path.find_last_of(VFS::Path::extensionSeparator);
+        if (extensionStart == std::string::npos)
+            return;
+
+        path.replace(extensionStart, path.size() - extensionStart, "/");
+
+        for (const VFS::Path::Normalized& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(path))
         {
             if (Misc::getFileExtension(name) == "kf")
+            {
                 addSingleAnimSource(name, baseModel);
+            }
         }
     }
 
     void Animation::addAnimSource(std::string_view model, const std::string& baseModel)
     {
-        std::string kfname = Misc::StringUtils::lowerCase(model);
+        VFS::Path::Normalized kfname(model);
 
-        if (kfname.ends_with(".nif"))
-            kfname.replace(kfname.size() - 4, 4, ".kf");
+        if (Misc::getFileExtension(kfname) == "nif")
+            kfname.changeExtension("kf");
 
         addSingleAnimSource(kfname, baseModel);
 
         if (Settings::game().mUseAdditionalAnimSources)
-            loadAllAnimationsInFolder(kfname, baseModel);
+            loadAdditionalAnimations(kfname, baseModel);
     }
 
-    void Animation::addSingleAnimSource(const std::string& kfname, const std::string& baseModel)
+    std::shared_ptr<Animation::AnimSource> Animation::addSingleAnimSource(
+        const std::string& kfname, const std::string& baseModel)
     {
         if (!mResourceSystem->getVFS()->exists(kfname))
-            return;
+            return nullptr;
 
         auto animsrc = std::make_shared<AnimSource>();
-        animsrc->mKeyframes = mResourceSystem->getKeyframeManager()->get(kfname);
+        animsrc->mKeyframes = mResourceSystem->getKeyframeManager()->get(VFS::Path::toNormalized(kfname));
 
         if (!animsrc->mKeyframes || animsrc->mKeyframes->mTextKeys.empty()
             || animsrc->mKeyframes->mKeyframeControllers.empty())
-            return;
+            return nullptr;
 
         const NodeMap& nodeMap = getNodeMap();
         const auto& controllerMap = animsrc->mKeyframes->mKeyframeControllers;
@@ -659,7 +736,7 @@ namespace MWRender
             animsrc->mControllerMap[blendMask].insert(std::make_pair(bonename, cloned));
         }
 
-        mAnimSources.push_back(std::move(animsrc));
+        mAnimSources.push_back(animsrc);
 
         for (const std::string& group : mAnimSources.back()->getTextKeys().getGroups())
             mSupportedAnimations.insert(group);
@@ -691,6 +768,37 @@ namespace MWRender
                     break;
             }
         }
+
+        // Get the blending rules
+        if (Settings::game().mSmoothAnimTransitions)
+        {
+            // Note, even if the actual config is .json - we should send a .yaml path to AnimBlendRulesManager, the
+            // manager will check for .json if it will not find a specified .yaml file.
+            VFS::Path::Normalized blendConfigPath(kfname);
+            blendConfigPath.changeExtension("yaml");
+
+            // globalBlendConfigPath is only used with actors! Objects have no default blending.
+            constexpr VFS::Path::NormalizedView globalBlendConfigPath("animations/animation-config.yaml");
+
+            osg::ref_ptr<const SceneUtil::AnimBlendRules> blendRules;
+            if (mPtr.getClass().isActor())
+            {
+                blendRules
+                    = mResourceSystem->getAnimBlendRulesManager()->getRules(globalBlendConfigPath, blendConfigPath);
+                if (blendRules == nullptr)
+                    Log(Debug::Warning) << "Unable to find animation blending rules: '" << blendConfigPath << "' or '"
+                                        << globalBlendConfigPath << "'";
+            }
+            else
+            {
+                blendRules = mResourceSystem->getAnimBlendRulesManager()->getRules(blendConfigPath, blendConfigPath);
+            }
+
+            // At this point blendRules will either be nullptr or an AnimBlendRules instance with > 0 rules inside.
+            animsrc->mAnimBlendRules = blendRules;
+        }
+
+        return animsrc;
     }
 
     void Animation::clearAnimSources()
@@ -713,6 +821,41 @@ namespace MWRender
         return mSupportedAnimations.find(anim) != mSupportedAnimations.end();
     }
 
+    bool Animation::isLoopingAnimation(std::string_view group) const
+    {
+        // In Morrowind, a some animation groups are always considered looping, regardless
+        // of loop start/stop keys.
+        // To be match vanilla behavior we probably only need to check this list, but we don't
+        // want to prevent modded animations with custom group names from looping either.
+        static const std::unordered_set<std::string_view> loopingAnimations = { "walkforward", "walkback", "walkleft",
+            "walkright", "swimwalkforward", "swimwalkback", "swimwalkleft", "swimwalkright", "runforward", "runback",
+            "runleft", "runright", "swimrunforward", "swimrunback", "swimrunleft", "swimrunright", "sneakforward",
+            "sneakback", "sneakleft", "sneakright", "turnleft", "turnright", "swimturnleft", "swimturnright",
+            "spellturnleft", "spellturnright", "torch", "idle", "idle2", "idle3", "idle4", "idle5", "idle6", "idle7",
+            "idle8", "idle9", "idlesneak", "idlestorm", "idleswim", "jump", "inventoryhandtohand",
+            "inventoryweapononehand", "inventoryweapontwohand", "inventoryweapontwowide" };
+        static const std::vector<std::string_view> shortGroups = MWMechanics::getAllWeaponTypeShortGroups();
+
+        if (getTextKeyTime(std::string(group) + ": loop start") >= 0)
+            return true;
+
+        // Most looping animations have variants for each weapon type shortgroup.
+        // Just remove the shortgroup instead of enumerating all of the possible animation groupnames.
+        // Make sure we pick the longest shortgroup so e.g. "bow" doesn't get picked over "crossbow"
+        // when the shortgroup is crossbow.
+        std::size_t suffixLength = 0;
+        for (std::string_view suffix : shortGroups)
+        {
+            if (suffix.length() > suffixLength && group.ends_with(suffix))
+            {
+                suffixLength = suffix.length();
+            }
+        }
+        group.remove_suffix(suffixLength);
+
+        return loopingAnimations.count(group) > 0;
+    }
+
     float Animation::getStartTime(const std::string& groupname) const
     {
         for (AnimSourceList::const_reverse_iterator iter(mAnimSources.rbegin()); iter != mAnimSources.rend(); ++iter)
@@ -756,21 +899,19 @@ namespace MWRender
                 state.mLoopStopTime = key->first;
         }
 
-        if (mTextKeyListener)
+        try
         {
-            try
-            {
+            if (mTextKeyListener != nullptr)
                 mTextKeyListener->handleTextKey(groupname, key, map);
-            }
-            catch (std::exception& e)
-            {
-                Log(Debug::Error) << "Error handling text key " << evt << ": " << e.what();
-            }
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Error handling text key " << evt << ": " << e.what();
         }
     }
 
     void Animation::play(std::string_view groupname, const AnimPriority& priority, int blendMask, bool autodisable,
-        float speedmult, std::string_view start, std::string_view stop, float startpoint, size_t loops,
+        float speedmult, std::string_view start, std::string_view stop, float startpoint, uint32_t loops,
         bool loopfallback)
     {
         if (!mObjectRoot || mAnimSources.empty())
@@ -782,19 +923,23 @@ namespace MWRender
             return;
         }
 
+        AnimStateMap::iterator foundstateiter = mStates.find(groupname);
+        if (foundstateiter != mStates.end())
+        {
+            foundstateiter->second.mPriority = priority;
+        }
+
         AnimStateMap::iterator stateiter = mStates.begin();
         while (stateiter != mStates.end())
         {
-            if (stateiter->second.mPriority == priority)
+            if (stateiter->second.mPriority == priority && stateiter->first != groupname)
                 mStates.erase(stateiter++);
             else
                 ++stateiter;
         }
 
-        stateiter = mStates.find(groupname);
-        if (stateiter != mStates.end())
+        if (foundstateiter != mStates.end())
         {
-            stateiter->second.mPriority = priority;
             resetActiveGroups();
             return;
         }
@@ -814,6 +959,8 @@ namespace MWRender
                 state.mPriority = priority;
                 state.mBlendMask = blendMask;
                 state.mAutoDisable = autodisable;
+                state.mGroupname = groupname;
+                state.mStartKey = start;
                 mStates[std::string{ groupname }] = state;
 
                 if (state.mPlaying)
@@ -921,7 +1068,7 @@ namespace MWRender
         return true;
     }
 
-    void Animation::setTextKeyListener(Animation::TextKeyListener* listener)
+    void Animation::setTextKeyListener(TextKeyListener* listener)
     {
         mTextKeyListener = listener;
     }
@@ -930,13 +1077,64 @@ namespace MWRender
     {
         if (!mNodeMapCreated && mObjectRoot)
         {
-            SceneUtil::NodeMapVisitor visitor(mNodeMap);
-            mObjectRoot->accept(visitor);
+            // If the base of this animation is an osgAnimation, we should map the bones not matrix transforms
+            if (mRequiresBoneMap)
+            {
+                SceneUtil::NodeMapVisitorBoneOnly visitor(mNodeMap);
+                mObjectRoot->accept(visitor);
+            }
+            else
+            {
+                SceneUtil::NodeMapVisitor visitor(mNodeMap);
+                mObjectRoot->accept(visitor);
+            }
             mNodeMapCreated = true;
         }
         return mNodeMap;
     }
 
+    template <typename ControllerType>
+    inline osg::Callback* Animation::handleBlendTransform(const osg::ref_ptr<osg::Node>& node,
+        osg::ref_ptr<SceneUtil::KeyframeController> keyframeController,
+        std::map<osg::ref_ptr<osg::Node>, osg::ref_ptr<ControllerType>>& blendControllers,
+        const AnimBlendStateData& stateData, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules,
+        const AnimState& active)
+    {
+        osg::ref_ptr<ControllerType> animController;
+        if (blendControllers.contains(node))
+        {
+            animController = blendControllers.at(node);
+            animController->setKeyframeTrack(keyframeController, stateData, blendRules);
+        }
+        else
+        {
+            animController = new ControllerType(keyframeController, stateData, blendRules);
+            blendControllers.emplace(node, animController);
+
+            if constexpr (std::is_same_v<ControllerType, BoneAnimBlendController>)
+                assignBoneBlendCallbackRecursive(animController, node, true);
+        }
+
+        keyframeController->mTime = active.mTime;
+
+        osg::Callback* asCallback = animController->getAsCallback();
+        if constexpr (std::is_same_v<ControllerType, BoneAnimBlendController>)
+        {
+            // IMPORTANT: we must gather all transforms at point of change before next update
+            // instead of at the root update callback because the root bone may require blending.
+            if (animController->getBlendTrigger())
+                animController->gatherRecursiveBoneTransforms(static_cast<osgAnimation::Bone*>(node.get()));
+
+            // Register blend callback after the initial animation callback
+            node->addUpdateCallback(asCallback);
+            mActiveControllers.emplace_back(node, asCallback);
+
+            return keyframeController->getAsCallback();
+        }
+
+        return asCallback;
+    }
+
     void Animation::resetActiveGroups()
     {
         // remove all previous external controllers from the scene graph
@@ -960,7 +1158,7 @@ namespace MWRender
             AnimStateMap::const_iterator state = mStates.begin();
             for (; state != mStates.end(); ++state)
             {
-                if (!(state->second.mBlendMask & (1 << blendMask)))
+                if (!state->second.blendMaskContains(blendMask))
                     continue;
 
                 if (active == mStates.end()
@@ -975,6 +1173,8 @@ namespace MWRender
             if (active != mStates.end())
             {
                 std::shared_ptr<AnimSource> animsrc = active->second.mSource;
+                const AnimBlendStateData stateData
+                    = { .mGroupname = active->second.mGroupname, .mStartKey = active->second.mStartKey };
 
                 for (AnimSource::ControllerMap::iterator it = animsrc->mControllerMap[blendMask].begin();
                      it != animsrc->mControllerMap[blendMask].end(); ++it)
@@ -982,7 +1182,23 @@ namespace MWRender
                     osg::ref_ptr<osg::Node> node = getNodeMap().at(
                         it->first); // this should not throw, we already checked for the node existing in addAnimSource
 
+                    const bool useSmoothAnims = Settings::game().mSmoothAnimTransitions;
+
                     osg::Callback* callback = it->second->getAsCallback();
+                    if (useSmoothAnims)
+                    {
+                        if (dynamic_cast<NifOsg::MatrixTransform*>(node.get()))
+                        {
+                            callback = handleBlendTransform<NifAnimBlendController>(node, it->second,
+                                mAnimBlendControllers, stateData, animsrc->mAnimBlendRules, active->second);
+                        }
+                        else if (dynamic_cast<osgAnimation::Bone*>(node.get()))
+                        {
+                            callback = handleBlendTransform<BoneAnimBlendController>(node, it->second,
+                                mBoneAnimBlendControllers, stateData, animsrc->mAnimBlendRules, active->second);
+                        }
+                    }
+
                     node->addUpdateCallback(callback);
                     mActiveControllers.emplace_back(node, callback);
 
@@ -1002,6 +1218,7 @@ namespace MWRender
                 }
             }
         }
+
         addControllers();
     }
 
@@ -1020,7 +1237,7 @@ namespace MWRender
         return false;
     }
 
-    bool Animation::getInfo(std::string_view groupname, float* complete, float* speedmult) const
+    bool Animation::getInfo(std::string_view groupname, float* complete, float* speedmult, size_t* loopcount) const
     {
         AnimStateMap::const_iterator iter = mStates.find(groupname);
         if (iter == mStates.end())
@@ -1029,6 +1246,8 @@ namespace MWRender
                 *complete = 0.0f;
             if (speedmult)
                 *speedmult = 0.0f;
+            if (loopcount)
+                *loopcount = 0;
             return false;
         }
 
@@ -1042,10 +1261,22 @@ namespace MWRender
         }
         if (speedmult)
             *speedmult = iter->second.mSpeedMult;
+
+        if (loopcount)
+            *loopcount = iter->second.mLoopCount;
         return true;
     }
 
-    float Animation::getCurrentTime(const std::string& groupname) const
+    std::string_view Animation::getActiveGroup(BoneGroup boneGroup) const
+    {
+        if (auto timePtr = mAnimationTimePtr[boneGroup]->getTimePtr())
+            for (auto& state : mStates)
+                if (state.second.mTime == timePtr)
+                    return state.first;
+        return "";
+    }
+
+    float Animation::getCurrentTime(std::string_view groupname) const
     {
         AnimStateMap::const_iterator iter = mStates.find(groupname);
         if (iter == mStates.end())
@@ -1054,15 +1285,6 @@ namespace MWRender
         return iter->second.getTime();
     }
 
-    size_t Animation::getCurrentLoopCount(const std::string& groupname) const
-    {
-        AnimStateMap::const_iterator iter = mStates.find(groupname);
-        if (iter == mStates.end())
-            return 0;
-
-        return iter->second.mLoopCount;
-    }
-
     void Animation::disable(std::string_view groupname)
     {
         AnimStateMap::iterator iter = mStates.find(groupname);
@@ -1141,24 +1363,12 @@ namespace MWRender
 
     osg::Vec3f Animation::runAnimation(float duration)
     {
-        // If we have scripted animations, play only them
-        bool hasScriptedAnims = false;
-        for (AnimStateMap::iterator stateiter = mStates.begin(); stateiter != mStates.end(); stateiter++)
-        {
-            if (stateiter->second.mPriority.contains(int(MWMechanics::Priority_Persistent))
-                && stateiter->second.mPlaying)
-            {
-                hasScriptedAnims = true;
-                break;
-            }
-        }
-
         osg::Vec3f movement(0.f, 0.f, 0.f);
         AnimStateMap::iterator stateiter = mStates.begin();
         while (stateiter != mStates.end())
         {
             AnimState& state = stateiter->second;
-            if (hasScriptedAnims && !state.mPriority.contains(int(MWMechanics::Priority_Persistent)))
+            if (mPlayScriptedOnly && !state.mPriority.contains(MWMechanics::Priority_Scripted))
             {
                 ++stateiter;
                 continue;
@@ -1236,9 +1446,11 @@ namespace MWRender
             mRootController->setEnabled(enable);
             if (enable)
             {
-                mRootController->setRotate(osg::Quat(mLegsYawRadians, osg::Vec3f(0, 0, 1))
-                    * osg::Quat(mBodyPitchRadians, osg::Vec3f(1, 0, 0)));
+                osg::Quat legYaw = osg::Quat(mLegsYawRadians, osg::Vec3f(0, 0, 1));
+                mRootController->setRotate(legYaw * osg::Quat(mBodyPitchRadians, osg::Vec3f(1, 0, 0)));
                 yawOffset = mLegsYawRadians;
+                // When yawing the root, also update the accumulated movement.
+                movement = legYaw * movement;
             }
         }
         if (mSpineController)
@@ -1262,10 +1474,6 @@ namespace MWRender
                     osg::Quat(mHeadPitchRadians, osg::Vec3f(1, 0, 0)) * osg::Quat(yaw, osg::Vec3f(0, 0, 1)));
         }
 
-        // Scripted animations should not cause movement
-        if (hasScriptedAnims)
-            return osg::Vec3f(0, 0, 0);
-
         return movement;
     }
 
@@ -1277,7 +1485,7 @@ namespace MWRender
     }
 
     void loadBonesFromFile(
-        osg::ref_ptr<osg::Node>& baseNode, const std::string& model, Resource::ResourceSystem* resourceSystem)
+        osg::ref_ptr<osg::Node>& baseNode, VFS::Path::NormalizedView model, Resource::ResourceSystem* resourceSystem)
     {
         const osg::Node* node = resourceSystem->getSceneManager()->getTemplate(model).get();
         osg::ref_ptr<osg::Node> sheathSkeleton(
@@ -1312,7 +1520,7 @@ namespace MWRender
         }
         animationPath.replace(animationPath.size() - 4, 4, "/");
 
-        for (const auto& name : resourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
+        for (const VFS::Path::Normalized& name : resourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
             if (Misc::getFileExtension(name) == "nif")
                 loadBonesFromFile(node, name, resourceSystem);
@@ -1330,7 +1538,7 @@ namespace MWRender
             Cache::iterator found = cache.find(model);
             if (found == cache.end())
             {
-                osg::ref_ptr<osg::Node> created = sceneMgr->getInstance(model);
+                osg::ref_ptr<osg::Node> created = sceneMgr->getInstance(VFS::Path::toNormalized(model));
 
                 if (inject)
                 {
@@ -1351,7 +1559,7 @@ namespace MWRender
         }
         else
         {
-            osg::ref_ptr<osg::Node> created = sceneMgr->getInstance(model);
+            osg::ref_ptr<osg::Node> created = sceneMgr->getInstance(VFS::Path::toNormalized(model));
 
             if (inject)
             {
@@ -1394,7 +1602,7 @@ namespace MWRender
                 MWWorld::LiveCellRef<ESM::Creature>* ref = mPtr.get<ESM::Creature>();
                 if (ref->mBase->mFlags & ESM::Creature::Bipedal)
                 {
-                    defaultSkeleton = Settings::Manager::getString("xbaseanim", "Models");
+                    defaultSkeleton = Settings::models().mXbaseanim.get().value();
                     inject = true;
                 }
             }
@@ -1411,12 +1619,14 @@ namespace MWRender
                     const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
                     const ESM::Race* race = store.get<ESM::Race>().find(ref->mBase->mRace);
 
-                    bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
-                    bool isFemale = !ref->mBase->isMale();
+                    const bool firstPerson = false;
+                    const bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
+                    const bool isFemale = !ref->mBase->isMale();
+                    const bool werewolf = false;
 
-                    defaultSkeleton = SceneUtil::getActorSkeleton(false, isFemale, isBeast, false);
-                    defaultSkeleton
-                        = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS());
+                    defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(
+                        VFS::Path::toNormalized(getActorSkeleton(firstPerson, isFemale, isBeast, werewolf)),
+                        mResourceSystem->getVFS());
                 }
             }
         }
@@ -1453,6 +1663,10 @@ namespace MWRender
             mInsert->addChild(mObjectRoot);
         }
 
+        // osgAnimation formats with skeletons should have their nodemap be bone instances
+        // FIXME: better way to detect osgAnimation here instead of relying on extension?
+        mRequiresBoneMap = mSkeleton != nullptr && !Misc::StringUtils::ciEndsWith(model, ".nif");
+
         if (previousStateset)
             mObjectRoot->setStateSet(previousStateset);
 
@@ -1485,7 +1699,7 @@ namespace MWRender
         return mObjectRoot.get();
     }
 
-    void Animation::addSpellCastGlow(const ESM::MagicEffect* effect, float glowDuration)
+    void Animation::addSpellCastGlow(const osg::Vec4f& color, float glowDuration)
     {
         if (!mGlowUpdater || (mGlowUpdater->isDone() || (mGlowUpdater->isPermanentGlowUpdater() == true)))
         {
@@ -1494,12 +1708,11 @@ namespace MWRender
 
             if (mGlowUpdater && mGlowUpdater->isPermanentGlowUpdater())
             {
-                mGlowUpdater->setColor(effect->getColor());
+                mGlowUpdater->setColor(color);
                 mGlowUpdater->setDuration(glowDuration);
             }
             else
-                mGlowUpdater
-                    = SceneUtil::addEnchantedGlow(mObjectRoot, mResourceSystem, effect->getColor(), glowDuration);
+                mGlowUpdater = SceneUtil::addEnchantedGlow(mObjectRoot, mResourceSystem, color, glowDuration);
         }
     }
 
@@ -1511,8 +1724,8 @@ namespace MWRender
         mExtraLightSource->setActorFade(mAlpha);
     }
 
-    void Animation::addEffect(
-        const std::string& model, int effectId, bool loop, std::string_view bonename, std::string_view texture)
+    void Animation::addEffect(std::string_view model, std::string_view effectId, bool loop, std::string_view bonename,
+        std::string_view texture)
     {
         if (!mObjectRoot.get())
             return;
@@ -1562,13 +1775,13 @@ namespace MWRender
         }
         parentNode->addChild(trans);
 
-        osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model, trans);
+        osg::ref_ptr<osg::Node> node
+            = mResourceSystem->getSceneManager()->getInstance(VFS::Path::toNormalized(model), trans);
 
         // Morrowind has a white ambient light attached to the root VFX node of the scenegraph
         node->getOrCreateStateSet()->setAttributeAndModes(
             getVFXLightModelInstance(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-        if (mResourceSystem->getSceneManager()->getSupportsNormalsRT())
-            node->getOrCreateStateSet()->setAttribute(new osg::ColorMaski(1, false, false, false, false));
+        mResourceSystem->getSceneManager()->setUpNormalsRTForStateSet(node->getOrCreateStateSet(), false);
         SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
         node->accept(findMaxLengthVisitor);
 
@@ -1591,10 +1804,10 @@ namespace MWRender
         // Notify that this animation has attached magic effects
         mHasMagicEffects = true;
 
-        overrideFirstRootTexture(texture, mResourceSystem, node);
+        overrideFirstRootTexture(texture, mResourceSystem, *node);
     }
 
-    void Animation::removeEffect(int effectId)
+    void Animation::removeEffect(std::string_view effectId)
     {
         RemoveCallbackVisitor visitor(effectId);
         mInsert->accept(visitor);
@@ -1604,17 +1817,19 @@ namespace MWRender
 
     void Animation::removeEffects()
     {
-        removeEffect(-1);
+        removeEffect("");
     }
 
-    void Animation::getLoopingEffects(std::vector<int>& out) const
+    std::vector<std::string_view> Animation::getLoopingEffects() const
     {
         if (!mHasMagicEffects)
-            return;
+            return {};
 
         FindVfxCallbacksVisitor visitor;
         mInsert->accept(visitor);
 
+        std::vector<std::string_view> out;
+
         for (std::vector<UpdateVfxCallback*>::iterator it = visitor.mCallbacks.begin(); it != visitor.mCallbacks.end();
              ++it)
         {
@@ -1623,6 +1838,7 @@ namespace MWRender
             if (callback->mParams.mLoop && !callback->mFinished)
                 out.push_back(callback->mParams.mEffectId);
         }
+        return out;
     }
 
     void Animation::updateEffects()
@@ -1749,13 +1965,15 @@ namespace MWRender
         osg::Callback* cb = node->getUpdateCallback();
         while (cb)
         {
-            if (dynamic_cast<SceneUtil::KeyframeController*>(cb))
+            if (dynamic_cast<NifAnimBlendController*>(cb) || dynamic_cast<BoneAnimBlendController*>(cb)
+                || dynamic_cast<SceneUtil::KeyframeController*>(cb))
             {
                 foundKeyframeCtrl = true;
                 break;
             }
             cb = cb->getNestedCallback();
         }
+        // Note: AnimBlendController also does the reset so if one is present - we should add the rotation node
         // Without KeyframeController the orientation will not be reseted each frame, so
         // RotateController shouldn't be used for such nodes.
         if (!foundKeyframeCtrl)
@@ -1886,7 +2104,8 @@ namespace MWRender
             mObjectRoot->accept(visitor);
         }
 
-        if (ptr.getRefData().getCustomData() != nullptr && ObjectAnimation::canBeHarvested())
+        if (Settings::game().mGraphicHerbalism && ptr.getRefData().getCustomData() != nullptr
+            && ObjectAnimation::canBeHarvested())
         {
             const MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
             if (!store.hasVisibleItems())
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 8615811cc3..d398c5b727 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -1,16 +1,25 @@
 #ifndef GAME_RENDER_ANIMATION_H
 #define GAME_RENDER_ANIMATION_H
 
+#include "animationpriority.hpp"
+#include "animblendcontroller.hpp"
+#include "blendmask.hpp"
+#include "bonegroup.hpp"
+
 #include "../mwworld/movementdirection.hpp"
 #include "../mwworld/ptr.hpp"
 
 #include <components/misc/strings/algorithm.hpp>
+#include <components/sceneutil/animblendrules.hpp>
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/textkeymap.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/vfs/pathutil.hpp>
 
+#include <map>
 #include <span>
+#include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
@@ -43,6 +52,8 @@ namespace MWRender
     class RotateController;
     class TransparencyUpdater;
 
+    using ActiveControllersVector = std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>>;
+
     class EffectAnimationTime : public SceneUtil::ControllerSource
     {
     private:
@@ -84,7 +95,7 @@ namespace MWRender
         std::string mModelName; // Just here so we don't add the same effect twice
         std::shared_ptr<EffectAnimationTime> mAnimTime;
         float mMaxControllerLength;
-        int mEffectId;
+        std::string mEffectId;
         bool mLoop;
         std::string mBoneName;
     };
@@ -92,60 +103,9 @@ namespace MWRender
     class Animation : public osg::Referenced
     {
     public:
-        enum BoneGroup
-        {
-            BoneGroup_LowerBody = 0,
-            BoneGroup_Torso,
-            BoneGroup_LeftArm,
-            BoneGroup_RightArm
-        };
-
-        enum BlendMask
-        {
-            BlendMask_LowerBody = 1 << 0,
-            BlendMask_Torso = 1 << 1,
-            BlendMask_LeftArm = 1 << 2,
-            BlendMask_RightArm = 1 << 3,
-
-            BlendMask_UpperBody = BlendMask_Torso | BlendMask_LeftArm | BlendMask_RightArm,
-
-            BlendMask_All = BlendMask_LowerBody | BlendMask_UpperBody
-        };
-        /* This is the number of *discrete* blend masks. */
-        static constexpr size_t sNumBlendMasks = 4;
-
-        /// Holds an animation priority value for each BoneGroup.
-        struct AnimPriority
-        {
-            /// Convenience constructor, initialises all priorities to the same value.
-            AnimPriority(int priority)
-            {
-                for (unsigned int i = 0; i < sNumBlendMasks; ++i)
-                    mPriority[i] = priority;
-            }
-
-            bool operator==(const AnimPriority& other) const
-            {
-                for (unsigned int i = 0; i < sNumBlendMasks; ++i)
-                    if (other.mPriority[i] != mPriority[i])
-                        return false;
-                return true;
-            }
-
-            int& operator[](BoneGroup n) { return mPriority[n]; }
-
-            const int& operator[](BoneGroup n) const { return mPriority[n]; }
-
-            bool contains(int priority) const
-            {
-                for (unsigned int i = 0; i < sNumBlendMasks; ++i)
-                    if (priority == mPriority[i])
-                        return true;
-                return false;
-            }
-
-            int mPriority[sNumBlendMasks];
-        };
+        using BlendMask = MWRender::BlendMask;
+        using BoneGroup = MWRender::BoneGroup;
+        using AnimPriority = MWRender::AnimPriority;
 
         class TextKeyListener
         {
@@ -189,45 +149,31 @@ namespace MWRender
         struct AnimState
         {
             std::shared_ptr<AnimSource> mSource;
-            float mStartTime;
-            float mLoopStartTime;
-            float mLoopStopTime;
-            float mStopTime;
+            float mStartTime = 0;
+            float mLoopStartTime = 0;
+            float mLoopStopTime = 0;
+            float mStopTime = 0;
 
-            typedef std::shared_ptr<float> TimePtr;
-            TimePtr mTime;
-            float mSpeedMult;
+            std::shared_ptr<float> mTime = std::make_shared<float>(0);
+            float mSpeedMult = 1;
 
-            bool mPlaying;
-            bool mLoopingEnabled;
-            size_t mLoopCount;
+            bool mPlaying = false;
+            bool mLoopingEnabled = true;
+            uint32_t mLoopCount = 0;
 
-            AnimPriority mPriority;
-            int mBlendMask;
-            bool mAutoDisable;
+            AnimPriority mPriority{ 0 };
+            int mBlendMask = 0;
+            bool mAutoDisable = true;
 
-            AnimState()
-                : mStartTime(0.0f)
-                , mLoopStartTime(0.0f)
-                , mLoopStopTime(0.0f)
-                , mStopTime(0.0f)
-                , mTime(new float)
-                , mSpeedMult(1.0f)
-                , mPlaying(false)
-                , mLoopingEnabled(true)
-                , mLoopCount(0)
-                , mPriority(0)
-                , mBlendMask(0)
-                , mAutoDisable(true)
-            {
-            }
-            ~AnimState() = default;
+            std::string mGroupname;
+            std::string mStartKey;
 
             float getTime() const { return *mTime; }
             void setTime(float time) { *mTime = time; }
-
+            bool blendMaskContains(size_t blendMask) const { return (mBlendMask & (1 << blendMask)); }
             bool shouldLoop() const { return getTime() >= mLoopStopTime && mLoopingEnabled && mLoopCount > 0; }
         };
+
         typedef std::map<std::string, AnimState, std::less<>> AnimStateMap;
         AnimStateMap mStates;
 
@@ -253,7 +199,11 @@ namespace MWRender
 
         // Keep track of controllers that we added to our scene graph.
         // We may need to rebuild these controllers when the active animation groups / sources change.
-        std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> mActiveControllers;
+        ActiveControllersVector mActiveControllers;
+
+        // Keep track of the animation controllers for easy access
+        std::map<osg::ref_ptr<osg::Node>, osg::ref_ptr<NifAnimBlendController>> mAnimBlendControllers;
+        std::map<osg::ref_ptr<osg::Node>, osg::ref_ptr<BoneAnimBlendController>> mBoneAnimBlendControllers;
 
         std::shared_ptr<AnimationTime> mAnimationTimePtr[sNumBlendMasks];
 
@@ -292,9 +242,14 @@ namespace MWRender
 
         osg::ref_ptr<SceneUtil::LightListCallback> mLightListCallback;
 
+        bool mPlayScriptedOnly;
+        bool mRequiresBoneMap;
+
         const NodeMap& getNodeMap() const;
 
-        /* Sets the appropriate animations on the bone groups based on priority.
+        /* Sets the appropriate animations on the bone groups based on priority by finding
+         * the highest priority AnimationStates and linking the appropriate controllers stored
+         * in the AnimationState to the corresponding nodes.
          */
         void resetActiveGroups();
 
@@ -327,7 +282,7 @@ namespace MWRender
          */
         void setObjectRoot(const std::string& model, bool forceskeleton, bool baseonly, bool isCreature);
 
-        void loadAllAnimationsInFolder(const std::string& model, const std::string& baseModel);
+        void loadAdditionalAnimations(VFS::Path::NormalizedView model, const std::string& baseModel);
 
         /** Adds the keyframe controllers in the specified model as a new animation source.
          * @note Later added animation sources have the highest priority when it comes to finding a particular
@@ -336,7 +291,7 @@ namespace MWRender
          * @param baseModel The filename of the mObjectRoot, only used for error messages.
          */
         void addAnimSource(std::string_view model, const std::string& baseModel);
-        void addSingleAnimSource(const std::string& model, const std::string& baseModel);
+        std::shared_ptr<AnimSource> addSingleAnimSource(const std::string& model, const std::string& baseModel);
 
         /** Adds an additional light to the given node using the specified ESM record. */
         void addExtraLight(osg::ref_ptr<osg::Group> parent, const SceneUtil::LightCommon& light);
@@ -352,6 +307,13 @@ namespace MWRender
 
         void removeFromSceneImpl();
 
+        template <typename ControllerType>
+        inline osg::Callback* handleBlendTransform(const osg::ref_ptr<osg::Node>& node,
+            osg::ref_ptr<SceneUtil::KeyframeController> keyframeController,
+            std::map<osg::ref_ptr<osg::Node>, osg::ref_ptr<ControllerType>>& blendControllers,
+            const AnimBlendStateData& stateData, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules,
+            const AnimState& active);
+
     public:
         Animation(
             const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
@@ -382,26 +344,29 @@ namespace MWRender
          * @param texture override the texture specified in the model's materials - if empty, do not override
          * @note Will not add an effect twice.
          */
-        void addEffect(const std::string& model, int effectId, bool loop = false, std::string_view bonename = {},
-            std::string_view texture = {});
-        void removeEffect(int effectId);
+        void addEffect(std::string_view model, std::string_view effectId, bool loop = false,
+            std::string_view bonename = {}, std::string_view texture = {});
+        void removeEffect(std::string_view effectId);
         void removeEffects();
-        void getLoopingEffects(std::vector<int>& out) const;
+        std::vector<std::string_view> getLoopingEffects() const;
 
         // Add a spell casting glow to an object. From measuring video taken from the original engine,
         // the glow seems to be about 1.5 seconds except for telekinesis, which is 1 second.
-        void addSpellCastGlow(const ESM::MagicEffect* effect, float glowDuration = 1.5);
+        void addSpellCastGlow(const osg::Vec4f& color, float glowDuration = 1.5);
 
         virtual void updatePtr(const MWWorld::Ptr& ptr);
 
         bool hasAnimation(std::string_view anim) const;
 
+        bool isLoopingAnimation(std::string_view group) const;
+
         // Specifies the axis' to accumulate on. Non-accumulated axis will just
         // move visually, but not affect the actual movement. Each x/y/z value
         // should be on the scale of 0 to 1.
         void setAccumulation(const osg::Vec3f& accum);
 
         /** Plays an animation.
+         * Creates or updates AnimationStates to represent and manage animation playback.
          * \param groupname Name of the animation group to play.
          * \param priority Priority of the animation. The animation will play on
          *                 bone groups that don't have another animation set of a
@@ -422,7 +387,7 @@ namespace MWRender
          *                     the "start" and "stop" keys for looping?
          */
         void play(std::string_view groupname, const AnimPriority& priority, int blendMask, bool autodisable,
-            float speedmult, std::string_view start, std::string_view stop, float startpoint, size_t loops,
+            float speedmult, std::string_view start, std::string_view stop, float startpoint, uint32_t loops,
             bool loopfallback = false);
 
         /** Adjust the speed multiplier of an already playing animation.
@@ -441,7 +406,11 @@ namespace MWRender
          * \param speedmult Stores the animation speed multiplier
          * \return True if the animation is active, false otherwise.
          */
-        bool getInfo(std::string_view groupname, float* complete = nullptr, float* speedmult = nullptr) const;
+        bool getInfo(std::string_view groupname, float* complete = nullptr, float* speedmult = nullptr,
+            size_t* loopcount = nullptr) const;
+
+        /// Returns the group name of the animation currently active on that bone group.
+        std::string_view getActiveGroup(BoneGroup boneGroup) const;
 
         /// Get the absolute position in the animation track of the first text key with the given group.
         float getStartTime(const std::string& groupname) const;
@@ -451,9 +420,7 @@ namespace MWRender
 
         /// Get the current absolute position in the animation track for the animation that is currently playing from
         /// the given group.
-        float getCurrentTime(const std::string& groupname) const;
-
-        size_t getCurrentLoopCount(const std::string& groupname) const;
+        float getCurrentTime(std::string_view groupname) const;
 
         /** Disables the specified animation group;
          * \param groupname Animation group to disable.
@@ -477,6 +444,9 @@ namespace MWRender
         MWWorld::MovementDirectionFlags getSupportedMovementDirections(
             std::span<const std::string_view> prefixes) const;
 
+        bool getPlayScriptedOnly() const { return mPlayScriptedOnly; }
+        void setPlayScriptedOnly(bool playScriptedOnly) { mPlayScriptedOnly = playScriptedOnly; }
+
         virtual bool useShieldAnimations() const { return false; }
         virtual bool getWeaponsShown() const { return false; }
         virtual void showWeapons(bool showWeapon) {}
@@ -545,6 +515,5 @@ namespace MWRender
     private:
         double mStartingTime;
     };
-
 }
 #endif
diff --git a/apps/openmw/mwrender/animationpriority.hpp b/apps/openmw/mwrender/animationpriority.hpp
new file mode 100644
index 0000000000..048d29901e
--- /dev/null
+++ b/apps/openmw/mwrender/animationpriority.hpp
@@ -0,0 +1,42 @@
+#ifndef GAME_RENDER_ANIMATIONPRIORITY_H
+#define GAME_RENDER_ANIMATIONPRIORITY_H
+
+#include "blendmask.hpp"
+#include "bonegroup.hpp"
+
+namespace MWRender
+{
+    /// Holds an animation priority value for each BoneGroup.
+    struct AnimPriority
+    {
+        /// Convenience constructor, initialises all priorities to the same value.
+        AnimPriority(int priority)
+        {
+            for (unsigned int i = 0; i < sNumBlendMasks; ++i)
+                mPriority[i] = priority;
+        }
+
+        bool operator==(const AnimPriority& other) const
+        {
+            for (unsigned int i = 0; i < sNumBlendMasks; ++i)
+                if (other.mPriority[i] != mPriority[i])
+                    return false;
+            return true;
+        }
+
+        int& operator[](BoneGroup n) { return mPriority[n]; }
+
+        const int& operator[](BoneGroup n) const { return mPriority[n]; }
+
+        bool contains(int priority) const
+        {
+            for (unsigned int i = 0; i < sNumBlendMasks; ++i)
+                if (priority == mPriority[i])
+                    return true;
+            return false;
+        }
+
+        int mPriority[sNumBlendMasks];
+    };
+}
+#endif
diff --git a/apps/openmw/mwrender/animblendcontroller.cpp b/apps/openmw/mwrender/animblendcontroller.cpp
new file mode 100644
index 0000000000..3d8b7b59d7
--- /dev/null
+++ b/apps/openmw/mwrender/animblendcontroller.cpp
@@ -0,0 +1,393 @@
+#include "animblendcontroller.hpp"
+#include "rotatecontroller.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include <osgAnimation/Bone>
+
+#include <cassert>
+#include <string>
+#include <vector>
+
+namespace MWRender
+{
+    namespace
+    {
+        // Animation Easing/Blending functions
+        namespace Easings
+        {
+            float linear(float x)
+            {
+                return x;
+            }
+
+            float sineOut(float x)
+            {
+                return std::sin((x * osg::PIf) / 2.f);
+            }
+
+            float sineIn(float x)
+            {
+                return 1.f - std::cos((x * osg::PIf) / 2.f);
+            }
+
+            float sineInOut(float x)
+            {
+                return -(std::cos(osg::PIf * x) - 1.f) / 2.f;
+            }
+
+            float cubicOut(float t)
+            {
+                float t1 = 1.f - t;
+                return 1.f - (t1 * t1 * t1); // (1-t)^3
+            }
+
+            float cubicIn(float x)
+            {
+                return x * x * x; // x^3
+            }
+
+            float cubicInOut(float x)
+            {
+                if (x < 0.5f)
+                {
+                    return 4.f * x * x * x; // 4x^3
+                }
+                else
+                {
+                    float x2 = -2.f * x + 2.f;
+                    return 1.f - (x2 * x2 * x2) / 2.f; // (1 - (-2x + 2)^3)/2
+                }
+            }
+
+            float quartOut(float t)
+            {
+                float t1 = 1.f - t;
+                return 1.f - (t1 * t1 * t1 * t1); // (1-t)^4
+            }
+
+            float quartIn(float t)
+            {
+                return t * t * t * t; // t^4
+            }
+
+            float quartInOut(float x)
+            {
+                if (x < 0.5f)
+                {
+                    return 8.f * x * x * x * x; // 8x^4
+                }
+                else
+                {
+                    float x2 = -2.f * x + 2.f;
+                    return 1.f - (x2 * x2 * x2 * x2) / 2.f; // 1 - ((-2x + 2)^4)/2
+                }
+            }
+
+            float springOutGeneric(float x, float lambda)
+            {
+                // Higher lambda = lower swing amplitude. 1 = 150% swing amplitude.
+                // w is the frequency of oscillation in the easing func, controls the amount of overswing
+                const float w = 1.5f * osg::PIf; // 4.71238
+                return 1.f - expf(-lambda * x) * std::cos(w * x);
+            }
+
+            float springOutWeak(float x)
+            {
+                return springOutGeneric(x, 4.f);
+            }
+
+            float springOutMed(float x)
+            {
+                return springOutGeneric(x, 3.f);
+            }
+
+            float springOutStrong(float x)
+            {
+                return springOutGeneric(x, 2.f);
+            }
+
+            float springOutTooMuch(float x)
+            {
+                return springOutGeneric(x, 1.f);
+            }
+
+            const std::unordered_map<std::string, EasingFn> easingsMap = {
+                { "linear", Easings::linear },
+                { "sineOut", Easings::sineOut },
+                { "sineIn", Easings::sineIn },
+                { "sineInOut", Easings::sineInOut },
+                { "cubicOut", Easings::cubicOut },
+                { "cubicIn", Easings::cubicIn },
+                { "cubicInOut", Easings::cubicInOut },
+                { "quartOut", Easings::quartOut },
+                { "quartIn", Easings::quartIn },
+                { "quartInOut", Easings::quartInOut },
+                { "springOutWeak", Easings::springOutWeak },
+                { "springOutMed", Easings::springOutMed },
+                { "springOutStrong", Easings::springOutStrong },
+                { "springOutTooMuch", Easings::springOutTooMuch },
+            };
+        }
+
+        osg::Vec3f vec3fLerp(float t, const osg::Vec3f& start, const osg::Vec3f& end)
+        {
+            return start + (end - start) * t;
+        }
+    }
+
+    AnimBlendController::AnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
+        const AnimBlendStateData& newState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules)
+        : mEasingFn(&Easings::sineOut)
+    {
+        setKeyframeTrack(keyframeTrack, newState, blendRules);
+    }
+
+    AnimBlendController::AnimBlendController()
+        : mEasingFn(&Easings::sineOut)
+    {
+    }
+
+    NifAnimBlendController::NifAnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
+        const AnimBlendStateData& newState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules)
+        : AnimBlendController(keyframeTrack, newState, blendRules)
+    {
+    }
+
+    BoneAnimBlendController::BoneAnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
+        const AnimBlendStateData& newState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules)
+        : AnimBlendController(keyframeTrack, newState, blendRules)
+    {
+    }
+
+    void AnimBlendController::setKeyframeTrack(const osg::ref_ptr<SceneUtil::KeyframeController>& kft,
+        const AnimBlendStateData& newState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules)
+    {
+        // If animation has changed then start blending
+        if (newState.mGroupname != mAnimState.mGroupname || newState.mStartKey != mAnimState.mStartKey
+            || kft != mKeyframeTrack)
+        {
+            // Default blend settings
+            mBlendDuration = 0;
+            mEasingFn = &Easings::sineOut;
+
+            if (blendRules)
+            {
+                // Finds a matching blend rule either in this or previous ruleset
+                auto blendRule = blendRules->findBlendingRule(
+                    mAnimState.mGroupname, mAnimState.mStartKey, newState.mGroupname, newState.mStartKey);
+
+                if (blendRule)
+                {
+                    if (const auto it = Easings::easingsMap.find(blendRule->mEasing); it != Easings::easingsMap.end())
+                    {
+                        mEasingFn = it->second;
+                        mBlendDuration = blendRule->mDuration;
+                    }
+                    else
+                    {
+                        Log(Debug::Warning)
+                            << "Warning: animation blending rule contains invalid easing type: " << blendRule->mEasing;
+                    }
+                }
+            }
+
+            mAnimBlendRules = blendRules;
+            mKeyframeTrack = kft;
+            mAnimState = newState;
+            mBlendTrigger = true;
+        }
+    }
+
+    void AnimBlendController::calculateInterpFactor(float time)
+    {
+        if (mBlendDuration != 0)
+            mTimeFactor = std::min((time - mBlendStartTime) / mBlendDuration, 1.0f);
+        else
+            mTimeFactor = 1;
+
+        mInterpActive = mTimeFactor < 1.0;
+
+        if (mInterpActive)
+            mInterpFactor = mEasingFn(mTimeFactor);
+        else
+            mInterpFactor = 1.0f;
+    }
+
+    void BoneAnimBlendController::gatherRecursiveBoneTransforms(osgAnimation::Bone* bone, bool isRoot)
+    {
+        // Incase group traversal encountered something that isnt a bone
+        if (!bone)
+            return;
+
+        mBlendBoneTransforms[bone] = bone->getMatrix();
+
+        osg::Group* group = bone->asGroup();
+        if (group)
+        {
+            for (unsigned int i = 0; i < group->getNumChildren(); ++i)
+                gatherRecursiveBoneTransforms(dynamic_cast<osgAnimation::Bone*>(group->getChild(i)), false);
+        }
+    }
+
+    void BoneAnimBlendController::applyBoneBlend(osgAnimation::Bone* bone)
+    {
+        // If we are done with interpolation then we can safely skip this as the bones are correct
+        if (!mInterpActive)
+            return;
+
+        // Shouldn't happen, but potentially an edge case where a new bone was added
+        // between gatherRecursiveBoneTransforms and this update
+        // currently OpenMW will never do this
+        assert(mBlendBoneTransforms.find(bone) != mBlendBoneTransforms.end());
+
+        // Every frame the osgAnimation controller updates this
+        // so it is ok that we update it directly below
+        const osg::Matrixf& currentSampledMatrix = bone->getMatrix();
+        const osg::Matrixf& lastSampledMatrix = mBlendBoneTransforms.at(bone);
+
+        const osg::Vec3f scale = currentSampledMatrix.getScale();
+        const osg::Quat rotation = currentSampledMatrix.getRotate();
+        const osg::Vec3f translation = currentSampledMatrix.getTrans();
+
+        const osg::Quat blendRotation = lastSampledMatrix.getRotate();
+        const osg::Vec3f blendTrans = lastSampledMatrix.getTrans();
+
+        osg::Quat lerpedRot;
+        lerpedRot.slerp(mInterpFactor, blendRotation, rotation);
+
+        osg::Matrixf lerpedMatrix;
+        lerpedMatrix.makeRotate(lerpedRot);
+        lerpedMatrix.setTrans(vec3fLerp(mInterpFactor, blendTrans, translation));
+
+        // Scale is not lerped based on the idea that it is much more likely that scale animation will be used to
+        // instantly hide/show objects in which case the scale interpolation is undesirable.
+        lerpedMatrix = osg::Matrixd::scale(scale) * lerpedMatrix;
+
+        // Apply new blended matrix
+        osgAnimation::Bone* boneParent = bone->getBoneParent();
+        bone->setMatrix(lerpedMatrix);
+        if (boneParent)
+            bone->setMatrixInSkeletonSpace(lerpedMatrix * boneParent->getMatrixInSkeletonSpace());
+        else
+            bone->setMatrixInSkeletonSpace(lerpedMatrix);
+    }
+
+    void BoneAnimBlendController::operator()(osgAnimation::Bone* node, osg::NodeVisitor* nv)
+    {
+        // HOW THIS WORKS: This callback method is called only for bones with attached keyframe controllers
+        // such as bip01, bip01 spine1 etc. The child bones of these controllers have their own callback wrapper
+        // which will call this instance's applyBoneBlend for each child bone. The order of update is important
+        // as the blending calculations expect the bone's skeleton matrix to be at the sample point
+        float time = nv->getFrameStamp()->getSimulationTime();
+        assert(node != nullptr);
+
+        if (mBlendTrigger)
+        {
+            mBlendTrigger = false;
+            mBlendStartTime = time;
+        }
+
+        calculateInterpFactor(time);
+
+        if (mInterpActive)
+            applyBoneBlend(node);
+
+        SceneUtil::NodeCallback<BoneAnimBlendController, osgAnimation::Bone*>::traverse(node, nv);
+    }
+
+    void NifAnimBlendController::operator()(NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
+    {
+        // HOW THIS WORKS: The actual retrieval of the bone transformation based on animation is done by the
+        // KeyframeController (mKeyframeTrack). The KeyframeController retreives time data (playback position) every
+        // frame from controller's input (getInputValue(nv)) which is bound to an appropriate AnimationState time value
+        // in Animation.cpp. Animation.cpp ultimately manages animation playback via updating AnimationState objects and
+        // determines when and what should be playing.
+        // This controller exploits KeyframeController to get transformations and upon animation change blends from
+        // the last known position to the new animated one.
+
+        auto [translation, rotation, scale] = mKeyframeTrack->getCurrentTransformation(nv);
+
+        float time = nv->getFrameStamp()->getSimulationTime();
+
+        if (mBlendTrigger)
+        {
+            mBlendTrigger = false;
+            mBlendStartTime = time;
+
+            // Nif mRotationScale is used here because it's unaffected by the side-effects of RotationController
+            mBlendStartRot = node->mRotationScale.toOsgMatrix().getRotate();
+            mBlendStartTrans = node->getMatrix().getTrans();
+            mBlendStartScale = node->mScale;
+
+            // Subtract any rotate controller's offset from start transform (if it appears after this callback)
+            // this is required otherwise the blend start will be with an offset, then offset could be applied again
+            // fixes an issue with camera jumping during first person sneak jumping camera
+            osg::Callback* updateCb = node->getUpdateCallback()->getNestedCallback();
+            while (updateCb)
+            {
+                MWRender::RotateController* rotateController = dynamic_cast<MWRender::RotateController*>(updateCb);
+                if (rotateController)
+                {
+                    const osg::Quat& rotate = rotateController->getRotate();
+                    const osg::Vec3f& offset = rotateController->getOffset();
+
+                    osg::NodePathList nodepaths = node->getParentalNodePaths(rotateController->getRelativeTo());
+                    osg::Quat worldOrient;
+                    if (!nodepaths.empty())
+                    {
+                        osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
+                        worldOrient = worldMat.getRotate();
+                    }
+
+                    worldOrient = worldOrient * rotate.inverse();
+                    const osg::Quat worldOrientInverse = worldOrient.inverse();
+
+                    mBlendStartTrans -= worldOrientInverse * offset;
+                }
+
+                updateCb = updateCb->getNestedCallback();
+            }
+        }
+
+        calculateInterpFactor(time);
+
+        if (mInterpActive)
+        {
+            if (rotation)
+            {
+                osg::Quat lerpedRot;
+                lerpedRot.slerp(mInterpFactor, mBlendStartRot, *rotation);
+                node->setRotation(lerpedRot);
+            }
+            else
+            {
+                // This is necessary to prevent first person animation glitching out
+                node->setRotation(node->mRotationScale);
+            }
+
+            if (translation)
+            {
+                osg::Vec3f lerpedTrans = vec3fLerp(mInterpFactor, mBlendStartTrans, *translation);
+                node->setTranslation(lerpedTrans);
+            }
+        }
+        else
+        {
+            if (translation)
+                node->setTranslation(*translation);
+
+            if (rotation)
+                node->setRotation(*rotation);
+            else
+                node->setRotation(node->mRotationScale);
+        }
+
+        if (scale)
+            // Scale is not lerped based on the idea that it is much more likely that scale animation will be used to
+            // instantly hide/show objects in which case the scale interpolation is undesirable.
+            node->setScale(*scale);
+
+        SceneUtil::NodeCallback<NifAnimBlendController, NifOsg::MatrixTransform*>::traverse(node, nv);
+    }
+}
diff --git a/apps/openmw/mwrender/animblendcontroller.hpp b/apps/openmw/mwrender/animblendcontroller.hpp
new file mode 100644
index 0000000000..40a5d7582f
--- /dev/null
+++ b/apps/openmw/mwrender/animblendcontroller.hpp
@@ -0,0 +1,142 @@
+#ifndef OPENMW_MWRENDER_ANIMBLENDCONTROLLER_H
+#define OPENMW_MWRENDER_ANIMBLENDCONTROLLER_H
+
+#include <map>
+#include <optional>
+#include <string>
+#include <unordered_map>
+
+#include <osgAnimation/Bone>
+
+#include <components/nifosg/matrixtransform.hpp>
+#include <components/sceneutil/animblendrules.hpp>
+#include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/nodecallback.hpp>
+
+namespace MWRender
+{
+    typedef float (*EasingFn)(float);
+
+    struct AnimBlendStateData
+    {
+        std::string mGroupname;
+        std::string mStartKey;
+    };
+
+    class AnimBlendController : public SceneUtil::Controller
+    {
+    public:
+        AnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
+            const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
+
+        AnimBlendController();
+
+        void setKeyframeTrack(const osg::ref_ptr<SceneUtil::KeyframeController>& kft,
+            const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
+
+        bool getBlendTrigger() const { return mBlendTrigger; }
+
+    protected:
+        EasingFn mEasingFn;
+        float mBlendDuration = 0.0f;
+        float mBlendStartTime = 0.0f;
+        float mTimeFactor = 0.0f;
+        float mInterpFactor = 0.0f;
+
+        bool mBlendTrigger = false;
+        bool mInterpActive = false;
+
+        AnimBlendStateData mAnimState;
+        osg::ref_ptr<const SceneUtil::AnimBlendRules> mAnimBlendRules;
+        osg::ref_ptr<SceneUtil::KeyframeController> mKeyframeTrack;
+
+        std::unordered_map<osg::Node*, osg::Matrixf> mBlendBoneTransforms;
+
+        inline void calculateInterpFactor(float time);
+    };
+
+    class NifAnimBlendController : public SceneUtil::NodeCallback<NifAnimBlendController, NifOsg::MatrixTransform*>,
+                                   public AnimBlendController
+    {
+    public:
+        NifAnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
+            const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
+
+        NifAnimBlendController() {}
+
+        NifAnimBlendController(const NifAnimBlendController& other, const osg::CopyOp&)
+            : NifAnimBlendController(other.mKeyframeTrack, other.mAnimState, other.mAnimBlendRules)
+        {
+        }
+
+        META_Object(MWRender, NifAnimBlendController)
+
+        void operator()(NifOsg::MatrixTransform* node, osg::NodeVisitor* nv);
+
+        osg::Callback* getAsCallback() { return this; }
+
+    private:
+        osg::Quat mBlendStartRot;
+        osg::Vec3f mBlendStartTrans;
+        float mBlendStartScale = 0.0f;
+    };
+
+    class BoneAnimBlendController : public SceneUtil::NodeCallback<BoneAnimBlendController, osgAnimation::Bone*>,
+                                    public AnimBlendController
+    {
+    public:
+        BoneAnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
+            const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
+
+        BoneAnimBlendController() {}
+
+        BoneAnimBlendController(const BoneAnimBlendController& other, const osg::CopyOp&)
+            : BoneAnimBlendController(other.mKeyframeTrack, other.mAnimState, other.mAnimBlendRules)
+        {
+        }
+
+        void gatherRecursiveBoneTransforms(osgAnimation::Bone* parent, bool isRoot = true);
+        void applyBoneBlend(osgAnimation::Bone* parent);
+
+        META_Object(MWRender, BoneAnimBlendController)
+
+        void operator()(osgAnimation::Bone* node, osg::NodeVisitor* nv);
+
+        osg::Callback* getAsCallback() { return this; }
+    };
+
+    // Assigned to child bones with an instance of AnimBlendController
+    class BoneAnimBlendControllerWrapper : public osg::Callback
+    {
+    public:
+        BoneAnimBlendControllerWrapper(osg::ref_ptr<BoneAnimBlendController> rootCallback, osgAnimation::Bone* node)
+            : mRootCallback(std::move(rootCallback))
+            , mNode(node)
+        {
+        }
+
+        BoneAnimBlendControllerWrapper() {}
+
+        BoneAnimBlendControllerWrapper(const BoneAnimBlendControllerWrapper& copy, const osg::CopyOp&)
+            : mRootCallback(copy.mRootCallback)
+            , mNode(copy.mNode)
+        {
+        }
+
+        META_Object(MWRender, BoneAnimBlendControllerWrapper)
+
+        bool run(osg::Object* object, osg::Object* data) override
+        {
+            mRootCallback->applyBoneBlend(mNode);
+            traverse(object, data);
+            return true;
+        }
+
+    private:
+        osg::ref_ptr<BoneAnimBlendController> mRootCallback;
+        osgAnimation::Bone* mNode{ nullptr };
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwrender/blendmask.hpp b/apps/openmw/mwrender/blendmask.hpp
new file mode 100644
index 0000000000..f140814d8d
--- /dev/null
+++ b/apps/openmw/mwrender/blendmask.hpp
@@ -0,0 +1,22 @@
+#ifndef GAME_RENDER_BLENDMASK_H
+#define GAME_RENDER_BLENDMASK_H
+
+#include <cstddef>
+
+namespace MWRender
+{
+    enum BlendMask
+    {
+        BlendMask_LowerBody = 1 << 0,
+        BlendMask_Torso = 1 << 1,
+        BlendMask_LeftArm = 1 << 2,
+        BlendMask_RightArm = 1 << 3,
+
+        BlendMask_UpperBody = BlendMask_Torso | BlendMask_LeftArm | BlendMask_RightArm,
+
+        BlendMask_All = BlendMask_LowerBody | BlendMask_UpperBody
+    };
+    /* This is the number of *discrete* blend masks. */
+    static constexpr size_t sNumBlendMasks = 4;
+}
+#endif
diff --git a/apps/openmw/mwrender/bonegroup.hpp b/apps/openmw/mwrender/bonegroup.hpp
new file mode 100644
index 0000000000..2afedade86
--- /dev/null
+++ b/apps/openmw/mwrender/bonegroup.hpp
@@ -0,0 +1,16 @@
+#ifndef GAME_RENDER_BONEGROUP_H
+#define GAME_RENDER_BONEGROUP_H
+
+namespace MWRender
+{
+    enum BoneGroup
+    {
+        BoneGroup_LowerBody = 0,
+        BoneGroup_Torso,
+        BoneGroup_LeftArm,
+        BoneGroup_RightArm,
+
+        Num_BoneGroups
+    };
+}
+#endif
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index fbe5c6b4c7..1c163a6701 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -109,8 +109,7 @@ namespace MWRender
 
     void Camera::updateCamera(osg::Camera* cam)
     {
-        osg::Quat orient = osg::Quat(mRoll + mExtraRoll, osg::Vec3d(0, 1, 0))
-            * osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1, 0, 0)) * osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0, 0, 1));
+        osg::Quat orient = getOrient();
         osg::Vec3d forward = orient * osg::Vec3d(0, 1, 0);
         osg::Vec3d up = orient * osg::Vec3d(0, 0, 1);
 
@@ -138,14 +137,12 @@ namespace MWRender
         if (mProcessViewChange)
             processViewChange();
 
-        if (paused)
-            return;
-
         // only show the crosshair in game mode
         MWBase::WindowManager* wm = MWBase::Environment::get().getWindowManager();
         wm->showCrosshair(!wm->isGuiMode() && mShowCrosshair);
 
-        updateFocalPointOffset(duration);
+        if (!paused)
+            updateFocalPointOffset(duration);
         updatePosition();
     }
 
@@ -211,6 +208,12 @@ namespace MWRender
         mPosition = focal + offset;
     }
 
+    osg::Quat Camera::getOrient() const
+    {
+        return osg::Quat(mRoll + mExtraRoll, osg::Vec3d(0, 1, 0)) * osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1, 0, 0))
+            * osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0, 0, 1));
+    }
+
     void Camera::setMode(Mode newMode, bool force)
     {
         if (mMode == newMode)
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index c6500160fd..e09a265293 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -72,6 +72,8 @@ namespace MWRender
         void setExtraYaw(float angle) { mExtraYaw = angle; }
         void setExtraRoll(float angle) { mExtraRoll = angle; }
 
+        osg::Quat getOrient() const;
+
         /// @param Force view mode switch, even if currently not allowed by the animation.
         void toggleViewMode(bool force = false);
         bool toggleVanityMode(bool enable);
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 5357f5025c..123eadfdec 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -24,7 +24,7 @@
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/rtt.hpp>
 #include <components/sceneutil/shadow.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 #include <components/stereo/multiview.hpp>
 
 #include "../mwworld/class.hpp"
@@ -34,6 +34,7 @@
 #include "../mwmechanics/weapontype.hpp"
 
 #include "npcanimation.hpp"
+#include "util.hpp"
 #include "vismask.hpp"
 
 namespace MWRender
@@ -153,8 +154,8 @@ namespace MWRender
 
     public:
         CharacterPreviewRTTNode(uint32_t sizeX, uint32_t sizeY)
-            : RTTNode(sizeX, sizeY, Settings::Manager::getInt("antialiasing", "Video"), false, 0,
-                StereoAwareness::Unaware_MultiViewShaders)
+            : RTTNode(sizeX, sizeY, Settings::video().mAntialiasing, false, 0,
+                StereoAwareness::Unaware_MultiViewShaders, shouldAddMSAAIntermediateTarget())
             , mAspectRatio(static_cast<float>(sizeX) / static_cast<float>(sizeY))
         {
             if (SceneUtil::AutoDepth::isReversed())
@@ -226,9 +227,13 @@ namespace MWRender
         mRTTNode = new CharacterPreviewRTTNode(sizeX, sizeY);
         mRTTNode->setNodeMask(Mask_RenderToTexture);
 
-        bool ffp = mResourceSystem->getSceneManager()->getLightingMethod() == SceneUtil::LightingMethod::FFP;
-
-        osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(ffp);
+        osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(SceneUtil::LightSettings{
+            .mLightingMethod = mResourceSystem->getSceneManager()->getLightingMethod(),
+            .mMaxLights = Settings::shaders().mMaxLights,
+            .mMaximumLightDistance = Settings::shaders().mMaximumLightDistance,
+            .mLightFadeStart = Settings::shaders().mLightFadeStart,
+            .mLightBoundsMultiplier = Settings::shaders().mLightBoundsMultiplier,
+        });
         lightManager->setStartLight(1);
         osg::ref_ptr<osg::StateSet> stateset = lightManager->getOrCreateStateSet();
         stateset->setDefine("FORCE_OPAQUE", "1", osg::StateAttribute::ON);
@@ -242,7 +247,7 @@ namespace MWRender
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         stateset->setAttribute(defaultMat);
 
-        SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
+        SceneUtil::ShadowManager::instance().disableShadowsForStateSet(*stateset);
 
         // assign large value to effectively turn off fog
         // shaders don't respect glDisable(GL_FOG)
@@ -431,7 +436,7 @@ namespace MWRender
 
                 // We still should use one-handed animation as fallback
                 if (mAnimation->hasAnimation(inventoryGroup))
-                    groupname = inventoryGroup;
+                    groupname = std::move(inventoryGroup);
                 else
                 {
                     static const std::string oneHandFallback
@@ -451,15 +456,15 @@ namespace MWRender
 
         mAnimation->showCarriedLeft(showCarriedLeft);
 
-        mCurrentAnimGroup = groupname;
-        mAnimation->play(mCurrentAnimGroup, 1, Animation::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
+        mCurrentAnimGroup = std::move(groupname);
+        mAnimation->play(mCurrentAnimGroup, 1, BlendMask::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
 
         MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
         if (torch != inv.end() && torch->getType() == ESM::Light::sRecordId && showCarriedLeft)
         {
             if (!mAnimation->getInfo("torch"))
-                mAnimation->play(
-                    "torch", 2, Animation::BlendMask_LeftArm, false, 1.0f, "start", "stop", 0.0f, ~0ul, true);
+                mAnimation->play("torch", 2, BlendMask::BlendMask_LeftArm, false, 1.0f, "start", "stop", 0.0f,
+                    std::numeric_limits<uint32_t>::max(), true);
         }
         else if (mAnimation->getInfo("torch"))
             mAnimation->disable("torch");
@@ -528,7 +533,7 @@ namespace MWRender
         : CharacterPreview(
             parent, resourceSystem, MWMechanics::getPlayer(), 512, 512, osg::Vec3f(0, 125, 8), osg::Vec3f(0, 0, 8))
         , mBase(*mCharacter.get<ESM::NPC>()->mBase)
-        , mRef(&mBase)
+        , mRef(ESM::makeBlankCellRef(), &mBase)
         , mPitchRadians(osg::DegreesToRadians(6.f))
     {
         mCharacter = MWWorld::Ptr(&mRef, nullptr);
@@ -586,7 +591,7 @@ namespace MWRender
     void RaceSelectionPreview::onSetup()
     {
         CharacterPreview::onSetup();
-        mAnimation->play("idle", 1, Animation::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
+        mAnimation->play("idle", 1, BlendMask::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
         mAnimation->runAnimation(0.f);
 
         // attach camera to follow the head node
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 77faee7231..f84e58e4bc 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -5,9 +5,10 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/sceneutil/lightcommon.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/visitor.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 
 #include "../mwmechanics/weapontype.hpp"
 
@@ -27,7 +28,7 @@ namespace MWRender
             setObjectRoot(model, false, false, true);
 
             if ((ref->mBase->mFlags & ESM::Creature::Bipedal))
-                addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
+                addAnimSource(Settings::models().mXbaseanim.get(), model);
 
             if (animated)
                 addAnimSource(model, model);
@@ -47,7 +48,7 @@ namespace MWRender
             setObjectRoot(model, true, false, true);
 
             if ((ref->mBase->mFlags & ESM::Creature::Bipedal))
-                addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
+                addAnimSource(Settings::models().mXbaseanim.get(), model);
 
             if (animated)
                 addAnimSource(model, model);
@@ -110,7 +111,7 @@ namespace MWRender
         MWWorld::ConstPtr item = *it;
 
         std::string_view bonename;
-        std::string itemModel = item.getClass().getModel(item);
+        VFS::Path::Normalized itemModel = item.getClass().getCorrectedModel(item);
         if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
         {
             if (item.getType() == ESM::Weapon::sRecordId)
@@ -168,10 +169,13 @@ namespace MWRender
             if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
                 source = mWeaponAnimationTime;
             else
-                source = std::make_shared<NullAnimationTime>();
+                source = mAnimationTimePtr[0];
 
-            SceneUtil::AssignControllerSourcesVisitor assignVisitor(source);
+            SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::move(source));
             attached->accept(assignVisitor);
+
+            if (item.getType() == ESM::Light::sRecordId)
+                addExtraLight(scene->getNode()->asGroup(), SceneUtil::LightCommon(*item.get<ESM::Light>()->mBase));
         }
         catch (std::exception& e)
         {
diff --git a/apps/openmw/mwrender/distortion.cpp b/apps/openmw/mwrender/distortion.cpp
new file mode 100644
index 0000000000..5df2bfb703
--- /dev/null
+++ b/apps/openmw/mwrender/distortion.cpp
@@ -0,0 +1,37 @@
+#include "distortion.hpp"
+
+#include <osg/FrameBufferObject>
+
+#include "postprocessor.hpp"
+
+namespace MWRender
+{
+    void DistortionCallback::drawImplementation(
+        osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous)
+    {
+        osg::State* state = renderInfo.getState();
+        size_t frameId = state->getFrameStamp()->getFrameNumber() % 2;
+
+        PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
+
+        if (!postProcessor || bin->getStage()->getFrameBufferObject() != postProcessor->getPrimaryFbo(frameId))
+            return;
+
+        mFBO[frameId]->apply(*state);
+
+        const osg::Texture* tex
+            = mFBO[frameId]->getAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0).getTexture();
+
+        glViewport(0, 0, tex->getTextureWidth(), tex->getTextureHeight());
+        glClearColor(0.0, 0.0, 0.0, 1.0);
+        glColorMask(true, true, true, true);
+        state->haveAppliedAttribute(osg::StateAttribute::Type::COLORMASK);
+        glClear(GL_COLOR_BUFFER_BIT);
+
+        bin->drawImplementation(renderInfo, previous);
+
+        tex = mOriginalFBO[frameId]->getAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0).getTexture();
+        glViewport(0, 0, tex->getTextureWidth(), tex->getTextureHeight());
+        mOriginalFBO[frameId]->apply(*state);
+    }
+}
diff --git a/apps/openmw/mwrender/distortion.hpp b/apps/openmw/mwrender/distortion.hpp
new file mode 100644
index 0000000000..736f4ea6f2
--- /dev/null
+++ b/apps/openmw/mwrender/distortion.hpp
@@ -0,0 +1,28 @@
+#include <array>
+
+#include <osgUtil/RenderBin>
+
+namespace osg
+{
+    class FrameBufferObject;
+}
+
+namespace MWRender
+{
+    class DistortionCallback : public osgUtil::RenderBin::DrawCallback
+    {
+    public:
+        void drawImplementation(
+            osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override;
+
+        void setFBO(const osg::ref_ptr<osg::FrameBufferObject>& fbo, size_t frameId) { mFBO[frameId] = fbo; }
+        void setOriginalFBO(const osg::ref_ptr<osg::FrameBufferObject>& fbo, size_t frameId)
+        {
+            mOriginalFBO[frameId] = fbo;
+        }
+
+    private:
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mFBO;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mOriginalFBO;
+    };
+}
diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index e5b8431c84..0ac509742c 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -27,7 +27,7 @@ namespace MWRender
         clear();
     }
 
-    void EffectManager::addEffect(const std::string& model, std::string_view textureOverride,
+    void EffectManager::addEffect(VFS::Path::NormalizedView model, std::string_view textureOverride,
         const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
     {
         osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model);
@@ -52,9 +52,9 @@ namespace MWRender
         node->accept(assignVisitor);
 
         if (isMagicVFX)
-            overrideFirstRootTexture(textureOverride, mResourceSystem, node);
+            overrideFirstRootTexture(textureOverride, mResourceSystem, *node);
         else
-            overrideTexture(textureOverride, mResourceSystem, node);
+            overrideTexture(textureOverride, mResourceSystem, *node);
 
         mParentNode->addChild(trans);
 
diff --git a/apps/openmw/mwrender/effectmanager.hpp b/apps/openmw/mwrender/effectmanager.hpp
index 2477344fd0..671c441a59 100644
--- a/apps/openmw/mwrender/effectmanager.hpp
+++ b/apps/openmw/mwrender/effectmanager.hpp
@@ -2,11 +2,12 @@
 #define OPENMW_MWRENDER_EFFECTMANAGER_H
 
 #include <memory>
-#include <string>
 #include <vector>
 
 #include <osg/ref_ptr>
 
+#include <components/vfs/pathutil.hpp>
+
 namespace osg
 {
     class Group;
@@ -33,8 +34,8 @@ namespace MWRender
         ~EffectManager();
 
         /// Add an effect. When it's finished playing, it will be removed automatically.
-        void addEffect(const std::string& model, std::string_view textureOverride, const osg::Vec3f& worldPosition,
-            float scale, bool isMagicVFX = true);
+        void addEffect(VFS::Path::NormalizedView model, std::string_view textureOverride,
+            const osg::Vec3f& worldPosition, float scale, bool isMagicVFX = true);
 
         void update(float dt);
 
diff --git a/apps/openmw/mwrender/esm4npcanimation.cpp b/apps/openmw/mwrender/esm4npcanimation.cpp
new file mode 100644
index 0000000000..d0b54adb8f
--- /dev/null
+++ b/apps/openmw/mwrender/esm4npcanimation.cpp
@@ -0,0 +1,189 @@
+#include "esm4npcanimation.hpp"
+
+#include <components/esm4/loadarma.hpp>
+#include <components/esm4/loadarmo.hpp>
+#include <components/esm4/loadclot.hpp>
+#include <components/esm4/loadhair.hpp>
+#include <components/esm4/loadhdpt.hpp>
+#include <components/esm4/loadnpc.hpp>
+#include <components/esm4/loadrace.hpp>
+
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwclass/esm4npc.hpp"
+#include "../mwworld/esmstore.hpp"
+
+namespace MWRender
+{
+    ESM4NpcAnimation::ESM4NpcAnimation(
+        const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
+        : Animation(ptr, std::move(parentNode), resourceSystem)
+    {
+        setObjectRoot(mPtr.getClass().getCorrectedModel(mPtr), true, true, false);
+        updateParts();
+    }
+
+    void ESM4NpcAnimation::updateParts()
+    {
+        if (mObjectRoot == nullptr)
+            return;
+        const ESM4::Npc* traits = MWClass::ESM4Npc::getTraitsRecord(mPtr);
+        if (traits == nullptr)
+            return;
+        if (traits->mIsTES4)
+            updatePartsTES4(*traits);
+        else if (traits->mIsFONV)
+        {
+            // Not implemented yet
+        }
+        else
+        {
+            // There is no easy way to distinguish TES5 and FO3.
+            // In case of FO3 the function shouldn't crash the game and will
+            // only lead to the NPC not being rendered.
+            updatePartsTES5(*traits);
+        }
+    }
+
+    void ESM4NpcAnimation::insertPart(std::string_view model)
+    {
+        if (model.empty())
+            return;
+        mResourceSystem->getSceneManager()->getInstance(
+            Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(model)), mObjectRoot.get());
+    }
+
+    template <class Record>
+    static std::string_view chooseTes4EquipmentModel(const Record* rec, bool isFemale)
+    {
+        if (isFemale && !rec->mModelFemale.empty())
+            return rec->mModelFemale;
+        else if (!isFemale && !rec->mModelMale.empty())
+            return rec->mModelMale;
+        else
+            return rec->mModel;
+    }
+
+    void ESM4NpcAnimation::updatePartsTES4(const ESM4::Npc& traits)
+    {
+        const ESM4::Race* race = MWClass::ESM4Npc::getRace(mPtr);
+        bool isFemale = MWClass::ESM4Npc::isFemale(mPtr);
+
+        // TODO: Body and head parts are placed incorrectly, need to attach to bones
+
+        for (const ESM4::Race::BodyPart& bodyPart : (isFemale ? race->mBodyPartsFemale : race->mBodyPartsMale))
+            insertPart(bodyPart.mesh);
+        for (const ESM4::Race::BodyPart& bodyPart : race->mHeadParts)
+            insertPart(bodyPart.mesh);
+        if (!traits.mHair.isZeroOrUnset())
+        {
+            const MWWorld::ESMStore* store = MWBase::Environment::get().getESMStore();
+            if (const ESM4::Hair* hair = store->get<ESM4::Hair>().search(traits.mHair))
+                insertPart(hair->mModel);
+            else
+                Log(Debug::Error) << "Hair not found: " << ESM::RefId(traits.mHair);
+        }
+
+        for (const ESM4::Armor* armor : MWClass::ESM4Npc::getEquippedArmor(mPtr))
+            insertPart(chooseTes4EquipmentModel(armor, isFemale));
+        for (const ESM4::Clothing* clothing : MWClass::ESM4Npc::getEquippedClothing(mPtr))
+            insertPart(chooseTes4EquipmentModel(clothing, isFemale));
+    }
+
+    void ESM4NpcAnimation::insertHeadParts(
+        const std::vector<ESM::FormId>& partIds, std::set<uint32_t>& usedHeadPartTypes)
+    {
+        const MWWorld::ESMStore* store = MWBase::Environment::get().getESMStore();
+        for (ESM::FormId partId : partIds)
+        {
+            if (partId.isZeroOrUnset())
+                continue;
+            const ESM4::HeadPart* part = store->get<ESM4::HeadPart>().search(partId);
+            if (!part)
+            {
+                Log(Debug::Error) << "Head part not found: " << ESM::RefId(partId);
+                continue;
+            }
+            if (usedHeadPartTypes.emplace(part->mType).second)
+                insertPart(part->mModel);
+        }
+    }
+
+    void ESM4NpcAnimation::updatePartsTES5(const ESM4::Npc& traits)
+    {
+        const MWWorld::ESMStore* store = MWBase::Environment::get().getESMStore();
+
+        const ESM4::Race* race = MWClass::ESM4Npc::getRace(mPtr);
+        bool isFemale = MWClass::ESM4Npc::isFemale(mPtr);
+
+        std::vector<const ESM4::ArmorAddon*> armorAddons;
+
+        auto findArmorAddons = [&](const ESM4::Armor* armor) {
+            for (ESM::FormId armaId : armor->mAddOns)
+            {
+                if (armaId.isZeroOrUnset())
+                    continue;
+                const ESM4::ArmorAddon* arma = store->get<ESM4::ArmorAddon>().search(armaId);
+                if (!arma)
+                {
+                    Log(Debug::Error) << "ArmorAddon not found: " << ESM::RefId(armaId);
+                    continue;
+                }
+                bool compatibleRace = arma->mRacePrimary == traits.mRace;
+                for (auto r : arma->mRaces)
+                    if (r == traits.mRace)
+                        compatibleRace = true;
+                if (compatibleRace)
+                    armorAddons.push_back(arma);
+            }
+        };
+
+        for (const ESM4::Armor* armor : MWClass::ESM4Npc::getEquippedArmor(mPtr))
+            findArmorAddons(armor);
+        if (!traits.mWornArmor.isZeroOrUnset())
+        {
+            if (const ESM4::Armor* armor = store->get<ESM4::Armor>().search(traits.mWornArmor))
+                findArmorAddons(armor);
+            else
+                Log(Debug::Error) << "Worn armor not found: " << ESM::RefId(traits.mWornArmor);
+        }
+        if (!race->mSkin.isZeroOrUnset())
+        {
+            if (const ESM4::Armor* armor = store->get<ESM4::Armor>().search(race->mSkin))
+                findArmorAddons(armor);
+            else
+                Log(Debug::Error) << "Skin not found: " << ESM::RefId(race->mSkin);
+        }
+
+        if (isFemale)
+            std::sort(armorAddons.begin(), armorAddons.end(),
+                [](auto x, auto y) { return x->mFemalePriority > y->mFemalePriority; });
+        else
+            std::sort(armorAddons.begin(), armorAddons.end(),
+                [](auto x, auto y) { return x->mMalePriority > y->mMalePriority; });
+
+        uint32_t usedParts = 0;
+        for (const ESM4::ArmorAddon* arma : armorAddons)
+        {
+            const uint32_t covers = arma->mBodyTemplate.bodyPart;
+            // if body is already covered, skip to avoid clipping
+            if (covers & usedParts & ESM4::Armor::TES5_Body)
+                continue;
+            // if covers at least something that wasn't covered before - add model
+            if (covers & ~usedParts)
+            {
+                usedParts |= covers;
+                insertPart(isFemale ? arma->mModelFemale : arma->mModelMale);
+            }
+        }
+
+        std::set<uint32_t> usedHeadPartTypes;
+        if (usedParts & ESM4::Armor::TES5_Hair)
+            usedHeadPartTypes.insert(ESM4::HeadPart::Type_Hair);
+        insertHeadParts(traits.mHeadParts, usedHeadPartTypes);
+        insertHeadParts(isFemale ? race->mHeadPartIdsFemale : race->mHeadPartIdsMale, usedHeadPartTypes);
+    }
+}
diff --git a/apps/openmw/mwrender/esm4npcanimation.hpp b/apps/openmw/mwrender/esm4npcanimation.hpp
new file mode 100644
index 0000000000..274c060b06
--- /dev/null
+++ b/apps/openmw/mwrender/esm4npcanimation.hpp
@@ -0,0 +1,31 @@
+#ifndef GAME_RENDER_ESM4NPCANIMATION_H
+#define GAME_RENDER_ESM4NPCANIMATION_H
+
+#include "animation.hpp"
+
+namespace ESM4
+{
+    struct Npc;
+}
+
+namespace MWRender
+{
+    class ESM4NpcAnimation : public Animation
+    {
+    public:
+        ESM4NpcAnimation(
+            const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
+
+    private:
+        void insertPart(std::string_view model);
+
+        // Works for FO3/FONV/TES5
+        void insertHeadParts(const std::vector<ESM::FormId>& partIds, std::set<uint32_t>& usedHeadPartTypes);
+
+        void updateParts();
+        void updatePartsTES4(const ESM4::Npc& traits);
+        void updatePartsTES5(const ESM4::Npc& traits);
+    };
+}
+
+#endif // GAME_RENDER_ESM4NPCANIMATION_H
diff --git a/apps/openmw/mwrender/fogmanager.cpp b/apps/openmw/mwrender/fogmanager.cpp
index ef8de1cb2e..b75fb507ed 100644
--- a/apps/openmw/mwrender/fogmanager.cpp
+++ b/apps/openmw/mwrender/fogmanager.cpp
@@ -9,7 +9,7 @@
 #include <components/sceneutil/util.hpp>
 #include <components/settings/values.hpp>
 
-#include <apps/openmw/mwworld/cell.hpp>
+#include "apps/openmw/mwworld/cell.hpp"
 
 namespace MWRender
 {
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index ac7a8a9351..f9dae65c40 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -363,7 +363,7 @@ namespace MWRender
             imageDest.mImage = image;
             imageDest.mX = x;
             imageDest.mY = y;
-            mPendingImageDest[camera] = imageDest;
+            mPendingImageDest[camera] = std::move(imageDest);
         }
 
         // Create a quad rendering the updated texture
@@ -422,7 +422,8 @@ namespace MWRender
         if (cellX > mMaxX || cellX < mMinX || cellY > mMaxY || cellY < mMinY)
             return;
 
-        requestOverlayTextureUpdate(originX, mHeight - originY, cellSize, cellSize, localMapTexture, false, true);
+        requestOverlayTextureUpdate(
+            originX, mHeight - originY, cellSize, cellSize, std::move(localMapTexture), false, true);
     }
 
     void GlobalMap::clear()
@@ -554,7 +555,7 @@ namespace MWRender
         {
             mOverlayImage = image;
 
-            requestOverlayTextureUpdate(0, 0, mWidth, mHeight, texture, true, false);
+            requestOverlayTextureUpdate(0, 0, mWidth, mHeight, std::move(texture), true, false);
         }
         else
         {
@@ -562,7 +563,7 @@ namespace MWRender
             // In the latter case, we'll want filtering.
             // Create a RTT Camera and draw the image onto mOverlayImage in the next frame.
             requestOverlayTextureUpdate(destBox.mLeft, destBox.mTop, destBox.mRight - destBox.mLeft,
-                destBox.mBottom - destBox.mTop, texture, true, true, srcBox.mLeft / float(imageWidth),
+                destBox.mBottom - destBox.mTop, std::move(texture), true, true, srcBox.mLeft / float(imageWidth),
                 srcBox.mTop / float(imageHeight), srcBox.mRight / float(imageWidth),
                 srcBox.mBottom / float(imageHeight));
         }
diff --git a/apps/openmw/mwrender/globalmap.hpp b/apps/openmw/mwrender/globalmap.hpp
index e0582b20fa..07d7731e31 100644
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@@ -111,8 +111,6 @@ namespace MWRender
 
         ImageDestMap mPendingImageDest;
 
-        std::vector<std::pair<int, int>> mExploredCells;
-
         osg::ref_ptr<osg::Texture2D> mBaseTexture;
         osg::ref_ptr<osg::Texture2D> mAlphaTexture;
 
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index e00e3446a6..9fc40f3e19 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -1,5 +1,7 @@
 #include "groundcover.hpp"
 
+#include <span>
+
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
 #include <osg/ComputeBoundsVisitor>
@@ -14,6 +16,7 @@
 #include <components/misc/convert.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/settings/values.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/terrain/quadtreenode.hpp>
 
@@ -45,13 +48,13 @@ namespace MWRender
         class InstancedComputeNearFarCullCallback : public osg::DrawableCullCallback
         {
         public:
-            InstancedComputeNearFarCullCallback(const std::vector<Groundcover::GroundcoverEntry>& instances,
+            explicit InstancedComputeNearFarCullCallback(std::span<const Groundcover::GroundcoverEntry> instances,
                 const osg::Vec3& chunkPosition, const osg::BoundingBox& instanceBounds)
                 : mInstanceMatrices()
                 , mInstanceBounds(instanceBounds)
             {
                 mInstanceMatrices.reserve(instances.size());
-                for (const auto& instance : instances)
+                for (const Groundcover::GroundcoverEntry& instance : instances)
                     mInstanceMatrices.emplace_back(computeInstanceMatrix(instance, chunkPosition));
             }
 
@@ -94,6 +97,8 @@ namespace MWRender
                     {
                         // Other objects are likely cheaper and should let us skip all but a few groundcover instances
                         cullVisitor.computeNearPlane();
+                        computedZNear = cullVisitor.getCalculatedNearPlane();
+                        computedZFar = cullVisitor.getCalculatedFarPlane();
 
                         if (dNear < computedZNear)
                         {
@@ -188,13 +193,26 @@ namespace MWRender
         class InstancingVisitor : public osg::NodeVisitor
         {
         public:
-            InstancingVisitor(std::vector<Groundcover::GroundcoverEntry>& instances, osg::Vec3f& chunkPosition)
+            explicit InstancingVisitor(
+                std::span<const Groundcover::GroundcoverEntry> instances, osg::Vec3f& chunkPosition)
                 : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
                 , mInstances(instances)
                 , mChunkPosition(chunkPosition)
             {
             }
 
+            void apply(osg::Group& group) override
+            {
+                for (unsigned int i = 0; i < group.getNumChildren();)
+                {
+                    if (group.getChild(i)->asDrawable() && !group.getChild(i)->asGeometry())
+                        group.removeChild(i);
+                    else
+                        ++i;
+                }
+                traverse(group);
+            }
+
             void apply(osg::Geometry& geom) override
             {
                 for (unsigned int i = 0; i < geom.getNumPrimitiveSets(); ++i)
@@ -237,7 +255,7 @@ namespace MWRender
             }
 
         private:
-            std::vector<Groundcover::GroundcoverEntry> mInstances;
+            std::span<const Groundcover::GroundcoverEntry> mInstances;
             osg::Vec3f mChunkPosition;
         };
 
@@ -327,7 +345,7 @@ namespace MWRender
 
     Groundcover::Groundcover(
         Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::GroundcoverStore& store)
-        : GenericResourceManager<GroundcoverChunkId>(nullptr)
+        : GenericResourceManager<GroundcoverChunkId>(nullptr, Settings::cells().mCacheExpiryDelay)
         , mSceneManager(sceneManager)
         , mDensity(density)
         , mStateset(new osg::StateSet)
@@ -396,12 +414,15 @@ namespace MWRender
                     }
                 }
 
-                for (auto& pair : refs)
+                for (auto& [refNum, cellRef] : refs)
                 {
-                    ESM::CellRef& ref = pair.second;
-                    const std::string& model = mGroundcoverStore.getGroundcoverModel(ref.mRefID);
-                    if (!model.empty())
-                        instances[model].emplace_back(std::move(ref));
+                    const VFS::Path::NormalizedView model = mGroundcoverStore.getGroundcoverModel(cellRef.mRefID);
+                    if (model.empty())
+                        continue;
+                    auto it = instances.find(model);
+                    if (it == instances.end())
+                        it = instances.emplace_hint(it, VFS::Path::Normalized(model), std::vector<GroundcoverEntry>());
+                    it->second.emplace_back(std::move(cellRef));
                 }
             }
         }
@@ -411,9 +432,9 @@ namespace MWRender
     {
         osg::ref_ptr<osg::Group> group = new osg::Group;
         osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0) * ESM::Land::REAL_SIZE;
-        for (auto& pair : instances)
+        for (const auto& [model, entries] : instances)
         {
-            const osg::Node* temp = mSceneManager->getTemplate(pair.first);
+            const osg::Node* temp = mSceneManager->getTemplate(model);
             osg::ref_ptr<osg::Node> node = static_cast<osg::Node*>(temp->clone(osg::CopyOp::DEEP_COPY_NODES
                 | osg::CopyOp::DEEP_COPY_DRAWABLES | osg::CopyOp::DEEP_COPY_USERDATA | osg::CopyOp::DEEP_COPY_ARRAYS
                 | osg::CopyOp::DEEP_COPY_PRIMITIVES));
@@ -421,7 +442,7 @@ namespace MWRender
             // Keep link to original mesh to keep it in cache
             group->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(temp));
 
-            InstancingVisitor visitor(pair.second, worldCenter);
+            InstancingVisitor visitor(entries, worldCenter);
             node->accept(visitor);
             group->addChild(node);
         }
@@ -448,6 +469,6 @@ namespace MWRender
 
     void Groundcover::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Groundcover Chunk", mCache->getCacheSize());
+        Resource::reportStats("Groundcover Chunk", frameNumber, mCache->getStats(), *stats);
     }
 }
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index df40d9d529..ecbc990da0 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -4,6 +4,7 @@
 #include <components/esm3/loadcell.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/terrain/quadtreeworld.hpp>
+#include <components/vfs/pathutil.hpp>
 
 namespace MWWorld
 {
@@ -46,13 +47,14 @@ namespace MWRender
         };
 
     private:
+        using InstanceMap = std::map<VFS::Path::Normalized, std::vector<GroundcoverEntry>, std::less<>>;
+
         Resource::SceneManager* mSceneManager;
         float mDensity;
         osg::ref_ptr<osg::StateSet> mStateset;
         osg::ref_ptr<osg::Program> mProgramTemplate;
         const MWWorld::GroundcoverStore& mGroundcoverStore;
 
-        typedef std::map<std::string, std::vector<GroundcoverEntry>> InstanceMap;
         osg::ref_ptr<osg::Node> createChunk(InstanceMap& instances, const osg::Vec2f& center);
         void collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center);
     };
diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp
index 6ab9f12139..d17933b2b7 100644
--- a/apps/openmw/mwrender/landmanager.cpp
+++ b/apps/openmw/mwrender/landmanager.cpp
@@ -1,8 +1,8 @@
 #include "landmanager.hpp"
 
-#include <osg/Stats>
-
+#include <components/esm4/loadwrld.hpp>
 #include <components/resource/objectcache.hpp>
+#include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -12,17 +12,24 @@ namespace MWRender
 {
 
     LandManager::LandManager(int loadFlags)
-        : GenericResourceManager<ESM::ExteriorCellLocation>(nullptr)
+        : GenericResourceManager<ESM::ExteriorCellLocation>(nullptr, Settings::cells().mCacheExpiryDelay)
         , mLoadFlags(loadFlags)
     {
     }
 
     osg::ref_ptr<ESMTerrain::LandObject> LandManager::getLand(ESM::ExteriorCellLocation cellIndex)
     {
+        const MWBase::World& world = *MWBase::Environment::get().getWorld();
+        if (ESM::isEsm4Ext(cellIndex.mWorldspace))
+        {
+            const ESM4::World* worldspace = world.getStore().get<ESM4::World>().find(cellIndex.mWorldspace);
+            if (!worldspace->mParent.isZeroOrUnset() && worldspace->mParentUseFlags & ESM4::World::UseFlag_Land)
+                cellIndex.mWorldspace = worldspace->mParent;
+        }
+
         if (const std::optional<osg::ref_ptr<osg::Object>> obj = mCache->getRefFromObjectCacheOrNone(cellIndex))
             return static_cast<ESMTerrain::LandObject*>(obj->get());
 
-        const MWBase::World& world = *MWBase::Environment::get().getWorld();
         osg::ref_ptr<ESMTerrain::LandObject> landObj = nullptr;
 
         if (ESM::isEsm4Ext(cellIndex.mWorldspace))
@@ -44,7 +51,7 @@ namespace MWRender
 
     void LandManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Land", mCache->getCacheSize());
+        Resource::reportStats("Land", frameNumber, mCache->getStats(), *stats);
     }
 
 }
diff --git a/apps/openmw/mwrender/landmanager.hpp b/apps/openmw/mwrender/landmanager.hpp
index 7166c4b111..1b82f32ce9 100644
--- a/apps/openmw/mwrender/landmanager.hpp
+++ b/apps/openmw/mwrender/landmanager.hpp
@@ -3,7 +3,7 @@
 
 #include <osg/Object>
 
-#include <components/esm/util.hpp>
+#include <components/esm/exteriorcelllocation.hpp>
 #include <components/esmterrain/storage.hpp>
 #include <components/resource/resourcemanager.hpp>
 
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index a07fa10b09..f33ef35a52 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -30,6 +30,7 @@
 
 #include "../mwworld/cellstore.hpp"
 
+#include "util.hpp"
 #include "vismask.hpp"
 
 namespace
@@ -136,6 +137,8 @@ namespace MWRender
             fog->mBounds.mMinY = mBounds.yMin();
             fog->mBounds.mMaxY = mBounds.yMax();
             fog->mNorthMarkerAngle = mAngle;
+            fog->mCenterX = mCenter.x();
+            fog->mCenterY = mCenter.y();
 
             fog->mFogTextures.reserve(segments.first * segments.second);
 
@@ -144,15 +147,12 @@ namespace MWRender
                 for (int y = 0; y < segments.second; ++y)
                 {
                     const MapSegment& segment = mInteriorSegments[std::make_pair(x, y)];
-
-                    fog->mFogTextures.emplace_back();
-
-                    // saving even if !segment.mHasFogState so we don't mess up the segmenting
-                    // plus, older openmw versions can't deal with empty images
-                    segment.saveFogOfWar(fog->mFogTextures.back());
-
-                    fog->mFogTextures.back().mX = x;
-                    fog->mFogTextures.back().mY = y;
+                    if (!segment.mHasFogState)
+                        continue;
+                    ESM::FogTexture& texture = fog->mFogTextures.emplace_back();
+                    segment.saveFogOfWar(texture);
+                    texture.mX = x;
+                    texture.mY = y;
                 }
             }
 
@@ -331,22 +331,20 @@ namespace MWRender
 
         float zMin = mBounds.zMin();
         float zMax = mBounds.zMax();
+        mCenter = osg::Vec2f(mBounds.center().x(), mBounds.center().y());
 
         // If there is fog state in the CellStore (e.g. when it came from a savegame) we need to do some checks
         // to see if this state is still valid.
         // Both the cell bounds and the NorthMarker rotation could be changed by the content files or exchanged models.
         // If they changed by too much then parts of the interior might not be covered by the map anymore.
         // The following code detects this, and discards the CellStore's fog state if it needs to.
-        std::vector<std::pair<int, int>> segmentMappings;
-        if (cell->getFog())
+        int xOffset = 0;
+        int yOffset = 0;
+        if (const ESM::FogState* fog = cell->getFog())
         {
-            ESM::FogState* fog = cell->getFog();
-
             if (std::abs(mAngle - fog->mNorthMarkerAngle) < osg::DegreesToRadians(5.f))
             {
                 // Expand mBounds so the saved textures fit the same grid
-                int xOffset = 0;
-                int yOffset = 0;
                 if (fog->mBounds.mMinX < mBounds.xMin())
                 {
                     mBounds.xMin() = fog->mBounds.mMinX;
@@ -354,8 +352,7 @@ namespace MWRender
                 else if (fog->mBounds.mMinX > mBounds.xMin())
                 {
                     float diff = fog->mBounds.mMinX - mBounds.xMin();
-                    xOffset += diff / mMapWorldSize;
-                    xOffset++;
+                    xOffset = std::ceil(diff / mMapWorldSize);
                     mBounds.xMin() = fog->mBounds.mMinX - xOffset * mMapWorldSize;
                 }
                 if (fog->mBounds.mMinY < mBounds.yMin())
@@ -365,8 +362,7 @@ namespace MWRender
                 else if (fog->mBounds.mMinY > mBounds.yMin())
                 {
                     float diff = fog->mBounds.mMinY - mBounds.yMin();
-                    yOffset += diff / mMapWorldSize;
-                    yOffset++;
+                    yOffset = std::ceil(diff / mMapWorldSize);
                     mBounds.yMin() = fog->mBounds.mMinY - yOffset * mMapWorldSize;
                 }
                 if (fog->mBounds.mMaxX > mBounds.xMax())
@@ -377,22 +373,14 @@ namespace MWRender
                 if (xOffset != 0 || yOffset != 0)
                     Log(Debug::Warning) << "Warning: expanding fog by " << xOffset << ", " << yOffset;
 
-                const auto& textures = fog->mFogTextures;
-                segmentMappings.reserve(textures.size());
-                osg::BoundingBox savedBounds{ fog->mBounds.mMinX, fog->mBounds.mMinY, 0, fog->mBounds.mMaxX,
-                    fog->mBounds.mMaxY, 0 };
-                auto segments = divideIntoSegments(savedBounds, mMapWorldSize);
-                for (int x = 0; x < segments.first; ++x)
-                    for (int y = 0; y < segments.second; ++y)
-                        segmentMappings.emplace_back(std::make_pair(x + xOffset, y + yOffset));
-
                 mAngle = fog->mNorthMarkerAngle;
+                mCenter.x() = fog->mCenterX;
+                mCenter.y() = fog->mCenterY;
             }
         }
 
         osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
 
-        osg::Vec2f center(mBounds.center().x(), mBounds.center().y());
         osg::Quat cameraOrient(mAngle, osg::Vec3d(0, 0, -1));
 
         auto segments = divideIntoSegments(mBounds, mMapWorldSize);
@@ -403,10 +391,10 @@ namespace MWRender
                 osg::Vec2f start = min + osg::Vec2f(mMapWorldSize * x, mMapWorldSize * y);
                 osg::Vec2f newcenter = start + osg::Vec2f(mMapWorldSize / 2.f, mMapWorldSize / 2.f);
 
-                osg::Vec2f a = newcenter - center;
+                osg::Vec2f a = newcenter - mCenter;
                 osg::Vec3f rotatedCenter = cameraOrient * (osg::Vec3f(a.x(), a.y(), 0));
 
-                osg::Vec2f pos = osg::Vec2f(rotatedCenter.x(), rotatedCenter.y()) + center;
+                osg::Vec2f pos = osg::Vec2f(rotatedCenter.x(), rotatedCenter.y()) + mCenter;
 
                 setupRenderToTexture(x, y, pos.x(), pos.y(), osg::Vec3f(north.x(), north.y(), 0.f), zMin, zMax);
 
@@ -415,14 +403,16 @@ namespace MWRender
                 if (!segment.mFogOfWarImage)
                 {
                     bool loaded = false;
-                    for (size_t index{}; index < segmentMappings.size(); index++)
+                    if (const ESM::FogState* fog = cell->getFog())
                     {
-                        if (segmentMappings[index] == coords)
+                        auto match = std::find_if(
+                            fog->mFogTextures.begin(), fog->mFogTextures.end(), [&](const ESM::FogTexture& texture) {
+                                return texture.mX == x - xOffset && texture.mY == y - yOffset;
+                            });
+                        if (match != fog->mFogTextures.end())
                         {
-                            ESM::FogState* fog = cell->getFog();
-                            segment.loadFogOfWar(fog->mFogTextures[index]);
+                            segment.loadFogOfWar(*match);
                             loaded = true;
-                            break;
                         }
                     }
                     if (!loaded)
@@ -434,7 +424,7 @@ namespace MWRender
 
     void LocalMap::worldToInteriorMapPosition(osg::Vec2f pos, float& nX, float& nY, int& x, int& y)
     {
-        pos = rotatePoint(pos, osg::Vec2f(mBounds.center().x(), mBounds.center().y()), mAngle);
+        pos = rotatePoint(pos, mCenter, mAngle);
 
         osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
 
@@ -450,7 +440,7 @@ namespace MWRender
         osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
         osg::Vec2f pos(mMapWorldSize * (nX + x) + min.x(), mMapWorldSize * (1.0f - nY + y) + min.y());
 
-        pos = rotatePoint(pos, osg::Vec2f(mBounds.center().x(), mBounds.center().y()), -mAngle);
+        pos = rotatePoint(pos, mCenter, -mAngle);
         return pos;
     }
 
@@ -586,6 +576,12 @@ namespace MWRender
         return result;
     }
 
+    MyGUI::IntRect LocalMap::getInteriorGrid() const
+    {
+        auto segments = divideIntoSegments(mBounds, mMapWorldSize);
+        return { -1, -1, segments.first, segments.second };
+    }
+
     void LocalMap::MapSegment::createFogOfWarTexture()
     {
         if (mFogOfWarTexture)
@@ -679,7 +675,7 @@ namespace MWRender
 
     LocalMapRenderToTexture::LocalMapRenderToTexture(osg::Node* sceneRoot, int res, int mapWorldSize, float x, float y,
         const osg::Vec3d& upVector, float zmin, float zmax)
-        : RTTNode(res, res, 0, false, 0, StereoAwareness::Unaware_MultiViewShaders)
+        : RTTNode(res, res, 0, false, 0, StereoAwareness::Unaware_MultiViewShaders, shouldAddMSAAIntermediateTarget())
         , mSceneRoot(sceneRoot)
         , mActive(true)
     {
@@ -762,7 +758,7 @@ namespace MWRender
 
         lightSource->setStateSetModes(*stateset, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
-        SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
+        SceneUtil::ShadowManager::instance().disableShadowsForStateSet(*stateset);
 
         // override sun for local map
         SceneUtil::configureStateSetSunOverride(static_cast<SceneUtil::LightManager*>(mSceneRoot), light, stateset);
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index 9fd101c45f..3ba07ff2ee 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -6,6 +6,7 @@
 #include <set>
 #include <vector>
 
+#include <MyGUI_Types.h>
 #include <osg/BoundingBox>
 #include <osg/Quat>
 #include <osg/ref_ptr>
@@ -98,6 +99,8 @@ namespace MWRender
 
         osg::Group* getRoot();
 
+        MyGUI::IntRect getInteriorGrid() const;
+
     private:
         osg::ref_ptr<osg::Group> mRoot;
         osg::ref_ptr<osg::Node> mSceneRoot;
@@ -105,9 +108,6 @@ namespace MWRender
         typedef std::vector<osg::ref_ptr<LocalMapRenderToTexture>> RTTVector;
         RTTVector mLocalMapRTTs;
 
-        typedef std::set<std::pair<int, int>> Grid;
-        Grid mCurrentGrid;
-
         enum NeighbourCellFlag : std::uint8_t
         {
             NeighbourCellTopLeft = 1,
@@ -157,8 +157,9 @@ namespace MWRender
         void setupRenderToTexture(
             int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax);
 
-        bool mInterior;
         osg::BoundingBox mBounds;
+        osg::Vec2f mCenter;
+        bool mInterior;
 
         std::uint8_t getExteriorNeighbourFlags(int cellX, int cellY) const;
     };
diff --git a/apps/openmw/mwrender/luminancecalculator.cpp b/apps/openmw/mwrender/luminancecalculator.cpp
index 53240205c7..f974ea5ad7 100644
--- a/apps/openmw/mwrender/luminancecalculator.cpp
+++ b/apps/openmw/mwrender/luminancecalculator.cpp
@@ -1,7 +1,7 @@
 #include "luminancecalculator.hpp"
 
 #include <components/misc/mathutil.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 #include <components/shader/shadermanager.hpp>
 
 #include "pingpongcanvas.hpp"
@@ -10,11 +10,8 @@ namespace MWRender
 {
     LuminanceCalculator::LuminanceCalculator(Shader::ShaderManager& shaderManager)
     {
-        const float hdrExposureTime
-            = std::max(Settings::Manager::getFloat("auto exposure speed", "Post Processing"), 0.0001f);
-
         Shader::ShaderManager::DefineMap defines = {
-            { "hdrExposureTime", std::to_string(hdrExposureTime) },
+            { "hdrExposureTime", std::to_string(Settings::postProcessing().mAutoExposureSpeed) },
         };
 
         auto vertex = shaderManager.getShader("fullscreen_tri.vert", {});
@@ -22,31 +19,23 @@ namespace MWRender
         auto resolveFragment = shaderManager.getShader("luminance/resolve.frag", defines);
 
         mResolveProgram = shaderManager.getProgram(vertex, std::move(resolveFragment));
-        mLuminanceProgram = shaderManager.getProgram(vertex, std::move(luminanceFragment));
-    }
-
-    void LuminanceCalculator::compile()
-    {
-        int mipmapLevels = osg::Image::computeNumberOfMipmapLevels(mWidth, mHeight);
+        mLuminanceProgram = shaderManager.getProgram(std::move(vertex), std::move(luminanceFragment));
 
         for (auto& buffer : mBuffers)
         {
             buffer.mipmappedSceneLuminanceTex = new osg::Texture2D;
             buffer.mipmappedSceneLuminanceTex->setInternalFormat(GL_R16F);
             buffer.mipmappedSceneLuminanceTex->setSourceFormat(GL_RED);
-            buffer.mipmappedSceneLuminanceTex->setSourceType(GL_FLOAT);
             buffer.mipmappedSceneLuminanceTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
             buffer.mipmappedSceneLuminanceTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
             buffer.mipmappedSceneLuminanceTex->setFilter(
                 osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR_MIPMAP_NEAREST);
             buffer.mipmappedSceneLuminanceTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
             buffer.mipmappedSceneLuminanceTex->setTextureSize(mWidth, mHeight);
-            buffer.mipmappedSceneLuminanceTex->setNumMipmapLevels(mipmapLevels);
 
             buffer.luminanceTex = new osg::Texture2D;
             buffer.luminanceTex->setInternalFormat(GL_R16F);
             buffer.luminanceTex->setSourceFormat(GL_RED);
-            buffer.luminanceTex->setSourceType(GL_FLOAT);
             buffer.luminanceTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
             buffer.luminanceTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
             buffer.luminanceTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
@@ -65,14 +54,6 @@ namespace MWRender
             buffer.luminanceProxyFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
                 osg::FrameBufferAttachment(buffer.luminanceProxyTex));
 
-            buffer.resolveSceneLumFbo = new osg::FrameBufferObject;
-            buffer.resolveSceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
-                osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex, mipmapLevels - 1));
-
-            buffer.sceneLumFbo = new osg::FrameBufferObject;
-            buffer.sceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
-                osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex));
-
             buffer.sceneLumSS = new osg::StateSet;
             buffer.sceneLumSS->setAttributeAndModes(mLuminanceProgram);
             buffer.sceneLumSS->addUniform(new osg::Uniform("sceneTex", 0));
@@ -87,6 +68,26 @@ namespace MWRender
 
         mBuffers[0].resolveSS->setTextureAttributeAndModes(1, mBuffers[1].luminanceTex);
         mBuffers[1].resolveSS->setTextureAttributeAndModes(1, mBuffers[0].luminanceTex);
+    }
+
+    void LuminanceCalculator::compile()
+    {
+        int mipmapLevels = osg::Image::computeNumberOfMipmapLevels(mWidth, mHeight);
+
+        for (auto& buffer : mBuffers)
+        {
+            buffer.mipmappedSceneLuminanceTex->setTextureSize(mWidth, mHeight);
+            buffer.mipmappedSceneLuminanceTex->setNumMipmapLevels(mipmapLevels);
+            buffer.mipmappedSceneLuminanceTex->dirtyTextureObject();
+
+            buffer.resolveSceneLumFbo = new osg::FrameBufferObject;
+            buffer.resolveSceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex, mipmapLevels - 1));
+
+            buffer.sceneLumFbo = new osg::FrameBufferObject;
+            buffer.sceneLumFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+                osg::FrameBufferAttachment(buffer.mipmappedSceneLuminanceTex));
+        }
 
         mCompiled = true;
     }
@@ -117,13 +118,14 @@ namespace MWRender
         buffer.luminanceProxyFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
         ext->glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 
-        if (dirty)
+        if (mIsBlank)
         {
             // Use current frame data for previous frame to warm up calculations and prevent popin
             mBuffers[(frameId + 1) % 2].resolveFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
             ext->glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 
             buffer.luminanceProxyFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            mIsBlank = false;
         }
 
         buffer.resolveFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
diff --git a/apps/openmw/mwrender/luminancecalculator.hpp b/apps/openmw/mwrender/luminancecalculator.hpp
index 71ea2f7971..8b51081e2f 100644
--- a/apps/openmw/mwrender/luminancecalculator.hpp
+++ b/apps/openmw/mwrender/luminancecalculator.hpp
@@ -58,6 +58,7 @@ namespace MWRender
 
         bool mCompiled = false;
         bool mEnabled = false;
+        bool mIsBlank = true;
 
         int mWidth = 1;
         int mHeight = 1;
diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 8d638c918b..f1100ba502 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -1,4 +1,5 @@
 #include "navmesh.hpp"
+
 #include "vismask.hpp"
 
 #include <components/detournavigator/guardednavmeshcacheitem.hpp>
@@ -6,10 +7,13 @@
 #include <components/detournavigator/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/detourdebugdraw.hpp>
 #include <components/sceneutil/navmesh.hpp>
 #include <components/sceneutil/workqueue.hpp>
 
+#include <osg/BlendFunc>
+#include <osg/LineWidth>
 #include <osg/PositionAttitudeTransform>
 #include <osg/StateSet>
 
@@ -22,6 +26,29 @@
 
 namespace MWRender
 {
+    namespace
+    {
+        osg::ref_ptr<osg::StateSet> makeDebugDrawStateSet()
+        {
+            const osg::ref_ptr<osg::LineWidth> lineWidth = new osg::LineWidth();
+
+            const osg::ref_ptr<osg::BlendFunc> blendFunc = new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+            const osg::ref_ptr<SceneUtil::AutoDepth> depth = new SceneUtil::AutoDepth;
+            depth->setWriteMask(false);
+
+            osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
+            stateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
+            stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+            stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+            stateSet->setAttributeAndModes(lineWidth);
+            stateSet->setAttributeAndModes(blendFunc);
+            stateSet->setAttributeAndModes(depth);
+
+            return stateSet;
+        }
+    }
+
     struct NavMesh::LessByTilePosition
     {
         bool operator()(const DetourNavigator::TilePosition& lhs,
@@ -46,7 +73,7 @@ namespace MWRender
         const osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
         const DetourNavigator::Settings mSettings;
         std::map<DetourNavigator::TilePosition, Tile> mTiles;
-        NavMeshMode mMode;
+        Settings::NavMeshRenderMode mMode;
         std::atomic_bool mAborted{ false };
         std::mutex mMutex;
         bool mStarted = false;
@@ -57,7 +84,7 @@ namespace MWRender
             std::weak_ptr<DetourNavigator::GuardedNavMeshCacheItem> navMesh,
             const osg::ref_ptr<osg::StateSet>& groupStateSet, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet,
             const DetourNavigator::Settings& settings, const std::map<DetourNavigator::TilePosition, Tile>& tiles,
-            NavMeshMode mode)
+            Settings::NavMeshRenderMode mode)
             : mId(id)
             , mVersion(version)
             , mNavMesh(std::move(navMesh))
@@ -110,13 +137,13 @@ namespace MWRender
 
             const unsigned char flags = SceneUtil::NavMeshTileDrawFlagsOffMeshConnections
                 | SceneUtil::NavMeshTileDrawFlagsClosedList
-                | (mMode == NavMeshMode::UpdateFrequency ? SceneUtil::NavMeshTileDrawFlagsHeat : 0);
+                | (mMode == Settings::NavMeshRenderMode::UpdateFrequency ? SceneUtil::NavMeshTileDrawFlagsHeat : 0);
 
             for (const auto& [position, version] : existingTiles)
             {
                 const auto it = mTiles.find(position);
                 if (it != mTiles.end() && it->second.mGroup != nullptr && it->second.mVersion == version
-                    && mMode != NavMeshMode::UpdateFrequency)
+                    && mMode != Settings::NavMeshRenderMode::UpdateFrequency)
                     continue;
 
                 osg::ref_ptr<osg::Group> group;
@@ -129,16 +156,17 @@ namespace MWRender
                     if (mAborted.load(std::memory_order_acquire))
                         return;
 
-                    group = SceneUtil::createNavMeshTileGroup(navMesh->getImpl(), *meshTile, mSettings, mGroupStateSet,
-                        mDebugDrawStateSet, flags, minSalt, maxSalt);
+                    group = SceneUtil::createNavMeshTileGroup(
+                        navMesh->getImpl(), *meshTile, mSettings, mDebugDrawStateSet, flags, minSalt, maxSalt);
                 }
                 if (group == nullptr)
                 {
                     removedTiles.push_back(position);
                     continue;
                 }
-                MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
                 group->setNodeMask(Mask_Debug);
+                group->setStateSet(mGroupStateSet);
+                MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
                 updatedTiles.emplace_back(position, Tile{ version, std::move(group) });
             }
 
@@ -163,11 +191,11 @@ namespace MWRender
     };
 
     NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue,
-        bool enabled, NavMeshMode mode)
+        bool enabled, Settings::NavMeshRenderMode mode)
         : mRootNode(root)
         , mWorkQueue(workQueue)
-        , mGroupStateSet(SceneUtil::makeNavMeshTileStateSet())
-        , mDebugDrawStateSet(SceneUtil::DebugDraw::makeStateSet())
+        , mGroupStateSet(SceneUtil::makeDetourGroupStateSet())
+        , mDebugDrawStateSet(makeDebugDrawStateSet())
         , mEnabled(enabled)
         , mMode(mode)
         , mId(std::numeric_limits<std::size_t>::max())
@@ -310,7 +338,7 @@ namespace MWRender
         mEnabled = false;
     }
 
-    void NavMesh::setMode(NavMeshMode value)
+    void NavMesh::setMode(Settings::NavMeshRenderMode value)
     {
         if (mMode == value)
             return;
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index 4b4e50f791..8ac93e095f 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -1,18 +1,16 @@
 #ifndef OPENMW_MWRENDER_NAVMESH_H
 #define OPENMW_MWRENDER_NAVMESH_H
 
-#include "navmeshmode.hpp"
-
 #include <components/detournavigator/tileposition.hpp>
 #include <components/detournavigator/version.hpp>
 #include <components/misc/guarded.hpp>
+#include <components/settings/navmeshrendermode.hpp>
 
 #include <osg/ref_ptr>
 
 #include <cstddef>
 #include <map>
 #include <memory>
-#include <string_view>
 #include <vector>
 
 class dtNavMesh;
@@ -41,7 +39,7 @@ namespace MWRender
     {
     public:
         explicit NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue,
-            bool enabled, NavMeshMode mode);
+            bool enabled, Settings::NavMeshRenderMode mode);
         ~NavMesh();
 
         bool toggle();
@@ -57,7 +55,7 @@ namespace MWRender
 
         bool isEnabled() const { return mEnabled; }
 
-        void setMode(NavMeshMode value);
+        void setMode(Settings::NavMeshRenderMode value);
 
     private:
         struct Tile
@@ -75,7 +73,7 @@ namespace MWRender
         osg::ref_ptr<osg::StateSet> mGroupStateSet;
         osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
         bool mEnabled;
-        NavMeshMode mMode;
+        Settings::NavMeshRenderMode mMode;
         std::size_t mId;
         DetourNavigator::Version mVersion;
         std::map<DetourNavigator::TilePosition, Tile> mTiles;
diff --git a/apps/openmw/mwrender/navmeshmode.cpp b/apps/openmw/mwrender/navmeshmode.cpp
deleted file mode 100644
index d08e7cf693..0000000000
--- a/apps/openmw/mwrender/navmeshmode.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "navmeshmode.hpp"
-
-#include <stdexcept>
-#include <string>
-
-namespace MWRender
-{
-    NavMeshMode parseNavMeshMode(std::string_view value)
-    {
-        if (value == "area type")
-            return NavMeshMode::AreaType;
-        if (value == "update frequency")
-            return NavMeshMode::UpdateFrequency;
-        throw std::logic_error("Unsupported navigation mesh rendering mode: " + std::string(value));
-    }
-}
diff --git a/apps/openmw/mwrender/navmeshmode.hpp b/apps/openmw/mwrender/navmeshmode.hpp
deleted file mode 100644
index 9401479e21..0000000000
--- a/apps/openmw/mwrender/navmeshmode.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef OPENMW_MWRENDER_NAVMESHMODE_H
-#define OPENMW_MWRENDER_NAVMESHMODE_H
-
-#include <string_view>
-
-namespace MWRender
-{
-    enum class NavMeshMode
-    {
-        AreaType,
-        UpdateFrequency,
-    };
-
-    NavMeshMode parseNavMeshMode(std::string_view value);
-}
-
-#endif
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 6ddca9a674..c14eee27e4 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -18,7 +18,6 @@
 #include <components/esm3/loadrace.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/sceneutil/actorutil.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/lightcommon.hpp>
@@ -40,6 +39,7 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
 
+#include "actorutil.hpp"
 #include "postprocessor.hpp"
 #include "renderbin.hpp"
 #include "rotatecontroller.hpp"
@@ -48,7 +48,7 @@
 namespace
 {
 
-    std::string getVampireHead(const ESM::RefId& race, bool female, const VFS::Manager& vfs)
+    std::string getVampireHead(const ESM::RefId& race, bool female)
     {
         static std::map<std::pair<ESM::RefId, int>, const ESM::BodyPart*> sVampireMapping;
 
@@ -78,7 +78,7 @@ namespace
         const ESM::BodyPart* bodyPart = sVampireMapping[thisCombination];
         if (!bodyPart)
             return std::string();
-        return Misc::ResourceHelpers::correctMeshPath(bodyPart->mModel, &vfs);
+        return Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(bodyPart->mModel)).value();
     }
 
 }
@@ -155,6 +155,9 @@ namespace MWRender
         if (!mEnabled)
             return;
 
+        if (dt == 0.f)
+            return;
+
         if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference))
         {
             mBlinkTimer += dt;
@@ -312,9 +315,8 @@ namespace MWRender
     class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
     {
     public:
-        DepthClearCallback(Resource::ResourceSystem* resourceSystem)
+        DepthClearCallback()
         {
-            mPassNormals = resourceSystem->getSceneManager()->getSupportsNormalsRT();
             mDepth = new SceneUtil::AutoDepth;
             mDepth->setWriteMask(true);
 
@@ -328,51 +330,33 @@ namespace MWRender
         {
             osg::State* state = renderInfo.getState();
 
-            PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
+            PostProcessor* postProcessor = static_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
 
             state->applyAttribute(mDepth);
 
             unsigned int frameId = state->getFrameStamp()->getFrameNumber() % 2;
 
-            if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId))
-            {
-                postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId)->apply(*state);
-                if (mPassNormals)
-                {
-                    state->get<osg::GLExtensions>()->glColorMaski(1, true, true, true, true);
-                    state->haveAppliedAttribute(osg::StateAttribute::COLORMASK);
-                }
-                glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-                // color accumulation pass
-                bin->drawImplementation(renderInfo, previous);
+            postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId)->apply(*state);
+            glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+            // color accumulation pass
+            bin->drawImplementation(renderInfo, previous);
 
-                auto primaryFBO = postProcessor->getPrimaryFbo(frameId);
+            auto primaryFBO = postProcessor->getPrimaryFbo(frameId);
+            primaryFBO->apply(*state);
 
-                if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
-                    postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId)->apply(*state);
-                else
-                    primaryFBO->apply(*state);
+            postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId)->apply(*state);
 
-                // depth accumulation pass
-                osg::ref_ptr<osg::StateSet> restore = bin->getStateSet();
-                bin->setStateSet(mStateSet);
-                bin->drawImplementation(renderInfo, previous);
-                bin->setStateSet(restore);
+            // depth accumulation pass
+            osg::ref_ptr<osg::StateSet> restore = bin->getStateSet();
+            bin->setStateSet(mStateSet);
+            bin->drawImplementation(renderInfo, previous);
+            bin->setStateSet(restore);
 
-                if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
-                    primaryFBO->apply(*state);
-            }
-            else
-            {
-                // fallback to standard depth clear when we are not rendering our main scene via an intermediate FBO
-                glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-                bin->drawImplementation(renderInfo, previous);
-            }
+            primaryFBO->apply(*state);
 
             state->checkGLErrors("after DepthClearCallback::drawImplementation");
         }
 
-        bool mPassNormals;
         osg::ref_ptr<osg::Depth> mDepth;
         osg::ref_ptr<osg::StateSet> mStateSet;
     };
@@ -421,7 +405,7 @@ namespace MWRender
             if (!prototypeAdded)
             {
                 osg::ref_ptr<osgUtil::RenderBin> depthClearBin(new osgUtil::RenderBin);
-                depthClearBin->setDrawCallback(new DepthClearCallback(mResourceSystem));
+                depthClearBin->setDrawCallback(new DepthClearCallback());
                 osgUtil::RenderBin::addRenderBinPrototype("DepthClear", depthClearBin);
                 prototypeAdded = true;
             }
@@ -472,14 +456,14 @@ namespace MWRender
         mHeadModel.clear();
         mHairModel.clear();
 
-        const ESM::RefId& headName = isWerewolf ? ESM::RefId::stringRefId("WerewolfHead") : mNpc->mHead;
-        const ESM::RefId& hairName = isWerewolf ? ESM::RefId::stringRefId("WerewolfHair") : mNpc->mHair;
+        const ESM::RefId headName = isWerewolf ? ESM::RefId::stringRefId("WerewolfHead") : mNpc->mHead;
+        const ESM::RefId hairName = isWerewolf ? ESM::RefId::stringRefId("WerewolfHair") : mNpc->mHair;
 
         if (!headName.empty())
         {
             const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(headName);
             if (bp)
-                mHeadModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
+                mHeadModel = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(bp->mModel));
             else
                 Log(Debug::Warning) << "Warning: Failed to load body part '" << headName << "'";
         }
@@ -488,53 +472,59 @@ namespace MWRender
         {
             const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(hairName);
             if (bp)
-                mHairModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
+                mHairModel = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(bp->mModel));
             else
                 Log(Debug::Warning) << "Warning: Failed to load body part '" << hairName << "'";
         }
 
-        const std::string vampireHead = getVampireHead(mNpc->mRace, isFemale, *mResourceSystem->getVFS());
+        const std::string vampireHead = getVampireHead(mNpc->mRace, isFemale);
         if (!isWerewolf && isVampire && !vampireHead.empty())
             mHeadModel = vampireHead;
 
         bool is1stPerson = mViewMode == VM_FirstPerson;
         bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
 
-        std::string defaultSkeleton = SceneUtil::getActorSkeleton(is1stPerson, isFemale, isBeast, isWerewolf);
-        defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS());
+        std::string_view base;
+        if (!isWerewolf)
+        {
+            if (!is1stPerson)
+                base = Settings::models().mXbaseanim.get().value();
+            else
+                base = Settings::models().mXbaseanim1st.get().value();
+        }
+
+        const std::string defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(
+            VFS::Path::toNormalized(getActorSkeleton(is1stPerson, isFemale, isBeast, isWerewolf)),
+            mResourceSystem->getVFS());
 
         std::string smodel = defaultSkeleton;
+        bool isCustomModel = false;
         if (!is1stPerson && !isWerewolf && !mNpc->mModel.empty())
-            smodel = Misc::ResourceHelpers::correctActorModelPath(
-                Misc::ResourceHelpers::correctMeshPath(mNpc->mModel, mResourceSystem->getVFS()),
-                mResourceSystem->getVFS());
+        {
+            VFS::Path::Normalized model = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(mNpc->mModel));
+            isCustomModel = !isDefaultActorSkeleton(model);
+            smodel = Misc::ResourceHelpers::correctActorModelPath(model, mResourceSystem->getVFS());
+        }
 
         setObjectRoot(smodel, true, true, false);
 
         updateParts();
 
-        if (!is1stPerson)
-        {
-            const std::string& base = Settings::Manager::getString("xbaseanim", "Models");
-            if (smodel != base && !isWerewolf)
-                addAnimSource(base, smodel);
+        if (!base.empty())
+            addAnimSource(base, smodel);
 
-            if (smodel != defaultSkeleton && base != defaultSkeleton)
-                addAnimSource(defaultSkeleton, smodel);
+        if (defaultSkeleton != base)
+            addAnimSource(defaultSkeleton, smodel);
 
+        if (isCustomModel)
             addAnimSource(smodel, smodel);
 
-            if (!isWerewolf && mNpc->mRace.contains("argonian"))
-                addAnimSource("meshes\\xargonian_swimkna.nif", smodel);
-        }
-        else
+        const bool customArgonianSwim = !is1stPerson && !isWerewolf && isBeast && mNpc->mRace.contains("argonian");
+        if (customArgonianSwim)
+            addAnimSource(Settings::models().mXargonianswimkna.get().value(), smodel);
+
+        if (is1stPerson)
         {
-            const std::string& base = Settings::Manager::getString("xbaseanim1st", "Models");
-            if (smodel != base && !isWerewolf)
-                addAnimSource(base, smodel);
-
-            addAnimSource(smodel, smodel);
-
             mObjectRoot->setNodeMask(Mask_FirstPerson);
             mObjectRoot->addCullCallback(new OverrideFieldOfViewCallback(mFirstPersonFieldOfView));
         }
@@ -549,8 +539,7 @@ namespace MWRender
         if (mesh.empty())
             return std::string();
 
-        std::string holsteredName = mesh;
-        holsteredName = holsteredName.replace(holsteredName.size() - 4, 4, "_sh.nif");
+        const VFS::Path::Normalized holsteredName(addSuffixBeforeExtension(mesh, "_sh"));
         if (mResourceSystem->getVFS()->exists(holsteredName))
         {
             osg::ref_ptr<osg::Node> shieldTemplate = mResourceSystem->getSceneManager()->getInstance(holsteredName);
@@ -658,9 +647,8 @@ namespace MWRender
             if (store != inv.end() && (part = *store).getType() == ESM::Light::sRecordId)
             {
                 const ESM::Light* light = part.get<ESM::Light>()->mBase;
-                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
-                    Misc::ResourceHelpers::correctMeshPath(light->mModel, vfs), false, nullptr, true);
+                    Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(light->mModel)), false, nullptr, true);
                 if (mObjectParts[ESM::PRT_Shield])
                     addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), SceneUtil::LightCommon(*light));
             }
@@ -678,13 +666,9 @@ namespace MWRender
         {
             if (mPartPriorities[part] < 1)
             {
-                const ESM::BodyPart* bodypart = parts[part];
-                if (bodypart)
-                {
-                    const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                if (const ESM::BodyPart* bodypart = parts[part])
                     addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part), -1, 1,
-                        Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs));
-                }
+                        Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(bodypart->mModel)));
             }
         }
 
@@ -692,14 +676,14 @@ namespace MWRender
             attachArrow();
     }
 
-    PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, std::string_view bonename,
+    PartHolderPtr NpcAnimation::insertBoundedPart(VFS::Path::NormalizedView model, std::string_view bonename,
         std::string_view bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
     {
         osg::ref_ptr<osg::Node> attached = attach(model, bonename, bonefilter, isLight);
         if (enchantedGlow)
             mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, *glowColor);
 
-        return std::make_unique<PartHolder>(attached);
+        return std::make_unique<PartHolder>(std::move(attached));
     }
 
     osg::Vec3f NpcAnimation::runAnimation(float timepassed)
@@ -765,7 +749,7 @@ namespace MWRender
     }
 
     bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority,
-        const std::string& mesh, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
+        VFS::Path::NormalizedView mesh, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
     {
         if (priority <= mPartPriorities[type])
             return false;
@@ -852,7 +836,7 @@ namespace MWRender
                         }
                     }
                 }
-                SceneUtil::ForceControllerSourcesVisitor assignVisitor(src);
+                SceneUtil::ForceControllerSourcesVisitor assignVisitor(std::move(src));
                 node->accept(assignVisitor);
             }
             else
@@ -860,8 +844,8 @@ namespace MWRender
                 if (type == ESM::PRT_Weapon)
                     src = mWeaponAnimationTime;
                 else
-                    src = std::make_shared<NullAnimationTime>();
-                SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
+                    src = mAnimationTimePtr[0];
+                SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::move(src));
                 node->accept(assignVisitor);
             }
         }
@@ -913,11 +897,9 @@ namespace MWRender
             }
 
             if (bodypart)
-            {
-                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part.mPart), group, priority,
-                    Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs), enchantedGlow, glowColor);
-            }
+                    Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(bodypart->mModel)), enchantedGlow,
+                    glowColor);
             else
                 reserveIndividualPart((ESM::PartReferenceType)part.mPart, group, priority);
         }
@@ -932,13 +914,18 @@ namespace MWRender
 
         if (mViewMode == VM_FirstPerson)
         {
-            NodeMap::iterator found = mNodeMap.find("bip01 neck");
-            if (found != mNodeMap.end())
+            // If there is no active animation, then the bip01 neck node will not be updated each frame, and the
+            // RotateController will accumulate rotations.
+            if (mStates.size() > 0)
             {
-                osg::MatrixTransform* node = found->second.get();
-                mFirstPersonNeckController = new RotateController(mObjectRoot.get());
-                node->addUpdateCallback(mFirstPersonNeckController);
-                mActiveControllers.emplace_back(node, mFirstPersonNeckController);
+                NodeMap::iterator found = mNodeMap.find("bip01 neck");
+                if (found != mNodeMap.end())
+                {
+                    osg::MatrixTransform* node = found->second.get();
+                    mFirstPersonNeckController = new RotateController(mObjectRoot.get());
+                    node->addUpdateCallback(mFirstPersonNeckController);
+                    mActiveControllers.emplace_back(node, mFirstPersonNeckController);
+                }
             }
         }
         else if (mViewMode == VM_Normal)
@@ -958,7 +945,7 @@ namespace MWRender
             if (weapon != inv.end())
             {
                 osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
-                std::string mesh = weapon->getClass().getModel(*weapon);
+                const VFS::Path::Normalized mesh = weapon->getClass().getCorrectedModel(*weapon);
                 addOrReplaceIndividualPart(ESM::PRT_Weapon, MWWorld::InventoryStore::Slot_CarriedRight, 1, mesh,
                     !weapon->getClass().getEnchantment(*weapon).empty(), &glowColor);
 
@@ -1018,7 +1005,7 @@ namespace MWRender
         if (show && iter != inv.end())
         {
             osg::Vec4f glowColor = iter->getClass().getEnchantmentColor(*iter);
-            std::string mesh = iter->getClass().getModel(*iter);
+            VFS::Path::Normalized mesh = iter->getClass().getCorrectedModel(*iter);
             // For shields we must try to use the body part model
             if (iter->getType() == ESM::Armor::sRecordId)
             {
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index a03ee28f3a..1f9a656d65 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -1,13 +1,14 @@
 #ifndef GAME_RENDER_NPCANIMATION_H
 #define GAME_RENDER_NPCANIMATION_H
 
+#include "actoranimation.hpp"
 #include "animation.hpp"
+#include "weaponanimation.hpp"
+
+#include <components/vfs/pathutil.hpp>
 
 #include "../mwworld/inventorystore.hpp"
 
-#include "actoranimation.hpp"
-#include "weaponanimation.hpp"
-
 #include <array>
 
 namespace ESM
@@ -50,8 +51,8 @@ namespace MWRender
         std::array<MWSound::Sound*, ESM::PRT_Count> mSounds;
 
         const ESM::NPC* mNpc;
-        std::string mHeadModel;
-        std::string mHairModel;
+        VFS::Path::Normalized mHeadModel;
+        VFS::Path::Normalized mHairModel;
         ViewMode mViewMode;
         bool mShowWeapons;
         bool mShowCarriedLeft;
@@ -83,14 +84,15 @@ namespace MWRender
 
         NpcType getNpcType() const;
 
-        PartHolderPtr insertBoundedPart(const std::string& model, std::string_view bonename,
+        PartHolderPtr insertBoundedPart(VFS::Path::NormalizedView model, std::string_view bonename,
             std::string_view bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight);
 
         void removeIndividualPart(ESM::PartReferenceType type);
         void reserveIndividualPart(ESM::PartReferenceType type, int group, int priority);
 
-        bool addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority, const std::string& mesh,
-            bool enchantedGlow = false, osg::Vec4f* glowColor = nullptr, bool isLight = false);
+        bool addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority,
+            VFS::Path::NormalizedView mesh, bool enchantedGlow = false, osg::Vec4f* glowColor = nullptr,
+            bool isLight = false);
         void removePartGroup(int group);
         void addPartGroup(int group, int priority, const std::vector<ESM::PartReference>& parts,
             bool enchantedGlow = false, osg::Vec4f* glowColor = nullptr);
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index c3c473de6b..f45247398f 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -9,31 +9,30 @@
 #include <osg/Sequence>
 #include <osg/Switch>
 #include <osgAnimation/BasicAnimationManager>
+#include <osgParticle/ParticleProcessor>
+#include <osgParticle/ParticleSystemUpdater>
 #include <osgUtil/IncrementalCompileOperation>
 
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/loaddoor.hpp>
 #include <components/esm3/loadstat.hpp>
-
 #include <components/esm3/readerscache.hpp>
+#include <components/misc/pathhelpers.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/resource/scenemanager.hpp>
-#include <components/sceneutil/optimizer.hpp>
-#include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/sceneutil/util.hpp>
-#include <components/vfs/manager.hpp>
-
-#include <osgParticle/ParticleProcessor>
-#include <osgParticle/ParticleSystemUpdater>
-
 #include <components/misc/rng.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
+#include <components/sceneutil/optimizer.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>
-#include <components/settings/settings.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/settings/values.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "apps/openmw/mwbase/environment.hpp"
 #include "apps/openmw/mwbase/world.hpp"
@@ -41,81 +40,78 @@
 
 #include "vismask.hpp"
 
-#include <condition_variable>
-
 namespace MWRender
 {
-
-    bool typeFilter(int type, bool far)
+    namespace
     {
-        switch (type)
+        bool typeFilter(int type, bool far)
         {
-            case ESM::REC_STAT:
-            case ESM::REC_ACTI:
-            case ESM::REC_DOOR:
-                return true;
-            case ESM::REC_CONT:
-                return !far;
+            switch (type)
+            {
+                case ESM::REC_STAT:
+                case ESM::REC_ACTI:
+                case ESM::REC_DOOR:
+                    return true;
+                case ESM::REC_CONT:
+                    return !far;
 
-            default:
-                return false;
+                default:
+                    return false;
+            }
+        }
+
+        std::string getModel(int type, ESM::RefId id, const MWWorld::ESMStore& store)
+        {
+            switch (type)
+            {
+                case ESM::REC_STAT:
+                    return store.get<ESM::Static>().searchStatic(id)->mModel;
+                case ESM::REC_ACTI:
+                    return store.get<ESM::Activator>().searchStatic(id)->mModel;
+                case ESM::REC_DOOR:
+                    return store.get<ESM::Door>().searchStatic(id)->mModel;
+                case ESM::REC_CONT:
+                    return store.get<ESM::Container>().searchStatic(id)->mModel;
+                default:
+                    return {};
+            }
         }
     }
 
-    std::string getModel(int type, const ESM::RefId& id, const MWWorld::ESMStore& store)
-    {
-        switch (type)
-        {
-            case ESM::REC_STAT:
-                return store.get<ESM::Static>().searchStatic(id)->mModel;
-            case ESM::REC_ACTI:
-                return store.get<ESM::Activator>().searchStatic(id)->mModel;
-            case ESM::REC_DOOR:
-                return store.get<ESM::Door>().searchStatic(id)->mModel;
-            case ESM::REC_CONT:
-                return store.get<ESM::Container>().searchStatic(id)->mModel;
-            default:
-                return {};
-        }
-    }
-
-    osg::ref_ptr<osg::Node> ObjectPaging::getChunk(float size, const osg::Vec2f& center, unsigned char lod,
+    osg::ref_ptr<osg::Node> ObjectPaging::getChunk(float size, const osg::Vec2f& center, unsigned char /*lod*/,
         unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
     {
-        lod = static_cast<unsigned char>(lodFlags >> (4 * 4));
         if (activeGrid && !mActiveGrid)
             return nullptr;
 
-        ChunkId id = std::make_tuple(center, size, activeGrid);
+        const ChunkId id = std::make_tuple(center, size, activeGrid);
 
-        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
-        if (obj)
+        if (const osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id))
             return static_cast<osg::Node*>(obj.get());
-        else
-        {
-            osg::ref_ptr<osg::Node> node = createChunk(size, center, activeGrid, viewPoint, compile, lod);
-            mCache->addEntryToObjectCache(id, node.get());
-            return node;
-        }
-    }
 
-    class CanOptimizeCallback : public SceneUtil::Optimizer::IsOperationPermissibleForObjectCallback
-    {
-    public:
-        bool isOperationPermissibleForObjectImplementation(
-            const SceneUtil::Optimizer* optimizer, const osg::Drawable* node, unsigned int option) const override
-        {
-            return true;
-        }
-        bool isOperationPermissibleForObjectImplementation(
-            const SceneUtil::Optimizer* optimizer, const osg::Node* node, unsigned int option) const override
-        {
-            return (node->getDataVariance() != osg::Object::DYNAMIC);
-        }
-    };
+        const unsigned char lod = static_cast<unsigned char>(lodFlags >> (4 * 4));
+        osg::ref_ptr<osg::Node> node = createChunk(size, center, activeGrid, viewPoint, compile, lod);
+        mCache->addEntryToObjectCache(id, node.get());
+        return node;
+    }
 
     namespace
     {
+        class CanOptimizeCallback : public SceneUtil::Optimizer::IsOperationPermissibleForObjectCallback
+        {
+        public:
+            bool isOperationPermissibleForObjectImplementation(
+                const SceneUtil::Optimizer* optimizer, const osg::Drawable* node, unsigned int option) const override
+            {
+                return true;
+            }
+            bool isOperationPermissibleForObjectImplementation(
+                const SceneUtil::Optimizer* optimizer, const osg::Node* node, unsigned int option) const override
+            {
+                return (node->getDataVariance() != osg::Object::DYNAMIC);
+            }
+        };
+
         using LODRange = osg::LOD::MinMaxPair;
 
         LODRange intersection(const LODRange& left, const LODRange& right)
@@ -132,447 +128,487 @@ namespace MWRender
         {
             return { r.first / div, r.second / div };
         }
-    }
 
-    class CopyOp : public osg::CopyOp
-    {
-    public:
-        bool mOptimizeBillboards = true;
-        LODRange mDistances = { 0.f, 0.f };
-        osg::Vec3f mViewVector;
-        osg::Node::NodeMask mCopyMask = ~0u;
-        mutable std::vector<const osg::Node*> mNodePath;
-
-        void copy(const osg::Node* toCopy, osg::Group* attachTo)
+        class CopyOp : public osg::CopyOp
         {
-            const osg::Group* groupToCopy = toCopy->asGroup();
-            if (toCopy->getStateSet() || toCopy->asTransform() || !groupToCopy)
-                attachTo->addChild(operator()(toCopy));
-            else
+        public:
+            bool mOptimizeBillboards = true;
+            bool mActiveGrid = false;
+            LODRange mDistances = { 0.f, 0.f };
+            osg::Vec3f mViewVector;
+            osg::Node::NodeMask mCopyMask = ~0u;
+            mutable std::vector<const osg::Node*> mNodePath;
+
+            CopyOp(bool activeGrid, osg::Node::NodeMask copyMask)
+                : mActiveGrid(activeGrid)
+                , mCopyMask(copyMask)
             {
-                for (unsigned int i = 0; i < groupToCopy->getNumChildren(); ++i)
-                    attachTo->addChild(operator()(groupToCopy->getChild(i)));
             }
-        }
 
-        osg::Node* operator()(const osg::Node* node) const override
-        {
-            if (!(node->getNodeMask() & mCopyMask))
-                return nullptr;
-
-            if (const osg::Drawable* d = node->asDrawable())
-                return operator()(d);
-
-            if (dynamic_cast<const osgParticle::ParticleProcessor*>(node))
-                return nullptr;
-            if (dynamic_cast<const osgParticle::ParticleSystemUpdater*>(node))
-                return nullptr;
-
-            if (const osg::Switch* sw = node->asSwitch())
+            void copy(const osg::Node* toCopy, osg::Group* attachTo)
             {
-                osg::Group* n = new osg::Group;
-                for (unsigned int i = 0; i < sw->getNumChildren(); ++i)
-                    if (sw->getValue(i))
-                        n->addChild(operator()(sw->getChild(i)));
-                n->setDataVariance(osg::Object::STATIC);
-                return n;
-            }
-            if (const osg::LOD* lod = dynamic_cast<const osg::LOD*>(node))
-            {
-                std::vector<std::pair<osg::ref_ptr<osg::Node>, LODRange>> children;
-                for (unsigned int i = 0; i < lod->getNumChildren(); ++i)
-                    if (const auto r = intersection(lod->getRangeList()[i], mDistances); !empty(r))
-                        children.emplace_back(operator()(lod->getChild(i)), lod->getRangeList()[i]);
-                if (children.empty())
-                    return nullptr;
-
-                if (children.size() == 1)
-                    return children.front().first.release();
+                const osg::Group* groupToCopy = toCopy->asGroup();
+                if (toCopy->getStateSet() || toCopy->asTransform() || !groupToCopy)
+                    attachTo->addChild(operator()(toCopy));
                 else
                 {
-                    osg::LOD* n = new osg::LOD;
-                    for (const auto& [child, range] : children)
-                        n->addChild(child, range.first, range.second);
+                    for (unsigned int i = 0; i < groupToCopy->getNumChildren(); ++i)
+                        attachTo->addChild(operator()(groupToCopy->getChild(i)));
+                }
+            }
+
+            osg::Node* operator()(const osg::Node* node) const override
+            {
+                if (!(node->getNodeMask() & mCopyMask))
+                    return nullptr;
+
+                if (const osg::Drawable* d = node->asDrawable())
+                    return operator()(d);
+
+                if (dynamic_cast<const osgParticle::ParticleProcessor*>(node))
+                    return nullptr;
+                if (dynamic_cast<const osgParticle::ParticleSystemUpdater*>(node))
+                    return nullptr;
+
+                if (const osg::Switch* sw = node->asSwitch())
+                {
+                    osg::Group* n = new osg::Group;
+                    for (unsigned int i = 0; i < sw->getNumChildren(); ++i)
+                        if (sw->getValue(i))
+                            n->addChild(operator()(sw->getChild(i)));
                     n->setDataVariance(osg::Object::STATIC);
                     return n;
                 }
-            }
-            if (const osg::Sequence* sq = dynamic_cast<const osg::Sequence*>(node))
-            {
-                osg::Group* n = new osg::Group;
-                n->addChild(operator()(sq->getChild(sq->getValue() != -1 ? sq->getValue() : 0)));
-                n->setDataVariance(osg::Object::STATIC);
-                return n;
-            }
-
-            mNodePath.push_back(node);
-
-            osg::Node* cloned = static_cast<osg::Node*>(node->clone(*this));
-            cloned->setDataVariance(osg::Object::STATIC);
-            cloned->setUserDataContainer(nullptr);
-            cloned->setName("");
-
-            mNodePath.pop_back();
-
-            handleCallbacks(node, cloned);
-
-            return cloned;
-        }
-        void handleCallbacks(const osg::Node* node, osg::Node* cloned) const
-        {
-            for (const osg::Callback* callback = node->getCullCallback(); callback != nullptr;
-                 callback = callback->getNestedCallback())
-            {
-                if (callback->className() == std::string("BillboardCallback"))
+                if (const osg::LOD* lod = dynamic_cast<const osg::LOD*>(node))
                 {
-                    if (mOptimizeBillboards)
+                    std::vector<std::pair<osg::ref_ptr<osg::Node>, LODRange>> children;
+                    for (unsigned int i = 0; i < lod->getNumChildren(); ++i)
+                        if (const auto r = intersection(lod->getRangeList()[i], mDistances); !empty(r))
+                            children.emplace_back(operator()(lod->getChild(i)), lod->getRangeList()[i]);
+                    if (children.empty())
+                        return nullptr;
+
+                    if (children.size() == 1)
+                        return children.front().first.release();
+                    else
                     {
-                        handleBillboard(cloned);
-                        continue;
+                        osg::LOD* n = new osg::LOD;
+                        for (const auto& [child, range] : children)
+                            n->addChild(child, range.first, range.second);
+                        n->setDataVariance(osg::Object::STATIC);
+                        return n;
+                    }
+                }
+                if (const osg::Sequence* sq = dynamic_cast<const osg::Sequence*>(node))
+                {
+                    osg::Group* n = new osg::Group;
+                    n->addChild(operator()(sq->getChild(sq->getValue() != -1 ? sq->getValue() : 0)));
+                    n->setDataVariance(osg::Object::STATIC);
+                    return n;
+                }
+
+                mNodePath.push_back(node);
+
+                osg::Node* cloned = static_cast<osg::Node*>(node->clone(*this));
+                if (!mActiveGrid)
+                    cloned->setDataVariance(osg::Object::STATIC);
+                cloned->setUserDataContainer(nullptr);
+                cloned->setName("");
+
+                mNodePath.pop_back();
+
+                handleCallbacks(node, cloned);
+
+                return cloned;
+            }
+            void handleCallbacks(const osg::Node* node, osg::Node* cloned) const
+            {
+                for (const osg::Callback* callback = node->getCullCallback(); callback != nullptr;
+                     callback = callback->getNestedCallback())
+                {
+                    if (callback->className() == std::string("BillboardCallback"))
+                    {
+                        if (mOptimizeBillboards)
+                        {
+                            handleBillboard(cloned);
+                            continue;
+                        }
+                        else
+                            cloned->setDataVariance(osg::Object::DYNAMIC);
+                    }
+
+                    if (node->getCullCallback()->getNestedCallback())
+                    {
+                        osg::Callback* clonedCallback = osg::clone(callback, osg::CopyOp::SHALLOW_COPY);
+                        clonedCallback->setNestedCallback(nullptr);
+                        cloned->addCullCallback(clonedCallback);
                     }
                     else
-                        cloned->setDataVariance(osg::Object::DYNAMIC);
+                        cloned->addCullCallback(const_cast<osg::Callback*>(callback));
                 }
+            }
+            void handleBillboard(osg::Node* node) const
+            {
+                osg::Transform* transform = node->asTransform();
+                if (!transform)
+                    return;
+                osg::MatrixTransform* matrixTransform = transform->asMatrixTransform();
+                if (!matrixTransform)
+                    return;
 
-                if (node->getCullCallback()->getNestedCallback())
+                osg::Matrix worldToLocal = osg::Matrix::identity();
+                for (auto pathNode : mNodePath)
+                    if (const osg::Transform* t = pathNode->asTransform())
+                        t->computeWorldToLocalMatrix(worldToLocal, nullptr);
+                worldToLocal = osg::Matrix::orthoNormal(worldToLocal);
+
+                osg::Matrix billboardMatrix;
+                osg::Vec3f viewVector = -(mViewVector + worldToLocal.getTrans());
+                viewVector.normalize();
+                osg::Vec3f right = viewVector ^ osg::Vec3f(0, 0, 1);
+                right.normalize();
+                osg::Vec3f up = right ^ viewVector;
+                up.normalize();
+                billboardMatrix.makeLookAt(osg::Vec3f(0, 0, 0), viewVector, up);
+                billboardMatrix.invert(billboardMatrix);
+
+                const osg::Matrix& oldMatrix = matrixTransform->getMatrix();
+                float mag[3]; // attempt to preserve scale
+                for (int i = 0; i < 3; ++i)
+                    mag[i] = std::sqrt(oldMatrix(0, i) * oldMatrix(0, i) + oldMatrix(1, i) * oldMatrix(1, i)
+                        + oldMatrix(2, i) * oldMatrix(2, i));
+                osg::Matrix newMatrix;
+                worldToLocal.setTrans(0, 0, 0);
+                newMatrix *= worldToLocal;
+                newMatrix.preMult(billboardMatrix);
+                newMatrix.preMultScale(osg::Vec3f(mag[0], mag[1], mag[2]));
+                newMatrix.setTrans(oldMatrix.getTrans());
+
+                matrixTransform->setMatrix(newMatrix);
+            }
+            osg::Drawable* operator()(const osg::Drawable* drawable) const override
+            {
+                if (!(drawable->getNodeMask() & mCopyMask))
+                    return nullptr;
+
+                if (dynamic_cast<const osgParticle::ParticleSystem*>(drawable))
+                    return nullptr;
+
+                if (dynamic_cast<const SceneUtil::OsgaRigGeometry*>(drawable))
+                    return nullptr;
+                if (const SceneUtil::RigGeometry* rig = dynamic_cast<const SceneUtil::RigGeometry*>(drawable))
+                    return operator()(rig->getSourceGeometry());
+                if (const SceneUtil::MorphGeometry* morph = dynamic_cast<const SceneUtil::MorphGeometry*>(drawable))
+                    return operator()(morph->getSourceGeometry());
+
+                if (getCopyFlags() & DEEP_COPY_DRAWABLES)
                 {
-                    osg::Callback* clonedCallback = osg::clone(callback, osg::CopyOp::SHALLOW_COPY);
-                    clonedCallback->setNestedCallback(nullptr);
-                    cloned->addCullCallback(clonedCallback);
+                    osg::Drawable* d = static_cast<osg::Drawable*>(drawable->clone(*this));
+                    d->setDataVariance(osg::Object::STATIC);
+                    d->setUserDataContainer(nullptr);
+                    d->setName("");
+                    return d;
                 }
                 else
-                    cloned->addCullCallback(const_cast<osg::Callback*>(callback));
+                    return const_cast<osg::Drawable*>(drawable);
             }
-        }
-        void handleBillboard(osg::Node* node) const
-        {
-            osg::Transform* transform = node->asTransform();
-            if (!transform)
-                return;
-            osg::MatrixTransform* matrixTransform = transform->asMatrixTransform();
-            if (!matrixTransform)
-                return;
-
-            osg::Matrix worldToLocal = osg::Matrix::identity();
-            for (auto pathNode : mNodePath)
-                if (const osg::Transform* t = pathNode->asTransform())
-                    t->computeWorldToLocalMatrix(worldToLocal, nullptr);
-            worldToLocal = osg::Matrix::orthoNormal(worldToLocal);
-
-            osg::Matrix billboardMatrix;
-            osg::Vec3f viewVector = -(mViewVector + worldToLocal.getTrans());
-            viewVector.normalize();
-            osg::Vec3f right = viewVector ^ osg::Vec3f(0, 0, 1);
-            right.normalize();
-            osg::Vec3f up = right ^ viewVector;
-            up.normalize();
-            billboardMatrix.makeLookAt(osg::Vec3f(0, 0, 0), viewVector, up);
-            billboardMatrix.invert(billboardMatrix);
-
-            const osg::Matrix& oldMatrix = matrixTransform->getMatrix();
-            float mag[3]; // attempt to preserve scale
-            for (int i = 0; i < 3; ++i)
-                mag[i] = std::sqrt(oldMatrix(0, i) * oldMatrix(0, i) + oldMatrix(1, i) * oldMatrix(1, i)
-                    + oldMatrix(2, i) * oldMatrix(2, i));
-            osg::Matrix newMatrix;
-            worldToLocal.setTrans(0, 0, 0);
-            newMatrix *= worldToLocal;
-            newMatrix.preMult(billboardMatrix);
-            newMatrix.preMultScale(osg::Vec3f(mag[0], mag[1], mag[2]));
-            newMatrix.setTrans(oldMatrix.getTrans());
-
-            matrixTransform->setMatrix(newMatrix);
-        }
-        osg::Drawable* operator()(const osg::Drawable* drawable) const override
-        {
-            if (!(drawable->getNodeMask() & mCopyMask))
-                return nullptr;
-
-            if (dynamic_cast<const osgParticle::ParticleSystem*>(drawable))
-                return nullptr;
-
-            if (dynamic_cast<const SceneUtil::OsgaRigGeometry*>(drawable))
-                return nullptr;
-            if (const SceneUtil::RigGeometry* rig = dynamic_cast<const SceneUtil::RigGeometry*>(drawable))
-                return operator()(rig->getSourceGeometry());
-            if (const SceneUtil::MorphGeometry* morph = dynamic_cast<const SceneUtil::MorphGeometry*>(drawable))
-                return operator()(morph->getSourceGeometry());
-
-            if (getCopyFlags() & DEEP_COPY_DRAWABLES)
-            {
-                osg::Drawable* d = static_cast<osg::Drawable*>(drawable->clone(*this));
-                d->setDataVariance(osg::Object::STATIC);
-                d->setUserDataContainer(nullptr);
-                d->setName("");
-                return d;
-            }
-            else
-                return const_cast<osg::Drawable*>(drawable);
-        }
-        osg::Callback* operator()(const osg::Callback* callback) const override { return nullptr; }
-    };
-
-    class RefnumSet : public osg::Object
-    {
-    public:
-        RefnumSet() {}
-        RefnumSet(const RefnumSet& copy, const osg::CopyOp&)
-            : mRefnums(copy.mRefnums)
-        {
-        }
-        META_Object(MWRender, RefnumSet)
-        std::vector<ESM::RefNum> mRefnums;
-    };
-
-    class AnalyzeVisitor : public osg::NodeVisitor
-    {
-    public:
-        AnalyzeVisitor(osg::Node::NodeMask analyzeMask)
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-            , mCurrentStateSet(nullptr)
-        {
-            setTraversalMask(analyzeMask);
-        }
-
-        typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
-        struct Result
-        {
-            StateSetCounter mStateSetCounter;
-            unsigned int mNumVerts = 0;
+            osg::Callback* operator()(const osg::Callback* callback) const override { return nullptr; }
         };
 
-        void apply(osg::Node& node) override
+        class RefnumSet : public osg::Object
         {
-            if (node.getStateSet())
-                mCurrentStateSet = node.getStateSet();
+        public:
+            RefnumSet() {}
+            RefnumSet(const RefnumSet& copy, const osg::CopyOp&)
+                : mRefnums(copy.mRefnums)
+            {
+            }
+            META_Object(MWRender, RefnumSet)
+            std::vector<ESM::RefNum> mRefnums;
+        };
 
-            if (osg::Switch* sw = node.asSwitch())
+        class AnalyzeVisitor : public osg::NodeVisitor
+        {
+        public:
+            AnalyzeVisitor(osg::Node::NodeMask analyzeMask)
+                : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+                , mCurrentStateSet(nullptr)
             {
-                for (unsigned int i = 0; i < sw->getNumChildren(); ++i)
-                    if (sw->getValue(i))
-                        traverse(*sw->getChild(i));
-                return;
-            }
-            if (osg::LOD* lod = dynamic_cast<osg::LOD*>(&node))
-            {
-                for (unsigned int i = 0; i < lod->getNumChildren(); ++i)
-                    if (const auto r = intersection(lod->getRangeList()[i], mDistances); !empty(r))
-                        traverse(*lod->getChild(i));
-                return;
-            }
-            if (osg::Sequence* sq = dynamic_cast<osg::Sequence*>(&node))
-            {
-                traverse(*sq->getChild(sq->getValue() != -1 ? sq->getValue() : 0));
-                return;
+                setTraversalMask(analyzeMask);
             }
 
-            traverse(node);
-        }
-        void apply(osg::Geometry& geom) override
-        {
-            if (osg::Array* array = geom.getVertexArray())
-                mResult.mNumVerts += array->getNumElements();
-
-            ++mResult.mStateSetCounter[mCurrentStateSet];
-            ++mGlobalStateSetCounter[mCurrentStateSet];
-        }
-        Result retrieveResult()
-        {
-            Result result = mResult;
-            mResult = Result();
-            mCurrentStateSet = nullptr;
-            return result;
-        }
-        void addInstance(const Result& result)
-        {
-            for (auto pair : result.mStateSetCounter)
-                mGlobalStateSetCounter[pair.first] += pair.second;
-        }
-        float getMergeBenefit(const Result& result)
-        {
-            if (result.mStateSetCounter.empty())
-                return 1;
-            float mergeBenefit = 0;
-            for (auto pair : result.mStateSetCounter)
+            typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
+            struct Result
             {
-                mergeBenefit += mGlobalStateSetCounter[pair.first];
+                StateSetCounter mStateSetCounter;
+                unsigned int mNumVerts = 0;
+            };
+
+            void apply(osg::Node& node) override
+            {
+                if (node.getStateSet())
+                    mCurrentStateSet = node.getStateSet();
+
+                if (osg::Switch* sw = node.asSwitch())
+                {
+                    for (unsigned int i = 0; i < sw->getNumChildren(); ++i)
+                        if (sw->getValue(i))
+                            traverse(*sw->getChild(i));
+                    return;
+                }
+                if (osg::LOD* lod = dynamic_cast<osg::LOD*>(&node))
+                {
+                    for (unsigned int i = 0; i < lod->getNumChildren(); ++i)
+                        if (const auto r = intersection(lod->getRangeList()[i], mDistances); !empty(r))
+                            traverse(*lod->getChild(i));
+                    return;
+                }
+                if (osg::Sequence* sq = dynamic_cast<osg::Sequence*>(&node))
+                {
+                    traverse(*sq->getChild(sq->getValue() != -1 ? sq->getValue() : 0));
+                    return;
+                }
+
+                traverse(node);
             }
-            mergeBenefit /= result.mStateSetCounter.size();
-            return mergeBenefit;
-        }
+            void apply(osg::Geometry& geom) override
+            {
+                if (osg::Array* array = geom.getVertexArray())
+                    mResult.mNumVerts += array->getNumElements();
 
-        Result mResult;
-        osg::StateSet* mCurrentStateSet;
-        StateSetCounter mGlobalStateSetCounter;
-        LODRange mDistances = { 0.f, 0.f };
-    };
+                ++mResult.mStateSetCounter[mCurrentStateSet];
+                ++mGlobalStateSetCounter[mCurrentStateSet];
+            }
+            Result retrieveResult()
+            {
+                Result result = mResult;
+                mResult = Result();
+                mCurrentStateSet = nullptr;
+                return result;
+            }
+            void addInstance(const Result& result)
+            {
+                for (auto pair : result.mStateSetCounter)
+                    mGlobalStateSetCounter[pair.first] += pair.second;
+            }
+            float getMergeBenefit(const Result& result)
+            {
+                if (result.mStateSetCounter.empty())
+                    return 1;
+                float mergeBenefit = 0;
+                for (auto pair : result.mStateSetCounter)
+                {
+                    mergeBenefit += mGlobalStateSetCounter[pair.first];
+                }
+                mergeBenefit /= result.mStateSetCounter.size();
+                return mergeBenefit;
+            }
 
-    class DebugVisitor : public osg::NodeVisitor
-    {
-    public:
-        DebugVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        {
-        }
-        void apply(osg::Drawable& node) override
-        {
-            osg::ref_ptr<osg::Material> m(new osg::Material);
-            osg::Vec4f color(
-                Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), 0.f);
-            color.normalize();
-            m->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f, 0.1f, 0.1f, 1.f));
-            m->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f, 0.1f, 0.1f, 1.f));
-            m->setColorMode(osg::Material::OFF);
-            m->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(color));
-            osg::ref_ptr<osg::StateSet> stateset
-                = node.getStateSet() ? osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY) : new osg::StateSet;
-            stateset->setAttribute(m);
-            stateset->addUniform(new osg::Uniform("colorMode", 0));
-            stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
-            stateset->addUniform(new osg::Uniform("specStrength", 1.f));
-            node.setStateSet(stateset);
-        }
-    };
+            Result mResult;
+            osg::StateSet* mCurrentStateSet;
+            StateSetCounter mGlobalStateSetCounter;
+            LODRange mDistances = { 0.f, 0.f };
+        };
 
-    class AddRefnumMarkerVisitor : public osg::NodeVisitor
-    {
-    public:
-        AddRefnumMarkerVisitor(const ESM::RefNum& refnum)
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-            , mRefnum(refnum)
+        class DebugVisitor : public osg::NodeVisitor
         {
-        }
-        ESM::RefNum mRefnum;
-        void apply(osg::Geometry& node) override
-        {
-            osg::ref_ptr<RefnumMarker> marker(new RefnumMarker);
-            marker->mRefnum = mRefnum;
-            if (osg::Array* array = node.getVertexArray())
-                marker->mNumVertices = array->getNumElements();
-            node.getOrCreateUserDataContainer()->addUserObject(marker);
-        }
-    };
+        public:
+            DebugVisitor()
+                : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            {
+            }
+            void apply(osg::Drawable& node) override
+            {
+                osg::ref_ptr<osg::Material> m(new osg::Material);
+                osg::Vec4f color(
+                    Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), Misc::Rng::rollProbability(), 0.f);
+                color.normalize();
+                m->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f, 0.1f, 0.1f, 1.f));
+                m->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.1f, 0.1f, 0.1f, 1.f));
+                m->setColorMode(osg::Material::OFF);
+                m->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(color));
+                osg::ref_ptr<osg::StateSet> stateset = node.getStateSet()
+                    ? osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY)
+                    : new osg::StateSet;
+                stateset->setAttribute(m);
+                stateset->addUniform(new osg::Uniform("colorMode", 0));
+                stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
+                stateset->addUniform(new osg::Uniform("specStrength", 1.f));
+                node.setStateSet(stateset);
+            }
+        };
 
-    ObjectPaging::ObjectPaging(Resource::SceneManager* sceneManager, ESM::RefId worldspace)
-        : GenericResourceManager<ChunkId>(nullptr)
-        , Terrain::QuadTreeWorld::ChunkManager(worldspace)
-        , mSceneManager(sceneManager)
-        , mRefTrackerLocked(false)
-    {
-        mActiveGrid = Settings::Manager::getBool("object paging active grid", "Terrain");
-        mDebugBatches = Settings::Manager::getBool("debug chunks", "Terrain");
-        mMergeFactor = Settings::Manager::getFloat("object paging merge factor", "Terrain");
-        mMinSize = Settings::Manager::getFloat("object paging min size", "Terrain");
-        mMinSizeMergeFactor = Settings::Manager::getFloat("object paging min size merge factor", "Terrain");
-        mMinSizeCostMultiplier = Settings::Manager::getFloat("object paging min size cost multiplier", "Terrain");
+        class AddRefnumMarkerVisitor : public osg::NodeVisitor
+        {
+        public:
+            AddRefnumMarkerVisitor(ESM::RefNum refnum)
+                : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+                , mRefnum(refnum)
+            {
+            }
+            ESM::RefNum mRefnum;
+            void apply(osg::Geometry& node) override
+            {
+                osg::ref_ptr<RefnumMarker> marker(new RefnumMarker);
+                marker->mRefnum = mRefnum;
+                if (osg::Array* array = node.getVertexArray())
+                    marker->mNumVertices = array->getNumElements();
+                node.getOrCreateUserDataContainer()->addUserObject(marker);
+            }
+        };
     }
 
-    std::map<ESM::RefNum, ESM::CellRef> ObjectPaging::collectESM3References(
-        float size, const osg::Vec2i& startCell, ESM::ReadersCache& readers) const
+    ObjectPaging::ObjectPaging(Resource::SceneManager* sceneManager, ESM::RefId worldspace)
+        : GenericResourceManager<ChunkId>(nullptr, Settings::cells().mCacheExpiryDelay)
+        , Terrain::QuadTreeWorld::ChunkManager(worldspace)
+        , mSceneManager(sceneManager)
+        , mActiveGrid(Settings::terrain().mObjectPagingActiveGrid)
+        , mDebugBatches(Settings::terrain().mDebugChunks)
+        , mMergeFactor(Settings::terrain().mObjectPagingMergeFactor)
+        , mMinSize(Settings::terrain().mObjectPagingMinSize)
+        , mMinSizeMergeFactor(Settings::terrain().mObjectPagingMinSizeMergeFactor)
+        , mMinSizeCostMultiplier(Settings::terrain().mObjectPagingMinSizeCostMultiplier)
+        , mRefTrackerLocked(false)
     {
-        std::map<ESM::RefNum, ESM::CellRef> refs;
-        const auto& store = MWBase::Environment::get().getWorld()->getStore();
-        for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
+    }
+
+    namespace
+    {
+        struct PagedCellRef
         {
-            for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
+            ESM::RefId mRefId;
+            ESM::RefNum mRefNum;
+            osg::Vec3f mPosition;
+            osg::Vec3f mRotation;
+            float mScale;
+        };
+
+        PagedCellRef makePagedCellRef(const ESM::CellRef& value)
+        {
+            return PagedCellRef{
+                .mRefId = value.mRefID,
+                .mRefNum = value.mRefNum,
+                .mPosition = value.mPos.asVec3(),
+                .mRotation = value.mPos.asRotationVec3(),
+                .mScale = value.mScale,
+            };
+        }
+
+        std::map<ESM::RefNum, PagedCellRef> collectESM3References(
+            float size, const osg::Vec2i& startCell, const MWWorld::ESMStore& store)
+        {
+            std::map<ESM::RefNum, PagedCellRef> refs;
+            ESM::ReadersCache readers;
+            for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
             {
-                const ESM::Cell* cell = store.get<ESM::Cell>().searchStatic(cellX, cellY);
-                if (!cell)
-                    continue;
-                for (size_t i = 0; i < cell->mContextList.size(); ++i)
+                for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
                 {
-                    try
+                    const ESM::Cell* cell = store.get<ESM::Cell>().searchStatic(cellX, cellY);
+                    if (!cell)
+                        continue;
+                    for (size_t i = 0; i < cell->mContextList.size(); ++i)
                     {
-                        const std::size_t index = static_cast<std::size_t>(cell->mContextList[i].index);
-                        const ESM::ReadersCache::BusyItem reader = readers.get(index);
-                        cell->restore(*reader, i);
-                        ESM::CellRef ref;
-                        ESM::MovedCellRef cMRef;
-                        bool deleted = false;
-                        bool moved = false;
-                        while (ESM::Cell::getNextRef(
-                            *reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
+                        try
                         {
-                            if (moved)
-                                continue;
-
-                            if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum)
-                                != cell->mMovedRefs.end())
-                                continue;
-
-                            int type = store.findStatic(ref.mRefID);
-                            if (!typeFilter(type, size >= 2))
-                                continue;
-                            if (deleted)
+                            const std::size_t index = static_cast<std::size_t>(cell->mContextList[i].index);
+                            const ESM::ReadersCache::BusyItem reader = readers.get(index);
+                            cell->restore(*reader, i);
+                            ESM::CellRef ref;
+                            ESM::MovedCellRef cMRef;
+                            bool deleted = false;
+                            bool moved = false;
+                            while (ESM::Cell::getNextRef(
+                                *reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                             {
-                                refs.erase(ref.mRefNum);
-                                continue;
+                                if (moved)
+                                    continue;
+
+                                if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum)
+                                    != cell->mMovedRefs.end())
+                                    continue;
+
+                                int type = store.findStatic(ref.mRefID);
+                                if (!typeFilter(type, size >= 2))
+                                    continue;
+                                if (deleted)
+                                {
+                                    refs.erase(ref.mRefNum);
+                                    continue;
+                                }
+                                refs.insert_or_assign(ref.mRefNum, makePagedCellRef(ref));
                             }
-                            refs[ref.mRefNum] = std::move(ref);
+                        }
+                        catch (const std::exception& e)
+                        {
+                            Log(Debug::Warning) << "Failed to collect references from cell \"" << cell->getDescription()
+                                                << "\": " << e.what();
+                            continue;
                         }
                     }
-                    catch (std::exception&)
+                    for (const auto& [ref, deleted] : cell->mLeasedRefs)
                     {
-                        continue;
+                        if (deleted)
+                        {
+                            refs.erase(ref.mRefNum);
+                            continue;
+                        }
+                        int type = store.findStatic(ref.mRefID);
+                        if (!typeFilter(type, size >= 2))
+                            continue;
+                        refs.insert_or_assign(ref.mRefNum, makePagedCellRef(ref));
                     }
                 }
-                for (auto [ref, deleted] : cell->mLeasedRefs)
-                {
-                    if (deleted)
-                    {
-                        refs.erase(ref.mRefNum);
-                        continue;
-                    }
-                    int type = store.findStatic(ref.mRefID);
-                    if (!typeFilter(type, size >= 2))
-                        continue;
-                    refs[ref.mRefNum] = std::move(ref);
-                }
             }
+            return refs;
         }
-        return refs;
     }
 
     osg::ref_ptr<osg::Node> ObjectPaging::createChunk(float size, const osg::Vec2f& center, bool activeGrid,
         const osg::Vec3f& viewPoint, bool compile, unsigned char lod)
     {
-        osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size / 2.f), std::floor(center.y() - size / 2.f));
+        const osg::Vec2i startCell(std::floor(center.x() - size / 2.f), std::floor(center.y() - size / 2.f));
+        const MWBase::World& world = *MWBase::Environment::get().getWorld();
+        const MWWorld::ESMStore& store = world.getStore();
 
-        osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0) * getCellSize(mWorldspace);
-        osg::Vec3f relativeViewPoint = viewPoint - worldCenter;
-
-        std::map<ESM::RefNum, ESM::CellRef> refs;
-        ESM::ReadersCache readers;
-        const auto& world = MWBase::Environment::get().getWorld();
-        const auto& store = world->getStore();
+        std::map<ESM::RefNum, PagedCellRef> refs;
 
         if (mWorldspace == ESM::Cell::sDefaultWorldspaceId)
         {
-            refs = collectESM3References(size, startCell, readers);
+            refs = collectESM3References(size, startCell, store);
         }
         else
         {
             // TODO
         }
 
-        if (activeGrid)
+        if (activeGrid && !refs.empty())
         {
             std::lock_guard<std::mutex> lock(mRefTrackerMutex);
-            for (auto ref : getRefTracker().mBlacklist)
-                refs.erase(ref);
+            const std::set<ESM::RefNum>& blacklist = getRefTracker().mBlacklist;
+            if (blacklist.size() < refs.size())
+            {
+                for (ESM::RefNum ref : blacklist)
+                    refs.erase(ref);
+            }
+            else
+            {
+                std::erase_if(refs, [&](const auto& ref) { return blacklist.contains(ref.first); });
+            }
         }
 
-        osg::Vec2f minBound = (center - osg::Vec2f(size / 2.f, size / 2.f));
-        osg::Vec2f maxBound = (center + osg::Vec2f(size / 2.f, size / 2.f));
+        const osg::Vec2f minBound = (center - osg::Vec2f(size / 2.f, size / 2.f));
+        const osg::Vec2f maxBound = (center + osg::Vec2f(size / 2.f, size / 2.f));
+        const osg::Vec2i floorMinBound(std::floor(minBound.x()), std::floor(minBound.y()));
+        const osg::Vec2i ceilMaxBound(std::ceil(maxBound.x()), std::ceil(maxBound.y()));
         struct InstanceList
         {
-            std::vector<const ESM::CellRef*> mInstances;
+            std::vector<const PagedCellRef*> mInstances;
             AnalyzeVisitor::Result mAnalyzeResult;
             bool mNeedCompile = false;
         };
         typedef std::map<osg::ref_ptr<const osg::Node>, InstanceList> NodeMap;
         NodeMap nodes;
-        osg::ref_ptr<RefnumSet> refnumSet = activeGrid ? new RefnumSet : nullptr;
+        const osg::ref_ptr<RefnumSet> refnumSet = activeGrid ? new RefnumSet : nullptr;
 
         // Mask_UpdateVisitor is used in such cases in NIF loader:
         // 1. For collision nodes, which is not supposed to be rendered.
@@ -580,58 +616,50 @@ namespace MWRender
         // Since ObjectPaging does not handle VisController, we can just ignore both types of nodes.
         constexpr auto copyMask = ~Mask_UpdateVisitor;
 
-        auto cellSize = getCellSize(mWorldspace);
-        const auto smallestDistanceToChunk = (size > 1 / 8.f) ? (size * cellSize) : 0.f;
-        const auto higherDistanceToChunk = [&] {
-            if (!activeGrid)
-                return smallestDistanceToChunk + 1;
-            return ((size < 1) ? 5 : 3) * cellSize * size + 1;
-        }();
+        const int cellSize = getCellSize(mWorldspace);
+        const float smallestDistanceToChunk = (size > 1 / 8.f) ? (size * cellSize) : 0.f;
+        const float higherDistanceToChunk
+            = activeGrid ? ((size < 1) ? 5 : 3) * cellSize * size + 1 : smallestDistanceToChunk + 1;
 
         AnalyzeVisitor analyzeVisitor(copyMask);
-        float minSize = mMinSize;
-        if (mMinSizeMergeFactor)
-            minSize *= mMinSizeMergeFactor;
-        for (const auto& pair : refs)
+        const float minSize = mMinSizeMergeFactor ? mMinSize * mMinSizeMergeFactor : mMinSize;
+        for (const auto& [refNum, ref] : refs)
         {
-            const ESM::CellRef& ref = pair.second;
-
-            osg::Vec3f pos = ref.mPos.asVec3();
             if (size < 1.f)
             {
-                osg::Vec3f cellPos = pos / cellSize;
-                if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x())
-                    || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
-                    || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x())
-                    || (maxBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
+                const osg::Vec3f cellPos = ref.mPosition / cellSize;
+                if ((minBound.x() > floorMinBound.x() && cellPos.x() < minBound.x())
+                    || (minBound.y() > floorMinBound.y() && cellPos.y() < minBound.y())
+                    || (maxBound.x() < ceilMaxBound.x() && cellPos.x() >= maxBound.x())
+                    || (maxBound.y() < ceilMaxBound.y() && cellPos.y() >= maxBound.y()))
                     continue;
             }
 
-            float dSqr = (viewPoint - pos).length2();
+            const float dSqr = (viewPoint - ref.mPosition).length2();
             if (!activeGrid)
             {
                 std::lock_guard<std::mutex> lock(mSizeCacheMutex);
-                SizeCache::iterator found = mSizeCache.find(pair.first);
+                SizeCache::iterator found = mSizeCache.find(refNum);
                 if (found != mSizeCache.end() && found->second < dSqr * minSize * minSize)
                     continue;
             }
 
-            if (Misc::ResourceHelpers::isHiddenMarker(ref.mRefID))
+            if (Misc::ResourceHelpers::isHiddenMarker(ref.mRefId))
                 continue;
 
-            int type = store.findStatic(ref.mRefID);
-            std::string model = getModel(type, ref.mRefID, store);
+            const int type = store.findStatic(ref.mRefId);
+            VFS::Path::Normalized model = getModel(type, ref.mRefId, store);
             if (model.empty())
                 continue;
-            model = Misc::ResourceHelpers::correctMeshPath(model, mSceneManager->getVFS());
+            model = Misc::ResourceHelpers::correctMeshPath(model);
 
             if (activeGrid && type != ESM::REC_STAT)
             {
                 model = Misc::ResourceHelpers::correctActorModelPath(model, mSceneManager->getVFS());
-                std::string kfname = Misc::StringUtils::lowerCase(model);
-                if (kfname.size() > 4 && kfname.ends_with(".nif"))
+                if (Misc::getFileExtension(model) == "nif")
                 {
-                    kfname.replace(kfname.size() - 4, 4, ".kf");
+                    VFS::Path::Normalized kfname = model;
+                    kfname.changeExtension("kf");
                     if (mSceneManager->getVFS()->exists(kfname))
                         continue;
                 }
@@ -646,11 +674,9 @@ namespace MWRender
                     model = found->second;
                 else
                     model = mLODNameCache
-                                .insert(found,
-                                    { key,
-                                        Misc::ResourceHelpers::getLODMeshName(
-                                            world->getESMVersions()[ref.mRefNum.mContentFile], model,
-                                            mSceneManager->getVFS(), lod) })
+                                .emplace_hint(found, std::move(key),
+                                    Misc::ResourceHelpers::getLODMeshName(world.getESMVersions()[refNum.mContentFile],
+                                        model, *mSceneManager->getVFS(), lod))
                                 ->second;
             }
 
@@ -665,76 +691,74 @@ namespace MWRender
                         && dynamic_cast<const osgAnimation::BasicAnimationManager*>(cnode->getUpdateCallback())))
                     continue;
                 else
-                    refnumSet->mRefnums.push_back(pair.first);
+                    refnumSet->mRefnums.push_back(refNum);
             }
 
             {
                 std::lock_guard<std::mutex> lock(mRefTrackerMutex);
-                if (getRefTracker().mDisabled.count(pair.first))
+                if (getRefTracker().mDisabled.count(refNum))
                     continue;
             }
 
-            float radius2 = cnode->getBound().radius2() * ref.mScale * ref.mScale;
+            const float radius2 = cnode->getBound().radius2() * ref.mScale * ref.mScale;
             if (radius2 < dSqr * minSize * minSize && !activeGrid)
             {
                 std::lock_guard<std::mutex> lock(mSizeCacheMutex);
-                mSizeCache[pair.first] = radius2;
+                mSizeCache[refNum] = radius2;
                 continue;
             }
 
-            auto emplaced = nodes.emplace(cnode, InstanceList());
+            const auto emplaced = nodes.emplace(std::move(cnode), InstanceList());
             if (emplaced.second)
             {
                 analyzeVisitor.mDistances = LODRange{ smallestDistanceToChunk, higherDistanceToChunk } / ref.mScale;
-                const_cast<osg::Node*>(cnode.get())
-                    ->accept(
-                        analyzeVisitor); // const-trickery required because there is no const version of NodeVisitor
+                const osg::Node* const nodePtr = emplaced.first->first.get();
+                // const-trickery required because there is no const version of NodeVisitor
+                const_cast<osg::Node*>(nodePtr)->accept(analyzeVisitor);
                 emplaced.first->second.mAnalyzeResult = analyzeVisitor.retrieveResult();
-                emplaced.first->second.mNeedCompile = compile && cnode->referenceCount() <= 3;
+                emplaced.first->second.mNeedCompile = compile && nodePtr->referenceCount() <= 2;
             }
             else
                 analyzeVisitor.addInstance(emplaced.first->second.mAnalyzeResult);
             emplaced.first->second.mInstances.push_back(&ref);
         }
 
+        const osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0) * getCellSize(mWorldspace);
         osg::ref_ptr<osg::Group> group = new osg::Group;
         osg::ref_ptr<osg::Group> mergeGroup = new osg::Group;
         osg::ref_ptr<Resource::TemplateMultiRef> templateRefs = new Resource::TemplateMultiRef;
         osgUtil::StateToCompile stateToCompile(0, nullptr);
-        CopyOp copyop;
-        copyop.mCopyMask = copyMask;
+        CopyOp copyop(activeGrid, copyMask);
         for (const auto& pair : nodes)
         {
             const osg::Node* cnode = pair.first;
 
             const AnalyzeVisitor::Result& analyzeResult = pair.second.mAnalyzeResult;
 
-            float mergeCost = analyzeResult.mNumVerts * size;
-            float mergeBenefit = analyzeVisitor.getMergeBenefit(analyzeResult) * mMergeFactor;
-            bool merge = mergeBenefit > mergeCost;
+            const float mergeCost = analyzeResult.mNumVerts * size;
+            const float mergeBenefit = analyzeVisitor.getMergeBenefit(analyzeResult) * mMergeFactor;
+            const bool merge = mergeBenefit > mergeCost;
 
-            float minSizeMerged = mMinSize;
-            float factor2 = mergeBenefit > 0 ? std::min(1.f, mergeCost * mMinSizeCostMultiplier / mergeBenefit) : 1;
-            float minSizeMergeFactor2 = (1 - factor2) * mMinSizeMergeFactor + factor2;
-            if (minSizeMergeFactor2 > 0)
-                minSizeMerged *= minSizeMergeFactor2;
+            const float factor2
+                = mergeBenefit > 0 ? std::min(1.f, mergeCost * mMinSizeCostMultiplier / mergeBenefit) : 1;
+            const float minSizeMergeFactor2 = (1 - factor2) * mMinSizeMergeFactor + factor2;
+            const float minSizeMerged = minSizeMergeFactor2 > 0 ? mMinSize * minSizeMergeFactor2 : mMinSize;
 
             unsigned int numinstances = 0;
-            for (auto cref : pair.second.mInstances)
+            for (const PagedCellRef* refPtr : pair.second.mInstances)
             {
-                const ESM::CellRef& ref = *cref;
-                osg::Vec3f pos = ref.mPos.asVec3();
+                const PagedCellRef& ref = *refPtr;
 
                 if (!activeGrid && minSizeMerged != minSize
-                    && cnode->getBound().radius2() * cref->mScale * cref->mScale
-                        < (viewPoint - pos).length2() * minSizeMerged * minSizeMerged)
+                    && cnode->getBound().radius2() * ref.mScale * ref.mScale
+                        < (viewPoint - ref.mPosition).length2() * minSizeMerged * minSizeMerged)
                     continue;
 
-                osg::Vec3f nodePos = pos - worldCenter;
-                osg::Quat nodeAttitude = osg::Quat(ref.mPos.rot[2], osg::Vec3f(0, 0, -1))
-                    * osg::Quat(ref.mPos.rot[1], osg::Vec3f(0, -1, 0))
-                    * osg::Quat(ref.mPos.rot[0], osg::Vec3f(-1, 0, 0));
-                osg::Vec3f nodeScale = osg::Vec3f(ref.mScale, ref.mScale, ref.mScale);
+                const osg::Vec3f nodePos = ref.mPosition - worldCenter;
+                const osg::Quat nodeAttitude = osg::Quat(ref.mRotation.z(), osg::Vec3f(0, 0, -1))
+                    * osg::Quat(ref.mRotation.y(), osg::Vec3f(0, -1, 0))
+                    * osg::Quat(ref.mRotation.x(), osg::Vec3f(-1, 0, 0));
+                const osg::Vec3f nodeScale(ref.mScale, ref.mScale, ref.mScale);
 
                 osg::ref_ptr<osg::Group> trans;
                 if (merge)
@@ -787,7 +811,7 @@ namespace MWRender
                     }
                 }
 
-                osg::Group* attachTo = merge ? mergeGroup : group;
+                osg::Group* const attachTo = merge ? mergeGroup : group;
                 attachTo->addChild(trans);
                 ++numinstances;
             }
@@ -808,6 +832,8 @@ namespace MWRender
             }
         }
 
+        const osg::Vec3f relativeViewPoint = viewPoint - worldCenter;
+
         if (mergeGroup->getNumChildren())
         {
             SceneUtil::Optimizer optimizer;
@@ -817,7 +843,7 @@ namespace MWRender
                 optimizer.setMergeAlphaBlending(true);
             }
             optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
-            unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS
+            const unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS
                 | SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES | SceneUtil::Optimizer::MERGE_GEOMETRY;
 
             optimizer.optimize(mergeGroup, options);
@@ -836,7 +862,7 @@ namespace MWRender
             }
         }
 
-        auto ico = mSceneManager->getIncrementalCompileOperation();
+        osgUtil::IncrementalCompileOperation* const ico = mSceneManager->getIncrementalCompileOperation();
         if (!stateToCompile.empty() && ico)
         {
             auto compileSet = new osgUtil::IncrementalCompileOperation::CompileSet(group);
@@ -865,38 +891,51 @@ namespace MWRender
         return Mask_Static;
     }
 
-    struct ClearCacheFunctor
+    namespace
     {
-        void operator()(MWRender::ChunkId id, osg::Object* obj)
+        osg::Vec2f clampToCell(const osg::Vec3f& cellPos, const osg::Vec2i& cell)
         {
-            if (intersects(id, mPosition))
-                mToClear.insert(id);
+            return osg::Vec2f(std::clamp<float>(cellPos.x(), cell.x(), cell.x() + 1),
+                std::clamp<float>(cellPos.y(), cell.y(), cell.y() + 1));
         }
-        bool intersects(ChunkId id, osg::Vec3f pos)
+
+        class CollectIntersecting
         {
-            if (mActiveGridOnly && !std::get<2>(id))
-                return false;
-            pos /= getCellSize(mWorldspace);
-            clampToCell(pos);
-            osg::Vec2f center = std::get<0>(id);
-            float halfSize = std::get<1>(id) / 2;
-            return pos.x() >= center.x() - halfSize && pos.y() >= center.y() - halfSize
-                && pos.x() <= center.x() + halfSize && pos.y() <= center.y() + halfSize;
-        }
-        void clampToCell(osg::Vec3f& cellPos)
-        {
-            cellPos.x() = std::clamp<float>(cellPos.x(), mCell.x(), mCell.x() + 1);
-            cellPos.y() = std::clamp<float>(cellPos.y(), mCell.y(), mCell.y() + 1);
-        }
-        osg::Vec3f mPosition;
-        osg::Vec2i mCell;
-        ESM::RefId mWorldspace;
-        std::set<MWRender::ChunkId> mToClear;
-        bool mActiveGridOnly = false;
-    };
+        public:
+            explicit CollectIntersecting(
+                bool activeGridOnly, const osg::Vec3f& position, const osg::Vec2i& cell, ESM::RefId worldspace)
+                : mActiveGridOnly(activeGridOnly)
+                , mPosition(clampToCell(position / getCellSize(worldspace), cell))
+            {
+            }
+
+            void operator()(const ChunkId& id, osg::Object* /*obj*/)
+            {
+                if (mActiveGridOnly && !std::get<2>(id))
+                    return;
+                if (intersects(id))
+                    mCollected.push_back(id);
+            }
+
+            const std::vector<ChunkId>& getCollected() const { return mCollected; }
+
+        private:
+            bool intersects(ChunkId id) const
+            {
+                const osg::Vec2f center = std::get<0>(id);
+                const float halfSize = std::get<1>(id) / 2;
+                return mPosition.x() >= center.x() - halfSize && mPosition.y() >= center.y() - halfSize
+                    && mPosition.x() <= center.x() + halfSize && mPosition.y() <= center.y() + halfSize;
+            }
+
+            bool mActiveGridOnly;
+            osg::Vec2f mPosition;
+            std::vector<ChunkId> mCollected;
+        };
+    }
 
     bool ObjectPaging::enableObject(
-        int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled)
+        int type, ESM::RefNum refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled)
     {
         if (!typeFilter(type, false))
             return false;
@@ -911,20 +950,16 @@ namespace MWRender
                 return false;
         }
 
-        ClearCacheFunctor ccf;
-        ccf.mPosition = pos;
-        ccf.mCell = cell;
-        ccf.mWorldspace = mWorldspace;
+        CollectIntersecting ccf(false, pos, cell, mWorldspace);
         mCache->call(ccf);
-        if (ccf.mToClear.empty())
+        if (ccf.getCollected().empty())
             return false;
-        for (const auto& chunk : ccf.mToClear)
+        for (const ChunkId& chunk : ccf.getCollected())
             mCache->removeFromObjectCache(chunk);
         return true;
     }
 
-    bool ObjectPaging::blacklistObject(
-        int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell)
+    bool ObjectPaging::blacklistObject(int type, ESM::RefNum refnum, const osg::Vec3f& pos, const osg::Vec2i& cell)
     {
         if (!typeFilter(type, false))
             return false;
@@ -937,15 +972,11 @@ namespace MWRender
                 return false;
         }
 
-        ClearCacheFunctor ccf;
-        ccf.mPosition = pos;
-        ccf.mCell = cell;
-        ccf.mActiveGridOnly = true;
-        ccf.mWorldspace = mWorldspace;
+        CollectIntersecting ccf(true, pos, cell, mWorldspace);
         mCache->call(ccf);
-        if (ccf.mToClear.empty())
+        if (ccf.getCollected().empty())
             return false;
-        for (const auto& chunk : ccf.mToClear)
+        for (const ChunkId& chunk : ccf.getCollected())
             mCache->removeFromObjectCache(chunk);
         return true;
     }
@@ -974,34 +1005,37 @@ namespace MWRender
         return true;
     }
 
-    struct GetRefnumsFunctor
+    namespace
     {
-        GetRefnumsFunctor(std::vector<ESM::RefNum>& output)
-            : mOutput(output)
+        struct GetRefnumsFunctor
         {
-        }
-        void operator()(MWRender::ChunkId chunkId, osg::Object* obj)
-        {
-            if (!std::get<2>(chunkId))
-                return;
-            const osg::Vec2f& center = std::get<0>(chunkId);
-            bool activeGrid = (center.x() > mActiveGrid.x() || center.y() > mActiveGrid.y()
-                || center.x() < mActiveGrid.z() || center.y() < mActiveGrid.w());
-            if (!activeGrid)
-                return;
-
-            osg::UserDataContainer* udc = obj->getUserDataContainer();
-            if (udc && udc->getNumUserObjects())
+            GetRefnumsFunctor(std::vector<ESM::RefNum>& output)
+                : mOutput(output)
             {
-                RefnumSet* refnums = dynamic_cast<RefnumSet*>(udc->getUserObject(0));
-                if (!refnums)
-                    return;
-                mOutput.insert(mOutput.end(), refnums->mRefnums.begin(), refnums->mRefnums.end());
             }
-        }
-        osg::Vec4i mActiveGrid;
-        std::vector<ESM::RefNum>& mOutput;
-    };
+            void operator()(MWRender::ChunkId chunkId, osg::Object* obj)
+            {
+                if (!std::get<2>(chunkId))
+                    return;
+                const osg::Vec2f& center = std::get<0>(chunkId);
+                const bool activeGrid = (center.x() > mActiveGrid.x() || center.y() > mActiveGrid.y()
+                    || center.x() < mActiveGrid.z() || center.y() < mActiveGrid.w());
+                if (!activeGrid)
+                    return;
+
+                osg::UserDataContainer* udc = obj->getUserDataContainer();
+                if (udc && udc->getNumUserObjects())
+                {
+                    RefnumSet* refnums = dynamic_cast<RefnumSet*>(udc->getUserObject(0));
+                    if (!refnums)
+                        return;
+                    mOutput.insert(mOutput.end(), refnums->mRefnums.begin(), refnums->mRefnums.end());
+                }
+            }
+            osg::Vec4i mActiveGrid;
+            std::vector<ESM::RefNum>& mOutput;
+        };
+    }
 
     void ObjectPaging::getPagedRefnums(const osg::Vec4i& activeGrid, std::vector<ESM::RefNum>& out)
     {
@@ -1014,7 +1048,7 @@ namespace MWRender
 
     void ObjectPaging::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Object Chunk", mCache->getCacheSize());
+        Resource::reportStats("Object Chunk", frameNumber, mCache->getStats(), *stats);
     }
 
 }
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index d677c172f2..6359aa9b0c 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWRENDER_OBJECTPAGING_H
 #define OPENMW_MWRENDER_OBJECTPAGING_H
 
-#include <components/esm3/loadcell.hpp>
+#include <components/esm3/refnum.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/terrain/quadtreeworld.hpp>
 
@@ -11,15 +11,6 @@ namespace Resource
 {
     class SceneManager;
 }
-namespace MWWorld
-{
-    class ESMStore;
-}
-
-namespace ESM
-{
-    class ReadersCache;
-}
 
 namespace MWRender
 {
@@ -41,11 +32,10 @@ namespace MWRender
         unsigned int getNodeMask() override;
 
         /// @return true if view needs rebuild
-        bool enableObject(
-            int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled);
+        bool enableObject(int type, ESM::RefNum refnum, const osg::Vec3f& pos, const osg::Vec2i& cell, bool enabled);
 
         /// @return true if view needs rebuild
-        bool blacklistObject(int type, const ESM::RefNum& refnum, const osg::Vec3f& pos, const osg::Vec2i& cell);
+        bool blacklistObject(int type, ESM::RefNum refnum, const osg::Vec3f& pos, const osg::Vec2i& cell);
 
         void clear();
 
@@ -83,16 +73,13 @@ namespace MWRender
         const RefTracker& getRefTracker() const { return mRefTracker; }
         RefTracker& getWritableRefTracker() { return mRefTrackerLocked ? mRefTrackerNew : mRefTracker; }
 
-        std::map<ESM::RefNum, ESM::CellRef> collectESM3References(
-            float size, const osg::Vec2i& startCell, ESM::ReadersCache& readers) const;
-
         std::mutex mSizeCacheMutex;
         typedef std::map<ESM::RefNum, float> SizeCache;
         SizeCache mSizeCache;
 
         std::mutex mLODNameCacheMutex;
         typedef std::pair<std::string, unsigned char> LODNameCacheKey; // Key: mesh name, lod level
-        typedef std::map<LODNameCacheKey, std::string> LODNameCache; // Cache: key, mesh name to use
+        using LODNameCache = std::map<LODNameCacheKey, VFS::Path::Normalized>; // Cache: key, mesh name to use
         LODNameCache mLODNameCache;
     };
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index b8b7d62309..9393846d7a 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -13,6 +13,7 @@
 
 #include "animation.hpp"
 #include "creatureanimation.hpp"
+#include "esm4npcanimation.hpp"
 #include "npcanimation.hpp"
 #include "vismask.hpp"
 
@@ -67,7 +68,7 @@ namespace MWRender
         ptr.getClass().adjustScale(ptr, scaleVec, true);
         insert->setScale(scaleVec);
 
-        ptr.getRefData().setBaseNode(insert);
+        ptr.getRefData().setBaseNode(std::move(insert));
     }
 
     void Objects::insertModel(const MWWorld::Ptr& ptr, const std::string& mesh, bool allowLight)
@@ -78,7 +79,8 @@ namespace MWRender
         std::string animationMesh = mesh;
         if (animated && !mesh.empty())
         {
-            animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
+            animationMesh = Misc::ResourceHelpers::correctActorModelPath(
+                VFS::Path::toNormalized(mesh), mResourceSystem->getVFS());
             if (animationMesh == mesh && Misc::StringUtils::ciEndsWith(animationMesh, ".nif"))
                 animated = false;
         }
@@ -95,7 +97,8 @@ namespace MWRender
         ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
 
         bool animated = true;
-        std::string animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
+        std::string animationMesh
+            = Misc::ResourceHelpers::correctActorModelPath(VFS::Path::toNormalized(mesh), mResourceSystem->getVFS());
         if (animationMesh == mesh && Misc::StringUtils::ciEndsWith(animationMesh, ".nif"))
             animated = false;
 
@@ -116,13 +119,22 @@ namespace MWRender
         insertBegin(ptr);
         ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
 
-        osg::ref_ptr<NpcAnimation> anim(
-            new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
-
-        if (mObjects.emplace(ptr.mRef, anim).second)
+        if (ptr.getType() == ESM::REC_NPC_4)
         {
-            ptr.getClass().getInventoryStore(ptr).setInvListener(anim.get());
-            ptr.getClass().getInventoryStore(ptr).setContListener(anim.get());
+            osg::ref_ptr<ESM4NpcAnimation> anim(
+                new ESM4NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
+            mObjects.emplace(ptr.mRef, anim);
+        }
+        else
+        {
+            osg::ref_ptr<NpcAnimation> anim(
+                new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
+
+            if (mObjects.emplace(ptr.mRef, anim).second)
+            {
+                ptr.getClass().getInventoryStore(ptr).setInvListener(anim.get());
+                ptr.getClass().getInventoryStore(ptr).setContListener(anim.get());
+            }
         }
     }
 
diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
index 6a56f7e5f7..54d8145fa9 100644
--- a/apps/openmw/mwrender/pingpongcanvas.cpp
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -1,5 +1,7 @@
 #include "pingpongcanvas.hpp"
 
+#include <cassert>
+
 #include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
@@ -10,9 +12,11 @@
 
 namespace MWRender
 {
-    PingPongCanvas::PingPongCanvas(Shader::ShaderManager& shaderManager)
+    PingPongCanvas::PingPongCanvas(
+        Shader::ShaderManager& shaderManager, const std::shared_ptr<LuminanceCalculator>& luminanceCalculator)
         : mFallbackStateSet(new osg::StateSet)
         , mMultiviewResolveStateSet(new osg::StateSet)
+        , mLuminanceCalculator(luminanceCalculator)
     {
         setUseDisplayList(false);
         setUseVertexBufferObjects(true);
@@ -26,8 +30,7 @@ namespace MWRender
 
         addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES, 0, 3));
 
-        mLuminanceCalculator = LuminanceCalculator(shaderManager);
-        mLuminanceCalculator.disable();
+        mLuminanceCalculator->disable();
 
         Shader::ShaderManager::DefineMap defines;
         Stereo::shaderStereoDefines(defines);
@@ -43,19 +46,16 @@ namespace MWRender
         mMultiviewResolveStateSet->addUniform(new osg::Uniform("lastShader", 0));
     }
 
-    void PingPongCanvas::setCurrentFrameData(size_t frameId, fx::DispatchArray&& data)
+    void PingPongCanvas::setPasses(fx::DispatchArray&& passes)
     {
-        mBufferData[frameId].data = std::move(data);
+        mPasses = std::move(passes);
     }
 
-    void PingPongCanvas::setMask(size_t frameId, bool underwater, bool exterior)
+    void PingPongCanvas::setMask(bool underwater, bool exterior)
     {
-        mBufferData[frameId].mask = 0;
-
-        mBufferData[frameId].mask
-            |= underwater ? fx::Technique::Flag_Disable_Underwater : fx::Technique::Flag_Disable_Abovewater;
-        mBufferData[frameId].mask
-            |= exterior ? fx::Technique::Flag_Disable_Exteriors : fx::Technique::Flag_Disable_Interiors;
+        mMask = 0;
+        mMask |= underwater ? fx::Technique::Flag_Disable_Underwater : fx::Technique::Flag_Disable_Abovewater;
+        mMask |= exterior ? fx::Technique::Flag_Disable_Exteriors : fx::Technique::Flag_Disable_Interiors;
     }
 
     void PingPongCanvas::drawGeometry(osg::RenderInfo& renderInfo) const
@@ -77,19 +77,15 @@ namespace MWRender
 
         size_t frameId = state.getFrameStamp()->getFrameNumber() % 2;
 
-        auto& bufferData = mBufferData[frameId];
-
-        const auto& data = bufferData.data;
-
         std::vector<size_t> filtered;
 
-        filtered.reserve(data.size());
+        filtered.reserve(mPasses.size());
 
-        for (size_t i = 0; i < data.size(); ++i)
+        for (size_t i = 0; i < mPasses.size(); ++i)
         {
-            const auto& node = data[i];
+            const auto& node = mPasses[i];
 
-            if (bufferData.mask & node.mFlags)
+            if (mMask & node.mFlags)
                 continue;
 
             filtered.push_back(i);
@@ -97,7 +93,7 @@ namespace MWRender
 
         auto* resolveViewport = state.getCurrentViewport();
 
-        if (filtered.empty() || !bufferData.postprocessing)
+        if (filtered.empty() || !mPostprocessing)
         {
             state.pushStateSet(mFallbackStateSet);
             state.apply();
@@ -108,7 +104,7 @@ namespace MWRender
                 state.apply();
             }
 
-            state.applyTextureAttribute(0, bufferData.sceneTex);
+            state.applyTextureAttribute(0, mTextureScene);
             resolveViewport->apply(state);
 
             drawGeometry(renderInfo);
@@ -124,13 +120,12 @@ namespace MWRender
 
         const unsigned int handle = mFbos[0] ? mFbos[0]->getHandle(state.getContextID()) : 0;
 
-        if (handle == 0 || bufferData.dirty)
+        if (handle == 0 || mDirty)
         {
             for (auto& fbo : mFbos)
             {
                 fbo = new osg::FrameBufferObject;
-                attachCloneOfTemplate(
-                    fbo, osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
+                attachCloneOfTemplate(fbo, osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, mTextureScene);
                 fbo->apply(state);
                 glClearColor(0.5, 0.5, 0.5, 1);
                 glClear(GL_COLOR_BUFFER_BIT);
@@ -140,7 +135,7 @@ namespace MWRender
             {
                 mMultiviewResolveFramebuffer = new osg::FrameBufferObject();
                 attachCloneOfTemplate(mMultiviewResolveFramebuffer,
-                    osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
+                    osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, mTextureScene);
                 mMultiviewResolveFramebuffer->apply(state);
                 glClearColor(0.5, 0.5, 0.5, 1);
                 glClear(GL_COLOR_BUFFER_BIT);
@@ -150,15 +145,15 @@ namespace MWRender
                         .getTexture());
             }
 
-            mLuminanceCalculator.dirty(bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
+            mLuminanceCalculator->dirty(mTextureScene->getTextureWidth(), mTextureScene->getTextureHeight());
 
             if (Stereo::getStereo())
-                mRenderViewport = new osg::Viewport(
-                    0, 0, bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
+                mRenderViewport
+                    = new osg::Viewport(0, 0, mTextureScene->getTextureWidth(), mTextureScene->getTextureHeight());
             else
                 mRenderViewport = nullptr;
 
-            bufferData.dirty = false;
+            mDirty = false;
         }
 
         constexpr std::array<std::array<int, 2>, 3> buffers
@@ -166,11 +161,11 @@ namespace MWRender
                 { GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT2_EXT },
                 { GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT } } };
 
-        (bufferData.hdr) ? mLuminanceCalculator.enable() : mLuminanceCalculator.disable();
+        (mAvgLum) ? mLuminanceCalculator->enable() : mLuminanceCalculator->disable();
 
         // A histogram based approach is superior way to calculate scene luminance. Using mipmaps is more broadly
         // supported, so that's what we use for now.
-        mLuminanceCalculator.draw(*this, renderInfo, state, ext, frameId);
+        mLuminanceCalculator->draw(*this, renderInfo, state, ext, frameId);
 
         auto buffer = buffers[0];
 
@@ -181,8 +176,7 @@ namespace MWRender
 
         const unsigned int cid = state.getContextID();
 
-        const osg::ref_ptr<osg::FrameBufferObject>& destinationFbo
-            = bufferData.destination ? bufferData.destination : nullptr;
+        const osg::ref_ptr<osg::FrameBufferObject>& destinationFbo = mDestinationFBO ? mDestinationFBO : nullptr;
         unsigned int destinationHandle = destinationFbo ? destinationFbo->getHandle(cid) : 0;
 
         auto bindDestinationFbo = [&]() {
@@ -204,19 +198,55 @@ namespace MWRender
             }
         };
 
+        // When textures are created (or resized) we need to either dirty them and/or clear them.
+        // Otherwise, there will be undefined behavior when reading from a texture that has yet to be written to in a
+        // later pass.
+        for (const auto& attachment : mDirtyAttachments)
+        {
+            const auto [w, h]
+                = attachment.mSize.get(mTextureScene->getTextureWidth(), mTextureScene->getTextureHeight());
+
+            attachment.mTarget->setTextureSize(w, h);
+            if (attachment.mMipMap)
+                attachment.mTarget->setNumMipmapLevels(osg::Image::computeNumberOfMipmapLevels(w, h));
+            attachment.mTarget->dirtyTextureObject();
+
+            osg::ref_ptr<osg::FrameBufferObject> fbo = new osg::FrameBufferObject;
+
+            fbo->setAttachment(
+                osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(attachment.mTarget));
+            fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+
+            glViewport(0, 0, attachment.mTarget->getTextureWidth(), attachment.mTarget->getTextureHeight());
+            state.haveAppliedAttribute(osg::StateAttribute::VIEWPORT);
+            glClearColor(attachment.mClearColor.r(), attachment.mClearColor.g(), attachment.mClearColor.b(),
+                attachment.mClearColor.a());
+            glClear(GL_COLOR_BUFFER_BIT);
+
+            if (attachment.mTarget->getNumMipmapLevels() > 0)
+            {
+                state.setActiveTextureUnit(0);
+                state.applyTextureAttribute(0, attachment.mTarget);
+                ext->glGenerateMipmap(GL_TEXTURE_2D);
+            }
+        }
+
         for (const size_t& index : filtered)
         {
-            const auto& node = data[index];
+            const auto& node = mPasses[index];
 
-            node.mRootStateSet->setTextureAttribute(PostProcessor::Unit_Depth, bufferData.depthTex);
+            node.mRootStateSet->setTextureAttribute(PostProcessor::Unit_Depth, mTextureDepth);
 
-            if (bufferData.hdr)
+            if (mAvgLum)
+                node.mRootStateSet->setTextureAttribute(PostProcessor::TextureUnits::Unit_EyeAdaptation,
+                    mLuminanceCalculator->getLuminanceTexture(frameId));
+
+            if (mTextureNormals)
+                node.mRootStateSet->setTextureAttribute(PostProcessor::TextureUnits::Unit_Normals, mTextureNormals);
+
+            if (mTextureDistortion)
                 node.mRootStateSet->setTextureAttribute(
-                    PostProcessor::TextureUnits::Unit_EyeAdaptation, mLuminanceCalculator.getLuminanceTexture(frameId));
-
-            if (bufferData.normalsTex)
-                node.mRootStateSet->setTextureAttribute(
-                    PostProcessor::TextureUnits::Unit_Normals, bufferData.normalsTex);
+                    PostProcessor::TextureUnits::Unit_Distortion, mTextureDistortion);
 
             state.pushStateSet(node.mRootStateSet);
             state.apply();
@@ -231,7 +261,7 @@ namespace MWRender
 
                 // VR-TODO: This won't actually work for tex2darrays
                 if (lastShader == 0)
-                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, bufferData.sceneTex);
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, mTextureScene);
                 else
                     pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader,
                         (osg::Texture*)mFbos[lastShader - GL_COLOR_ATTACHMENT0_EXT]
@@ -239,7 +269,7 @@ namespace MWRender
                             .getTexture());
 
                 if (lastDraw == 0)
-                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, bufferData.sceneTex);
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, mTextureScene);
                 else
                     pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass,
                         (osg::Texture*)mFbos[lastDraw - GL_COLOR_ATTACHMENT0_EXT]
@@ -260,7 +290,6 @@ namespace MWRender
                     }
 
                     lastApplied = pass.mRenderTarget->getHandle(state.getContextID());
-                    ;
                 }
                 else if (pass.mResolve && index == filtered.back())
                 {
@@ -322,5 +351,7 @@ namespace MWRender
         {
             bindDestinationFbo();
         }
+
+        mDirtyAttachments.clear();
     }
 }
diff --git a/apps/openmw/mwrender/pingpongcanvas.hpp b/apps/openmw/mwrender/pingpongcanvas.hpp
index a5557a6d6e..5a37b7fbc9 100644
--- a/apps/openmw/mwrender/pingpongcanvas.hpp
+++ b/apps/openmw/mwrender/pingpongcanvas.hpp
@@ -22,78 +22,64 @@ namespace MWRender
     class PingPongCanvas : public osg::Geometry
     {
     public:
-        PingPongCanvas(Shader::ShaderManager& shaderManager);
-
-        void drawImplementation(osg::RenderInfo& renderInfo) const override;
-
-        void dirty(size_t frameId) { mBufferData[frameId].dirty = true; }
-
-        const fx::DispatchArray& getCurrentFrameData(size_t frame) { return mBufferData[frame % 2].data; }
-
-        // Sets current frame pass data and stores copy of dispatch array to apply to next frame data
-        void setCurrentFrameData(size_t frameId, fx::DispatchArray&& data);
-
-        void setMask(size_t frameId, bool underwater, bool exterior);
-
-        void setSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].sceneTex = tex; }
-
-        void setLDRSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex)
-        {
-            mBufferData[frameId].sceneTexLDR = tex;
-        }
-
-        void setDepthTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].depthTex = tex; }
-
-        void setNormalsTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex)
-        {
-            mBufferData[frameId].normalsTex = tex;
-        }
-
-        void setHDR(size_t frameId, bool hdr) { mBufferData[frameId].hdr = hdr; }
-
-        void setPostProcessing(size_t frameId, bool postprocessing)
-        {
-            mBufferData[frameId].postprocessing = postprocessing;
-        }
-
-        const osg::ref_ptr<osg::Texture>& getSceneTexture(size_t frameId) const
-        {
-            return mBufferData[frameId].sceneTex;
-        }
+        PingPongCanvas(
+            Shader::ShaderManager& shaderManager, const std::shared_ptr<LuminanceCalculator>& luminanceCalculator);
 
         void drawGeometry(osg::RenderInfo& renderInfo) const;
 
-    private:
-        void copyNewFrameData(size_t frameId) const;
+        void drawImplementation(osg::RenderInfo& renderInfo) const override;
 
-        mutable LuminanceCalculator mLuminanceCalculator;
+        void dirty() { mDirty = true; }
+
+        void setDirtyAttachments(const std::vector<fx::Types::RenderTarget>& attachments)
+        {
+            mDirtyAttachments = attachments;
+        }
+
+        const fx::DispatchArray& getPasses() { return mPasses; }
+
+        void setPasses(fx::DispatchArray&& passes);
+
+        void setMask(bool underwater, bool exterior);
+
+        void setTextureScene(osg::ref_ptr<osg::Texture> tex) { mTextureScene = tex; }
+
+        void setTextureDepth(osg::ref_ptr<osg::Texture> tex) { mTextureDepth = tex; }
+
+        void setTextureNormals(osg::ref_ptr<osg::Texture> tex) { mTextureNormals = tex; }
+
+        void setTextureDistortion(osg::ref_ptr<osg::Texture> tex) { mTextureDistortion = tex; }
+
+        void setCalculateAvgLum(bool enabled) { mAvgLum = enabled; }
+
+        void setPostProcessing(bool enabled) { mPostprocessing = enabled; }
+
+        const osg::ref_ptr<osg::Texture>& getSceneTexture(size_t frameId) const { return mTextureScene; }
+
+    private:
+        bool mAvgLum = false;
+        bool mPostprocessing = false;
+
+        fx::DispatchArray mPasses;
+        fx::FlagsType mMask = 0;
 
         osg::ref_ptr<osg::Program> mFallbackProgram;
         osg::ref_ptr<osg::Program> mMultiviewResolveProgram;
         osg::ref_ptr<osg::StateSet> mFallbackStateSet;
         osg::ref_ptr<osg::StateSet> mMultiviewResolveStateSet;
-        mutable osg::ref_ptr<osg::FrameBufferObject> mMultiviewResolveFramebuffer;
 
-        struct BufferData
-        {
-            bool dirty = false;
-            bool hdr = false;
-            bool postprocessing = true;
+        osg::ref_ptr<osg::Texture> mTextureScene;
+        osg::ref_ptr<osg::Texture> mTextureDepth;
+        osg::ref_ptr<osg::Texture> mTextureNormals;
+        osg::ref_ptr<osg::Texture> mTextureDistortion;
 
-            fx::DispatchArray data;
-            fx::FlagsType mask;
-
-            osg::ref_ptr<osg::FrameBufferObject> destination;
-
-            osg::ref_ptr<osg::Texture> sceneTex;
-            osg::ref_ptr<osg::Texture> depthTex;
-            osg::ref_ptr<osg::Texture> sceneTexLDR;
-            osg::ref_ptr<osg::Texture> normalsTex;
-        };
-
-        mutable std::array<BufferData, 2> mBufferData;
-        mutable std::array<osg::ref_ptr<osg::FrameBufferObject>, 3> mFbos;
+        mutable bool mDirty = false;
+        mutable std::vector<fx::Types::RenderTarget> mDirtyAttachments;
         mutable osg::ref_ptr<osg::Viewport> mRenderViewport;
+        mutable osg::ref_ptr<osg::FrameBufferObject> mMultiviewResolveFramebuffer;
+        mutable osg::ref_ptr<osg::FrameBufferObject> mDestinationFBO;
+        mutable std::array<osg::ref_ptr<osg::FrameBufferObject>, 3> mFbos;
+        mutable std::shared_ptr<LuminanceCalculator> mLuminanceCalculator;
     };
 }
 
diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp
index 8dfff5a60c..497c6c734a 100644
--- a/apps/openmw/mwrender/pingpongcull.cpp
+++ b/apps/openmw/mwrender/pingpongcull.cpp
@@ -21,7 +21,7 @@ namespace MWRender
         if (Stereo::getStereo())
         {
             mViewportStateset = new osg::StateSet();
-            mViewport = new osg::Viewport(0, 0, pp->renderWidth(), pp->renderHeight());
+            mViewport = new osg::Viewport;
             mViewportStateset->setAttribute(mViewport);
         }
     }
@@ -37,41 +37,31 @@ namespace MWRender
         size_t frame = cv->getTraversalNumber();
         size_t frameId = frame % 2;
 
-        MWRender::PostProcessor* postProcessor
-            = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
-        if (!postProcessor)
-            throw std::runtime_error("PingPongCull: failed to get a PostProcessor!");
-
         if (Stereo::getStereo())
         {
             auto& sm = Stereo::Manager::instance();
             auto view = sm.getEye(cv);
             int index = view == Stereo::Eye::Right ? 1 : 0;
             auto projectionMatrix = sm.computeEyeProjection(index, true);
-            postProcessor->getStateUpdater()->setProjectionMatrix(projectionMatrix);
+            mPostProcessor->getStateUpdater()->setProjectionMatrix(projectionMatrix);
         }
 
-        postProcessor->getStateUpdater()->setViewMatrix(cv->getCurrentCamera()->getViewMatrix());
-        postProcessor->getStateUpdater()->setPrevViewMatrix(mLastViewMatrix[0]);
+        mPostProcessor->getStateUpdater()->setViewMatrix(cv->getCurrentCamera()->getViewMatrix());
+        mPostProcessor->getStateUpdater()->setPrevViewMatrix(mLastViewMatrix[0]);
         mLastViewMatrix[0] = cv->getCurrentCamera()->getViewMatrix();
 
-        postProcessor->getStateUpdater()->setEyePos(cv->getEyePoint());
-        postProcessor->getStateUpdater()->setEyeVec(cv->getLookVectorLocal());
+        mPostProcessor->getStateUpdater()->setEyePos(cv->getEyePoint());
+        mPostProcessor->getStateUpdater()->setEyeVec(cv->getLookVectorLocal());
 
-        if (!postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
+        if (!mPostProcessor->getFbo(PostProcessor::FBO_Multisample, frameId))
         {
-            renderStage->setMultisampleResolveFramebufferObject(nullptr);
-            renderStage->setFrameBufferObject(nullptr);
-        }
-        else if (!postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId))
-        {
-            renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
+            renderStage->setFrameBufferObject(mPostProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
         }
         else
         {
             renderStage->setMultisampleResolveFramebufferObject(
-                postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
-            renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId));
+                mPostProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
+            renderStage->setFrameBufferObject(mPostProcessor->getFbo(PostProcessor::FBO_Multisample, frameId));
 
             // The MultiView patch has a bug where it does not update resolve layers if the resolve framebuffer is
             // changed. So we do blit manually in this case
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index d64e9651bc..8fdc0a45ca 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -18,18 +18,21 @@
 #include <components/sceneutil/color.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/nodecallback.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwgui/postprocessorhud.hpp"
 
+#include "distortion.hpp"
 #include "pingpongcull.hpp"
+#include "renderbin.hpp"
 #include "renderingmanager.hpp"
 #include "sky.hpp"
 #include "transparentpass.hpp"
@@ -103,6 +106,8 @@ namespace
 
         return Stereo::createMultiviewCompatibleAttachment(texture);
     }
+
+    constexpr float DistortionRatio = 0.25;
 }
 
 namespace MWRender
@@ -110,33 +115,76 @@ namespace MWRender
     PostProcessor::PostProcessor(
         RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode, const VFS::Manager* vfs)
         : osg::Group()
-        , mEnableLiveReload(false)
         , mRootNode(rootNode)
-        , mSamples(Settings::Manager::getInt("antialiasing", "Video"))
-        , mDirty(false)
-        , mDirtyFrameId(0)
+        , mHUDCamera(new osg::Camera)
         , mRendering(rendering)
         , mViewer(viewer)
         , mVFS(vfs)
-        , mTriggerShaderReload(false)
-        , mReload(false)
-        , mEnabled(false)
-        , mUsePostProcessing(false)
-        , mSoftParticles(false)
-        , mDisableDepthPasses(false)
-        , mLastFrameNumber(0)
-        , mLastSimulationTime(0.f)
-        , mExteriorFlag(false)
-        , mUnderwater(false)
-        , mHDR(false)
-        , mNormals(false)
-        , mPrevNormals(false)
-        , mNormalsSupported(false)
-        , mPassLights(false)
-        , mPrevPassLights(false)
+        , mUsePostProcessing(Settings::postProcessing().mEnabled)
+        , mSamples(Settings::video().mAntialiasing)
+        , mPingPongCull(new PingPongCull(this))
+        , mDistortionCallback(new DistortionCallback)
     {
-        mSoftParticles = Settings::Manager::getBool("soft particles", "Shaders");
-        mUsePostProcessing = Settings::Manager::getBool("enabled", "Post Processing");
+        auto& shaderManager = mRendering.getResourceSystem()->getSceneManager()->getShaderManager();
+
+        std::shared_ptr<LuminanceCalculator> luminanceCalculator = std::make_shared<LuminanceCalculator>(shaderManager);
+
+        for (auto& canvas : mCanvases)
+            canvas = new PingPongCanvas(shaderManager, luminanceCalculator);
+
+        mHUDCamera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
+        mHUDCamera->setRenderOrder(osg::Camera::POST_RENDER);
+        mHUDCamera->setClearColor(osg::Vec4(0.45, 0.45, 0.14, 1.0));
+        mHUDCamera->setClearMask(0);
+        mHUDCamera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1));
+        mHUDCamera->setAllowEventFocus(false);
+        mHUDCamera->setViewport(0, 0, mWidth, mHeight);
+        mHUDCamera->setNodeMask(Mask_RenderToTexture);
+        mHUDCamera->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        mHUDCamera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+        mHUDCamera->addChild(mCanvases[0]);
+        mHUDCamera->addChild(mCanvases[1]);
+        mHUDCamera->setCullCallback(new HUDCullCallback);
+        mViewer->getCamera()->addCullCallback(mPingPongCull);
+
+        // resolves the multisampled depth buffer and optionally draws an additional depth postpass
+        mTransparentDepthPostPass
+            = new TransparentDepthBinCallback(mRendering.getResourceSystem()->getSceneManager()->getShaderManager(),
+                Settings::postProcessing().mTransparentPostpass);
+        osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(mTransparentDepthPostPass);
+
+        osg::ref_ptr<osgUtil::RenderBin> distortionRenderBin
+            = new osgUtil::RenderBin(osgUtil::RenderBin::SORT_BACK_TO_FRONT);
+        // This is silly to have to do, but if nothing is drawn then the drawcallback is never called and the distortion
+        // texture will never be cleared
+        osg::ref_ptr<osg::Node> dummyNodeToClear = new osg::Node;
+        dummyNodeToClear->setCullingActive(false);
+        dummyNodeToClear->getOrCreateStateSet()->setRenderBinDetails(RenderBin_Distortion, "Distortion");
+        rootNode->addChild(dummyNodeToClear);
+        distortionRenderBin->setDrawCallback(mDistortionCallback);
+        distortionRenderBin->getStateSet()->setDefine("DISTORTION", "1", osg::StateAttribute::ON);
+
+        // Give the renderbin access to the opaque depth sampler so it can write its occlusion
+        // Distorted geometry is drawn with ALWAYS depth function and depths writes disbled.
+        const int unitSoftEffect
+            = shaderManager.reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
+        distortionRenderBin->getStateSet()->addUniform(new osg::Uniform("opaqueDepthTex", unitSoftEffect));
+
+        osgUtil::RenderBin::addRenderBinPrototype("Distortion", distortionRenderBin);
+
+        auto defines = shaderManager.getGlobalDefines();
+        defines["distorionRTRatio"] = std::to_string(DistortionRatio);
+        shaderManager.setGlobalDefines(defines);
+
+        createObjectsForFrame(0);
+        createObjectsForFrame(1);
+
+        populateTechniqueFiles();
+
+        auto distortion = loadTechnique("internal_distortion");
+        distortion->setInternal(true);
+        distortion->setLocked(true);
+        mInternalTechniques.push_back(distortion);
 
         osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
         osg::GLExtensions* ext = gc->getState()->get<osg::GLExtensions>();
@@ -156,27 +204,22 @@ namespace MWRender
         else
             Log(Debug::Error) << "'glDisablei' unsupported, pass normals will not be available to shaders.";
 
-        if (mSoftParticles)
-        {
-            for (int i = 0; i < 2; ++i)
-            {
-                if (Stereo::getMultiview())
-                    mTextures[i][Tex_OpaqueDepth] = new osg::Texture2DArray;
-                else
-                    mTextures[i][Tex_OpaqueDepth] = new osg::Texture2D;
-                mTextures[i][Tex_OpaqueDepth]->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-                mTextures[i][Tex_OpaqueDepth]->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-            }
-        }
-
         mGLSLVersion = ext->glslLanguageVersion * 100;
         mUBO = ext->isUniformBufferObjectSupported && mGLSLVersion >= 330;
         mStateUpdater = new fx::StateUpdater(mUBO);
 
-        if (!Stereo::getStereo() && !SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !mUsePostProcessing)
-            return;
+        addChild(mHUDCamera);
+        addChild(mRootNode);
 
-        enable(mUsePostProcessing);
+        mViewer->setSceneData(this);
+        mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+        mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
+        mViewer->getCamera()->setUserData(this);
+
+        setCullCallback(mStateUpdater);
+
+        if (mUsePostProcessing)
+            enable();
     }
 
     PostProcessor::~PostProcessor()
@@ -192,28 +235,14 @@ namespace MWRender
         if (Stereo::getStereo())
             Stereo::Manager::instance().screenResolutionChanged();
 
-        auto width = renderWidth();
-        auto height = renderHeight();
-        for (auto& technique : mTechniques)
-        {
-            for (auto& [name, rt] : technique->getRenderTargetsMap())
-            {
-                const auto [w, h] = rt.mSize.get(width, height);
-                rt.mTarget->setTextureSize(w, h);
-            }
-        }
-
         size_t frameId = frame() % 2;
 
-        createTexturesAndCamera(frameId);
         createObjectsForFrame(frameId);
 
         mRendering.updateProjectionMatrix();
-        mRendering.setScreenRes(width, height);
+        mRendering.setScreenRes(renderWidth(), renderHeight());
 
-        dirtyTechniques();
-
-        mPingPongCanvas->dirty(frameId);
+        dirtyTechniques(true);
 
         mDirty = true;
         mDirtyFrameId = !frameId;
@@ -233,77 +262,20 @@ namespace MWRender
         }
     }
 
-    void PostProcessor::enable(bool usePostProcessing)
+    void PostProcessor::enable()
     {
         mReload = true;
-        mEnabled = true;
-        bool postPass = Settings::Manager::getBool("transparent postpass", "Post Processing");
-        mUsePostProcessing = usePostProcessing;
-
-        mDisableDepthPasses = !mSoftParticles && !postPass;
-
-#ifdef ANDROID
-        mDisableDepthPasses = true;
-#endif
-
-        if (!mDisableDepthPasses)
-        {
-            mTransparentDepthPostPass = new TransparentDepthBinCallback(
-                mRendering.getResourceSystem()->getSceneManager()->getShaderManager(), postPass);
-            osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(mTransparentDepthPostPass);
-        }
-
-        if (mUsePostProcessing && mTechniqueFileMap.empty())
-        {
-            populateTechniqueFiles();
-        }
-
-        createTexturesAndCamera(frame() % 2);
-
-        removeChild(mHUDCamera);
-        removeChild(mRootNode);
-
-        addChild(mHUDCamera);
-        addChild(mRootNode);
-
-        mViewer->setSceneData(this);
-        mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-        mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
-        mViewer->getCamera()->setUserData(this);
-
-        setCullCallback(mStateUpdater);
-        mHUDCamera->setCullCallback(new HUDCullCallback);
+        mUsePostProcessing = true;
     }
 
     void PostProcessor::disable()
     {
-        if (!mSoftParticles)
-            osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(nullptr);
-
-        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles)
-        {
-            removeChild(mHUDCamera);
-            setCullCallback(nullptr);
-
-            mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER);
-            mViewer->getCamera()->getGraphicsContext()->setResizedCallback(nullptr);
-            mViewer->getCamera()->setUserData(nullptr);
-
-            mEnabled = false;
-        }
-
         mUsePostProcessing = false;
         mRendering.getSkyManager()->setSunglare(true);
     }
 
     void PostProcessor::traverse(osg::NodeVisitor& nv)
     {
-        if (!mEnabled)
-        {
-            osg::Group::traverse(nv);
-            return;
-        }
-
         size_t frameId = nv.getTraversalNumber() % 2;
 
         if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
@@ -316,33 +288,28 @@ namespace MWRender
 
     void PostProcessor::cull(size_t frameId, osgUtil::CullVisitor* cv)
     {
-        const auto& fbo = getFbo(FBO_Intercept, frameId);
-        if (fbo)
+        if (const auto& fbo = getFbo(FBO_Intercept, frameId))
         {
             osgUtil::RenderStage* rs = cv->getRenderStage();
             if (rs && rs->getMultisampleResolveFramebufferObject())
                 rs->setMultisampleResolveFramebufferObject(fbo);
         }
 
-        mPingPongCanvas->setPostProcessing(frameId, mUsePostProcessing);
-        mPingPongCanvas->setNormalsTexture(frameId, mNormals ? getTexture(Tex_Normal, frameId) : nullptr);
-        mPingPongCanvas->setMask(frameId, mUnderwater, mExteriorFlag);
-        mPingPongCanvas->setHDR(frameId, getHDR());
+        mCanvases[frameId]->setPostProcessing(mUsePostProcessing);
+        mCanvases[frameId]->setTextureNormals(mNormals ? getTexture(Tex_Normal, frameId) : nullptr);
+        mCanvases[frameId]->setMask(mUnderwater, mExteriorFlag);
+        mCanvases[frameId]->setCalculateAvgLum(mHDR);
 
-        mPingPongCanvas->setSceneTexture(frameId, getTexture(Tex_Scene, frameId));
-        if (mDisableDepthPasses)
-            mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_Depth, frameId));
-        else
-            mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_OpaqueDepth, frameId));
+        mCanvases[frameId]->setTextureScene(getTexture(Tex_Scene, frameId));
+        mCanvases[frameId]->setTextureDepth(getTexture(Tex_OpaqueDepth, frameId));
+        mCanvases[frameId]->setTextureDistortion(getTexture(Tex_Distortion, frameId));
 
-        mPingPongCanvas->setLDRSceneTexture(frameId, getTexture(Tex_Scene_LDR, frameId));
+        mTransparentDepthPostPass->mFbo[frameId] = mFbos[frameId][FBO_Primary];
+        mTransparentDepthPostPass->mMsaaFbo[frameId] = mFbos[frameId][FBO_Multisample];
+        mTransparentDepthPostPass->mOpaqueFbo[frameId] = mFbos[frameId][FBO_OpaqueDepth];
 
-        if (mTransparentDepthPostPass)
-        {
-            mTransparentDepthPostPass->mFbo[frameId] = mFbos[frameId][FBO_Primary];
-            mTransparentDepthPostPass->mMsaaFbo[frameId] = mFbos[frameId][FBO_Multisample];
-            mTransparentDepthPostPass->mOpaqueFbo[frameId] = mFbos[frameId][FBO_OpaqueDepth];
-        }
+        mDistortionCallback->setFBO(mFbos[frameId][FBO_Distortion], frameId);
+        mDistortionCallback->setOriginalFBO(mFbos[frameId][FBO_Primary], frameId);
 
         size_t frame = cv->getTraversalNumber();
 
@@ -356,9 +323,11 @@ namespace MWRender
 
             mStateUpdater->setSimulationTime(static_cast<float>(stamp->getSimulationTime()));
             mStateUpdater->setDeltaSimulationTime(static_cast<float>(stamp->getSimulationTime() - mLastSimulationTime));
+            // Use a signed int because 'uint' type is not supported in GLSL 120 without extensions
+            mStateUpdater->setFrameNumber(static_cast<int>(stamp->getFrameNumber()));
             mLastSimulationTime = stamp->getSimulationTime();
 
-            for (const auto& dispatchNode : mPingPongCanvas->getCurrentFrameData(frame))
+            for (const auto& dispatchNode : mCanvases[frameId]->getPasses())
             {
                 for (auto& uniform : dispatchNode.mHandle->getUniformMap())
                 {
@@ -379,7 +348,7 @@ namespace MWRender
 
         for (auto& technique : mTechniques)
         {
-            if (technique->getStatus() == fx::Technique::Status::File_Not_exists)
+            if (!technique || technique->getStatus() == fx::Technique::Status::File_Not_exists)
                 continue;
 
             const auto lastWriteTime = std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]);
@@ -424,13 +393,15 @@ namespace MWRender
 
         reloadIfRequired();
 
+        mCanvases[frameId]->setNodeMask(~0u);
+        mCanvases[!frameId]->setNodeMask(0);
+
         if (mDirty && mDirtyFrameId == frameId)
         {
-            createTexturesAndCamera(frameId);
             createObjectsForFrame(frameId);
-            mDirty = false;
 
-            mPingPongCanvas->setCurrentFrameData(frameId, fx::DispatchArray(mTemplateData));
+            mDirty = false;
+            mCanvases[frameId]->setPasses(fx::DispatchArray(mTemplateData));
         }
 
         if ((mNormalsSupported && mNormals != mPrevNormals) || (mPassLights != mPrevPassLights))
@@ -440,10 +411,14 @@ namespace MWRender
 
             mViewer->stopThreading();
 
-            auto& shaderManager = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getShaderManager();
-            auto defines = shaderManager.getGlobalDefines();
-            defines["disableNormals"] = mNormals ? "0" : "1";
-            shaderManager.setGlobalDefines(defines);
+            if (mNormalsSupported)
+            {
+                auto& shaderManager
+                    = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getShaderManager();
+                auto defines = shaderManager.getGlobalDefines();
+                defines["disableNormals"] = mNormals ? "0" : "1";
+                shaderManager.setGlobalDefines(defines);
+            }
 
             mRendering.getLightRoot()->setCollectPPLights(mPassLights);
             mStateUpdater->bindPointLights(mPassLights ? mRendering.getLightRoot()->getPPLightsBuffer() : nullptr);
@@ -451,7 +426,6 @@ namespace MWRender
 
             mViewer->startThreading();
 
-            createTexturesAndCamera(frameId);
             createObjectsForFrame(frameId);
 
             mDirty = true;
@@ -461,20 +435,55 @@ namespace MWRender
 
     void PostProcessor::createObjectsForFrame(size_t frameId)
     {
-        auto& fbos = mFbos[frameId];
         auto& textures = mTextures[frameId];
-        auto width = renderWidth();
-        auto height = renderHeight();
 
-        for (auto& tex : textures)
+        int width = renderWidth();
+        int height = renderHeight();
+
+        for (osg::ref_ptr<osg::Texture>& texture : textures)
         {
-            if (!tex)
-                continue;
-
-            Stereo::setMultiviewCompatibleTextureSize(tex, width, height);
-            tex->dirtyTextureObject();
+            if (!texture)
+            {
+                if (Stereo::getMultiview())
+                    texture = new osg::Texture2DArray;
+                else
+                    texture = new osg::Texture2D;
+            }
+            Stereo::setMultiviewCompatibleTextureSize(texture, width, height);
+            texture->setSourceFormat(GL_RGBA);
+            texture->setSourceType(GL_UNSIGNED_BYTE);
+            texture->setInternalFormat(GL_RGBA);
+            texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture::LINEAR);
+            texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture::LINEAR);
+            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            texture->setResizeNonPowerOfTwoHint(false);
+            Stereo::setMultiviewCompatibleTextureSize(texture, width, height);
+            texture->dirtyTextureObject();
         }
 
+        textures[Tex_Normal]->setSourceFormat(GL_RGB);
+        textures[Tex_Normal]->setInternalFormat(GL_RGB);
+
+        textures[Tex_Distortion]->setSourceFormat(GL_RGB);
+        textures[Tex_Distortion]->setInternalFormat(GL_RGB);
+
+        Stereo::setMultiviewCompatibleTextureSize(
+            textures[Tex_Distortion], width * DistortionRatio, height * DistortionRatio);
+        textures[Tex_Distortion]->dirtyTextureObject();
+
+        auto setupDepth = [](osg::Texture* tex) {
+            tex->setSourceFormat(GL_DEPTH_STENCIL_EXT);
+            tex->setSourceType(SceneUtil::AutoDepth::depthSourceType());
+            tex->setInternalFormat(SceneUtil::AutoDepth::depthInternalFormat());
+        };
+
+        setupDepth(textures[Tex_Depth]);
+        setupDepth(textures[Tex_OpaqueDepth]);
+        textures[Tex_OpaqueDepth]->setName("opaqueTexMap");
+
+        auto& fbos = mFbos[frameId];
+
         fbos[FBO_Primary] = new osg::FrameBufferObject;
         fbos[FBO_Primary]->setAttachment(
             osg::Camera::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
@@ -501,6 +510,7 @@ namespace MWRender
                 auto normalRB = createFrameBufferAttachmentFromTemplate(
                     Usage::RENDER_BUFFER, width, height, textures[Tex_Normal], mSamples);
                 fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, normalRB);
+                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, normalRB);
             }
             auto depthRB = createFrameBufferAttachmentFromTemplate(
                 Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples);
@@ -524,12 +534,13 @@ namespace MWRender
                     Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
         }
 
-        if (textures[Tex_OpaqueDepth])
-        {
-            fbos[FBO_OpaqueDepth] = new osg::FrameBufferObject;
-            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER,
-                Stereo::createMultiviewCompatibleAttachment(textures[Tex_OpaqueDepth]));
-        }
+        fbos[FBO_OpaqueDepth] = new osg::FrameBufferObject;
+        fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER,
+            Stereo::createMultiviewCompatibleAttachment(textures[Tex_OpaqueDepth]));
+
+        fbos[FBO_Distortion] = new osg::FrameBufferObject;
+        fbos[FBO_Distortion]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
+            Stereo::createMultiviewCompatibleAttachment(textures[Tex_Distortion]));
 
 #ifdef __APPLE__
         if (textures[Tex_OpaqueDepth])
@@ -537,13 +548,12 @@ namespace MWRender
                 osg::FrameBufferAttachment(new osg::RenderBuffer(textures[Tex_OpaqueDepth]->getTextureWidth(),
                     textures[Tex_OpaqueDepth]->getTextureHeight(), textures[Tex_Scene]->getInternalFormat())));
 #endif
+
+        mCanvases[frameId]->dirty();
     }
 
-    void PostProcessor::dirtyTechniques()
+    void PostProcessor::dirtyTechniques(bool dirtyAttachments)
     {
-        if (!isEnabled())
-            return;
-
         size_t frameId = frame() % 2;
 
         mDirty = true;
@@ -556,9 +566,11 @@ namespace MWRender
         mNormals = false;
         mPassLights = false;
 
+        std::vector<fx::Types::RenderTarget> attachmentsToDirty;
+
         for (const auto& technique : mTechniques)
         {
-            if (!technique->isValid())
+            if (!technique || !technique->isValid())
                 continue;
 
             if (technique->getGLSLVersion() > mGLSLVersion)
@@ -588,6 +600,7 @@ namespace MWRender
             node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerLastShader", Unit_LastShader));
             node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerLastPass", Unit_LastPass));
             node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerDepth", Unit_Depth));
+            node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerDistortion", Unit_Distortion));
 
             if (mNormals)
                 node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerNormals", Unit_Normals));
@@ -595,6 +608,8 @@ namespace MWRender
             if (technique->getHDR())
                 node.mRootStateSet->addUniform(new osg::Uniform("omw_EyeAdaptation", Unit_EyeAdaptation));
 
+            node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerDistortion", Unit_Distortion));
+
             int texUnit = Unit_NextFree;
 
             // user-defined samplers
@@ -621,8 +636,6 @@ namespace MWRender
                         uniform->mName.c_str(), *type, uniform->getNumElements()));
             }
 
-            std::unordered_map<osg::Texture2D*, osg::Texture2D*> renderTargetCache;
-
             for (const auto& pass : technique->getPasses())
             {
                 int subTexUnit = texUnit;
@@ -634,32 +647,47 @@ namespace MWRender
 
                 if (!pass->getTarget().empty())
                 {
-                    const auto& rt = technique->getRenderTargetsMap()[pass->getTarget()];
+                    auto& renderTarget = technique->getRenderTargetsMap()[pass->getTarget()];
+                    subPass.mSize = renderTarget.mSize;
+                    subPass.mRenderTexture = renderTarget.mTarget;
+                    subPass.mMipMap = renderTarget.mMipMap;
 
-                    const auto [w, h] = rt.mSize.get(renderWidth(), renderHeight());
+                    const auto [w, h] = renderTarget.mSize.get(renderWidth(), renderHeight());
+                    subPass.mStateSet->setAttributeAndModes(new osg::Viewport(0, 0, w, h));
 
-                    subPass.mRenderTexture = new osg::Texture2D(*rt.mTarget);
-                    renderTargetCache[rt.mTarget] = subPass.mRenderTexture;
                     subPass.mRenderTexture->setTextureSize(w, h);
-                    subPass.mRenderTexture->setName(std::string(pass->getTarget()));
-
-                    if (rt.mMipMap)
-                        subPass.mRenderTexture->setNumMipmapLevels(osg::Image::computeNumberOfMipmapLevels(w, h));
+                    subPass.mRenderTexture->dirtyTextureObject();
 
                     subPass.mRenderTarget = new osg::FrameBufferObject;
                     subPass.mRenderTarget->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0,
                         osg::FrameBufferAttachment(subPass.mRenderTexture));
-                    subPass.mStateSet->setAttributeAndModes(new osg::Viewport(0, 0, w, h));
+
+                    if (std::find_if(attachmentsToDirty.cbegin(), attachmentsToDirty.cend(),
+                            [renderTarget](const auto& rt) { return renderTarget.mTarget == rt.mTarget; })
+                        == attachmentsToDirty.cend())
+                    {
+                        attachmentsToDirty.push_back(fx::Types::RenderTarget(renderTarget));
+                    }
                 }
 
-                for (const auto& whitelist : pass->getRenderTargets())
+                for (const auto& name : pass->getRenderTargets())
                 {
-                    auto it = technique->getRenderTargetsMap().find(whitelist);
-                    if (it != technique->getRenderTargetsMap().end() && renderTargetCache[it->second.mTarget])
+                    if (name.empty())
                     {
-                        subPass.mStateSet->setTextureAttribute(subTexUnit, renderTargetCache[it->second.mTarget]);
-                        subPass.mStateSet->addUniform(new osg::Uniform(std::string(it->first).c_str(), subTexUnit++));
+                        continue;
                     }
+
+                    auto& renderTarget = technique->getRenderTargetsMap()[name];
+                    subPass.mStateSet->setTextureAttribute(subTexUnit, renderTarget.mTarget);
+                    subPass.mStateSet->addUniform(new osg::Uniform(name.c_str(), subTexUnit));
+
+                    if (std::find_if(attachmentsToDirty.cbegin(), attachmentsToDirty.cend(),
+                            [renderTarget](const auto& rt) { return renderTarget.mTarget == rt.mTarget; })
+                        == attachmentsToDirty.cend())
+                    {
+                        attachmentsToDirty.push_back(fx::Types::RenderTarget(renderTarget));
+                    }
+                    subTexUnit++;
                 }
 
                 node.mPasses.emplace_back(std::move(subPass));
@@ -670,39 +698,36 @@ namespace MWRender
             mTemplateData.emplace_back(std::move(node));
         }
 
-        mPingPongCanvas->setCurrentFrameData(frameId, fx::DispatchArray(mTemplateData));
+        mCanvases[frameId]->setPasses(fx::DispatchArray(mTemplateData));
 
         if (auto hud = MWBase::Environment::get().getWindowManager()->getPostProcessorHud())
             hud->updateTechniques();
 
         mRendering.getSkyManager()->setSunglare(sunglare);
+
+        if (dirtyAttachments)
+            mCanvases[frameId]->setDirtyAttachments(attachmentsToDirty);
     }
 
     PostProcessor::Status PostProcessor::enableTechnique(
         std::shared_ptr<fx::Technique> technique, std::optional<int> location)
     {
-        if (!isEnabled())
-        {
-            Log(Debug::Warning) << "PostProcessing disabled, cannot load technique '" << technique->getName() << "'";
-            return Status_Error;
-        }
-
         if (!technique || technique->getLocked() || (location.has_value() && location.value() < 0))
             return Status_Error;
 
         disableTechnique(technique, false);
 
-        int pos = std::min<int>(location.value_or(mTechniques.size()), mTechniques.size());
+        int pos = std::min<int>(location.value_or(mTechniques.size()) + mInternalTechniques.size(), mTechniques.size());
 
         mTechniques.insert(mTechniques.begin() + pos, technique);
-        dirtyTechniques();
+        dirtyTechniques(Settings::ShaderManager::get().getMode() == Settings::ShaderManager::Mode::Debug);
 
         return Status_Toggled;
     }
 
     PostProcessor::Status PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
     {
-        if (technique->getLocked())
+        if (!technique || technique->getLocked())
             return Status_Error;
 
         auto it = std::find(mTechniques.begin(), mTechniques.end(), technique);
@@ -718,92 +743,17 @@ namespace MWRender
 
     bool PostProcessor::isTechniqueEnabled(const std::shared_ptr<fx::Technique>& technique) const
     {
+        if (!technique)
+            return false;
+
         if (auto it = std::find(mTechniques.begin(), mTechniques.end(), technique); it == mTechniques.end())
             return false;
 
         return technique->isValid();
     }
 
-    void PostProcessor::createTexturesAndCamera(size_t frameId)
-    {
-        auto& textures = mTextures[frameId];
-
-        auto width = renderWidth();
-        auto height = renderHeight();
-
-        for (auto& texture : textures)
-        {
-            if (!texture)
-            {
-                if (Stereo::getMultiview())
-                    texture = new osg::Texture2DArray;
-                else
-                    texture = new osg::Texture2D;
-            }
-            Stereo::setMultiviewCompatibleTextureSize(texture, width, height);
-            texture->setSourceFormat(GL_RGBA);
-            texture->setSourceType(GL_UNSIGNED_BYTE);
-            texture->setInternalFormat(GL_RGBA);
-            texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture::LINEAR);
-            texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture::LINEAR);
-            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-            texture->setResizeNonPowerOfTwoHint(false);
-        }
-
-        textures[Tex_Normal]->setSourceFormat(GL_RGB);
-        textures[Tex_Normal]->setInternalFormat(GL_RGB);
-
-        auto setupDepth = [](osg::Texture* tex) {
-            tex->setSourceFormat(GL_DEPTH_STENCIL_EXT);
-            tex->setSourceType(SceneUtil::AutoDepth::depthSourceType());
-            tex->setInternalFormat(SceneUtil::AutoDepth::depthInternalFormat());
-        };
-
-        setupDepth(textures[Tex_Depth]);
-
-        if (mDisableDepthPasses)
-        {
-            textures[Tex_OpaqueDepth] = nullptr;
-        }
-        else
-        {
-            setupDepth(textures[Tex_OpaqueDepth]);
-            textures[Tex_OpaqueDepth]->setName("opaqueTexMap");
-        }
-
-        if (mHUDCamera)
-            return;
-
-        mHUDCamera = new osg::Camera;
-        mHUDCamera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
-        mHUDCamera->setRenderOrder(osg::Camera::POST_RENDER);
-        mHUDCamera->setClearColor(osg::Vec4(0.45, 0.45, 0.14, 1.0));
-        mHUDCamera->setClearMask(0);
-        mHUDCamera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1));
-        mHUDCamera->setAllowEventFocus(false);
-        mHUDCamera->setViewport(0, 0, mWidth, mHeight);
-
-        mViewer->getCamera()->removeCullCallback(mPingPongCull);
-        mPingPongCull = new PingPongCull(this);
-        mViewer->getCamera()->addCullCallback(mPingPongCull);
-
-        mPingPongCanvas = new PingPongCanvas(mRendering.getResourceSystem()->getSceneManager()->getShaderManager());
-        mHUDCamera->addChild(mPingPongCanvas);
-        mHUDCamera->setNodeMask(Mask_RenderToTexture);
-
-        mHUDCamera->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-        mHUDCamera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-    }
-
     std::shared_ptr<fx::Technique> PostProcessor::loadTechnique(const std::string& name, bool loadNextFrame)
     {
-        if (!isEnabled())
-        {
-            Log(Debug::Warning) << "PostProcessing disabled, cannot load technique '" << name << "'";
-            return nullptr;
-        }
-
         for (const auto& technique : mTemplates)
             if (Misc::StringUtils::ciEqual(technique->getName(), name))
                 return technique;
@@ -834,14 +784,14 @@ namespace MWRender
 
     void PostProcessor::loadChain()
     {
-        if (!isEnabled())
-            return;
-
         mTechniques.clear();
 
-        std::vector<std::string> techniqueStrings = Settings::Manager::getStringArray("chain", "Post Processing");
+        for (const auto& technique : mInternalTechniques)
+        {
+            mTechniques.push_back(technique);
+        }
 
-        for (auto& techniqueName : techniqueStrings)
+        for (const std::string& techniqueName : Settings::postProcessing().mChain.get())
         {
             if (techniqueName.empty())
                 continue;
@@ -858,12 +808,12 @@ namespace MWRender
 
         for (const auto& technique : mTechniques)
         {
-            if (!technique || technique->getDynamic())
+            if (!technique || technique->getDynamic() || technique->getInternal())
                 continue;
             chain.push_back(technique->getName());
         }
 
-        Settings::Manager::setStringArray("chain", "Post Processing", chain);
+        Settings::postProcessing().mChain.set(chain);
     }
 
     void PostProcessor::toggleMode()
@@ -871,13 +821,13 @@ namespace MWRender
         for (auto& technique : mTemplates)
             technique->compile();
 
-        dirtyTechniques();
+        dirtyTechniques(true);
     }
 
     void PostProcessor::disableDynamicShaders()
     {
         for (auto& technique : mTechniques)
-            if (technique->getDynamic())
+            if (technique && technique->getDynamic())
                 disableTechnique(technique);
     }
 
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index fa230ec2e8..2630467f95 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -50,12 +50,13 @@ namespace MWRender
     class PingPongCull;
     class PingPongCanvas;
     class TransparentDepthBinCallback;
+    class DistortionCallback;
 
     class PostProcessor : public osg::Group
     {
     public:
-        using FBOArray = std::array<osg::ref_ptr<osg::FrameBufferObject>, 5>;
-        using TextureArray = std::array<osg::ref_ptr<osg::Texture>, 5>;
+        using FBOArray = std::array<osg::ref_ptr<osg::FrameBufferObject>, 6>;
+        using TextureArray = std::array<osg::ref_ptr<osg::Texture>, 6>;
         using TechniqueList = std::vector<std::shared_ptr<fx::Technique>>;
 
         enum TextureIndex
@@ -64,7 +65,8 @@ namespace MWRender
             Tex_Scene_LDR,
             Tex_Depth,
             Tex_OpaqueDepth,
-            Tex_Normal
+            Tex_Normal,
+            Tex_Distortion,
         };
 
         enum FBOIndex
@@ -73,7 +75,8 @@ namespace MWRender
             FBO_Multisample,
             FBO_FirstPerson,
             FBO_OpaqueDepth,
-            FBO_Intercept
+            FBO_Intercept,
+            FBO_Distortion,
         };
 
         enum TextureUnits
@@ -83,6 +86,7 @@ namespace MWRender
             Unit_Depth,
             Unit_EyeAdaptation,
             Unit_Normals,
+            Unit_Distortion,
             Unit_NextFree
         };
 
@@ -115,14 +119,14 @@ namespace MWRender
             return mFbos[frameId][FBO_Multisample] ? mFbos[frameId][FBO_Multisample] : mFbos[frameId][FBO_Primary];
         }
 
+        osg::ref_ptr<osg::Camera> getHUDCamera() { return mHUDCamera; }
+
         osg::ref_ptr<fx::StateUpdater> getStateUpdater() { return mStateUpdater; }
 
         const TechniqueList& getTechniques() { return mTechniques; }
 
         const TechniqueList& getTemplates() const { return mTemplates; }
 
-        osg::ref_ptr<PingPongCanvas> getCanvas() { return mPingPongCanvas; }
-
         const auto& getTechniqueMap() const { return mTechniqueFileMap; }
 
         void resize();
@@ -173,15 +177,11 @@ namespace MWRender
 
         std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool loadNextFrame = false);
 
-        bool isEnabled() const { return mUsePostProcessing && mEnabled; }
-
-        bool softParticlesEnabled() const { return mSoftParticles; }
-
-        bool getHDR() const { return mHDR; }
+        bool isEnabled() const { return mUsePostProcessing; }
 
         void disable();
 
-        void enable(bool usePostProcessing = true);
+        void enable();
 
         void setRenderTargetSize(int width, int height)
         {
@@ -196,7 +196,7 @@ namespace MWRender
 
         void triggerShaderReload();
 
-        bool mEnableLiveReload;
+        bool mEnableLiveReload = false;
 
         void loadChain();
         void saveChain();
@@ -208,11 +208,7 @@ namespace MWRender
 
         void createObjectsForFrame(size_t frameId);
 
-        void createTexturesAndCamera(size_t frameId);
-
-        void reloadMainPass(fx::Technique& technique);
-
-        void dirtyTechniques();
+        void dirtyTechniques(bool dirtyAttachments = false);
 
         void update(size_t frameId);
 
@@ -231,46 +227,43 @@ namespace MWRender
         TechniqueList mTechniques;
         TechniqueList mTemplates;
         TechniqueList mQueuedTemplates;
+        TechniqueList mInternalTechniques;
 
         std::unordered_map<std::string, std::filesystem::path> mTechniqueFileMap;
 
-        int mSamples;
-
-        bool mDirty;
-        size_t mDirtyFrameId;
-
         RenderingManager& mRendering;
         osgViewer::Viewer* mViewer;
         const VFS::Manager* mVFS;
 
-        bool mTriggerShaderReload;
-        bool mReload;
-        bool mEnabled;
-        bool mUsePostProcessing;
-        bool mSoftParticles;
-        bool mDisableDepthPasses;
+        size_t mDirtyFrameId = 0;
+        size_t mLastFrameNumber = 0;
+        float mLastSimulationTime = 0.f;
 
-        size_t mLastFrameNumber;
-        float mLastSimulationTime;
+        bool mDirty = false;
+        bool mReload = true;
+        bool mTriggerShaderReload = false;
+        bool mUsePostProcessing = false;
+
+        bool mUBO = false;
+        bool mHDR = false;
+        bool mNormals = false;
+        bool mUnderwater = false;
+        bool mPassLights = false;
+        bool mPrevNormals = false;
+        bool mExteriorFlag = false;
+        bool mNormalsSupported = false;
+        bool mPrevPassLights = false;
 
-        bool mExteriorFlag;
-        bool mUnderwater;
-        bool mHDR;
-        bool mNormals;
-        bool mPrevNormals;
-        bool mNormalsSupported;
-        bool mPassLights;
-        bool mPrevPassLights;
-        bool mUBO;
         int mGLSLVersion;
+        int mWidth;
+        int mHeight;
+        int mSamples;
 
         osg::ref_ptr<fx::StateUpdater> mStateUpdater;
         osg::ref_ptr<PingPongCull> mPingPongCull;
-        osg::ref_ptr<PingPongCanvas> mPingPongCanvas;
+        std::array<osg::ref_ptr<PingPongCanvas>, 2> mCanvases;
         osg::ref_ptr<TransparentDepthBinCallback> mTransparentDepthPostPass;
-
-        int mWidth;
-        int mHeight;
+        osg::ref_ptr<DistortionCallback> mDistortionCallback;
 
         fx::DispatchArray mTemplateData;
     };
diff --git a/apps/openmw/mwrender/precipitationocclusion.cpp b/apps/openmw/mwrender/precipitationocclusion.cpp
index e7c9245fef..31712410b8 100644
--- a/apps/openmw/mwrender/precipitationocclusion.cpp
+++ b/apps/openmw/mwrender/precipitationocclusion.cpp
@@ -1,5 +1,7 @@
 #include "precipitationocclusion.hpp"
 
+#include <cassert>
+
 #include <osgUtil/CullVisitor>
 
 #include <components/misc/constants.hpp>
@@ -8,6 +10,7 @@
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/settings/values.hpp>
 #include <components/shader/shadermanager.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -112,23 +115,26 @@ namespace MWRender
         mCamera->attach(osg::Camera::DEPTH_BUFFER, mDepthTexture);
         mCamera->addChild(mSceneNode);
         mCamera->setSmallFeatureCullingPixelSize(
-            Settings::Manager::getFloat("weather particle occlusion small feature culling pixel size", "Shaders"));
+            Settings::shaders().mWeatherParticleOcclusionSmallFeatureCullingPixelSize);
 
         SceneUtil::setCameraClearDepth(mCamera);
     }
 
     void PrecipitationOccluder::update()
     {
+        if (!mRange.has_value())
+            return;
+
         const osg::Vec3 pos = mSceneCamera->getInverseViewMatrix().getTrans();
 
-        const float zmin = pos.z() - mRange.z() - Constants::CellSizeInUnits;
-        const float zmax = pos.z() + mRange.z() + Constants::CellSizeInUnits;
+        const float zmin = pos.z() - mRange->z() - Constants::CellSizeInUnits;
+        const float zmax = pos.z() + mRange->z() + Constants::CellSizeInUnits;
         const float near = 0;
         const float far = zmax - zmin;
 
-        const float left = -mRange.x() / 2;
+        const float left = -mRange->x() / 2;
         const float right = -left;
-        const float top = mRange.y() / 2;
+        const float top = mRange->y() / 2;
         const float bottom = -top;
 
         if (SceneUtil::AutoDepth::isReversed())
@@ -162,10 +168,14 @@ namespace MWRender
         mSkyCullCallback = nullptr;
 
         mRootNode->removeChild(mCamera);
+        mRange = std::nullopt;
     }
 
     void PrecipitationOccluder::updateRange(const osg::Vec3f range)
     {
+        assert(range.x() != 0);
+        assert(range.y() != 0);
+        assert(range.z() != 0);
         const osg::Vec3f margin = { -50, -50, 0 };
         mRange = range - margin;
     }
diff --git a/apps/openmw/mwrender/precipitationocclusion.hpp b/apps/openmw/mwrender/precipitationocclusion.hpp
index 26114ed42f..9d2992637e 100644
--- a/apps/openmw/mwrender/precipitationocclusion.hpp
+++ b/apps/openmw/mwrender/precipitationocclusion.hpp
@@ -4,6 +4,8 @@
 #include <osg/Camera>
 #include <osg/Texture2D>
 
+#include <optional>
+
 namespace MWRender
 {
     class PrecipitationOccluder
@@ -27,7 +29,7 @@ namespace MWRender
         osg::ref_ptr<osg::Camera> mCamera;
         osg::ref_ptr<osg::Camera> mSceneCamera;
         osg::ref_ptr<osg::Texture2D> mDepthTexture;
-        osg::Vec3f mRange;
+        std::optional<osg::Vec3f> mRange;
     };
 }
 
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index 8edbc8568d..30cfa82493 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -6,6 +6,7 @@
 #include <components/detournavigator/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/detourdebugdraw.hpp>
 #include <components/sceneutil/recastmesh.hpp>
 
 #include <osg/PositionAttitudeTransform>
@@ -16,9 +17,22 @@
 
 namespace MWRender
 {
+    namespace
+    {
+        osg::ref_ptr<osg::StateSet> makeDebugDrawStateSet()
+        {
+            osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
+            stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+            return stateSet;
+        }
+    }
+
     RecastMesh::RecastMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
         : mRootNode(root)
         , mEnabled(enabled)
+        , mGroupStateSet(SceneUtil::makeDetourGroupStateSet())
+        , mDebugDrawStateSet(makeDebugDrawStateSet())
     {
     }
 
@@ -55,11 +69,16 @@ namespace MWRender
 
             if (it->second.mVersion != tile->second->getVersion())
             {
-                const auto group = SceneUtil::createRecastMeshGroup(*tile->second, settings.mRecast);
-                MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
+                const osg::ref_ptr<osg::Group> group
+                    = SceneUtil::createRecastMeshGroup(*tile->second, settings.mRecast, mDebugDrawStateSet);
                 group->setNodeMask(Mask_Debug);
+                group->setStateSet(mGroupStateSet);
+
+                MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
+
                 mRootNode->removeChild(it->second.mValue);
                 mRootNode->addChild(group);
+
                 it->second.mValue = group;
                 it->second.mVersion = tile->second->getVersion();
             }
@@ -67,14 +86,26 @@ namespace MWRender
             ++it;
         }
 
-        for (const auto& tile : tiles)
+        for (const auto& [position, mesh] : tiles)
         {
-            if (mGroups.count(tile.first))
-                continue;
-            const auto group = SceneUtil::createRecastMeshGroup(*tile.second, settings.mRecast);
-            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
+            const auto it = mGroups.find(position);
+
+            if (it != mGroups.end())
+            {
+                if (it->second.mVersion == mesh->getVersion())
+                    continue;
+
+                mRootNode->removeChild(it->second.mValue);
+            }
+
+            const osg::ref_ptr<osg::Group> group
+                = SceneUtil::createRecastMeshGroup(*mesh, settings.mRecast, mDebugDrawStateSet);
             group->setNodeMask(Mask_Debug);
-            mGroups.emplace(tile.first, Group{ tile.second->getVersion(), group });
+            group->setStateSet(mGroupStateSet);
+
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
+
+            mGroups.insert_or_assign(it, position, Group{ mesh->getVersion(), group });
             mRootNode->addChild(group);
         }
     }
diff --git a/apps/openmw/mwrender/recastmesh.hpp b/apps/openmw/mwrender/recastmesh.hpp
index 2a45d67c6f..5fadd0b76a 100644
--- a/apps/openmw/mwrender/recastmesh.hpp
+++ b/apps/openmw/mwrender/recastmesh.hpp
@@ -6,12 +6,11 @@
 
 #include <osg/ref_ptr>
 
-#include <vector>
-
 namespace osg
 {
     class Group;
     class Geometry;
+    class StateSet;
 }
 
 namespace DetourNavigator
@@ -49,6 +48,8 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mRootNode;
         bool mEnabled;
         std::map<DetourNavigator::TilePosition, Group> mGroups;
+        osg::ref_ptr<osg::StateSet> mGroupStateSet;
+        osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
     };
 }
 
diff --git a/apps/openmw/mwrender/renderbin.hpp b/apps/openmw/mwrender/renderbin.hpp
index c14f611426..6f4ae0819b 100644
--- a/apps/openmw/mwrender/renderbin.hpp
+++ b/apps/openmw/mwrender/renderbin.hpp
@@ -13,7 +13,8 @@ namespace MWRender
         RenderBin_DepthSorted = 10, // osg::StateSet::TRANSPARENT_BIN
         RenderBin_OcclusionQuery = 11,
         RenderBin_FirstPerson = 12,
-        RenderBin_SunGlare = 13
+        RenderBin_SunGlare = 13,
+        RenderBin_Distortion = 14,
     };
 
 }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index f9058fa18a..fcb2d18e4c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -59,6 +59,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/groundcoverstore.hpp"
+#include "../mwworld/scene.hpp"
 
 #include "../mwgui/postprocessorhud.hpp"
 
@@ -82,6 +83,7 @@
 #include "screenshotmanager.hpp"
 #include "sky.hpp"
 #include "terrainstorage.hpp"
+#include "util.hpp"
 #include "vismask.hpp"
 #include "water.hpp"
 
@@ -281,22 +283,22 @@ namespace MWRender
         {
             try
             {
-                for (std::vector<std::string>::const_iterator it = mModels.begin(); it != mModels.end(); ++it)
-                    mResourceSystem->getSceneManager()->getTemplate(*it);
-                for (std::vector<std::string>::const_iterator it = mTextures.begin(); it != mTextures.end(); ++it)
-                    mResourceSystem->getImageManager()->getImage(*it);
-                for (std::vector<std::string>::const_iterator it = mKeyframes.begin(); it != mKeyframes.end(); ++it)
-                    mResourceSystem->getKeyframeManager()->get(*it);
+                for (const VFS::Path::Normalized& v : mModels)
+                    mResourceSystem->getSceneManager()->getTemplate(v);
+                for (const VFS::Path::Normalized& v : mTextures)
+                    mResourceSystem->getImageManager()->getImage(v);
+                for (const VFS::Path::Normalized& v : mKeyframes)
+                    mResourceSystem->getKeyframeManager()->get(v);
             }
-            catch (std::exception&)
+            catch (const std::exception& e)
             {
-                // ignore error (will be shown when these are needed proper)
+                Log(Debug::Warning) << "Failed to preload common assets: " << e.what();
             }
         }
 
-        std::vector<std::string> mModels;
-        std::vector<std::string> mTextures;
-        std::vector<std::string> mKeyframes;
+        std::vector<VFS::Path::Normalized> mModels;
+        std::vector<VFS::Path::Normalized> mTextures;
+        std::vector<VFS::Path::Normalized> mKeyframes;
 
     private:
         Resource::ResourceSystem* mResourceSystem;
@@ -312,7 +314,6 @@ namespace MWRender
         , mResourceSystem(resourceSystem)
         , mWorkQueue(workQueue)
         , mNavigator(navigator)
-        , mMinimumAmbientLuminance(0.f)
         , mNightEyeFactor(0.f)
         // TODO: Near clip should not need to be bounded like this, but too small values break OSG shadow calculations
         // CPU-side. See issue: #6072
@@ -325,46 +326,83 @@ namespace MWRender
         , mGroundCoverStore(groundcoverStore)
     {
         bool reverseZ = SceneUtil::AutoDepth::isReversed();
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(
-            Settings::Manager::getString("lighting method", "Shaders"));
+        const SceneUtil::LightingMethod lightingMethod = Settings::shaders().mLightingMethod;
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
-        // Shadows and radial fog have problems with fixed-function mode.
-        bool forceShaders = Settings::fog().mRadialFog || Settings::fog().mExponentialFog
-            || Settings::Manager::getBool("soft particles", "Shaders")
-            || Settings::Manager::getBool("force shaders", "Shaders")
-            || Settings::Manager::getBool("enable shadows", "Shadows")
-            || lightingMethod != SceneUtil::LightingMethod::FFP || reverseZ || mSkyBlending || Stereo::getMultiview();
-        resourceSystem->getSceneManager()->setForceShaders(forceShaders);
 
+        // Figure out which pipeline must be used by default and inform the user
+        bool forceShaders = Settings::shaders().mForceShaders;
+        {
+            std::vector<std::string> requesters;
+            if (!forceShaders)
+            {
+                if (Settings::fog().mRadialFog)
+                    requesters.push_back("radial fog");
+                if (Settings::fog().mExponentialFog)
+                    requesters.push_back("exponential fog");
+                if (mSkyBlending)
+                    requesters.push_back("sky blending");
+                if (Settings::shaders().mSoftParticles)
+                    requesters.push_back("soft particles");
+                if (Settings::shadows().mEnableShadows)
+                    requesters.push_back("shadows");
+                if (lightingMethod != SceneUtil::LightingMethod::FFP)
+                    requesters.push_back("lighting method");
+                if (reverseZ)
+                    requesters.push_back("reverse-Z depth buffer");
+                if (Stereo::getMultiview())
+                    requesters.push_back("stereo multiview");
+
+                if (!requesters.empty())
+                    forceShaders = true;
+            }
+
+            if (forceShaders)
+            {
+                std::string message = "Using rendering with shaders by default";
+                if (requesters.empty())
+                {
+                    message += " (forced)";
+                }
+                else
+                {
+                    message += ", requested by:";
+                    for (size_t i = 0; i < requesters.size(); i++)
+                        message += "\n - " + requesters[i];
+                }
+                Log(Debug::Info) << message;
+            }
+            else
+            {
+                Log(Debug::Info) << "Using fixed-function rendering by default";
+            }
+        }
+
+        resourceSystem->getSceneManager()->setForceShaders(forceShaders);
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
-        resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
-        resourceSystem->getSceneManager()->setAutoUseNormalMaps(
-            Settings::Manager::getBool("auto use object normal maps", "Shaders"));
-        resourceSystem->getSceneManager()->setNormalMapPattern(
-            Settings::Manager::getString("normal map pattern", "Shaders"));
-        resourceSystem->getSceneManager()->setNormalHeightMapPattern(
-            Settings::Manager::getString("normal height map pattern", "Shaders"));
-        resourceSystem->getSceneManager()->setAutoUseSpecularMaps(
-            Settings::Manager::getBool("auto use object specular maps", "Shaders"));
-        resourceSystem->getSceneManager()->setSpecularMapPattern(
-            Settings::Manager::getString("specular map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setClampLighting(Settings::shaders().mClampLighting);
+        resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::shaders().mAutoUseObjectNormalMaps);
+        resourceSystem->getSceneManager()->setNormalMapPattern(Settings::shaders().mNormalMapPattern);
+        resourceSystem->getSceneManager()->setNormalHeightMapPattern(Settings::shaders().mNormalHeightMapPattern);
+        resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::shaders().mAutoUseObjectSpecularMaps);
+        resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::shaders().mSpecularMapPattern);
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(
-            Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
-        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(
-            Settings::Manager::getBool("antialias alpha test", "Shaders")
-            && Settings::Manager::getInt("antialiasing", "Video") > 1);
+            Settings::shaders().mApplyLightingToEnvironmentMaps);
+        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(shouldAddMSAAIntermediateTarget());
         resourceSystem->getSceneManager()->setAdjustCoverageForAlphaTest(
-            Settings::Manager::getBool("adjust coverage for alpha test", "Shaders"));
+            Settings::shaders().mAdjustCoverageForAlphaTest);
 
         // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this
         // depends on support for various OpenGL extensions.
-        osg::ref_ptr<SceneUtil::LightManager> sceneRoot
-            = new SceneUtil::LightManager(lightingMethod == SceneUtil::LightingMethod::FFP);
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(SceneUtil::LightSettings{
+            .mLightingMethod = lightingMethod,
+            .mMaxLights = Settings::shaders().mMaxLights,
+            .mMaximumLightDistance = Settings::shaders().mMaximumLightDistance,
+            .mLightFadeStart = Settings::shaders().mLightFadeStart,
+            .mLightBoundsMultiplier = Settings::shaders().mLightBoundsMultiplier,
+        });
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setSupportedLightingMethods(sceneRoot->getSupportedLightingMethods());
-        mMinimumAmbientLuminance
-            = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
 
         sceneRoot->setLightingMask(Mask_Lighting);
         mSceneRoot = sceneRoot;
@@ -373,22 +411,22 @@ namespace MWRender
         sceneRoot->setName("Scene Root");
 
         int shadowCastingTraversalMask = Mask_Scene;
-        if (Settings::Manager::getBool("actor shadows", "Shadows"))
+        if (Settings::shadows().mActorShadows)
             shadowCastingTraversalMask |= Mask_Actor;
-        if (Settings::Manager::getBool("player shadows", "Shadows"))
+        if (Settings::shadows().mPlayerShadows)
             shadowCastingTraversalMask |= Mask_Player;
 
         int indoorShadowCastingTraversalMask = shadowCastingTraversalMask;
-        if (Settings::Manager::getBool("object shadows", "Shadows"))
+        if (Settings::shadows().mObjectShadows)
             shadowCastingTraversalMask |= (Mask_Object | Mask_Static);
-        if (Settings::Manager::getBool("terrain shadows", "Shadows"))
+        if (Settings::shadows().mTerrainShadows)
             shadowCastingTraversalMask |= Mask_Terrain;
 
         mShadowManager = std::make_unique<SceneUtil::ShadowManager>(sceneRoot, mRootNode, shadowCastingTraversalMask,
-            indoorShadowCastingTraversalMask, Mask_Terrain | Mask_Object | Mask_Static,
+            indoorShadowCastingTraversalMask, Mask_Terrain | Mask_Object | Mask_Static, Settings::shadows(),
             mResourceSystem->getSceneManager()->getShaderManager());
 
-        Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines();
+        Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines(Settings::shadows());
         Shader::ShaderManager::DefineMap lightDefines = sceneRoot->getLightDefines();
         Shader::ShaderManager::DefineMap globalDefines
             = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
@@ -396,15 +434,15 @@ namespace MWRender
         for (auto itr = shadowDefines.begin(); itr != shadowDefines.end(); itr++)
             globalDefines[itr->first] = itr->second;
 
-        globalDefines["forcePPL"] = Settings::Manager::getBool("force per pixel lighting", "Shaders") ? "1" : "0";
-        globalDefines["clamp"] = Settings::Manager::getBool("clamp lighting", "Shaders") ? "1" : "0";
-        globalDefines["preLightEnv"]
-            = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
+        globalDefines["forcePPL"] = Settings::shaders().mForcePerPixelLighting ? "1" : "0";
+        globalDefines["clamp"] = Settings::shaders().mClampLighting ? "1" : "0";
+        globalDefines["preLightEnv"] = Settings::shaders().mApplyLightingToEnvironmentMaps ? "1" : "0";
+        globalDefines["classicFalloff"] = Settings::shaders().mClassicFalloff ? "1" : "0";
         const bool exponentialFog = Settings::fog().mExponentialFog;
         globalDefines["radialFog"] = (exponentialFog || Settings::fog().mRadialFog) ? "1" : "0";
         globalDefines["exponentialFog"] = exponentialFog ? "1" : "0";
         globalDefines["skyBlending"] = mSkyBlending ? "1" : "0";
-        globalDefines["refraction_enabled"] = "0";
+        globalDefines["waterRefraction"] = "0";
         globalDefines["useGPUShader4"] = "0";
         globalDefines["useOVR_multiview"] = "0";
         globalDefines["numViews"] = "1";
@@ -425,13 +463,10 @@ namespace MWRender
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
-        mNavMesh = std::make_unique<NavMesh>(mRootNode, mWorkQueue,
-            Settings::Manager::getBool("enable nav mesh render", "Navigator"),
-            parseNavMeshMode(Settings::Manager::getString("nav mesh render mode", "Navigator")));
-        mActorsPaths = std::make_unique<ActorsPaths>(
-            mRootNode, Settings::Manager::getBool("enable agents paths render", "Navigator"));
-        mRecastMesh = std::make_unique<RecastMesh>(
-            mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator"));
+        mNavMesh = std::make_unique<NavMesh>(mRootNode, mWorkQueue, Settings::navigator().mEnableNavMeshRender,
+            Settings::navigator().mNavMeshRenderMode);
+        mActorsPaths = std::make_unique<ActorsPaths>(mRootNode, Settings::navigator().mEnableAgentsPathsRender);
+        mRecastMesh = std::make_unique<RecastMesh>(mRootNode, Settings::navigator().mEnableRecastMeshRender);
         mPathgrid = std::make_unique<Pathgrid>(mRootNode);
 
         mObjects = std::make_unique<Objects>(mResourceSystem, sceneRoot, unrefQueue);
@@ -442,17 +477,19 @@ namespace MWRender
             mViewer->getIncrementalCompileOperation()->setTargetFrameRate(Settings::cells().mTargetFramerate);
         }
 
-        mDebugDraw
-            = std::make_unique<Debug::DebugDrawer>(mResourceSystem->getSceneManager()->getShaderManager(), mRootNode);
+        mDebugDraw = new Debug::DebugDrawer(mResourceSystem->getSceneManager()->getShaderManager());
+        mDebugDraw->setNodeMask(Mask_Debug);
+        sceneRoot->addChild(mDebugDraw);
+
         mResourceSystem->getSceneManager()->setIncrementalCompileOperation(mViewer->getIncrementalCompileOperation());
 
         mEffectManager = std::make_unique<EffectManager>(sceneRoot, mResourceSystem);
 
-        const std::string& normalMapPattern = Settings::Manager::getString("normal map pattern", "Shaders");
-        const std::string& heightMapPattern = Settings::Manager::getString("normal height map pattern", "Shaders");
-        const std::string& specularMapPattern = Settings::Manager::getString("terrain specular map pattern", "Shaders");
-        const bool useTerrainNormalMaps = Settings::Manager::getBool("auto use terrain normal maps", "Shaders");
-        const bool useTerrainSpecularMaps = Settings::Manager::getBool("auto use terrain specular maps", "Shaders");
+        const std::string& normalMapPattern = Settings::shaders().mNormalMapPattern;
+        const std::string& heightMapPattern = Settings::shaders().mNormalHeightMapPattern;
+        const std::string& specularMapPattern = Settings::shaders().mTerrainSpecularMapPattern;
+        const bool useTerrainNormalMaps = Settings::shaders().mAutoUseTerrainNormalMaps;
+        const bool useTerrainSpecularMaps = Settings::shaders().mAutoUseTerrainSpecularMaps;
 
         mTerrainStorage = std::make_unique<TerrainStorage>(mResourceSystem, normalMapPattern, heightMapPattern,
             useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps);
@@ -475,8 +512,9 @@ namespace MWRender
         resourceSystem->getSceneManager()->setOpaqueDepthTex(
             mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 0),
             mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 1));
-        resourceSystem->getSceneManager()->setSoftParticles(mPostProcessor->softParticlesEnabled());
+        resourceSystem->getSceneManager()->setSoftParticles(Settings::shaders().mSoftParticles);
         resourceSystem->getSceneManager()->setSupportsNormalsRT(mPostProcessor->getSupportsNormalsRT());
+        resourceSystem->getSceneManager()->setWeatherParticleOcclusion(Settings::shaders().mWeatherParticleOcclusion);
 
         // water goes after terrain for correct waterculling order
         mWater = std::make_unique<Water>(
@@ -484,8 +522,7 @@ namespace MWRender
 
         mCamera = std::make_unique<Camera>(mViewer->getCamera());
 
-        mScreenshotManager
-            = std::make_unique<ScreenshotManager>(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get());
+        mScreenshotManager = std::make_unique<ScreenshotManager>(viewer);
 
         mViewer->setLightingMode(osgViewer::View::NO_LIGHT);
 
@@ -511,6 +548,9 @@ namespace MWRender
         sceneRoot->getOrCreateStateSet()->setAttribute(defaultMat);
         sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
         sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
+        sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("distortionStrength", 0.f));
+
+        resourceSystem->getSceneManager()->setUpNormalsRTForStateSet(sceneRoot->getOrCreateStateSet(), true);
 
         mFog = std::make_unique<FogManager>();
 
@@ -543,8 +583,7 @@ namespace MWRender
         MWBase::Environment::get().getWindowManager()->setCullMask(mask);
         NifOsg::Loader::setHiddenNodeMask(Mask_UpdateVisitor);
         NifOsg::Loader::setIntersectionDisabledNodeMask(Mask_Effect);
-        Nif::Reader::setLoadUnsupportedFiles(Settings::Manager::getBool("load unsupported nif files", "Models"));
-        Nif::Reader::setWriteNifDebugLog(Settings::Manager::getBool("write nif debug log", "Models"));
+        Nif::Reader::setLoadUnsupportedFiles(Settings::models().mLoadUnsupportedNifFiles);
 
         mStateUpdater->setFogEnd(mViewDistance);
 
@@ -606,15 +645,15 @@ namespace MWRender
         mSky->listAssetsToPreload(workItem->mModels, workItem->mTextures);
         mWater->listAssetsToPreload(workItem->mTextures);
 
-        workItem->mModels.push_back(Settings::Manager::getString("xbaseanim", "Models"));
-        workItem->mModels.push_back(Settings::Manager::getString("xbaseanim1st", "Models"));
-        workItem->mModels.push_back(Settings::Manager::getString("xbaseanimfemale", "Models"));
-        workItem->mModels.push_back(Settings::Manager::getString("xargonianswimkna", "Models"));
+        workItem->mModels.push_back(Settings::models().mXbaseanim);
+        workItem->mModels.push_back(Settings::models().mXbaseanim1st);
+        workItem->mModels.push_back(Settings::models().mXbaseanimfemale);
+        workItem->mModels.push_back(Settings::models().mXargonianswimkna);
 
-        workItem->mKeyframes.push_back(Settings::Manager::getString("xbaseanimkf", "Models"));
-        workItem->mKeyframes.push_back(Settings::Manager::getString("xbaseanim1stkf", "Models"));
-        workItem->mKeyframes.push_back(Settings::Manager::getString("xbaseanimfemalekf", "Models"));
-        workItem->mKeyframes.push_back(Settings::Manager::getString("xargonianswimknakf", "Models"));
+        workItem->mKeyframes.push_back(Settings::models().mXbaseanimkf);
+        workItem->mKeyframes.push_back(Settings::models().mXbaseanim1stkf);
+        workItem->mKeyframes.push_back(Settings::models().mXbaseanimfemalekf);
+        workItem->mKeyframes.push_back(Settings::models().mXargonianswimknakf);
 
         workItem->mTextures.emplace_back("textures/_land_default.dds");
 
@@ -646,11 +685,6 @@ namespace MWRender
         updateAmbient();
     }
 
-    void RenderingManager::skySetDate(int day, int month)
-    {
-        mSky->setDate(day, month);
-    }
-
     int RenderingManager::skyGetMasserPhase() const
     {
         return mSky->getMasserPhase();
@@ -671,7 +705,7 @@ namespace MWRender
         bool isInterior = !cell.isExterior() && !cell.isQuasiExterior();
         bool needsAdjusting = false;
         if (mResourceSystem->getSceneManager()->getLightingMethod() != SceneUtil::LightingMethod::FFP)
-            needsAdjusting = isInterior;
+            needsAdjusting = isInterior && !Settings::shaders().mClassicFalloff;
 
         osg::Vec4f ambient = SceneUtil::colourFromRGB(cell.getMood().mAmbiantColor);
 
@@ -683,15 +717,16 @@ namespace MWRender
 
             // we already work in linear RGB so no conversions are needed for the luminosity function
             float relativeLuminance = pR * ambient.r() + pG * ambient.g() + pB * ambient.b();
-            if (relativeLuminance < mMinimumAmbientLuminance)
+            const float minimumAmbientLuminance = Settings::shaders().mMinimumInteriorBrightness;
+            if (relativeLuminance < minimumAmbientLuminance)
             {
                 // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data
                 // as least we can
                 if (ambient.r() == 0.f && ambient.g() == 0.f && ambient.b() == 0.f)
                     ambient = osg::Vec4(
-                        mMinimumAmbientLuminance, mMinimumAmbientLuminance, mMinimumAmbientLuminance, ambient.a());
+                        minimumAmbientLuminance, minimumAmbientLuminance, minimumAmbientLuminance, ambient.a());
                 else
-                    ambient *= mMinimumAmbientLuminance / relativeLuminance;
+                    ambient *= minimumAmbientLuminance / relativeLuminance;
             }
         }
 
@@ -700,8 +735,9 @@ namespace MWRender
         osg::Vec4f diffuse = SceneUtil::colourFromRGB(cell.getMood().mDirectionalColor);
 
         setSunColour(diffuse, diffuse, 1.f);
-
-        const osg::Vec4f interiorSunPos = osg::Vec4f(-0.15f, 0.15f, 1.f, 0.f);
+        // This is total nonsense but it's what Morrowind uses
+        static const osg::Vec4f interiorSunPos
+            = osg::Vec4f(-1.f, osg::DegreesToRadians(45.f), osg::DegreesToRadians(45.f), 0.f);
         mPostProcessor->getStateUpdater()->setSunPos(interiorSunPos, false);
         mSunLight->setPosition(interiorSunPos);
     }
@@ -710,7 +746,7 @@ namespace MWRender
     {
         // need to wrap this in a StateUpdater?
         mSunLight->setDiffuse(diffuse);
-        mSunLight->setSpecular(specular);
+        mSunLight->setSpecular(osg::Vec4f(specular.x(), specular.y(), specular.z(), specular.w() * sunVis));
 
         mPostProcessor->getStateUpdater()->setSunColor(diffuse);
         mPostProcessor->getStateUpdater()->setSunVis(sunVis);
@@ -722,9 +758,12 @@ namespace MWRender
         // need to wrap this in a StateUpdater?
         mSunLight->setPosition(osg::Vec4(position.x(), position.y(), position.z(), 0));
 
+        // The sun is not synchronized with the sunlight because sunlight origin can't reach the horizon
+        // This is based on exterior sun orbit and won't make sense for interiors, see WeatherManager::update
+        position.z() = 400.f - std::abs(position.x());
         mSky->setSunDirection(position);
 
-        mPostProcessor->getStateUpdater()->setSunPos(mSunLight->getPosition(), mNight);
+        mPostProcessor->getStateUpdater()->setSunPos(osg::Vec4f(position, 0.f), mNight);
     }
 
     void RenderingManager::addCell(const MWWorld::CellStore* store)
@@ -778,7 +817,7 @@ namespace MWRender
         if (enabled)
             mShadowManager->enableOutdoorMode();
         else
-            mShadowManager->enableIndoorMode();
+            mShadowManager->enableIndoorMode(Settings::shadows());
         mPostProcessor->getStateUpdater()->setIsInterior(!enabled);
     }
 
@@ -855,6 +894,7 @@ namespace MWRender
 
         float rainIntensity = mSky->getPrecipitationAlpha();
         mWater->setRainIntensity(rainIntensity);
+        mWater->setRainRipplesEnabled(mSky->getRainRipplesEnabled());
 
         mWater->update(dt, paused);
         if (!paused)
@@ -973,19 +1013,6 @@ namespace MWRender
         mScreenshotManager->screenshot(image, w, h);
     }
 
-    bool RenderingManager::screenshot360(osg::Image* image)
-    {
-        if (mCamera->isVanityOrPreviewModeEnabled())
-        {
-            Log(Debug::Warning) << "Spherical screenshots are not allowed in preview mode.";
-            return false;
-        }
-
-        mScreenshotManager->screenshot360(image);
-
-        return true;
-    }
-
     osg::Vec4f RenderingManager::getScreenBounds(const osg::BoundingBox& worldbb)
     {
         if (!worldbb.valid())
@@ -1016,34 +1043,44 @@ namespace MWRender
         return osg::Vec4f(min_x, min_y, max_x, max_y);
     }
 
-    RenderingManager::RayResult getIntersectionResult(osgUtil::LineSegmentIntersector* intersector)
+    RenderingManager::RayResult getIntersectionResult(osgUtil::LineSegmentIntersector* intersector,
+        const osg::ref_ptr<osgUtil::IntersectionVisitor>& visitor, std::span<const MWWorld::Ptr> ignoreList = {})
     {
+        constexpr auto nonObjectWorldMask = Mask_Terrain | Mask_Water;
         RenderingManager::RayResult result;
         result.mHit = false;
         result.mRatio = 0;
-        if (intersector->containsIntersections())
-        {
-            result.mHit = true;
-            osgUtil::LineSegmentIntersector::Intersection intersection = intersector->getFirstIntersection();
 
-            result.mHitPointWorld = intersection.getWorldIntersectPoint();
-            result.mHitNormalWorld = intersection.getWorldIntersectNormal();
-            result.mRatio = intersection.ratio;
+        if (!intersector->containsIntersections())
+            return result;
 
+        auto test = [&](const osgUtil::LineSegmentIntersector::Intersection& intersection) {
             PtrHolder* ptrHolder = nullptr;
             std::vector<RefnumMarker*> refnumMarkers;
+            bool hitNonObjectWorld = false;
             for (osg::NodePath::const_iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end();
                  ++it)
             {
+                const auto& nodeMask = (*it)->getNodeMask();
+                if (!hitNonObjectWorld)
+                    hitNonObjectWorld = nodeMask & nonObjectWorldMask;
+
                 osg::UserDataContainer* userDataContainer = (*it)->getUserDataContainer();
                 if (!userDataContainer)
                     continue;
                 for (unsigned int i = 0; i < userDataContainer->getNumUserObjects(); ++i)
                 {
                     if (PtrHolder* p = dynamic_cast<PtrHolder*>(userDataContainer->getUserObject(i)))
-                        ptrHolder = p;
+                    {
+                        if (std::find(ignoreList.begin(), ignoreList.end(), p->mPtr) == ignoreList.end())
+                        {
+                            ptrHolder = p;
+                        }
+                    }
                     if (RefnumMarker* r = dynamic_cast<RefnumMarker*>(userDataContainer->getUserObject(i)))
+                    {
                         refnumMarkers.push_back(r);
+                    }
                 }
             }
 
@@ -1058,21 +1095,113 @@ namespace MWRender
                     || (intersectionIndex >= vertexCounter
                         && intersectionIndex < vertexCounter + refnumMarkers[i]->mNumVertices))
                 {
-                    result.mHitRefnum = refnumMarkers[i]->mRefnum;
+                    auto it = std::find_if(
+                        ignoreList.begin(), ignoreList.end(), [target = refnumMarkers[i]->mRefnum](const auto& ptr) {
+                            return target == ptr.getCellRef().getRefNum();
+                        });
+
+                    if (it == ignoreList.end())
+                    {
+                        result.mHitRefnum = refnumMarkers[i]->mRefnum;
+                    }
+
                     break;
                 }
                 vertexCounter += refnumMarkers[i]->mNumVertices;
             }
+
+            if (!result.mHitObject.isEmpty() || result.mHitRefnum.isSet() || hitNonObjectWorld)
+            {
+                result.mHit = true;
+                result.mHitPointWorld = intersection.getWorldIntersectPoint();
+                result.mHitNormalWorld = intersection.getWorldIntersectNormal();
+                result.mRatio = intersection.ratio;
+            }
+        };
+
+        if (ignoreList.empty() || intersector->getIntersectionLimit() != osgUtil::LineSegmentIntersector::NO_LIMIT)
+        {
+            test(intersector->getFirstIntersection());
+        }
+        else
+        {
+            for (const auto& intersection : intersector->getIntersections())
+            {
+                test(intersection);
+
+                if (result.mHit)
+                {
+                    break;
+                }
+            }
         }
 
         return result;
     }
 
+    class IntersectionVisitorWithIgnoreList : public osgUtil::IntersectionVisitor
+    {
+    public:
+        bool skipTransform(osg::Transform& transform)
+        {
+            if (mContainsPagedRefs)
+                return false;
+
+            osg::UserDataContainer* userDataContainer = transform.getUserDataContainer();
+            if (!userDataContainer)
+                return false;
+
+            for (unsigned int i = 0; i < userDataContainer->getNumUserObjects(); ++i)
+            {
+                if (PtrHolder* p = dynamic_cast<PtrHolder*>(userDataContainer->getUserObject(i)))
+                {
+                    if (std::find(mIgnoreList.begin(), mIgnoreList.end(), p->mPtr) != mIgnoreList.end())
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        void apply(osg::Transform& transform) override
+        {
+            if (skipTransform(transform))
+            {
+                return;
+            }
+            osgUtil::IntersectionVisitor::apply(transform);
+        }
+
+        void setIgnoreList(std::span<const MWWorld::Ptr> ignoreList) { mIgnoreList = ignoreList; }
+        void setContainsPagedRefs(bool contains) { mContainsPagedRefs = contains; }
+
+    private:
+        std::span<const MWWorld::Ptr> mIgnoreList;
+        bool mContainsPagedRefs = false;
+    };
+
     osg::ref_ptr<osgUtil::IntersectionVisitor> RenderingManager::getIntersectionVisitor(
-        osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors)
+        osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors,
+        std::span<const MWWorld::Ptr> ignoreList)
     {
         if (!mIntersectionVisitor)
-            mIntersectionVisitor = new osgUtil::IntersectionVisitor;
+            mIntersectionVisitor = new IntersectionVisitorWithIgnoreList;
+
+        mIntersectionVisitor->setIgnoreList(ignoreList);
+        mIntersectionVisitor->setContainsPagedRefs(false);
+
+        MWWorld::Scene* worldScene = MWBase::Environment::get().getWorldScene();
+        for (const auto& ptr : ignoreList)
+        {
+            if (worldScene->isPagedRef(ptr))
+            {
+                mIntersectionVisitor->setContainsPagedRefs(true);
+                intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
+                break;
+            }
+        }
 
         mIntersectionVisitor->setTraversalNumber(mViewer->getFrameStamp()->getFrameNumber());
         mIntersectionVisitor->setFrameStamp(mViewer->getFrameStamp());
@@ -1090,16 +1219,16 @@ namespace MWRender
         return mIntersectionVisitor;
     }
 
-    RenderingManager::RayResult RenderingManager::castRay(
-        const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors)
+    RenderingManager::RayResult RenderingManager::castRay(const osg::Vec3f& origin, const osg::Vec3f& dest,
+        bool ignorePlayer, bool ignoreActors, std::span<const MWWorld::Ptr> ignoreList)
     {
         osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector(
             new osgUtil::LineSegmentIntersector(osgUtil::LineSegmentIntersector::MODEL, origin, dest));
         intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_NEAREST);
 
-        mRootNode->accept(*getIntersectionVisitor(intersector, ignorePlayer, ignoreActors));
+        mRootNode->accept(*getIntersectionVisitor(intersector, ignorePlayer, ignoreActors, ignoreList));
 
-        return getIntersectionResult(intersector);
+        return getIntersectionResult(intersector, mIntersectionVisitor, ignoreList);
     }
 
     RenderingManager::RayResult RenderingManager::castCameraToViewportRay(
@@ -1119,7 +1248,7 @@ namespace MWRender
 
         mViewer->getCamera()->accept(*getIntersectionVisitor(intersector, ignorePlayer, ignoreActors));
 
-        return getIntersectionResult(intersector);
+        return getIntersectionResult(intersector, mIntersectionVisitor);
     }
 
     void RenderingManager::updatePtr(const MWWorld::Ptr& old, const MWWorld::Ptr& updated)
@@ -1128,7 +1257,7 @@ namespace MWRender
         mActorsPaths->updatePtr(old, updated);
     }
 
-    void RenderingManager::spawnEffect(const std::string& model, std::string_view texture,
+    void RenderingManager::spawnEffect(VFS::Path::NormalizedView model, std::string_view texture,
         const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
     {
         mEffectManager->addEffect(model, texture, worldPosition, scale, isMagicVFX);
@@ -1238,8 +1367,8 @@ namespace MWRender
         if (mViewDistance < mNearClip)
             throw std::runtime_error("Viewing distance is less than near clip");
 
-        double width = Settings::Manager::getInt("resolution x", "Video");
-        double height = Settings::Manager::getInt("resolution y", "Video");
+        const double width = Settings::video().mResolutionX;
+        const double height = Settings::video().mResolutionY;
 
         double aspect = (height == 0.0) ? 1.0 : width / height;
         float fov = mFieldOfView;
@@ -1264,7 +1393,7 @@ namespace MWRender
             mSharedUniformStateUpdater->setScreenRes(res.x(), res.y());
             Stereo::Manager::instance().setMasterProjectionMatrix(mPerViewUniformStateUpdater->getProjectionMatrix());
         }
-        else if (!mPostProcessor->isEnabled())
+        else
         {
             mSharedUniformStateUpdater->setScreenRes(width, height);
         }
@@ -1324,23 +1453,22 @@ namespace MWRender
             return existingChunkMgr->second;
         RenderingManager::WorldspaceChunkMgr newChunkMgr;
 
-        const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain");
-        const bool groundcover = Settings::groundcover().mEnabled;
-        bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
+        const float lodFactor = Settings::terrain().mLodFactor;
+        const bool groundcover = Settings::groundcover().mEnabled && worldspace == ESM::Cell::sDefaultWorldspaceId;
+        const bool distantTerrain = Settings::terrain().mDistantTerrain;
+        const double expiryDelay = Settings::cells().mCacheExpiryDelay;
         if (distantTerrain || groundcover)
         {
-            const int compMapResolution = Settings::Manager::getInt("composite map resolution", "Terrain");
-            int compMapPower = Settings::Manager::getInt("composite map level", "Terrain");
-            compMapPower = std::max(-3, compMapPower);
-            float compMapLevel = pow(2, compMapPower);
-            const int vertexLodMod = Settings::Manager::getInt("vertex lod mod", "Terrain");
-            float maxCompGeometrySize = Settings::Manager::getFloat("max composite geometry size", "Terrain");
-            maxCompGeometrySize = std::max(maxCompGeometrySize, 1.f);
-            bool debugChunks = Settings::Manager::getBool("debug chunks", "Terrain");
+            const int compMapResolution = Settings::terrain().mCompositeMapResolution;
+            const int compMapPower = Settings::terrain().mCompositeMapLevel;
+            const float compMapLevel = std::pow(2, compMapPower);
+            const int vertexLodMod = Settings::terrain().mVertexLodMod;
+            const float maxCompGeometrySize = Settings::terrain().mMaxCompositeGeometrySize;
+            const bool debugChunks = Settings::terrain().mDebugChunks;
             auto quadTreeWorld = std::make_unique<Terrain::QuadTreeWorld>(mSceneRoot, mRootNode, mResourceSystem,
                 mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug, compMapResolution, compMapLevel,
-                lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks, worldspace);
-            if (Settings::Manager::getBool("object paging", "Terrain"))
+                lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks, worldspace, expiryDelay);
+            if (Settings::terrain().mObjectPaging)
             {
                 newChunkMgr.mObjectPaging
                     = std::make_unique<ObjectPaging>(mResourceSystem->getSceneManager(), worldspace);
@@ -1361,11 +1489,12 @@ namespace MWRender
         }
         else
             newChunkMgr.mTerrain = std::make_unique<Terrain::TerrainGrid>(mSceneRoot, mRootNode, mResourceSystem,
-                mTerrainStorage.get(), Mask_Terrain, worldspace, Mask_PreCompile, Mask_Debug);
+                mTerrainStorage.get(), Mask_Terrain, worldspace, expiryDelay, Mask_PreCompile, Mask_Debug);
 
         newChunkMgr.mTerrain->setTargetFrameRate(Settings::cells().mTargetFramerate);
         float distanceMult = std::cos(osg::DegreesToRadians(std::min(mFieldOfView, 140.f)) / 2.f);
         newChunkMgr.mTerrain->setViewDistance(mViewDistance * (distanceMult ? 1.f / distanceMult : 1.f));
+        newChunkMgr.mTerrain->enableHeightCullCallback(Settings::terrain().mWaterCulling);
 
         return mWorldspaceChunks.emplace(worldspace, std::move(newChunkMgr)).first->second;
     }
@@ -1411,23 +1540,38 @@ namespace MWRender
             }
             else if (it->first == "Shaders" && it->second == "minimum interior brightness")
             {
-                mMinimumAmbientLuminance
-                    = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
                 if (MWMechanics::getPlayer().isInCell())
                     configureAmbient(*MWMechanics::getPlayer().getCell()->getCell());
             }
+            else if (it->first == "Shaders"
+                && (it->second == "force per pixel lighting" || it->second == "classic falloff"))
+            {
+                mViewer->stopThreading();
+
+                auto defines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
+                defines["forcePPL"] = Settings::shaders().mForcePerPixelLighting ? "1" : "0";
+                defines["classicFalloff"] = Settings::shaders().mClassicFalloff ? "1" : "0";
+                mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
+
+                if (MWMechanics::getPlayer().isInCell() && it->second == "classic falloff")
+                    configureAmbient(*MWMechanics::getPlayer().getCell()->getCell());
+
+                mViewer->startThreading();
+            }
             else if (it->first == "Shaders"
                 && (it->second == "light bounds multiplier" || it->second == "maximum light distance"
                     || it->second == "light fade start" || it->second == "max lights"))
             {
                 auto* lightManager = getLightRoot();
-                lightManager->processChangedSettings(changed);
+
+                lightManager->processChangedSettings(Settings::shaders().mLightBoundsMultiplier,
+                    Settings::shaders().mMaximumLightDistance, Settings::shaders().mLightFadeStart);
 
                 if (it->second == "max lights" && !lightManager->usingFFP())
                 {
                     mViewer->stopThreading();
 
-                    lightManager->updateMaxLights();
+                    lightManager->updateMaxLights(Settings::shaders().mMaxLights);
 
                     auto defines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
                     for (const auto& [name, key] : lightManager->getLightDefines())
@@ -1441,7 +1585,7 @@ namespace MWRender
             }
             else if (it->first == "Post Processing" && it->second == "enabled")
             {
-                if (Settings::Manager::getBool("enabled", "Post Processing"))
+                if (Settings::postProcessing().mEnabled)
                     mPostProcessor->enable();
                 else
                 {
@@ -1500,7 +1644,7 @@ namespace MWRender
     osg::Vec3f RenderingManager::getHalfExtents(const MWWorld::ConstPtr& object) const
     {
         osg::Vec3f halfExtents(0, 0, 0);
-        std::string modelName = object.getClass().getModel(object);
+        VFS::Path::Normalized modelName(object.getClass().getCorrectedModel(object));
         if (modelName.empty())
             return halfExtents;
 
@@ -1522,24 +1666,39 @@ namespace MWRender
 
     osg::BoundingBox RenderingManager::getCullSafeBoundingBox(const MWWorld::Ptr& ptr) const
     {
-        const std::string model = ptr.getClass().getModel(ptr);
-        if (model.empty())
+        if (ptr.isEmpty())
             return {};
 
-        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> rootNode = new SceneUtil::PositionAttitudeTransform;
-        // Hack even used by osg internally, osg's NodeVisitor won't accept const qualified nodes
-        rootNode->addChild(const_cast<osg::Node*>(mResourceSystem->getSceneManager()->getTemplate(model).get()));
+        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> rootNode = ptr.getRefData().getBaseNode();
 
-        const float refScale = ptr.getCellRef().getScale();
-        rootNode->setScale({ refScale, refScale, refScale });
-        rootNode->setPosition(osg::Vec3(0, 0, 0));
-
-        osg::ref_ptr<Animation> animation = nullptr;
-
-        if (ptr.getClass().isNpc())
+        // Recalculate bounds on the ptr's template when the object is not loaded or is loaded but paged
+        MWWorld::Scene* worldScene = MWBase::Environment::get().getWorldScene();
+        if (!rootNode || worldScene->isPagedRef(ptr))
         {
-            rootNode->setNodeMask(Mask_Actor);
-            animation = new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(rootNode), mResourceSystem);
+            const VFS::Path::Normalized model(ptr.getClass().getCorrectedModel(ptr));
+
+            if (model.empty())
+                return {};
+
+            rootNode = new SceneUtil::PositionAttitudeTransform;
+            // Hack even used by osg internally, osg's NodeVisitor won't accept const qualified nodes
+            rootNode->addChild(const_cast<osg::Node*>(mResourceSystem->getSceneManager()->getTemplate(model).get()));
+
+            const float refScale = ptr.getCellRef().getScale();
+            rootNode->setScale({ refScale, refScale, refScale });
+            const auto& rotation = ptr.getCellRef().getPosition().rot;
+            if (!ptr.getClass().isActor())
+                rootNode->setAttitude(osg::Quat(rotation[0], osg::Vec3(-1, 0, 0))
+                    * osg::Quat(rotation[1], osg::Vec3(0, -1, 0)) * osg::Quat(rotation[2], osg::Vec3(0, 0, -1)));
+            rootNode->setPosition(ptr.getCellRef().getPosition().asVec3());
+
+            osg::ref_ptr<Animation> animation = nullptr;
+
+            if (ptr.getClass().isNpc())
+            {
+                rootNode->setNodeMask(Mask_Actor);
+                animation = new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(rootNode), mResourceSystem);
+            }
         }
 
         SceneUtil::CullSafeBoundsVisitor computeBounds;
@@ -1644,7 +1803,7 @@ namespace MWRender
     {
         if (!ptr.isInCell() || !ptr.getCell()->isExterior() || !mObjectPaging)
             return;
-        const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
+        ESM::RefNum refnum = ptr.getCellRef().getRefNum();
         if (!refnum.hasContentFile())
             return;
         if (mObjectPaging->blacklistObject(type, refnum, ptr.getCellRef().getPosition().asVec3(),
@@ -1666,7 +1825,7 @@ namespace MWRender
             mObjectPaging->getPagedRefnums(activeGrid, out);
     }
 
-    void RenderingManager::setNavMeshMode(NavMeshMode value)
+    void RenderingManager::setNavMeshMode(Settings::NavMeshRenderMode value)
     {
         mNavMesh->setMode(value);
     }
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 0e2ece7de9..7e68f666a1 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -1,21 +1,21 @@
 #ifndef OPENMW_MWRENDER_RENDERINGMANAGER_H
 #define OPENMW_MWRENDER_RENDERINGMANAGER_H
 
-#include <osg/Camera>
-#include <osg/Light>
-#include <osg/ref_ptr>
-
-#include <components/settings/settings.hpp>
-
-#include <osgUtil/IncrementalCompileOperation>
-
-#include "navmeshmode.hpp"
 #include "objects.hpp"
 #include "renderinginterface.hpp"
 #include "rendermode.hpp"
 
+#include <components/settings/settings.hpp>
+#include <components/vfs/pathutil.hpp>
+
+#include <osg/Light>
+#include <osg/ref_ptr>
+
+#include <osgUtil/IncrementalCompileOperation>
+
 #include <deque>
 #include <memory>
+#include <span>
 #include <unordered_map>
 
 namespace osg
@@ -88,6 +88,7 @@ namespace MWRender
     class StateUpdater;
     class SharedUniformStateUpdater;
     class PerViewUniformStateUpdater;
+    class IntersectionVisitorWithIgnoreList;
 
     class EffectManager;
     class ScreenshotManager;
@@ -134,7 +135,6 @@ namespace MWRender
 
         void setAmbientColour(const osg::Vec4f& colour);
 
-        void skySetDate(int day, int month);
         int skyGetMasserPhase() const;
         int skyGetSecundaPhase() const;
         void skySetMoonColour(bool red);
@@ -166,7 +166,6 @@ namespace MWRender
 
         /// Take a screenshot of w*h onto the given image, not including the GUI.
         void screenshot(osg::Image* image, int w, int h);
-        bool screenshot360(osg::Image* image);
 
         struct RayResult
         {
@@ -178,8 +177,8 @@ namespace MWRender
             float mRatio;
         };
 
-        RayResult castRay(
-            const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors = false);
+        RayResult castRay(const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer,
+            bool ignoreActors = false, std::span<const MWWorld::Ptr> ignoreList = {});
 
         /// Return the object under the mouse cursor / crosshair position, given by nX and nY normalized screen
         /// coordinates, where (0,0) is the top left corner.
@@ -196,7 +195,7 @@ namespace MWRender
 
         SkyManager* getSkyManager();
 
-        void spawnEffect(const std::string& model, std::string_view texture, const osg::Vec3f& worldPosition,
+        void spawnEffect(VFS::Path::NormalizedView model, std::string_view texture, const osg::Vec3f& worldPosition,
             float scale = 1.f, bool isMagicVFX = true);
 
         /// Clear all savegame-specific data
@@ -275,13 +274,12 @@ namespace MWRender
 
         void setScreenRes(int width, int height);
 
-        void setNavMeshMode(NavMeshMode value);
+        void setNavMeshMode(Settings::NavMeshRenderMode value);
 
     private:
         void updateTextureFiltering();
         void updateAmbient();
         void setFogColor(const osg::Vec4f& color);
-        void updateThirdPersonViewMode();
 
         struct WorldspaceChunkMgr
         {
@@ -300,10 +298,10 @@ namespace MWRender
 
         const bool mSkyBlending;
 
-        osg::ref_ptr<osgUtil::IntersectionVisitor> getIntersectionVisitor(
-            osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors);
+        osg::ref_ptr<osgUtil::IntersectionVisitor> getIntersectionVisitor(osgUtil::Intersector* intersector,
+            bool ignorePlayer, bool ignoreActors, std::span<const MWWorld::Ptr> ignoreList = {});
 
-        osg::ref_ptr<osgUtil::IntersectionVisitor> mIntersectionVisitor;
+        osg::ref_ptr<IntersectionVisitorWithIgnoreList> mIntersectionVisitor;
 
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
@@ -336,14 +334,13 @@ namespace MWRender
         osg::ref_ptr<NpcAnimation> mPlayerAnimation;
         osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mPlayerNode;
         std::unique_ptr<Camera> mCamera;
-        std::unique_ptr<Debug::DebugDrawer> mDebugDraw;
+        osg::ref_ptr<Debug::DebugDrawer> mDebugDraw;
 
         osg::ref_ptr<StateUpdater> mStateUpdater;
         osg::ref_ptr<SharedUniformStateUpdater> mSharedUniformStateUpdater;
         osg::ref_ptr<PerViewUniformStateUpdater> mPerViewUniformStateUpdater;
 
         osg::Vec4f mAmbientColor;
-        float mMinimumAmbientLuminance;
         float mNightEyeFactor;
 
         float mNearClip;
diff --git a/apps/openmw/mwrender/ripples.cpp b/apps/openmw/mwrender/ripples.cpp
index 191ff0e714..bb8248217a 100644
--- a/apps/openmw/mwrender/ripples.cpp
+++ b/apps/openmw/mwrender/ripples.cpp
@@ -10,6 +10,7 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/color.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/glextensions.hpp>
 #include <components/shader/shadermanager.hpp>
 
 #include "../mwworld/ptr.hpp"
@@ -43,9 +44,9 @@ namespace MWRender
         mUseCompute = false;
 #else
         constexpr float minimumGLVersionRequiredForCompute = 4.4;
-        osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
-        mUseCompute = exts->glVersion >= minimumGLVersionRequiredForCompute
-            && exts->glslLanguageVersion >= minimumGLVersionRequiredForCompute;
+        osg::GLExtensions& exts = SceneUtil::getGLExtensions();
+        mUseCompute = exts.glVersion >= minimumGLVersionRequiredForCompute
+            && exts.glslLanguageVersion >= minimumGLVersionRequiredForCompute;
 #endif
 
         if (mUseCompute)
@@ -63,7 +64,7 @@ namespace MWRender
             stateset->addUniform(new osg::Uniform("offset", osg::Vec2f()));
             stateset->addUniform(new osg::Uniform("positionCount", 0));
             stateset->addUniform(new osg::Uniform(osg::Uniform::Type::FLOAT_VEC3, "positions", 100));
-            stateset->setAttributeAndModes(new osg::Viewport(0, 0, RipplesSurface::mRTTSize, RipplesSurface::mRTTSize));
+            stateset->setAttributeAndModes(new osg::Viewport(0, 0, RipplesSurface::sRTTSize, RipplesSurface::sRTTSize));
             mState[i].mStateset = stateset;
         }
 
@@ -71,14 +72,13 @@ namespace MWRender
         {
             osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
             texture->setSourceFormat(GL_RGBA);
-            texture->setSourceType(GL_HALF_FLOAT);
             texture->setInternalFormat(GL_RGBA16F);
             texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture::LINEAR);
             texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture::LINEAR);
             texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_BORDER);
             texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_BORDER);
             texture->setBorderColor(osg::Vec4(0, 0, 0, 0));
-            texture->setTextureSize(mRTTSize, mRTTSize);
+            texture->setTextureSize(sRTTSize, sRTTSize);
 
             mTextures[i] = texture;
 
@@ -99,14 +99,14 @@ namespace MWRender
     {
         auto& shaderManager = mResourceSystem->getSceneManager()->getShaderManager();
 
-        Shader::ShaderManager::DefineMap defineMap = { { "ripple_map_size", std::to_string(mRTTSize) + ".0" } };
+        Shader::ShaderManager::DefineMap defineMap = { { "rippleMapSize", std::to_string(sRTTSize) + ".0" } };
 
         osg::ref_ptr<osg::Shader> vertex = shaderManager.getShader("fullscreen_tri.vert", {}, osg::Shader::VERTEX);
 
         mProgramBlobber = shaderManager.getProgram(
             vertex, shaderManager.getShader("ripples_blobber.frag", defineMap, osg::Shader::FRAGMENT));
         mProgramSimulation = shaderManager.getProgram(
-            vertex, shaderManager.getShader("ripples_simulate.frag", defineMap, osg::Shader::FRAGMENT));
+            std::move(vertex), shaderManager.getShader("ripples_simulate.frag", defineMap, osg::Shader::FRAGMENT));
     }
 
     void RipplesSurface::setupComputePipeline()
@@ -119,58 +119,83 @@ namespace MWRender
             nullptr, shaderManager.getShader("core/ripples_simulate.comp", {}, osg::Shader::COMPUTE));
     }
 
+    void RipplesSurface::updateState(const osg::FrameStamp& frameStamp, State& state)
+    {
+        state.mPaused = mPaused;
+
+        if (mPaused)
+            return;
+
+        constexpr double updateFrequency = 60.0;
+        constexpr double updatePeriod = 1.0 / updateFrequency;
+
+        const double simulationTime = frameStamp.getSimulationTime();
+        const double frameDuration = simulationTime - mLastSimulationTime;
+        mLastSimulationTime = simulationTime;
+
+        mRemainingWaveTime += frameDuration;
+        const double ticks = std::floor(mRemainingWaveTime * updateFrequency);
+        mRemainingWaveTime -= ticks * updatePeriod;
+
+        if (ticks == 0)
+        {
+            state.mPaused = true;
+            return;
+        }
+
+        const MWWorld::Ptr player = MWMechanics::getPlayer();
+        const ESM::Position& playerPos = player.getRefData().getPosition();
+
+        mCurrentPlayerPos = osg::Vec2f(
+            std::floor(playerPos.pos[0] / sWorldScaleFactor), std::floor(playerPos.pos[1] / sWorldScaleFactor));
+        const osg::Vec2f offset = mCurrentPlayerPos - mLastPlayerPos;
+        mLastPlayerPos = mCurrentPlayerPos;
+
+        state.mStateset->getUniform("positionCount")->set(static_cast<int>(mPositionCount));
+        state.mStateset->getUniform("offset")->set(offset);
+
+        osg::Uniform* const positions = state.mStateset->getUniform("positions");
+
+        for (std::size_t i = 0; i < mPositionCount; ++i)
+        {
+            osg::Vec3f pos = mPositions[i]
+                - osg::Vec3f(mCurrentPlayerPos.x() * sWorldScaleFactor, mCurrentPlayerPos.y() * sWorldScaleFactor, 0.0)
+                + osg::Vec3f(sRTTSize * sWorldScaleFactor / 2, sRTTSize * sWorldScaleFactor / 2, 0.0);
+            pos /= sWorldScaleFactor;
+            positions->setElement(i, pos);
+        }
+        positions->dirty();
+
+        mPositionCount = 0;
+    }
+
     void RipplesSurface::traverse(osg::NodeVisitor& nv)
     {
-        if (!nv.getFrameStamp())
+        const osg::FrameStamp* const frameStamp = nv.getFrameStamp();
+
+        if (frameStamp == nullptr)
             return;
 
         if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
-        {
-            size_t frameId = nv.getFrameStamp()->getFrameNumber() % 2;
+            updateState(*frameStamp, mState[frameStamp->getFrameNumber() % 2]);
 
-            const ESM::Position& player = MWMechanics::getPlayer().getRefData().getPosition();
-
-            mCurrentPlayerPos = osg::Vec2f(
-                std::floor(player.pos[0] / mWorldScaleFactor), std::floor(player.pos[1] / mWorldScaleFactor));
-            osg::Vec2f offset = mCurrentPlayerPos - mLastPlayerPos;
-            mLastPlayerPos = mCurrentPlayerPos;
-            mState[frameId].mPaused = mPaused;
-            mState[frameId].mOffset = offset;
-            mState[frameId].mStateset->getUniform("positionCount")->set(static_cast<int>(mPositionCount));
-            mState[frameId].mStateset->getUniform("offset")->set(offset);
-
-            auto* positions = mState[frameId].mStateset->getUniform("positions");
-
-            for (size_t i = 0; i < mPositionCount; ++i)
-            {
-                osg::Vec3f pos = mPositions[i]
-                    - osg::Vec3f(
-                        mCurrentPlayerPos.x() * mWorldScaleFactor, mCurrentPlayerPos.y() * mWorldScaleFactor, 0.0)
-                    + osg::Vec3f(mRTTSize * mWorldScaleFactor / 2, mRTTSize * mWorldScaleFactor / 2, 0.0);
-                pos /= mWorldScaleFactor;
-                positions->setElement(i, pos);
-            }
-            positions->dirty();
-
-            mPositionCount = 0;
-        }
         osg::Geometry::traverse(nv);
     }
 
     void RipplesSurface::drawImplementation(osg::RenderInfo& renderInfo) const
     {
         osg::State& state = *renderInfo.getState();
-        osg::GLExtensions& ext = *state.get<osg::GLExtensions>();
-        size_t contextID = state.getContextID();
-
-        size_t currentFrame = state.getFrameStamp()->getFrameNumber() % 2;
+        const std::size_t currentFrame = state.getFrameStamp()->getFrameNumber() % 2;
         const State& frameState = mState[currentFrame];
         if (frameState.mPaused)
         {
             return;
         }
 
-        auto bindImage = [contextID, &state, &ext](osg::Texture2D* texture, GLuint index, GLenum access) {
+        osg::GLExtensions& ext = *state.get<osg::GLExtensions>();
+        const std::size_t contextID = state.getContextID();
+
+        const auto bindImage = [&](osg::Texture2D* texture, GLuint index, GLenum access) {
             osg::Texture::TextureObject* to = texture->getTextureObject(contextID);
             if (!to || texture->isDirty(contextID))
             {
@@ -180,53 +205,55 @@ namespace MWRender
             ext.glBindImageTexture(index, to->id(), 0, GL_FALSE, 0, access, GL_RGBA16F);
         };
 
-        // Run simulation at a fixed rate independent on current FPS
-        // FIXME: when we skip frames we need to preserve positions. this doesn't work now
-        size_t ticks = 1;
-
         // PASS: Blot in all ripple spawners
-        mProgramBlobber->apply(state);
-        state.apply(frameState.mStateset);
-
-        for (size_t i = 0; i < ticks; i++)
+        state.pushStateSet(frameState.mStateset);
+        state.apply();
+        state.applyAttribute(mProgramBlobber);
+        for (const auto& [name, stack] : state.getUniformMap())
         {
-            if (mUseCompute)
-            {
-                bindImage(mTextures[1], 0, GL_WRITE_ONLY_ARB);
-                bindImage(mTextures[0], 1, GL_READ_ONLY_ARB);
+            if (!stack.uniformVec.empty())
+                state.getLastAppliedProgramObject()->apply(*(stack.uniformVec.back().first));
+        }
 
-                ext.glDispatchCompute(mRTTSize / 16, mRTTSize / 16, 1);
-                ext.glMemoryBarrier(GL_ALL_BARRIER_BITS);
-            }
-            else
-            {
-                mFBOs[1]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
-                state.applyTextureAttribute(0, mTextures[0]);
-                osg::Geometry::drawImplementation(renderInfo);
-            }
+        if (mUseCompute)
+        {
+            bindImage(mTextures[1], 0, GL_WRITE_ONLY_ARB);
+            bindImage(mTextures[0], 1, GL_READ_ONLY_ARB);
+
+            ext.glDispatchCompute(sRTTSize / 16, sRTTSize / 16, 1);
+            ext.glMemoryBarrier(GL_ALL_BARRIER_BITS);
+        }
+        else
+        {
+            mFBOs[1]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            state.applyTextureAttribute(0, mTextures[0]);
+            osg::Geometry::drawImplementation(renderInfo);
         }
 
         // PASS: Wave simulation
-        mProgramSimulation->apply(state);
-        state.apply(frameState.mStateset);
-
-        for (size_t i = 0; i < ticks; i++)
+        state.applyAttribute(mProgramSimulation);
+        for (const auto& [name, stack] : state.getUniformMap())
         {
-            if (mUseCompute)
-            {
-                bindImage(mTextures[0], 0, GL_WRITE_ONLY_ARB);
-                bindImage(mTextures[1], 1, GL_READ_ONLY_ARB);
-
-                ext.glDispatchCompute(mRTTSize / 16, mRTTSize / 16, 1);
-                ext.glMemoryBarrier(GL_ALL_BARRIER_BITS);
-            }
-            else
-            {
-                mFBOs[0]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
-                state.applyTextureAttribute(0, mTextures[1]);
-                osg::Geometry::drawImplementation(renderInfo);
-            }
+            if (!stack.uniformVec.empty())
+                state.getLastAppliedProgramObject()->apply(*(stack.uniformVec.back().first));
         }
+
+        if (mUseCompute)
+        {
+            bindImage(mTextures[0], 0, GL_WRITE_ONLY_ARB);
+            bindImage(mTextures[1], 1, GL_READ_ONLY_ARB);
+
+            ext.glDispatchCompute(sRTTSize / 16, sRTTSize / 16, 1);
+            ext.glMemoryBarrier(GL_ALL_BARRIER_BITS);
+        }
+        else
+        {
+            mFBOs[0]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            state.applyTextureAttribute(0, mTextures[1]);
+            osg::Geometry::drawImplementation(renderInfo);
+        }
+
+        state.popStateSet();
     }
 
     osg::Texture* RipplesSurface::getColorTexture() const
@@ -270,7 +297,7 @@ namespace MWRender
         setReferenceFrame(osg::Camera::ABSOLUTE_RF);
         setNodeMask(Mask_RenderToTexture);
         setClearMask(GL_NONE);
-        setViewport(0, 0, RipplesSurface::mRTTSize, RipplesSurface::mRTTSize);
+        setViewport(0, 0, RipplesSurface::sRTTSize, RipplesSurface::sRTTSize);
         addChild(mRipples);
         setCullingActive(false);
         setImplicitBufferAttachmentMask(0, 0);
diff --git a/apps/openmw/mwrender/ripples.hpp b/apps/openmw/mwrender/ripples.hpp
index 0d5b055eb5..e355b16ecd 100644
--- a/apps/openmw/mwrender/ripples.hpp
+++ b/apps/openmw/mwrender/ripples.hpp
@@ -46,28 +46,30 @@ namespace MWRender
 
         void releaseGLObjects(osg::State* state) const override;
 
-        static constexpr size_t mRTTSize = 1024;
+        static constexpr size_t sRTTSize = 1024;
         // e.g. texel to cell unit ratio
-        static constexpr float mWorldScaleFactor = 2.5;
-
-        Resource::ResourceSystem* mResourceSystem;
+        static constexpr float sWorldScaleFactor = 2.5;
 
+    private:
         struct State
         {
-            osg::Vec2f mOffset;
-            osg::ref_ptr<osg::StateSet> mStateset;
             bool mPaused = true;
+            osg::ref_ptr<osg::StateSet> mStateset;
         };
 
+        void setupFragmentPipeline();
+
+        void setupComputePipeline();
+
+        inline void updateState(const osg::FrameStamp& frameStamp, State& state);
+
+        Resource::ResourceSystem* mResourceSystem;
+
         size_t mPositionCount = 0;
         std::array<osg::Vec3f, 100> mPositions;
 
         std::array<State, 2> mState;
 
-    private:
-        void setupFragmentPipeline();
-        void setupComputePipeline();
-
         osg::Vec2f mCurrentPlayerPos;
         osg::Vec2f mLastPlayerPos;
 
@@ -79,6 +81,9 @@ namespace MWRender
 
         bool mPaused = false;
         bool mUseCompute = false;
+
+        double mLastSimulationTime = 0;
+        double mRemainingWaveTime = 0;
     };
 
     class Ripples : public osg::Camera
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index abfb7ba9cd..88a620efd0 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -41,8 +41,8 @@ namespace
         {
             std::ostringstream texname;
             texname << "textures/water/" << tex << std::setw(2) << std::setfill('0') << i << ".dds";
-            osg::ref_ptr<osg::Texture2D> tex2(
-                new osg::Texture2D(resourceSystem->getImageManager()->getImage(texname.str())));
+            const VFS::Path::Normalized path(texname.str());
+            osg::ref_ptr<osg::Texture2D> tex2(new osg::Texture2D(resourceSystem->getImageManager()->getImage(path)));
             tex2->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             tex2->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
             resourceSystem->getSceneManager()->applyFilterSettings(tex2);
@@ -80,6 +80,25 @@ namespace
 
         node->setStateSet(stateset);
     }
+
+    int findOldestParticleAlive(const osgParticle::ParticleSystem* partsys)
+    {
+        int oldest = -1;
+        float oldestAge = 0.f;
+        for (int i = 0; i < partsys->numParticles(); ++i)
+        {
+            const osgParticle::Particle* particle = partsys->getParticle(i);
+            if (!particle->isAlive())
+                continue;
+            const float age = particle->getAge();
+            if (oldest == -1 || age > oldestAge)
+            {
+                oldest = i;
+                oldestAge = age;
+            }
+        }
+        return oldest;
+    }
 }
 
 namespace MWRender
@@ -87,6 +106,7 @@ namespace MWRender
 
     RippleSimulation::RippleSimulation(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
         : mParent(parent)
+        , mMaxNumberRipples(Fallback::Map::getInt("Water_MaxNumberRipples"))
     {
         mParticleSystem = new osgParticle::ParticleSystem;
 
@@ -159,9 +179,6 @@ namespace MWRender
 
                 currentPos.z() = mParticleNode->getPosition().z();
 
-                if (mParticleSystem->numParticles() - mParticleSystem->numDeadParticles() > 500)
-                    continue; // TODO: remove the oldest particle to make room?
-
                 emitRipple(currentPos);
             }
         }
@@ -226,7 +243,19 @@ namespace MWRender
             }
             else
             {
+                if (mMaxNumberRipples <= 0)
+                    return;
+
                 osgParticle::ParticleSystem::ScopedWriteLock lock(*mParticleSystem->getReadWriteMutex());
+                if (mParticleSystem->numParticles() - mParticleSystem->numDeadParticles() > mMaxNumberRipples)
+                {
+                    // osgParticle::ParticleSystem design requires this to be O(N)
+                    // However, the number of particles we'll have to go through is not large
+                    // If the user makes the limit absurd and manages to actually hit it this could be a problem
+                    const int oldest = findOldestParticleAlive(mParticleSystem);
+                    if (oldest != -1)
+                        mParticleSystem->reuseParticle(oldest);
+                }
                 osgParticle::Particle* p = mParticleSystem->createParticle(nullptr);
                 p->setPosition(osg::Vec3f(pos.x(), pos.y(), 0.f));
                 p->setAngle(osg::Vec3f(0, 0, Misc::Rng::rollProbability() * osg::PI * 2 - osg::PI));
diff --git a/apps/openmw/mwrender/ripplesimulation.hpp b/apps/openmw/mwrender/ripplesimulation.hpp
index 1f09797bf4..10b47f5679 100644
--- a/apps/openmw/mwrender/ripplesimulation.hpp
+++ b/apps/openmw/mwrender/ripplesimulation.hpp
@@ -74,6 +74,8 @@ namespace MWRender
         std::vector<Emitter> mEmitters;
 
         Ripples* mRipples = nullptr;
+
+        int mMaxNumberRipples;
     };
 
 }
diff --git a/apps/openmw/mwrender/rotatecontroller.cpp b/apps/openmw/mwrender/rotatecontroller.cpp
index d7f8bb902c..0e84087710 100644
--- a/apps/openmw/mwrender/rotatecontroller.cpp
+++ b/apps/openmw/mwrender/rotatecontroller.cpp
@@ -1,6 +1,7 @@
 #include "rotatecontroller.hpp"
 
 #include <osg/MatrixTransform>
+#include <osgAnimation/Bone>
 
 namespace MWRender
 {
@@ -34,7 +35,16 @@ namespace MWRender
             return;
         }
         osg::Matrix matrix = node->getMatrix();
-        osg::Quat worldOrient = getWorldOrientation(node);
+
+        osg::Quat worldOrient;
+        osg::NodePathList nodepaths = node->getParentalNodePaths(mRelativeTo);
+
+        if (!nodepaths.empty())
+        {
+            osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
+            worldOrient = worldMat.getRotate();
+        }
+
         osg::Quat worldOrientInverse = worldOrient.inverse();
 
         osg::Quat orient = worldOrient * mRotate * worldOrientInverse * matrix.getRotate();
@@ -43,20 +53,17 @@ namespace MWRender
 
         node->setMatrix(matrix);
 
+        // If we are linked to a bone we must call setMatrixInSkeletonSpace
+        osgAnimation::Bone* b = dynamic_cast<osgAnimation::Bone*>(node);
+        if (b)
+        {
+            osgAnimation::Bone* parent = b->getBoneParent();
+            if (parent)
+                matrix *= parent->getMatrixInSkeletonSpace();
+
+            b->setMatrixInSkeletonSpace(matrix);
+        }
+
         traverse(node, nv);
     }
-
-    osg::Quat RotateController::getWorldOrientation(osg::Node* node)
-    {
-        // this could be optimized later, we just need the world orientation, not the full matrix
-        osg::NodePathList nodepaths = node->getParentalNodePaths(mRelativeTo);
-        osg::Quat worldOrient;
-        if (!nodepaths.empty())
-        {
-            osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
-            worldOrient = worldMat.getRotate();
-        }
-        return worldOrient;
-    }
-
 }
diff --git a/apps/openmw/mwrender/rotatecontroller.hpp b/apps/openmw/mwrender/rotatecontroller.hpp
index 87bf0adfe1..3d9f44c6a3 100644
--- a/apps/openmw/mwrender/rotatecontroller.hpp
+++ b/apps/openmw/mwrender/rotatecontroller.hpp
@@ -24,11 +24,15 @@ namespace MWRender
         void setOffset(const osg::Vec3f& offset);
         void setRotate(const osg::Quat& rotate);
 
+        const osg::Vec3f& getOffset() const { return mOffset; }
+
+        const osg::Quat& getRotate() const { return mRotate; }
+
+        osg::Node* getRelativeTo() const { return mRelativeTo; }
+
         void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv);
 
     protected:
-        osg::Quat getWorldOrientation(osg::Node* node);
-
         bool mEnabled;
         osg::Vec3f mOffset;
         osg::Quat mRotate;
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 336a321cf0..2c86a70f23 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -3,39 +3,16 @@
 #include <condition_variable>
 #include <mutex>
 
-#include <osg/ImageUtils>
-#include <osg/ShapeDrawable>
-#include <osg/Texture2D>
-#include <osg/TextureCubeMap>
-
-#include <components/misc/strings/algorithm.hpp>
-#include <components/misc/strings/conversion.hpp>
-#include <components/resource/resourcesystem.hpp>
-#include <components/resource/scenemanager.hpp>
-#include <components/sceneutil/depth.hpp>
-#include <components/settings/values.hpp>
-#include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
-#include "../mwgui/loadingscreen.hpp"
+#include "../mwbase/world.hpp"
 
 #include "postprocessor.hpp"
-#include "util.hpp"
-#include "vismask.hpp"
-#include "water.hpp"
 
 namespace MWRender
 {
-    enum Screenshot360Type
-    {
-        Spherical,
-        Cylindrical,
-        Planet,
-        RawCubemap
-    };
 
     class NotifyDrawCompletedCallback : public osg::Camera::DrawCallback
     {
@@ -102,24 +79,6 @@ namespace MWRender
             int width = screenW - leftPadding * 2;
             int height = screenH - topPadding * 2;
 
-            // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer. Also ensure
-            // that the readbuffer is set correctly with rendeirng to FBO. glReadPixel() cannot read from multisampled
-            // targets
-            PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
-            osg::GLExtensions* ext = osg::GLExtensions::Get(renderInfo.getContextID(), false);
-
-            if (ext)
-            {
-                size_t frameId = renderInfo.getState()->getFrameStamp()->getFrameNumber() % 2;
-                osg::FrameBufferObject* fbo = nullptr;
-
-                if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
-                    fbo = postProcessor->getFbo(PostProcessor::FBO_Primary, frameId);
-
-                if (fbo)
-                    fbo->apply(*renderInfo.getState(), osg::FrameBufferObject::READ_FRAMEBUFFER);
-            }
-
             mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);
             mImage->scaleImage(mWidth, mHeight, 1);
         }
@@ -130,14 +89,9 @@ namespace MWRender
         osg::ref_ptr<osg::Image> mImage;
     };
 
-    ScreenshotManager::ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
-        osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water)
+    ScreenshotManager::ScreenshotManager(osgViewer::Viewer* viewer)
         : mViewer(viewer)
-        , mRootNode(std::move(rootNode))
-        , mSceneRoot(std::move(sceneRoot))
         , mDrawCompleteCallback(new NotifyDrawCompletedCallback)
-        , mResourceSystem(resourceSystem)
-        , mWater(water)
     {
     }
 
@@ -145,224 +99,25 @@ namespace MWRender
 
     void ScreenshotManager::screenshot(osg::Image* image, int w, int h)
     {
-        osg::Camera* camera = mViewer->getCamera();
+        osg::Camera* camera = MWBase::Environment::get().getWorld()->getPostProcessor()->getHUDCamera();
         osg::ref_ptr<osg::Drawable> tempDrw = new osg::Drawable;
         tempDrw->setDrawCallback(new ReadImageFromFramebufferCallback(image, w, h));
         tempDrw->setCullingActive(false);
         tempDrw->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin",
             osg::StateSet::USE_RENDERBIN_DETAILS); // so its after all scene bins but before POST_RENDER gui camera
         camera->addChild(tempDrw);
-        traversalsAndWait(mViewer->getFrameStamp()->getFrameNumber());
+
+        // Ref https://gitlab.com/OpenMW/openmw/-/issues/6013
+        mDrawCompleteCallback->reset(mViewer->getFrameStamp()->getFrameNumber());
+        mViewer->getCamera()->setFinalDrawCallback(mDrawCompleteCallback);
+        mViewer->eventTraversal();
+        mViewer->updateTraversal();
+        mViewer->renderingTraversals();
+        mDrawCompleteCallback->waitTillDone();
+
         // now that we've "used up" the current frame, get a fresh frame number for the next frame() following after the
         // screenshot is completed
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
         camera->removeChild(tempDrw);
     }
-
-    bool ScreenshotManager::screenshot360(osg::Image* image)
-    {
-        int screenshotW = mViewer->getCamera()->getViewport()->width();
-        int screenshotH = mViewer->getCamera()->getViewport()->height();
-        Screenshot360Type screenshotMapping = Spherical;
-
-        const std::string& settingStr = Settings::Manager::getString("screenshot type", "Video");
-        std::vector<std::string_view> settingArgs;
-        Misc::StringUtils::split(settingStr, settingArgs);
-
-        if (settingArgs.size() > 0)
-        {
-            std::string_view typeStrings[4] = { "spherical", "cylindrical", "planet", "cubemap" };
-            bool found = false;
-
-            for (int i = 0; i < 4; ++i)
-            {
-                if (settingArgs[0] == typeStrings[i])
-                {
-                    screenshotMapping = static_cast<Screenshot360Type>(i);
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found)
-            {
-                Log(Debug::Warning) << "Wrong screenshot type: " << settingArgs[0] << ".";
-                return false;
-            }
-        }
-
-        // planet mapping needs higher resolution
-        int cubeSize = screenshotMapping == Planet ? screenshotW : screenshotW / 2;
-
-        if (settingArgs.size() > 1)
-        {
-            screenshotW = std::min(10000, Misc::StringUtils::toNumeric<int>(settingArgs[1], 0));
-        }
-
-        if (settingArgs.size() > 2)
-        {
-            screenshotH = std::min(10000, Misc::StringUtils::toNumeric<int>(settingArgs[2], 0));
-        }
-
-        if (settingArgs.size() > 3)
-        {
-            cubeSize = std::min(5000, Misc::StringUtils::toNumeric<int>(settingArgs[3], 0));
-        }
-
-        bool rawCubemap = screenshotMapping == RawCubemap;
-
-        if (rawCubemap)
-            screenshotW = cubeSize * 6; // the image will consist of 6 cube sides in a row
-        else if (screenshotMapping == Planet)
-            screenshotH = screenshotW; // use square resolution for planet mapping
-
-        std::vector<osg::ref_ptr<osg::Image>> images;
-        images.reserve(6);
-
-        for (int i = 0; i < 6; ++i)
-            images.push_back(new osg::Image);
-
-        osg::Vec3 directions[6]
-            = { rawCubemap ? osg::Vec3(1, 0, 0) : osg::Vec3(0, 0, 1), osg::Vec3(0, 0, -1), osg::Vec3(-1, 0, 0),
-                  rawCubemap ? osg::Vec3(0, 0, 1) : osg::Vec3(1, 0, 0), osg::Vec3(0, 1, 0), osg::Vec3(0, -1, 0) };
-
-        double rotations[] = { -osg::PI / 2.0, osg::PI / 2.0, osg::PI, 0, osg::PI / 2.0, osg::PI / 2.0 };
-
-        for (int i = 0; i < 6; ++i) // for each cubemap side
-        {
-            osg::Matrixd transform = osg::Matrixd::rotate(osg::Vec3(0, 0, -1), directions[i]);
-
-            if (!rawCubemap)
-                transform *= osg::Matrixd::rotate(rotations[i], osg::Vec3(0, 0, -1));
-
-            osg::Image* sideImage = images[i].get();
-            makeCubemapScreenshot(sideImage, cubeSize, cubeSize, transform);
-
-            if (!rawCubemap)
-                sideImage->flipHorizontal();
-        }
-
-        if (rawCubemap) // for raw cubemap don't run on GPU, just merge the images
-        {
-            image->allocateImage(
-                cubeSize * 6, cubeSize, images[0]->r(), images[0]->getPixelFormat(), images[0]->getDataType());
-
-            for (int i = 0; i < 6; ++i)
-                osg::copyImage(images[i].get(), 0, 0, 0, images[i]->s(), images[i]->t(), images[i]->r(), image,
-                    i * cubeSize, 0, 0);
-
-            return true;
-        }
-
-        // run on GPU now:
-        osg::ref_ptr<osg::TextureCubeMap> cubeTexture(new osg::TextureCubeMap);
-        cubeTexture->setResizeNonPowerOfTwoHint(false);
-
-        cubeTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::NEAREST);
-        cubeTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::NEAREST);
-
-        cubeTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        cubeTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-
-        for (int i = 0; i < 6; ++i)
-            cubeTexture->setImage(i, images[i].get());
-
-        osg::ref_ptr<osg::Camera> screenshotCamera(new osg::Camera);
-        osg::ref_ptr<osg::ShapeDrawable> quad(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0, 0, 0), 2.0)));
-
-        osg::ref_ptr<osg::StateSet> stateset = quad->getOrCreateStateSet();
-
-        Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
-        stateset->setAttributeAndModes(shaderMgr.getProgram("360"), osg::StateAttribute::ON);
-
-        stateset->addUniform(new osg::Uniform("cubeMap", 0));
-        stateset->addUniform(new osg::Uniform("mapping", screenshotMapping));
-        stateset->setTextureAttributeAndModes(0, cubeTexture, osg::StateAttribute::ON);
-
-        screenshotCamera->addChild(quad);
-
-        renderCameraToImage(screenshotCamera, image, screenshotW, screenshotH);
-
-        return true;
-    }
-
-    void ScreenshotManager::traversalsAndWait(unsigned int frame)
-    {
-        // Ref https://gitlab.com/OpenMW/openmw/-/issues/6013
-        mDrawCompleteCallback->reset(frame);
-        mViewer->getCamera()->setFinalDrawCallback(mDrawCompleteCallback);
-
-        mViewer->eventTraversal();
-        mViewer->updateTraversal();
-        mViewer->renderingTraversals();
-        mDrawCompleteCallback->waitTillDone();
-    }
-
-    void ScreenshotManager::renderCameraToImage(osg::Camera* camera, osg::Image* image, int w, int h)
-    {
-        camera->setNodeMask(Mask_RenderToTexture);
-        camera->attach(osg::Camera::COLOR_BUFFER, image);
-        camera->setRenderOrder(osg::Camera::PRE_RENDER);
-        camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
-        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
-        camera->setViewport(0, 0, w, h);
-
-        SceneUtil::setCameraClearDepth(camera);
-
-        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D);
-        texture->setInternalFormat(GL_RGB);
-        texture->setTextureSize(w, h);
-        texture->setResizeNonPowerOfTwoHint(false);
-        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        camera->attach(osg::Camera::COLOR_BUFFER, texture);
-
-        image->setDataType(GL_UNSIGNED_BYTE);
-        image->setPixelFormat(texture->getInternalFormat());
-
-        mRootNode->addChild(camera);
-
-        MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOn(false);
-
-        // The draw needs to complete before we can copy back our image.
-        traversalsAndWait(0);
-
-        MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOff();
-
-        // now that we've "used up" the current frame, get a fresh framenumber for the next frame() following after the
-        // screenshot is completed
-        mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
-
-        camera->removeChildren(0, camera->getNumChildren());
-        mRootNode->removeChild(camera);
-    }
-
-    void ScreenshotManager::makeCubemapScreenshot(osg::Image* image, int w, int h, const osg::Matrixd& cameraTransform)
-    {
-        osg::ref_ptr<osg::Camera> rttCamera(new osg::Camera);
-        const float nearClip = Settings::camera().mNearClip;
-        const float viewDistance = Settings::camera().mViewingDistance;
-        // each cubemap side sees 90 degrees
-        if (SceneUtil::AutoDepth::isReversed())
-            rttCamera->setProjectionMatrix(
-                SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(90.0, w / float(h), nearClip));
-        else
-            rttCamera->setProjectionMatrixAsPerspective(90.0, w / float(h), nearClip, viewDistance);
-        rttCamera->setViewMatrix(mViewer->getCamera()->getViewMatrix() * cameraTransform);
-
-        rttCamera->setUpdateCallback(new NoTraverseCallback);
-        rttCamera->addChild(mSceneRoot);
-
-        rttCamera->addChild(mWater->getReflectionNode());
-        rttCamera->addChild(mWater->getRefractionNode());
-
-        rttCamera->setCullMask(
-            MWBase::Environment::get().getWindowManager()->getCullMask() & ~(Mask_GUI | Mask_FirstPerson));
-
-        rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
-        renderCameraToImage(rttCamera.get(), image, w, h);
-    }
 }
diff --git a/apps/openmw/mwrender/screenshotmanager.hpp b/apps/openmw/mwrender/screenshotmanager.hpp
index 72e5b91637..f41ccf0045 100644
--- a/apps/openmw/mwrender/screenshotmanager.hpp
+++ b/apps/openmw/mwrender/screenshotmanager.hpp
@@ -1,45 +1,25 @@
 #ifndef MWRENDER_SCREENSHOTMANAGER_H
 #define MWRENDER_SCREENSHOTMANAGER_H
 
-#include <memory>
-
-#include <osg/Group>
 #include <osg/ref_ptr>
 
 #include <osgViewer/Viewer>
 
-namespace Resource
-{
-    class ResourceSystem;
-}
-
 namespace MWRender
 {
-    class Water;
     class NotifyDrawCompletedCallback;
 
     class ScreenshotManager
     {
     public:
-        ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
-            osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water);
+        ScreenshotManager(osgViewer::Viewer* viewer);
         ~ScreenshotManager();
 
         void screenshot(osg::Image* image, int w, int h);
-        bool screenshot360(osg::Image* image);
 
     private:
         osg::ref_ptr<osgViewer::Viewer> mViewer;
-        osg::ref_ptr<osg::Group> mRootNode;
-        osg::ref_ptr<osg::Group> mSceneRoot;
         osg::ref_ptr<NotifyDrawCompletedCallback> mDrawCompleteCallback;
-        Resource::ResourceSystem* mResourceSystem;
-        Water* mWater;
-
-        void traversalsAndWait(unsigned int frame);
-        void renderCameraToImage(osg::Camera* camera, osg::Image* image, int w, int h);
-        void makeCubemapScreenshot(
-            osg::Image* image, int w, int h, const osg::Matrixd& cameraTransform = osg::Matrixd());
     };
 }
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index d2f725c4b8..1cc8cc0d3e 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -35,6 +35,7 @@
 
 #include "renderbin.hpp"
 #include "skyutil.hpp"
+#include "util.hpp"
 #include "vismask.hpp"
 
 namespace
@@ -205,7 +206,8 @@ namespace
     {
     public:
         SkyRTT(osg::Vec2f size, osg::Group* earlyRenderBinRoot)
-            : RTTNode(static_cast<int>(size.x()), static_cast<int>(size.y()), 0, false, 1, StereoAwareness::Aware)
+            : RTTNode(static_cast<int>(size.x()), static_cast<int>(size.y()), 0, false, 1, StereoAwareness::Aware,
+                MWRender::shouldAddMSAAIntermediateTarget())
             , mEarlyRenderBinRoot(earlyRenderBinRoot)
         {
             setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
@@ -218,7 +220,7 @@ namespace
             camera->setNodeMask(MWRender::Mask_RenderToTexture);
             camera->setCullMask(MWRender::Mask_Sky);
             camera->addChild(mEarlyRenderBinRoot);
-            SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+            SceneUtil::ShadowManager::instance().disableShadowsForStateSet(*camera->getOrCreateStateSet());
         }
 
     private:
@@ -236,10 +238,8 @@ namespace MWRender
         , mAtmosphereNightRoll(0.f)
         , mCreated(false)
         , mIsStorm(false)
-        , mDay(0)
-        , mMonth(0)
+        , mTimescaleClouds(Fallback::Map::getBool("Weather_Timescale_Clouds"))
         , mCloudAnimationTimer(0.f)
-        , mRainTimer(0.f)
         , mStormParticleDirection(MWWorld::Weather::defaultDirection())
         , mStormDirection(MWWorld::Weather::defaultDirection())
         , mClouds()
@@ -247,18 +247,17 @@ namespace MWRender
         , mCloudBlendFactor(0.f)
         , mCloudSpeed(0.f)
         , mStarsOpacity(0.f)
-        , mRemainingTransitionTime(0.f)
-        , mRainEnabled(false)
         , mRainSpeed(0.f)
         , mRainDiameter(0.f)
         , mRainMinHeight(0.f)
         , mRainMaxHeight(0.f)
         , mRainEntranceSpeed(1.f)
         , mRainMaxRaindrops(0)
+        , mRainRipplesEnabled(Fallback::Map::getBool("Weather_Rain_Ripples"))
+        , mSnowRipplesEnabled(Fallback::Map::getBool("Weather_Snow_Ripples"))
         , mWindSpeed(0.f)
         , mBaseWindSpeed(0.f)
         , mEnabled(true)
-        , mSunEnabled(true)
         , mSunglareEnabled(true)
         , mPrecipitationAlpha(0.f)
         , mDirtyParticlesEffect(false)
@@ -269,7 +268,8 @@ namespace MWRender
         if (!mSceneManager->getForceShaders())
             skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(),
                 osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED | osg::StateAttribute::ON);
-        SceneUtil::ShadowManager::disableShadowsForStateSet(skyroot->getOrCreateStateSet());
+        mSceneManager->setUpNormalsRTForStateSet(skyroot->getOrCreateStateSet(), false);
+        SceneUtil::ShadowManager::instance().disableShadowsForStateSet(*skyroot->getOrCreateStateSet());
         parentNode->addChild(skyroot);
 
         mEarlyRenderBinRoot = new osg::Group;
@@ -292,7 +292,7 @@ namespace MWRender
         mRootNode->addChild(mEarlyRenderBinRoot);
         mUnderwaterSwitch = new UnderwaterSwitchCallback(skyroot);
 
-        mPrecipitationOcclusion = Settings::Manager::getBool("weather particle occlusion", "Shaders");
+        mPrecipitationOcclusion = Settings::shaders().mWeatherParticleOcclusion;
         mPrecipitationOccluder = std::make_unique<PrecipitationOccluder>(skyroot, parentNode, rootNode, camera);
     }
 
@@ -302,8 +302,7 @@ namespace MWRender
 
         bool forceShaders = mSceneManager->getForceShaders();
 
-        mAtmosphereDay
-            = mSceneManager->getInstance(Settings::Manager::getString("skyatmosphere", "Models"), mEarlyRenderBinRoot);
+        mAtmosphereDay = mSceneManager->getInstance(Settings::models().mSkyatmosphere.get(), mEarlyRenderBinRoot);
         ModVertexAlphaVisitor modAtmosphere(ModVertexAlphaVisitor::Atmosphere);
         mAtmosphereDay->accept(modAtmosphere);
 
@@ -315,12 +314,10 @@ namespace MWRender
         mEarlyRenderBinRoot->addChild(mAtmosphereNightNode);
 
         osg::ref_ptr<osg::Node> atmosphereNight;
-        if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
-            atmosphereNight = mSceneManager->getInstance(
-                Settings::Manager::getString("skynight02", "Models"), mAtmosphereNightNode);
+        if (mSceneManager->getVFS()->exists(Settings::models().mSkynight02.get()))
+            atmosphereNight = mSceneManager->getInstance(Settings::models().mSkynight02.get(), mAtmosphereNightNode);
         else
-            atmosphereNight = mSceneManager->getInstance(
-                Settings::Manager::getString("skynight01", "Models"), mAtmosphereNightNode);
+            atmosphereNight = mSceneManager->getInstance(Settings::models().mSkynight01.get(), mAtmosphereNightNode);
         atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(
             createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
@@ -341,7 +338,7 @@ namespace MWRender
 
         mCloudMesh = new osg::PositionAttitudeTransform;
         osg::ref_ptr<osg::Node> cloudMeshChild
-            = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudMesh);
+            = mSceneManager->getInstance(Settings::models().mSkyclouds.get(), mCloudMesh);
         mCloudUpdater = new CloudUpdater(forceShaders);
         mCloudUpdater->setOpacity(1.f);
         cloudMeshChild->addUpdateCallback(mCloudUpdater);
@@ -349,7 +346,7 @@ namespace MWRender
 
         mNextCloudMesh = new osg::PositionAttitudeTransform;
         osg::ref_ptr<osg::Node> nextCloudMeshChild
-            = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mNextCloudMesh);
+            = mSceneManager->getInstance(Settings::models().mSkyclouds.get(), mNextCloudMesh);
         mNextCloudUpdater = new CloudUpdater(forceShaders);
         mNextCloudUpdater->setOpacity(0.f);
         nextCloudMeshChild->addUpdateCallback(mNextCloudUpdater);
@@ -400,8 +397,9 @@ namespace MWRender
 
         osg::ref_ptr<osg::StateSet> stateset = mRainParticleSystem->getOrCreateStateSet();
 
+        constexpr VFS::Path::NormalizedView raindropImage("textures/tx_raindrop_01.dds");
         osg::ref_ptr<osg::Texture2D> raindropTex
-            = new osg::Texture2D(mSceneManager->getImageManager()->getImage("textures/tx_raindrop_01.dds"));
+            = new osg::Texture2D(mSceneManager->getImageManager()->getImage(raindropImage));
         raindropTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         raindropTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
@@ -518,6 +516,20 @@ namespace MWRender
         return mRainNode != nullptr;
     }
 
+    bool SkyManager::getRainRipplesEnabled() const
+    {
+        if (!mEnabled || mIsStorm)
+            return false;
+
+        if (hasRain())
+            return mRainRipplesEnabled;
+
+        if (mParticleNode && mCurrentParticleEffect == Settings::models().mWeathersnow.get())
+            return mSnowRipplesEnabled;
+
+        return false;
+    }
+
     float SkyManager::getPrecipitationAlpha() const
     {
         if (mEnabled && !mIsStorm && (hasRain() || mParticleNode))
@@ -538,13 +550,22 @@ namespace MWRender
             osg::Quat quat;
             quat.makeRotate(MWWorld::Weather::defaultDirection(), mStormParticleDirection);
             // Morrowind deliberately rotates the blizzard mesh, so so should we.
-            if (mCurrentParticleEffect == "meshes\\blizzard.nif")
+            if (mCurrentParticleEffect == Settings::models().mWeatherblizzard.get())
                 quat.makeRotate(osg::Vec3f(-1, 0, 0), mStormParticleDirection);
             mParticleNode->setAttitude(quat);
         }
 
+        const float timeScale = MWBase::Environment::get().getWorld()->getTimeManager()->getGameTimeScale();
+
         // UV Scroll the clouds
-        mCloudAnimationTimer += duration * mCloudSpeed * 0.003;
+        float cloudDelta = duration * mCloudSpeed / 400.f;
+        if (mTimescaleClouds)
+            cloudDelta *= timeScale / 60.f;
+
+        mCloudAnimationTimer += cloudDelta;
+        if (mCloudAnimationTimer >= 4.f)
+            mCloudAnimationTimer -= 4.f;
+
         mNextCloudUpdater->setTextureCoord(mCloudAnimationTimer);
         mCloudUpdater->setTextureCoord(mCloudAnimationTimer);
 
@@ -560,8 +581,7 @@ namespace MWRender
         }
 
         // rotate the stars by 360 degrees every 4 days
-        mAtmosphereNightRoll += MWBase::Environment::get().getWorld()->getTimeManager()->getGameTimeScale() * duration
-            * osg::DegreesToRadians(360.f) / (3600 * 96.f);
+        mAtmosphereNightRoll += timeScale * duration * osg::DegreesToRadians(360.f) / (3600 * 96.f);
         if (mAtmosphereNightNode->getNodeMask() != 0)
             mAtmosphereNightNode->setAttitude(osg::Quat(mAtmosphereNightRoll, osg::Vec3f(0, 0, 1)));
         mPrecipitationOccluder->update();
@@ -702,7 +722,7 @@ namespace MWRender
 
                 const osg::Vec3 defaultWrapRange = osg::Vec3(1024, 1024, 800);
                 const bool occlusionEnabledForEffect
-                    = !mRainEffect.empty() || mCurrentParticleEffect == "meshes\\snow.nif";
+                    = !mRainEffect.empty() || mCurrentParticleEffect == Settings::models().mWeathersnow.get();
 
                 for (unsigned int i = 0; i < findPSVisitor.mFoundNodes.size(); ++i)
                 {
@@ -743,14 +763,15 @@ namespace MWRender
         {
             mClouds = weather.mCloudTexture;
 
-            std::string texture = Misc::ResourceHelpers::correctTexturePath(mClouds, mSceneManager->getVFS());
+            const VFS::Path::Normalized texture
+                = Misc::ResourceHelpers::correctTexturePath(mClouds, mSceneManager->getVFS());
 
             osg::ref_ptr<osg::Texture2D> cloudTex
                 = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
             cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
-            mCloudUpdater->setTexture(cloudTex);
+            mCloudUpdater->setTexture(std::move(cloudTex));
         }
 
         if (mStormDirection != weather.mStormDirection)
@@ -765,14 +786,15 @@ namespace MWRender
 
             if (!mNextClouds.empty())
             {
-                std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
+                const VFS::Path::Normalized texture
+                    = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
 
                 osg::ref_ptr<osg::Texture2D> cloudTex
                     = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
                 cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
                 cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
-                mNextCloudUpdater->setTexture(cloudTex);
+                mNextCloudUpdater->setTexture(std::move(cloudTex));
                 mNextStormDirection = weather.mStormDirection;
             }
         }
@@ -893,12 +915,6 @@ namespace MWRender
         mSecunda->setState(state);
     }
 
-    void SkyManager::setDate(int day, int month)
-    {
-        mDay = day;
-        mMonth = month;
-    }
-
     void SkyManager::setGlareTimeOfDayFade(float val)
     {
         mSun->setGlareTimeOfDayFade(val);
@@ -909,18 +925,19 @@ namespace MWRender
         mUnderwaterSwitch->setWaterLevel(height);
     }
 
-    void SkyManager::listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures)
+    void SkyManager::listAssetsToPreload(
+        std::vector<VFS::Path::Normalized>& models, std::vector<VFS::Path::Normalized>& textures)
     {
-        models.emplace_back(Settings::Manager::getString("skyatmosphere", "Models"));
-        if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
-            models.emplace_back(Settings::Manager::getString("skynight02", "Models"));
-        models.emplace_back(Settings::Manager::getString("skynight01", "Models"));
-        models.emplace_back(Settings::Manager::getString("skyclouds", "Models"));
+        models.push_back(Settings::models().mSkyatmosphere);
+        if (mSceneManager->getVFS()->exists(Settings::models().mSkynight02.get()))
+            models.push_back(Settings::models().mSkynight02);
+        models.push_back(Settings::models().mSkynight01);
+        models.push_back(Settings::models().mSkyclouds);
 
-        models.emplace_back(Settings::Manager::getString("weatherashcloud", "Models"));
-        models.emplace_back(Settings::Manager::getString("weatherblightcloud", "Models"));
-        models.emplace_back(Settings::Manager::getString("weathersnow", "Models"));
-        models.emplace_back(Settings::Manager::getString("weatherblizzard", "Models"));
+        models.push_back(Settings::models().mWeatherashcloud);
+        models.push_back(Settings::models().mWeatherblightcloud);
+        models.push_back(Settings::models().mWeathersnow);
+        models.push_back(Settings::models().mWeatherblizzard);
 
         textures.emplace_back("textures/tx_mooncircle_full_s.dds");
         textures.emplace_back("textures/tx_mooncircle_full_m.dds");
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 75c6a10a50..6a32978c4e 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -8,6 +8,8 @@
 #include <osg/Vec4f>
 #include <osg/ref_ptr>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "precipitationocclusion.hpp"
 #include "skyutil.hpp"
 
@@ -52,12 +54,6 @@ namespace MWRender
 
         void setEnabled(bool enabled);
 
-        void setHour(double hour);
-        ///< will be called even when sky is disabled.
-
-        void setDate(int day, int month);
-        ///< will be called even when sky is disabled.
-
         int getMasserPhase() const;
         ///< 0 new moon, 1 waxing or waning cresecent, 2 waxing or waning half,
         /// 3 waxing or waning gibbous, 4 full moon
@@ -79,9 +75,9 @@ namespace MWRender
 
         bool hasRain() const;
 
-        float getPrecipitationAlpha() const;
+        bool getRainRipplesEnabled() const;
 
-        void setRainSpeed(float speed);
+        float getPrecipitationAlpha() const;
 
         void setStormParticleDirection(const osg::Vec3f& direction);
 
@@ -98,7 +94,8 @@ namespace MWRender
         /// Set height of water plane (used to remove underwater weather particles)
         void setWaterHeight(float height);
 
-        void listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures);
+        void listAssetsToPreload(
+            std::vector<VFS::Path::Normalized>& models, std::vector<VFS::Path::Normalized>& textures);
 
         float getBaseWindSpeed() const;
 
@@ -160,13 +157,9 @@ namespace MWRender
 
         bool mIsStorm;
 
-        int mDay;
-        int mMonth;
-
+        bool mTimescaleClouds;
         float mCloudAnimationTimer;
 
-        float mRainTimer;
-
         // particle system rotation is independent of cloud rotation internally
         osg::Vec3f mStormParticleDirection;
         osg::Vec3f mStormDirection;
@@ -182,11 +175,8 @@ namespace MWRender
         osg::Vec4f mSkyColour;
         osg::Vec4f mFogColour;
 
-        std::string mCurrentParticleEffect;
+        VFS::Path::Normalized mCurrentParticleEffect;
 
-        float mRemainingTransitionTime;
-
-        bool mRainEnabled;
         std::string mRainEffect;
         float mRainSpeed;
         float mRainDiameter;
@@ -194,11 +184,12 @@ namespace MWRender
         float mRainMaxHeight;
         float mRainEntranceSpeed;
         int mRainMaxRaindrops;
+        bool mRainRipplesEnabled;
+        bool mSnowRipplesEnabled;
         float mWindSpeed;
         float mBaseWindSpeed;
 
         bool mEnabled;
-        bool mSunEnabled;
         bool mSunglareEnabled;
 
         float mPrecipitationAlpha;
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index 3274b8c6b0..dacf628a2c 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -6,7 +6,6 @@
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
 #include <osg/ColorMask>
-#include <osg/ColorMaski>
 #include <osg/Depth>
 #include <osg/Geometry>
 #include <osg/Material>
@@ -29,6 +28,7 @@
 #include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/texturetype.hpp>
 
 #include <components/fallback/fallback.hpp>
 
@@ -406,7 +406,7 @@ namespace MWRender
             }
         }
 
-        void setTextures(const std::string& phaseTex, const std::string& circleTex)
+        void setTextures(VFS::Path::NormalizedView phaseTex, VFS::Path::NormalizedView circleTex)
         {
             mPhaseTex = new osg::Texture2D(mImageManager.getImage(phaseTex));
             mPhaseTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
@@ -766,12 +766,15 @@ namespace MWRender
 
         Resource::ImageManager& imageManager = *sceneManager.getImageManager();
 
-        osg::ref_ptr<osg::Texture2D> sunTex = new osg::Texture2D(imageManager.getImage("textures/tx_sun_05.dds"));
+        constexpr VFS::Path::NormalizedView image("textures/tx_sun_05.dds");
+
+        osg::ref_ptr<osg::Texture2D> sunTex = new osg::Texture2D(imageManager.getImage(image));
         sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        sunTex->setName("diffuseMap");
 
         mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex);
+        mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(
+            0, new SceneUtil::TextureType("diffuseMap"), osg::StateAttribute::ON);
         mGeom->getOrCreateStateSet()->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sun)));
 
         osg::ref_ptr<osg::Group> queryNode = new osg::Group;
@@ -788,14 +791,14 @@ namespace MWRender
             stateset->setAttributeAndModes(alphaFunc);
         }
         stateset->setTextureAttributeAndModes(0, sunTex);
+        stateset->setTextureAttributeAndModes(0, new SceneUtil::TextureType("diffuseMap"), osg::StateAttribute::ON);
         stateset->setAttributeAndModes(createUnlitMaterial());
         stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunflash_Query)));
 
         // Disable writing to the color buffer. We are using this geometry for visibility tests only.
         osg::ref_ptr<osg::ColorMask> colormask = new osg::ColorMask(0, 0, 0, 0);
         stateset->setAttributeAndModes(colormask);
-        if (sceneManager.getSupportsNormalsRT())
-            stateset->setAttributeAndModes(new osg::ColorMaski(1, false, false, false, false));
+        sceneManager.setUpNormalsRTForStateSet(stateset, false);
         mTransform->addChild(queryNode);
 
         mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true);
@@ -882,12 +885,11 @@ namespace MWRender
         osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
-            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth(osg::Depth::LEQUAL);
+            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
             // This is a trick to make fragments written by the query always use the maximum depth value,
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.
             double far = SceneUtil::AutoDepth::isReversed() ? 0.0 : 1.0;
-            depth->setFunction(osg::Depth::LEQUAL);
             depth->setZNear(far);
             depth->setZFar(far);
             depth->setWriteMask(false);
@@ -906,11 +908,10 @@ namespace MWRender
 
     void Sun::createSunFlash(Resource::ImageManager& imageManager)
     {
-        osg::ref_ptr<osg::Texture2D> tex
-            = new osg::Texture2D(imageManager.getImage("textures/tx_sun_flash_grey_05.dds"));
+        constexpr VFS::Path::NormalizedView image("textures/tx_sun_flash_grey_05.dds");
+        osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(imageManager.getImage(image));
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        tex->setName("diffuseMap");
 
         osg::ref_ptr<osg::Group> group(new osg::Group);
 
@@ -923,6 +924,7 @@ namespace MWRender
         osg::StateSet* stateset = geom->getOrCreateStateSet();
 
         stateset->setTextureAttributeAndModes(0, tex);
+        stateset->setTextureAttributeAndModes(0, new SceneUtil::TextureType("diffuseMap"), osg::StateAttribute::ON);
         stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
         stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
         stateset->setNestRenderBins(false);
@@ -1114,10 +1116,18 @@ namespace MWRender
 
         textureName += ".dds";
 
+        const VFS::Path::Normalized texturePath(std::move(textureName));
+
         if (mType == Moon::Type_Secunda)
-            mUpdater->setTextures(textureName, "textures/tx_mooncircle_full_s.dds");
+        {
+            constexpr VFS::Path::NormalizedView secunda("textures/tx_mooncircle_full_s.dds");
+            mUpdater->setTextures(texturePath, secunda);
+        }
         else
-            mUpdater->setTextures(textureName, "textures/tx_mooncircle_full_m.dds");
+        {
+            constexpr VFS::Path::NormalizedView masser("textures/tx_mooncircle_full_m.dds");
+            mUpdater->setTextures(texturePath, masser);
+        }
     }
 
     int RainCounter::numParticlesToCreate(double dt) const
diff --git a/apps/openmw/mwrender/skyutil.hpp b/apps/openmw/mwrender/skyutil.hpp
index 1018724595..da038e6c58 100644
--- a/apps/openmw/mwrender/skyutil.hpp
+++ b/apps/openmw/mwrender/skyutil.hpp
@@ -65,6 +65,7 @@ namespace MWRender
         bool mIsStorm;
 
         ESM::RefId mAmbientLoopSoundID;
+        ESM::RefId mRainLoopSoundID;
         float mAmbientSoundVolume;
 
         std::string mParticleEffect;
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index 11fdbd774f..9776d7e632 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -1,6 +1,7 @@
 #include "terrainstorage.hpp"
 
 #include <components/esm3/loadland.hpp>
+#include <components/esm4/loadwrld.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwworld/esmstore.hpp"
@@ -10,8 +11,8 @@
 namespace MWRender
 {
 
-    TerrainStorage::TerrainStorage(Resource::ResourceSystem* resourceSystem, const std::string& normalMapPattern,
-        const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern,
+    TerrainStorage::TerrainStorage(Resource::ResourceSystem* resourceSystem, std::string_view normalMapPattern,
+        std::string_view normalHeightMapPattern, bool autoUseNormalMaps, std::string_view specularMapPattern,
         bool autoUseSpecularMaps)
         : ESMTerrain::Storage(resourceSystem->getVFS(), normalMapPattern, normalHeightMapPattern, autoUseNormalMaps,
             specularMapPattern, autoUseSpecularMaps)
@@ -33,6 +34,10 @@ namespace MWRender
 
         if (ESM::isEsm4Ext(cellLocation.mWorldspace))
         {
+            const ESM4::World* worldspace = esmStore.get<ESM4::World>().find(cellLocation.mWorldspace);
+            if (!worldspace->mParent.isZeroOrUnset() && worldspace->mParentUseFlags & ESM4::World::UseFlag_Land)
+                cellLocation.mWorldspace = worldspace->mParent;
+
             return esmStore.get<ESM4::Land>().search(cellLocation) != nullptr;
         }
         else
@@ -64,6 +69,10 @@ namespace MWRender
 
         if (ESM::isEsm4Ext(worldspace))
         {
+            const ESM4::World* worldRec = esmStore.get<ESM4::World>().find(worldspace);
+            if (!worldRec->mParent.isZeroOrUnset() && worldRec->mParentUseFlags & ESM4::World::UseFlag_Land)
+                worldspace = worldRec->mParent;
+
             const auto& lands = esmStore.get<ESM4::Land>().getLands();
             for (const auto& [landPos, _] : lands)
             {
@@ -96,7 +105,7 @@ namespace MWRender
         return mLandManager->getLand(cellLocation);
     }
 
-    const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)
+    const std::string* TerrainStorage::getLandTexture(std::uint16_t index, int plugin)
     {
         const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore();
         return esmStore.get<ESM::LandTexture>().search(index, plugin);
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index 0b41c06428..731f396713 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -16,13 +16,13 @@ namespace MWRender
     class TerrainStorage : public ESMTerrain::Storage
     {
     public:
-        TerrainStorage(Resource::ResourceSystem* resourceSystem, const std::string& normalMapPattern = "",
-            const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false,
-            const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
+        TerrainStorage(Resource::ResourceSystem* resourceSystem, std::string_view normalMapPattern = {},
+            std::string_view normalHeightMapPattern = {}, bool autoUseNormalMaps = false,
+            std::string_view specularMapPattern = {}, bool autoUseSpecularMaps = false);
         ~TerrainStorage();
 
         osg::ref_ptr<const ESMTerrain::LandObject> getLand(ESM::ExteriorCellLocation cellLocation) override;
-        const ESM::LandTexture* getLandTexture(int index, short plugin) override;
+        const std::string* getLandTexture(std::uint16_t index, int plugin) override;
 
         bool hasData(ESM::ExteriorCellLocation cellLocation) override;
 
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index 509ea2efa7..c2231c31f8 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -6,65 +6,72 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/sceneutil/texturetype.hpp>
 #include <components/sceneutil/visitor.hpp>
+#include <components/settings/values.hpp>
 
 namespace MWRender
 {
-
-    class TextureOverrideVisitor : public osg::NodeVisitor
+    namespace
     {
-    public:
-        TextureOverrideVisitor(std::string_view texture, Resource::ResourceSystem* resourcesystem)
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-            , mTexture(texture)
-            , mResourcesystem(resourcesystem)
+        class TextureOverrideVisitor : public osg::NodeVisitor
         {
-        }
-
-        void apply(osg::Node& node) override
-        {
-            int index = 0;
-            osg::ref_ptr<osg::Node> nodePtr(&node);
-            if (node.getUserValue("overrideFx", index))
+        public:
+            TextureOverrideVisitor(std::string_view texture, Resource::ResourceSystem* resourcesystem)
+                : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+                , mTexture(texture)
+                , mResourcesystem(resourcesystem)
             {
-                if (index == 1)
-                    overrideTexture(mTexture, mResourcesystem, std::move(nodePtr));
             }
-            traverse(node);
-        }
-        std::string_view mTexture;
-        Resource::ResourceSystem* mResourcesystem;
-    };
 
-    void overrideFirstRootTexture(
-        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node)
-    {
-        TextureOverrideVisitor overrideVisitor(texture, resourceSystem);
-        node->accept(overrideVisitor);
+            void apply(osg::Node& node) override
+            {
+                int index = 0;
+                if (node.getUserValue("overrideFx", index))
+                {
+                    if (index == 1)
+                        overrideTexture(mTexture, mResourcesystem, node);
+                }
+                traverse(node);
+            }
+            std::string_view mTexture;
+            Resource::ResourceSystem* mResourcesystem;
+        };
     }
 
-    void overrideTexture(
-        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node)
+    void overrideFirstRootTexture(std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::Node& node)
+    {
+        TextureOverrideVisitor overrideVisitor(texture, resourceSystem);
+        node.accept(overrideVisitor);
+    }
+
+    void overrideTexture(std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::Node& node)
     {
         if (texture.empty())
             return;
-        std::string correctedTexture = Misc::ResourceHelpers::correctTexturePath(texture, resourceSystem->getVFS());
+        const VFS::Path::Normalized correctedTexture
+            = Misc::ResourceHelpers::correctTexturePath(texture, resourceSystem->getVFS());
         // Not sure if wrap settings should be pulled from the overridden texture?
         osg::ref_ptr<osg::Texture2D> tex
             = new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture));
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        tex->setName("diffuseMap");
 
         osg::ref_ptr<osg::StateSet> stateset;
-        if (node->getStateSet())
-            stateset = new osg::StateSet(*node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
+        if (const osg::StateSet* const src = node.getStateSet())
+            stateset = new osg::StateSet(*src, osg::CopyOp::SHALLOW_COPY);
         else
             stateset = new osg::StateSet;
 
         stateset->setTextureAttribute(0, tex, osg::StateAttribute::OVERRIDE);
+        stateset->setTextureAttribute(0, new SceneUtil::TextureType("diffuseMap"), osg::StateAttribute::OVERRIDE);
 
-        node->setStateSet(stateset);
+        node.setStateSet(stateset);
+    }
+
+    bool shouldAddMSAAIntermediateTarget()
+    {
+        return Settings::shaders().mAntialiasAlphaTest && Settings::video().mAntialiasing > 1;
     }
 
 }
diff --git a/apps/openmw/mwrender/util.hpp b/apps/openmw/mwrender/util.hpp
index 457b23f94b..fc43680d67 100644
--- a/apps/openmw/mwrender/util.hpp
+++ b/apps/openmw/mwrender/util.hpp
@@ -2,8 +2,8 @@
 #define OPENMW_MWRENDER_UTIL_H
 
 #include <osg/NodeCallback>
-#include <osg/ref_ptr>
-#include <string>
+
+#include <string_view>
 
 namespace osg
 {
@@ -20,11 +20,9 @@ namespace MWRender
     // Overrides the texture of nodes in the mesh that had the same NiTexturingProperty as the first NiTexturingProperty
     // of the .NIF file's root node, if it had a NiTexturingProperty. Used for applying "particle textures" to magic
     // effects.
-    void overrideFirstRootTexture(
-        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
+    void overrideFirstRootTexture(std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::Node& node);
 
-    void overrideTexture(
-        std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
+    void overrideTexture(std::string_view texture, Resource::ResourceSystem* resourceSystem, osg::Node& node);
 
     // Node callback to entirely skip the traversal.
     class NoTraverseCallback : public osg::NodeCallback
@@ -35,6 +33,8 @@ namespace MWRender
             // no traverse()
         }
     };
+
+    bool shouldAddMSAAIntermediateTarget();
 }
 
 #endif
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index 1b25dfc366..05ed534d29 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -59,8 +59,8 @@ namespace MWRender
     };
 
     // Defines masks to remove when using ToggleWorld command
-    constexpr static unsigned int sToggleWorldMask
-        = Mask_Debug | Mask_Actor | Mask_Terrain | Mask_Object | Mask_Static | Mask_Groundcover;
+    constexpr inline unsigned int sToggleWorldMask
+        = Mask_Actor | Mask_Terrain | Mask_Object | Mask_Static | Mask_Groundcover;
 
 }
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 51ce06069c..81e44248ac 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -35,11 +35,14 @@
 
 #include <components/fallback/fallback.hpp>
 
+#include <components/settings/values.hpp>
+
 #include "../mwworld/cellstore.hpp"
 
 #include "renderbin.hpp"
 #include "ripples.hpp"
 #include "ripplesimulation.hpp"
+#include "util.hpp"
 #include "vismask.hpp"
 
 namespace MWRender
@@ -111,7 +114,10 @@ namespace MWRender
                 }
 
                 // move the plane back along its normal a little bit to prevent bleeding at the water shore
-                const float clipFudge = -5;
+                float fov = Settings::camera().mFieldOfView;
+                const float clipFudgeMin = 2.5; // minimum offset of clip plane
+                const float clipFudgeScale = -15000.0;
+                float clipFudge = abs(abs((*mCullPlane)[3]) - eyePoint.z()) * fov / clipFudgeScale - clipFudgeMin;
                 modelViewMatrix->preMultTranslate(mCullPlane->getNormal() * clipFudge);
 
                 cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
@@ -202,21 +208,25 @@ namespace MWRender
         }
     };
 
-    class RainIntensityUpdater : public SceneUtil::StateSetUpdater
+    class RainSettingsUpdater : public SceneUtil::StateSetUpdater
     {
     public:
-        RainIntensityUpdater()
+        RainSettingsUpdater()
             : mRainIntensity(0.f)
+            , mEnableRipples(false)
         {
         }
 
         void setRainIntensity(float rainIntensity) { mRainIntensity = rainIntensity; }
+        void setRipplesEnabled(bool enableRipples) { mEnableRipples = enableRipples; }
 
     protected:
         void setDefaults(osg::StateSet* stateset) override
         {
             osg::ref_ptr<osg::Uniform> rainIntensityUniform = new osg::Uniform("rainIntensity", 0.0f);
             stateset->addUniform(rainIntensityUniform.get());
+            osg::ref_ptr<osg::Uniform> enableRainRipplesUniform = new osg::Uniform("enableRainRipples", false);
+            stateset->addUniform(enableRainRipplesUniform.get());
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
@@ -224,17 +234,21 @@ namespace MWRender
             osg::ref_ptr<osg::Uniform> rainIntensityUniform = stateset->getUniform("rainIntensity");
             if (rainIntensityUniform != nullptr)
                 rainIntensityUniform->set(mRainIntensity);
+            osg::ref_ptr<osg::Uniform> enableRainRipplesUniform = stateset->getUniform("enableRainRipples");
+            if (enableRainRipplesUniform != nullptr)
+                enableRainRipplesUniform->set(mEnableRipples);
         }
 
     private:
         float mRainIntensity;
+        bool mEnableRipples;
     };
 
     class Refraction : public SceneUtil::RTTNode
     {
     public:
         Refraction(uint32_t rttSize)
-            : RTTNode(rttSize, rttSize, 0, false, 1, StereoAwareness::Aware)
+            : RTTNode(rttSize, rttSize, 0, false, 1, StereoAwareness::Aware, shouldAddMSAAIntermediateTarget())
             , mNodeMask(Refraction::sDefaultCullMask)
         {
             setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
@@ -244,8 +258,7 @@ namespace MWRender
         void setDefaults(osg::Camera* camera) override
         {
             camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
-            camera->setSmallFeatureCullingPixelSize(
-                Settings::Manager::getInt("small feature culling pixel size", "Water"));
+            camera->setSmallFeatureCullingPixelSize(Settings::water().mSmallFeatureCullingPixelSize);
             camera->setName("RefractionCamera");
             camera->addCullCallback(new InheritViewPointCallback);
             camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
@@ -262,8 +275,8 @@ namespace MWRender
             camera->addChild(mClipCullNode);
             camera->setNodeMask(Mask_RenderToTexture);
 
-            if (Settings::Manager::getFloat("refraction scale", "Water") != 1) // TODO: to be removed with issue #5709
-                SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+            if (Settings::water().mRefractionScale != 1) // TODO: to be removed with issue #5709
+                SceneUtil::ShadowManager::instance().disableShadowsForStateSet(*camera->getOrCreateStateSet());
         }
 
         void apply(osg::Camera* camera) override
@@ -282,8 +295,7 @@ namespace MWRender
 
         void setWaterLevel(float waterLevel)
         {
-            const float refractionScale
-                = std::clamp(Settings::Manager::getFloat("refraction scale", "Water"), 0.f, 1.f);
+            const float refractionScale = Settings::water().mRefractionScale;
 
             mViewMatrix = osg::Matrix::scale(1, 1, refractionScale)
                 * osg::Matrix::translate(0, 0, (1.0 - refractionScale) * waterLevel);
@@ -315,7 +327,7 @@ namespace MWRender
     {
     public:
         Reflection(uint32_t rttSize, bool isInterior)
-            : RTTNode(rttSize, rttSize, 0, false, 0, StereoAwareness::Aware)
+            : RTTNode(rttSize, rttSize, 0, false, 0, StereoAwareness::Aware, shouldAddMSAAIntermediateTarget())
         {
             setInterior(isInterior);
             setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
@@ -325,8 +337,7 @@ namespace MWRender
         void setDefaults(osg::Camera* camera) override
         {
             camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
-            camera->setSmallFeatureCullingPixelSize(
-                Settings::Manager::getInt("small feature culling pixel size", "Water"));
+            camera->setSmallFeatureCullingPixelSize(Settings::water().mSmallFeatureCullingPixelSize);
             camera->setName("ReflectionCamera");
             camera->addCullCallback(new InheritViewPointCallback);
 
@@ -341,7 +352,7 @@ namespace MWRender
             camera->addChild(mClipCullNode);
             camera->setNodeMask(Mask_RenderToTexture);
 
-            SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+            SceneUtil::ShadowManager::instance().disableShadowsForStateSet(*camera->getOrCreateStateSet());
         }
 
         void apply(osg::Camera* camera) override
@@ -381,7 +392,7 @@ namespace MWRender
     private:
         unsigned int calcNodeMask()
         {
-            int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
+            int reflectionDetail = Settings::water().mReflectionDetail;
             reflectionDetail = std::clamp(reflectionDetail, mInterior ? 2 : 0, 5);
             unsigned int extraMask = 0;
             if (reflectionDetail >= 1)
@@ -429,7 +440,7 @@ namespace MWRender
 
     Water::Water(osg::Group* parent, osg::Group* sceneRoot, Resource::ResourceSystem* resourceSystem,
         osgUtil::IncrementalCompileOperation* ico)
-        : mRainIntensityUpdater(nullptr)
+        : mRainSettingsUpdater(nullptr)
         , mParent(parent)
         , mSceneRoot(sceneRoot)
         , mResourceSystem(resourceSystem)
@@ -522,9 +533,9 @@ namespace MWRender
         mWaterGeom->setStateSet(nullptr);
         mWaterGeom->setUpdateCallback(nullptr);
 
-        if (Settings::Manager::getBool("shader", "Water"))
+        if (Settings::water().mShader)
         {
-            unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
+            const unsigned int rttSize = Settings::water().mRttSize;
 
             mReflection = new Reflection(rttSize, mInterior);
             mReflection->setWaterLevel(mTop);
@@ -533,7 +544,7 @@ namespace MWRender
                 mReflection->addCullCallback(mCullCallback);
             mParent->addChild(mReflection);
 
-            if (Settings::Manager::getBool("refraction", "Water"))
+            if (Settings::water().mRefraction)
             {
                 mRefraction = new Refraction(rttSize);
                 mRefraction->setWaterLevel(mTop);
@@ -557,16 +568,6 @@ namespace MWRender
         updateVisible();
     }
 
-    osg::Node* Water::getReflectionNode()
-    {
-        return mReflection;
-    }
-
-    osg::Node* Water::getRefractionNode()
-    {
-        return mRefraction;
-    }
-
     osg::Vec3d Water::getPosition() const
     {
         return mWaterNode->getPosition();
@@ -578,7 +579,7 @@ namespace MWRender
 
         node->setStateSet(stateset);
         node->setUpdateCallback(nullptr);
-        mRainIntensityUpdater = nullptr;
+        mRainSettingsUpdater = nullptr;
 
         // Add animated textures
         std::vector<osg::ref_ptr<osg::Texture2D>> textures;
@@ -588,8 +589,8 @@ namespace MWRender
         {
             std::ostringstream texname;
             texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
-            osg::ref_ptr<osg::Texture2D> tex(
-                new osg::Texture2D(mResourceSystem->getImageManager()->getImage(texname.str())));
+            const VFS::Path::Normalized path(texname.str());
+            osg::ref_ptr<osg::Texture2D> tex(new osg::Texture2D(mResourceSystem->getImageManager()->getImage(path)));
             tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
             mResourceSystem->getSceneManager()->applyFilterSettings(tex);
@@ -689,32 +690,31 @@ namespace MWRender
     {
         // use a define map to conditionally compile the shader
         std::map<std::string, std::string> defineMap;
-        defineMap["refraction_enabled"] = std::string(mRefraction ? "1" : "0");
-        const auto rippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
-        defineMap["rain_ripple_detail"] = std::to_string(rippleDetail);
-        defineMap["ripple_map_world_scale"] = std::to_string(RipplesSurface::mWorldScaleFactor);
-        defineMap["ripple_map_size"] = std::to_string(RipplesSurface::mRTTSize) + ".0";
+        defineMap["waterRefraction"] = std::string(mRefraction ? "1" : "0");
+        const int rippleDetail = Settings::water().mRainRippleDetail;
+        defineMap["rainRippleDetail"] = std::to_string(rippleDetail);
+        defineMap["rippleMapWorldScale"] = std::to_string(RipplesSurface::sWorldScaleFactor);
+        defineMap["rippleMapSize"] = std::to_string(RipplesSurface::sRTTSize) + ".0";
+        defineMap["sunlightScattering"] = Settings::water().mSunlightScattering ? "1" : "0";
+        defineMap["wobblyShores"] = Settings::water().mWobblyShores ? "1" : "0";
 
         Stereo::shaderStereoDefines(defineMap);
 
         Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
         osg::ref_ptr<osg::Program> program = shaderMgr.getProgram("water", defineMap);
 
+        constexpr VFS::Path::NormalizedView waterImage("textures/omw/water_nm.png");
         osg::ref_ptr<osg::Texture2D> normalMap(
-            new osg::Texture2D(mResourceSystem->getImageManager()->getImage("textures/omw/water_nm.png")));
-        if (normalMap->getImage())
-            normalMap->getImage()->flipVertical();
+            new osg::Texture2D(mResourceSystem->getImageManager()->getImage(waterImage)));
         normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
         normalMap->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-        normalMap->setMaxAnisotropy(16);
-        normalMap->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
-        normalMap->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        mResourceSystem->getSceneManager()->applyFilterSettings(normalMap);
 
-        mRainIntensityUpdater = new RainIntensityUpdater();
-        node->setUpdateCallback(mRainIntensityUpdater);
+        mRainSettingsUpdater = new RainSettingsUpdater();
+        node->setUpdateCallback(mRainSettingsUpdater);
 
-        mShaderWaterStateSetUpdater
-            = new ShaderWaterStateSetUpdater(this, mReflection, mRefraction, mRipples, std::move(program), normalMap);
+        mShaderWaterStateSetUpdater = new ShaderWaterStateSetUpdater(
+            this, mReflection, mRefraction, mRipples, std::move(program), std::move(normalMap));
         node->addCullCallback(mShaderWaterStateSetUpdater);
     }
 
@@ -745,7 +745,7 @@ namespace MWRender
         }
     }
 
-    void Water::listAssetsToPreload(std::vector<std::string>& textures)
+    void Water::listAssetsToPreload(std::vector<VFS::Path::Normalized>& textures)
     {
         const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
         std::string_view texture = Fallback::Map::getString("Water_SurfaceTexture");
@@ -753,7 +753,7 @@ namespace MWRender
         {
             std::ostringstream texname;
             texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
-            textures.push_back(texname.str());
+            textures.emplace_back(texname.str());
         }
     }
 
@@ -800,8 +800,14 @@ namespace MWRender
 
     void Water::setRainIntensity(float rainIntensity)
     {
-        if (mRainIntensityUpdater)
-            mRainIntensityUpdater->setRainIntensity(rainIntensity);
+        if (mRainSettingsUpdater)
+            mRainSettingsUpdater->setRainIntensity(rainIntensity);
+    }
+
+    void Water::setRainRipplesEnabled(bool enableRipples)
+    {
+        if (mRainSettingsUpdater)
+            mRainSettingsUpdater->setRipplesEnabled(enableRipples);
     }
 
     void Water::update(float dt, bool paused)
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 0204cb4303..92299309f0 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -9,6 +9,7 @@
 #include <osg/ref_ptr>
 
 #include <components/settings/settings.hpp>
+#include <components/vfs/pathutil.hpp>
 
 namespace osg
 {
@@ -46,13 +47,13 @@ namespace MWRender
     class Refraction;
     class Reflection;
     class RippleSimulation;
-    class RainIntensityUpdater;
+    class RainSettingsUpdater;
     class Ripples;
 
     /// Water rendering
     class Water
     {
-        osg::ref_ptr<RainIntensityUpdater> mRainIntensityUpdater;
+        osg::ref_ptr<RainSettingsUpdater> mRainSettingsUpdater;
 
         osg::ref_ptr<osg::Group> mParent;
         osg::ref_ptr<osg::Group> mSceneRoot;
@@ -92,7 +93,7 @@ namespace MWRender
 
         void setCullCallback(osg::Callback* callback);
 
-        void listAssetsToPreload(std::vector<std::string>& textures);
+        void listAssetsToPreload(std::vector<VFS::Path::Normalized>& textures);
 
         void setEnabled(bool enabled);
 
@@ -113,12 +114,10 @@ namespace MWRender
         void changeCell(const MWWorld::CellStore* store);
         void setHeight(const float height);
         void setRainIntensity(const float rainIntensity);
+        void setRainRipplesEnabled(bool enableRipples);
 
         void update(float dt, bool paused);
 
-        osg::Node* getReflectionNode();
-        osg::Node* getRefractionNode();
-
         osg::Vec3d getPosition() const;
 
         void processChangedSettings(const Settings::CategorySettingVector& settings);
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index c19062168e..b9c8fd1d28 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -86,7 +86,7 @@ namespace MWRender
             MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
             if (ammo == inv.end())
                 return;
-            std::string model = ammo->getClass().getModel(*ammo);
+            VFS::Path::Normalized model(ammo->getClass().getCorrectedModel(*ammo));
 
             osg::ref_ptr<osg::Node> arrow = getResourceSystem()->getSceneManager()->getInstance(model, parent);
 
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index b6acbd246b..a91a585367 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -507,8 +507,9 @@ namespace MWScript
                 runtime.pop();
 
                 MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(targetID, true, false);
-                if (!target.isEmpty())
-                    MWBase::Environment::get().getMechanicsManager()->startCombat(actor, target);
+                if (!target.isEmpty() && !target.getBase()->isDeleted()
+                    && !target.getClass().getCreatureStats(target).isDead())
+                    MWBase::Environment::get().getMechanicsManager()->startCombat(actor, target, nullptr);
             }
         };
 
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index 32d7e46527..16c1f5a134 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -56,7 +56,7 @@ namespace MWScript
                 }
 
                 MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(
-                    ptr, group, mode, std::numeric_limits<int>::max(), true);
+                    ptr, group, mode, std::numeric_limits<uint32_t>::max(), true);
             }
         };
 
@@ -91,7 +91,7 @@ namespace MWScript
                         throw std::runtime_error("animation mode out of range");
                 }
 
-                MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, group, mode, loops + 1, true);
+                MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, group, mode, loops, true);
             }
         };
 
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 3a8318a7a3..d913eb0915 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -11,6 +11,8 @@
 
 #include <components/misc/strings/algorithm.hpp>
 
+#include <components/esm/util.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -123,7 +125,7 @@ namespace MWScript
                 MWBase::World* world = MWBase::Environment::get().getWorld();
                 MWWorld::Ptr playerPtr = world->getPlayerPtr();
 
-                osg::Vec2 posFromIndex
+                const osg::Vec2f posFromIndex
                     = ESM::indexToPosition(ESM::ExteriorCellLocation(x, y, ESM::Cell::sDefaultWorldspaceId), true);
                 pos.pos[0] = posFromIndex.x();
                 pos.pos[1] = posFromIndex.y();
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index edee3963e7..9708a503ee 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -31,6 +31,7 @@
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/levelledlist.hpp"
 
+#include "interpretercontext.hpp"
 #include "ref.hpp"
 
 namespace
@@ -94,6 +95,12 @@ namespace MWScript
                 Interpreter::Type_Integer count = runtime[0].mInteger;
                 runtime.pop();
 
+                if (!MWBase::Environment::get().getESMStore()->find(item))
+                {
+                    runtime.getContext().report("Failed to add item '" + item.getRefIdString() + "': unknown ID");
+                    return;
+                }
+
                 if (count < 0)
                     count = static_cast<uint16_t>(count);
 
@@ -102,7 +109,7 @@ namespace MWScript
                     return;
 
                 if (item == "gold_005" || item == "gold_010" || item == "gold_025" || item == "gold_100")
-                    item = ESM::RefId::stringRefId("gold_001");
+                    item = MWWorld::ContainerStore::sGoldId;
 
                 // Check if "item" can be placed in a container
                 MWWorld::ManualRef manualRef(*MWBase::Environment::get().getESMStore(), item, 1);
@@ -182,13 +189,19 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime& runtime) override
             {
-                MWWorld::Ptr ptr = R()(runtime);
+                MWWorld::Ptr ptr = R()(runtime, false);
 
                 ESM::RefId item = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
+                if (ptr.isEmpty() || (ptr.getType() != ESM::Container::sRecordId && !ptr.getClass().isActor()))
+                {
+                    runtime.push(0);
+                    return;
+                }
+
                 if (item == "gold_005" || item == "gold_010" || item == "gold_025" || item == "gold_100")
-                    item = ESM::RefId::stringRefId("gold_001");
+                    item = MWWorld::ContainerStore::sGoldId;
 
                 MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
 
@@ -210,6 +223,12 @@ namespace MWScript
                 Interpreter::Type_Integer count = runtime[0].mInteger;
                 runtime.pop();
 
+                if (!MWBase::Environment::get().getESMStore()->find(item))
+                {
+                    runtime.getContext().report("Failed to remove item '" + item.getRefIdString() + "': unknown ID");
+                    return;
+                }
+
                 if (count < 0)
                     count = static_cast<uint16_t>(count);
 
@@ -218,7 +237,7 @@ namespace MWScript
                     return;
 
                 if (item == "gold_005" || item == "gold_010" || item == "gold_025" || item == "gold_100")
-                    item = ESM::RefId::stringRefId("gold_001");
+                    item = MWWorld::ContainerStore::sGoldId;
 
                 // Explicit calls to non-unique actors affect the base record
                 if (!R::implicit && ptr.getClass().isActor()
@@ -447,7 +466,7 @@ namespace MWScript
                      it != invStore.cend(); ++it)
                 {
                     if (it->getCellRef().getSoul() == name)
-                        count += it->getRefData().getCount();
+                        count += it->getCellRef().getCount();
                 }
                 runtime.push(count);
             }
diff --git a/apps/openmw/mwscript/controlextensions.cpp b/apps/openmw/mwscript/controlextensions.cpp
index a69f2cd571..b9e8f8965a 100644
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@@ -25,11 +25,11 @@ namespace MWScript
     {
         class OpSetControl : public Interpreter::Opcode0
         {
-            std::string mControl;
+            std::string_view mControl;
             bool mEnable;
 
         public:
-            OpSetControl(const std::string& control, bool enable)
+            OpSetControl(std::string_view control, bool enable)
                 : mControl(control)
                 , mEnable(enable)
             {
@@ -43,10 +43,10 @@ namespace MWScript
 
         class OpGetDisabled : public Interpreter::Opcode0
         {
-            std::string mControl;
+            std::string_view mControl;
 
         public:
-            OpGetDisabled(const std::string& control)
+            OpGetDisabled(std::string_view control)
                 : mControl(control)
             {
             }
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index 5a361e1bdc..6511fbdb01 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -16,6 +16,7 @@
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "ref.hpp"
 
@@ -89,6 +90,13 @@ namespace MWScript
                 ESM::RefId topic = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
+                if (!MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>().search(topic))
+                {
+                    runtime.getContext().report(
+                        "Failed to add topic '" + topic.getRefIdString() + "': topic record not found");
+                    return;
+                }
+
                 MWBase::Environment::get().getDialogueManager()->addTopic(topic);
             }
         };
@@ -135,6 +143,15 @@ namespace MWScript
                     return;
                 }
 
+                bool greetWerewolves = false;
+                const ESM::RefId& script = ptr.getClass().getScript(ptr);
+                if (!script.empty())
+                    greetWerewolves = ptr.getRefData().getLocals().hasVar(script, "allowwerewolfforcegreeting");
+
+                const MWWorld::Ptr& player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                if (player.getClass().getNpcStats(player).isWerewolf() && !greetWerewolves)
+                    return;
+
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, ptr);
             }
         };
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index c1590941e6..07855f18ef 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -192,7 +192,8 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime& runtime) override
             {
-                bool state = MWBase::Environment::get().getWindowManager()->toggleHud();
+                bool state = MWBase::Environment::get().getWindowManager()->setHudVisibility(
+                    !MWBase::Environment::get().getWindowManager()->isHudVisible());
                 runtime.getContext().report(state ? "GUI -> On" : "GUI -> Off");
 
                 if (!state)
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index db5dda5204..3bd4e82059 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -121,6 +121,12 @@ namespace MWScript
         return true;
     }
 
+    std::size_t Locals::getSize(const ESM::RefId& script)
+    {
+        ensure(script);
+        return mShorts.size() + mLongs.size() + mFloats.size();
+    }
+
     bool Locals::write(ESM::Locals& locals, const ESM::RefId& script) const
     {
         if (!mInitialised)
diff --git a/apps/openmw/mwscript/locals.hpp b/apps/openmw/mwscript/locals.hpp
index 1cc8fecb9b..76b582b78c 100644
--- a/apps/openmw/mwscript/locals.hpp
+++ b/apps/openmw/mwscript/locals.hpp
@@ -67,6 +67,8 @@ namespace MWScript
             return static_cast<float>(getVarAsDouble(script, var));
         }
 
+        std::size_t getSize(const ESM::RefId& script);
+
         /// \note If locals have not been configured yet, no data is written.
         ///
         /// \return Locals written?
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 43da00afe3..72faf0afa9 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -41,11 +41,13 @@
 #include <components/esm3/loadmisc.hpp>
 #include <components/esm3/loadprob.hpp>
 #include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadscpt.hpp>
 #include <components/esm3/loadstat.hpp>
 #include <components/esm3/loadweap.hpp>
 
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/conversion.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/vfs/manager.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -105,7 +107,7 @@ namespace
                     std::string fileName;
                     if (image)
                         fileName = image->getFileName();
-                    mTextures.emplace_back(texture->getName(), fileName);
+                    mTextures.emplace_back(SceneUtil::getTextureType(*stateset, *texture, i), fileName);
                 }
             }
 
@@ -184,6 +186,14 @@ namespace MWScript
                 MWWorld::Ptr target = R()(runtime, false);
                 ESM::RefId name = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
+
+                if (!MWBase::Environment::get().getESMStore()->get<ESM::Script>().search(name))
+                {
+                    runtime.getContext().report(
+                        "Failed to start global script '" + name.getRefIdString() + "': script record not found");
+                    return;
+                }
+
                 MWBase::Environment::get().getScriptManager()->getGlobalScripts().addScript(name, target);
             }
         };
@@ -206,6 +216,14 @@ namespace MWScript
             {
                 const ESM::RefId& name = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
+
+                if (!MWBase::Environment::get().getESMStore()->get<ESM::Script>().search(name))
+                {
+                    runtime.getContext().report(
+                        "Failed to stop global script '" + name.getRefIdString() + "': script record not found");
+                    return;
+                }
+
                 MWBase::Environment::get().getScriptManager()->getGlobalScripts().removeScript(name);
             }
         };
@@ -585,15 +603,15 @@ namespace MWScript
                     key = ESM::MagicEffect::effectGmstIdToIndex(effect);
 
                 const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-
-                const MWMechanics::MagicEffects& effects = stats.getMagicEffects();
-
-                for (const auto& activeEffect : effects)
+                for (const auto& spell : stats.getActiveSpells())
                 {
-                    if (activeEffect.first.mId == key && activeEffect.second.getModifier() > 0)
+                    for (const auto& effect : spell.getEffects())
                     {
-                        runtime.push(1);
-                        return;
+                        if (effect.mFlags & ESM::ActiveEffect::Flag_Applied && effect.mEffectId == key)
+                        {
+                            runtime.push(1);
+                            return;
+                        }
                     }
                 }
                 runtime.push(0);
@@ -614,7 +632,7 @@ namespace MWScript
                 ESM::RefId gem = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                if (!ptr.getClass().hasInventoryStore(ptr))
+                if (!ptr.getClass().isActor())
                     return;
 
                 const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@@ -647,10 +665,10 @@ namespace MWScript
                 for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                if (!ptr.getClass().hasInventoryStore(ptr))
+                if (!ptr.getClass().isActor())
                     return;
 
-                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
                 for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
                 {
                     if (it->getCellRef().getSoul() == soul)
@@ -687,46 +705,48 @@ namespace MWScript
                 if (!ptr.getClass().isActor())
                     return;
 
+                MWWorld::InventoryStore* invStorePtr = nullptr;
                 if (ptr.getClass().hasInventoryStore(ptr))
                 {
+                    invStorePtr = &ptr.getClass().getInventoryStore(ptr);
                     // Prefer dropping unequipped items first; re-stack if possible by unequipping items before dropping
                     // them.
-                    MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
-                    int numNotEquipped = store.count(item);
+                    int numNotEquipped = invStorePtr->count(item);
                     for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
                     {
-                        MWWorld::ConstContainerStoreIterator it = store.getSlot(slot);
-                        if (it != store.end() && it->getCellRef().getRefId() == item)
+                        MWWorld::ConstContainerStoreIterator it = invStorePtr->getSlot(slot);
+                        if (it != invStorePtr->end() && it->getCellRef().getRefId() == item)
                         {
-                            numNotEquipped -= it->getRefData().getCount();
+                            numNotEquipped -= it->getCellRef().getCount();
                         }
                     }
 
                     for (int slot = 0; slot < MWWorld::InventoryStore::Slots && amount > numNotEquipped; ++slot)
                     {
-                        MWWorld::ContainerStoreIterator it = store.getSlot(slot);
-                        if (it != store.end() && it->getCellRef().getRefId() == item)
+                        MWWorld::ContainerStoreIterator it = invStorePtr->getSlot(slot);
+                        if (it != invStorePtr->end() && it->getCellRef().getRefId() == item)
                         {
-                            int numToRemove = std::min(amount - numNotEquipped, it->getRefData().getCount());
-                            store.unequipItemQuantity(*it, numToRemove);
+                            int numToRemove = std::min(amount - numNotEquipped, it->getCellRef().getCount());
+                            invStorePtr->unequipItemQuantity(*it, numToRemove);
                             numNotEquipped += numToRemove;
                         }
                     }
+                }
 
-                    for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
+                for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
+                {
+                    if (iter->getCellRef().getRefId() == item && (!invStorePtr || !invStorePtr->isEquipped(*iter)))
                     {
-                        if (iter->getCellRef().getRefId() == item && !store.isEquipped(*iter))
-                        {
-                            int removed = store.remove(*iter, amount);
-                            MWWorld::Ptr dropped
-                                = MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter, removed);
-                            dropped.getCellRef().setOwner(ESM::RefId());
+                        int removed = store.remove(*iter, amount);
+                        MWWorld::Ptr dropped
+                            = MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter, removed);
+                        dropped.getCellRef().setOwner(ESM::RefId());
 
-                            amount -= removed;
+                        amount -= removed;
 
-                            if (amount <= 0)
-                                break;
-                        }
+                        if (amount <= 0)
+                            break;
                     }
                 }
 
@@ -763,10 +783,10 @@ namespace MWScript
                 ESM::RefId soul = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                if (!ptr.getClass().hasInventoryStore(ptr))
+                if (!ptr.getClass().isActor())
                     return;
 
-                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
 
                 for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
                 {
@@ -1329,8 +1349,10 @@ namespace MWScript
             {
                 MWWorld::Ptr player = MWMechanics::getPlayer();
                 player.getClass().getNpcStats(player).setBounty(0);
-                MWBase::Environment::get().getWorld()->confiscateStolenItems(player);
-                MWBase::Environment::get().getWorld()->getPlayer().recordCrimeId();
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                world->confiscateStolenItems(player);
+                world->getPlayer().recordCrimeId();
+                world->getPlayer().setDrawState(MWMechanics::DrawState::Nothing);
             }
         };
 
@@ -1399,7 +1421,7 @@ namespace MWScript
 
                 if (ptr.getRefData().isDeletedByContentFile())
                     msg << "[Deleted by content file]" << std::endl;
-                if (!ptr.getRefData().getCount())
+                if (!ptr.getCellRef().getCount())
                     msg << "[Deleted]" << std::endl;
 
                 msg << "RefID: " << ptr.getCellRef().getRefId() << std::endl;
@@ -1415,9 +1437,9 @@ namespace MWScript
                     osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
                     msg << "Coordinates: " << pos.x() << " " << pos.y() << " " << pos.z() << std::endl;
                     auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                    std::string model
-                        = ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getModel(ptr), vfs);
-                    msg << "Model: " << model << std::endl;
+                    const VFS::Path::Normalized model
+                        = ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getCorrectedModel(ptr), vfs);
+                    msg << "Model: " << model.value() << std::endl;
                     if (!model.empty())
                     {
                         const std::string archive = vfs->getArchive(model);
@@ -1454,7 +1476,7 @@ namespace MWScript
 
                                 if (lastTextureSrc.empty() || textureSrc != lastTextureSrc)
                                 {
-                                    lastTextureSrc = textureSrc;
+                                    lastTextureSrc = std::move(textureSrc);
                                     if (lastTextureSrc.empty())
                                         lastTextureSrc = "[No Source]";
 
@@ -1692,7 +1714,7 @@ namespace MWScript
                 for (const T& record : store.get<T>())
                 {
                     MWWorld::ManualRef ref(store, record.mId);
-                    std::string model = ref.getPtr().getClass().getModel(ref.getPtr());
+                    VFS::Path::Normalized model(ref.getPtr().getClass().getCorrectedModel(ref.getPtr()));
                     if (!model.empty())
                     {
                         sceneManager->getTemplate(model);
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 14194de61d..e8d57b4c74 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -24,20 +24,16 @@
 
 namespace MWScript
 {
-    ScriptManager::ScriptManager(const MWWorld::ESMStore& store, Compiler::Context& compilerContext, int warningsMode,
-        const std::vector<ESM::RefId>& scriptBlacklist)
+    ScriptManager::ScriptManager(const MWWorld::ESMStore& store, Compiler::Context& compilerContext, int warningsMode)
         : mErrorHandler()
         , mStore(store)
         , mCompilerContext(compilerContext)
         , mParser(mErrorHandler, mCompilerContext)
-        , mOpcodesInstalled(false)
         , mGlobalScripts(store)
     {
+        installOpcodes(mInterpreter);
+
         mErrorHandler.setWarningsMode(warningsMode);
-
-        mScriptBlacklist.resize(scriptBlacklist.size());
-
-        std::sort(mScriptBlacklist.begin(), mScriptBlacklist.end());
     }
 
     bool ScriptManager::compile(const ESM::RefId& name)
@@ -110,14 +106,9 @@ namespace MWScript
         const auto& target = interpreterContext.getTarget();
         if (!iter->second.mProgram.mInstructions.empty()
             && iter->second.mInactive.find(target) == iter->second.mInactive.end())
+        {
             try
             {
-                if (!mOpcodesInstalled)
-                {
-                    installOpcodes(mInterpreter);
-                    mOpcodesInstalled = true;
-                }
-
                 mInterpreter.run(iter->second.mProgram, interpreterContext);
                 return true;
             }
@@ -131,6 +122,7 @@ namespace MWScript
 
                 iter->second.mInactive.insert(target); // don't execute again.
             }
+        }
         return false;
     }
 
@@ -151,13 +143,10 @@ namespace MWScript
 
         for (auto& script : mStore.get<ESM::Script>())
         {
-            if (!std::binary_search(mScriptBlacklist.begin(), mScriptBlacklist.end(), script.mId))
-            {
-                ++count;
+            ++count;
 
-                if (compile(script.mId))
-                    ++success;
-            }
+            if (compile(script.mId))
+                ++success;
         }
 
         return std::make_pair(count, success);
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index de1ce286a6..b17057ae28 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -42,7 +42,6 @@ namespace MWScript
         Compiler::Context& mCompilerContext;
         Compiler::FileParser mParser;
         Interpreter::Interpreter mInterpreter;
-        bool mOpcodesInstalled;
 
         struct CompiledScript
         {
@@ -60,11 +59,9 @@ namespace MWScript
         std::unordered_map<ESM::RefId, CompiledScript> mScripts;
         GlobalScripts mGlobalScripts;
         std::unordered_map<ESM::RefId, Compiler::Locals> mOtherLocals;
-        std::vector<ESM::RefId> mScriptBlacklist;
 
     public:
-        ScriptManager(const MWWorld::ESMStore& store, Compiler::Context& compilerContext, int warningsMode,
-            const std::vector<ESM::RefId>& scriptBlacklist);
+        ScriptManager(const MWWorld::ESMStore& store, Compiler::Context& compilerContext, int warningsMode);
 
         void clear() override;
 
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 39944970bf..d2b41fb87a 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -102,11 +102,11 @@ namespace MWScript
                 std::string_view region{ runtime.getStringLiteral(runtime[0].mInteger) };
                 runtime.pop();
 
-                std::vector<char> chances;
+                std::vector<uint8_t> chances;
                 chances.reserve(10);
                 while (arg0 > 0)
                 {
-                    chances.push_back(std::clamp(runtime[0].mInteger, 0, 127));
+                    chances.push_back(std::clamp(runtime[0].mInteger, 0, 100));
                     runtime.pop();
                     arg0--;
                 }
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index f1ac2a7a08..c248c30520 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -33,7 +33,7 @@ namespace MWScript
                 MWScript::InterpreterContext& context
                     = static_cast<MWScript::InterpreterContext&>(runtime.getContext());
 
-                std::string file{ runtime.getStringLiteral(runtime[0].mInteger) };
+                VFS::Path::Normalized file{ runtime.getStringLiteral(runtime[0].mInteger) };
                 runtime.pop();
 
                 std::string_view text = runtime.getStringLiteral(runtime[0].mInteger);
@@ -63,10 +63,11 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime& runtime) override
             {
-                std::string sound{ runtime.getStringLiteral(runtime[0].mInteger) };
+                const VFS::Path::Normalized music(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                MWBase::Environment::get().getSoundManager()->streamMusic(sound);
+                MWBase::Environment::get().getSoundManager()->streamMusic(
+                    Misc::ResourceHelpers::correctMusicPath(music), MWSound::MusicType::MWScript);
             }
         };
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 0363f21fa6..96a9c4f507 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -85,7 +85,9 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).getLevel();
+                Interpreter::Type_Integer value = -1;
+                if (ptr.getClass().isActor())
+                    value = ptr.getClass().getCreatureStats(ptr).getLevel();
 
                 runtime.push(value);
             }
@@ -102,7 +104,8 @@ namespace MWScript
                 Interpreter::Type_Integer value = runtime[0].mInteger;
                 runtime.pop();
 
-                ptr.getClass().getCreatureStats(ptr).setLevel(value);
+                if (ptr.getClass().isActor())
+                    ptr.getClass().getCreatureStats(ptr).setLevel(value);
             }
         };
 
@@ -121,7 +124,9 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                Interpreter::Type_Float value = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex).getModified();
+                Interpreter::Type_Float value = 0.f;
+                if (ptr.getClass().isActor())
+                    value = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex).getModified();
 
                 runtime.push(value);
             }
@@ -145,6 +150,9 @@ namespace MWScript
                 Interpreter::Type_Float value = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 MWMechanics::AttributeValue attribute = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex);
                 attribute.setBase(value, true);
                 ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
@@ -169,6 +177,9 @@ namespace MWScript
                 Interpreter::Type_Float value = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 MWMechanics::AttributeValue attribute = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex);
                 modStat(attribute, value);
                 ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
@@ -189,14 +200,14 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
-                Interpreter::Type_Float value;
+                Interpreter::Type_Float value = 0.f;
 
                 if (mIndex == 0 && ptr.getClass().hasItemHealth(ptr))
                 {
                     // health is a special case
                     value = static_cast<Interpreter::Type_Float>(ptr.getClass().getItemMaxHealth(ptr));
                 }
-                else
+                else if (ptr.getClass().isActor())
                 {
                     value = ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex).getCurrent();
                     // GetMagicka shouldn't return negative values
@@ -225,6 +236,9 @@ namespace MWScript
                 Interpreter::Type_Float value = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 MWMechanics::DynamicStat<float> stat(ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex));
 
                 stat.setBase(value);
@@ -254,6 +268,9 @@ namespace MWScript
                 Interpreter::Type_Float diff = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 // workaround broken endgame scripts that kill dagoth ur
                 if (!R::implicit && ptr.getCellRef().getRefId() == "dagoth_ur_1")
                 {
@@ -301,6 +318,9 @@ namespace MWScript
                 Interpreter::Type_Float diff = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
                 Interpreter::Type_Float current = stats.getDynamic(mIndex).getCurrent();
@@ -336,9 +356,16 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
+
+                if (!ptr.getClass().isActor())
+                {
+                    runtime.push(0.f);
+                    return;
+                }
+
                 const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                runtime.push(stats.getDynamic(mIndex).getRatio());
+                runtime.push(stats.getDynamic(mIndex).getRatio(false));
             }
         };
 
@@ -357,6 +384,12 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
+                if (!ptr.getClass().isActor())
+                {
+                    runtime.push(0.f);
+                    return;
+                }
+
                 Interpreter::Type_Float value = ptr.getClass().getSkill(ptr, mId);
 
                 runtime.push(value);
@@ -381,6 +414,9 @@ namespace MWScript
                 Interpreter::Type_Float value = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!ptr.getClass().isNpc())
+                    return;
+
                 MWMechanics::NpcStats& stats = ptr.getClass().getNpcStats(ptr);
 
                 stats.getSkill(mId).setBase(value, true);
@@ -405,6 +441,9 @@ namespace MWScript
                 Interpreter::Type_Float value = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!ptr.getClass().isNpc())
+                    return;
+
                 MWMechanics::SkillValue& skill = ptr.getClass().getNpcStats(ptr).getSkill(mId);
                 modStat(skill, value);
             }
@@ -445,10 +484,12 @@ namespace MWScript
             {
                 MWBase::World* world = MWBase::Environment::get().getWorld();
                 MWWorld::Ptr player = world->getPlayerPtr();
-
-                player.getClass().getNpcStats(player).setBounty(
-                    static_cast<int>(runtime[0].mFloat) + player.getClass().getNpcStats(player).getBounty());
+                int bounty = std::max(
+                    0, static_cast<int>(runtime[0].mFloat) + player.getClass().getNpcStats(player).getBounty());
+                player.getClass().getNpcStats(player).setBounty(bounty);
                 runtime.pop();
+                if (bounty == 0)
+                    MWBase::Environment::get().getWorld()->getPlayer().recordCrimeId();
             }
         };
 
@@ -463,6 +504,9 @@ namespace MWScript
                 ESM::RefId id = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 const ESM::Spell* spell = MWBase::Environment::get().getESMStore()->get<ESM::Spell>().find(id);
 
                 MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
@@ -489,6 +533,9 @@ namespace MWScript
                 ESM::RefId id = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
                 creatureStats.getSpells().remove(id);
 
@@ -512,7 +559,8 @@ namespace MWScript
                 ESM::RefId spellid = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                ptr.getClass().getCreatureStats(ptr).getActiveSpells().removeEffects(ptr, spellid);
+                if (ptr.getClass().isActor())
+                    ptr.getClass().getCreatureStats(ptr).getActiveSpells().removeEffectsBySourceSpellId(ptr, spellid);
             }
         };
 
@@ -527,7 +575,8 @@ namespace MWScript
                 Interpreter::Type_Integer effectId = runtime[0].mInteger;
                 runtime.pop();
 
-                ptr.getClass().getCreatureStats(ptr).getActiveSpells().purgeEffect(ptr, effectId);
+                if (ptr.getClass().isActor())
+                    ptr.getClass().getCreatureStats(ptr).getActiveSpells().purgeEffect(ptr, effectId);
             }
         };
 
@@ -843,7 +892,10 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                runtime.push(ptr.getClass().getCreatureStats(ptr).hasCommonDisease());
+                if (ptr.getClass().isActor())
+                    runtime.push(ptr.getClass().getCreatureStats(ptr).hasCommonDisease());
+                else
+                    runtime.push(0);
             }
         };
 
@@ -855,7 +907,10 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                runtime.push(ptr.getClass().getCreatureStats(ptr).hasBlightDisease());
+                if (ptr.getClass().isActor())
+                    runtime.push(ptr.getClass().getCreatureStats(ptr).hasBlightDisease());
+                else
+                    runtime.push(0);
             }
         };
 
@@ -870,9 +925,16 @@ namespace MWScript
                 ESM::RefId race = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                const ESM::RefId& npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
+                if (ptr.getClass().isNpc())
+                {
+                    const ESM::RefId& npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
 
-                runtime.push(race == npcRace);
+                    runtime.push(race == npcRace);
+                }
+                else
+                {
+                    runtime.push(0);
+                }
             }
         };
 
@@ -938,7 +1000,7 @@ namespace MWScript
                 MWWorld::Ptr player = MWMechanics::getPlayer();
                 if (!factionID.empty())
                 {
-                    player.getClass().getNpcStats(player).expell(factionID);
+                    player.getClass().getNpcStats(player).expell(factionID, true);
                 }
             }
         };
@@ -1041,10 +1103,15 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).hasDied();
+                Interpreter::Type_Integer value = 0;
+                if (ptr.getClass().isActor())
+                {
+                    auto& stats = ptr.getClass().getCreatureStats(ptr);
+                    value = stats.hasDied();
 
-                if (value)
-                    ptr.getClass().getCreatureStats(ptr).clearHasDied();
+                    if (value)
+                        stats.clearHasDied();
+                }
 
                 runtime.push(value);
             }
@@ -1058,10 +1125,15 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).hasBeenMurdered();
+                Interpreter::Type_Integer value = 0;
+                if (ptr.getClass().isActor())
+                {
+                    auto& stats = ptr.getClass().getCreatureStats(ptr);
+                    value = stats.hasBeenMurdered();
 
-                if (value)
-                    ptr.getClass().getCreatureStats(ptr).clearHasBeenMurdered();
+                    if (value)
+                        stats.clearHasBeenMurdered();
+                }
 
                 runtime.push(value);
             }
@@ -1075,7 +1147,9 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                Interpreter::Type_Integer value = ptr.getClass().getCreatureStats(ptr).getKnockedDownOneFrame();
+                Interpreter::Type_Integer value = 0;
+                if (ptr.getClass().isActor())
+                    value = ptr.getClass().getCreatureStats(ptr).getKnockedDownOneFrame();
 
                 runtime.push(value);
             }
@@ -1088,7 +1162,10 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
-                runtime.push(ptr.getClass().getNpcStats(ptr).isWerewolf());
+                if (ptr.getClass().isNpc())
+                    runtime.push(ptr.getClass().getNpcStats(ptr).isWerewolf());
+                else
+                    runtime.push(0);
             }
         };
 
@@ -1099,7 +1176,8 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
-                MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, set);
+                if (ptr.getClass().isNpc())
+                    MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, set);
             }
         };
 
@@ -1110,7 +1188,8 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
-                MWBase::Environment::get().getMechanicsManager()->applyWerewolfAcrobatics(ptr);
+                if (ptr.getClass().isNpc())
+                    MWBase::Environment::get().getMechanicsManager()->applyWerewolfAcrobatics(ptr);
             }
         };
 
@@ -1122,6 +1201,9 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
+                if (!ptr.getClass().isActor())
+                    return;
+
                 if (ptr == MWMechanics::getPlayer())
                 {
                     MWBase::Environment::get().getMechanicsManager()->resurrect(ptr);
@@ -1190,6 +1272,12 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
+                if (!ptr.getClass().isActor())
+                {
+                    runtime.push(0);
+                    return;
+                }
+
                 const MWMechanics::MagicEffects& effects = ptr.getClass().getCreatureStats(ptr).getMagicEffects();
                 float currentValue = effects.getOrDefault(mPositiveEffect).getMagnitude();
                 if (mNegativeEffect != -1)
@@ -1224,6 +1312,13 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
+
+                int arg = runtime[0].mInteger;
+                runtime.pop();
+
+                if (!ptr.getClass().isActor())
+                    return;
+
                 MWMechanics::MagicEffects& effects = ptr.getClass().getCreatureStats(ptr).getMagicEffects();
                 float currentValue = effects.getOrDefault(mPositiveEffect).getMagnitude();
                 if (mNegativeEffect != -1)
@@ -1237,8 +1332,6 @@ namespace MWScript
                 if (mPositiveEffect == ESM::MagicEffect::ResistFrost)
                     currentValue += effects.getOrDefault(ESM::MagicEffect::FrostShield).getMagnitude();
 
-                int arg = runtime[0].mInteger;
-                runtime.pop();
                 effects.modifyBase(mPositiveEffect, (arg - static_cast<int>(currentValue)));
             }
         };
@@ -1259,10 +1352,14 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
-                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
                 int arg = runtime[0].mInteger;
                 runtime.pop();
+
+                if (!ptr.getClass().isActor())
+                    return;
+
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
                 stats.getMagicEffects().modifyBase(mPositiveEffect, arg);
             }
         };
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 614fbbe26f..bf09269f1e 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -4,6 +4,8 @@
 
 #include <components/esm3/loadcell.hpp>
 
+#include <components/esm/util.hpp>
+
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
@@ -166,7 +168,7 @@ namespace MWScript
                 float az = ptr.getRefData().getPosition().rot[2];
 
                 // XYZ axis use the inverse (XYZ) rotation order like vanilla SetAngle.
-                // UWV axis use the standard (ZYX) rotation order like TESCS/OpenMW-CS and the rest of the game.
+                // UVW axis use the standard (ZYX) rotation order like TESCS/OpenMW-CS and the rest of the game.
                 if (axis == "x")
                     MWBase::Environment::get().getWorld()->rotateObject(
                         ptr, osg::Vec3f(angle, ay, az), MWBase::RotationFlag_inverseOrder);
@@ -179,10 +181,10 @@ namespace MWScript
                 else if (axis == "u")
                     MWBase::Environment::get().getWorld()->rotateObject(
                         ptr, osg::Vec3f(angle, ay, az), MWBase::RotationFlag_none);
-                else if (axis == "w")
+                else if (axis == "v")
                     MWBase::Environment::get().getWorld()->rotateObject(
                         ptr, osg::Vec3f(ax, angle, az), MWBase::RotationFlag_none);
-                else if (axis == "v")
+                else if (axis == "w")
                     MWBase::Environment::get().getWorld()->rotateObject(
                         ptr, osg::Vec3f(ax, ay, angle), MWBase::RotationFlag_none);
             }
diff --git a/apps/openmw/mwsound/constants.hpp b/apps/openmw/mwsound/constants.hpp
new file mode 100644
index 0000000000..217dd1935e
--- /dev/null
+++ b/apps/openmw/mwsound/constants.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_APPS_OPENMW_MWSOUND_CONSTANTS_H
+#define OPENMW_APPS_OPENMW_MWSOUND_CONSTANTS_H
+
+#include <components/vfs/pathutil.hpp>
+
+namespace MWSound
+{
+    constexpr VFS::Path::NormalizedView battlePlaylist("battle");
+    constexpr VFS::Path::NormalizedView explorePlaylist("explore");
+    constexpr VFS::Path::NormalizedView titleMusic("music/special/morrowind title.mp3");
+    constexpr VFS::Path::NormalizedView triumphMusic("music/special/mw_triumph.mp3");
+    constexpr VFS::Path::NormalizedView deathMusic("music/special/mw_death.mp3");
+}
+
+#endif
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index bd63d3de40..54fd126c41 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -1,15 +1,48 @@
 #include "ffmpeg_decoder.hpp"
 
-#include <memory>
-
 #include <algorithm>
+#include <memory>
 #include <stdexcept>
+#include <utility>
 
 #include <components/debug/debuglog.hpp>
 #include <components/vfs/manager.hpp>
 
+#include <extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp>
+#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+
+#if OPENMW_FFMPEG_5_OR_GREATER
+#include <libavutil/channel_layout.h>
+#endif
+
 namespace MWSound
 {
+    void AVIOContextDeleter::operator()(AVIOContext* ptr) const
+    {
+        if (ptr->buffer != nullptr)
+            av_freep(&ptr->buffer);
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
+        avio_context_free(&ptr);
+#else
+        av_free(ptr);
+#endif
+    }
+
+    void AVFormatContextDeleter::operator()(AVFormatContext* ptr) const
+    {
+        avformat_close_input(&ptr);
+    }
+
+    void AVCodecContextDeleter::operator()(AVCodecContext* ptr) const
+    {
+        avcodec_free_context(&ptr);
+    }
+
+    void AVFrameDeleter::operator()(AVFrame* ptr) const
+    {
+        av_frame_free(&ptr);
+    }
 
     int FFmpeg_Decoder::readPacket(void* user_data, uint8_t* buf, int buf_size)
     {
@@ -21,7 +54,9 @@ namespace MWSound
             std::streamsize count = stream.gcount();
             if (count == 0)
                 return AVERROR_EOF;
-            return count;
+            if (count > std::numeric_limits<int>::max())
+                return AVERROR_BUG;
+            return static_cast<int>(count);
         }
         catch (std::exception&)
         {
@@ -29,7 +64,11 @@ namespace MWSound
         }
     }
 
+#if OPENMW_FFMPEG_CONST_WRITEPACKET
+    int FFmpeg_Decoder::writePacket(void*, const uint8_t*, int)
+#else
     int FFmpeg_Decoder::writePacket(void*, uint8_t*, int)
+#endif
     {
         Log(Debug::Error) << "can't write to read-only stream";
         return -1;
@@ -72,8 +111,8 @@ namespace MWSound
         if (!mStream)
             return false;
 
-        int stream_idx = mStream - mFormatCtx->streams;
-        while (av_read_frame(mFormatCtx, &mPacket) >= 0)
+        std::ptrdiff_t stream_idx = mStream - mFormatCtx->streams;
+        while (av_read_frame(mFormatCtx.get(), &mPacket) >= 0)
         {
             /* Check if the packet belongs to this stream */
             if (stream_idx == mPacket.stream_index)
@@ -100,12 +139,12 @@ namespace MWSound
         do
         {
             /* Decode some data, and check for errors */
-            int ret = avcodec_receive_frame(mCodecCtx, mFrame);
+            int ret = avcodec_receive_frame(mCodecCtx.get(), mFrame.get());
             if (ret == AVERROR(EAGAIN))
             {
                 if (mPacket.size == 0 && !getNextPacket())
                     return false;
-                ret = avcodec_send_packet(mCodecCtx, &mPacket);
+                ret = avcodec_send_packet(mCodecCtx.get(), &mPacket);
                 av_packet_unref(&mPacket);
                 if (ret == 0)
                     continue;
@@ -124,7 +163,11 @@ namespace MWSound
                 if (!mDataBuf || mDataBufLen < mFrame->nb_samples)
                 {
                     av_freep(&mDataBuf);
+#if OPENMW_FFMPEG_5_OR_GREATER
+                    if (av_samples_alloc(&mDataBuf, nullptr, mOutputChannelLayout.nb_channels,
+#else
                     if (av_samples_alloc(&mDataBuf, nullptr, av_get_channel_layout_nb_channels(mOutputChannelLayout),
+#endif
                             mFrame->nb_samples, mOutputSampleFormat, 0)
                         < 0)
                         return false;
@@ -161,7 +204,11 @@ namespace MWSound
                 if (!getAVAudioData())
                     break;
                 mFramePos = 0;
+#if OPENMW_FFMPEG_5_OR_GREATER
+                mFrameSize = mFrame->nb_samples * mOutputChannelLayout.nb_channels
+#else
                 mFrameSize = mFrame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout)
+#endif
                     * av_get_bytes_per_sample(mOutputSampleFormat);
             }
 
@@ -180,142 +227,108 @@ namespace MWSound
         return dec;
     }
 
-    void FFmpeg_Decoder::open(const std::string& fname)
+    void FFmpeg_Decoder::open(VFS::Path::NormalizedView fname)
     {
         close();
         mDataStream = mResourceMgr->get(fname);
 
-        if ((mFormatCtx = avformat_alloc_context()) == nullptr)
+        AVIOContextPtr ioCtx(avio_alloc_context(nullptr, 0, 0, this, readPacket, writePacket, seek));
+        if (ioCtx == nullptr)
+            throw std::runtime_error("Failed to allocate AVIO context");
+
+        AVFormatContext* formatCtx = avformat_alloc_context();
+        if (formatCtx == nullptr)
             throw std::runtime_error("Failed to allocate context");
 
-        try
+        formatCtx->pb = ioCtx.get();
+
+        // avformat_open_input frees user supplied AVFormatContext on failure
+        if (avformat_open_input(&formatCtx, fname.value().data(), nullptr, nullptr) != 0)
+            throw std::runtime_error("Failed to open input");
+
+        AVFormatContextPtr formatCtxPtr(std::exchange(formatCtx, nullptr));
+
+        if (avformat_find_stream_info(formatCtxPtr.get(), nullptr) < 0)
+            throw std::runtime_error("Failed to find stream info");
+
+        AVStream** stream = nullptr;
+        for (size_t j = 0; j < formatCtxPtr->nb_streams; j++)
         {
-            mFormatCtx->pb = avio_alloc_context(nullptr, 0, 0, this, readPacket, writePacket, seek);
-            if (!mFormatCtx->pb || avformat_open_input(&mFormatCtx, fname.c_str(), nullptr, nullptr) != 0)
+            if (formatCtxPtr->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
             {
-                // "Note that a user-supplied AVFormatContext will be freed on failure".
-                if (mFormatCtx)
-                {
-                    if (mFormatCtx->pb != nullptr)
-                    {
-                        if (mFormatCtx->pb->buffer != nullptr)
-                        {
-                            av_free(mFormatCtx->pb->buffer);
-                            mFormatCtx->pb->buffer = nullptr;
-                        }
-                        av_free(mFormatCtx->pb);
-                        mFormatCtx->pb = nullptr;
-                    }
-                    avformat_free_context(mFormatCtx);
-                }
-                mFormatCtx = nullptr;
-                throw std::runtime_error("Failed to allocate input stream");
+                stream = &formatCtxPtr->streams[j];
+                break;
             }
+        }
 
-            if (avformat_find_stream_info(mFormatCtx, nullptr) < 0)
-                throw std::runtime_error("Failed to find stream info in " + fname);
+        if (stream == nullptr)
+            throw std::runtime_error("No audio streams");
 
-            for (size_t j = 0; j < mFormatCtx->nb_streams; j++)
-            {
-                if (mFormatCtx->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
-                {
-                    mStream = &mFormatCtx->streams[j];
-                    break;
-                }
-            }
-            if (!mStream)
-                throw std::runtime_error("No audio streams in " + fname);
+        const AVCodec* codec = avcodec_find_decoder((*stream)->codecpar->codec_id);
+        if (codec == nullptr)
+            throw std::runtime_error("No codec found for id " + std::to_string((*stream)->codecpar->codec_id));
 
-            const AVCodec* codec = avcodec_find_decoder((*mStream)->codecpar->codec_id);
-            if (!codec)
-            {
-                std::string ss = "No codec found for id " + std::to_string((*mStream)->codecpar->codec_id);
-                throw std::runtime_error(ss);
-            }
+        AVCodecContext* codecCtx = avcodec_alloc_context3(codec);
+        if (codecCtx == nullptr)
+            throw std::runtime_error("Failed to allocate codec context");
 
-            AVCodecContext* avctx = avcodec_alloc_context3(codec);
-            avcodec_parameters_to_context(avctx, (*mStream)->codecpar);
+        avcodec_parameters_to_context(codecCtx, (*stream)->codecpar);
 
 // This is not needed anymore above FFMpeg version 4.0
 #if LIBAVCODEC_VERSION_INT < 3805796
-            av_codec_set_pkt_timebase(avctx, (*mStream)->time_base);
+        av_codec_set_pkt_timebase(avctx, (*stream)->time_base);
 #endif
 
-            mCodecCtx = avctx;
+        AVCodecContextPtr codecCtxPtr(std::exchange(codecCtx, nullptr));
 
-            if (avcodec_open2(mCodecCtx, codec, nullptr) < 0)
-                throw std::runtime_error(std::string("Failed to open audio codec ") + codec->long_name);
+        if (avcodec_open2(codecCtxPtr.get(), codec, nullptr) < 0)
+            throw std::runtime_error(std::string("Failed to open audio codec ") + codec->long_name);
 
-            mFrame = av_frame_alloc();
+        AVFramePtr frame(av_frame_alloc());
+        if (frame == nullptr)
+            throw std::runtime_error("Failed to allocate frame");
 
-            if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_U8P)
-                mOutputSampleFormat = AV_SAMPLE_FMT_U8;
-            // FIXME: Check for AL_EXT_FLOAT32 support
-            // else if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLT || mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLTP)
-            //     mOutputSampleFormat = AV_SAMPLE_FMT_S16;
-            else
-                mOutputSampleFormat = AV_SAMPLE_FMT_S16;
+        if (codecCtxPtr->sample_fmt == AV_SAMPLE_FMT_U8P)
+            mOutputSampleFormat = AV_SAMPLE_FMT_U8;
+        // FIXME: Check for AL_EXT_FLOAT32 support
+        // else if (codecCtxPtr->sample_fmt == AV_SAMPLE_FMT_FLT || codecCtxPtr->sample_fmt == AV_SAMPLE_FMT_FLTP)
+        //     mOutputSampleFormat = AV_SAMPLE_FMT_S16;
+        else
+            mOutputSampleFormat = AV_SAMPLE_FMT_S16;
 
-            mOutputChannelLayout = (*mStream)->codecpar->channel_layout;
-            if (mOutputChannelLayout == 0)
-                mOutputChannelLayout = av_get_default_channel_layout(mCodecCtx->channels);
+#if OPENMW_FFMPEG_5_OR_GREATER
+        mOutputChannelLayout = (*stream)->codecpar->ch_layout; // sefault
+        if (mOutputChannelLayout.u.mask == 0)
+            av_channel_layout_default(&mOutputChannelLayout, codecCtxPtr->ch_layout.nb_channels);
 
-            mCodecCtx->channel_layout = mOutputChannelLayout;
-        }
-        catch (...)
-        {
-            if (mStream)
-                avcodec_free_context(&mCodecCtx);
-            mStream = nullptr;
+        codecCtxPtr->ch_layout = mOutputChannelLayout;
+#else
+        mOutputChannelLayout = (*stream)->codecpar->channel_layout;
+        if (mOutputChannelLayout == 0)
+            mOutputChannelLayout = av_get_default_channel_layout(codecCtxPtr->channels);
 
-            if (mFormatCtx != nullptr)
-            {
-                if (mFormatCtx->pb->buffer != nullptr)
-                {
-                    av_free(mFormatCtx->pb->buffer);
-                    mFormatCtx->pb->buffer = nullptr;
-                }
-                av_free(mFormatCtx->pb);
-                mFormatCtx->pb = nullptr;
+        codecCtxPtr->channel_layout = mOutputChannelLayout;
+#endif
 
-                avformat_close_input(&mFormatCtx);
-            }
-        }
+        mIoCtx = std::move(ioCtx);
+        mFrame = std::move(frame);
+        mFormatCtx = std::move(formatCtxPtr);
+        mCodecCtx = std::move(codecCtxPtr);
+        mStream = stream;
     }
 
     void FFmpeg_Decoder::close()
     {
-        if (mStream)
-            avcodec_free_context(&mCodecCtx);
         mStream = nullptr;
+        mCodecCtx.reset();
 
         av_packet_unref(&mPacket);
         av_freep(&mDataBuf);
-        av_frame_free(&mFrame);
+        mFrame.reset();
         swr_free(&mSwr);
 
-        if (mFormatCtx)
-        {
-            if (mFormatCtx->pb != nullptr)
-            {
-                // mFormatCtx->pb->buffer must be freed by hand,
-                // if not, valgrind will show memleak, see:
-                //
-                // https://trac.ffmpeg.org/ticket/1357
-                //
-                if (mFormatCtx->pb->buffer != nullptr)
-                {
-                    av_freep(&mFormatCtx->pb->buffer);
-                }
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
-                avio_context_free(&mFormatCtx->pb);
-#else
-                av_freep(&mFormatCtx->pb);
-#endif
-            }
-            avformat_close_input(&mFormatCtx);
-        }
-
+        mFormatCtx.reset();
+        mIoCtx.reset();
         mDataStream.reset();
     }
 
@@ -346,41 +359,88 @@ namespace MWSound
             *type = SampleType_Int16;
         }
 
-        if (mOutputChannelLayout == AV_CH_LAYOUT_MONO)
-            *chans = ChannelConfig_Mono;
-        else if (mOutputChannelLayout == AV_CH_LAYOUT_STEREO)
-            *chans = ChannelConfig_Stereo;
-        else if (mOutputChannelLayout == AV_CH_LAYOUT_QUAD)
-            *chans = ChannelConfig_Quad;
-        else if (mOutputChannelLayout == AV_CH_LAYOUT_5POINT1)
-            *chans = ChannelConfig_5point1;
-        else if (mOutputChannelLayout == AV_CH_LAYOUT_7POINT1)
-            *chans = ChannelConfig_7point1;
-        else
+#if OPENMW_FFMPEG_5_OR_GREATER
+        switch (mOutputChannelLayout.u.mask)
+#else
+        switch (mOutputChannelLayout)
+#endif
         {
-            char str[1024];
-            av_get_channel_layout_string(str, sizeof(str), mCodecCtx->channels, mCodecCtx->channel_layout);
-            Log(Debug::Error) << "Unsupported channel layout: " << str;
-
-            if (mCodecCtx->channels == 1)
-            {
-                mOutputChannelLayout = AV_CH_LAYOUT_MONO;
+            case AV_CH_LAYOUT_MONO:
                 *chans = ChannelConfig_Mono;
-            }
-            else
-            {
-                mOutputChannelLayout = AV_CH_LAYOUT_STEREO;
+                break;
+            case AV_CH_LAYOUT_STEREO:
                 *chans = ChannelConfig_Stereo;
-            }
+                break;
+            case AV_CH_LAYOUT_QUAD:
+                *chans = ChannelConfig_Quad;
+                break;
+            case AV_CH_LAYOUT_5POINT1:
+                *chans = ChannelConfig_5point1;
+                break;
+            case AV_CH_LAYOUT_7POINT1:
+                *chans = ChannelConfig_7point1;
+                break;
+            default:
+                char str[1024];
+#if OPENMW_FFMPEG_5_OR_GREATER
+                av_channel_layout_describe(&mCodecCtx->ch_layout, str, sizeof(str));
+                Log(Debug::Error) << "Unsupported channel layout: " << str;
+
+                if (mCodecCtx->ch_layout.nb_channels == 1)
+                {
+                    mOutputChannelLayout = AV_CHANNEL_LAYOUT_MONO;
+                    *chans = ChannelConfig_Mono;
+                }
+                else
+                {
+                    mOutputChannelLayout = AV_CHANNEL_LAYOUT_STEREO;
+                    *chans = ChannelConfig_Stereo;
+                }
+#else
+                av_get_channel_layout_string(str, sizeof(str), mCodecCtx->channels, mCodecCtx->channel_layout);
+                Log(Debug::Error) << "Unsupported channel layout: " << str;
+
+                if (mCodecCtx->channels == 1)
+                {
+                    mOutputChannelLayout = AV_CH_LAYOUT_MONO;
+                    *chans = ChannelConfig_Mono;
+                }
+                else
+                {
+                    mOutputChannelLayout = AV_CH_LAYOUT_STEREO;
+                    *chans = ChannelConfig_Stereo;
+                }
+#endif
+                break;
         }
 
         *samplerate = mCodecCtx->sample_rate;
+#if OPENMW_FFMPEG_5_OR_GREATER
+        AVChannelLayout ch_layout = mCodecCtx->ch_layout;
+        if (ch_layout.u.mask == 0)
+            av_channel_layout_default(&ch_layout, mCodecCtx->ch_layout.nb_channels);
+
+        if (mOutputSampleFormat != mCodecCtx->sample_fmt || mOutputChannelLayout.u.mask != ch_layout.u.mask)
+#else
         int64_t ch_layout = mCodecCtx->channel_layout;
         if (ch_layout == 0)
             ch_layout = av_get_default_channel_layout(mCodecCtx->channels);
 
         if (mOutputSampleFormat != mCodecCtx->sample_fmt || mOutputChannelLayout != ch_layout)
+#endif
+
         {
+#if OPENMW_FFMPEG_5_OR_GREATER
+            swr_alloc_set_opts2(&mSwr, // SwrContext
+                &mOutputChannelLayout, // output ch layout
+                mOutputSampleFormat, // output sample format
+                mCodecCtx->sample_rate, // output sample rate
+                &ch_layout, // input ch layout
+                mCodecCtx->sample_fmt, // input sample format
+                mCodecCtx->sample_rate, // input sample rate
+                0, // logging level offset
+                nullptr); // log context
+#else
             mSwr = swr_alloc_set_opts(mSwr, // SwrContext
                 mOutputChannelLayout, // output ch layout
                 mOutputSampleFormat, // output sample format
@@ -390,6 +450,7 @@ namespace MWSound
                 mCodecCtx->sample_rate, // input sample rate
                 0, // logging level offset
                 nullptr); // log context
+#endif
             if (!mSwr)
                 throw std::runtime_error("Couldn't allocate SwrContext");
             int init = swr_init(mSwr);
@@ -418,7 +479,11 @@ namespace MWSound
 
         while (getAVAudioData())
         {
+#if OPENMW_FFMPEG_5_OR_GREATER
+            size_t got = mFrame->nb_samples * mOutputChannelLayout.nb_channels
+#else
             size_t got = mFrame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout)
+#endif
                 * av_get_bytes_per_sample(mOutputSampleFormat);
             const char* inbuf = reinterpret_cast<char*>(mFrameData[0]);
             output.insert(output.end(), inbuf, inbuf + got);
@@ -427,23 +492,28 @@ namespace MWSound
 
     size_t FFmpeg_Decoder::getSampleOffset()
     {
-        int delay = (mFrameSize - mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout)
+#if OPENMW_FFMPEG_5_OR_GREATER
+        std::size_t delay = (mFrameSize - mFramePos) / mOutputChannelLayout.nb_channels
+#else
+        std::size_t delay = (mFrameSize - mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout)
+#endif
             / av_get_bytes_per_sample(mOutputSampleFormat);
-        return (int)(mNextPts * mCodecCtx->sample_rate) - delay;
+        return static_cast<std::size_t>(mNextPts * mCodecCtx->sample_rate) - delay;
     }
 
     FFmpeg_Decoder::FFmpeg_Decoder(const VFS::Manager* vfs)
         : Sound_Decoder(vfs)
-        , mFormatCtx(nullptr)
-        , mCodecCtx(nullptr)
         , mStream(nullptr)
-        , mFrame(nullptr)
         , mFrameSize(0)
         , mFramePos(0)
         , mNextPts(0.0)
         , mSwr(nullptr)
         , mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
+#if OPENMW_FFMPEG_5_OR_GREATER
+        , mOutputChannelLayout({})
+#else
         , mOutputChannelLayout(0)
+#endif
         , mDataBuf(nullptr)
         , mFrameData(nullptr)
         , mDataBufLen(0)
@@ -468,5 +538,4 @@ namespace MWSound
     {
         close();
     }
-
 }
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index 88dd3316f5..e67b8efbf3 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -3,6 +3,9 @@
 
 #include <cstdint>
 
+#include <extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp>
+#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable : 4244)
@@ -32,23 +35,56 @@ extern "C"
 
 namespace MWSound
 {
+    struct AVIOContextDeleter
+    {
+        void operator()(AVIOContext* ptr) const;
+    };
+
+    using AVIOContextPtr = std::unique_ptr<AVIOContext, AVIOContextDeleter>;
+
+    struct AVFormatContextDeleter
+    {
+        void operator()(AVFormatContext* ptr) const;
+    };
+
+    using AVFormatContextPtr = std::unique_ptr<AVFormatContext, AVFormatContextDeleter>;
+
+    struct AVCodecContextDeleter
+    {
+        void operator()(AVCodecContext* ptr) const;
+    };
+
+    using AVCodecContextPtr = std::unique_ptr<AVCodecContext, AVCodecContextDeleter>;
+
+    struct AVFrameDeleter
+    {
+        void operator()(AVFrame* ptr) const;
+    };
+
+    using AVFramePtr = std::unique_ptr<AVFrame, AVFrameDeleter>;
+
     class FFmpeg_Decoder final : public Sound_Decoder
     {
-        AVFormatContext* mFormatCtx;
-        AVCodecContext* mCodecCtx;
+        AVIOContextPtr mIoCtx;
+        AVFormatContextPtr mFormatCtx;
+        AVCodecContextPtr mCodecCtx;
         AVStream** mStream;
 
         AVPacket mPacket;
-        AVFrame* mFrame;
+        AVFramePtr mFrame;
 
-        int mFrameSize;
-        int mFramePos;
+        std::size_t mFrameSize;
+        std::size_t mFramePos;
 
         double mNextPts;
 
         SwrContext* mSwr;
         enum AVSampleFormat mOutputSampleFormat;
+#if OPENMW_FFMPEG_5_OR_GREATER
+        AVChannelLayout mOutputChannelLayout;
+#else
         int64_t mOutputChannelLayout;
+#endif
         uint8_t* mDataBuf;
         uint8_t** mFrameData;
         int mDataBufLen;
@@ -58,13 +94,17 @@ namespace MWSound
         Files::IStreamPtr mDataStream;
 
         static int readPacket(void* user_data, uint8_t* buf, int buf_size);
+#if OPENMW_FFMPEG_CONST_WRITEPACKET
+        static int writePacket(void* user_data, const uint8_t* buf, int buf_size);
+#else
         static int writePacket(void* user_data, uint8_t* buf, int buf_size);
+#endif
         static int64_t seek(void* user_data, int64_t offset, int whence);
 
         bool getAVAudioData();
         size_t readAVAudioData(void* data, size_t length);
 
-        void open(const std::string& fname) override;
+        void open(VFS::Path::NormalizedView fname) override;
         void close() override;
 
         std::string getName() override;
diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp
index b1c1a3f2af..2a6ac5ac8e 100644
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@@ -15,11 +15,11 @@ namespace MWSound
             return;
 
         int samplesPerSegment = static_cast<int>(mSampleRate / mSamplesPerSec);
-        int numSamples = bytesToFrames(mQueue.size(), mChannelConfig, mSampleType);
-        int advance = framesToBytes(1, mChannelConfig, mSampleType);
+        std::size_t numSamples = bytesToFrames(mQueue.size(), mChannelConfig, mSampleType);
+        std::size_t advance = framesToBytes(1, mChannelConfig, mSampleType);
 
-        int segment = 0;
-        int sample = 0;
+        std::size_t segment = 0;
+        std::size_t sample = 0;
         while (segment < numSamples / samplesPerSegment)
         {
             float sum = 0;
@@ -61,7 +61,7 @@ namespace MWSound
         if (mSamplesPerSec <= 0.0f || mSamples.empty() || sec < 0.0f)
             return 0.0f;
 
-        size_t index = std::clamp<size_t>(sec * mSamplesPerSec, 0, mSamples.size() - 1);
+        size_t index = std::min(static_cast<size_t>(sec * mSamplesPerSec), mSamples.size() - 1);
         return mSamples[index];
     }
 
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index 1bb5275c45..962086701a 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -1,6 +1,7 @@
 #include "movieaudiofactory.hpp"
 
 #include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp>
+#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
 #include <extern/osg-ffmpeg-videoplayer/videostate.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -24,8 +25,10 @@ namespace MWSound
     private:
         MWSound::MovieAudioDecoder* mDecoder;
 
-        void open(const std::string& fname) override;
-        void close() override;
+        void open(VFS::Path::NormalizedView fname) override { throw std::runtime_error("Method not implemented"); }
+
+        void close() override {}
+
         std::string getName() override;
         void getInfo(int* samplerate, ChannelConfig* chans, SampleType* type) override;
         size_t read(char* buffer, size_t bytes) override;
@@ -44,12 +47,19 @@ namespace MWSound
 
         size_t getSampleOffset()
         {
+#if OPENMW_FFMPEG_5_OR_GREATER
+            ssize_t clock_delay = (mFrameSize - mFramePos) / mOutputChannelLayout.nb_channels
+#else
             ssize_t clock_delay = (mFrameSize - mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout)
+#endif
                 / av_get_bytes_per_sample(mOutputSampleFormat);
             return (size_t)(mAudioClock * mAudioContext->sample_rate) - clock_delay;
         }
 
-        std::string getStreamName() { return std::string(); }
+        std::string getStreamName()
+        {
+            return std::string();
+        }
 
     private:
         // MovieAudioDecoder overrides
@@ -92,12 +102,6 @@ namespace MWSound
         std::shared_ptr<MWSoundDecoderBridge> mDecoderBridge;
     };
 
-    void MWSoundDecoderBridge::open(const std::string& fname)
-    {
-        throw std::runtime_error("Method not implemented");
-    }
-    void MWSoundDecoderBridge::close() {}
-
     std::string MWSoundDecoderBridge::getName()
     {
         return mDecoder->getStreamName();
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 363a0d06b5..3c3d6fb26e 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -298,8 +298,6 @@ namespace MWSound
 
         std::atomic<bool> mIsFinished;
 
-        void updateAll(bool local);
-
         OpenAL_SoundStream(const OpenAL_SoundStream& rhs);
         OpenAL_SoundStream& operator=(const OpenAL_SoundStream& rhs);
 
@@ -610,9 +608,9 @@ namespace MWSound
                 }
             }
         }
-        catch (std::exception&)
+        catch (const std::exception& e)
         {
-            Log(Debug::Error) << "Error updating stream \"" << mDecoder->getName() << "\"";
+            Log(Debug::Error) << "Error updating stream \"" << mDecoder->getName() << "\": " << e.what();
             mIsFinished = true;
         }
         return !mIsFinished;
@@ -1034,66 +1032,7 @@ namespace MWSound
         return ret;
     }
 
-    void OpenAL_Output::setHrtf(const std::string& hrtfname, HrtfMode hrtfmode)
-    {
-        if (!mDevice || !ALC.SOFT_HRTF)
-        {
-            Log(Debug::Info) << "HRTF extension not present";
-            return;
-        }
-
-        LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
-        getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
-
-        LPALCRESETDEVICESOFT alcResetDeviceSOFT = nullptr;
-        getALCFunc(alcResetDeviceSOFT, mDevice, "alcResetDeviceSOFT");
-
-        std::vector<ALCint> attrs;
-        attrs.reserve(15);
-
-        attrs.push_back(ALC_HRTF_SOFT);
-        attrs.push_back(hrtfmode == HrtfMode::Disable ? ALC_FALSE
-                : hrtfmode == HrtfMode::Enable        ? ALC_TRUE
-                                                      :
-                                               /*hrtfmode == HrtfMode::Auto ?*/ ALC_DONT_CARE_SOFT);
-        if (!hrtfname.empty())
-        {
-            ALCint index = -1;
-            ALCint num_hrtf;
-            alcGetIntegerv(mDevice, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
-            for (ALCint i = 0; i < num_hrtf; ++i)
-            {
-                const ALCchar* entry = alcGetStringiSOFT(mDevice, ALC_HRTF_SPECIFIER_SOFT, i);
-                if (hrtfname == entry)
-                {
-                    index = i;
-                    break;
-                }
-            }
-
-            if (index < 0)
-                Log(Debug::Warning) << "Failed to find HRTF name \"" << hrtfname << "\", using default";
-            else
-            {
-                attrs.push_back(ALC_HRTF_ID_SOFT);
-                attrs.push_back(index);
-            }
-        }
-        attrs.push_back(0);
-        alcResetDeviceSOFT(mDevice, attrs.data());
-
-        ALCint hrtf_state;
-        alcGetIntegerv(mDevice, ALC_HRTF_SOFT, 1, &hrtf_state);
-        if (!hrtf_state)
-            Log(Debug::Info) << "HRTF disabled";
-        else
-        {
-            const ALCchar* hrtf = alcGetString(mDevice, ALC_HRTF_SPECIFIER_SOFT);
-            Log(Debug::Info) << "Enabled HRTF " << hrtf;
-        }
-    }
-
-    std::pair<Sound_Handle, size_t> OpenAL_Output::loadSound(const std::string& fname)
+    std::pair<Sound_Handle, size_t> OpenAL_Output::loadSound(VFS::Path::NormalizedView fname)
     {
         getALError();
 
@@ -1104,7 +1043,7 @@ namespace MWSound
         try
         {
             DecoderPtr decoder = mManager.getDecoder();
-            decoder->open(Misc::ResourceHelpers::correctSoundPath(fname, decoder->mResourceMgr));
+            decoder->open(Misc::ResourceHelpers::correctSoundPath(fname, *decoder->mResourceMgr));
 
             ChannelConfig chans;
             SampleType type;
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index eed23ac659..b419038eab 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -7,6 +7,8 @@
 #include <string>
 #include <vector>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "al.h"
 #include "alc.h"
 #include "alext.h"
@@ -84,9 +86,8 @@ namespace MWSound
         void deinit() override;
 
         std::vector<std::string> enumerateHrtf() override;
-        void setHrtf(const std::string& hrtfname, HrtfMode hrtfmode) override;
 
-        std::pair<Sound_Handle, size_t> loadSound(const std::string& fname) override;
+        std::pair<Sound_Handle, size_t> loadSound(VFS::Path::NormalizedView fname) override;
         size_t unloadSound(Sound_Handle data) override;
 
         bool playSound(Sound* sound, Sound_Handle data, float offset) override;
diff --git a/apps/openmw/mwsound/regionsoundselector.cpp b/apps/openmw/mwsound/regionsoundselector.cpp
index 8fda57596a..cb2ece7f8f 100644
--- a/apps/openmw/mwsound/regionsoundselector.cpp
+++ b/apps/openmw/mwsound/regionsoundselector.cpp
@@ -4,29 +4,18 @@
 #include <components/fallback/fallback.hpp>
 #include <components/misc/rng.hpp>
 
-#include <algorithm>
-#include <numeric>
-
 #include "../mwbase/environment.hpp"
 #include "../mwworld/esmstore.hpp"
 
 namespace MWSound
 {
-    namespace
-    {
-        int addChance(int result, const ESM::Region::SoundRef& v)
-        {
-            return result + v.mChance;
-        }
-    }
-
     RegionSoundSelector::RegionSoundSelector()
         : mMinTimeBetweenSounds(Fallback::Map::getFloat("Weather_Minimum_Time_Between_Environmental_Sounds"))
         , mMaxTimeBetweenSounds(Fallback::Map::getFloat("Weather_Maximum_Time_Between_Environmental_Sounds"))
     {
     }
 
-    std::optional<ESM::RefId> RegionSoundSelector::getNextRandom(float duration, const ESM::RefId& regionName)
+    ESM::RefId RegionSoundSelector::getNextRandom(float duration, const ESM::RefId& regionName)
     {
         mTimePassed += duration;
 
@@ -37,40 +26,17 @@ namespace MWSound
         mTimeToNextEnvSound = mMinTimeBetweenSounds + (mMaxTimeBetweenSounds - mMinTimeBetweenSounds) * a;
         mTimePassed = 0;
 
-        if (mLastRegionName != regionName)
-        {
-            mLastRegionName = regionName;
-            mSumChance = 0;
-        }
-
         const ESM::Region* const region
-            = MWBase::Environment::get().getESMStore()->get<ESM::Region>().search(mLastRegionName);
+            = MWBase::Environment::get().getESMStore()->get<ESM::Region>().search(regionName);
 
         if (region == nullptr)
             return {};
 
-        if (mSumChance == 0)
+        for (const ESM::Region::SoundRef& sound : region->mSoundList)
         {
-            mSumChance = std::accumulate(region->mSoundList.begin(), region->mSoundList.end(), 0, addChance);
-            if (mSumChance == 0)
-                return {};
+            if (Misc::Rng::roll0to99() < sound.mChance)
+                return sound.mSound;
         }
-
-        const int r = Misc::Rng::rollDice(std::max(mSumChance, 100));
-        int pos = 0;
-
-        const auto isSelected = [&](const ESM::Region::SoundRef& sound) {
-            if (r - pos < sound.mChance)
-                return true;
-            pos += sound.mChance;
-            return false;
-        };
-
-        const auto it = std::find_if(region->mSoundList.begin(), region->mSoundList.end(), isSelected);
-
-        if (it == region->mSoundList.end())
-            return {};
-
-        return it->mSound;
+        return {};
     }
 }
diff --git a/apps/openmw/mwsound/regionsoundselector.hpp b/apps/openmw/mwsound/regionsoundselector.hpp
index 1a9e6e450b..474e1afa06 100644
--- a/apps/openmw/mwsound/regionsoundselector.hpp
+++ b/apps/openmw/mwsound/regionsoundselector.hpp
@@ -2,27 +2,18 @@
 #define GAME_SOUND_REGIONSOUNDSELECTOR_H
 
 #include <components/esm/refid.hpp>
-#include <optional>
-#include <string>
-
-namespace MWBase
-{
-    class World;
-}
 
 namespace MWSound
 {
     class RegionSoundSelector
     {
     public:
-        std::optional<ESM::RefId> getNextRandom(float duration, const ESM::RefId& regionName);
+        ESM::RefId getNextRandom(float duration, const ESM::RefId& regionName);
 
         RegionSoundSelector();
 
     private:
         float mTimeToNextEnvSound = 0.0f;
-        int mSumChance = 0;
-        ESM::RefId mLastRegionName;
         float mTimePassed = 0.0;
         float mMinTimeBetweenSounds;
         float mMaxTimeBetweenSounds;
diff --git a/apps/openmw/mwsound/sound_buffer.cpp b/apps/openmw/mwsound/sound_buffer.cpp
index d2645a1fe8..f28b268df2 100644
--- a/apps/openmw/mwsound/sound_buffer.cpp
+++ b/apps/openmw/mwsound/sound_buffer.cpp
@@ -6,7 +6,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadsoun.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 #include <components/vfs/pathutil.hpp>
 
 #include <algorithm>
@@ -37,11 +37,9 @@ namespace MWSound
 
     SoundBufferPool::SoundBufferPool(Sound_Output& output)
         : mOutput(&output)
-        , mBufferCacheMax(std::max(Settings::Manager::getInt("buffer cache max", "Sound"), 1) * 1024 * 1024)
+        , mBufferCacheMax(Settings::sound().mBufferCacheMax * 1024 * 1024)
         , mBufferCacheMin(
-              std::min(static_cast<std::size_t>(std::max(Settings::Manager::getInt("buffer cache min", "Sound"), 1))
-                      * 1024 * 1024,
-                  mBufferCacheMax))
+              std::min(static_cast<std::size_t>(Settings::sound().mBufferCacheMin) * 1024 * 1024, mBufferCacheMax))
     {
     }
 
@@ -185,9 +183,8 @@ namespace MWSound
         min = std::max(min, 1.0f);
         max = std::max(min, max);
 
-        Sound_Buffer& sfx
-            = mSoundBuffers.emplace_back(Misc::ResourceHelpers::correctSoundPath(sound.mSound), volume, min, max);
-        VFS::Path::normalizeFilenameInPlace(sfx.mResourceName);
+        Sound_Buffer& sfx = mSoundBuffers.emplace_back(
+            Misc::ResourceHelpers::correctSoundPath(VFS::Path::Normalized(sound.mSound)), volume, min, max);
 
         mBufferNameMap.emplace(soundId, &sfx);
         return &sfx;
diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 3bf734a4b6..7de6dab9ae 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -35,7 +35,7 @@ namespace MWSound
         {
         }
 
-        const std::string& getResourceName() const noexcept { return mResourceName; }
+        const VFS::Path::Normalized& getResourceName() const noexcept { return mResourceName; }
 
         Sound_Handle getHandle() const noexcept { return mHandle; }
 
@@ -46,7 +46,7 @@ namespace MWSound
         float getMaxDist() const noexcept { return mMaxDist; }
 
     private:
-        std::string mResourceName;
+        VFS::Path::Normalized mResourceName;
         float mVolume;
         float mMinDist;
         float mMaxDist;
diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp
index f6dcdb7032..17f9d28909 100644
--- a/apps/openmw/mwsound/sound_decoder.hpp
+++ b/apps/openmw/mwsound/sound_decoder.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_SOUND_SOUND_DECODER_H
 #define GAME_SOUND_SOUND_DECODER_H
 
+#include <components/vfs/pathutil.hpp>
+
 #include <string>
 #include <vector>
 
@@ -36,7 +38,7 @@ namespace MWSound
     {
         const VFS::Manager* mResourceMgr;
 
-        virtual void open(const std::string& fname) = 0;
+        virtual void open(VFS::Path::NormalizedView fname) = 0;
         virtual void close() = 0;
 
         virtual std::string getName() = 0;
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index d7c35fbbc6..5a77124985 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -5,6 +5,9 @@
 #include <string>
 #include <vector>
 
+#include <components/settings/hrtfmode.hpp>
+#include <components/vfs/pathutil.hpp>
+
 #include "../mwbase/soundmanager.hpp"
 
 namespace MWSound
@@ -19,19 +22,14 @@ namespace MWSound
     // An opaque handle for the implementation's sound instances.
     typedef void* Sound_Instance;
 
-    enum class HrtfMode
-    {
-        Disable,
-        Enable,
-        Auto
-    };
-
     enum Environment
     {
         Env_Normal,
         Env_Underwater
     };
 
+    using HrtfMode = Settings::HrtfMode;
+
     class Sound_Output
     {
         SoundManager& mManager;
@@ -41,9 +39,8 @@ namespace MWSound
         virtual void deinit() = 0;
 
         virtual std::vector<std::string> enumerateHrtf() = 0;
-        virtual void setHrtf(const std::string& hrtfname, HrtfMode hrtfmode) = 0;
 
-        virtual std::pair<Sound_Handle, size_t> loadSound(const std::string& fname) = 0;
+        virtual std::pair<Sound_Handle, size_t> loadSound(VFS::Path::NormalizedView fname) = 0;
         virtual size_t unloadSound(Sound_Handle data) = 0;
 
         virtual bool playSound(Sound* sound, Sound_Handle data, float offset) = 0;
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index d5f1758f03..1d9a6d457c 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -10,11 +10,14 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
+#include <components/settings/values.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/pathutil.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/cellstore.hpp"
@@ -22,14 +25,14 @@
 
 #include "../mwmechanics/actorutil.hpp"
 
+#include "constants.hpp"
+#include "ffmpeg_decoder.hpp"
+#include "openal_output.hpp"
 #include "sound.hpp"
 #include "sound_buffer.hpp"
 #include "sound_decoder.hpp"
 #include "sound_output.hpp"
 
-#include "ffmpeg_decoder.hpp"
-#include "openal_output.hpp"
-
 namespace MWSound
 {
     namespace
@@ -71,6 +74,33 @@ namespace MWSound
 
             return 1.0;
         }
+
+        // Gets the combined volume settings for the given sound type
+        float volumeFromType(Type type)
+        {
+            float volume = Settings::sound().mMasterVolume;
+
+            switch (type)
+            {
+                case Type::Sfx:
+                    volume *= Settings::sound().mSfxVolume;
+                    break;
+                case Type::Voice:
+                    volume *= Settings::sound().mVoiceVolume;
+                    break;
+                case Type::Foot:
+                    volume *= Settings::sound().mFootstepsVolume;
+                    break;
+                case Type::Music:
+                    volume *= Settings::sound().mMusicVolume;
+                    break;
+                case Type::Movie:
+                case Type::Mask:
+                    break;
+            }
+
+            return volume;
+        }
     }
 
     // For combining PlayMode and Type flags
@@ -84,6 +114,7 @@ namespace MWSound
         , mOutput(std::make_unique<OpenAL_Output>(*this))
         , mWaterSoundUpdater(makeWaterSoundUpdaterSettings())
         , mSoundBuffers(*mOutput)
+        , mMusicType(MWSound::MusicType::Normal)
         , mListenerUnderwater(false)
         , mListenerPos(0, 0, 0)
         , mListenerDir(1, 0, 0)
@@ -101,12 +132,7 @@ namespace MWSound
             return;
         }
 
-        const std::string& hrtfname = Settings::Manager::getString("hrtf", "Sound");
-        int hrtfstate = Settings::Manager::getInt("hrtf enable", "Sound");
-        HrtfMode hrtfmode = hrtfstate < 0 ? HrtfMode::Auto : hrtfstate > 0 ? HrtfMode::Enable : HrtfMode::Disable;
-
-        const std::string& devname = Settings::Manager::getString("device", "Sound");
-        if (!mOutput->init(devname, hrtfname, hrtfmode))
+        if (!mOutput->init(Settings::sound().mDevice, Settings::sound().mHrtf, Settings::sound().mHrtfEnable))
         {
             Log(Debug::Error) << "Failed to initialize audio output, sound disabled";
             return;
@@ -131,15 +157,6 @@ namespace MWSound
 
             Log(Debug::Info) << stream.str();
         }
-
-        // TODO: dehardcode this
-        std::vector<std::string> titleMusic;
-        std::string_view titlefile = "music/special/morrowind title.mp3";
-        if (mVFS->exists(titlefile))
-            titleMusic.emplace_back(titlefile);
-        else
-            Log(Debug::Warning) << "Title music not found";
-        mMusicFiles["Title"] = titleMusic;
     }
 
     SoundManager::~SoundManager()
@@ -155,12 +172,12 @@ namespace MWSound
         return std::make_shared<FFmpeg_Decoder>(mVFS);
     }
 
-    DecoderPtr SoundManager::loadVoice(const std::string& voicefile)
+    DecoderPtr SoundManager::loadVoice(VFS::Path::NormalizedView voicefile)
     {
         try
         {
             DecoderPtr decoder = getDecoder();
-            decoder->open(Misc::ResourceHelpers::correctSoundPath(voicefile, decoder->mResourceMgr));
+            decoder->open(Misc::ResourceHelpers::correctSoundPath(voicefile, *decoder->mResourceMgr));
             return decoder;
         }
         catch (std::exception& e)
@@ -206,7 +223,7 @@ namespace MWSound
                 params.mFlags = PlayMode::NoEnv | Type::Voice | Play_2D;
                 return params;
             }());
-            played = mOutput->streamSound(decoder, sound.get(), true);
+            played = mOutput->streamSound(std::move(decoder), sound.get(), true);
         }
         else
         {
@@ -219,19 +236,13 @@ namespace MWSound
                 params.mFlags = PlayMode::Normal | Type::Voice | Play_3D;
                 return params;
             }());
-            played = mOutput->streamSound3D(decoder, sound.get(), true);
+            played = mOutput->streamSound3D(std::move(decoder), sound.get(), true);
         }
         if (!played)
             return nullptr;
         return sound;
     }
 
-    // Gets the combined volume settings for the given sound type
-    float SoundManager::volumeFromType(Type type) const
-    {
-        return mVolumeSettings.getVolumeFromType(type);
-    }
-
     void SoundManager::stopMusic()
     {
         if (mMusic)
@@ -241,26 +252,25 @@ namespace MWSound
         }
     }
 
-    void SoundManager::streamMusicFull(const std::string& filename)
+    void SoundManager::streamMusicFull(VFS::Path::NormalizedView filename)
     {
         if (!mOutput->isInitialized())
             return;
 
         stopMusic();
-        if (filename.empty())
+        if (filename.value().empty())
             return;
 
-        Log(Debug::Info) << "Playing " << filename;
-        mLastPlayedMusic = filename;
+        Log(Debug::Info) << "Playing \"" << filename << "\"";
 
         DecoderPtr decoder = getDecoder();
         try
         {
             decoder->open(filename);
         }
-        catch (std::exception& e)
+        catch (const std::exception& e)
         {
-            Log(Debug::Error) << "Failed to load audio from " << filename << ": " << e.what();
+            Log(Debug::Error) << "Failed to load audio from \"" << filename << "\": " << e.what();
             return;
         }
 
@@ -271,10 +281,10 @@ namespace MWSound
             params.mFlags = PlayMode::NoEnvNoScaling | Type::Music | Play_2D;
             return params;
         }());
-        mOutput->streamSound(decoder, mMusic.get());
+        mOutput->streamSound(std::move(decoder), mMusic.get());
     }
 
-    void SoundManager::advanceMusic(const std::string& filename)
+    void SoundManager::advanceMusic(VFS::Path::NormalizedView filename, float fadeOut)
     {
         if (!isMusicPlaying())
         {
@@ -284,44 +294,7 @@ namespace MWSound
 
         mNextMusic = filename;
 
-        mMusic->setFadeout(1.f);
-    }
-
-    void SoundManager::startRandomTitle()
-    {
-        const std::vector<std::string>& filelist = mMusicFiles[mCurrentPlaylist];
-        if (filelist.empty())
-        {
-            advanceMusic(std::string());
-            return;
-        }
-
-        auto& tracklist = mMusicToPlay[mCurrentPlaylist];
-
-        // Do a Fisher-Yates shuffle
-
-        // Repopulate if playlist is empty
-        if (tracklist.empty())
-        {
-            tracklist.resize(filelist.size());
-            std::iota(tracklist.begin(), tracklist.end(), 0);
-        }
-
-        int i = Misc::Rng::rollDice(tracklist.size());
-
-        // Reshuffle if last played music is the same after a repopulation
-        if (filelist[tracklist[i]] == mLastPlayedMusic)
-            i = (i + 1) % tracklist.size();
-
-        // Remove music from list after advancing music
-        advanceMusic(filelist[tracklist[i]]);
-        tracklist[i] = tracklist.back();
-        tracklist.pop_back();
-    }
-
-    void SoundManager::streamMusic(const std::string& filename)
-    {
-        advanceMusic("Music/" + filename);
+        mMusic->setFadeout(fadeOut);
     }
 
     bool SoundManager::isMusicPlaying()
@@ -329,32 +302,17 @@ namespace MWSound
         return mMusic && mOutput->isStreamPlaying(mMusic.get());
     }
 
-    void SoundManager::playPlaylist(const std::string& playlist)
+    void SoundManager::streamMusic(VFS::Path::NormalizedView filename, MusicType type, float fade)
     {
-        if (mCurrentPlaylist == playlist)
+        // Can not interrupt scripted music by built-in playlists
+        if (mMusicType == MusicType::MWScript && type != MusicType::MWScript)
             return;
 
-        if (mMusicFiles.find(playlist) == mMusicFiles.end())
-        {
-            std::vector<std::string> filelist;
-            for (const auto& name : mVFS->getRecursiveDirectoryIterator("Music/" + playlist + '/'))
-                filelist.push_back(name);
-
-            mMusicFiles[playlist] = filelist;
-        }
-
-        // No Battle music? Use Explore playlist
-        if (playlist == "Battle" && mMusicFiles[playlist].empty())
-        {
-            playPlaylist("Explore");
-            return;
-        }
-
-        mCurrentPlaylist = playlist;
-        startRandomTitle();
+        mMusicType = type;
+        advanceMusic(filename, fade);
     }
 
-    void SoundManager::say(const MWWorld::ConstPtr& ptr, const std::string& filename)
+    void SoundManager::say(const MWWorld::ConstPtr& ptr, VFS::Path::NormalizedView filename)
     {
         if (!mOutput->isInitialized())
             return;
@@ -367,7 +325,7 @@ namespace MWSound
         const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
 
         stopSay(ptr);
-        StreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
+        StreamPtr sound = playVoice(std::move(decoder), pos, (ptr == MWMechanics::getPlayer()));
         if (!sound)
             return;
 
@@ -386,7 +344,7 @@ namespace MWSound
         return 0.0f;
     }
 
-    void SoundManager::say(const std::string& filename)
+    void SoundManager::say(VFS::Path::NormalizedView filename)
     {
         if (!mOutput->isInitialized())
             return;
@@ -396,7 +354,7 @@ namespace MWSound
             return;
 
         stopSay(MWWorld::ConstPtr());
-        StreamPtr sound = playVoice(decoder, osg::Vec3f(), true);
+        StreamPtr sound = playVoice(std::move(decoder), osg::Vec3f(), true);
         if (!sound)
             return;
 
@@ -869,13 +827,14 @@ namespace MWSound
         const MWWorld::ConstPtr player = world->getPlayerPtr();
         auto cell = player.getCell()->getCell();
 
-        if (!cell->isExterior())
+        if (!cell->isExterior() && !cell->isQuasiExterior())
             return;
         if (mCurrentRegionSound && mOutput->isSoundPlaying(mCurrentRegionSound))
             return;
 
-        if (const auto next = mRegionSoundSelector.getNextRandom(duration, cell->getRegion()))
-            mCurrentRegionSound = playSound(*next, 1.0f, 1.0f);
+        ESM::RefId next = mRegionSoundSelector.getNextRandom(duration, cell->getRegion());
+        if (!next.empty())
+            mCurrentRegionSound = playSound(next, 1.0f, 1.0f);
     }
 
     void SoundManager::updateWaterSound()
@@ -991,10 +950,6 @@ namespace MWSound
         duration = mTimePassed;
         mTimePassed = 0.0f;
 
-        // Make sure music is still playing
-        if (!isMusicPlaying() && !mCurrentPlaylist.empty())
-            startRandomTitle();
-
         Environment env = Env_Normal;
         if (mListenerUnderwater)
             env = Env_Underwater;
@@ -1110,11 +1065,13 @@ namespace MWSound
         if (!mMusic || !mMusic->updateFade(duration) || !mOutput->isStreamPlaying(mMusic.get()))
         {
             stopMusic();
-            if (!mNextMusic.empty())
+            if (!mNextMusic.value().empty())
             {
                 streamMusicFull(mNextMusic);
-                mNextMusic.clear();
+                mNextMusic = VFS::Path::Normalized();
             }
+            else
+                mMusicType = MusicType::Normal;
         }
         else
         {
@@ -1127,8 +1084,18 @@ namespace MWSound
         if (!mOutput->isInitialized() || mPlaybackPaused)
             return;
 
+        MWBase::StateManager::State state = MWBase::Environment::get().getStateManager()->getState();
+        bool isMainMenu = MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu)
+            && state == MWBase::StateManager::State_NoGame;
+
+        if (isMainMenu && !isMusicPlaying())
+        {
+            if (mVFS->exists(MWSound::titleMusic))
+                streamMusic(MWSound::titleMusic, MWSound::MusicType::Normal);
+        }
+
         updateSounds(duration);
-        if (MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame)
+        if (state != MWBase::StateManager::State_NoGame)
         {
             updateRegionSound(duration);
             updateWaterSound();
@@ -1137,8 +1104,6 @@ namespace MWSound
 
     void SoundManager::processChangedSettings(const Settings::CategorySettingVector& settings)
     {
-        mVolumeSettings.update();
-
         if (!mOutput->isInitialized())
             return;
         mOutput->startUpdate();
@@ -1291,7 +1256,8 @@ namespace MWSound
 
     void SoundManager::clear()
     {
-        SoundManager::stopMusic();
+        stopMusic();
+        mMusicType = MusicType::Normal;
 
         for (SoundMap::value_type& snd : mActiveSounds)
         {
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 7453ce86f4..a5e5b2c45f 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -9,6 +9,7 @@
 
 #include <components/fallback/fallback.hpp>
 #include <components/misc/objectpool.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/soundmanager.hpp"
@@ -16,7 +17,6 @@
 #include "regionsoundselector.hpp"
 #include "sound_buffer.hpp"
 #include "type.hpp"
-#include "volumesettings.hpp"
 #include "watersoundupdater.hpp"
 
 namespace VFS
@@ -52,13 +52,6 @@ namespace MWSound
 
         std::unique_ptr<Sound_Output> mOutput;
 
-        // Caches available music tracks by <playlist name, (sound files) >
-        std::unordered_map<std::string, std::vector<std::string>> mMusicFiles;
-        std::unordered_map<std::string, std::vector<int>> mMusicToPlay; // A list with music files not yet played
-        std::string mLastPlayedMusic; // The music file that was last played
-
-        VolumeSettings mVolumeSettings;
-
         WaterSoundUpdater mWaterSoundUpdater;
 
         SoundBufferPool mSoundBuffers;
@@ -93,7 +86,7 @@ namespace MWSound
         TrackList mActiveTracks;
 
         StreamPtr mMusic;
-        std::string mCurrentPlaylist;
+        MusicType mMusicType;
 
         bool mListenerUnderwater;
         osg::Vec3f mListenerPos;
@@ -105,7 +98,7 @@ namespace MWSound
         Sound* mUnderwaterSound;
         Sound* mNearWaterSound;
 
-        std::string mNextMusic;
+        VFS::Path::Normalized mNextMusic;
         bool mPlaybackPaused;
 
         RegionSoundSelector mRegionSoundSelector;
@@ -119,16 +112,15 @@ namespace MWSound
         Sound_Buffer* insertSound(const std::string& soundId, const ESM::Sound* sound);
 
         // returns a decoder to start streaming, or nullptr if the sound was not found
-        DecoderPtr loadVoice(const std::string& voicefile);
+        DecoderPtr loadVoice(VFS::Path::NormalizedView voicefile);
 
         SoundPtr getSoundRef();
         StreamPtr getStreamRef();
 
         StreamPtr playVoice(DecoderPtr decoder, const osg::Vec3f& pos, bool playlocal);
 
-        void streamMusicFull(const std::string& filename);
-        void advanceMusic(const std::string& filename);
-        void startRandomTitle();
+        void streamMusicFull(VFS::Path::NormalizedView filename);
+        void advanceMusic(VFS::Path::NormalizedView filename, float fadeOut = 1.f);
 
         void cull3DSound(SoundBase* sound);
 
@@ -144,8 +136,6 @@ namespace MWSound
         void updateWaterSound();
         void updateMusic(float duration);
 
-        float volumeFromType(Type type) const;
-
         enum class WaterSoundAction
         {
             DoNothing,
@@ -173,26 +163,28 @@ namespace MWSound
 
         void processChangedSettings(const Settings::CategorySettingVector& settings) override;
 
+        bool isEnabled() const override { return mOutput->isInitialized(); }
+        ///< Returns true if sound system is enabled
+
         void stopMusic() override;
         ///< Stops music if it's playing
 
-        void streamMusic(const std::string& filename) override;
+        MWSound::MusicType getMusicType() const override { return mMusicType; }
+
+        void streamMusic(VFS::Path::NormalizedView filename, MWSound::MusicType type, float fade = 1.f) override;
         ///< Play a soundifle
-        /// \param filename name of a sound file in "Music/" in the data directory.
+        /// \param filename name of a sound file in the data directory.
+        /// \param type music type.
+        /// \param fade time in seconds to fade out current track before start this one.
 
         bool isMusicPlaying() override;
         ///< Returns true if music is playing
 
-        void playPlaylist(const std::string& playlist) override;
-        ///< Start playing music from the selected folder
-        /// \param name of the folder that contains the playlist
-        /// Title music playlist is predefined
-
-        void say(const MWWorld::ConstPtr& reference, const std::string& filename) override;
+        void say(const MWWorld::ConstPtr& reference, VFS::Path::NormalizedView filename) override;
         ///< Make an actor say some text.
         /// \param filename name of a sound file in the VFS
 
-        void say(const std::string& filename) override;
+        void say(VFS::Path::NormalizedView filename) override;
         ///< Say some text, without an actor ref
         /// \param filename name of a sound file in the VFS
 
diff --git a/apps/openmw/mwsound/volumesettings.cpp b/apps/openmw/mwsound/volumesettings.cpp
deleted file mode 100644
index 4306bc5268..0000000000
--- a/apps/openmw/mwsound/volumesettings.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "volumesettings.hpp"
-
-#include <components/settings/settings.hpp>
-
-#include <algorithm>
-
-namespace MWSound
-{
-    namespace
-    {
-        float clamp(float value)
-        {
-            return std::clamp(value, 0.f, 1.f);
-        }
-    }
-
-    VolumeSettings::VolumeSettings()
-        : mMasterVolume(clamp(Settings::Manager::getFloat("master volume", "Sound")))
-        , mSFXVolume(clamp(Settings::Manager::getFloat("sfx volume", "Sound")))
-        , mMusicVolume(clamp(Settings::Manager::getFloat("music volume", "Sound")))
-        , mVoiceVolume(clamp(Settings::Manager::getFloat("voice volume", "Sound")))
-        , mFootstepsVolume(clamp(Settings::Manager::getFloat("footsteps volume", "Sound")))
-    {
-    }
-
-    float VolumeSettings::getVolumeFromType(Type type) const
-    {
-        float volume = mMasterVolume;
-
-        switch (type)
-        {
-            case Type::Sfx:
-                volume *= mSFXVolume;
-                break;
-            case Type::Voice:
-                volume *= mVoiceVolume;
-                break;
-            case Type::Foot:
-                volume *= mFootstepsVolume;
-                break;
-            case Type::Music:
-                volume *= mMusicVolume;
-                break;
-            case Type::Movie:
-            case Type::Mask:
-                break;
-        }
-
-        return volume;
-    }
-
-    void VolumeSettings::update()
-    {
-        *this = VolumeSettings();
-    }
-}
diff --git a/apps/openmw/mwsound/volumesettings.hpp b/apps/openmw/mwsound/volumesettings.hpp
deleted file mode 100644
index 884a3e1bca..0000000000
--- a/apps/openmw/mwsound/volumesettings.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef GAME_SOUND_VOLUMESETTINGS_H
-#define GAME_SOUND_VOLUMESETTINGS_H
-
-#include "type.hpp"
-
-namespace MWSound
-{
-    class VolumeSettings
-    {
-    public:
-        VolumeSettings();
-
-        float getVolumeFromType(Type type) const;
-
-        void update();
-
-    private:
-        float mMasterVolume;
-        float mSFXVolume;
-        float mMusicVolume;
-        float mVoiceVolume;
-        float mFootstepsVolume;
-    };
-}
-
-#endif
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 85f5087fe6..3c02311458 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -7,11 +7,11 @@
 #include <tuple>
 #include <utility>
 
+#include <components/debug/debuglog.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm3/esmreader.hpp>
-#include <components/misc/utf8stream.hpp>
-
 #include <components/misc/strings/algorithm.hpp>
+#include <components/misc/utf8stream.hpp>
 
 bool MWState::operator<(const Slot& left, const Slot& right)
 {
@@ -84,8 +84,8 @@ void MWState::Character::addSlot(const ESM::SavedGame& profile)
     mSlots.push_back(slot);
 }
 
-MWState::Character::Character(std::filesystem::path saves, const std::string& game)
-    : mPath(std::move(saves))
+MWState::Character::Character(const std::filesystem::path& saves, const std::string& game)
+    : mPath(saves)
 {
     if (!std::filesystem::is_directory(mPath))
     {
@@ -99,9 +99,11 @@ MWState::Character::Character(std::filesystem::path saves, const std::string& ga
             {
                 addSlot(iter, game);
             }
-            catch (...)
+            catch (const std::exception& e)
             {
-            } // ignoring bad saved game files for now
+                Log(Debug::Warning) << "Failed to add slot for game \"" << game << "\" save " << iter << ": "
+                                    << e.what();
+            }
         }
 
         std::sort(mSlots.begin(), mSlots.end());
@@ -132,9 +134,9 @@ const MWState::Slot* MWState::Character::createSlot(const ESM::SavedGame& profil
 
 void MWState::Character::deleteSlot(const Slot* slot)
 {
-    int index = slot - mSlots.data();
+    std::ptrdiff_t index = slot - mSlots.data();
 
-    if (index < 0 || index >= static_cast<int>(mSlots.size()))
+    if (index < 0 || static_cast<std::size_t>(index) >= mSlots.size())
     {
         // sanity check; not entirely reliable
         throw std::logic_error("slot not found");
@@ -147,9 +149,9 @@ void MWState::Character::deleteSlot(const Slot* slot)
 
 const MWState::Slot* MWState::Character::updateSlot(const Slot* slot, const ESM::SavedGame& profile)
 {
-    int index = slot - mSlots.data();
+    std::ptrdiff_t index = slot - mSlots.data();
 
-    if (index < 0 || index >= static_cast<int>(mSlots.size()))
+    if (index < 0 || static_cast<std::size_t>(index) >= mSlots.size())
     {
         // sanity check; not entirely reliable
         throw std::logic_error("slot not found");
diff --git a/apps/openmw/mwstate/character.hpp b/apps/openmw/mwstate/character.hpp
index 7b9eba2fee..3c68d9f490 100644
--- a/apps/openmw/mwstate/character.hpp
+++ b/apps/openmw/mwstate/character.hpp
@@ -32,7 +32,7 @@ namespace MWState
         void addSlot(const ESM::SavedGame& profile);
 
     public:
-        Character(std::filesystem::path saves, const std::string& game);
+        Character(const std::filesystem::path& saves, const std::string& game);
 
         void cleanup();
         ///< Delete the directory we used, if it is empty
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 50fd123b4f..9e292a3eee 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -2,6 +2,8 @@
 
 #include <filesystem>
 
+#include <SDL_clipboard.h>
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm3/esmreader.hpp>
@@ -14,7 +16,8 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 
 #include <components/files/conversion.hpp>
-#include <components/settings/settings.hpp>
+#include <components/misc/algorithm.hpp>
+#include <components/settings/values.hpp>
 
 #include <osg/Image>
 
@@ -59,13 +62,19 @@ void MWState::StateManager::cleanup(bool force)
         MWBase::Environment::get().getInputManager()->clear();
         MWBase::Environment::get().getMechanicsManager()->clear();
 
-        mState = State_NoGame;
         mCharacterManager.setCurrentCharacter(nullptr);
         mTimePlayed = 0;
-
+        mLastSavegame.clear();
         MWMechanics::CreatureStats::cleanup();
+
+        mState = State_NoGame;
+        MWBase::Environment::get().getLuaManager()->noGame();
+    }
+    else
+    {
+        // TODO: do we need this cleanup?
+        MWBase::Environment::get().getLuaManager()->clear();
     }
-    MWBase::Environment::get().getLuaManager()->clear();
 }
 
 std::map<int, int> MWState::StateManager::buildContentFileIndexMap(const ESM::ESMReader& reader) const
@@ -78,10 +87,8 @@ std::map<int, int> MWState::StateManager::buildContentFileIndexMap(const ESM::ES
 
     for (int iPrev = 0; iPrev < static_cast<int>(prev.size()); ++iPrev)
     {
-        std::string id = Misc::StringUtils::lowerCase(prev[iPrev].name);
-
         for (int iCurrent = 0; iCurrent < static_cast<int>(current.size()); ++iCurrent)
-            if (id == Misc::StringUtils::lowerCase(current[iCurrent]))
+            if (Misc::StringUtils::ciEqual(prev[iPrev].name, current[iCurrent]))
             {
                 map.insert(std::make_pair(iPrev, iCurrent));
                 break;
@@ -117,14 +124,27 @@ void MWState::StateManager::askLoadRecent()
 
     if (!mAskLoadRecent)
     {
-        const MWState::Character* character = getCurrentCharacter();
-        if (!character || character->begin() == character->end()) // no saves
+        if (mLastSavegame.empty()) // no saves
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
         }
         else
         {
-            MWState::Slot lastSave = *character->begin();
+            std::string saveName = Files::pathToUnicodeString(mLastSavegame.filename());
+            // Assume the last saved game belongs to the current character's slot list.
+            const Character* character = getCurrentCharacter();
+            if (character)
+            {
+                for (const auto& slot : *character)
+                {
+                    if (slot.mPath == mLastSavegame)
+                    {
+                        saveName = slot.mProfile.mDescription;
+                        break;
+                    }
+                }
+            }
+
             std::vector<std::string> buttons;
             buttons.emplace_back("#{Interface:Yes}");
             buttons.emplace_back("#{Interface:No}");
@@ -132,7 +152,7 @@ void MWState::StateManager::askLoadRecent()
                 = MWBase::Environment::get().getL10nManager()->getMessage("OMWEngine", "AskLoadLastSave");
             std::string_view tag = "%s";
             size_t pos = message.find(tag);
-            message.replace(pos, tag.length(), lastSave.mProfile.mDescription);
+            message.replace(pos, tag.length(), saveName);
             MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, buttons);
             mAskLoadRecent = true;
         }
@@ -155,10 +175,10 @@ void MWState::StateManager::newGame(bool bypass)
     {
         Log(Debug::Info) << "Starting a new game";
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
-        MWBase::Environment::get().getLuaManager()->newGameStarted();
         MWBase::Environment::get().getWorld()->startNewGame(bypass);
 
         mState = State_Running;
+        MWBase::Environment::get().getLuaManager()->gameLoaded();
 
         MWBase::Environment::get().getWindowManager()->fadeScreenOut(0);
         MWBase::Environment::get().getWindowManager()->fadeScreenIn(1);
@@ -182,11 +202,13 @@ void MWState::StateManager::newGame(bool bypass)
 void MWState::StateManager::endGame()
 {
     mState = State_Ended;
+    MWBase::Environment::get().getLuaManager()->gameEnded();
 }
 
 void MWState::StateManager::resumeGame()
 {
     mState = State_Running;
+    MWBase::Environment::get().getLuaManager()->gameLoaded();
 }
 
 void MWState::StateManager::saveGame(std::string_view description, const Slot* slot)
@@ -227,10 +249,15 @@ void MWState::StateManager::saveGame(std::string_view description, const Slot* s
         else
             profile.mPlayerClassId = classId;
 
+        const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
+
         profile.mPlayerCellName = world.getCellName();
         profile.mInGameTime = world.getTimeManager()->getEpochTimeStamp();
         profile.mTimePlayed = mTimePlayed;
         profile.mDescription = description;
+        profile.mCurrentDay = world.getTimeManager()->getTimeStamp().getDay();
+        profile.mCurrentHealth = stats.getHealth().getCurrent();
+        profile.mMaximumHealth = stats.getHealth().getModified();
 
         Log(Debug::Info) << "Making a screenshot for saved game '" << description << "'";
         writeScreenshot(profile.mScreenshot);
@@ -314,8 +341,8 @@ void MWState::StateManager::saveGame(std::string_view description, const Slot* s
         if (filestream.fail())
             throw std::runtime_error("Write operation failed (file stream)");
 
-        Settings::Manager::setString(
-            "character", "Saves", Files::pathToUnicodeString(slot->mPath.parent_path().filename()));
+        Settings::saves().mCharacter.set(Files::pathToUnicodeString(slot->mPath.parent_path().filename()));
+        mLastSavegame = slot->mPath;
 
         const auto finish = std::chrono::steady_clock::now();
 
@@ -354,12 +381,8 @@ void MWState::StateManager::quickSave(std::string name)
         return;
     }
 
-    int maxSaves = Settings::Manager::getInt("max quicksaves", "Saves");
-    if (maxSaves < 1)
-        maxSaves = 1;
-
     Character* currentCharacter = getCurrentCharacter(); // Get current character
-    QuickSaveManager saveFinder = QuickSaveManager(name, maxSaves);
+    QuickSaveManager saveFinder(name, Settings::saves().mMaxQuicksaves);
 
     if (currentCharacter)
     {
@@ -393,9 +416,38 @@ void MWState::StateManager::loadGame(const std::filesystem::path& filepath)
     loadGame(character, filepath);
 }
 
-struct VersionMismatchError : public std::runtime_error
+struct SaveFormatVersionError : public std::exception
 {
-    using std::runtime_error::runtime_error;
+    using std::exception::exception;
+
+    SaveFormatVersionError(ESM::FormatVersion savegameFormat, const std::string& message)
+        : mSavegameFormat(savegameFormat)
+        , mErrorMessage(message)
+    {
+    }
+
+    const char* what() const noexcept override { return mErrorMessage.c_str(); }
+    ESM::FormatVersion getFormatVersion() const { return mSavegameFormat; }
+
+protected:
+    ESM::FormatVersion mSavegameFormat = ESM::DefaultFormatVersion;
+    std::string mErrorMessage;
+};
+
+struct SaveVersionTooOldError : SaveFormatVersionError
+{
+    SaveVersionTooOldError(ESM::FormatVersion savegameFormat)
+        : SaveFormatVersionError(savegameFormat, "format version " + std::to_string(savegameFormat) + " is too old")
+    {
+    }
+};
+
+struct SaveVersionTooNewError : SaveFormatVersionError
+{
+    SaveVersionTooNewError(ESM::FormatVersion savegameFormat)
+        : SaveFormatVersionError(savegameFormat, "format version " + std::to_string(savegameFormat) + " is too new")
+    {
+    }
 };
 
 void MWState::StateManager::loadGame(const Character* character, const std::filesystem::path& filepath)
@@ -409,10 +461,11 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
         ESM::ESMReader reader;
         reader.open(filepath);
 
-        if (reader.getFormatVersion() > ESM::CurrentSaveGameFormatVersion)
-            throw VersionMismatchError(
-                "This save file was created using a newer version of OpenMW and is thus not supported. Please upgrade "
-                "to the newest OpenMW version to load this file.");
+        ESM::FormatVersion version = reader.getFormatVersion();
+        if (version > ESM::CurrentSaveGameFormatVersion)
+            throw SaveVersionTooNewError(version);
+        else if (version < ESM::MinSupportedSaveGameFormatVersion)
+            throw SaveVersionTooOldError(version);
 
         std::map<int, int> contentFileMap = buildContentFileIndexMap(reader);
         reader.setContentFileMapping(&contentFileMap);
@@ -440,7 +493,9 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
                 {
                     ESM::SavedGame profile;
                     profile.load(reader);
-                    if (!verifyProfile(profile))
+                    const auto& selectedContentFiles = MWBase::Environment::get().getWorld()->getContentFiles();
+                    auto missingFiles = profile.getMissingContentFiles(selectedContentFiles);
+                    if (!missingFiles.empty() && !confirmLoading(missingFiles))
                     {
                         cleanup(true);
                         MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
@@ -453,7 +508,6 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
                 break;
 
                 case ESM::REC_JOUR:
-                case ESM::REC_JOUR_LEGACY:
                 case ESM::REC_QUES:
 
                     MWBase::Environment::get().getJournal()->readRecord(reader, n.toInt());
@@ -486,6 +540,7 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
                 case ESM::REC_ENAB:
                 case ESM::REC_LEVC:
                 case ESM::REC_LEVI:
+                case ESM::REC_LIGH:
                 case ESM::REC_CREA:
                 case ESM::REC_CONT:
                 case ESM::REC_RAND:
@@ -542,8 +597,8 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
         mState = State_Running;
 
         if (character)
-            Settings::Manager::setString(
-                "character", "Saves", Files::pathToUnicodeString(character->getPath().filename()));
+            Settings::saves().mCharacter.set(Files::pathToUnicodeString(character->getPath().filename()));
+        mLastSavegame = filepath;
 
         MWBase::Environment::get().getWindowManager()->setNewGame(false);
         MWBase::Environment::get().getWorld()->saveLoaded();
@@ -551,6 +606,7 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
         MWBase::Environment::get().getWorld()->renderPlayer();
         MWBase::Environment::get().getWindowManager()->updatePlayer();
         MWBase::Environment::get().getMechanicsManager()->playerLoaded();
+        MWBase::Environment::get().getWorld()->toggleVanityMode(false);
 
         if (firstPersonCam != MWBase::Environment::get().getWorld()->isFirstPerson())
             MWBase::Environment::get().getWorld()->togglePOV();
@@ -570,7 +626,7 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
             Log(Debug::Warning) << "Player character's cell no longer exists, changing to the default cell";
             ESM::ExteriorCellLocation cellIndex(0, 0, ESM::Cell::sDefaultWorldspaceId);
             MWWorld::CellStore& cell = MWBase::Environment::get().getWorldModel()->getExterior(cellIndex);
-            osg::Vec2 posFromIndex = ESM::indexToPosition(cellIndex, false);
+            const osg::Vec2f posFromIndex = ESM::indexToPosition(cellIndex, false);
             ESM::Position pos;
             pos.pos[0] = posFromIndex.x();
             pos.pos[1] = posFromIndex.y();
@@ -593,40 +649,71 @@ void MWState::StateManager::loadGame(const Character* character, const std::file
 
         MWBase::Environment::get().getLuaManager()->gameLoaded();
     }
+    catch (const SaveVersionTooNewError& e)
+    {
+        std::string error = "#{OMWEngine:LoadingRequiresNewVersionError}";
+        printSavegameFormatError(e.what(), error);
+    }
+    catch (const SaveVersionTooOldError& e)
+    {
+        const char* release;
+        // Report the last version still capable of reading this save
+        if (e.getFormatVersion() <= ESM::OpenMW0_48SaveGameFormatVersion)
+            release = "OpenMW 0.48.0";
+        else
+        {
+            // Insert additional else if statements above to cover future releases
+            static_assert(ESM::MinSupportedSaveGameFormatVersion <= ESM::OpenMW0_49SaveGameFormatVersion);
+            release = "OpenMW 0.49.0";
+        }
+        auto l10n = MWBase::Environment::get().getL10nManager()->getContext("OMWEngine");
+        std::string error = l10n->formatMessage("LoadingRequiresOldVersionError", { "version" }, { release });
+        printSavegameFormatError(e.what(), error);
+    }
     catch (const std::exception& e)
     {
-        Log(Debug::Error) << "Failed to load saved game: " << e.what();
-
-        cleanup(true);
-
-        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
-
-        std::vector<std::string> buttons;
-        buttons.emplace_back("#{Interface:OK}");
-
-        std::string error;
-        if (typeid(e) == typeid(VersionMismatchError))
-            error = "#{OMWEngine:LoadingFailed}: #{OMWEngine:LoadingRequiresNewVersionError}";
-        else
-            error = "#{OMWEngine:LoadingFailed}: " + std::string(e.what());
-
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(error, buttons);
+        std::string error = "#{OMWEngine:LoadingFailed}: " + std::string(e.what());
+        printSavegameFormatError(e.what(), error);
     }
 }
 
+void MWState::StateManager::printSavegameFormatError(
+    const std::string& exceptionText, const std::string& messageBoxText)
+{
+    Log(Debug::Error) << "Failed to load saved game: " << exceptionText;
+
+    cleanup(true);
+
+    MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
+
+    std::vector<std::string> buttons;
+    buttons.emplace_back("#{Interface:OK}");
+
+    MWBase::Environment::get().getWindowManager()->interactiveMessageBox(messageBoxText, buttons);
+}
+
 void MWState::StateManager::quickLoad()
 {
     if (Character* currentCharacter = getCurrentCharacter())
     {
         if (currentCharacter->begin() == currentCharacter->end())
             return;
-        loadGame(currentCharacter, currentCharacter->begin()->mPath); // Get newest save
+        // use requestLoad, otherwise we can crash by loading during the wrong part of the frame
+        requestLoad(currentCharacter->begin()->mPath);
     }
 }
 
 void MWState::StateManager::deleteGame(const MWState::Character* character, const MWState::Slot* slot)
 {
+    const std::filesystem::path savePath = slot->mPath;
     mCharacterManager.deleteSlot(character, slot);
+    if (mLastSavegame == savePath)
+    {
+        if (character->begin() != character->end())
+            mLastSavegame = character->begin()->mPath;
+        else
+            mLastSavegame.clear();
+    }
 }
 
 MWState::Character* MWState::StateManager::getCurrentCharacter()
@@ -657,9 +744,9 @@ void MWState::StateManager::update(float duration)
         {
             mAskLoadRecent = false;
             // Load last saved game for current character
-
-            MWState::Slot lastSave = *curCharacter->begin();
-            loadGame(curCharacter, lastSave.mPath);
+            // loadGame resets the game state along with mLastSavegame so we want to preserve it
+            const std::filesystem::path filePath = std::move(mLastSavegame);
+            loadGame(curCharacter, filePath);
         }
         else if (iButton == 1)
         {
@@ -667,32 +754,80 @@ void MWState::StateManager::update(float duration)
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
         }
     }
+
+    if (mNewGameRequest)
+    {
+        newGame();
+        mNewGameRequest = false;
+    }
+
+    if (mLoadRequest)
+    {
+        loadGame(*mLoadRequest);
+        mLoadRequest = std::nullopt;
+    }
 }
 
-bool MWState::StateManager::verifyProfile(const ESM::SavedGame& profile) const
+bool MWState::StateManager::confirmLoading(const std::vector<std::string_view>& missingFiles) const
 {
-    const std::vector<std::string>& selectedContentFiles = MWBase::Environment::get().getWorld()->getContentFiles();
-    bool notFound = false;
-    for (const std::string& contentFile : profile.mContentFiles)
+    std::ostringstream stream;
+    for (auto& contentFile : missingFiles)
     {
-        if (std::find(selectedContentFiles.begin(), selectedContentFiles.end(), contentFile)
-            == selectedContentFiles.end())
+        Log(Debug::Warning) << "Warning: Saved game dependency " << contentFile << " is missing.";
+        stream << contentFile << "\n";
+    }
+
+    auto fullList = stream.str();
+    if (!fullList.empty())
+        fullList.pop_back();
+
+    constexpr size_t missingPluginsDisplayLimit = 12;
+
+    std::vector<std::string> buttons;
+    buttons.emplace_back("#{Interface:Yes}");
+    buttons.emplace_back("#{Interface:Copy}");
+    buttons.emplace_back("#{Interface:No}");
+    std::string message = "#{OMWEngine:MissingContentFilesConfirmation}";
+
+    auto l10n = MWBase::Environment::get().getL10nManager()->getContext("OMWEngine");
+    message += l10n->formatMessage("MissingContentFilesList", { "files" }, { static_cast<int>(missingFiles.size()) });
+    auto cappedSize = std::min(missingFiles.size(), missingPluginsDisplayLimit);
+    if (cappedSize == missingFiles.size())
+    {
+        message += fullList;
+    }
+    else
+    {
+        for (size_t i = 0; i < cappedSize - 1; ++i)
         {
-            Log(Debug::Warning) << "Warning: Saved game dependency " << contentFile << " is missing.";
-            notFound = true;
+            message += missingFiles[i];
+            message += "\n";
         }
+
+        message += "...";
     }
-    if (notFound)
+
+    message
+        += l10n->formatMessage("MissingContentFilesListCopy", { "files" }, { static_cast<int>(missingFiles.size()) });
+
+    int selectedButton = -1;
+    while (true)
     {
-        std::vector<std::string> buttons;
-        buttons.emplace_back("#{Interface:Yes}");
-        buttons.emplace_back("#{Interface:No}");
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
-            "#{OMWEngine:MissingContentFilesConfirmation}", buttons, true);
-        int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
-        if (selectedButton == 1 || selectedButton == -1)
-            return false;
+        auto windowManager = MWBase::Environment::get().getWindowManager();
+        windowManager->interactiveMessageBox(message, buttons, true, selectedButton);
+        selectedButton = windowManager->readPressedButton();
+        if (selectedButton == 0)
+            break;
+
+        if (selectedButton == 1)
+        {
+            SDL_SetClipboardText(fullList.c_str());
+            continue;
+        }
+
+        return false;
     }
+
     return true;
 }
 
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index df62ca7ebf..b08584a817 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -14,14 +14,19 @@ namespace MWState
     {
         bool mQuitRequest;
         bool mAskLoadRecent;
+        bool mNewGameRequest = false;
+        std::optional<std::filesystem::path> mLoadRequest;
         State mState;
         CharacterManager mCharacterManager;
         double mTimePlayed;
+        std::filesystem::path mLastSavegame;
 
     private:
         void cleanup(bool force = false);
 
-        bool verifyProfile(const ESM::SavedGame& profile) const;
+        void printSavegameFormatError(const std::string& exceptionText, const std::string& messageBoxText);
+
+        bool confirmLoading(const std::vector<std::string_view>& missingFiles) const;
 
         void writeScreenshot(std::vector<char>& imageData) const;
 
@@ -36,6 +41,9 @@ namespace MWState
 
         void askLoadRecent() override;
 
+        void requestNewGame() override { mNewGameRequest = true; }
+        void requestLoad(const std::filesystem::path& filepath) override { mLoadRequest = filepath; }
+
         State getState() const override;
 
         void newGame(bool bypass = false) override;
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index b77fe146ef..c67502bdee 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -11,7 +11,7 @@ namespace MWWorld
     void ActionEat::executeImp(const Ptr& actor)
     {
         if (actor.getClass().consume(getTarget(), actor) && actor == MWMechanics::getPlayer())
-            actor.getClass().skillUsageSucceeded(actor, ESM::Skill::Alchemy, 1);
+            actor.getClass().skillUsageSucceeded(actor, ESM::Skill::Alchemy, ESM::Skill::Alchemy_UseIngredient);
     }
 
     ActionEat::ActionEat(const MWWorld::Ptr& object)
diff --git a/apps/openmw/mwworld/actionharvest.cpp b/apps/openmw/mwworld/actionharvest.cpp
index 708260d395..30f316c2db 100644
--- a/apps/openmw/mwworld/actionharvest.cpp
+++ b/apps/openmw/mwworld/actionharvest.cpp
@@ -37,7 +37,7 @@ namespace MWWorld
             if (!it->getClass().showsInInventory(*it))
                 continue;
 
-            int itemCount = it->getRefData().getCount();
+            int itemCount = it->getCellRef().getCount();
             // Note: it is important to check for crime before move an item from container. Otherwise owner check will
             // not work for a last item in the container - empty harvested containers are considered as "allowed to
             // use".
diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp
index 3f48920dc0..b6014b834c 100644
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@@ -5,6 +5,7 @@
 #include <components/esm3/loadskil.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
@@ -22,15 +23,15 @@ namespace MWWorld
 
     void ActionRead::executeImp(const MWWorld::Ptr& actor)
     {
-
-        if (actor != MWMechanics::getPlayer())
+        const MWWorld::Ptr player = MWMechanics::getPlayer();
+        if (actor != player && getTarget().getContainerStore() != nullptr)
             return;
 
         // Ensure we're not in combat
         if (MWMechanics::isPlayerInCombat()
             // Reading in combat is still allowed if the scroll/book is not in the player inventory yet
             // (since otherwise, there would be no way to pick it up)
-            && getTarget().getContainerStore() == &actor.getClass().getContainerStore(actor))
+            && getTarget().getContainerStore() == &player.getClass().getContainerStore(player))
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage4}");
             return;
@@ -43,18 +44,13 @@ namespace MWWorld
         else
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Book, getTarget());
 
-        MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats(actor);
+        MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats(player);
 
         // Skill gain from books
         ESM::RefId skill = ESM::Skill::indexToRefId(ref->mBase->mData.mSkillId);
         if (!skill.empty() && !npcStats.hasBeenUsed(ref->mBase->mId))
         {
-            MWWorld::LiveCellRef<ESM::NPC>* playerRef = actor.get<ESM::NPC>();
-
-            const ESM::Class* class_
-                = MWBase::Environment::get().getESMStore()->get<ESM::Class>().find(playerRef->mBase->mClass);
-
-            npcStats.increaseSkill(skill, *class_, true, true);
+            MWBase::Environment::get().getLuaManager()->skillLevelUp(player, skill, "book");
 
             npcStats.flagAsUsed(ref->mBase->mId);
         }
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index 83d6e729c9..1f37499e8f 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -30,10 +30,12 @@ namespace MWWorld
             }
         }
 
-        MWBase::Environment::get().getMechanicsManager()->itemTaken(
-            actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
-        MWWorld::Ptr newitem
-            = *actor.getClass().getContainerStore(actor).add(getTarget(), getTarget().getRefData().getCount());
+        int count = getTarget().getCellRef().getCount();
+        if (getTarget().getClass().isGold(getTarget()))
+            count *= getTarget().getClass().getValue(getTarget());
+
+        MWBase::Environment::get().getMechanicsManager()->itemTaken(actor, getTarget(), MWWorld::Ptr(), count);
+        MWWorld::Ptr newitem = *actor.getClass().getContainerStore(actor).add(getTarget(), count);
         MWBase::Environment::get().getWorld()->deleteObject(getTarget());
         setTarget(newitem);
     }
diff --git a/apps/openmw/mwworld/cell.cpp b/apps/openmw/mwworld/cell.cpp
index 56afc104cf..1bc58d89c3 100644
--- a/apps/openmw/mwworld/cell.cpp
+++ b/apps/openmw/mwworld/cell.cpp
@@ -100,18 +100,7 @@ namespace MWWorld
             mWaterHeight = -1.f;
             mHasWater = true;
         }
-    }
-
-    ESM::RefId Cell::getWorldSpace() const
-    {
-        if (isExterior())
-            return mParent;
         else
-            return mId;
-    }
-
-    ESM::ExteriorCellLocation Cell::getExteriorCellLocation() const
-    {
-        return { mGridPos.x(), mGridPos.y(), getWorldSpace() };
+            mGridPos = {};
     }
 }
diff --git a/apps/openmw/mwworld/cell.hpp b/apps/openmw/mwworld/cell.hpp
index 1fa088eac4..c9586a01fa 100644
--- a/apps/openmw/mwworld/cell.hpp
+++ b/apps/openmw/mwworld/cell.hpp
@@ -4,8 +4,8 @@
 #include <osg/Vec2i>
 
 #include <components/esm/esmbridge.hpp>
+#include <components/esm/exteriorcelllocation.hpp>
 #include <components/esm/refid.hpp>
-#include <components/esm/util.hpp>
 
 namespace ESM
 {
@@ -48,8 +48,12 @@ namespace MWWorld
         const MoodData& getMood() const { return mMood; }
         float getWaterHeight() const { return mWaterHeight; }
         const ESM::RefId& getId() const { return mId; }
-        ESM::RefId getWorldSpace() const;
-        ESM::ExteriorCellLocation getExteriorCellLocation() const;
+        ESM::RefId getWorldSpace() const { return mIsExterior ? mParent : mId; }
+
+        ESM::ExteriorCellLocation getExteriorCellLocation() const
+        {
+            return ESM::ExteriorCellLocation(mGridPos.x(), mGridPos.y(), getWorldSpace());
+        }
 
     private:
         bool mIsExterior;
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 7da5e8f848..5540982f26 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -1,14 +1,19 @@
 #include "cellpreloader.hpp"
 
-#include <array>
+#include <algorithm>
 #include <atomic>
 #include <limits>
+#include <span>
+
+#include <osg/Stats>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/loadinglistener/reporter.hpp>
 #include <components/misc/constants.hpp>
+#include <components/misc/pathhelpers.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
@@ -23,50 +28,38 @@
 #include "cellstore.hpp"
 #include "class.hpp"
 
-namespace
-{
-    template <class Contained>
-    bool contains(const std::vector<MWWorld::CellPreloader::PositionCellGrid>& container, const Contained& contained,
-        float tolerance)
-    {
-        for (const auto& pos : contained)
-        {
-            bool found = false;
-            for (const auto& pos2 : container)
-            {
-                if ((pos.first - pos2.first).length2() < tolerance * tolerance && pos.second == pos2.second)
-                {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found)
-                return false;
-        }
-        return true;
-    }
-}
-
 namespace MWWorld
 {
+    namespace
+    {
+        bool contains(std::span<const PositionCellGrid> positions, const PositionCellGrid& contained, float tolerance)
+        {
+            const float squaredTolerance = tolerance * tolerance;
+            const auto predicate = [&](const PositionCellGrid& v) {
+                return (contained.mPosition - v.mPosition).length2() < squaredTolerance
+                    && contained.mCellBounds == v.mCellBounds;
+            };
+            return std::ranges::any_of(positions, predicate);
+        }
+
+        bool contains(
+            std::span<const PositionCellGrid> container, std::span<const PositionCellGrid> contained, float tolerance)
+        {
+            const auto predicate = [&](const PositionCellGrid& v) { return contains(container, v, tolerance); };
+            return std::ranges::all_of(contained, predicate);
+        }
+    }
 
     struct ListModelsVisitor
     {
-        ListModelsVisitor(std::vector<std::string>& out)
-            : mOut(out)
-        {
-        }
-
-        virtual bool operator()(const MWWorld::Ptr& ptr)
+        bool operator()(const MWWorld::ConstPtr& ptr)
         {
             ptr.getClass().getModelsToPreload(ptr, mOut);
 
             return true;
         }
 
-        virtual ~ListModelsVisitor() = default;
-
-        std::vector<std::string>& mOut;
+        std::vector<std::string_view>& mOut;
     };
 
     /// Worker thread item: preload models in a cell.
@@ -74,12 +67,12 @@ namespace MWWorld
     {
     public:
         /// Constructor to be called from the main thread.
-        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager,
+        explicit PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager,
             Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager,
             Terrain::World* terrain, MWRender::LandManager* landManager, bool preloadInstances)
             : mIsExterior(cell->getCell()->isExterior())
-            , mX(cell->getCell()->getGridX())
-            , mY(cell->getCell()->getGridY())
+            , mCellLocation(cell->getCell()->getExteriorCellLocation())
+            , mCellId(cell->getCell()->getId())
             , mSceneManager(sceneManager)
             , mBulletShapeManager(bulletShapeManager)
             , mKeyframeManager(keyframeManager)
@@ -90,8 +83,8 @@ namespace MWWorld
         {
             mTerrainView = mTerrain->createView();
 
-            ListModelsVisitor visitor(mMeshes);
-            cell->forEach(visitor);
+            ListModelsVisitor visitor{ mMeshes };
+            cell->forEachConst(visitor);
         }
 
         void abort() override { mAbort = true; }
@@ -103,59 +96,59 @@ namespace MWWorld
             {
                 try
                 {
-                    mTerrain->cacheCell(mTerrainView.get(), mX, mY);
-                    mPreloadedObjects.insert(
-                        mLandManager->getLand(ESM::ExteriorCellLocation(mX, mY, ESM::Cell::sDefaultWorldspaceId)));
+                    mTerrain->cacheCell(mTerrainView.get(), mCellLocation.mX, mCellLocation.mY);
+                    mPreloadedObjects.insert(mLandManager->getLand(mCellLocation));
                 }
-                catch (std::exception&)
+                catch (const std::exception& e)
                 {
+                    Log(Debug::Warning) << "Failed to cache terrain for exterior cell " << mCellLocation << ": "
+                                        << e.what();
                 }
             }
 
-            for (std::string& mesh : mMeshes)
+            VFS::Path::Normalized mesh;
+            VFS::Path::Normalized kfname;
+            for (std::string_view path : mMeshes)
             {
                 if (mAbort)
                     break;
 
                 try
                 {
-                    mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
+                    const VFS::Manager& vfs = *mSceneManager->getVFS();
+                    mesh = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(path));
+                    mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, &vfs);
 
-                    size_t slashpos = mesh.find_last_of("/\\");
-                    if (slashpos != std::string::npos && slashpos != mesh.size() - 1)
+                    if (!vfs.exists(mesh))
+                        continue;
+
+                    if (Misc::getFileName(mesh).starts_with('x') && Misc::getFileExtension(mesh) == "nif")
                     {
-                        Misc::StringUtils::lowerCaseInPlace(mesh);
-                        if (mesh[slashpos + 1] == 'x')
-                        {
-                            if (mesh.size() > 4 && mesh.ends_with(".nif"))
-                            {
-                                std::string kfname = mesh;
-                                kfname.replace(kfname.size() - 4, 4, ".kf");
-                                if (mSceneManager->getVFS()->exists(kfname))
-                                    mPreloadedObjects.insert(mKeyframeManager->get(kfname));
-                            }
-                        }
+                        kfname = mesh;
+                        kfname.changeExtension("kf");
+                        if (vfs.exists(kfname))
+                            mPreloadedObjects.insert(mKeyframeManager->get(kfname));
                     }
+
                     mPreloadedObjects.insert(mSceneManager->getTemplate(mesh));
                     if (mPreloadInstances)
                         mPreloadedObjects.insert(mBulletShapeManager->cacheInstance(mesh));
                     else
                         mPreloadedObjects.insert(mBulletShapeManager->getShape(mesh));
                 }
-                catch (std::exception&)
+                catch (const std::exception& e)
                 {
-                    // ignore error for now, would spam the log too much
-                    // error will be shown when visiting the cell
+                    Log(Debug::Warning) << "Failed to preload mesh \"" << path << "\" from cell " << mCellId << ": "
+                                        << e.what();
                 }
             }
         }
 
     private:
-        typedef std::vector<std::string> MeshList;
         bool mIsExterior;
-        int mX;
-        int mY;
-        MeshList mMeshes;
+        ESM::ExteriorCellLocation mCellLocation;
+        ESM::RefId mCellId;
+        std::vector<std::string_view> mMeshes;
         Resource::SceneManager* mSceneManager;
         Resource::BulletShapeManager* mBulletShapeManager;
         Resource::KeyframeManager* mKeyframeManager;
@@ -174,12 +167,12 @@ namespace MWWorld
     class TerrainPreloadItem : public SceneUtil::WorkItem
     {
     public:
-        TerrainPreloadItem(const std::vector<osg::ref_ptr<Terrain::View>>& views, Terrain::World* world,
-            const std::vector<CellPreloader::PositionCellGrid>& preloadPositions)
+        explicit TerrainPreloadItem(const std::vector<osg::ref_ptr<Terrain::View>>& views, Terrain::World* world,
+            std::span<const PositionCellGrid> preloadPositions)
             : mAbort(false)
             , mTerrainViews(views)
             , mWorld(world)
-            , mPreloadPositions(preloadPositions)
+            , mPreloadPositions(preloadPositions.begin(), preloadPositions.end())
         {
         }
 
@@ -188,8 +181,8 @@ namespace MWWorld
             for (unsigned int i = 0; i < mTerrainViews.size() && i < mPreloadPositions.size() && !mAbort; ++i)
             {
                 mTerrainViews[i]->reset();
-                mWorld->preload(mTerrainViews[i], mPreloadPositions[i].first, mPreloadPositions[i].second, mAbort,
-                    mLoadingReporter);
+                mWorld->preload(mTerrainViews[i], mPreloadPositions[i].mPosition, mPreloadPositions[i].mCellBounds,
+                    mAbort, mLoadingReporter);
             }
             mLoadingReporter.complete();
         }
@@ -202,7 +195,7 @@ namespace MWWorld
         std::atomic<bool> mAbort;
         std::vector<osg::ref_ptr<Terrain::View>> mTerrainViews;
         Terrain::World* mWorld;
-        std::vector<CellPreloader::PositionCellGrid> mPreloadPositions;
+        std::vector<PositionCellGrid> mPreloadPositions;
         Loading::Reporter mLoadingReporter;
     };
 
@@ -230,8 +223,6 @@ namespace MWWorld
         , mTerrain(terrain)
         , mLandManager(landManager)
         , mExpiryDelay(0.0)
-        , mMinCacheSize(0)
-        , mMaxCacheSize(0)
         , mPreloadInstances(true)
         , mLastResourceCacheUpdate(0.0)
         , mLoadedTerrainTimestamp(0.0)
@@ -283,6 +274,7 @@ namespace MWWorld
             {
                 oldestCell->second.mWorkItem->abort();
                 mPreloadCells.erase(oldestCell);
+                ++mEvicted;
             }
             else
                 return;
@@ -292,7 +284,8 @@ namespace MWWorld
             mResourceSystem->getKeyframeManager(), mTerrain, mLandManager, mPreloadInstances));
         mWorkQueue->addWorkItem(item);
 
-        mPreloadCells[&cell] = PreloadEntry(timestamp, item);
+        mPreloadCells.emplace(&cell, PreloadEntry(timestamp, item));
+        ++mAdded;
     }
 
     void CellPreloader::notifyLoaded(CellStore* cell)
@@ -307,6 +300,7 @@ namespace MWWorld
             }
 
             mPreloadCells.erase(found);
+            ++mLoaded;
         }
     }
 
@@ -336,6 +330,7 @@ namespace MWWorld
                     it->second.mWorkItem = nullptr;
                 }
                 mPreloadCells.erase(it++);
+                ++mExpired;
             }
             else
                 ++it;
@@ -362,26 +357,11 @@ namespace MWWorld
         mExpiryDelay = expiryDelay;
     }
 
-    void CellPreloader::setMinCacheSize(unsigned int num)
-    {
-        mMinCacheSize = num;
-    }
-
-    void CellPreloader::setMaxCacheSize(unsigned int num)
-    {
-        mMaxCacheSize = num;
-    }
-
     void CellPreloader::setPreloadInstances(bool preload)
     {
         mPreloadInstances = preload;
     }
 
-    unsigned int CellPreloader::getMaxCacheSize() const
-    {
-        return mMaxCacheSize;
-    }
-
     void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
     {
         mWorkQueue = workQueue;
@@ -393,19 +373,19 @@ namespace MWWorld
             mTerrainPreloadItem->wait(listener);
     }
 
-    void CellPreloader::abortTerrainPreloadExcept(const CellPreloader::PositionCellGrid* exceptPos)
+    void CellPreloader::abortTerrainPreloadExcept(const PositionCellGrid* exceptPos)
     {
-        if (exceptPos && contains(mTerrainPreloadPositions, std::array{ *exceptPos }, Constants::CellSizeInUnits))
+        if (exceptPos != nullptr && contains(mTerrainPreloadPositions, *exceptPos, Constants::CellSizeInUnits))
             return;
         if (mTerrainPreloadItem && !mTerrainPreloadItem->isDone())
         {
             mTerrainPreloadItem->abort();
             mTerrainPreloadItem->waitTillDone();
         }
-        setTerrainPreloadPositions(std::vector<CellPreloader::PositionCellGrid>());
+        setTerrainPreloadPositions({});
     }
 
-    void CellPreloader::setTerrainPreloadPositions(const std::vector<CellPreloader::PositionCellGrid>& positions)
+    void CellPreloader::setTerrainPreloadPositions(std::span<const PositionCellGrid> positions)
     {
         if (positions.empty())
         {
@@ -426,7 +406,7 @@ namespace MWWorld
                     mTerrainViews.emplace_back(mTerrain->createView());
             }
 
-            mTerrainPreloadPositions = positions;
+            mTerrainPreloadPositions.assign(positions.begin(), positions.end());
             if (!positions.empty())
             {
                 mTerrainPreloadItem = new TerrainPreloadItem(mTerrainViews, mTerrain, positions);
@@ -435,10 +415,10 @@ namespace MWWorld
         }
     }
 
-    bool CellPreloader::isTerrainLoaded(const CellPreloader::PositionCellGrid& position, double referenceTime) const
+    bool CellPreloader::isTerrainLoaded(const PositionCellGrid& position, double referenceTime) const
     {
         return mLoadedTerrainTimestamp + mResourceSystem->getSceneManager()->getExpiryDelay() > referenceTime
-            && contains(mLoadedTerrainPositions, std::array{ position }, Constants::CellSizeInUnits);
+            && contains(mLoadedTerrainPositions, position, Constants::CellSizeInUnits);
     }
 
     void CellPreloader::setTerrain(Terrain::World* terrain)
@@ -474,4 +454,12 @@ namespace MWWorld
         mPreloadCells.clear();
     }
 
+    void CellPreloader::reportStats(unsigned int frameNumber, osg::Stats& stats) const
+    {
+        stats.setAttribute(frameNumber, "CellPreloader Count", mPreloadCells.size());
+        stats.setAttribute(frameNumber, "CellPreloader Added", mAdded);
+        stats.setAttribute(frameNumber, "CellPreloader Evicted", mEvicted);
+        stats.setAttribute(frameNumber, "CellPreloader Loaded", mLoaded);
+        stats.setAttribute(frameNumber, "CellPreloader Expired", mExpired);
+    }
 }
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index ddf13cab83..405ba96a2e 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -1,12 +1,20 @@
 #ifndef OPENMW_MWWORLD_CELLPRELOADER_H
 #define OPENMW_MWWORLD_CELLPRELOADER_H
 
+#include "positioncellgrid.hpp"
+
 #include <components/sceneutil/workqueue.hpp>
-#include <map>
-#include <osg/Vec3f>
-#include <osg/Vec4i>
+
 #include <osg/ref_ptr>
 
+#include <map>
+#include <span>
+
+namespace osg
+{
+    class Stats;
+}
+
 namespace Resource
 {
     class ResourceSystem;
@@ -56,26 +64,29 @@ namespace MWWorld
         void setExpiryDelay(double expiryDelay);
 
         /// The minimum number of preloaded cells before unused cells get thrown out.
-        void setMinCacheSize(unsigned int num);
+        void setMinCacheSize(std::size_t value) { mMinCacheSize = value; }
 
         /// The maximum number of preloaded cells.
-        void setMaxCacheSize(unsigned int num);
+        void setMaxCacheSize(std::size_t value) { mMaxCacheSize = value; }
 
         /// Enables the creation of instances in the preloading thread.
         void setPreloadInstances(bool preload);
 
-        unsigned int getMaxCacheSize() const;
+        std::size_t getMaxCacheSize() const { return mMaxCacheSize; }
+
+        std::size_t getCacheSize() const { return mPreloadCells.size(); }
 
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
-        typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
-        void setTerrainPreloadPositions(const std::vector<PositionCellGrid>& positions);
+        void setTerrainPreloadPositions(std::span<const PositionCellGrid> positions);
 
         void syncTerrainLoad(Loading::Listener& listener);
         void abortTerrainPreloadExcept(const PositionCellGrid* exceptPos);
-        bool isTerrainLoaded(const CellPreloader::PositionCellGrid& position, double referenceTime) const;
+        bool isTerrainLoaded(const PositionCellGrid& position, double referenceTime) const;
         void setTerrain(Terrain::World* terrain);
 
+        void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
+
     private:
         void clearAllTasks();
 
@@ -85,8 +96,8 @@ namespace MWWorld
         MWRender::LandManager* mLandManager;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
         double mExpiryDelay;
-        unsigned int mMinCacheSize;
-        unsigned int mMaxCacheSize;
+        std::size_t mMinCacheSize = 0;
+        std::size_t mMaxCacheSize = 0;
         bool mPreloadInstances;
 
         double mLastResourceCacheUpdate;
@@ -118,6 +129,10 @@ namespace MWWorld
 
         std::vector<PositionCellGrid> mLoadedTerrainPositions;
         double mLoadedTerrainTimestamp;
+        std::size_t mEvicted = 0;
+        std::size_t mAdded = 0;
+        std::size_t mExpired = 0;
+        std::size_t mLoaded = 0;
     };
 
 }
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 37e1be0ddf..854348c2a8 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -8,10 +8,10 @@
 #include <components/esm3/objectstate.hpp>
 #include <components/esm4/loadrefr.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwmechanics/spellutil.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwmechanics/spellutil.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
 
 namespace MWWorld
 {
@@ -30,17 +30,17 @@ namespace MWWorld
     {
     }
 
-    const ESM::RefNum& CellRef::getRefNum() const
+    ESM::RefNum CellRef::getRefNum() const noexcept
     {
         return std::visit(ESM::VisitOverload{
-                              [&](const ESM4::Reference& ref) -> const ESM::RefNum& { return ref.mId; },
-                              [&](const ESM4::ActorCharacter& ref) -> const ESM::RefNum& { return ref.mId; },
-                              [&](const ESM::CellRef& ref) -> const ESM::RefNum& { return ref.mRefNum; },
+                              [&](const ESM4::Reference& ref) -> ESM::RefNum { return ref.mId; },
+                              [&](const ESM4::ActorCharacter& ref) -> ESM::RefNum { return ref.mId; },
+                              [&](const ESM::CellRef& ref) -> ESM::RefNum { return ref.mRefNum; },
                           },
             mCellRef.mVariant);
     }
 
-    const ESM::RefNum& CellRef::getOrAssignRefNum(ESM::RefNum& lastAssignedRefNum)
+    ESM::RefNum CellRef::getOrAssignRefNum(ESM::RefNum& lastAssignedRefNum)
     {
         ESM::RefNum& refNum = std::visit(ESM::VisitOverload{
                                              [&](ESM4::Reference& ref) -> ESM::RefNum& { return ref.mId; },
@@ -188,19 +188,14 @@ namespace MWWorld
     void CellRef::applyChargeRemainderToBeSubtracted(float chargeRemainder)
     {
         auto esm3Visit = [&](ESM::CellRef& cellRef3) {
-            cellRef3.mChargeIntRemainder += std::abs(chargeRemainder);
-            if (cellRef3.mChargeIntRemainder > 1.0f)
+            cellRef3.mChargeIntRemainder -= std::abs(chargeRemainder);
+            if (cellRef3.mChargeIntRemainder <= -1.0f)
             {
-                float newChargeRemainder = (cellRef3.mChargeIntRemainder - std::floor(cellRef3.mChargeIntRemainder));
-                if (cellRef3.mChargeInt <= static_cast<int>(cellRef3.mChargeIntRemainder))
-                {
-                    cellRef3.mChargeInt = 0;
-                }
-                else
-                {
-                    cellRef3.mChargeInt -= static_cast<int>(cellRef3.mChargeIntRemainder);
-                }
+                float newChargeRemainder = std::modf(cellRef3.mChargeIntRemainder, &cellRef3.mChargeIntRemainder);
+                cellRef3.mChargeInt += static_cast<int>(cellRef3.mChargeIntRemainder);
                 cellRef3.mChargeIntRemainder = newChargeRemainder;
+                if (cellRef3.mChargeInt < 0)
+                    cellRef3.mChargeInt = 0;
             }
         };
         std::visit(ESM::VisitOverload{
@@ -211,6 +206,16 @@ namespace MWWorld
             mCellRef.mVariant);
     }
 
+    void CellRef::setChargeIntRemainder(float chargeRemainder)
+    {
+        std::visit(ESM::VisitOverload{
+                       [&](ESM4::Reference& /*ref*/) {},
+                       [&](ESM4::ActorCharacter&) {},
+                       [&](ESM::CellRef& ref) { ref.mChargeIntRemainder = chargeRemainder; },
+                   },
+            mCellRef.mVariant);
+    }
+
     void CellRef::setChargeFloat(float charge)
     {
         std::visit(ESM::VisitOverload{
@@ -372,17 +377,19 @@ namespace MWWorld
         }
     }
 
-    void CellRef::setGoldValue(int value)
+    void CellRef::setCount(int value)
     {
-        if (value != getGoldValue())
+        if (value != getCount(false))
         {
             mChanged = true;
             std::visit(ESM::VisitOverload{
-                           [&](ESM4::Reference& /*ref*/) {},
-                           [&](ESM4::ActorCharacter&) {},
-                           [&](ESM::CellRef& ref) { ref.mGoldValue = value; },
+                           [&](ESM4::Reference& ref) { ref.mCount = value; },
+                           [&](ESM4::ActorCharacter& ref) { ref.mCount = value; },
+                           [&](ESM::CellRef& ref) { ref.mCount = value; },
                        },
                 mCellRef.mVariant);
+            if (value == 0)
+                MWBase::Environment::get().getWorld()->removeRefScript(this);
         }
     }
 
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index 73e721278e..4dcac4def5 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -27,11 +27,11 @@ namespace MWWorld
         explicit CellRef(const ESM4::ActorCharacter& ref);
 
         // Note: Currently unused for items in containers
-        const ESM::RefNum& getRefNum() const;
+        ESM::RefNum getRefNum() const noexcept;
 
         // Returns RefNum.
         // If RefNum is not set, assigns a generated one and changes the "lastAssignedRefNum" counter.
-        const ESM::RefNum& getOrAssignRefNum(ESM::RefNum& lastAssignedRefNum);
+        ESM::RefNum getOrAssignRefNum(ESM::RefNum& lastAssignedRefNum);
 
         void setRefNum(ESM::RefNum refNum);
 
@@ -118,9 +118,22 @@ namespace MWWorld
             };
             return std::visit(Visitor(), mCellRef.mVariant);
         } // Implemented as union with int charge
+        float getChargeIntRemainder() const
+        {
+            struct Visitor
+            {
+                float operator()(const ESM::CellRef& ref) { return ref.mChargeIntRemainder; }
+                float operator()(const ESM4::Reference& /*ref*/) { return 0; }
+                float operator()(const ESM4::ActorCharacter&) { throw std::logic_error("Not applicable"); }
+            };
+            return std::visit(Visitor(), mCellRef.mVariant);
+        }
         void setCharge(int charge);
         void setChargeFloat(float charge);
-        void applyChargeRemainderToBeSubtracted(float chargeRemainder); // Stores remainders and applies if > 1
+        void applyChargeRemainderToBeSubtracted(float chargeRemainder); // Stores remainders and applies if <= -1
+
+        // Stores fractional part of mChargeInt
+        void setChargeIntRemainder(float chargeRemainder);
 
         // The NPC that owns this object (and will get angry if you steal it)
         ESM::RefId getOwner() const
@@ -218,18 +231,20 @@ namespace MWWorld
         }
         void setTrap(const ESM::RefId& trap);
 
-        // This is 5 for Gold_005 references, 100 for Gold_100 and so on.
-        int getGoldValue() const
+        int getCount(bool absolute = true) const
         {
             struct Visitor
             {
-                int operator()(const ESM::CellRef& ref) { return ref.mGoldValue; }
-                int operator()(const ESM4::Reference& /*ref*/) { return 0; }
-                int operator()(const ESM4::ActorCharacter&) { throw std::logic_error("Not applicable"); }
+                int operator()(const ESM::CellRef& ref) { return ref.mCount; }
+                int operator()(const ESM4::Reference& ref) { return ref.mCount; }
+                int operator()(const ESM4::ActorCharacter& ref) { return ref.mCount; }
             };
-            return std::visit(Visitor(), mCellRef.mVariant);
+            int count = std::visit(Visitor(), mCellRef.mVariant);
+            if (absolute)
+                return std::abs(count);
+            return count;
         }
-        void setGoldValue(int value);
+        void setCount(int value);
 
         // Write the content of this CellRef into the given ObjectState
         void writeState(ESM::ObjectState& state) const;
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
index 12f086e15d..187fff4287 100644
--- a/apps/openmw/mwworld/cellreflist.hpp
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -38,7 +38,7 @@ namespace MWWorld
         }
 
         /// Remove all references with the given refNum from this list.
-        void remove(const ESM::RefNum& refNum)
+        void remove(ESM::RefNum refNum)
         {
             for (typename List::iterator it = mList.begin(); it != mList.end();)
             {
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 4263be8649..4cd189bb20 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -52,12 +52,16 @@
 #include <components/esm4/loadcont.hpp>
 #include <components/esm4/loadcrea.hpp>
 #include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadflor.hpp>
 #include <components/esm4/loadfurn.hpp>
+#include <components/esm4/loadimod.hpp>
 #include <components/esm4/loadingr.hpp>
 #include <components/esm4/loadligh.hpp>
 #include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmstt.hpp>
 #include <components/esm4/loadnpc.hpp>
 #include <components/esm4/loadrefr.hpp>
+#include <components/esm4/loadscol.hpp>
 #include <components/esm4/loadstat.hpp>
 #include <components/esm4/loadterm.hpp>
 #include <components/esm4/loadtree.hpp>
@@ -149,7 +153,7 @@ namespace
             if (toIgnore.find(&*iter) != toIgnore.end())
                 continue;
 
-            if (actor.getClass().getCreatureStats(actor).matchesActorId(actorId) && actor.getRefData().getCount() > 0)
+            if (actor.getClass().getCreatureStats(actor).matchesActorId(actorId) && actor.getCellRef().getCount() > 0)
                 return actor;
         }
 
@@ -159,31 +163,32 @@ namespace
     template <typename T>
     void writeReferenceCollection(ESM::ESMWriter& writer, const MWWorld::CellRefList<T>& collection)
     {
-        if (!collection.mList.empty())
+        // references
+        for (const MWWorld::LiveCellRef<T>& liveCellRef : collection.mList)
         {
-            // references
-            for (typename MWWorld::CellRefList<T>::List::const_iterator iter(collection.mList.begin());
-                 iter != collection.mList.end(); ++iter)
+            if (ESM::isESM4Rec(T::sRecordId))
             {
-                if (!iter->mData.hasChanged() && !iter->mRef.hasChanged() && iter->mRef.hasContentFile())
-                {
-                    // Reference that came from a content file and has not been changed -> ignore
-                    continue;
-                }
-                if (iter->mData.getCount() == 0 && !iter->mRef.hasContentFile())
-                {
-                    // Deleted reference that did not come from a content file -> ignore
-                    continue;
-                }
-                using StateType = typename RecordToState<T>::StateType;
-                StateType state;
-                iter->save(state);
-
-                // recordId currently unused
-                writer.writeHNT("OBJE", collection.mList.front().mBase->sRecordId);
-
-                state.save(writer);
+                // TODO: Implement loading/saving of REFR4 and ACHR4 with ESM3 reader/writer.
+                continue;
             }
+            if (!liveCellRef.mData.hasChanged() && !liveCellRef.mRef.hasChanged() && liveCellRef.mRef.hasContentFile())
+            {
+                // Reference that came from a content file and has not been changed -> ignore
+                continue;
+            }
+            if (liveCellRef.mRef.getCount() == 0 && !liveCellRef.mRef.hasContentFile())
+            {
+                // Deleted reference that did not come from a content file -> ignore
+                continue;
+            }
+            using StateType = typename RecordToState<T>::StateType;
+            StateType state;
+            liveCellRef.save(state);
+
+            // recordId currently unused
+            writer.writeHNT("OBJE", collection.mList.front().mBase->sRecordId);
+
+            state.save(writer);
         }
     }
 
@@ -197,8 +202,8 @@ namespace
             {
                 for (auto& item : state.mInventory.mItems)
                 {
-                    if (item.mCount > 0 && baseItem.mItem == item.mRef.mRefID)
-                        item.mCount = -item.mCount;
+                    if (item.mRef.mCount > 0 && baseItem.mItem == item.mRef.mRefID)
+                        item.mRef.mCount = -item.mRef.mCount;
                 }
             }
         }
@@ -248,19 +253,27 @@ namespace
         if (!record)
             return;
 
-        if (state.mVersion < 15)
+        if (state.mVersion <= ESM::MaxOldRestockingFormatVersion)
             fixRestocking(record, state);
-        if (state.mVersion < 17)
+        if (state.mVersion <= ESM::MaxClearModifiersFormatVersion)
         {
             if constexpr (std::is_same_v<T, ESM::Creature>)
                 MWWorld::convertMagicEffects(state.mCreatureStats, state.mInventory);
             else if constexpr (std::is_same_v<T, ESM::NPC>)
                 MWWorld::convertMagicEffects(state.mCreatureStats, state.mInventory, &state.mNpcStats);
         }
-        else if (state.mVersion < 20)
+        else if (state.mVersion <= ESM::MaxOldCreatureStatsFormatVersion)
         {
             if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
+            {
                 MWWorld::convertStats(state.mCreatureStats);
+                MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory);
+            }
+        }
+        else if (state.mVersion <= ESM::MaxActiveSpellSlotIndexFormatVersion)
+        {
+            if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
+                MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory);
         }
 
         if (state.mRef.mRefNum.hasContentFile())
@@ -294,9 +307,9 @@ namespace
             // instance is invalid. But non-storable item are always stored in saves together with their original cell.
             // If a non-storable item references a content file, but is not found in this content file,
             // we should drop it. Likewise if this stack is empty.
-            if (!MWWorld::ContainerStore::isStorableType<T>() || !state.mCount)
+            if (!MWWorld::ContainerStore::isStorableType<T>() || !state.mRef.mCount)
             {
-                if (state.mCount)
+                if (state.mRef.mCount)
                     Log(Debug::Warning) << "Warning: Dropping reference to " << state.mRef.mRefID
                                         << " (invalid content file link)";
                 return;
@@ -304,9 +317,9 @@ namespace
         }
 
         // new reference
-        MWWorld::LiveCellRef<T> ref(record);
+        MWWorld::LiveCellRef<T> ref(ESM::makeBlankCellRef(), record);
         ref.load(state);
-        collection.mList.push_back(ref);
+        collection.mList.push_back(std::move(ref));
 
         MWWorld::LiveCellRefBase* base = &collection.mList.back();
         MWBase::Environment::get().getWorldModel()->registerPtr(MWWorld::Ptr(base, cellstore));
@@ -339,6 +352,34 @@ namespace
 
 namespace MWWorld
 {
+    namespace
+    {
+        template <class T>
+        bool isEnabled(const T& ref, const ESMStore& store)
+        {
+            if (ref.mEsp.parent.isZeroOrUnset())
+                return true;
+
+            // Disable objects that are linked to an initially disabled parent.
+            // Actually when we will start working on Oblivion/Skyrim scripting we will need to:
+            //  - use the current state of the parent instead of initial state of the parent
+            //  - every time when the parent is enabled/disabled we should also enable/disable
+            //        all objects that are linked to it.
+            // But for now we assume that the parent remains in its initial state.
+            if (const ESM4::Reference* parentRef = store.get<ESM4::Reference>().searchStatic(ref.mEsp.parent))
+            {
+                const bool parentDisabled = parentRef->mFlags & ESM4::Rec_Disabled;
+                const bool inversed = ref.mEsp.flags & ESM4::EnableParent::Flag_Inversed;
+                if (parentDisabled != inversed)
+                    return false;
+
+                return isEnabled(*parentRef, store);
+            }
+
+            return true;
+        }
+    }
+
     struct CellStoreImp
     {
         CellStoreTuple mRefLists;
@@ -385,9 +426,9 @@ namespace MWWorld
                 liveCellRef.mData.setDeletedByContentFile(true);
 
             if (iter != mList.end())
-                *iter = liveCellRef;
+                *iter = std::move(liveCellRef);
             else
-                mList.push_back(liveCellRef);
+                mList.push_back(std::move(liveCellRef));
         }
         else
         {
@@ -405,10 +446,16 @@ namespace MWWorld
     static void loadImpl(const R& ref, const MWWorld::ESMStore& esmStore, auto& list)
     {
         const MWWorld::Store<X>& store = esmStore.get<X>();
-        if (const X* ptr = store.search(ref.mBaseObj))
-            list.emplace_back(ref, ptr);
-        else
+        const X* ptr = store.search(ref.mBaseObj);
+        if (!ptr)
+        {
             Log(Debug::Warning) << "Warning: could not resolve cell reference " << ref.mId << " (dropping reference)";
+            return;
+        }
+        LiveCellRef<X> liveCellRef(ref, ptr);
+        if (!isEnabled(ref, esmStore))
+            liveCellRef.mData.disable();
+        list.push_back(std::move(liveCellRef));
     }
 
     template <typename X>
@@ -495,11 +542,7 @@ namespace MWWorld
         mMovedToAnotherCell.insert(std::make_pair(object.getBase(), cellToMoveTo));
 
         requestMergedRefsUpdate();
-        MWWorld::Ptr ptr(object.getBase(), cellToMoveTo);
-        const Class& cls = ptr.getClass();
-        if (cls.hasInventoryStore(ptr))
-            cls.getInventoryStore(ptr).setActor(ptr);
-        return ptr;
+        return MWWorld::Ptr(object.getBase(), cellToMoveTo);
     }
 
     struct MergeVisitor
@@ -560,7 +603,7 @@ namespace MWWorld
         return false;
     }
 
-    CellStore::CellStore(MWWorld::Cell cell, const MWWorld::ESMStore& esmStore, ESM::ReadersCache& readers)
+    CellStore::CellStore(MWWorld::Cell&& cell, const MWWorld::ESMStore& esmStore, ESM::ReadersCache& readers)
         : mStore(esmStore)
         , mReaders(readers)
         , mCellVariant(std::move(cell))
@@ -655,7 +698,7 @@ namespace MWWorld
             MWWorld::Ptr actor(base, this);
             if (!actor.getClass().isActor())
                 continue;
-            if (actor.getClass().getCreatureStats(actor).matchesActorId(id) && actor.getRefData().getCount() > 0)
+            if (actor.getClass().getCreatureStats(actor).matchesActorId(id) && actor.getCellRef().getCount() > 0)
                 return actor;
         }
 
@@ -664,10 +707,10 @@ namespace MWWorld
 
     class RefNumSearchVisitor
     {
-        const ESM::RefNum& mRefNum;
+        ESM::RefNum mRefNum;
 
     public:
-        RefNumSearchVisitor(const ESM::RefNum& refNum)
+        RefNumSearchVisitor(ESM::RefNum refNum)
             : mRefNum(refNum)
         {
         }
@@ -1021,7 +1064,7 @@ namespace MWWorld
         for (const auto& [base, store] : mMovedToAnotherCell)
         {
             ESM::RefNum refNum = base->mRef.getRefNum();
-            if (base->mData.isDeleted() && !refNum.hasContentFile())
+            if (base->isDeleted() && !refNum.hasContentFile())
                 continue; // filtered out in writeReferenceCollection
             ESM::RefId movedTo = store->getCell()->getId();
 
@@ -1147,20 +1190,18 @@ namespace MWWorld
     {
         if (mState == State_Loaded)
         {
-            for (CellRefList<ESM::Creature>::List::iterator it(get<ESM::Creature>().mList.begin());
-                 it != get<ESM::Creature>().mList.end(); ++it)
+            for (MWWorld::LiveCellRef<ESM::Creature>& creature : get<ESM::Creature>().mList)
             {
-                Ptr ptr = getCurrentPtr(&*it);
-                if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
+                Ptr ptr = getCurrentPtr(&creature);
+                if (!ptr.isEmpty() && ptr.getCellRef().getCount() > 0)
                 {
                     MWBase::Environment::get().getMechanicsManager()->restoreDynamicStats(ptr, hours, true);
                 }
             }
-            for (CellRefList<ESM::NPC>::List::iterator it(get<ESM::NPC>().mList.begin());
-                 it != get<ESM::NPC>().mList.end(); ++it)
+            for (MWWorld::LiveCellRef<ESM::NPC>& npc : get<ESM::NPC>().mList)
             {
-                Ptr ptr = getCurrentPtr(&*it);
-                if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
+                Ptr ptr = getCurrentPtr(&npc);
+                if (!ptr.isEmpty() && ptr.getCellRef().getCount() > 0)
                 {
                     MWBase::Environment::get().getMechanicsManager()->restoreDynamicStats(ptr, hours, true);
                 }
@@ -1175,29 +1216,26 @@ namespace MWWorld
 
         if (mState == State_Loaded)
         {
-            for (CellRefList<ESM::Creature>::List::iterator it(get<ESM::Creature>().mList.begin());
-                 it != get<ESM::Creature>().mList.end(); ++it)
+            for (MWWorld::LiveCellRef<ESM::Creature>& creature : get<ESM::Creature>().mList)
             {
-                Ptr ptr = getCurrentPtr(&*it);
-                if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
+                Ptr ptr = getCurrentPtr(&creature);
+                if (!ptr.isEmpty() && ptr.getCellRef().getCount() > 0)
                 {
                     ptr.getClass().getContainerStore(ptr).rechargeItems(duration);
                 }
             }
-            for (CellRefList<ESM::NPC>::List::iterator it(get<ESM::NPC>().mList.begin());
-                 it != get<ESM::NPC>().mList.end(); ++it)
+            for (MWWorld::LiveCellRef<ESM::NPC>& npc : get<ESM::NPC>().mList)
             {
-                Ptr ptr = getCurrentPtr(&*it);
-                if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
+                Ptr ptr = getCurrentPtr(&npc);
+                if (!ptr.isEmpty() && ptr.getCellRef().getCount() > 0)
                 {
                     ptr.getClass().getContainerStore(ptr).rechargeItems(duration);
                 }
             }
-            for (CellRefList<ESM::Container>::List::iterator it(get<ESM::Container>().mList.begin());
-                 it != get<ESM::Container>().mList.end(); ++it)
+            for (MWWorld::LiveCellRef<ESM::Container>& container : get<ESM::Container>().mList)
             {
-                Ptr ptr = getCurrentPtr(&*it);
-                if (!ptr.isEmpty() && ptr.getRefData().getCustomData() != nullptr && ptr.getRefData().getCount() > 0
+                Ptr ptr = getCurrentPtr(&container);
+                if (!ptr.isEmpty() && ptr.getRefData().getCustomData() != nullptr && ptr.getCellRef().getCount() > 0
                     && ptr.getClass().getContainerStore(ptr).isResolved())
                 {
                     ptr.getClass().getContainerStore(ptr).rechargeItems(duration);
@@ -1239,13 +1277,12 @@ namespace MWWorld
                 clearCorpse(ptr, mStore);
                 ptr.getClass().respawn(ptr);
             }
-            for (CellRefList<ESM::CreatureLevList>::List::iterator it(get<ESM::CreatureLevList>().mList.begin());
-                 it != get<ESM::CreatureLevList>().mList.end(); ++it)
-            {
-                Ptr ptr = getCurrentPtr(&*it);
+            forEachType<ESM::CreatureLevList>([](Ptr ptr) {
                 // no need to clearCorpse, handled as part of get<ESM::Creature>()
-                ptr.getClass().respawn(ptr);
-            }
+                if (!ptr.mRef->isDeleted())
+                    ptr.getClass().respawn(ptr);
+                return true;
+            });
         }
     }
 
@@ -1270,7 +1307,7 @@ namespace MWWorld
             for (auto& item : list)
             {
                 Ptr ptr = getCurrentPtr(&item);
-                if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
+                if (!ptr.isEmpty() && ptr.getCellRef().getCount() > 0)
                 {
                     checkItem(ptr);
                 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 496e98bf1a..097053e2e0 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -70,8 +70,12 @@ namespace ESM4
     struct Container;
     struct Door;
     struct Furniture;
+    struct Flora;
     struct Ingredient;
+    struct ItemMod;
     struct MiscItem;
+    struct MovableStatic;
+    struct StaticCollection;
     struct Terminal;
     struct Tree;
     struct Weapon;
@@ -93,9 +97,10 @@ namespace MWWorld
 
         CellRefList<ESM4::Static>, CellRefList<ESM4::Light>, CellRefList<ESM4::Activator>, CellRefList<ESM4::Potion>,
         CellRefList<ESM4::Ammunition>, CellRefList<ESM4::Armor>, CellRefList<ESM4::Book>, CellRefList<ESM4::Clothing>,
-        CellRefList<ESM4::Container>, CellRefList<ESM4::Door>, CellRefList<ESM4::Ingredient>,
-        CellRefList<ESM4::Terminal>, CellRefList<ESM4::Tree>, CellRefList<ESM4::MiscItem>, CellRefList<ESM4::Weapon>,
-        CellRefList<ESM4::Furniture>, CellRefList<ESM4::Creature>, CellRefList<ESM4::Npc>>;
+        CellRefList<ESM4::Container>, CellRefList<ESM4::Door>, CellRefList<ESM4::Flora>, CellRefList<ESM4::Ingredient>,
+        CellRefList<ESM4::ItemMod>, CellRefList<ESM4::Terminal>, CellRefList<ESM4::Tree>, CellRefList<ESM4::MiscItem>,
+        CellRefList<ESM4::MovableStatic>, CellRefList<ESM4::Weapon>, CellRefList<ESM4::Furniture>,
+        CellRefList<ESM4::Creature>, CellRefList<ESM4::Npc>, CellRefList<ESM4::StaticCollection>>;
 
     /// \brief Mutable state of a cell
     class CellStore
@@ -114,7 +119,7 @@ namespace MWWorld
         /// scripting compatibility, and the fact that objects may be "un-deleted" in the original game).
         static bool isAccessible(const MWWorld::RefData& refdata, const MWWorld::CellRef& cref)
         {
-            return !refdata.isDeletedByContentFile() && (cref.hasContentFile() || refdata.getCount() > 0);
+            return !refdata.isDeletedByContentFile() && (cref.hasContentFile() || cref.getCount() > 0);
         }
 
         /// Moves object from this cell to the given cell.
@@ -140,7 +145,7 @@ namespace MWWorld
         }
 
         /// @param readerList The readers to use for loading of the cell on-demand.
-        CellStore(MWWorld::Cell cell, const MWWorld::ESMStore& store, ESM::ReadersCache& readers);
+        CellStore(MWWorld::Cell&& cell, const MWWorld::ESMStore& store, ESM::ReadersCache& readers);
 
         CellStore(const CellStore&) = delete;
 
@@ -205,8 +210,8 @@ namespace MWWorld
         /// false will abort the iteration.
         /// \note Prefer using forEachConst when possible.
         /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in
-        /// unintended behaviour. \attention This function also lists deleted (count 0) objects! \return Iteration
-        /// completed?
+        /// unintended behaviour. \attention This function also lists deleted (count 0) objects!
+        /// \return Iteration completed?
         template <class Visitor>
         bool forEach(Visitor&& visitor)
         {
@@ -220,12 +225,12 @@ namespace MWWorld
 
             mHasState = true;
 
-            for (unsigned int i = 0; i < mMergedRefs.size(); ++i)
+            for (LiveCellRefBase* mergedRef : mMergedRefs)
             {
-                if (!isAccessible(mMergedRefs[i]->mData, mMergedRefs[i]->mRef))
+                if (!isAccessible(mergedRef->mData, mergedRef->mRef))
                     continue;
 
-                if (!visitor(MWWorld::Ptr(mMergedRefs[i], this)))
+                if (!visitor(MWWorld::Ptr(mergedRef, this)))
                     return false;
             }
             return true;
@@ -234,8 +239,8 @@ namespace MWWorld
         /// Call visitor (MWWorld::ConstPtr) for each reference. visitor must return a bool. Returning
         /// false will abort the iteration.
         /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in
-        /// unintended behaviour. \attention This function also lists deleted (count 0) objects! \return Iteration
-        /// completed?
+        /// unintended behaviour. \attention This function also lists deleted (count 0) objects!
+        /// \return Iteration completed?
         template <class Visitor>
         bool forEachConst(Visitor&& visitor) const
         {
@@ -245,12 +250,12 @@ namespace MWWorld
             if (mMergedRefsNeedsUpdate)
                 updateMergedRefs();
 
-            for (unsigned int i = 0; i < mMergedRefs.size(); ++i)
+            for (const LiveCellRefBase* mergedRef : mMergedRefs)
             {
-                if (!isAccessible(mMergedRefs[i]->mData, mMergedRefs[i]->mRef))
+                if (!isAccessible(mergedRef->mData, mergedRef->mRef))
                     continue;
 
-                if (!visitor(MWWorld::ConstPtr(mMergedRefs[i], this)))
+                if (!visitor(MWWorld::ConstPtr(mergedRef, this)))
                     return false;
             }
             return true;
@@ -259,10 +264,10 @@ namespace MWWorld
         /// Call visitor (ref) for each reference of given type. visitor must return a bool. Returning
         /// false will abort the iteration.
         /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in
-        /// unintended behaviour. \attention This function also lists deleted (count 0) objects! \return Iteration
-        /// completed?
+        /// unintended behaviour. \attention This function also lists deleted (count 0) objects!
+        /// \return Iteration completed?
         template <class T, class Visitor>
-        bool forEachType(Visitor& visitor)
+        bool forEachType(Visitor&& visitor)
         {
             if (mState != State_Loaded)
                 return false;
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index b360e90471..105fbca80a 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -6,6 +6,7 @@
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadsoun.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -118,13 +119,8 @@ namespace MWWorld
         throw std::runtime_error("class cannot hit");
     }
 
-    void Class::block(const Ptr& ptr) const
-    {
-        throw std::runtime_error("class cannot block");
-    }
-
     void Class::onHit(const Ptr& ptr, float damage, bool ishealth, const Ptr& object, const Ptr& attacker,
-        const osg::Vec3f& hitPosition, bool successful) const
+        const osg::Vec3f& hitPosition, bool successful, const MWMechanics::DamageSourceType sourceType) const
     {
         throw std::runtime_error("class cannot be hit");
     }
@@ -149,7 +145,7 @@ namespace MWWorld
         throw std::runtime_error("class does not have an inventory store");
     }
 
-    bool Class::hasInventoryStore(const Ptr& ptr) const
+    bool Class::hasInventoryStore(const ConstPtr& ptr) const
     {
         return false;
     }
@@ -310,19 +306,27 @@ namespace MWWorld
 
     void Class::adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const {}
 
-    std::string Class::getModel(const MWWorld::ConstPtr& ptr) const
+    std::string_view Class::getModel(const MWWorld::ConstPtr& ptr) const
     {
         return {};
     }
 
+    VFS::Path::Normalized Class::getCorrectedModel(const MWWorld::ConstPtr& ptr) const
+    {
+        std::string_view model = getModel(ptr);
+        if (!model.empty())
+            return Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(model));
+        return {};
+    }
+
     bool Class::useAnim() const
     {
         return false;
     }
 
-    void Class::getModelsToPreload(const Ptr& ptr, std::vector<std::string>& models) const
+    void Class::getModelsToPreload(const ConstPtr& ptr, std::vector<std::string_view>& models) const
     {
-        std::string model = getModel(ptr);
+        std::string_view model = getModel(ptr);
         if (!model.empty())
             models.push_back(model);
     }
@@ -373,11 +377,9 @@ namespace MWWorld
     {
         Ptr newPtr = copyToCellImpl(ptr, cell);
         newPtr.getCellRef().unsetRefNum(); // This RefNum is only valid within the original cell of the reference
-        newPtr.getRefData().setCount(count);
+        newPtr.getCellRef().setCount(count);
         newPtr.getRefData().setLuaScripts(nullptr);
         MWBase::Environment::get().getWorldModel()->registerPtr(newPtr);
-        if (hasInventoryStore(newPtr))
-            getInventoryStore(newPtr).setActor(newPtr);
         return newPtr;
     }
 
@@ -386,8 +388,6 @@ namespace MWWorld
         Ptr newPtr = copyToCellImpl(ptr, cell);
         ptr.getRefData().setLuaScripts(nullptr);
         MWBase::Environment::get().getWorldModel()->registerPtr(newPtr);
-        if (hasInventoryStore(newPtr))
-            getInventoryStore(newPtr).setActor(newPtr);
         return newPtr;
     }
 
@@ -528,13 +528,11 @@ namespace MWWorld
 
         const ESM::Enchantment* enchantment
             = MWBase::Environment::get().getESMStore()->get<ESM::Enchantment>().search(enchantmentName);
-        if (!enchantment)
+        if (!enchantment || enchantment->mEffects.mList.empty())
             return result;
 
-        assert(enchantment->mEffects.mList.size());
-
         const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().search(
-            enchantment->mEffects.mList.front().mEffectID);
+            enchantment->mEffects.mList.front().mData.mEffectID);
         if (!magicEffect)
             return result;
 
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 7b7e9135ba..d3d75aa935 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -13,8 +13,11 @@
 #include "ptr.hpp"
 
 #include "../mwmechanics/aisetting.hpp"
+#include "../mwmechanics/damagesourcetype.hpp"
+
 #include <components/esm/refid.hpp>
 #include <components/esm3/loadskil.hpp>
+#include <components/vfs/pathutil.hpp>
 
 namespace ESM
 {
@@ -142,15 +145,12 @@ namespace MWWorld
         /// (default implementation: throw an exception)
 
         virtual void onHit(const MWWorld::Ptr& ptr, float damage, bool ishealth, const MWWorld::Ptr& object,
-            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful) const;
+            const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful,
+            const MWMechanics::DamageSourceType sourceType) const;
         ///< Alerts \a ptr that it's being hit for \a damage points to health if \a ishealth is
         /// true (else fatigue) by \a object (sword, arrow, etc). \a attacker specifies the
-        /// actor responsible for the attack, and \a successful specifies if the hit is
-        /// successful or not.
-
-        virtual void block(const Ptr& ptr) const;
-        ///< Play the appropriate sound for a blocked attack, depending on the currently equipped shield
-        /// (default implementation: throw an exception)
+        /// actor responsible for the attack. \a successful specifies if the hit is
+        /// successful or not. \a sourceType classifies the damage source.
 
         virtual std::unique_ptr<Action> activate(const Ptr& ptr, const Ptr& actor) const;
         ///< Generate action for activation (default implementation: return a null action).
@@ -167,7 +167,7 @@ namespace MWWorld
         ///< Return inventory store or throw an exception, if class does not have a
         /// inventory store (default implementation: throw an exception)
 
-        virtual bool hasInventoryStore(const Ptr& ptr) const;
+        virtual bool hasInventoryStore(const ConstPtr& ptr) const;
         ///< Does this object have an inventory store, i.e. equipment slots? (default implementation: false)
 
         virtual bool canLock(const ConstPtr& ptr) const;
@@ -276,12 +276,14 @@ namespace MWWorld
 
         virtual int getServices(const MWWorld::ConstPtr& actor) const;
 
-        virtual std::string getModel(const MWWorld::ConstPtr& ptr) const;
+        virtual std::string_view getModel(const MWWorld::ConstPtr& ptr) const;
+
+        virtual VFS::Path::Normalized getCorrectedModel(const MWWorld::ConstPtr& ptr) const;
 
         virtual bool useAnim() const;
         ///< Whether or not to use animated variant of model (default false)
 
-        virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
+        virtual void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const;
         ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
         ///< list getModel().
 
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index f5e45415ae..5a7c5b5333 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -51,7 +51,7 @@ namespace
 
         for (const MWWorld::LiveCellRef<T>& liveCellRef : cellRefList.mList)
         {
-            if (const int count = liveCellRef.mData.getCount(); count > 0)
+            if (const int count = liveCellRef.mRef.getCount(); count > 0)
                 sum += count * liveCellRef.mBase->mData.mWeight;
         }
 
@@ -65,7 +65,7 @@ namespace
 
         for (MWWorld::LiveCellRef<T>& liveCellRef : list.mList)
         {
-            if ((liveCellRef.mBase->mId == id) && liveCellRef.mData.getCount())
+            if ((liveCellRef.mBase->mId == id) && liveCellRef.mRef.getCount())
             {
                 MWWorld::Ptr ptr(&liveCellRef, nullptr);
                 ptr.setContainerStore(store);
@@ -101,9 +101,9 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::getState(
     if (!record)
         return ContainerStoreIterator(this);
 
-    LiveCellRef<T> ref(record);
+    LiveCellRef<T> ref(ESM::makeBlankCellRef(), record);
     ref.load(state);
-    collection.mList.push_back(ref);
+    collection.mList.push_back(std::move(ref));
     auto it = ContainerStoreIterator(this, --collection.mList.end());
     MWBase::Environment::get().getWorldModel()->registerPtr(*it);
 
@@ -111,12 +111,12 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::getState(
 }
 
 void MWWorld::ContainerStore::storeEquipmentState(
-    const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const
+    const MWWorld::LiveCellRefBase& ref, size_t index, ESM::InventoryState& inventory) const
 {
 }
 
 void MWWorld::ContainerStore::readEquipmentState(
-    const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory)
+    const MWWorld::ContainerStoreIterator& iter, size_t index, const ESM::InventoryState& inventory)
 {
 }
 
@@ -128,11 +128,11 @@ void MWWorld::ContainerStore::storeState(const LiveCellRef<T>& ref, ESM::ObjectS
 
 template <typename T>
 void MWWorld::ContainerStore::storeStates(
-    const CellRefList<T>& collection, ESM::InventoryState& inventory, int& index, bool equipable) const
+    const CellRefList<T>& collection, ESM::InventoryState& inventory, size_t& index, bool equipable) const
 {
     for (const LiveCellRef<T>& liveCellRef : collection.mList)
     {
-        if (liveCellRef.mData.getCount() == 0)
+        if (liveCellRef.mRef.getCount() == 0)
             continue;
         ESM::ObjectState state;
         storeState(liveCellRef, state);
@@ -157,13 +157,6 @@ MWWorld::ContainerStore::ContainerStore()
 {
 }
 
-MWWorld::ContainerStore::~ContainerStore()
-{
-    MWWorld::WorldModel* worldModel = MWBase::Environment::get().getWorldModel();
-    for (MWWorld::ContainerStoreIterator iter(begin()); iter != end(); ++iter)
-        worldModel->deregisterPtr(*iter);
-}
-
 MWWorld::ConstContainerStoreIterator MWWorld::ContainerStore::cbegin(int mask) const
 {
     return ConstContainerStoreIterator(mask, this);
@@ -199,7 +192,7 @@ int MWWorld::ContainerStore::count(const ESM::RefId& id) const
     int total = 0;
     for (const auto&& iter : *this)
         if (iter.getCellRef().getRefId() == id)
-            total += iter.getRefData().getCount();
+            total += iter.getCellRef().getCount();
     return total;
 }
 
@@ -226,9 +219,9 @@ void MWWorld::ContainerStore::setContListener(MWWorld::ContainerStoreListener* l
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::unstack(const Ptr& ptr, int count)
 {
     resolve();
-    if (ptr.getRefData().getCount() <= count)
+    if (ptr.getCellRef().getCount() <= count)
         return end();
-    MWWorld::ContainerStoreIterator it = addNewStack(ptr, subtractItems(ptr.getRefData().getCount(false), count));
+    MWWorld::ContainerStoreIterator it = addNewStack(ptr, subtractItems(ptr.getCellRef().getCount(false), count));
 
     MWWorld::Ptr newPtr = *it;
     newPtr.getCellRef().unsetRefNum();
@@ -239,7 +232,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::unstack(const Ptr& ptr,
     if (!script.empty())
         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, *it);
 
-    remove(ptr, ptr.getRefData().getCount() - count);
+    remove(ptr, ptr.getCellRef().getCount() - count);
 
     return it;
 }
@@ -264,9 +257,9 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::restack(const MWWorld::
     {
         if (stacks(*iter, item))
         {
-            iter->getRefData().setCount(
-                addItems(iter->getRefData().getCount(false), item.getRefData().getCount(false)));
-            item.getRefData().setCount(0);
+            iter->getCellRef().setCount(
+                addItems(iter->getCellRef().getCount(false), item.getCellRef().getCount(false)));
+            item.getCellRef().setCount(0);
             retval = iter;
             break;
         }
@@ -350,7 +343,8 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(
     const ESM::RefId& script = item.getClass().getScript(item);
     if (!script.empty())
     {
-        if (mActor == player)
+        const Ptr& contPtr = getPtr();
+        if (contPtr == player)
         {
             // Items in player's inventory have cell set to 0, so their scripts will never be removed
             item.mCell = nullptr;
@@ -359,10 +353,8 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(
         {
             // Set mCell to the cell of the container/actor, so that the scripts are removed properly when
             // the cell of the container/actor goes inactive
-            if (!mPtr.isEmpty())
-                item.mCell = mPtr.getCell();
-            else if (!mActor.isEmpty())
-                item.mCell = mActor.getCell();
+            if (!contPtr.isEmpty())
+                item.mCell = contPtr.getCell();
         }
 
         item.mContainerStore = this;
@@ -371,12 +363,12 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(
 
         // Set OnPCAdd special variable, if it is declared
         // Make sure to do this *after* we have added the script to LocalScripts
-        if (mActor == player)
+        if (contPtr == player)
             item.getRefData().getLocals().setVarByInt(script, "onpcadd", 1);
     }
 
     // we should not fire event for InventoryStore yet - it has some custom logic
-    if (mListener && !(!mActor.isEmpty() && mActor.getClass().hasInventoryStore(mActor)))
+    if (mListener && typeid(*this) == typeid(ContainerStore))
         mListener->itemAdded(item, count);
 
     return it;
@@ -393,36 +385,38 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp(const Ptr& ptr,
     // gold needs special handling: when it is inserted into a container, the base object automatically becomes Gold_001
     // this ensures that gold piles of different sizes stack with each other (also, several scripts rely on Gold_001 for
     // detecting player gold)
+    // Note that adding 1 gold_100 is equivalent to adding 1 gold_001. Morrowind.exe resolves gold in leveled lists to
+    // gold_001 and TESCS disallows adding gold other than gold_001 to inventories. If a content file defines a
+    // container containing gold_100 anyway, the item is not turned to gold_001 until the player puts it down in the
+    // world and picks it up again. We just turn it into gold_001 here and ignore that oddity.
     if (ptr.getClass().isGold(ptr))
     {
-        int realCount = count * ptr.getClass().getValue(ptr);
-
         for (MWWorld::ContainerStoreIterator iter(begin(type)); iter != end(); ++iter)
         {
             if (iter->getCellRef().getRefId() == MWWorld::ContainerStore::sGoldId)
             {
-                iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), realCount));
+                iter->getCellRef().setCount(addItems(iter->getCellRef().getCount(false), count));
                 flagAsModified();
                 return iter;
             }
         }
 
-        MWWorld::ManualRef ref(esmStore, MWWorld::ContainerStore::sGoldId, realCount);
-        return addNewStack(ref.getPtr(), realCount);
+        MWWorld::ManualRef ref(esmStore, MWWorld::ContainerStore::sGoldId, count);
+        return addNewStack(ref.getPtr(), count);
     }
 
     // determine whether to stack or not
     for (MWWorld::ContainerStoreIterator iter(begin(type)); iter != end(); ++iter)
     {
         // Don't stack with equipped items
-        if (!mActor.isEmpty() && mActor.getClass().hasInventoryStore(mActor))
-            if (mActor.getClass().getInventoryStore(mActor).isEquipped(*iter))
+        if (auto* inventoryStore = dynamic_cast<InventoryStore*>(this))
+            if (inventoryStore->isEquipped(*iter))
                 continue;
 
         if (stacks(*iter, ptr))
         {
             // stack
-            iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), count));
+            iter->getCellRef().setCount(addItems(iter->getCellRef().getCount(false), count));
 
             flagAsModified();
             return iter;
@@ -488,7 +482,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addNewStack(const Const
             break;
     }
 
-    it->getRefData().setCount(count);
+    it->getCellRef().setCount(count);
 
     flagAsModified();
     return it;
@@ -570,7 +564,7 @@ int MWWorld::ContainerStore::remove(const Ptr& item, int count, bool equipReplac
         resolve();
 
     int toRemove = count;
-    RefData& itemRef = item.getRefData();
+    CellRef& itemRef = item.getCellRef();
 
     if (itemRef.getCount() <= toRemove)
     {
@@ -586,7 +580,7 @@ int MWWorld::ContainerStore::remove(const Ptr& item, int count, bool equipReplac
     flagAsModified();
 
     // we should not fire event for InventoryStore yet - it has some custom logic
-    if (mListener && !(!mActor.isEmpty() && mActor.getClass().hasInventoryStore(mActor)))
+    if (mListener && typeid(*this) == typeid(ContainerStore))
         mListener->itemRemoved(item, count - toRemove);
 
     // number of removed items
@@ -675,7 +669,7 @@ void MWWorld::ContainerStore::addInitialItemImp(
 void MWWorld::ContainerStore::clear()
 {
     for (auto&& iter : *this)
-        iter.getRefData().setCount(0);
+        iter.getCellRef().setCount(0);
 
     flagAsModified();
     mModified = true;
@@ -694,13 +688,14 @@ bool MWWorld::ContainerStore::isResolved() const
 
 void MWWorld::ContainerStore::resolve()
 {
-    if (!mResolved && !mPtr.isEmpty())
+    const Ptr& container = getPtr();
+    if (!mResolved && !container.isEmpty() && container.getType() == ESM::REC_CONT)
     {
         for (const auto&& ptr : *this)
-            ptr.getRefData().setCount(0);
+            ptr.getCellRef().setCount(0);
         Misc::Rng::Generator prng{ mSeed };
-        fill(mPtr.get<ESM::Container>()->mBase->mInventory, ESM::RefId(), prng);
-        addScripts(*this, mPtr.mCell);
+        fill(container.get<ESM::Container>()->mBase->mInventory, ESM::RefId(), prng);
+        addScripts(*this, container.mCell);
     }
     mModified = true;
 }
@@ -715,15 +710,16 @@ MWWorld::ResolutionHandle MWWorld::ContainerStore::resolveTemporarily()
         listener = std::make_shared<ResolutionListener>(*this);
         mResolutionListener = listener;
     }
-    if (!mResolved && !mPtr.isEmpty())
+    const Ptr& container = getPtr();
+    if (!mResolved && !container.isEmpty() && container.getType() == ESM::REC_CONT)
     {
         for (const auto&& ptr : *this)
-            ptr.getRefData().setCount(0);
+            ptr.getCellRef().setCount(0);
         Misc::Rng::Generator prng{ mSeed };
-        fill(mPtr.get<ESM::Container>()->mBase->mInventory, ESM::RefId(), prng);
-        addScripts(*this, mPtr.mCell);
+        fill(container.get<ESM::Container>()->mBase->mInventory, ESM::RefId(), prng);
+        addScripts(*this, container.mCell);
     }
-    return { listener };
+    return { std::move(listener) };
 }
 
 void MWWorld::ContainerStore::unresolve()
@@ -731,12 +727,13 @@ void MWWorld::ContainerStore::unresolve()
     if (mModified)
         return;
 
-    if (mResolved && !mPtr.isEmpty())
+    const Ptr& container = getPtr();
+    if (mResolved && !container.isEmpty() && container.getType() == ESM::REC_CONT)
     {
         for (const auto&& ptr : *this)
-            ptr.getRefData().setCount(0);
-        fillNonRandom(mPtr.get<ESM::Container>()->mBase->mInventory, ESM::RefId(), mSeed);
-        addScripts(*this, mPtr.mCell);
+            ptr.getCellRef().setCount(0);
+        fillNonRandom(container.get<ESM::Container>()->mBase->mInventory, ESM::RefId(), mSeed);
+        addScripts(*this, container.mCell);
         mResolved = false;
     }
 }
@@ -931,7 +928,7 @@ void MWWorld::ContainerStore::writeState(ESM::InventoryState& state) const
 {
     state.mItems.clear();
 
-    int index = 0;
+    size_t index = 0;
     storeStates(potions, state, index);
     storeStates(appas, state, index);
     storeStates(armors, state, index, true);
@@ -952,12 +949,12 @@ void MWWorld::ContainerStore::readState(const ESM::InventoryState& inventory)
     mModified = true;
     mResolved = true;
 
-    int index = 0;
+    size_t index = 0;
     for (const ESM::ObjectState& state : inventory.mItems)
     {
         int type = MWBase::Environment::get().getESMStore()->find(state.mRef.mRefID);
 
-        int thisIndex = index++;
+        size_t thisIndex = index++;
 
         switch (type)
         {
@@ -1337,7 +1334,7 @@ MWWorld::ContainerStoreIteratorBase<PtrType>& MWWorld::ContainerStoreIteratorBas
     {
         if (incIterator())
             nextType();
-    } while (mType != -1 && !(**this).getRefData().getCount());
+    } while (mType != -1 && !(**this).getCellRef().getCount());
 
     return *this;
 }
@@ -1389,7 +1386,7 @@ MWWorld::ContainerStoreIteratorBase<PtrType>::ContainerStoreIteratorBase(int mas
 {
     nextType();
 
-    if (mType == -1 || (**this).getRefData().getCount())
+    if (mType == -1 || (**this).getCellRef().getCount())
         return;
 
     ++*this;
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index bced5820fa..fb2722dde8 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -125,11 +125,6 @@ namespace MWWorld
 
         bool mRechargingItemsUpToDate;
 
-        // Non-empty only if is InventoryStore.
-        // The actor whose inventory it is.
-        // TODO: Consider merging mActor and mPtr.
-        MWWorld::Ptr mActor;
-
     private:
         MWWorld::CellRefList<ESM::Potion> potions;
         MWWorld::CellRefList<ESM::Apparatus> appas;
@@ -150,7 +145,7 @@ namespace MWWorld
         bool mModified;
         bool mResolved;
         unsigned int mSeed;
-        MWWorld::Ptr mPtr; // Container that contains this store. Set in MWClass::Container::getContainerStore
+        MWWorld::SafePtr mPtr; // Container or actor that holds this store.
         std::weak_ptr<ResolutionListener> mResolutionListener;
 
         ContainerStoreIterator addImp(const Ptr& ptr, int count, bool markModified = true);
@@ -166,21 +161,21 @@ namespace MWWorld
         void storeState(const LiveCellRef<T>& ref, ESM::ObjectState& state) const;
 
         template <typename T>
-        void storeStates(
-            const CellRefList<T>& collection, ESM::InventoryState& inventory, int& index, bool equipable = false) const;
+        void storeStates(const CellRefList<T>& collection, ESM::InventoryState& inventory, size_t& index,
+            bool equipable = false) const;
 
         void updateRechargingItems();
 
         virtual void storeEquipmentState(
-            const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const;
+            const MWWorld::LiveCellRefBase& ref, size_t index, ESM::InventoryState& inventory) const;
 
         virtual void readEquipmentState(
-            const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory);
+            const MWWorld::ContainerStoreIterator& iter, size_t index, const ESM::InventoryState& inventory);
 
     public:
         ContainerStore();
 
-        virtual ~ContainerStore();
+        virtual ~ContainerStore() = default;
 
         virtual std::unique_ptr<ContainerStore> clone()
         {
@@ -189,6 +184,10 @@ namespace MWWorld
             return res;
         }
 
+        // Container or actor that holds this store.
+        const Ptr& getPtr() const { return mPtr.ptrOrEmpty(); }
+        void setPtr(const Ptr& ptr) { mPtr = SafePtr(ptr); }
+
         ConstContainerStoreIterator cbegin(int mask = Type_All) const;
         ConstContainerStoreIterator cend() const;
         ConstContainerStoreIterator begin(int mask = Type_All) const;
diff --git a/apps/openmw/mwworld/customdata.cpp b/apps/openmw/mwworld/customdata.cpp
index 395d230a1a..db340302ce 100644
--- a/apps/openmw/mwworld/customdata.cpp
+++ b/apps/openmw/mwworld/customdata.cpp
@@ -77,4 +77,17 @@ namespace MWWorld
         throw std::logic_error(error.str());
     }
 
+    MWClass::ESM4NpcCustomData& CustomData::asESM4NpcCustomData()
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to ESM4NpcCustomData";
+        throw std::logic_error(error.str());
+    }
+
+    const MWClass::ESM4NpcCustomData& CustomData::asESM4NpcCustomData() const
+    {
+        std::stringstream error;
+        error << "bad cast " << typeid(this).name() << " to ESM4NpcCustomData";
+        throw std::logic_error(error.str());
+    }
 }
diff --git a/apps/openmw/mwworld/customdata.hpp b/apps/openmw/mwworld/customdata.hpp
index 9d9283f085..8051876309 100644
--- a/apps/openmw/mwworld/customdata.hpp
+++ b/apps/openmw/mwworld/customdata.hpp
@@ -6,6 +6,7 @@
 namespace MWClass
 {
     class CreatureCustomData;
+    class ESM4NpcCustomData;
     class NpcCustomData;
     class ContainerCustomData;
     class DoorCustomData;
@@ -38,6 +39,9 @@ namespace MWWorld
 
         virtual MWClass::CreatureLevListCustomData& asCreatureLevListCustomData();
         virtual const MWClass::CreatureLevListCustomData& asCreatureLevListCustomData() const;
+
+        virtual MWClass::ESM4NpcCustomData& asESM4NpcCustomData();
+        virtual const MWClass::ESM4NpcCustomData& asESM4NpcCustomData() const;
     };
 
     template <class T>
diff --git a/apps/openmw/mwworld/datetimemanager.cpp b/apps/openmw/mwworld/datetimemanager.cpp
index 7559242bef..633aeb42f0 100644
--- a/apps/openmw/mwworld/datetimemanager.cpp
+++ b/apps/openmw/mwworld/datetimemanager.cpp
@@ -4,6 +4,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
@@ -182,22 +183,19 @@ namespace MWWorld
             return months[month];
     }
 
-    bool DateTimeManager::updateGlobalFloat(GlobalVariableName name, float value)
+    void DateTimeManager::updateGlobalFloat(GlobalVariableName name, float value)
     {
         if (name == Globals::sGameHour)
         {
             setHour(value);
-            return true;
         }
         else if (name == Globals::sDay)
         {
             setDay(static_cast<int>(value));
-            return true;
         }
         else if (name == Globals::sMonth)
         {
             setMonth(static_cast<int>(value));
-            return true;
         }
         else if (name == Globals::sYear)
         {
@@ -211,26 +209,21 @@ namespace MWWorld
         {
             mDaysPassed = static_cast<int>(value);
         }
-
-        return false;
     }
 
-    bool DateTimeManager::updateGlobalInt(GlobalVariableName name, int value)
+    void DateTimeManager::updateGlobalInt(GlobalVariableName name, int value)
     {
         if (name == Globals::sGameHour)
         {
             setHour(static_cast<float>(value));
-            return true;
         }
         else if (name == Globals::sDay)
         {
             setDay(value);
-            return true;
         }
         else if (name == Globals::sMonth)
         {
             setMonth(value);
-            return true;
         }
         else if (name == Globals::sYear)
         {
@@ -244,8 +237,6 @@ namespace MWWorld
         {
             mDaysPassed = value;
         }
-
-        return false;
     }
 
     void DateTimeManager::setSimulationTimeScale(float scale)
@@ -263,6 +254,9 @@ namespace MWWorld
 
     void DateTimeManager::updateIsPaused()
     {
-        mPaused = !mPausedTags.empty() || MWBase::Environment::get().getWindowManager()->isGuiMode();
+        auto stateManager = MWBase::Environment::get().getStateManager();
+        auto wm = MWBase::Environment::get().getWindowManager();
+        mPaused = !mPausedTags.empty() || wm->isConsoleMode() || wm->isPostProcessorHudVisible()
+            || wm->isInteractiveMessageBoxActive() || stateManager->getState() == MWBase::StateManager::State_NoGame;
     }
 }
diff --git a/apps/openmw/mwworld/datetimemanager.hpp b/apps/openmw/mwworld/datetimemanager.hpp
index f89894292f..fce8898cf2 100644
--- a/apps/openmw/mwworld/datetimemanager.hpp
+++ b/apps/openmw/mwworld/datetimemanager.hpp
@@ -29,7 +29,11 @@ namespace MWWorld
         float getGameTimeScale() const { return mGameTimeScale; }
         void setGameTimeScale(float scale); // game time to simulation time ratio
 
-        // Simulation time (the number of seconds passed from the beginning of the game).
+        // Rendering simulation time (summary simulation time of rendering frames since application start).
+        double getRenderingSimulationTime() const { return mRenderingSimulationTime; }
+        void setRenderingSimulationTime(double t) { mRenderingSimulationTime = t; }
+
+        // World simulation time (the number of seconds passed from the beginning of the game).
         double getSimulationTime() const { return mSimulationTime; }
         void setSimulationTime(double t) { mSimulationTime = t; }
         float getSimulationTimeScale() const { return mSimulationTimeScale; }
@@ -49,8 +53,8 @@ namespace MWWorld
     private:
         friend class World;
         void setup(Globals& globalVariables);
-        bool updateGlobalInt(GlobalVariableName name, int value);
-        bool updateGlobalFloat(GlobalVariableName name, float value);
+        void updateGlobalInt(GlobalVariableName name, int value);
+        void updateGlobalFloat(GlobalVariableName name, float value);
         void advanceTime(double hours, Globals& globalVariables);
 
         void setHour(double hour);
@@ -64,6 +68,7 @@ namespace MWWorld
         float mGameHour = 0.f;
         float mGameTimeScale = 0.f;
         float mSimulationTimeScale = 1.0;
+        double mRenderingSimulationTime = 0.0;
         double mSimulationTime = 0.0;
         bool mPaused = false;
         std::set<std::string, std::less<>> mPausedTags;
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index e586a4c204..0be90c65f0 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -64,11 +64,12 @@ namespace MWWorld
             }
             case ESM::Format::Tes4:
             {
-                ESM4::Reader readerESM4(std::move(stream), filepath,
-                    MWBase::Environment::get().getResourceSystem()->getVFS(), mReaders.getStatelessEncoder());
-                readerESM4.setModIndex(index);
-                readerESM4.updateModIndices(mNameToIndex);
-                mStore.loadESM4(readerESM4);
+                ESM4::Reader reader(std::move(stream), filepath,
+                    MWBase::Environment::get().getResourceSystem()->getVFS(),
+                    mEncoder != nullptr ? &mEncoder->getStatelessEncoder() : nullptr);
+                reader.setModIndex(index);
+                reader.updateModIndices(mNameToIndex);
+                mStore.loadESM4(reader);
                 break;
             }
         }
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 209fc39b42..15a687f4d7 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -83,11 +83,22 @@ namespace
         throw std::runtime_error("List of NPC classes is empty!");
     }
 
+    const ESM::RefId& getDefaultRace(const MWWorld::Store<ESM::Race>& races)
+    {
+        auto it = races.begin();
+        if (it != races.end())
+            return it->mId;
+        throw std::runtime_error("List of NPC races is empty!");
+    }
+
     std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions,
-        const MWWorld::Store<ESM::Class>& classes, const std::unordered_map<ESM::RefId, ESM::NPC>& npcs)
+        const MWWorld::Store<ESM::Class>& classes, const MWWorld::Store<ESM::Race>& races,
+        const MWWorld::Store<ESM::Script>& scripts, const std::unordered_map<ESM::RefId, ESM::NPC>& npcs)
     {
         // Cache first class from store - we will use it if current class is not found
         const ESM::RefId& defaultCls = getDefaultClass(classes);
+        // Same for races
+        const ESM::RefId& defaultRace = getDefaultRace(races);
 
         // Validate NPCs for non-existing class and faction.
         // We will replace invalid entries by fixed ones
@@ -112,8 +123,7 @@ namespace
                 }
             }
 
-            const ESM::RefId& npcClass = npc.mClass;
-            const ESM::Class* cls = classes.search(npcClass);
+            const ESM::Class* cls = classes.search(npc.mClass);
             if (!cls)
             {
                 Log(Debug::Verbose) << "NPC " << npc.mId << " (" << npc.mName << ") has nonexistent class "
@@ -122,6 +132,23 @@ namespace
                 changed = true;
             }
 
+            const ESM::Race* race = races.search(npc.mRace);
+            if (!race)
+            {
+                Log(Debug::Verbose) << "NPC " << npc.mId << " (" << npc.mName << ") has nonexistent race " << npc.mRace
+                                    << ", using " << defaultRace << " race as replacement.";
+                npc.mRace = defaultRace;
+                changed = true;
+            }
+
+            if (!npc.mScript.empty() && !scripts.search(npc.mScript))
+            {
+                Log(Debug::Verbose) << "NPC " << npc.mId << " (" << npc.mName << ") has nonexistent script "
+                                    << npc.mScript << ", ignoring it.";
+                npc.mScript = ESM::RefId();
+                changed = true;
+            }
+
             if (changed)
                 npcsToReplace.push_back(npc);
         }
@@ -129,6 +156,59 @@ namespace
         return npcsToReplace;
     }
 
+    template <class RecordType>
+    std::vector<RecordType> getSpellsToReplace(
+        const MWWorld::Store<RecordType>& spells, const MWWorld::Store<ESM::MagicEffect>& magicEffects)
+    {
+        std::vector<RecordType> spellsToReplace;
+
+        for (RecordType spell : spells)
+        {
+            if (spell.mEffects.mList.empty())
+                continue;
+
+            bool changed = false;
+            auto iter = spell.mEffects.mList.begin();
+            while (iter != spell.mEffects.mList.end())
+            {
+                const ESM::MagicEffect* mgef = magicEffects.search(iter->mData.mEffectID);
+                if (!mgef)
+                {
+                    Log(Debug::Verbose) << RecordType::getRecordType() << " " << spell.mId
+                                        << ": dropping invalid effect (index " << iter->mData.mEffectID << ")";
+                    iter = spell.mEffects.mList.erase(iter);
+                    changed = true;
+                    continue;
+                }
+
+                if (!(mgef->mData.mFlags & ESM::MagicEffect::TargetAttribute) && iter->mData.mAttribute != -1)
+                {
+                    iter->mData.mAttribute = -1;
+                    Log(Debug::Verbose) << RecordType::getRecordType() << " " << spell.mId
+                                        << ": dropping unexpected attribute argument of "
+                                        << ESM::MagicEffect::indexToGmstString(iter->mData.mEffectID) << " effect";
+                    changed = true;
+                }
+
+                if (!(mgef->mData.mFlags & ESM::MagicEffect::TargetSkill) && iter->mData.mSkill != -1)
+                {
+                    iter->mData.mSkill = -1;
+                    Log(Debug::Verbose) << RecordType::getRecordType() << " " << spell.mId
+                                        << ": dropping unexpected skill argument of "
+                                        << ESM::MagicEffect::indexToGmstString(iter->mData.mEffectID) << " effect";
+                    changed = true;
+                }
+
+                ++iter;
+            }
+
+            if (changed)
+                spellsToReplace.emplace_back(spell);
+        }
+
+        return spellsToReplace;
+    }
+
     // Custom enchanted items can reference scripts that no longer exist, this doesn't necessarily mean the base item no
     // longer exists however. So instead of removing the item altogether, we're only removing the script.
     template <class MapT>
@@ -138,9 +218,9 @@ namespace
         {
             if (!item.mScript.empty() && !scripts.search(item.mScript))
             {
+                Log(Debug::Verbose) << MapT::mapped_type::getRecordType() << ' ' << id << " (" << item.mName
+                                    << ") has nonexistent script " << item.mScript << ", ignoring it.";
                 item.mScript = ESM::RefId();
-                Log(Debug::Verbose) << "Item " << id << " (" << item.mName << ") has nonexistent script "
-                                    << item.mScript << ", ignoring it.";
             }
         }
     }
@@ -284,14 +364,18 @@ namespace MWWorld
             case ESM::REC_CONT4:
             case ESM::REC_CREA4:
             case ESM::REC_DOOR4:
+            case ESM::REC_FLOR4:
             case ESM::REC_FURN4:
+            case ESM::REC_IMOD4:
             case ESM::REC_INGR4:
             case ESM::REC_LIGH4:
             case ESM::REC_LVLI4:
             case ESM::REC_LVLC4:
             case ESM::REC_LVLN4:
             case ESM::REC_MISC4:
+            case ESM::REC_MSTT4:
             case ESM::REC_NPC_4:
+            case ESM::REC_SCOL4:
             case ESM::REC_STAT4:
             case ESM::REC_TERM4:
             case ESM::REC_TREE4:
@@ -307,11 +391,6 @@ namespace MWWorld
         if (listener != nullptr)
             listener->setProgressRange(::EsmLoader::fileProgress);
 
-        // Land texture loading needs to use a separate internal store for each plugin.
-        // We set the number of plugins here so we can properly verify if valid plugin
-        // indices are being passed to the LandTexture Store retrieval methods.
-        getWritable<ESM::LandTexture>().resize(esm.getIndex() + 1);
-
         // Loop through all records
         while (esm.hasMoreRecs())
         {
@@ -516,8 +595,8 @@ namespace MWWorld
     void ESMStore::validate()
     {
         auto& npcs = getWritable<ESM::NPC>();
-        std::vector<ESM::NPC> npcsToReplace
-            = getNPCsToReplace(getWritable<ESM::Faction>(), getWritable<ESM::Class>(), npcs.mStatic);
+        std::vector<ESM::NPC> npcsToReplace = getNPCsToReplace(getWritable<ESM::Faction>(), getWritable<ESM::Class>(),
+            getWritable<ESM::Race>(), getWritable<ESM::Script>(), npcs.mStatic);
 
         for (const ESM::NPC& npc : npcsToReplace)
         {
@@ -525,71 +604,26 @@ namespace MWWorld
             npcs.insertStatic(npc);
         }
 
-        // Validate spell effects for invalid arguments
-        std::vector<ESM::Spell> spellsToReplace;
+        removeMissingScripts(getWritable<ESM::Script>(), getWritable<ESM::Creature>().mStatic);
+
+        // Validate spell effects and enchantments for invalid arguments
         auto& spells = getWritable<ESM::Spell>();
-        for (ESM::Spell spell : spells)
-        {
-            if (spell.mEffects.mList.empty())
-                continue;
-
-            bool changed = false;
-            auto iter = spell.mEffects.mList.begin();
-            while (iter != spell.mEffects.mList.end())
-            {
-                const ESM::MagicEffect* mgef = getWritable<ESM::MagicEffect>().search(iter->mEffectID);
-                if (!mgef)
-                {
-                    Log(Debug::Verbose) << "Spell '" << spell.mId << "' has an invalid effect (index "
-                                        << iter->mEffectID << ") present. Dropping the effect.";
-                    iter = spell.mEffects.mList.erase(iter);
-                    changed = true;
-                    continue;
-                }
-
-                if (mgef->mData.mFlags & ESM::MagicEffect::TargetSkill)
-                {
-                    if (iter->mAttribute != -1)
-                    {
-                        iter->mAttribute = -1;
-                        Log(Debug::Verbose)
-                            << ESM::MagicEffect::indexToGmstString(iter->mEffectID) << " effect of spell '" << spell.mId
-                            << "' has an attribute argument present. Dropping the argument.";
-                        changed = true;
-                    }
-                }
-                else if (mgef->mData.mFlags & ESM::MagicEffect::TargetAttribute)
-                {
-                    if (iter->mSkill != -1)
-                    {
-                        iter->mSkill = -1;
-                        Log(Debug::Verbose)
-                            << ESM::MagicEffect::indexToGmstString(iter->mEffectID) << " effect of spell '" << spell.mId
-                            << "' has a skill argument present. Dropping the argument.";
-                        changed = true;
-                    }
-                }
-                else if (iter->mSkill != -1 || iter->mAttribute != -1)
-                {
-                    iter->mSkill = -1;
-                    iter->mAttribute = -1;
-                    Log(Debug::Verbose) << ESM::MagicEffect::indexToGmstString(iter->mEffectID) << " effect of spell '"
-                                        << spell.mId << "' has argument(s) present. Dropping the argument(s).";
-                    changed = true;
-                }
-
-                ++iter;
-            }
-
-            if (changed)
-                spellsToReplace.emplace_back(spell);
-        }
+        auto& enchantments = getWritable<ESM::Enchantment>();
+        auto& magicEffects = getWritable<ESM::MagicEffect>();
 
+        std::vector<ESM::Spell> spellsToReplace = getSpellsToReplace(spells, magicEffects);
         for (const ESM::Spell& spell : spellsToReplace)
         {
             spells.eraseStatic(spell.mId);
             spells.insertStatic(spell);
         }
+
+        std::vector<ESM::Enchantment> enchantmentsToReplace = getSpellsToReplace(enchantments, magicEffects);
+        for (const ESM::Enchantment& enchantment : enchantmentsToReplace)
+        {
+            enchantments.eraseStatic(enchantment.mId);
+            enchantments.insertStatic(enchantment);
+        }
     }
 
     void ESMStore::movePlayerRecord()
@@ -604,8 +638,8 @@ namespace MWWorld
         auto& npcs = getWritable<ESM::NPC>();
         auto& scripts = getWritable<ESM::Script>();
 
-        std::vector<ESM::NPC> npcsToReplace
-            = getNPCsToReplace(getWritable<ESM::Faction>(), getWritable<ESM::Class>(), npcs.mDynamic);
+        std::vector<ESM::NPC> npcsToReplace = getNPCsToReplace(getWritable<ESM::Faction>(), getWritable<ESM::Class>(),
+            getWritable<ESM::Race>(), getWritable<ESM::Script>(), npcs.mDynamic);
 
         for (const ESM::NPC& npc : npcsToReplace)
             npcs.insert(npc);
@@ -613,6 +647,7 @@ namespace MWWorld
         removeMissingScripts(scripts, getWritable<ESM::Armor>().mDynamic);
         removeMissingScripts(scripts, getWritable<ESM::Book>().mDynamic);
         removeMissingScripts(scripts, getWritable<ESM::Clothing>().mDynamic);
+        removeMissingScripts(scripts, getWritable<ESM::Creature>().mDynamic);
         removeMissingScripts(scripts, getWritable<ESM::Weapon>().mDynamic);
 
         removeMissingObjects(getWritable<ESM::CreatureLevList>());
@@ -649,7 +684,7 @@ namespace MWWorld
             + get<ESM::Activator>().getDynamicSize() + get<ESM::Miscellaneous>().getDynamicSize()
             + get<ESM::Weapon>().getDynamicSize() + get<ESM::CreatureLevList>().getDynamicSize()
             + get<ESM::ItemLevList>().getDynamicSize() + get<ESM::Creature>().getDynamicSize()
-            + get<ESM::Container>().getDynamicSize();
+            + get<ESM::Container>().getDynamicSize() + get<ESM::Light>().getDynamicSize();
     }
 
     void ESMStore::write(ESM::ESMWriter& writer, Loading::Listener& progress) const
@@ -675,6 +710,7 @@ namespace MWWorld
         get<ESM::ItemLevList>().write(writer, progress);
         get<ESM::Creature>().write(writer, progress);
         get<ESM::Container>().write(writer, progress);
+        get<ESM::Light>().write(writer, progress);
     }
 
     bool ESMStore::readRecord(ESM::ESMReader& reader, uint32_t type_id)
@@ -694,6 +730,7 @@ namespace MWWorld
             case ESM::REC_WEAP:
             case ESM::REC_LEVI:
             case ESM::REC_LEVC:
+            case ESM::REC_LIGH:
                 mStoreImp->mRecNameToStore[type]->read(reader);
                 return true;
             case ESM::REC_NPC_:
@@ -704,7 +741,16 @@ namespace MWWorld
 
             case ESM::REC_DYNA:
                 reader.getSubNameIs("COUN");
-                reader.getHT(mDynamicCount);
+                if (reader.getFormatVersion() <= ESM::MaxActiveSpellTypeVersion)
+                {
+                    uint32_t dynamicCount32 = 0;
+                    reader.getHT(dynamicCount32);
+                    mDynamicCount = dynamicCount32;
+                }
+                else
+                {
+                    reader.getHT(mDynamicCount);
+                }
                 return true;
 
             default:
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 80cd5719e2..d8cfd1dcdf 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -86,22 +86,27 @@ namespace ESM4
     struct Container;
     struct Creature;
     struct Door;
+    struct Flora;
     struct Furniture;
     struct Hair;
     struct HeadPart;
     struct Ingredient;
+    struct ItemMod;
     struct Land;
+    struct LandTexture;
     struct LevelledCreature;
     struct LevelledItem;
     struct LevelledNpc;
     struct Light;
     struct MiscItem;
+    struct MovableStatic;
     struct Npc;
     struct Outfit;
     struct Potion;
     struct Race;
     struct Reference;
     struct Static;
+    struct StaticCollection;
     struct Terminal;
     struct Tree;
     struct Weapon;
@@ -136,11 +141,13 @@ namespace MWWorld
 
             Store<ESM4::Activator>, Store<ESM4::ActorCharacter>, Store<ESM4::ActorCreature>, Store<ESM4::Ammunition>,
             Store<ESM4::Armor>, Store<ESM4::ArmorAddon>, Store<ESM4::Book>, Store<ESM4::Cell>, Store<ESM4::Clothing>,
-            Store<ESM4::Container>, Store<ESM4::Creature>, Store<ESM4::Door>, Store<ESM4::Furniture>, Store<ESM4::Hair>,
-            Store<ESM4::HeadPart>, Store<ESM4::Ingredient>, Store<ESM4::Land>, Store<ESM4::LevelledCreature>,
-            Store<ESM4::LevelledItem>, Store<ESM4::LevelledNpc>, Store<ESM4::Light>, Store<ESM4::MiscItem>,
+            Store<ESM4::Container>, Store<ESM4::Creature>, Store<ESM4::Door>, Store<ESM4::Furniture>,
+            Store<ESM4::Flora>, Store<ESM4::Hair>, Store<ESM4::HeadPart>, Store<ESM4::Ingredient>, Store<ESM4::ItemMod>,
+            Store<ESM4::Land>, Store<ESM4::LandTexture>, Store<ESM4::LevelledCreature>, Store<ESM4::LevelledItem>,
+            Store<ESM4::LevelledNpc>, Store<ESM4::Light>, Store<ESM4::MiscItem>, Store<ESM4::MovableStatic>,
             Store<ESM4::Npc>, Store<ESM4::Outfit>, Store<ESM4::Potion>, Store<ESM4::Race>, Store<ESM4::Reference>,
-            Store<ESM4::Static>, Store<ESM4::Terminal>, Store<ESM4::Tree>, Store<ESM4::Weapon>, Store<ESM4::World>>;
+            Store<ESM4::Static>, Store<ESM4::StaticCollection>, Store<ESM4::Terminal>, Store<ESM4::Tree>,
+            Store<ESM4::Weapon>, Store<ESM4::World>>;
 
     private:
         template <typename T>
@@ -157,7 +164,7 @@ namespace MWWorld
         std::vector<StoreBase*> mStores;
         std::vector<DynamicStore*> mDynamicStores;
 
-        unsigned int mDynamicCount;
+        uint64_t mDynamicCount;
 
         mutable std::unordered_map<ESM::RefId, std::weak_ptr<MWMechanics::SpellList>> mSpellListCache;
 
@@ -204,6 +211,7 @@ namespace MWWorld
 
         void clearDynamic();
         void rebuildIdsIndex();
+        ESM::RefId generateId() { return ESM::RefId::generated(mDynamicCount++); }
 
         void movePlayerRecord();
 
@@ -224,7 +232,7 @@ namespace MWWorld
         template <class T>
         const T* insert(const T& x)
         {
-            const ESM::RefId id = ESM::RefId::generated(mDynamicCount++);
+            const ESM::RefId id = generateId();
 
             Store<T>& store = getWritable<T>();
             if (store.search(id) != nullptr)
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index 264109d17f..4977df56c0 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -99,7 +99,7 @@ namespace MWWorld
             global.load(reader, isDeleted);
 
             if (const auto iter = mVariables.find(global.mId); iter != mVariables.end())
-                iter->second = global;
+                iter->second = std::move(global);
 
             return true;
         }
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 85b9376f0d..ea5b5baf5e 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -9,8 +9,6 @@
 #include <components/misc/strings/lower.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwbase/environment.hpp>
-
 #include "store.hpp"
 
 namespace MWWorld
@@ -23,31 +21,27 @@ namespace MWWorld
         query.mLoadCells = true;
 
         ESM::ReadersCache readers;
-        const ::EsmLoader::EsmData content
+        ::EsmLoader::EsmData content
             = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder, listener);
 
-        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
-        static constexpr std::string_view prefix = "grass\\";
+        static constexpr std::string_view prefix = "grass/";
         for (const ESM::Static& stat : statics)
         {
-            std::string model = Misc::StringUtils::lowerCase(stat.mModel);
-            std::replace(model.begin(), model.end(), '/', '\\');
-            if (!model.starts_with(prefix))
+            VFS::Path::Normalized model = VFS::Path::toNormalized(stat.mModel);
+            if (!model.value().starts_with(prefix))
                 continue;
-            mMeshCache[stat.mId] = Misc::ResourceHelpers::correctMeshPath(model, vfs);
+            mMeshCache[stat.mId] = Misc::ResourceHelpers::correctMeshPath(model);
         }
 
         for (const ESM::Static& stat : content.mStatics)
         {
-            std::string model = Misc::StringUtils::lowerCase(stat.mModel);
-            std::replace(model.begin(), model.end(), '/', '\\');
-            if (!model.starts_with(prefix))
+            VFS::Path::Normalized model = VFS::Path::toNormalized(stat.mModel);
+            if (!model.value().starts_with(prefix))
                 continue;
-            mMeshCache[stat.mId] = Misc::ResourceHelpers::correctMeshPath(model, vfs);
+            mMeshCache[stat.mId] = Misc::ResourceHelpers::correctMeshPath(model);
         }
 
-        for (const ESM::Cell& cell : content.mCells)
+        for (ESM::Cell& cell : content.mCells)
         {
             if (!cell.isExterior())
                 continue;
@@ -56,15 +50,6 @@ namespace MWWorld
         }
     }
 
-    std::string GroundcoverStore::getGroundcoverModel(const ESM::RefId& id) const
-    {
-        auto search = mMeshCache.find(id);
-        if (search == mMeshCache.end())
-            return std::string();
-
-        return search->second;
-    }
-
     void GroundcoverStore::initCell(ESM::Cell& cell, int cellX, int cellY) const
     {
         cell.blank();
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
index 2f34aa9675..021bdb5e91 100644
--- a/apps/openmw/mwworld/groundcoverstore.hpp
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -2,6 +2,8 @@
 #define GAME_MWWORLD_GROUNDCOVER_STORE_H
 
 #include <components/esm/refid.hpp>
+#include <components/vfs/pathutil.hpp>
+
 #include <map>
 #include <string>
 #include <vector>
@@ -36,7 +38,7 @@ namespace MWWorld
     class GroundcoverStore
     {
     private:
-        std::map<ESM::RefId, std::string> mMeshCache;
+        std::map<ESM::RefId, VFS::Path::Normalized> mMeshCache;
         std::map<std::pair<int, int>, std::vector<ESM::ESM_Context>> mCellContexts;
 
     public:
@@ -44,7 +46,14 @@ namespace MWWorld
             const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
             Loading::Listener* listener);
 
-        std::string getGroundcoverModel(const ESM::RefId& id) const;
+        VFS::Path::NormalizedView getGroundcoverModel(ESM::RefId id) const
+        {
+            auto it = mMeshCache.find(id);
+            if (it == mMeshCache.end())
+                return {};
+            return it->second;
+        }
+
         void initCell(ESM::Cell& cell, int cellX, int cellY) const;
     };
 }
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 99949a73d4..f48f4e6e31 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -46,32 +46,32 @@ void MWWorld::InventoryStore::initSlots(TSlots& slots_)
 }
 
 void MWWorld::InventoryStore::storeEquipmentState(
-    const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const
+    const MWWorld::LiveCellRefBase& ref, size_t index, ESM::InventoryState& inventory) const
 {
-    for (int i = 0; i < static_cast<int>(mSlots.size()); ++i)
+    for (int32_t i = 0; i < MWWorld::InventoryStore::Slots; ++i)
+    {
         if (mSlots[i].getType() != -1 && mSlots[i]->getBase() == &ref)
-        {
-            inventory.mEquipmentSlots[index] = i;
-        }
+            inventory.mEquipmentSlots[static_cast<uint32_t>(index)] = i;
+    }
 
     if (mSelectedEnchantItem.getType() != -1 && mSelectedEnchantItem->getBase() == &ref)
         inventory.mSelectedEnchantItem = index;
 }
 
 void MWWorld::InventoryStore::readEquipmentState(
-    const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory)
+    const MWWorld::ContainerStoreIterator& iter, size_t index, const ESM::InventoryState& inventory)
 {
     if (index == inventory.mSelectedEnchantItem)
         mSelectedEnchantItem = iter;
 
-    std::map<int, int>::const_iterator found = inventory.mEquipmentSlots.find(index);
+    auto found = inventory.mEquipmentSlots.find(index);
     if (found != inventory.mEquipmentSlots.end())
     {
         if (found->second < 0 || found->second >= MWWorld::InventoryStore::Slots)
             throw std::runtime_error("Invalid slot index in inventory state");
 
         // make sure the item can actually be equipped in this slot
-        int slot = found->second;
+        int32_t slot = found->second;
         std::pair<std::vector<int>, bool> allowedSlots = iter->getClass().getEquipmentSlots(*iter);
         if (!allowedSlots.first.size())
             return;
@@ -79,11 +79,11 @@ void MWWorld::InventoryStore::readEquipmentState(
             slot = allowedSlots.first.front();
 
         // unstack if required
-        if (!allowedSlots.second && iter->getRefData().getCount() > 1)
+        if (!allowedSlots.second && iter->getCellRef().getCount() > 1)
         {
-            int count = iter->getRefData().getCount(false);
+            int count = iter->getCellRef().getCount(false);
             MWWorld::ContainerStoreIterator newIter = addNewStack(*iter, count > 0 ? 1 : -1);
-            iter->getRefData().setCount(subtractItems(count, 1));
+            iter->getCellRef().setCount(subtractItems(count, 1));
             mSlots[slot] = newIter;
         }
         else
@@ -133,8 +133,9 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(
         = MWWorld::ContainerStore::add(itemPtr, count, allowAutoEquip, resolve);
 
     // Auto-equip items if an armor/clothing item is added, but not for the player nor werewolves
-    if (allowAutoEquip && mActor != MWMechanics::getPlayer() && mActor.getClass().isNpc()
-        && !mActor.getClass().getNpcStats(mActor).isWerewolf())
+    const Ptr& actor = getPtr();
+    if (allowAutoEquip && actor != MWMechanics::getPlayer() && actor.getClass().isNpc()
+        && !actor.getClass().getNpcStats(actor).isWerewolf())
     {
         auto type = itemPtr.getType();
         if (type == ESM::Armor::sRecordId || type == ESM::Clothing::sRecordId)
@@ -170,7 +171,7 @@ void MWWorld::InventoryStore::equip(int slot, const ContainerStoreIterator& iter
 
     // unstack item pointed to by iterator if required
     if (iterator != end() && !slots_.second
-        && iterator->getRefData().getCount() > 1) // if slots.second is true, item can stay stacked when equipped
+        && iterator->getCellRef().getCount() > 1) // if slots.second is true, item can stay stacked when equipped
     {
         unstack(*iterator);
     }
@@ -220,12 +221,13 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::findSlot(int slot) cons
 
 void MWWorld::InventoryStore::autoEquipWeapon(TSlots& slots_)
 {
-    if (!mActor.getClass().isNpc())
+    const Ptr& actor = getPtr();
+    if (!actor.getClass().isNpc())
     {
         // In original game creatures do not autoequip weapon, but we need it for weapon sheathing.
         // The only case when the difference is noticable - when this creature sells weapon.
         // So just disable weapon autoequipping for creatures which sells weapon.
-        int services = mActor.getClass().getServices(mActor);
+        int services = actor.getClass().getServices(actor);
         bool sellsWeapon = services & (ESM::NPC::Weapon | ESM::NPC::MagicItems);
         if (sellsWeapon)
             return;
@@ -280,7 +282,7 @@ void MWWorld::InventoryStore::autoEquipWeapon(TSlots& slots_)
 
         for (int j = 0; j < static_cast<int>(weaponSkillsLength); ++j)
         {
-            float skillValue = mActor.getClass().getSkill(mActor, weaponSkills[j]);
+            float skillValue = actor.getClass().getSkill(actor, weaponSkills[j]);
             if (skillValue > max && !weaponSkillVisited[j])
             {
                 max = skillValue;
@@ -323,7 +325,7 @@ void MWWorld::InventoryStore::autoEquipWeapon(TSlots& slots_)
             }
         }
 
-        if (weapon != end() && weapon->getClass().canBeEquipped(*weapon, mActor).first)
+        if (weapon != end() && weapon->getClass().canBeEquipped(*weapon, actor).first)
         {
             // Do not equip ranged weapons, if there is no suitable ammo
             bool hasAmmo = true;
@@ -353,7 +355,7 @@ void MWWorld::InventoryStore::autoEquipWeapon(TSlots& slots_)
                 {
                     if (!itemsSlots.second)
                     {
-                        if (weapon->getRefData().getCount() > 1)
+                        if (weapon->getCellRef().getCount() > 1)
                         {
                             unstack(*weapon);
                         }
@@ -378,7 +380,8 @@ void MWWorld::InventoryStore::autoEquipArmor(TSlots& slots_)
 {
     // Only NPCs can wear armor for now.
     // For creatures we equip only shields.
-    if (!mActor.getClass().isNpc())
+    const Ptr& actor = getPtr();
+    if (!actor.getClass().isNpc())
     {
         autoEquipShield(slots_);
         return;
@@ -389,7 +392,7 @@ void MWWorld::InventoryStore::autoEquipArmor(TSlots& slots_)
     static float fUnarmoredBase1 = store.find("fUnarmoredBase1")->mValue.getFloat();
     static float fUnarmoredBase2 = store.find("fUnarmoredBase2")->mValue.getFloat();
 
-    float unarmoredSkill = mActor.getClass().getSkill(mActor, ESM::Skill::Unarmored);
+    float unarmoredSkill = actor.getClass().getSkill(actor, ESM::Skill::Unarmored);
     float unarmoredRating = (fUnarmoredBase1 * unarmoredSkill) * (fUnarmoredBase2 * unarmoredSkill);
 
     for (ContainerStoreIterator iter(begin(ContainerStore::Type_Clothing | ContainerStore::Type_Armor)); iter != end();
@@ -397,7 +400,7 @@ void MWWorld::InventoryStore::autoEquipArmor(TSlots& slots_)
     {
         Ptr test = *iter;
 
-        switch (test.getClass().canBeEquipped(test, mActor).first)
+        switch (test.getClass().canBeEquipped(test, actor).first)
         {
             case 0:
                 continue;
@@ -406,7 +409,7 @@ void MWWorld::InventoryStore::autoEquipArmor(TSlots& slots_)
         }
 
         if (iter.getType() == ContainerStore::Type_Armor
-            && test.getClass().getEffectiveArmorRating(test, mActor) <= std::max(unarmoredRating, 0.f))
+            && test.getClass().getEffectiveArmorRating(test, actor) <= std::max(unarmoredRating, 0.f))
         {
             continue;
         }
@@ -431,8 +434,8 @@ void MWWorld::InventoryStore::autoEquipArmor(TSlots& slots_)
 
                         if (old.get<ESM::Armor>()->mBase->mData.mType == test.get<ESM::Armor>()->mBase->mData.mType)
                         {
-                            if (old.getClass().getEffectiveArmorRating(old, mActor)
-                                >= test.getClass().getEffectiveArmorRating(test, mActor))
+                            if (old.getClass().getEffectiveArmorRating(old, actor)
+                                >= test.getClass().getEffectiveArmorRating(test, actor))
                                 // old armor had better armor rating
                                 continue;
                         }
@@ -475,7 +478,7 @@ void MWWorld::InventoryStore::autoEquipArmor(TSlots& slots_)
             if (!itemsSlots.second) // if itemsSlots.second is true, item can stay stacked when equipped
             {
                 // unstack item pointed to by iterator if required
-                if (iter->getRefData().getCount() > 1)
+                if (iter->getCellRef().getCount() > 1)
                 {
                     unstack(*iter);
                 }
@@ -494,7 +497,7 @@ void MWWorld::InventoryStore::autoEquipShield(TSlots& slots_)
     {
         if (iter->get<ESM::Armor>()->mBase->mData.mType != ESM::Armor::Shield)
             continue;
-        if (iter->getClass().canBeEquipped(*iter, mActor).first != 1)
+        if (iter->getClass().canBeEquipped(*iter, getPtr()).first != 1)
             continue;
         std::pair<std::vector<int>, bool> shieldSlots = iter->getClass().getEquipmentSlots(*iter);
         int slot = shieldSlots.first[0];
@@ -587,7 +590,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, bool equipReplac
     int retCount = ContainerStore::remove(item, count, equipReplacement, resolve);
 
     bool wasEquipped = false;
-    if (!item.getRefData().getCount())
+    if (!item.getCellRef().getCount())
     {
         for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
         {
@@ -606,15 +609,16 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, bool equipReplac
     // If an armor/clothing item is removed, try to find a replacement,
     // but not for the player nor werewolves, and not if the RemoveItem script command
     // was used (equipReplacement is false)
-    if (equipReplacement && wasEquipped && (mActor != MWMechanics::getPlayer()) && mActor.getClass().isNpc()
-        && !mActor.getClass().getNpcStats(mActor).isWerewolf())
+    const Ptr& actor = getPtr();
+    if (equipReplacement && wasEquipped && (actor != MWMechanics::getPlayer()) && actor.getClass().isNpc()
+        && !actor.getClass().getNpcStats(actor).isWerewolf())
     {
         auto type = item.getType();
         if (type == ESM::Armor::sRecordId || type == ESM::Clothing::sRecordId)
             autoEquip();
     }
 
-    if (item.getRefData().getCount() == 0 && mSelectedEnchantItem != end() && *mSelectedEnchantItem == item)
+    if (item.getCellRef().getCount() == 0 && mSelectedEnchantItem != end() && *mSelectedEnchantItem == item)
     {
         mSelectedEnchantItem = end();
     }
@@ -639,11 +643,11 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, b
         // empty this slot
         mSlots[slot] = end();
 
-        if (it->getRefData().getCount())
+        if (it->getCellRef().getCount())
         {
             retval = restack(*it);
 
-            if (mActor == MWMechanics::getPlayer())
+            if (getPtr() == MWMechanics::getPlayer())
             {
                 // Unset OnPCEquip Variable on item's script, if it has a script with that variable declared
                 const ESM::RefId& script = it->getClass().getScript(*it);
@@ -686,10 +690,10 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItemQuantity(con
         throw std::runtime_error("attempt to unequip an item that is not currently equipped");
     if (count <= 0)
         throw std::runtime_error("attempt to unequip nothing (count <= 0)");
-    if (count > item.getRefData().getCount())
+    if (count > item.getCellRef().getCount())
         throw std::runtime_error("attempt to unequip more items than equipped");
 
-    if (count == item.getRefData().getCount())
+    if (count == item.getCellRef().getCount())
         return unequipItem(item);
 
     // Move items to an existing stack if possible, otherwise split count items out into a new stack.
@@ -698,13 +702,13 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItemQuantity(con
     {
         if (stacks(*iter, item) && !isEquipped(*iter))
         {
-            iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), count));
-            item.getRefData().setCount(subtractItems(item.getRefData().getCount(false), count));
+            iter->getCellRef().setCount(addItems(iter->getCellRef().getCount(false), count));
+            item.getCellRef().setCount(subtractItems(item.getCellRef().getCount(false), count));
             return iter;
         }
     }
 
-    return unstack(item, item.getRefData().getCount() - count);
+    return unstack(item, item.getCellRef().getCount() - count);
 }
 
 MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getInvListener() const
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index c0723d319c..0af6ee2b28 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -81,9 +81,9 @@ namespace MWWorld
         void fireEquipmentChangedEvent();
 
         void storeEquipmentState(
-            const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const override;
+            const MWWorld::LiveCellRefBase& ref, size_t index, ESM::InventoryState& inventory) const override;
         void readEquipmentState(
-            const MWWorld::ContainerStoreIterator& iter, int index, const ESM::InventoryState& inventory) override;
+            const MWWorld::ContainerStoreIterator& iter, size_t index, const ESM::InventoryState& inventory) override;
 
         ContainerStoreIterator findSlot(int slot) const;
 
@@ -94,9 +94,6 @@ namespace MWWorld
 
         InventoryStore& operator=(const InventoryStore& store);
 
-        const MWWorld::Ptr& getActor() const { return mActor; }
-        void setActor(const MWWorld::Ptr& actor) { mActor = actor; }
-
         std::unique_ptr<ContainerStore> clone() override
         {
             auto res = std::make_unique<InventoryStore>(*this);
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 93470a593a..aaa74f5ef3 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -13,95 +13,124 @@
 #include "class.hpp"
 #include "esmstore.hpp"
 #include "ptr.hpp"
-
-MWWorld::LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM::CellRef& cref)
-    : mClass(&Class::get(type))
-    , mRef(cref)
-    , mData(cref)
-{
-}
-
-MWWorld::LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM4::Reference& cref)
-    : mClass(&Class::get(type))
-    , mRef(cref)
-    , mData(cref)
-{
-}
-
-MWWorld::LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM4::ActorCharacter& cref)
-    : mClass(&Class::get(type))
-    , mRef(cref)
-    , mData(cref)
-{
-}
-
-void MWWorld::LiveCellRefBase::loadImp(const ESM::ObjectState& state)
-{
-    mRef = MWWorld::CellRef(state.mRef);
-    mData = RefData(state, mData.isDeletedByContentFile());
-
-    Ptr ptr(this);
-
-    if (state.mHasLocals)
-    {
-        const ESM::RefId& scriptId = mClass->getScript(ptr);
-        // Make sure we still have a script. It could have been coming from a content file that is no longer active.
-        if (!scriptId.empty())
-        {
-            if (const ESM::Script* script
-                = MWBase::Environment::get().getESMStore()->get<ESM::Script>().search(scriptId))
-            {
-                try
-                {
-                    mData.setLocals(*script);
-                    mData.getLocals().read(state.mLocals, scriptId);
-                }
-                catch (const std::exception& exception)
-                {
-                    Log(Debug::Error) << "Error: failed to load state for local script " << scriptId
-                                      << " because an exception has been thrown: " << exception.what();
-                }
-            }
-        }
-    }
-
-    mClass->readAdditionalState(ptr, state);
-
-    if (!mRef.getSoul().empty()
-        && !MWBase::Environment::get().getESMStore()->get<ESM::Creature>().search(mRef.getSoul()))
-    {
-        Log(Debug::Warning) << "Soul '" << mRef.getSoul() << "' not found, removing the soul from soul gem";
-        mRef.setSoul(ESM::RefId());
-    }
-
-    MWBase::Environment::get().getLuaManager()->loadLocalScripts(ptr, state.mLuaScripts);
-}
-
-void MWWorld::LiveCellRefBase::saveImp(ESM::ObjectState& state) const
-{
-    mRef.writeState(state);
-
-    ConstPtr ptr(this);
-
-    mData.write(state, mClass->getScript(ptr));
-    MWBase::Environment::get().getLuaManager()->saveLocalScripts(
-        Ptr(const_cast<LiveCellRefBase*>(this)), state.mLuaScripts);
-
-    mClass->writeAdditionalState(ptr, state);
-}
-
-bool MWWorld::LiveCellRefBase::checkStateImp(const ESM::ObjectState& state)
-{
-    return true;
-}
-
-unsigned int MWWorld::LiveCellRefBase::getType() const
-{
-    return mClass->getType();
-}
+#include "worldmodel.hpp"
 
 namespace MWWorld
 {
+    LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM::CellRef& cref)
+        : mClass(&Class::get(type))
+        , mRef(cref)
+        , mData(cref)
+    {
+    }
+
+    LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM4::Reference& cref)
+        : mClass(&Class::get(type))
+        , mRef(cref)
+        , mData(cref)
+    {
+    }
+
+    LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM4::ActorCharacter& cref)
+        : mClass(&Class::get(type))
+        , mRef(cref)
+        , mData(cref)
+    {
+    }
+
+    LiveCellRefBase::LiveCellRefBase(LiveCellRefBase&& other) noexcept
+        : mClass(other.mClass)
+        , mRef(std::move(other.mRef))
+        , mData(std::move(other.mData))
+        , mWorldModel(std::exchange(other.mWorldModel, nullptr))
+    {
+    }
+
+    LiveCellRefBase::~LiveCellRefBase()
+    {
+        if (mWorldModel != nullptr)
+            mWorldModel->deregisterLiveCellRef(*this);
+    }
+
+    LiveCellRefBase& LiveCellRefBase::operator=(LiveCellRefBase&& other) noexcept
+    {
+        mClass = other.mClass;
+        mRef = std::move(other.mRef);
+        mData = std::move(other.mData);
+        mWorldModel = std::exchange(other.mWorldModel, nullptr);
+        return *this;
+    }
+
+    void LiveCellRefBase::loadImp(const ESM::ObjectState& state)
+    {
+        mRef = CellRef(state.mRef);
+        mData = RefData(state, mData.isDeletedByContentFile());
+
+        Ptr ptr(this);
+
+        if (state.mHasLocals)
+        {
+            const ESM::RefId& scriptId = mClass->getScript(ptr);
+            // Make sure we still have a script. It could have been coming from a content file that is no longer active.
+            if (!scriptId.empty())
+            {
+                if (const ESM::Script* script
+                    = MWBase::Environment::get().getESMStore()->get<ESM::Script>().search(scriptId))
+                {
+                    try
+                    {
+                        mData.setLocals(*script);
+                        mData.getLocals().read(state.mLocals, scriptId);
+                    }
+                    catch (const std::exception& exception)
+                    {
+                        Log(Debug::Error) << "Error: failed to load state for local script " << scriptId
+                                          << " because an exception has been thrown: " << exception.what();
+                    }
+                }
+            }
+        }
+
+        mClass->readAdditionalState(ptr, state);
+
+        if (!mRef.getSoul().empty()
+            && !MWBase::Environment::get().getESMStore()->get<ESM::Creature>().search(mRef.getSoul()))
+        {
+            Log(Debug::Warning) << "Soul '" << mRef.getSoul() << "' not found, removing the soul from soul gem";
+            mRef.setSoul(ESM::RefId());
+        }
+
+        MWBase::Environment::get().getLuaManager()->loadLocalScripts(ptr, state.mLuaScripts);
+    }
+
+    void LiveCellRefBase::saveImp(ESM::ObjectState& state) const
+    {
+        mRef.writeState(state);
+
+        ConstPtr ptr(this);
+
+        mData.write(state, mClass->getScript(ptr));
+        MWBase::Environment::get().getLuaManager()->saveLocalScripts(
+            Ptr(const_cast<LiveCellRefBase*>(this)), state.mLuaScripts);
+
+        mClass->writeAdditionalState(ptr, state);
+    }
+
+    bool LiveCellRefBase::checkStateImp(const ESM::ObjectState& state)
+    {
+        return true;
+    }
+
+    unsigned int LiveCellRefBase::getType() const
+    {
+        return mClass->getType();
+    }
+
+    bool LiveCellRefBase::isDeleted() const
+    {
+        return mData.isDeletedByContentFile() || mRef.getCount(false) == 0;
+    }
+
     std::string makeDynamicCastErrorMessage(const LiveCellRefBase* value, std::string_view recordType)
     {
         std::stringstream message;
diff --git a/apps/openmw/mwworld/livecellref.hpp b/apps/openmw/mwworld/livecellref.hpp
index f80690fbe8..026d3edefd 100644
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@@ -17,6 +17,7 @@ namespace MWWorld
     class Ptr;
     class ESMStore;
     class Class;
+    class WorldModel;
 
     template <typename X>
     struct LiveCellRef;
@@ -29,16 +30,27 @@ namespace MWWorld
         /** Information about this instance, such as 3D location and rotation
          * and individual type-dependent data.
          */
-        MWWorld::CellRef mRef;
+        CellRef mRef;
 
         /** runtime-data */
         RefData mData;
 
-        LiveCellRefBase(unsigned int type, const ESM::CellRef& cref = ESM::CellRef());
+        WorldModel* mWorldModel = nullptr;
+
+        LiveCellRefBase(unsigned int type, const ESM::CellRef& cref);
         LiveCellRefBase(unsigned int type, const ESM4::Reference& cref);
         LiveCellRefBase(unsigned int type, const ESM4::ActorCharacter& cref);
+
+        LiveCellRefBase(const LiveCellRefBase& other) = default;
+
+        LiveCellRefBase(LiveCellRefBase&& other) noexcept;
+
         /* Need this for the class to be recognized as polymorphic */
-        virtual ~LiveCellRefBase() {}
+        virtual ~LiveCellRefBase();
+
+        LiveCellRefBase& operator=(const LiveCellRefBase& other) = default;
+
+        LiveCellRefBase& operator=(LiveCellRefBase&& other) noexcept;
 
         virtual void load(const ESM::ObjectState& state) = 0;
         ///< Load state into a LiveCellRef, that has already been initialised with base and class.
@@ -59,6 +71,9 @@ namespace MWWorld
         template <class T>
         static LiveCellRef<T>* dynamicCast(LiveCellRefBase* value);
 
+        /// Returns true if the object was either deleted by the content file or by gameplay.
+        bool isDeleted() const;
+
     protected:
         void loadImp(const ESM::ObjectState& state);
         ///< Load state into a LiveCellRef, that has already been initialised with base and
@@ -129,12 +144,6 @@ namespace MWWorld
         {
         }
 
-        LiveCellRef(const X* b = nullptr)
-            : LiveCellRefBase(X::sRecordId)
-            , mBase(b)
-        {
-        }
-
         // The object that this instance is based on.
         const X* mBase;
 
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 8d9a282791..8f5dc63dfb 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -24,7 +24,7 @@ namespace
 
         bool operator()(const MWWorld::Ptr& ptr)
         {
-            if (ptr.getRefData().isDeleted())
+            if (ptr.mRef->isDeleted())
                 return true;
 
             const ESM::RefId& script = ptr.getClass().getScript(ptr);
@@ -152,10 +152,10 @@ void MWWorld::LocalScripts::clearCell(CellStore* cell)
     }
 }
 
-void MWWorld::LocalScripts::remove(RefData* ref)
+void MWWorld::LocalScripts::remove(const MWWorld::CellRef* ref)
 {
     for (auto iter = mScripts.begin(); iter != mScripts.end(); ++iter)
-        if (&(iter->second.getRefData()) == ref)
+        if (&(iter->second.getCellRef()) == ref)
         {
             if (iter == mIter)
                 ++mIter;
@@ -177,3 +177,8 @@ void MWWorld::LocalScripts::remove(const Ptr& ptr)
             break;
         }
 }
+
+bool MWWorld::LocalScripts::isRunning(const ESM::RefId& scriptName, const Ptr& ptr) const
+{
+    return std::ranges::find(mScripts, std::pair(scriptName, ptr)) != mScripts.end();
+}
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index 4bd2abeb84..fd7ae23edf 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -41,10 +41,13 @@ namespace MWWorld
         void clearCell(CellStore* cell);
         ///< Remove all scripts belonging to \a cell.
 
-        void remove(RefData* ref);
+        void remove(const MWWorld::CellRef* ref);
 
         void remove(const Ptr& ptr);
         ///< Remove script for given reference (ignored if reference does not have a script listed).
+
+        bool isRunning(const ESM::RefId&, const Ptr&) const;
+        ///< Is the local script running?.
     };
 }
 
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index 8b7ad79db2..38f17677ef 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -11,6 +11,7 @@
 #include <components/esm3/npcstate.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwworld/worldmodel.hpp"
 
 #include "../mwmechanics/magiceffects.hpp"
 
@@ -46,8 +47,8 @@ namespace MWWorld
 
             for (auto& effect : spell->mEffects.mList)
             {
-                if (effect.mEffectID == ESM::MagicEffect::DrainAttribute)
-                    stats.mWorsenings[effect.mAttribute] = oldStats.mWorsenings;
+                if (effect.mData.mEffectID == ESM::MagicEffect::DrainAttribute)
+                    stats.mWorsenings[effect.mData.mAttribute] = oldStats.mWorsenings;
             }
             creatureStats.mCorprusSpells[id] = stats;
         }
@@ -58,30 +59,30 @@ namespace MWWorld
             if (!spell || spell->mData.mType == ESM::Spell::ST_Spell || spell->mData.mType == ESM::Spell::ST_Power)
                 continue;
             ESM::ActiveSpells::ActiveSpellParams params;
-            params.mId = id;
+            params.mSourceSpellId = id;
             params.mDisplayName = spell->mName;
             params.mCasterActorId = creatureStats.mActorId;
             if (spell->mData.mType == ESM::Spell::ST_Ability)
-                params.mType = ESM::ActiveSpells::Type_Ability;
+                params.mFlags = ESM::Compatibility::ActiveSpells::Type_Ability_Flags;
             else
-                params.mType = ESM::ActiveSpells::Type_Permanent;
+                params.mFlags = ESM::Compatibility::ActiveSpells::Type_Permanent_Flags;
             params.mWorsenings = -1;
             params.mNextWorsening = ESM::TimeStamp();
-            int effectIndex = 0;
             for (const auto& enam : spell->mEffects.mList)
             {
-                if (oldParams.mPurgedEffects.find(effectIndex) == oldParams.mPurgedEffects.end())
+                if (oldParams.mPurgedEffects.find(enam.mIndex) == oldParams.mPurgedEffects.end())
                 {
                     ESM::ActiveEffect effect;
-                    effect.mEffectId = enam.mEffectID;
-                    effect.mArg = MWMechanics::EffectKey(enam).mArg;
+                    effect.mEffectId = enam.mData.mEffectID;
+                    effect.mArg = MWMechanics::EffectKey(enam.mData).mArg;
                     effect.mDuration = -1;
                     effect.mTimeLeft = -1;
-                    effect.mEffectIndex = effectIndex;
-                    auto rand = oldParams.mEffectRands.find(effectIndex);
+                    effect.mEffectIndex = enam.mIndex;
+                    auto rand = oldParams.mEffectRands.find(enam.mIndex);
                     if (rand != oldParams.mEffectRands.end())
                     {
-                        float magnitude = (enam.mMagnMax - enam.mMagnMin) * rand->second + enam.mMagnMin;
+                        float magnitude
+                            = (enam.mData.mMagnMax - enam.mData.mMagnMin) * rand->second + enam.mData.mMagnMin;
                         effect.mMagnitude = magnitude;
                         effect.mMinMagnitude = magnitude;
                         effect.mMaxMagnitude = magnitude;
@@ -92,23 +93,25 @@ namespace MWWorld
                     else
                     {
                         effect.mMagnitude = 0.f;
-                        effect.mMinMagnitude = enam.mMagnMin;
-                        effect.mMaxMagnitude = enam.mMagnMax;
+                        effect.mMinMagnitude = enam.mData.mMagnMin;
+                        effect.mMaxMagnitude = enam.mData.mMagnMax;
                         effect.mFlags = ESM::ActiveEffect::Flag_None;
                     }
                     params.mEffects.emplace_back(effect);
                 }
-                effectIndex++;
             }
             creatureStats.mActiveSpells.mSpells.emplace_back(params);
         }
-        std::multimap<ESM::RefId, int> equippedItems;
+        std::multimap<ESM::RefId, ESM::RefNum> equippedItems;
         for (std::size_t i = 0; i < inventory.mItems.size(); ++i)
         {
-            const ESM::ObjectState& item = inventory.mItems[i];
+            ESM::ObjectState& item = inventory.mItems[i];
             auto slot = inventory.mEquipmentSlots.find(i);
             if (slot != inventory.mEquipmentSlots.end())
-                equippedItems.emplace(item.mRef.mRefID, slot->second);
+            {
+                MWBase::Environment::get().getWorldModel()->assignSaveFileRefNum(item.mRef);
+                equippedItems.emplace(item.mRef.mRefID, item.mRef.mRefNum);
+            }
         }
         for (const auto& [id, oldMagnitudes] : inventory.mPermanentMagicEffectMagnitudes)
         {
@@ -132,30 +135,28 @@ namespace MWWorld
             if (!enchantment)
                 continue;
             ESM::ActiveSpells::ActiveSpellParams params;
-            params.mId = id;
-            params.mDisplayName = name;
+            params.mSourceSpellId = id;
+            params.mDisplayName = std::move(name);
             params.mCasterActorId = creatureStats.mActorId;
-            params.mType = ESM::ActiveSpells::Type_Enchantment;
+            params.mFlags = ESM::Compatibility::ActiveSpells::Type_Enchantment_Flags;
             params.mWorsenings = -1;
             params.mNextWorsening = ESM::TimeStamp();
-            for (std::size_t effectIndex = 0;
-                 effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
+            for (const auto& enam : enchantment->mEffects.mList)
             {
-                const auto& enam = enchantment->mEffects.mList[effectIndex];
-                auto [random, multiplier] = oldMagnitudes[effectIndex];
-                float magnitude = (enam.mMagnMax - enam.mMagnMin) * random + enam.mMagnMin;
+                auto [random, multiplier] = oldMagnitudes[enam.mIndex];
+                float magnitude = (enam.mData.mMagnMax - enam.mData.mMagnMin) * random + enam.mData.mMagnMin;
                 magnitude *= multiplier;
                 if (magnitude <= 0)
                     continue;
                 ESM::ActiveEffect effect;
-                effect.mEffectId = enam.mEffectID;
+                effect.mEffectId = enam.mData.mEffectID;
                 effect.mMagnitude = magnitude;
                 effect.mMinMagnitude = magnitude;
                 effect.mMaxMagnitude = magnitude;
-                effect.mArg = MWMechanics::EffectKey(enam).mArg;
+                effect.mArg = MWMechanics::EffectKey(enam.mData).mArg;
                 effect.mDuration = -1;
                 effect.mTimeLeft = -1;
-                effect.mEffectIndex = static_cast<int>(effectIndex);
+                effect.mEffectIndex = enam.mIndex;
                 // Prevent recalculation of resistances and don't reflect or absorb the effect
                 effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect
                     | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
@@ -164,7 +165,7 @@ namespace MWWorld
             auto [begin, end] = equippedItems.equal_range(id);
             for (auto it = begin; it != end; ++it)
             {
-                params.mItem = { static_cast<unsigned int>(it->second), 0 };
+                params.mItem = it->second;
                 creatureStats.mActiveSpells.mSpells.emplace_back(params);
             }
         }
@@ -172,7 +173,7 @@ namespace MWWorld
         {
             auto it
                 = std::find_if(creatureStats.mActiveSpells.mSpells.begin(), creatureStats.mActiveSpells.mSpells.end(),
-                    [&](const auto& params) { return params.mId == spell.first; });
+                    [&](const auto& params) { return params.mSourceSpellId == spell.first; });
             if (it != creatureStats.mActiveSpells.mSpells.end())
             {
                 it->mNextWorsening = spell.second.mNextWorsening;
@@ -188,7 +189,7 @@ namespace MWWorld
                 continue;
             for (auto& params : creatureStats.mActiveSpells.mSpells)
             {
-                if (params.mId == key.mSourceId)
+                if (params.mSourceSpellId == key.mSourceId)
                 {
                     bool found = false;
                     for (auto& effect : params.mEffects)
@@ -232,4 +233,28 @@ namespace MWWorld
         for (auto& setting : creatureStats.mAiSettings)
             setting.mMod = 0.f;
     }
+
+    // Versions 17-27 wrote an equipment slot index to mItem
+    void convertEnchantmentSlots(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory)
+    {
+        for (auto& activeSpell : creatureStats.mActiveSpells.mSpells)
+        {
+            if (!activeSpell.mItem.isSet())
+                continue;
+            if (activeSpell.mFlags & ESM::ActiveSpells::Flag_Equipment)
+            {
+                std::int64_t slotIndex = activeSpell.mItem.mIndex;
+                auto slot = std::find_if(inventory.mEquipmentSlots.begin(), inventory.mEquipmentSlots.end(),
+                    [=](const auto& entry) { return entry.second == slotIndex; });
+                if (slot != inventory.mEquipmentSlots.end() && slot->first < inventory.mItems.size())
+                {
+                    ESM::CellRef& ref = inventory.mItems[slot->first].mRef;
+                    MWBase::Environment::get().getWorldModel()->assignSaveFileRefNum(ref);
+                    activeSpell.mItem = ref.mRefNum;
+                    continue;
+                }
+            }
+            activeSpell.mItem = {};
+        }
+    }
 }
diff --git a/apps/openmw/mwworld/magiceffects.hpp b/apps/openmw/mwworld/magiceffects.hpp
index aefcd056e0..3acb14fff2 100644
--- a/apps/openmw/mwworld/magiceffects.hpp
+++ b/apps/openmw/mwworld/magiceffects.hpp
@@ -14,6 +14,8 @@ namespace MWWorld
         ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats = nullptr);
 
     void convertStats(ESM::CreatureStats& creatureStats);
+
+    void convertEnchantmentSlots(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory);
 }
 
 #endif
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index e9fd02e6f5..81ab4b5419 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -19,87 +19,91 @@ namespace
         refValue = MWWorld::LiveCellRef<T>(cellRef, base);
         ptrValue = MWWorld::Ptr(&std::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
     }
+
+    template <typename T>
+    void create(
+        const MWWorld::Store<T>& list, const MWWorld::Ptr& templatePtr, std::any& refValue, MWWorld::Ptr& ptrValue)
+    {
+        refValue = *static_cast<MWWorld::LiveCellRef<T>*>(templatePtr.getBase());
+        ptrValue = MWWorld::Ptr(&std::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
+    }
+
+    template <typename F>
+    void visitRefStore(const MWWorld::ESMStore& store, ESM::RefId name, F func)
+    {
+        switch (store.find(name))
+        {
+            case ESM::REC_ACTI:
+                return func(store.get<ESM::Activator>());
+            case ESM::REC_ALCH:
+                return func(store.get<ESM::Potion>());
+            case ESM::REC_APPA:
+                return func(store.get<ESM::Apparatus>());
+            case ESM::REC_ARMO:
+                return func(store.get<ESM::Armor>());
+            case ESM::REC_BOOK:
+                return func(store.get<ESM::Book>());
+            case ESM::REC_CLOT:
+                return func(store.get<ESM::Clothing>());
+            case ESM::REC_CONT:
+                return func(store.get<ESM::Container>());
+            case ESM::REC_CREA:
+                return func(store.get<ESM::Creature>());
+            case ESM::REC_DOOR:
+                return func(store.get<ESM::Door>());
+            case ESM::REC_INGR:
+                return func(store.get<ESM::Ingredient>());
+            case ESM::REC_LEVC:
+                return func(store.get<ESM::CreatureLevList>());
+            case ESM::REC_LEVI:
+                return func(store.get<ESM::ItemLevList>());
+            case ESM::REC_LIGH:
+                return func(store.get<ESM::Light>());
+            case ESM::REC_LOCK:
+                return func(store.get<ESM::Lockpick>());
+            case ESM::REC_MISC:
+                return func(store.get<ESM::Miscellaneous>());
+            case ESM::REC_NPC_:
+                return func(store.get<ESM::NPC>());
+            case ESM::REC_PROB:
+                return func(store.get<ESM::Probe>());
+            case ESM::REC_REPA:
+                return func(store.get<ESM::Repair>());
+            case ESM::REC_STAT:
+                return func(store.get<ESM::Static>());
+            case ESM::REC_WEAP:
+                return func(store.get<ESM::Weapon>());
+            case ESM::REC_BODY:
+                return func(store.get<ESM::BodyPart>());
+            case ESM::REC_STAT4:
+                return func(store.get<ESM4::Static>());
+            case ESM::REC_TERM4:
+                return func(store.get<ESM4::Terminal>());
+            case 0:
+                throw std::logic_error(
+                    "failed to create manual cell ref for " + name.toDebugString() + " (unknown ID)");
+
+            default:
+                throw std::logic_error(
+                    "failed to create manual cell ref for " + name.toDebugString() + " (unknown type)");
+        }
+    }
 }
 
 MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, const ESM::RefId& name, const int count)
 {
-    switch (store.find(name))
-    {
-        case ESM::REC_ACTI:
-            create(store.get<ESM::Activator>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_ALCH:
-            create(store.get<ESM::Potion>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_APPA:
-            create(store.get<ESM::Apparatus>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_ARMO:
-            create(store.get<ESM::Armor>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_BOOK:
-            create(store.get<ESM::Book>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_CLOT:
-            create(store.get<ESM::Clothing>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_CONT:
-            create(store.get<ESM::Container>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_CREA:
-            create(store.get<ESM::Creature>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_DOOR:
-            create(store.get<ESM::Door>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_INGR:
-            create(store.get<ESM::Ingredient>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LEVC:
-            create(store.get<ESM::CreatureLevList>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LEVI:
-            create(store.get<ESM::ItemLevList>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LIGH:
-            create(store.get<ESM::Light>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LOCK:
-            create(store.get<ESM::Lockpick>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_MISC:
-            create(store.get<ESM::Miscellaneous>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_NPC_:
-            create(store.get<ESM::NPC>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_PROB:
-            create(store.get<ESM::Probe>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_REPA:
-            create(store.get<ESM::Repair>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_STAT:
-            create(store.get<ESM::Static>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_WEAP:
-            create(store.get<ESM::Weapon>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_BODY:
-            create(store.get<ESM::BodyPart>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_STAT4:
-            create(store.get<ESM4::Static>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_TERM4:
-            create(store.get<ESM4::Terminal>(), name, mRef, mPtr);
-            break;
-        case 0:
-            throw std::logic_error("failed to create manual cell ref for " + name.toDebugString() + " (unknown ID)");
+    auto cb = [&](const auto& store) { create(store, name, mRef, mPtr); };
+    visitRefStore(store, name, cb);
 
-        default:
-            throw std::logic_error("failed to create manual cell ref for " + name.toDebugString() + " (unknown type)");
-    }
-
-    mPtr.getRefData().setCount(count);
+    mPtr.getCellRef().setCount(count);
+}
+
+MWWorld::ManualRef::ManualRef(const ESMStore& store, const Ptr& template_, const int count)
+{
+    auto cb = [&](const auto& store) { create(store, template_, mRef, mPtr); };
+    visitRefStore(store, template_.getCellRef().getRefId(), cb);
+
+    mPtr.getCellRef().setCount(count);
+    mPtr.getCellRef().unsetRefNum();
+    mPtr.getRefData().setLuaScripts(nullptr);
 }
diff --git a/apps/openmw/mwworld/manualref.hpp b/apps/openmw/mwworld/manualref.hpp
index 8356fd0a03..4611ed95bb 100644
--- a/apps/openmw/mwworld/manualref.hpp
+++ b/apps/openmw/mwworld/manualref.hpp
@@ -7,9 +7,11 @@
 
 namespace MWWorld
 {
-    /// \brief Manually constructed live cell ref
+    /// \brief Manually constructed live cell ref. The resulting Ptr shares its lifetime with this ManualRef and must
+    /// not be used past its end.
     class ManualRef
     {
+        // Stores the ref (LiveCellRef<T>) by value.
         std::any mRef;
         Ptr mPtr;
 
@@ -18,6 +20,7 @@ namespace MWWorld
 
     public:
         ManualRef(const MWWorld::ESMStore& store, const ESM::RefId& name, const int count = 1);
+        ManualRef(const MWWorld::ESMStore& store, const MWWorld::Ptr& template_, const int count = 1);
 
         const Ptr& getPtr() const { return mPtr; }
     };
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 0d7afb559f..b776f27f06 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -36,8 +36,20 @@
 
 namespace MWWorld
 {
+    namespace
+    {
+        ESM::CellRef makePlayerCellRef()
+        {
+            ESM::CellRef result;
+            result.blank();
+            result.mRefID = ESM::RefId::stringRefId("Player");
+            return result;
+        }
+    }
+
     Player::Player(const ESM::NPC* player)
-        : mCellStore(nullptr)
+        : mPlayer(makePlayerCellRef(), player)
+        , mCellStore(nullptr)
         , mLastKnownExteriorPosition(0, 0, 0)
         , mMarkedPosition(ESM::Position())
         , mMarkedCell(nullptr)
@@ -46,11 +58,6 @@ namespace MWWorld
         , mPaidCrimeId(-1)
         , mJumping(false)
     {
-        ESM::CellRef cellRef;
-        cellRef.blank();
-        cellRef.mRefID = ESM::RefId::stringRefId("Player");
-        mPlayer = LiveCellRef<ESM::NPC>(cellRef, player);
-
         ESM::Position playerPos = mPlayer.mData.getPosition();
         playerPos.pos[0] = playerPos.pos[1] = playerPos.pos[2] = 0;
         mPlayer.mData.setPosition(playerPos);
@@ -183,8 +190,7 @@ namespace MWWorld
 
         MWWorld::Ptr player = getPlayer();
         const MWMechanics::NpcStats& playerStats = player.getClass().getNpcStats(player);
-        bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
-        if ((!godmode && playerStats.isParalyzed()) || playerStats.getKnockedDown() || playerStats.isDead())
+        if (playerStats.isParalyzed() || playerStats.getKnockedDown() || playerStats.isDead())
             return;
 
         MWWorld::Ptr toActivate = MWBase::Environment::get().getWorld()->getFacedObject();
@@ -243,6 +249,11 @@ namespace MWWorld
 
     void Player::clear()
     {
+        ESM::CellRef cellRef;
+        cellRef.blank();
+        cellRef.mRefID = ESM::RefId::stringRefId("Player");
+        cellRef.mRefNum = mPlayer.mRef.getRefNum();
+        mPlayer = LiveCellRef<ESM::NPC>(cellRef, mPlayer.mBase);
         mCellStore = nullptr;
         mSign = ESM::RefId();
         mMarkedCell = nullptr;
@@ -317,7 +328,12 @@ namespace MWWorld
                 convertMagicEffects(
                     player.mObject.mCreatureStats, player.mObject.mInventory, &player.mObject.mNpcStats);
             else if (reader.getFormatVersion() <= ESM::MaxOldCreatureStatsFormatVersion)
+            {
                 convertStats(player.mObject.mCreatureStats);
+                convertEnchantmentSlots(player.mObject.mCreatureStats, player.mObject.mInventory);
+            }
+            else if (reader.getFormatVersion() <= ESM::MaxActiveSpellSlotIndexFormatVersion)
+                convertEnchantmentSlots(player.mObject.mCreatureStats, player.mObject.mInventory);
 
             if (!player.mObject.mEnabled)
             {
@@ -325,6 +341,7 @@ namespace MWWorld
                 player.mObject.mEnabled = true;
             }
 
+            MWBase::Environment::get().getWorldModel()->deregisterLiveCellRef(mPlayer);
             mPlayer.load(player.mObject);
 
             for (size_t i = 0; i < mSaveAttributes.size(); ++i)
@@ -334,12 +351,7 @@ namespace MWWorld
 
             if (player.mObject.mNpcStats.mIsWerewolf)
             {
-                if (player.mObject.mNpcStats.mWerewolfDeprecatedData)
-                {
-                    saveStats();
-                    setWerewolfStats();
-                }
-                else if (reader.getFormatVersion() <= ESM::MaxOldSkillsAndAttributesFormatVersion)
+                if (reader.getFormatVersion() <= ESM::MaxOldSkillsAndAttributesFormatVersion)
                 {
                     setWerewolfStats();
                     if (player.mSetWerewolfAcrobatics)
diff --git a/apps/openmw/mwworld/positioncellgrid.hpp b/apps/openmw/mwworld/positioncellgrid.hpp
new file mode 100644
index 0000000000..cbb8e3300a
--- /dev/null
+++ b/apps/openmw/mwworld/positioncellgrid.hpp
@@ -0,0 +1,16 @@
+#ifndef OPENMW_APPS_OPENMW_MWWORLD_POSITIONCELLGRID_H
+#define OPENMW_APPS_OPENMW_MWWORLD_POSITIONCELLGRID_H
+
+#include <osg/Vec3f>
+#include <osg/Vec4i>
+
+namespace MWWorld
+{
+    struct PositionCellGrid
+    {
+        osg::Vec3f mPosition;
+        osg::Vec4i mCellBounds;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index d873f16a59..b019dabdfe 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -15,6 +15,9 @@
 #include <components/esm3/loadrace.hpp>
 #include <components/esm3/projectilestate.hpp>
 
+#include <components/esm/quaternion.hpp>
+#include <components/esm/vector3.hpp>
+
 #include <components/misc/constants.hpp>
 #include <components/misc/convert.hpp>
 #include <components/misc/resourcehelpers.hpp>
@@ -79,18 +82,17 @@ namespace
         int count = 0;
         speed = 0.0f;
         ESM::EffectList projectileEffects;
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter(effects->mList.begin()); iter != effects->mList.end();
-             ++iter)
+        for (const ESM::IndexedENAMstruct& effect : effects->mList)
         {
             const ESM::MagicEffect* magicEffect
-                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(iter->mEffectID);
+                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(effect.mData.mEffectID);
 
             // Speed of multi-effect projectiles should be the average of the constituent effects,
             // based on observation of the original engine.
             speed += magicEffect->mData.mSpeed;
             count++;
 
-            if (iter->mRange != ESM::RT_Target)
+            if (effect.mData.mRange != ESM::RT_Target)
                 continue;
 
             if (magicEffect->mBolt.empty())
@@ -106,7 +108,7 @@ namespace
                                    ->get<ESM::Skill>()
                                    .find(magicEffect->mData.mSchool)
                                    ->mSchool->mBoltSound);
-            projectileEffects.mList.push_back(*iter);
+            projectileEffects.mList.push_back(effect);
         }
 
         if (count != 0)
@@ -117,7 +119,7 @@ namespace
         {
             const ESM::MagicEffect* magicEffect
                 = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(
-                    effects->mList.begin()->mEffectID);
+                    effects->mList.begin()->mData.mEffectID);
             texture = magicEffect->mParticle;
         }
 
@@ -136,10 +138,10 @@ namespace
     {
         // Calculate combined light diffuse color from magical effects
         osg::Vec4 lightDiffuseColor;
-        for (const ESM::ENAMstruct& enam : effects.mList)
+        for (const ESM::IndexedENAMstruct& enam : effects.mList)
         {
             const ESM::MagicEffect* magicEffect
-                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(enam.mEffectID);
+                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(enam.mData.mEffectID);
             lightDiffuseColor += magicEffect->getColor();
         }
         int numberOfEffects = effects.mList.size();
@@ -187,8 +189,8 @@ namespace MWWorld
         float mRotateSpeed;
     };
 
-    void ProjectileManager::createModel(State& state, const std::string& model, const osg::Vec3f& pos,
-        const osg::Quat& orient, bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture)
+    void ProjectileManager::createModel(State& state, VFS::Path::NormalizedView model, const osg::Vec3f& pos,
+        const osg::Quat& orient, bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, const std::string& texture)
     {
         state.mNode = new osg::PositionAttitudeTransform;
         state.mNode->setNodeMask(MWRender::Mask_Effect);
@@ -209,8 +211,6 @@ namespace MWWorld
 
         if (state.mIdMagic.size() > 1)
         {
-            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-
             for (size_t iter = 1; iter != state.mIdMagic.size(); ++iter)
             {
                 std::ostringstream nodeName;
@@ -222,7 +222,8 @@ namespace MWWorld
                 attachTo->accept(findVisitor);
                 if (findVisitor.mFoundNode)
                     mResourceSystem->getSceneManager()->getInstance(
-                        Misc::ResourceHelpers::correctMeshPath(weapon->mModel, vfs), findVisitor.mFoundNode);
+                        Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(weapon->mModel)),
+                        findVisitor.mFoundNode);
             }
         }
 
@@ -254,7 +255,7 @@ namespace MWWorld
         SceneUtil::AssignControllerSourcesVisitor assignVisitor(state.mEffectAnimationTime);
         state.mNode->accept(assignVisitor);
 
-        MWRender::overrideFirstRootTexture(texture, mResourceSystem, std::move(projectile));
+        MWRender::overrideFirstRootTexture(texture, mResourceSystem, *projectile);
     }
 
     void ProjectileManager::update(State& state, float duration)
@@ -313,7 +314,7 @@ namespace MWWorld
 
         osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
 
-        auto model = ptr.getClass().getModel(ptr);
+        VFS::Path::Normalized model = ptr.getClass().getCorrectedModel(ptr);
         createModel(state, model, pos, orient, true, true, lightDiffuseColor, texture);
 
         MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
@@ -329,9 +330,8 @@ namespace MWWorld
         // shape
         if (state.mIdMagic.size() > 1)
         {
-            model = Misc::ResourceHelpers::correctMeshPath(
-                MWBase::Environment::get().getESMStore()->get<ESM::Weapon>().find(state.mIdMagic[1])->mModel,
-                MWBase::Environment::get().getResourceSystem()->getVFS());
+            model = Misc::ResourceHelpers::correctMeshPath(VFS::Path::Normalized(
+                MWBase::Environment::get().getESMStore()->get<ESM::Weapon>().find(state.mIdMagic[1])->mModel));
         }
         state.mProjectileId = mPhysics->addProjectile(caster, pos, model, true);
         state.mToDelete = false;
@@ -354,7 +354,7 @@ namespace MWWorld
         MWWorld::ManualRef ref(*MWBase::Environment::get().getESMStore(), projectile.getCellRef().getRefId());
         MWWorld::Ptr ptr = ref.getPtr();
 
-        const auto model = ptr.getClass().getModel(ptr);
+        const VFS::Path::Normalized model = ptr.getClass().getCorrectedModel(ptr);
         createModel(state, model, pos, orient, false, false, osg::Vec4(0, 0, 0, 0));
         if (!ptr.getClass().getEnchantment(ptr).empty())
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
@@ -437,7 +437,7 @@ namespace MWWorld
             MWWorld::Ptr caster = magicBoltState.getCaster();
             if (!caster.isEmpty() && caster.getClass().isActor())
             {
-                if (caster.getRefData().getCount() <= 0 || caster.getClass().getCreatureStats(caster).isDead())
+                if (caster.getCellRef().getCount() <= 0 || caster.getClass().getCreatureStats(caster).isDead())
                 {
                     cleanupMagicBolt(magicBoltState);
                     continue;
@@ -453,7 +453,7 @@ namespace MWWorld
             {
                 const auto npc = caster.get<ESM::NPC>()->mBase;
                 const auto race = store.get<ESM::Race>().find(npc->mRace);
-                speed *= npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
+                speed *= npc->isMale() ? race->mData.mMaleWeight : race->mData.mFemaleWeight;
             }
             osg::Vec3f direction = orient * osg::Vec3f(0, 1, 0);
             direction.normalize();
@@ -694,20 +694,22 @@ namespace MWWorld
             state.mAttackStrength = esm.mAttackStrength;
             state.mToDelete = false;
 
-            std::string model;
+            VFS::Path::Normalized model;
             try
             {
                 MWWorld::ManualRef ref(*MWBase::Environment::get().getESMStore(), esm.mId);
                 MWWorld::Ptr ptr = ref.getPtr();
-                model = ptr.getClass().getModel(ptr);
+                model = ptr.getClass().getCorrectedModel(ptr);
                 int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
                 state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
 
                 state.mProjectileId
                     = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, false);
             }
-            catch (...)
+            catch (const std::exception& e)
             {
+                Log(Debug::Warning) << "Failed to add projectile for " << esm.mId
+                                    << " while reading projectile record: " << e.what();
                 return true;
             }
 
@@ -735,10 +737,10 @@ namespace MWWorld
                 state.mEffects = getMagicBoltData(
                     state.mIdMagic, state.mSoundIds, state.mSpeed, texture, state.mSourceName, state.mSpellId);
             }
-            catch (...)
+            catch (const std::exception& e)
             {
-                Log(Debug::Warning) << "Warning: Failed to recreate magic projectile from saved data (id \""
-                                    << state.mSpellId << "\" no longer exists?)";
+                Log(Debug::Warning) << "Failed to recreate magic projectile for " << esm.mId << " and spell "
+                                    << state.mSpellId << " while reading projectile record: " << e.what();
                 return true;
             }
 
@@ -747,15 +749,17 @@ namespace MWWorld
                                        // file's effect list, which is already trimmed of non-projectile
                                        // effects. We need to use the stored value.
 
-            std::string model;
+            VFS::Path::Normalized model;
             try
             {
                 MWWorld::ManualRef ref(*MWBase::Environment::get().getESMStore(), state.mIdMagic.at(0));
                 MWWorld::Ptr ptr = ref.getPtr();
-                model = ptr.getClass().getModel(ptr);
+                model = ptr.getClass().getCorrectedModel(ptr);
             }
-            catch (...)
+            catch (const std::exception& e)
             {
+                Log(Debug::Warning) << "Failed to get model for " << state.mIdMagic.at(0)
+                                    << " while reading projectile record: " << e.what();
                 return true;
             }
 
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 65254a9110..3003136ffc 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -7,6 +7,7 @@
 #include <osg/ref_ptr>
 
 #include <components/esm3/effectlist.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include "../mwbase/soundmanager.hpp"
 
@@ -135,8 +136,8 @@ namespace MWWorld
         void moveProjectiles(float dt);
         void moveMagicBolts(float dt);
 
-        void createModel(State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
-            bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
+        void createModel(State& state, VFS::Path::NormalizedView model, const osg::Vec3f& pos, const osg::Quat& orient,
+            bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, const std::string& texture = "");
         void update(State& state, float duration);
 
         void operator=(const ProjectileManager&);
diff --git a/apps/openmw/mwworld/ptr.cpp b/apps/openmw/mwworld/ptr.cpp
index 1421b51a2a..8b3f77e805 100644
--- a/apps/openmw/mwworld/ptr.cpp
+++ b/apps/openmw/mwworld/ptr.cpp
@@ -6,21 +6,6 @@
 
 namespace MWWorld
 {
-
-    std::string Ptr::toString() const
-    {
-        std::string res = "object";
-        if (getRefData().isDeleted())
-            res = "deleted object";
-        res.append(getCellRef().getRefNum().toString());
-        res.append(" (");
-        res.append(getTypeDescription());
-        res.append(", ");
-        res.append(getCellRef().getRefId().toDebugString());
-        res.append(")");
-        return res;
-    }
-
     SafePtr::SafePtr(const Ptr& ptr)
         : mId(ptr.getCellRef().getRefNum())
         , mPtr(ptr)
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 1adaa3cbf9..f434d8b0dd 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -98,6 +98,20 @@ namespace MWWorld
             return mContainerStore;
         }
 
+        std::string toString() const
+        {
+            if (mRef == nullptr)
+                return "null object";
+            std::string result = mRef->isDeleted() ? "deleted object" : "object";
+            result += mRef->mRef.getRefNum().toString();
+            result += " (";
+            result += mRef->getTypeDescription();
+            result += ", ";
+            result += mRef->mRef.getRefId().toDebugString();
+            result += ")";
+            return result;
+        }
+
         template <template <class> class TypeTransform2>
         bool operator==(const PtrBase<TypeTransform2>& other) const
         {
@@ -128,8 +142,6 @@ namespace MWWorld
             : PtrBase(liveCellRef, cell, nullptr)
         {
         }
-
-        std::string toString() const;
     };
 
     /// @note The difference between Ptr and ConstPtr is that the second one adds const to the underlying pointers.
@@ -153,8 +165,9 @@ namespace MWWorld
     class SafePtr
     {
     public:
-        using Id = ESM::RefNum;
+        using Id = ESM::FormId;
 
+        SafePtr() = default;
         explicit SafePtr(Id id)
             : mId(id)
         {
@@ -172,7 +185,7 @@ namespace MWWorld
         }
 
     private:
-        const Id mId;
+        Id mId;
 
         mutable Ptr mPtr;
         mutable size_t mLastUpdate = 0;
diff --git a/apps/openmw/mwworld/ptrregistry.hpp b/apps/openmw/mwworld/ptrregistry.hpp
index c40ea8e434..897945133e 100644
--- a/apps/openmw/mwworld/ptrregistry.hpp
+++ b/apps/openmw/mwworld/ptrregistry.hpp
@@ -43,10 +43,28 @@ namespace MWWorld
             ++mRevision;
         }
 
-        void remove(const Ptr& ptr)
+        void remove(const LiveCellRefBase& ref) noexcept
         {
-            mIndex.erase(ptr.getCellRef().getRefNum());
-            ++mRevision;
+            ESM::RefNum refNum = ref.mRef.getRefNum();
+            if (!refNum.isSet())
+                return;
+            auto it = mIndex.find(refNum);
+            if (it != mIndex.end() && it->second.mRef == &ref)
+            {
+                mIndex.erase(it);
+                ++mRevision;
+            }
+        }
+
+        // For fixing old saves
+        void assign(ESM::CellRef& ref)
+        {
+            if (!ref.mRefNum.isSet())
+            {
+                CellRef temp(ref);
+                temp.getOrAssignRefNum(mLastGenerated);
+                ref.mRefNum = temp.getRefNum();
+            }
         }
 
     private:
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 87c085ebd4..dc49ff0a4e 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -37,7 +37,6 @@ namespace MWWorld
         mBaseNode = refData.mBaseNode;
         mLocals = refData.mLocals;
         mEnabled = refData.mEnabled;
-        mCount = refData.mCount;
         mPosition = refData.mPosition;
         mChanged = refData.mChanged;
         mDeletedByContentFile = refData.mDeletedByContentFile;
@@ -59,13 +58,12 @@ namespace MWWorld
 
     RefData::RefData()
         : mBaseNode(nullptr)
+        , mCustomData(nullptr)
+        , mFlags(0)
         , mDeletedByContentFile(false)
         , mEnabled(true)
         , mPhysicsPostponed(false)
-        , mCount(1)
-        , mCustomData(nullptr)
         , mChanged(false)
-        , mFlags(0)
     {
         for (int i = 0; i < 3; ++i)
         {
@@ -76,54 +74,50 @@ namespace MWWorld
 
     RefData::RefData(const ESM::CellRef& cellRef)
         : mBaseNode(nullptr)
+        , mPosition(cellRef.mPos)
+        , mCustomData(nullptr)
+        , mFlags(0) // Loading from ESM/ESP files -> assume unchanged
         , mDeletedByContentFile(false)
         , mEnabled(true)
         , mPhysicsPostponed(false)
-        , mCount(1)
-        , mPosition(cellRef.mPos)
-        , mCustomData(nullptr)
         , mChanged(false)
-        , mFlags(0) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
     RefData::RefData(const ESM4::Reference& ref)
         : mBaseNode(nullptr)
+        , mPosition(ref.mPos)
+        , mCustomData(nullptr)
+        , mFlags(0)
         , mDeletedByContentFile(ref.mFlags & ESM4::Rec_Deleted)
         , mEnabled(!(ref.mFlags & ESM4::Rec_Disabled))
         , mPhysicsPostponed(false)
-        , mCount(ref.mCount)
-        , mPosition(ref.mPos)
-        , mCustomData(nullptr)
         , mChanged(false)
-        , mFlags(0)
     {
     }
 
     RefData::RefData(const ESM4::ActorCharacter& ref)
         : mBaseNode(nullptr)
+        , mPosition(ref.mPos)
+        , mCustomData(nullptr)
+        , mFlags(0)
         , mDeletedByContentFile(ref.mFlags & ESM4::Rec_Deleted)
         , mEnabled(!(ref.mFlags & ESM4::Rec_Disabled))
         , mPhysicsPostponed(false)
-        , mCount(mDeletedByContentFile ? 0 : 1)
-        , mPosition(ref.mPos)
-        , mCustomData(nullptr)
         , mChanged(false)
-        , mFlags(0)
     {
     }
 
     RefData::RefData(const ESM::ObjectState& objectState, bool deletedByContentFile)
         : mBaseNode(nullptr)
-        , mDeletedByContentFile(deletedByContentFile)
-        , mEnabled(objectState.mEnabled != 0)
-        , mPhysicsPostponed(false)
-        , mCount(objectState.mCount)
         , mPosition(objectState.mPosition)
         , mAnimationState(objectState.mAnimationState)
         , mCustomData(nullptr)
-        , mChanged(true)
         , mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
+        , mDeletedByContentFile(deletedByContentFile)
+        , mEnabled(objectState.mEnabled != 0)
+        , mPhysicsPostponed(false)
+        , mChanged(true)
     {
         // "Note that the ActivationFlag_UseEnabled is saved to the reference,
         // which will result in permanently suppressed activation if the reference script is removed.
@@ -153,7 +147,6 @@ namespace MWWorld
         objectState.mHasLocals = mLocals.write(objectState.mLocals, scriptId);
 
         objectState.mEnabled = mEnabled;
-        objectState.mCount = mCount;
         objectState.mPosition = mPosition;
         objectState.mFlags = mFlags;
 
@@ -205,39 +198,17 @@ namespace MWWorld
         return mBaseNode;
     }
 
-    int RefData::getCount(bool absolute) const
-    {
-        if (absolute)
-            return std::abs(mCount);
-        return mCount;
-    }
-
     void RefData::setLocals(const ESM::Script& script)
     {
         if (mLocals.configure(script) && !mLocals.isEmpty())
             mChanged = true;
     }
 
-    void RefData::setCount(int count)
-    {
-        if (count == 0)
-            MWBase::Environment::get().getWorld()->removeRefScript(this);
-
-        mChanged = true;
-
-        mCount = count;
-    }
-
     void RefData::setDeletedByContentFile(bool deleted)
     {
         mDeletedByContentFile = deleted;
     }
 
-    bool RefData::isDeleted() const
-    {
-        return mDeletedByContentFile || mCount == 0;
-    }
-
     bool RefData::isDeletedByContentFile() const
     {
         return mDeletedByContentFile;
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index a6a45623f5..e0b62c94b6 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWWORLD_REFDATA_H
 #define GAME_MWWORLD_REFDATA_H
 
-#include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 #include <components/esm/refid.hpp>
 #include <components/esm3/animationstate.hpp>
 
@@ -47,6 +47,10 @@ namespace MWWorld
 
         MWScript::Locals mLocals;
         std::shared_ptr<MWLua::LocalScripts> mLuaScripts;
+        ESM::Position mPosition;
+        ESM::AnimationState mAnimationState;
+        std::unique_ptr<CustomData> mCustomData;
+        unsigned int mFlags;
 
         /// separate delete flag used for deletion by a content file
         /// @note not stored in the save game file.
@@ -58,23 +62,12 @@ namespace MWWorld
         bool mPhysicsPostponed : 1;
 
     private:
-        /// 0: deleted
-        int mCount;
-
-        ESM::Position mPosition;
-
-        ESM::AnimationState mAnimationState;
-
-        std::unique_ptr<CustomData> mCustomData;
+        bool mChanged : 1;
 
         void copy(const RefData& refData);
 
         void cleanup();
 
-        bool mChanged;
-
-        unsigned int mFlags;
-
     public:
         RefData();
 
@@ -110,26 +103,15 @@ namespace MWWorld
         /// Set base node (can be a null pointer).
         void setBaseNode(osg::ref_ptr<SceneUtil::PositionAttitudeTransform> base);
 
-        int getCount(bool absolute = true) const;
-
         void setLocals(const ESM::Script& script);
 
         MWLua::LocalScripts* getLuaScripts() { return mLuaScripts.get(); }
         void setLuaScripts(std::shared_ptr<MWLua::LocalScripts>&&);
 
-        void setCount(int count);
-        ///< Set object count (an object pile is a simple object with a count >1).
-        ///
-        /// \warning Do not call setCount() to add or remove objects from a
-        /// container or an actor's inventory. Call ContainerStore::add() or
-        /// ContainerStore::remove() instead.
-
         /// This flag is only used for content stack loading and will not be stored in the savegame.
         /// If the object was deleted by gameplay, then use setCount(0) instead.
         void setDeletedByContentFile(bool deleted);
 
-        /// Returns true if the object was either deleted by the content file or by gameplay.
-        bool isDeleted() const;
         /// Returns true if the object was deleted by a content file.
         bool isDeletedByContentFile() const;
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 78c8ccab1d..c30c2b5af0 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -22,6 +22,7 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/settings/values.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
@@ -39,6 +40,8 @@
 #include "../mwphysics/object.hpp"
 #include "../mwphysics/physicssystem.hpp"
 
+#include "../mwworld/actionteleport.hpp"
+
 #include "cellpreloader.hpp"
 #include "cellstore.hpp"
 #include "cellvisitors.hpp"
@@ -69,13 +72,13 @@ namespace
 
     osg::Quat makeInverseNodeRotation(const MWWorld::Ptr& ptr)
     {
-        const auto pos = ptr.getRefData().getPosition();
+        const auto& pos = ptr.getRefData().getPosition();
         return ptr.getClass().isActor() ? makeActorOsgQuat(pos) : makeInversedOrderObjectOsgQuat(pos);
     }
 
     osg::Quat makeDirectNodeRotation(const MWWorld::Ptr& ptr)
     {
-        const auto pos = ptr.getRefData().getPosition();
+        const auto& pos = ptr.getRefData().getPosition();
         return ptr.getClass().isActor() ? makeActorOsgQuat(pos) : Misc::Convert::makeOsgQuat(pos);
     }
 
@@ -92,13 +95,17 @@ namespace
             rendering.rotateObject(ptr, rotation);
     }
 
-    std::string getModel(const MWWorld::Ptr& ptr)
+    VFS::Path::Normalized getModel(const MWWorld::Ptr& ptr)
     {
         if (Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId()))
             return {};
-        return ptr.getClass().getModel(ptr);
+        return ptr.getClass().getCorrectedModel(ptr);
     }
 
+    // Null node meant to distinguish objects that aren't in the scene from paged objects
+    // TODO: find a more clever way to make paging exclusion more reliable?
+    static osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pagedNode = new SceneUtil::PositionAttitudeTransform;
+
     void addObject(const MWWorld::Ptr& ptr, const MWWorld::World& world, const std::vector<ESM::RefNum>& pagedRefs,
         MWPhysics::PhysicsSystem& physics, MWRender::RenderingManager& rendering)
     {
@@ -108,16 +115,14 @@ namespace
             return;
         }
 
-        std::string model = getModel(ptr);
+        const VFS::Path::Normalized model = getModel(ptr);
         const auto rotation = makeDirectNodeRotation(ptr);
 
-        const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
+        ESM::RefNum refnum = ptr.getCellRef().getRefNum();
         if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum))
             ptr.getClass().insertObjectRendering(ptr, model, rendering);
         else
-            ptr.getRefData().setBaseNode(
-                new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend
-                                                           // on basenode
+            ptr.getRefData().setBaseNode(pagedNode);
         setNodeRotation(ptr, rendering, rotation);
 
         if (ptr.getClass().useAnim())
@@ -136,10 +141,22 @@ namespace
     }
 
     void addObject(const MWWorld::Ptr& ptr, const MWWorld::World& world, const MWPhysics::PhysicsSystem& physics,
-        DetourNavigator::Navigator& navigator, const DetourNavigator::UpdateGuard* navigatorUpdateGuard = nullptr)
+        float& lowestPoint, bool isInterior, DetourNavigator::Navigator& navigator,
+        const DetourNavigator::UpdateGuard* navigatorUpdateGuard = nullptr)
     {
         if (const auto object = physics.getObject(ptr))
         {
+            // Find the lowest point of this collision object in world space from its AABB if interior
+            // this point is used to determine the infinite fall cutoff from lowest point in the cell
+            if (isInterior)
+            {
+                btVector3 aabbMin;
+                btVector3 aabbMax;
+                const auto transform = object->getTransform();
+                object->getShapeInstance()->mCollisionShape->getAabb(transform, aabbMin, aabbMax);
+                lowestPoint = std::min(lowestPoint, static_cast<float>(aabbMin.z()));
+            }
+
             const DetourNavigator::ObjectTransform objectTransform{ ptr.getRefData().getPosition(),
                 ptr.getCellRef().getScale() };
 
@@ -161,13 +178,13 @@ namespace
                     Misc::Convert::makeBulletQuaternion(ptr.getCellRef().getPosition()), transform.getOrigin());
 
                 const auto start = Misc::Convert::toOsg(closedDoorTransform(center + toPoint));
-                const auto startPoint = physics.castRay(start, start - osg::Vec3f(0, 0, 1000), ptr, {},
+                const auto startPoint = physics.castRay(start, start - osg::Vec3f(0, 0, 1000), { ptr }, {},
                     MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap
                         | MWPhysics::CollisionType_Water);
                 const auto connectionStart = startPoint.mHit ? startPoint.mHitPos : start;
 
                 const auto end = Misc::Convert::toOsg(closedDoorTransform(center - toPoint));
-                const auto endPoint = physics.castRay(end, end - osg::Vec3f(0, 0, 1000), ptr, {},
+                const auto endPoint = physics.castRay(end, end - osg::Vec3f(0, 0, 1000), { ptr }, {},
                     MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap
                         | MWPhysics::CollisionType_Water);
                 const auto connectionEnd = endPoint.mHit ? endPoint.mHitPos : end;
@@ -188,7 +205,8 @@ namespace
         {
             const DetourNavigator::AgentBounds agentBounds = world.getPathfindingAgentBounds(ptr);
             if (!navigator.addAgent(agentBounds))
-                Log(Debug::Warning) << "Agent bounds are not supported by navigator: " << agentBounds;
+                Log(Debug::Warning) << "Agent bounds are not supported by navigator for " << ptr.toString() << ": "
+                                    << agentBounds;
         }
     }
 
@@ -226,7 +244,7 @@ namespace
     {
         for (MWWorld::Ptr& ptr : mToInsert)
         {
-            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
+            if (!ptr.mRef->isDeleted() && ptr.getRefData().isEnabled())
             {
                 try
                 {
@@ -259,7 +277,7 @@ namespace
         return false;
     }
 
-    bool removeFromSorted(const ESM::RefNum& refNum, std::vector<ESM::RefNum>& pagedRefs)
+    bool removeFromSorted(ESM::RefNum refNum, std::vector<ESM::RefNum>& pagedRefs)
     {
         const auto it = std::lower_bound(pagedRefs.begin(), pagedRefs.end(), refNum);
         if (it == pagedRefs.end() || *it != refNum)
@@ -267,14 +285,36 @@ namespace
         pagedRefs.erase(it);
         return true;
     }
+
+    template <class Function>
+    void iterateOverCellsAround(int cellX, int cellY, int range, Function&& f)
+    {
+        for (int x = cellX - range, lastX = cellX + range; x <= lastX; ++x)
+            for (int y = cellY - range, lastY = cellY + range; y <= lastY; ++y)
+                f(x, y);
+    }
+
+    void sortCellsToLoad(int centerX, int centerY, std::vector<std::pair<int, int>>& cells)
+    {
+        const auto getDistanceToPlayerCell = [&](const std::pair<int, int>& cellPosition) {
+            return std::abs(cellPosition.first - centerX) + std::abs(cellPosition.second - centerY);
+        };
+
+        const auto getCellPositionPriority = [&](const std::pair<int, int>& cellPosition) {
+            return std::make_pair(getDistanceToPlayerCell(cellPosition), getCellPositionDistanceToOrigin(cellPosition));
+        };
+
+        std::sort(cells.begin(), cells.end(), [&](const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
+            return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
+        });
+    }
 }
 
 namespace MWWorld
 {
-
     void Scene::removeFromPagedRefs(const Ptr& ptr)
     {
-        const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
+        ESM::RefNum refnum = ptr.getCellRef().getRefNum();
         if (refnum.hasContentFile() && removeFromSorted(refnum, mPagedRefs))
         {
             if (!ptr.getRefData().getBaseNode())
@@ -285,6 +325,11 @@ namespace MWWorld
         }
     }
 
+    bool Scene::isPagedRef(const Ptr& ptr) const
+    {
+        return ptr.getRefData().getBaseNode() == pagedNode.get();
+    }
+
     void Scene::updateObjectRotation(const Ptr& ptr, RotationOrder order)
     {
         const auto rot = makeNodeRotation(ptr, order);
@@ -406,8 +451,7 @@ namespace MWWorld
             }
             else if (!ESM::isEsm4Ext(worldspace))
             {
-                static std::vector<float> defaultHeight;
-                defaultHeight.resize(verts * verts, ESM::Land::DEFAULT_HEIGHT);
+                static const std::vector<float> defaultHeight(verts * verts, ESM::Land::DEFAULT_HEIGHT);
                 mPhysics->addHeightField(defaultHeight.data(), cellX, cellY, worldsize, verts,
                     ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
             }
@@ -496,6 +540,7 @@ namespace MWWorld
         navigatorUpdateGuard.reset();
         assert(mActiveCells.empty());
         mCurrentCell = nullptr;
+        mLowestPoint = std::numeric_limits<float>::max();
 
         mPreloader->clear();
     }
@@ -512,7 +557,7 @@ namespace MWWorld
             = mCurrentCell ? mCurrentCell->getCell()->getWorldSpace() : ESM::Cell::sDefaultWorldspaceId;
         if (currentGridCenter)
         {
-            osg::Vec2 center = ESM::indexToPosition(
+            const osg::Vec2f center = ESM::indexToPosition(
                 ESM::ExteriorCellLocation(currentGridCenter->x(), currentGridCenter->y(), worldspace), true);
             float distance = std::max(std::abs(center.x() - pos.x()), std::abs(center.y() - pos.y()));
             float cellSize = ESM::getCellSize(worldspace);
@@ -526,12 +571,39 @@ namespace MWWorld
 
     void Scene::playerMoved(const osg::Vec3f& pos)
     {
-        if (!mCurrentCell || !mCurrentCell->isExterior())
+        if (!mCurrentCell)
             return;
 
-        osg::Vec2i newCell = getNewGridCenter(pos, &mCurrentGridCenter);
-        if (newCell != mCurrentGridCenter)
-            requestChangeCellGrid(pos, newCell);
+        // The player is reset when z is 90 units below the lowest reference bound z.
+        constexpr float lowestPointAdjustment = -90.0f;
+        if (mCurrentCell->isExterior())
+        {
+            osg::Vec2i newCell = getNewGridCenter(pos, &mCurrentGridCenter);
+            if (newCell != mCurrentGridCenter)
+                requestChangeCellGrid(pos, newCell);
+        }
+        else if (pos.z() < mLowestPoint + lowestPointAdjustment)
+        {
+            // Player has fallen into the void, reset to interior marker/coc (#1415)
+            const std::string_view cellNameId = mCurrentCell->getCell()->getNameId();
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+            MWWorld::Ptr playerPtr = world->getPlayerPtr();
+
+            // Check that collision is enabled, which is opposite to Vanilla
+            // this change was decided in MR #4100 as the behaviour is preferable
+            if (world->isActorCollisionEnabled(playerPtr))
+            {
+                ESM::Position newPos;
+                const ESM::RefId refId = world->findInteriorPosition(cellNameId, newPos);
+
+                // Only teleport if that teleport point is > the lowest point, rare edge case
+                if (!refId.empty() && newPos.pos[2] >= mLowestPoint - lowestPointAdjustment)
+                {
+                    MWWorld::ActionTeleport(refId, newPos, false).execute(playerPtr);
+                    Log(Debug::Warning) << "Player position has been reset due to falling into the void";
+                }
+            }
+        }
     }
 
     void Scene::requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent)
@@ -542,11 +614,11 @@ namespace MWWorld
 
     void Scene::changeCellGrid(const osg::Vec3f& pos, ESM::ExteriorCellLocation playerCellIndex, bool changeEvent)
     {
-        mHalfGridSize
+        const int halfGridSize
             = isEsm4Ext(playerCellIndex.mWorldspace) ? Constants::ESM4CellGridRadius : Constants::CellGridRadius;
         auto navigatorUpdateGuard = mNavigator.makeUpdateGuard();
-        int playerCellX = playerCellIndex.mX;
-        int playerCellY = playerCellIndex.mY;
+        const int playerCellX = playerCellIndex.mX;
+        const int playerCellY = playerCellIndex.mY;
 
         for (auto iter = mActiveCells.begin(); iter != mActiveCells.end();)
         {
@@ -555,17 +627,21 @@ namespace MWWorld
             {
                 const auto dx = std::abs(playerCellX - cell->getCell()->getGridX());
                 const auto dy = std::abs(playerCellY - cell->getCell()->getGridY());
-                if (dx > mHalfGridSize || dy > mHalfGridSize)
+                if (dx > halfGridSize || dy > halfGridSize)
                     unloadCell(cell, navigatorUpdateGuard.get());
             }
             else
                 unloadCell(cell, navigatorUpdateGuard.get());
         }
-        mNavigator.setWorldspace(
-            mWorld.getWorldModel().getExterior(playerCellIndex).getCell()->getWorldSpace().serializeText(),
-            navigatorUpdateGuard.get());
-        mNavigator.updateBounds(pos, navigatorUpdateGuard.get());
 
+        const DetourNavigator::CellGridBounds cellGridBounds{
+            .mCenter = osg::Vec2i(playerCellX, playerCellY),
+            .mHalfSize = halfGridSize,
+        };
+
+        mNavigator.updateBounds(playerCellIndex.mWorldspace, cellGridBounds, pos, navigatorUpdateGuard.get());
+
+        mHalfGridSize = halfGridSize;
         mCurrentGridCenter = osg::Vec2i(playerCellX, playerCellY);
         osg::Vec4i newGrid = gridCenterToBounds(mCurrentGridCenter);
         mRendering.setActiveGrid(newGrid);
@@ -573,49 +649,29 @@ namespace MWWorld
         mPreloader->setTerrain(mRendering.getTerrain());
         if (mRendering.pagingUnlockCache())
             mPreloader->abortTerrainPreloadExcept(nullptr);
-        if (!mPreloader->isTerrainLoaded(std::make_pair(pos, newGrid), mRendering.getReferenceTime()))
+        if (!mPreloader->isTerrainLoaded(PositionCellGrid{ pos, newGrid }, mRendering.getReferenceTime()))
             preloadTerrain(pos, playerCellIndex.mWorldspace, true);
         mPagedRefs.clear();
         mRendering.getPagedRefnums(newGrid, mPagedRefs);
 
-        std::size_t refsToLoad = 0;
-        const auto cellsToLoad = [&](CellStoreCollection& collection, int range) -> std::vector<std::pair<int, int>> {
-            std::vector<std::pair<int, int>> cellsPositionsToLoad;
-            for (int x = playerCellX - range; x <= playerCellX + range; ++x)
-            {
-                for (int y = playerCellY - range; y <= playerCellY + range; ++y)
-                {
-                    if (!isCellInCollection(ESM::ExteriorCellLocation(x, y, playerCellIndex.mWorldspace), collection))
-                    {
-                        refsToLoad += mWorld.getWorldModel().getExterior(playerCellIndex).count();
-                        cellsPositionsToLoad.emplace_back(x, y);
-                    }
-                }
-            }
-            return cellsPositionsToLoad;
-        };
-
         addPostponedPhysicsObjects();
 
-        auto cellsPositionsToLoad = cellsToLoad(mActiveCells, mHalfGridSize);
+        std::size_t refsToLoad = 0;
+        std::vector<std::pair<int, int>> cellsPositionsToLoad;
+        iterateOverCellsAround(playerCellX, playerCellY, mHalfGridSize, [&](int x, int y) {
+            const ESM::ExteriorCellLocation location(x, y, playerCellIndex.mWorldspace);
+            if (isCellInCollection(location, mActiveCells))
+                return;
+            refsToLoad += mWorld.getWorldModel().getExterior(location).count();
+            cellsPositionsToLoad.emplace_back(x, y);
+        });
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
         loadingListener->setLabel("#{OMWEngine:LoadingExterior}");
         loadingListener->setProgressRange(refsToLoad);
 
-        const auto getDistanceToPlayerCell = [&](const std::pair<int, int>& cellPosition) {
-            return std::abs(cellPosition.first - playerCellX) + std::abs(cellPosition.second - playerCellY);
-        };
-
-        const auto getCellPositionPriority = [&](const std::pair<int, int>& cellPosition) {
-            return std::make_pair(getDistanceToPlayerCell(cellPosition), getCellPositionDistanceToOrigin(cellPosition));
-        };
-
-        std::sort(cellsPositionsToLoad.begin(), cellsPositionsToLoad.end(),
-            [&](const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
-                return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
-            });
+        sortCellsToLoad(playerCellX, playerCellY, cellsPositionsToLoad);
 
         for (const auto& [x, y] : cellsPositionsToLoad)
         {
@@ -648,9 +704,9 @@ namespace MWWorld
                 if (ptr.mRef->mData.mPhysicsPostponed)
                 {
                     ptr.mRef->mData.mPhysicsPostponed = false;
-                    if (ptr.mRef->mData.isEnabled() && ptr.mRef->mData.getCount() > 0)
+                    if (ptr.mRef->mData.isEnabled() && ptr.mRef->mRef.getCount() > 0)
                     {
-                        std::string model = getModel(ptr);
+                        const VFS::Path::Normalized model = getModel(ptr);
                         if (!model.empty())
                         {
                             const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
@@ -686,10 +742,18 @@ namespace MWWorld
 
             CellStore& cell = mWorld.getWorldModel().getExterior(
                 ESM::ExteriorCellLocation(it->mData.mX, it->mData.mY, ESM::Cell::sDefaultWorldspaceId));
-            mNavigator.setWorldspace(cell.getCell()->getWorldSpace().serializeText(), navigatorUpdateGuard.get());
             const osg::Vec3f position
                 = osg::Vec3f(it->mData.mX + 0.5f, it->mData.mY + 0.5f, 0) * Constants::CellSizeInUnits;
-            mNavigator.updateBounds(position, navigatorUpdateGuard.get());
+            const osg::Vec2i cellPosition(it->mData.mX, it->mData.mY);
+
+            const DetourNavigator::CellGridBounds cellGridBounds{
+                .mCenter = osg::Vec2i(it->mData.mX, it->mData.mY),
+                .mHalfSize = Constants::CellGridRadius,
+            };
+
+            mNavigator.updateBounds(
+                ESM::Cell::sDefaultWorldspaceId, cellGridBounds, position, navigatorUpdateGuard.get());
+
             loadCell(cell, nullptr, false, position, navigatorUpdateGuard.get());
 
             mNavigator.update(position, navigatorUpdateGuard.get());
@@ -743,10 +807,10 @@ namespace MWWorld
                 + std::to_string(cells.getIntSize()) + ")...");
 
             CellStore& cell = mWorld.getWorldModel().getInterior(it->mName);
-            mNavigator.setWorldspace(cell.getCell()->getWorldSpace().serializeText(), navigatorUpdateGuard.get());
             ESM::Position position;
             mWorld.findInteriorPosition(it->mName, position);
-            mNavigator.updateBounds(position.asVec3(), navigatorUpdateGuard.get());
+            mNavigator.updateBounds(
+                cell.getCell()->getWorldSpace(), std::nullopt, position.asVec3(), navigatorUpdateGuard.get());
             loadCell(cell, nullptr, false, position.asVec3(), navigatorUpdateGuard.get());
 
             mNavigator.update(position.asVec3(), navigatorUpdateGuard.get());
@@ -830,13 +894,11 @@ namespace MWWorld
         , mPreloadDoors(Settings::cells().mPreloadDoors)
         , mPreloadFastTravel(Settings::cells().mPreloadFastTravel)
         , mPredictionTime(Settings::cells().mPredictionTime)
+        , mLowestPoint(std::numeric_limits<float>::max())
     {
         mPreloader = std::make_unique<CellPreloader>(rendering.getResourceSystem(), physics->getShapeManager(),
             rendering.getTerrain(), rendering.getLandManager());
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
-
-        rendering.getResourceSystem()->setExpiryDelay(Settings::cells().mCacheExpiryDelay);
-
         mPreloader->setExpiryDelay(Settings::cells().mPreloadCellExpiryDelay);
         mPreloader->setMinCacheSize(Settings::cells().mPreloadCellCacheMin);
         mPreloader->setMaxCacheSize(Settings::cells().mPreloadCellCacheMax);
@@ -899,8 +961,8 @@ namespace MWWorld
 
         loadingListener->setProgressRange(cell.count());
 
-        mNavigator.setWorldspace(cell.getCell()->getWorldSpace().serializeText(), navigatorUpdateGuard.get());
-        mNavigator.updateBounds(position.asVec3(), navigatorUpdateGuard.get());
+        mNavigator.updateBounds(
+            cell.getCell()->getWorldSpace(), std::nullopt, position.asVec3(), navigatorUpdateGuard.get());
 
         // Load cell.
         mPagedRefs.clear();
@@ -963,20 +1025,23 @@ namespace MWWorld
     void Scene::insertCell(
         CellStore& cell, Loading::Listener* loadingListener, const DetourNavigator::UpdateGuard* navigatorUpdateGuard)
     {
+        const bool isInterior = !cell.isExterior();
         InsertVisitor insertVisitor(cell, loadingListener);
         cell.forEach(insertVisitor);
         insertVisitor.insert(
             [&](const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, mPagedRefs, *mPhysics, mRendering); });
-        insertVisitor.insert(
-            [&](const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, *mPhysics, mNavigator, navigatorUpdateGuard); });
+        insertVisitor.insert([&](const MWWorld::Ptr& ptr) {
+            addObject(ptr, mWorld, *mPhysics, mLowestPoint, isInterior, mNavigator, navigatorUpdateGuard);
+        });
     }
 
     void Scene::addObjectToScene(const Ptr& ptr)
     {
+        const bool isInterior = mCurrentCell && !mCurrentCell->isExterior();
         try
         {
             addObject(ptr, mWorld, mPagedRefs, *mPhysics, mRendering);
-            addObject(ptr, mWorld, *mPhysics, mNavigator);
+            addObject(ptr, mWorld, *mPhysics, mLowestPoint, isInterior, mNavigator);
             mWorld.scaleObject(ptr, ptr.getCellRef().getScale());
         }
         catch (std::exception& e)
@@ -1029,7 +1094,7 @@ namespace MWWorld
     class PreloadMeshItem : public SceneUtil::WorkItem
     {
     public:
-        PreloadMeshItem(const std::string& mesh, Resource::SceneManager* sceneManager)
+        explicit PreloadMeshItem(VFS::Path::NormalizedView mesh, Resource::SceneManager* sceneManager)
             : mMesh(mesh)
             , mSceneManager(sceneManager)
         {
@@ -1044,34 +1109,36 @@ namespace MWWorld
             {
                 mSceneManager->getTemplate(mMesh);
             }
-            catch (std::exception&)
+            catch (const std::exception& e)
             {
+                Log(Debug::Warning) << "Failed to get mesh template \"" << mMesh << "\" to preload: " << e.what();
             }
         }
 
         void abort() override { mAborted = true; }
 
     private:
-        std::string mMesh;
+        VFS::Path::Normalized mMesh;
         Resource::SceneManager* mSceneManager;
         std::atomic_bool mAborted{ false };
     };
 
     void Scene::preload(const std::string& mesh, bool useAnim)
     {
-        std::string mesh_ = mesh;
-        if (useAnim)
-            mesh_ = Misc::ResourceHelpers::correctActorModelPath(mesh_, mRendering.getResourceSystem()->getVFS());
+        const VFS::Path::Normalized meshPath = useAnim
+            ? Misc::ResourceHelpers::correctActorModelPath(
+                VFS::Path::toNormalized(mesh), mRendering.getResourceSystem()->getVFS())
+            : VFS::Path::toNormalized(mesh);
 
-        if (!mRendering.getResourceSystem()->getSceneManager()->checkLoaded(mesh_, mRendering.getReferenceTime()))
-        {
-            osg::ref_ptr<PreloadMeshItem> item(
-                new PreloadMeshItem(mesh_, mRendering.getResourceSystem()->getSceneManager()));
-            mRendering.getWorkQueue()->addWorkItem(item);
-            const auto isDone = [](const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
-            mWorkItems.erase(std::remove_if(mWorkItems.begin(), mWorkItems.end(), isDone), mWorkItems.end());
-            mWorkItems.emplace_back(std::move(item));
-        }
+        if (mRendering.getResourceSystem()->getSceneManager()->checkLoaded(meshPath, mRendering.getReferenceTime()))
+            return;
+
+        osg::ref_ptr<PreloadMeshItem> item(
+            new PreloadMeshItem(meshPath, mRendering.getResourceSystem()->getSceneManager()));
+        mRendering.getWorkQueue()->addWorkItem(item);
+        const auto isDone = [](const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
+        mWorkItems.erase(std::remove_if(mWorkItems.begin(), mWorkItems.end(), isDone), mWorkItems.end());
+        mWorkItems.emplace_back(std::move(item));
     }
 
     void Scene::preloadCells(float dt)
@@ -1086,26 +1153,25 @@ namespace MWWorld
         osg::Vec3f predictedPos = playerPos + moved / dt * mPredictionTime;
 
         if (mCurrentCell->isExterior())
-            exteriorPositions.emplace_back(
-                predictedPos, gridCenterToBounds(getNewGridCenter(predictedPos, &mCurrentGridCenter)));
+            exteriorPositions.push_back(PositionCellGrid{
+                predictedPos, gridCenterToBounds(getNewGridCenter(predictedPos, &mCurrentGridCenter)) });
 
         mLastPlayerPos = playerPos;
 
         if (mPreloadEnabled)
         {
             if (mPreloadDoors)
-                preloadTeleportDoorDestinations(playerPos, predictedPos, exteriorPositions);
+                preloadTeleportDoorDestinations(playerPos, predictedPos);
             if (mPreloadExteriorGrid)
                 preloadExteriorGrid(playerPos, predictedPos);
             if (mPreloadFastTravel)
-                preloadFastTravelDestinations(playerPos, predictedPos, exteriorPositions);
+                preloadFastTravelDestinations(playerPos, exteriorPositions);
         }
 
         mPreloader->setTerrainPreloadPositions(exteriorPositions);
     }
 
-    void Scene::preloadTeleportDoorDestinations(
-        const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos, std::vector<PositionCellGrid>& exteriorPositions)
+    void Scene::preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos)
     {
         std::vector<MWWorld::ConstPtr> teleportDoors;
         for (const MWWorld::CellStore* cellStore : mActiveCells)
@@ -1132,11 +1198,12 @@ namespace MWWorld
             {
                 try
                 {
-                    preloadCell(mWorld.getWorldModel().getCell(door.getCellRef().getDestCell()));
+                    preloadCellWithSurroundings(mWorld.getWorldModel().getCell(door.getCellRef().getDestCell()));
                 }
-                catch (std::exception&)
+                catch (const std::exception& e)
                 {
-                    // ignore error for now, would spam the log too much
+                    Log(Debug::Warning) << "Failed to schedule preload for door " << door.toString() << ": "
+                                        << e.what();
                 }
             }
         }
@@ -1164,7 +1231,7 @@ namespace MWWorld
                     && dx != -halfGridSizePlusOne)
                     continue; // only care about the outer (not yet loaded) part of the grid
                 ESM::ExteriorCellLocation cellIndex(cellX + dx, cellY + dy, extWorldspace);
-                osg::Vec2 thisCellCenter = ESM::indexToPosition(cellIndex, true);
+                const osg::Vec2f thisCellCenter = ESM::indexToPosition(cellIndex, true);
 
                 float dist = std::max(
                     std::abs(thisCellCenter.x() - playerPos.x()), std::abs(thisCellCenter.y() - playerPos.y()));
@@ -1179,36 +1246,55 @@ namespace MWWorld
         }
     }
 
-    void Scene::preloadCell(CellStore& cell, bool preloadSurrounding)
+    void Scene::preloadCellWithSurroundings(CellStore& cell)
     {
-        if (preloadSurrounding && cell.isExterior())
+        if (!cell.isExterior())
         {
-            int x = cell.getCell()->getGridX();
-            int y = cell.getCell()->getGridY();
-            unsigned int numpreloaded = 0;
-            for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx)
-            {
-                for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
-                {
-                    mPreloader->preload(mWorld.getWorldModel().getExterior(
-                                            ESM::ExteriorCellLocation(x + dx, y + dy, cell.getCell()->getWorldSpace())),
-                        mRendering.getReferenceTime());
-                    if (++numpreloaded >= mPreloader->getMaxCacheSize())
-                        break;
-                }
-            }
-        }
-        else
             mPreloader->preload(cell, mRendering.getReferenceTime());
+            return;
+        }
+
+        const int cellX = cell.getCell()->getGridX();
+        const int cellY = cell.getCell()->getGridY();
+
+        std::vector<std::pair<int, int>> cells;
+        const std::size_t gridSize = static_cast<std::size_t>(2 * mHalfGridSize + 1);
+        cells.reserve(gridSize * gridSize);
+
+        iterateOverCellsAround(cellX, cellY, mHalfGridSize, [&](int x, int y) { cells.emplace_back(x, y); });
+
+        sortCellsToLoad(cellX, cellY, cells);
+
+        const std::size_t leftCapacity = mPreloader->getMaxCacheSize() - mPreloader->getCacheSize();
+        if (cells.size() > leftCapacity)
+        {
+            static bool logged = [&] {
+                Log(Debug::Warning) << "Not enough cell preloader cache capacity to preload exterior cells, consider "
+                                       "increasing \"preload cell cache max\" up to "
+                                    << (mPreloader->getCacheSize() + cells.size());
+                return true;
+            }();
+            (void)logged;
+            cells.resize(leftCapacity);
+        }
+
+        const ESM::RefId worldspace = cell.getCell()->getWorldSpace();
+        for (const auto& [x, y] : cells)
+            mPreloader->preload(mWorld.getWorldModel().getExterior(ESM::ExteriorCellLocation(x, y, worldspace)),
+                mRendering.getReferenceTime());
+    }
+
+    void Scene::preloadCell(CellStore& cell)
+    {
+        mPreloader->preload(cell, mRendering.getReferenceTime());
     }
 
     void Scene::preloadTerrain(const osg::Vec3f& pos, ESM::RefId worldspace, bool sync)
     {
         ESM::ExteriorCellLocation cellPos = ESM::positionToExteriorCellLocation(pos.x(), pos.y(), worldspace);
-        std::vector<PositionCellGrid> vec;
-        vec.emplace_back(pos, gridCenterToBounds({ cellPos.mX, cellPos.mY }));
-        mPreloader->abortTerrainPreloadExcept(vec.data());
-        mPreloader->setTerrainPreloadPositions(vec);
+        const PositionCellGrid position{ pos, gridCenterToBounds({ cellPos.mX, cellPos.mY }) };
+        mPreloader->abortTerrainPreloadExcept(&position);
+        mPreloader->setTerrainPreloadPositions(std::span(&position, 1));
         if (!sync)
             return;
 
@@ -1222,7 +1308,7 @@ namespace MWWorld
 
     void Scene::reloadTerrain()
     {
-        mPreloader->setTerrainPreloadPositions(std::vector<PositionCellGrid>());
+        mPreloader->setTerrainPreloadPositions({});
     }
 
     struct ListFastTravelDestinationsVisitor
@@ -1255,12 +1341,10 @@ namespace MWWorld
         std::vector<ESM::Transport::Dest> mList;
     };
 
-    void Scene::preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& /*predictedPos*/,
-        std::vector<PositionCellGrid>& exteriorPositions) // ignore predictedPos here since opening dialogue with
-                                                          // travel service takes extra time
+    void Scene::preloadFastTravelDestinations(
+        const osg::Vec3f& playerPos, std::vector<PositionCellGrid>& exteriorPositions)
     {
-        const MWWorld::ConstPtr player = mWorld.getPlayerPtr();
-        ListFastTravelDestinationsVisitor listVisitor(mPreloadDistance, player.getRefData().getPosition().asVec3());
+        ListFastTravelDestinationsVisitor listVisitor(mPreloadDistance, playerPos);
         ESM::RefId extWorldspace = mWorld.getCurrentWorldspace();
         for (MWWorld::CellStore* cellStore : mActiveCells)
         {
@@ -1277,9 +1361,14 @@ namespace MWWorld
                 osg::Vec3f pos = dest.mPos.asVec3();
                 const ESM::ExteriorCellLocation cellIndex
                     = ESM::positionToExteriorCellLocation(pos.x(), pos.y(), extWorldspace);
-                preloadCell(mWorld.getWorldModel().getExterior(cellIndex), true);
-                exteriorPositions.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
+                preloadCellWithSurroundings(mWorld.getWorldModel().getExterior(cellIndex));
+                exteriorPositions.push_back(PositionCellGrid{ pos, gridCenterToBounds(getNewGridCenter(pos)) });
             }
         }
     }
+
+    void Scene::reportStats(unsigned int frameNumber, osg::Stats& stats) const
+    {
+        mPreloader->reportStats(frameNumber, stats);
+    }
 }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index f3dd377845..116e52e535 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -5,20 +5,21 @@
 #include <osg/Vec4i>
 #include <osg/ref_ptr>
 
+#include "positioncellgrid.hpp"
 #include "ptr.hpp"
 
 #include <memory>
 #include <optional>
 #include <set>
-#include <unordered_map>
 #include <vector>
 
-#include <components/esm/util.hpp>
+#include <components/esm/exteriorcelllocation.hpp>
 #include <components/misc/constants.hpp>
 
 namespace osg
 {
     class Vec3f;
+    class Stats;
 }
 
 namespace ESM
@@ -101,6 +102,7 @@ namespace MWWorld
         bool mPreloadDoors;
         bool mPreloadFastTravel;
         float mPredictionTime;
+        float mLowestPoint;
 
         int mHalfGridSize = Constants::CellGridRadius;
 
@@ -122,14 +124,11 @@ namespace MWWorld
 
         void requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent = true);
 
-        typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
-
         void preloadCells(float dt);
-        void preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos,
-            std::vector<PositionCellGrid>& exteriorPositions);
+        void preloadTeleportDoorDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos);
         void preloadExteriorGrid(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos);
-        void preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos,
-            std::vector<PositionCellGrid>& exteriorPositions);
+        void preloadFastTravelDestinations(
+            const osg::Vec3f& playerPos, std::vector<PositionCellGrid>& exteriorPositions);
 
         osg::Vec4i gridCenterToBounds(const osg::Vec2i& centerCell) const;
         osg::Vec2i getNewGridCenter(const osg::Vec3f& pos, const osg::Vec2i* currentGridCenter = nullptr) const;
@@ -144,7 +143,8 @@ namespace MWWorld
 
         ~Scene();
 
-        void preloadCell(MWWorld::CellStore& cell, bool preloadSurrounding = false);
+        void preloadCellWithSurroundings(MWWorld::CellStore& cell);
+        void preloadCell(MWWorld::CellStore& cell);
         void preloadTerrain(const osg::Vec3f& pos, ESM::RefId worldspace, bool sync = false);
         void reloadTerrain();
 
@@ -190,6 +190,8 @@ namespace MWWorld
 
         void removeFromPagedRefs(const Ptr& ptr);
 
+        bool isPagedRef(const Ptr& ptr) const;
+
         void updateObjectRotation(const Ptr& ptr, RotationOrder order);
         void updateObjectScale(const Ptr& ptr);
 
@@ -201,6 +203,8 @@ namespace MWWorld
 
         void testExteriorCells();
         void testInteriorCells();
+
+        void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index a4b8548e52..b0684b1ab4 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -379,83 +379,51 @@ namespace MWWorld
 
     // LandTexture
     //=========================================================================
-    Store<ESM::LandTexture>::Store() {}
-    const ESM::LandTexture* Store<ESM::LandTexture>::search(size_t index, size_t plugin) const
-    {
-        assert(plugin < mStatic.size());
-        const LandTextureList& ltexl = mStatic[plugin];
+    Store<ESM::LandTexture>::Store() = default;
 
-        if (index >= ltexl.size())
+    const std::string* Store<ESM::LandTexture>::search(std::uint32_t index, int plugin) const
+    {
+        auto mapping = mMappings.find(PluginIndex{ plugin, index });
+        if (mapping == mMappings.end())
             return nullptr;
-        return &ltexl[index];
-    }
-    const ESM::LandTexture* Store<ESM::LandTexture>::find(size_t index, size_t plugin) const
-    {
-        const ESM::LandTexture* ptr = search(index, plugin);
-        if (ptr == nullptr)
-        {
-            const std::string msg = "Land texture with index " + std::to_string(index) + " not found";
-            throw std::runtime_error(msg);
-        }
-        return ptr;
-    }
-
-    void Store<ESM::LandTexture>::resize(std::size_t num)
-    {
-        mStatic.resize(num);
+        auto texture = mStatic.find(mapping->second);
+        if (texture == mStatic.end())
+            return nullptr;
+        return &texture->second;
     }
 
     size_t Store<ESM::LandTexture>::getSize() const
     {
         return mStatic.size();
     }
-    size_t Store<ESM::LandTexture>::getSize(size_t plugin) const
-    {
-        assert(plugin < mStatic.size());
-        return mStatic[plugin].size();
-    }
+
     RecordId Store<ESM::LandTexture>::load(ESM::ESMReader& esm)
     {
+        const int plugin = esm.getIndex();
+
         ESM::LandTexture lt;
         bool isDeleted = false;
 
         lt.load(esm, isDeleted);
 
-        // Replace texture for records with given ID and index from all plugins.
-        for (unsigned int i = 0; i < mStatic.size(); i++)
+        if (!isDeleted)
         {
-            ESM::LandTexture* tex = const_cast<ESM::LandTexture*>(search(lt.mIndex, i));
-            if (tex)
-            {
-                if (tex->mId == lt.mId)
-                    tex->mTexture = lt.mTexture;
-            }
+            mStatic[lt.mId] = std::move(lt.mTexture);
+            mMappings.emplace(PluginIndex{ plugin, lt.mIndex }, lt.mId);
         }
 
-        LandTextureList& ltexl = mStatic.back();
-        if (lt.mIndex + 1 > (int)ltexl.size())
-            ltexl.resize(lt.mIndex + 1);
-
-        // Store it
-        auto idx = lt.mIndex;
-        ltexl[idx] = std::move(lt);
-
-        return RecordId(ltexl[idx].mId, isDeleted);
+        return RecordId(lt.mId, isDeleted);
     }
-    Store<ESM::LandTexture>::iterator Store<ESM::LandTexture>::begin(size_t plugin) const
+
+    bool Store<ESM::LandTexture>::eraseStatic(const ESM::RefId& id)
     {
-        assert(plugin < mStatic.size());
-        return mStatic[plugin].begin();
-    }
-    Store<ESM::LandTexture>::iterator Store<ESM::LandTexture>::end(size_t plugin) const
-    {
-        assert(plugin < mStatic.size());
-        return mStatic[plugin].end();
+        mStatic.erase(id);
+        return true;
     }
 
     // Land
     //=========================================================================
-    Store<ESM::Land>::~Store() {}
+    Store<ESM::Land>::~Store() = default;
     size_t Store<ESM::Land>::getSize() const
     {
         return mStatic.size();
@@ -662,6 +630,12 @@ namespace MWWorld
     }
     void Store<ESM::Cell>::clearDynamic()
     {
+        for (const auto& [_, cell] : mDynamicExt)
+            mCells.erase(cell->mId);
+        mDynamicExt.clear();
+        for (const auto& [_, cell] : mDynamicInt)
+            mCells.erase(cell->mId);
+        mDynamicInt.clear();
         setUp();
     }
 
@@ -893,7 +867,7 @@ namespace MWWorld
         // Try to overwrite existing record
         auto ret = mStatic.emplace(cell, pathgrid);
         if (!ret.second)
-            ret.first->second = pathgrid;
+            ret.first->second = std::move(pathgrid);
 
         return RecordId(ESM::RefId(), isDeleted);
     }
@@ -1017,11 +991,12 @@ namespace MWWorld
     void Store<ESM::GameSetting>::setUp()
     {
         auto addSetting = [&](const std::string& key, ESM::Variant value) {
+            auto id = ESM::RefId::stringRefId(key);
             ESM::GameSetting setting;
             setting.blank();
-            setting.mId = ESM::RefId::stringRefId(key);
+            setting.mId = id;
             setting.mValue = std::move(value);
-            auto [iter, inserted] = mStatic.insert_or_assign(setting.mId, std::move(setting));
+            auto [iter, inserted] = mStatic.insert_or_assign(id, std::move(setting));
             if (inserted)
                 mShared.push_back(&iter->second);
         };
@@ -1356,21 +1331,26 @@ template class MWWorld::TypedDynamicStore<ESM4::Clothing>;
 template class MWWorld::TypedDynamicStore<ESM4::Container>;
 template class MWWorld::TypedDynamicStore<ESM4::Creature>;
 template class MWWorld::TypedDynamicStore<ESM4::Door>;
+template class MWWorld::TypedDynamicStore<ESM4::Flora>;
 template class MWWorld::TypedDynamicStore<ESM4::Furniture>;
 template class MWWorld::TypedDynamicStore<ESM4::Hair>;
 template class MWWorld::TypedDynamicStore<ESM4::HeadPart>;
 template class MWWorld::TypedDynamicStore<ESM4::Ingredient>;
+template class MWWorld::TypedDynamicStore<ESM4::ItemMod>;
 template class MWWorld::TypedDynamicStore<ESM4::Land>;
+template class MWWorld::TypedDynamicStore<ESM4::LandTexture>;
 template class MWWorld::TypedDynamicStore<ESM4::LevelledCreature>;
 template class MWWorld::TypedDynamicStore<ESM4::LevelledItem>;
 template class MWWorld::TypedDynamicStore<ESM4::LevelledNpc>;
 template class MWWorld::TypedDynamicStore<ESM4::Light>;
 template class MWWorld::TypedDynamicStore<ESM4::MiscItem>;
+template class MWWorld::TypedDynamicStore<ESM4::MovableStatic>;
 template class MWWorld::TypedDynamicStore<ESM4::Npc>;
 template class MWWorld::TypedDynamicStore<ESM4::Outfit>;
 template class MWWorld::TypedDynamicStore<ESM4::Potion>;
 template class MWWorld::TypedDynamicStore<ESM4::Race>;
 template class MWWorld::TypedDynamicStore<ESM4::Static>;
+template class MWWorld::TypedDynamicStore<ESM4::StaticCollection>;
 template class MWWorld::TypedDynamicStore<ESM4::Terminal>;
 template class MWWorld::TypedDynamicStore<ESM4::Tree>;
 template class MWWorld::TypedDynamicStore<ESM4::Weapon>;
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 5cb0d6935c..5ce287c34e 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -255,29 +255,21 @@ namespace MWWorld
     template <>
     class Store<ESM::LandTexture> : public DynamicStore
     {
-        // For multiple ESM/ESP files we need one list per file.
-        typedef std::vector<ESM::LandTexture> LandTextureList;
-        std::vector<LandTextureList> mStatic;
+        using PluginIndex = std::pair<int, std::uint32_t>; // This is essentially a FormId
+        std::unordered_map<ESM::RefId, std::string> mStatic;
+        std::map<PluginIndex, ESM::RefId> mMappings;
 
     public:
         Store();
 
-        typedef std::vector<ESM::LandTexture>::const_iterator iterator;
-
         // Must be threadsafe! Called from terrain background loading threads.
         // Not a big deal here, since ESM::LandTexture can never be modified or inserted/erased
-        const ESM::LandTexture* search(size_t index, size_t plugin) const;
-        const ESM::LandTexture* find(size_t index, size_t plugin) const;
-
-        void resize(std::size_t num);
+        const std::string* search(std::uint32_t index, int plugin) const;
 
         size_t getSize() const override;
-        size_t getSize(size_t plugin) const;
+        bool eraseStatic(const ESM::RefId& id) override;
 
         RecordId load(ESM::ESMReader& esm) override;
-
-        iterator begin(size_t plugin) const;
-        iterator end(size_t plugin) const;
     };
 
     template <>
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 3338acd832..4f6f52a81a 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1,5 +1,7 @@
 #include "weather.hpp"
 
+#include <components/settings/values.hpp>
+
 #include <components/misc/rng.hpp>
 
 #include <components/esm3/esmreader.hpp>
@@ -45,7 +47,8 @@ namespace MWWorld
         osg::Vec3f calculateStormDirection(const std::string& particleEffect)
         {
             osg::Vec3f stormDirection = MWWorld::Weather::defaultDirection();
-            if (particleEffect == "meshes\\ashcloud.nif" || particleEffect == "meshes\\blightcloud.nif")
+            if (particleEffect == Settings::models().mWeatherashcloud.get()
+                || particleEffect == Settings::models().mWeatherblightcloud.get())
             {
                 osg::Vec3f playerPos = MWMechanics::getPlayer().getRefData().getPosition().asVec3();
                 playerPos.z() = 0;
@@ -180,7 +183,6 @@ namespace MWWorld
         , mTransitionDelta(Fallback::Map::getFloat("Weather_" + name + "_Transition_Delta"))
         , mThunderFrequency(Fallback::Map::getFloat("Weather_" + name + "_Thunder_Frequency"))
         , mThunderThreshold(Fallback::Map::getFloat("Weather_" + name + "_Thunder_Threshold"))
-        , mThunderSoundID()
         , mFlashDecrement(Fallback::Map::getFloat("Weather_" + name + "_Flash_Decrement"))
         , mFlashBrightness(0.0f)
     {
@@ -195,21 +197,19 @@ namespace MWWorld
         mThunderSoundID[3]
             = ESM::RefId::stringRefId(Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_3"));
 
-        // TODO: support weathers that have both "Ambient Loop Sound ID" and "Rain Loop Sound ID", need to play both
-        // sounds at the same time.
-
         if (!mRainEffect.empty()) // NOTE: in vanilla, the weathers with rain seem to be hardcoded; changing
                                   // Using_Precip has no effect
         {
-            mAmbientLoopSoundID
+            mRainLoopSoundID
                 = ESM::RefId::stringRefId(Fallback::Map::getString("Weather_" + name + "_Rain_Loop_Sound_ID"));
-            if (mAmbientLoopSoundID.empty()) // default to "rain" if not set
-                mAmbientLoopSoundID = ESM::RefId::stringRefId("rain");
+            if (mRainLoopSoundID.empty()) // default to "rain" if not set
+                mRainLoopSoundID = ESM::RefId::stringRefId("rain");
+            else if (mRainLoopSoundID == "None")
+                mRainLoopSoundID = ESM::RefId();
         }
-        else
-            mAmbientLoopSoundID
-                = ESM::RefId::stringRefId(Fallback::Map::getString("Weather_" + name + "_Ambient_Loop_Sound_ID"));
 
+        mAmbientLoopSoundID
+            = ESM::RefId::stringRefId(Fallback::Map::getString("Weather_" + name + "_Ambient_Loop_Sound_ID"));
         if (mAmbientLoopSoundID == "None")
             mAmbientLoopSoundID = ESM::RefId();
     }
@@ -285,19 +285,8 @@ namespace MWWorld
 
     RegionWeather::RegionWeather(const ESM::Region& region)
         : mWeather(invalidWeatherID)
-        , mChances()
+        , mChances(region.mData.mProbabilities.begin(), region.mData.mProbabilities.end())
     {
-        mChances.reserve(10);
-        mChances.push_back(region.mData.mClear);
-        mChances.push_back(region.mData.mCloudy);
-        mChances.push_back(region.mData.mFoggy);
-        mChances.push_back(region.mData.mOvercast);
-        mChances.push_back(region.mData.mRain);
-        mChances.push_back(region.mData.mThunder);
-        mChances.push_back(region.mData.mAsh);
-        mChances.push_back(region.mData.mBlight);
-        mChances.push_back(region.mData.mSnow);
-        mChances.push_back(region.mData.mBlizzard);
     }
 
     RegionWeather::RegionWeather(const ESM::RegionWeatherState& state)
@@ -313,19 +302,9 @@ namespace MWWorld
         return state;
     }
 
-    void RegionWeather::setChances(const std::vector<char>& chances)
+    void RegionWeather::setChances(const std::vector<uint8_t>& chances)
     {
-        if (mChances.size() < chances.size())
-        {
-            mChances.reserve(chances.size());
-        }
-
-        int i = 0;
-        for (char chance : chances)
-        {
-            mChances[i] = chance;
-            i++;
-        }
+        mChances = chances;
 
         // Regional weather no longer supports the current type, select a new weather pattern.
         if ((static_cast<size_t>(mWeather) >= mChances.size()) || (mChances[mWeather] == 0))
@@ -357,15 +336,14 @@ namespace MWWorld
         // If chances A and B has values 30 and 70 then by generating 100 numbers 1..100, 30% will be lesser or equal 30
         // and 70% will be greater than 30 (in theory).
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-        int chance = Misc::Rng::rollDice(100, prng) + 1; // 1..100
-        int sum = 0;
-        int i = 0;
-        for (; static_cast<size_t>(i) < mChances.size(); ++i)
+        unsigned int chance = static_cast<unsigned int>(Misc::Rng::rollDice(100, prng) + 1); // 1..100
+        unsigned int sum = 0;
+        for (size_t i = 0; i < mChances.size(); ++i)
         {
             sum += mChances[i];
             if (chance <= sum)
             {
-                mWeather = i;
+                mWeather = static_cast<int>(i);
                 return;
             }
         }
@@ -574,8 +552,6 @@ namespace MWWorld
         , mQueuedWeather(0)
         , mRegions()
         , mResult()
-        , mAmbientSound(nullptr)
-        , mPlayingSoundID()
     {
         mTimeSettings.mNightStart = mSunsetTime + mSunsetDuration;
         mTimeSettings.mNightEnd = mSunriseTime;
@@ -608,10 +584,10 @@ namespace MWWorld
         addWeather("Overcast", 0.7f, 0.0f); // 3
         addWeather("Rain", 0.5f, 10.0f); // 4
         addWeather("Thunderstorm", 0.5f, 20.0f); // 5
-        addWeather("Ashstorm", 0.2f, 50.0f, "meshes\\ashcloud.nif"); // 6
-        addWeather("Blight", 0.2f, 60.0f, "meshes\\blightcloud.nif"); // 7
-        addWeather("Snow", 0.5f, 40.0f, "meshes\\snow.nif"); // 8
-        addWeather("Blizzard", 0.16f, 70.0f, "meshes\\blizzard.nif"); // 9
+        addWeather("Ashstorm", 0.2f, 50.0f, Settings::models().mWeatherashcloud.get()); // 6
+        addWeather("Blight", 0.2f, 60.0f, Settings::models().mWeatherblightcloud.get()); // 7
+        addWeather("Snow", 0.5f, 40.0f, Settings::models().mWeathersnow.get()); // 8
+        addWeather("Blizzard", 0.16f, 70.0f, Settings::models().mWeatherblizzard.get()); // 9
 
         Store<ESM::Region>::iterator it = store.get<ESM::Region>().begin();
         for (; it != store.get<ESM::Region>().end(); ++it)
@@ -649,7 +625,7 @@ namespace MWWorld
         }
     }
 
-    void WeatherManager::modRegion(const ESM::RefId& regionID, const std::vector<char>& chances)
+    void WeatherManager::modRegion(const ESM::RefId& regionID, const std::vector<uint8_t>& chances)
     {
         // Sets the region's probability for various weather patterns. Note that this appears to be saved permanently.
         // In Morrowind, this seems to have the following behavior when applied to the current region:
@@ -747,7 +723,7 @@ namespace MWWorld
 
         // For some reason Ash Storm is not considered as a precipitation weather in game
         mPrecipitation = !(mResult.mParticleEffect.empty() && mResult.mRainEffect.empty())
-            && mResult.mParticleEffect != "meshes\\ashcloud.nif";
+            && mResult.mParticleEffect != Settings::models().mWeatherashcloud.get();
 
         mStormDirection = calculateStormDirection(mResult.mParticleEffect);
         mRendering.getSkyManager()->setStormParticleDirection(mStormDirection);
@@ -774,21 +750,21 @@ namespace MWWorld
             const float dayDuration = adjustedNightStart - mSunriseTime;
             const float nightDuration = 24.f - dayDuration;
 
-            double theta;
+            float orbit;
             if (!is_night)
             {
-                theta = static_cast<float>(osg::PI) * (adjustedHour - mSunriseTime) / dayDuration;
+                float t = (adjustedHour - mSunriseTime) / dayDuration;
+                orbit = 1.f - 2.f * t;
             }
             else
             {
-                theta = static_cast<float>(osg::PI)
-                    - static_cast<float>(osg::PI) * (adjustedHour - adjustedNightStart) / nightDuration;
+                float t = (adjustedHour - adjustedNightStart) / nightDuration;
+                orbit = 2.f * t - 1.f;
             }
 
-            osg::Vec3f final(static_cast<float>(cos(theta)),
-                -0.268f, // approx tan( -15 degrees )
-                static_cast<float>(sin(theta)));
-            mRendering.setSunDirection(final * -1);
+            // Hardcoded constant from Morrowind
+            const osg::Vec3f sunDir(-400.f * orbit, 75.f, -100.f);
+            mRendering.setSunDirection(sunDir);
             mRendering.setNight(is_night);
         }
 
@@ -811,30 +787,67 @@ namespace MWWorld
         mRendering.configureFog(
             mResult.mFogDepth, underwaterFog, mResult.mDLFogFactor, mResult.mDLFogOffset / 100.0f, mResult.mFogColor);
         mRendering.setAmbientColour(mResult.mAmbientColor);
-        mRendering.setSunColour(
-            mResult.mSunColor, mResult.mSunColor * mResult.mGlareView * glareFade, mResult.mGlareView * glareFade);
+        mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor, mResult.mGlareView * glareFade);
 
         mRendering.getSkyManager()->setWeather(mResult);
 
         // Play sounds
-        if (mPlayingSoundID != mResult.mAmbientLoopSoundID)
+        if (mPlayingAmbientSoundID != mResult.mAmbientLoopSoundID)
         {
-            stopSounds();
+            if (mAmbientSound)
+            {
+                MWBase::Environment::get().getSoundManager()->stopSound(mAmbientSound);
+                mAmbientSound = nullptr;
+            }
             if (!mResult.mAmbientLoopSoundID.empty())
                 mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(mResult.mAmbientLoopSoundID,
                     mResult.mAmbientSoundVolume, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
-            mPlayingSoundID = mResult.mAmbientLoopSoundID;
+            mPlayingAmbientSoundID = mResult.mAmbientLoopSoundID;
         }
         else if (mAmbientSound)
             mAmbientSound->setVolume(mResult.mAmbientSoundVolume);
+
+        if (mPlayingRainSoundID != mResult.mRainLoopSoundID)
+        {
+            if (mRainSound)
+            {
+                MWBase::Environment::get().getSoundManager()->stopSound(mRainSound);
+                mRainSound = nullptr;
+            }
+            if (!mResult.mRainLoopSoundID.empty())
+                mRainSound = MWBase::Environment::get().getSoundManager()->playSound(mResult.mRainLoopSoundID,
+                    mResult.mAmbientSoundVolume, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::Loop);
+            mPlayingRainSoundID = mResult.mRainLoopSoundID;
+        }
+        else if (mRainSound)
+            mRainSound->setVolume(mResult.mAmbientSoundVolume);
     }
 
     void WeatherManager::stopSounds()
     {
+        MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
         if (mAmbientSound)
-            MWBase::Environment::get().getSoundManager()->stopSound(mAmbientSound);
-        mAmbientSound = nullptr;
-        mPlayingSoundID = ESM::RefId();
+        {
+            sndMgr->stopSound(mAmbientSound);
+            mAmbientSound = nullptr;
+        }
+        mPlayingAmbientSoundID = ESM::RefId();
+
+        if (mRainSound)
+        {
+            sndMgr->stopSound(mRainSound);
+            mRainSound = nullptr;
+        }
+        mPlayingRainSoundID = ESM::RefId();
+
+        for (ESM::RefId soundId : mWeatherSettings[mCurrentWeather].mThunderSoundID)
+            if (!soundId.empty() && sndMgr->getSoundPlaying(MWWorld::ConstPtr(), soundId))
+                sndMgr->stopSound3D(MWWorld::ConstPtr(), soundId);
+
+        if (inTransition())
+            for (ESM::RefId soundId : mWeatherSettings[mNextWeather].mThunderSoundID)
+                if (!soundId.empty() && sndMgr->getSoundPlaying(MWWorld::ConstPtr(), soundId))
+                    sndMgr->stopSound3D(MWWorld::ConstPtr(), soundId);
     }
 
     float WeatherManager::getWindSpeed() const
@@ -921,36 +934,27 @@ namespace MWWorld
     {
         if (ESM::REC_WTHR == type)
         {
-            if (reader.getFormatVersion() <= ESM::MaxOldWeatherFormatVersion)
+            ESM::WeatherState state;
+            state.load(reader);
+
+            std::swap(mCurrentRegion, state.mCurrentRegion);
+            mTimePassed = state.mTimePassed;
+            mFastForward = state.mFastForward;
+            mWeatherUpdateTime = state.mWeatherUpdateTime;
+            mTransitionFactor = state.mTransitionFactor;
+            mCurrentWeather = state.mCurrentWeather;
+            mNextWeather = state.mNextWeather;
+            mQueuedWeather = state.mQueuedWeather;
+
+            mRegions.clear();
+            importRegions();
+
+            for (auto it = state.mRegions.begin(); it != state.mRegions.end(); ++it)
             {
-                // Weather state isn't really all that important, so to preserve older save games, we'll just discard
-                // the older weather records, rather than fail to handle the record.
-                reader.skipRecord();
-            }
-            else
-            {
-                ESM::WeatherState state;
-                state.load(reader);
-
-                std::swap(mCurrentRegion, state.mCurrentRegion);
-                mTimePassed = state.mTimePassed;
-                mFastForward = state.mFastForward;
-                mWeatherUpdateTime = state.mWeatherUpdateTime;
-                mTransitionFactor = state.mTransitionFactor;
-                mCurrentWeather = state.mCurrentWeather;
-                mNextWeather = state.mNextWeather;
-                mQueuedWeather = state.mQueuedWeather;
-
-                mRegions.clear();
-                importRegions();
-
-                for (auto it = state.mRegions.begin(); it != state.mRegions.end(); ++it)
+                auto found = mRegions.find(it->first);
+                if (found != mRegions.end())
                 {
-                    auto found = mRegions.find(it->first);
-                    if (found != mRegions.end())
-                    {
-                        found->second = RegionWeather(it->second);
-                    }
+                    found->second = RegionWeather(it->second);
                 }
             }
 
@@ -1150,6 +1154,7 @@ namespace MWWorld
         mResult.mCloudSpeed = current.mCloudSpeed;
         mResult.mGlareView = current.mGlareView;
         mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
+        mResult.mRainLoopSoundID = current.mRainLoopSoundID;
         mResult.mAmbientSoundVolume = 1.f;
         mResult.mPrecipitationAlpha = 1.f;
 
@@ -1269,6 +1274,7 @@ namespace MWWorld
             mResult.mAmbientSoundVolume = 1.f - factor / threshold;
             mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
             mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
+            mResult.mRainLoopSoundID = current.mRainLoopSoundID;
             mResult.mRainDiameter = current.mRainDiameter;
             mResult.mRainMinHeight = current.mRainMinHeight;
             mResult.mRainMaxHeight = current.mRainMaxHeight;
@@ -1284,6 +1290,7 @@ namespace MWWorld
             mResult.mAmbientSoundVolume = (factor - threshold) / (1 - threshold);
             mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
             mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
+            mResult.mRainLoopSoundID = other.mRainLoopSoundID;
 
             mResult.mRainDiameter = other.mRainDiameter;
             mResult.mRainMinHeight = other.mRainMinHeight;
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 57c69cde11..0643240dcd 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -156,9 +156,13 @@ namespace MWWorld
             float FogOffset;
         } mDL;
 
-        // Sound effect
+        // Sound effects
         // This is used for Blight, Ashstorm and Blizzard (Bloodmoon)
         ESM::RefId mAmbientLoopSoundID;
+        // This is used for Rain and Thunderstorm
+        ESM::RefId mRainLoopSoundID;
+
+        std::array<ESM::RefId, 4> mThunderSoundID;
 
         // Is this an ash storm / blight storm? If so, the following will happen:
         // - The particles and clouds will be oriented so they appear to come from the Red Mountain.
@@ -211,7 +215,6 @@ namespace MWWorld
         // non-zero values.
         float mThunderFrequency;
         float mThunderThreshold;
-        ESM::RefId mThunderSoundID[4];
         float mFlashDecrement;
 
         float mFlashBrightness;
@@ -230,7 +233,7 @@ namespace MWWorld
 
         operator ESM::RegionWeatherState() const;
 
-        void setChances(const std::vector<char>& chances);
+        void setChances(const std::vector<uint8_t>& chances);
 
         void setWeather(int weatherID);
 
@@ -238,7 +241,7 @@ namespace MWWorld
 
     private:
         int mWeather;
-        std::vector<char> mChances;
+        std::vector<uint8_t> mChances;
 
         void chooseNewWeather();
     };
@@ -286,7 +289,7 @@ namespace MWWorld
          * @param ID of the weather setting to shift to
          */
         void changeWeather(const ESM::RefId& regionID, const unsigned int weatherID);
-        void modRegion(const ESM::RefId& regionID, const std::vector<char>& chances);
+        void modRegion(const ESM::RefId& regionID, const std::vector<uint8_t>& chances);
         void playerTeleported(const ESM::RefId& playerRegion, bool isExterior);
 
         /**
@@ -369,8 +372,10 @@ namespace MWWorld
         std::map<ESM::RefId, RegionWeather> mRegions;
         MWRender::WeatherResult mResult;
 
-        MWBase::Sound* mAmbientSound;
-        ESM::RefId mPlayingSoundID;
+        MWBase::Sound* mAmbientSound{ nullptr };
+        ESM::RefId mPlayingAmbientSoundID;
+        MWBase::Sound* mRainSound{ nullptr };
+        ESM::RefId mPlayingRainSoundID;
 
         void addWeather(
             const std::string& name, float dlFactor, float dlOffset, const std::string& particleEffect = "");
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5a366ad9e0..c541c6003a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -27,6 +27,7 @@
 #include <components/esm4/loadcell.hpp>
 #include <components/esm4/loaddoor.hpp>
 #include <components/esm4/loadstat.hpp>
+#include <components/esm4/loadwrld.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/convert.hpp>
@@ -60,6 +61,7 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
@@ -88,6 +90,8 @@
 #include "../mwphysics/object.hpp"
 #include "../mwphysics/physicssystem.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "actionteleport.hpp"
 #include "cellstore.hpp"
 #include "containerstore.hpp"
@@ -237,7 +241,6 @@ namespace MWWorld
     {
         if (mSky && (isCellExterior() || isCellQuasiExterior()))
         {
-            updateSkyDate();
             mRendering->setSkyEnabled(true);
         }
         else
@@ -273,8 +276,6 @@ namespace MWWorld
         const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
     {
         mContentFiles = contentFiles;
-        if (encoder)
-            mReaders.setStatelessEncoder(encoder->getStatelessEncoder());
         mESMVersions.resize(mContentFiles.size(), -1);
 
         loadContentFiles(fileCollections, contentFiles, encoder, listener);
@@ -294,7 +295,7 @@ namespace MWWorld
     {
         mPhysics = std::make_unique<MWPhysics::PhysicsSystem>(mResourceSystem, rootNode);
 
-        if (Settings::Manager::getBool("enable", "Navigator"))
+        if (Settings::navigator().mEnable)
         {
             auto navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
             navigatorSettings.mRecast.mSwimHeightScale = mSwimHeightScale;
@@ -351,6 +352,8 @@ namespace MWWorld
         else
             mGlobalVariables[Globals::sCharGenState].setInteger(-1);
 
+        MWBase::Environment::get().getLuaManager()->newGameStarted();
+
         if (bypass && !mStartCell.empty())
         {
             ESM::Position pos;
@@ -391,7 +394,11 @@ namespace MWWorld
         {
             std::string_view video = Fallback::Map::getString("Movies_New_Game");
             if (!video.empty())
+            {
+                // Make sure that we do not continue to play a Title music after a new game video.
+                MWBase::Environment::get().getSoundManager()->stopMusic();
                 MWBase::Environment::get().getWindowManager()->playVideo(video, true);
+            }
         }
 
         // enable collision
@@ -420,8 +427,6 @@ namespace MWWorld
         if (mPlayer)
         {
             mPlayer->clear();
-            mPlayer->setCell(nullptr);
-            mPlayer->getPlayer().getRefData() = RefData();
             mPlayer->set(mStore.get<ESM::NPC>().find(ESM::RefId::stringRefId("Player")));
         }
 
@@ -432,6 +437,7 @@ namespace MWWorld
         mLevitationEnabled = true;
         mPlayerTraveling = false;
         mPlayerInJail = false;
+        mIdsRebuilt = false;
 
         fillGlobalVariables();
     }
@@ -469,8 +475,8 @@ namespace MWWorld
 
         mStore.write(writer, progress); // dynamic Store must be written (and read) before Cells, so that
                                         // references to custom made records will be recognized
+        mWorldModel.write(writer, progress); // the player's cell needs to be loaded before the player
         mPlayer->write(writer, progress);
-        mWorldModel.write(writer, progress);
         mGlobalVariables.write(writer, progress);
         mWeatherManager->write(writer, progress);
         mProjectileManager->write(writer, progress);
@@ -503,11 +509,11 @@ namespace MWWorld
             }
             break;
             case ESM::REC_PLAY:
-                // World::write always puts `ESM::REC_PLAY` between ESMStore (that contains dynamic records)
-                // and WorldModel (that can contain instances of dynamic records). Here we need to rebuild
-                // ESMStore index in order to be able to lookup dynamic records while loading the player and
-                // WorldModel.
-                mStore.rebuildIdsIndex();
+                if (reader.getFormatVersion() <= ESM::MaxPlayerBeforeCellDataFormatVersion && !mIdsRebuilt)
+                {
+                    mStore.rebuildIdsIndex();
+                    mIdsRebuilt = true;
+                }
 
                 mStore.checkPlayer();
                 mPlayer->readRecord(reader, type);
@@ -516,13 +522,22 @@ namespace MWWorld
                     if (getPlayerPtr().getCell()->isExterior())
                         mWorldScene->preloadTerrain(getPlayerPtr().getRefData().getPosition().asVec3(),
                             getPlayerPtr().getCell()->getCell()->getWorldSpace());
-                    mWorldScene->preloadCell(*getPlayerPtr().getCell(), true);
+                    mWorldScene->preloadCellWithSurroundings(*getPlayerPtr().getCell());
                 }
                 break;
+            case ESM::REC_CSTA:
+                // We need to rebuild the ESMStore index in order to be able to lookup dynamic records while loading the
+                // WorldModel and, afterwards, the player.
+                if (!mIdsRebuilt)
+                {
+                    mStore.rebuildIdsIndex();
+                    mIdsRebuilt = true;
+                }
+                mWorldModel.readRecord(reader, type);
+                break;
             default:
                 if (!mStore.readRecord(reader, type) && !mGlobalVariables.readRecord(reader, type)
-                    && !mWeatherManager->readRecord(reader, type) && !mWorldModel.readRecord(reader, type)
-                    && !mProjectileManager->readRecord(reader, type))
+                    && !mWeatherManager->readRecord(reader, type) && !mProjectileManager->readRecord(reader, type))
                 {
                     throw std::runtime_error("unknown record in saved game");
                 }
@@ -586,6 +601,12 @@ namespace MWWorld
         // Must be cleared before mRendering is destroyed
         if (mProjectileManager)
             mProjectileManager->clear();
+
+        if (Settings::navigator().mWaitForAllJobsOnExit)
+        {
+            Log(Debug::Verbose) << "Waiting for all navmesh jobs to be done...";
+            mNavigator->wait(DetourNavigator::WaitConditionType::allJobsDone, nullptr);
+        }
     }
 
     void World::setRandomSeed(uint32_t seed)
@@ -615,19 +636,13 @@ namespace MWWorld
 
     void World::setGlobalInt(GlobalVariableName name, int value)
     {
-        bool dateUpdated = mTimeManager->updateGlobalInt(name, value);
-        if (dateUpdated)
-            updateSkyDate();
-
+        mTimeManager->updateGlobalInt(name, value);
         mGlobalVariables[name].setInteger(value);
     }
 
     void World::setGlobalFloat(GlobalVariableName name, float value)
     {
-        bool dateUpdated = mTimeManager->updateGlobalFloat(name, value);
-        if (dateUpdated)
-            updateSkyDate();
-
+        mTimeManager->updateGlobalFloat(name, value);
         mGlobalVariables[name].setFloat(value);
     }
 
@@ -655,32 +670,36 @@ namespace MWWorld
 
     std::string_view World::getCellName(const MWWorld::Cell& cell) const
     {
-        if (!cell.isExterior() || !cell.getNameId().empty())
-            return cell.getNameId();
+        if (!cell.isExterior() || !cell.getDisplayName().empty())
+            return cell.getDisplayName();
 
-        return ESM::visit(ESM::VisitOverload{
-                              [&](const ESM::Cell& cellIn) -> std::string_view { return getCellName(&cellIn); },
-                              [&](const ESM4::Cell& cellIn) -> std::string_view {
-                                  return mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString();
-                              },
-                          },
-            cell);
-    }
-
-    std::string_view World::getCellName(const ESM::Cell* cell) const
-    {
-        if (cell)
+        if (!cell.getRegion().empty())
         {
-            if (!cell->isExterior() || !cell->mName.empty())
-                return cell->mName;
-
-            if (const ESM::Region* region = mStore.get<ESM::Region>().search(cell->mRegion))
-                return region->mName;
+            std::string_view regionName
+                = ESM::visit(ESM::VisitOverload{
+                                 [&](const ESM::Cell& cellIn) -> std::string_view {
+                                     if (const ESM::Region* region = mStore.get<ESM::Region>().search(cell.getRegion()))
+                                         return !region->mName.empty() ? region->mName : region->mId.getRefIdString();
+                                     return {};
+                                 },
+                                 [&](const ESM4::Cell& cellIn) -> std::string_view { return {}; },
+                             },
+                    cell);
+            if (!regionName.empty())
+                return regionName;
         }
+
+        if (!cell.getWorldSpace().empty() && ESM::isEsm4Ext(cell.getWorldSpace()))
+        {
+            if (const ESM4::World* worldspace = mStore.get<ESM4::World>().search(cell.getWorldSpace()))
+                if (!worldspace->mFullName.empty())
+                    return worldspace->mFullName;
+        }
+
         return mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString();
     }
 
-    void World::removeRefScript(MWWorld::RefData* ref)
+    void World::removeRefScript(const MWWorld::CellRef* ref)
     {
         mLocalScripts.remove(ref);
     }
@@ -822,7 +841,7 @@ namespace MWWorld
             reference.getRefData().enable();
 
             if (mWorldScene->getActiveCells().find(reference.getCell()) != mWorldScene->getActiveCells().end()
-                && reference.getRefData().getCount())
+                && reference.getCellRef().getCount())
                 mWorldScene->addObjectToScene(reference);
 
             if (reference.getCellRef().getRefNum().hasContentFile())
@@ -874,7 +893,7 @@ namespace MWWorld
         }
 
         if (mWorldScene->getActiveCells().find(reference.getCell()) != mWorldScene->getActiveCells().end()
-            && reference.getRefData().getCount())
+            && reference.getCellRef().getCount())
         {
             mWorldScene->removeObjectFromScene(reference);
             mWorldScene->addPostponedPhysicsObjects();
@@ -897,7 +916,6 @@ namespace MWWorld
 
         mWeatherManager->advanceTime(hours, incremental);
         mTimeManager->advanceTime(hours, mGlobalVariables);
-        updateSkyDate();
 
         if (!incremental)
         {
@@ -992,6 +1010,9 @@ namespace MWWorld
     {
         MWWorld::Ptr facedObject;
 
+        if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame)
+            return facedObject;
+
         if (MWBase::Environment::get().getWindowManager()->isGuiMode()
             && MWBase::Environment::get().getWindowManager()->isConsoleMode())
             facedObject = getFacedObject(getMaxActivationDistance() * 50, false);
@@ -1032,52 +1053,14 @@ namespace MWWorld
         return osg::Matrixf::translate(actor.getRefData().getPosition().asVec3());
     }
 
-    std::pair<MWWorld::Ptr, osg::Vec3f> World::getHitContact(
-        const MWWorld::ConstPtr& ptr, float distance, std::vector<MWWorld::Ptr>& targets)
-    {
-        const ESM::Position& posdata = ptr.getRefData().getPosition();
-
-        osg::Quat rot
-            = osg::Quat(posdata.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(posdata.rot[2], osg::Vec3f(0, 0, -1));
-
-        osg::Vec3f halfExtents = mPhysics->getHalfExtents(ptr);
-
-        // the origin of hitbox is an actor's front, not center
-        distance += halfExtents.y();
-
-        // special cased for better aiming with the camera
-        // if we do not hit anything, will use the default approach as fallback
-        if (ptr == getPlayerPtr())
-        {
-            osg::Vec3f pos = getActorHeadTransform(ptr).getTrans();
-
-            std::pair<MWWorld::Ptr, osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance, targets);
-            if (!result.first.isEmpty())
-                return std::make_pair(result.first, result.second);
-        }
-
-        osg::Vec3f pos = ptr.getRefData().getPosition().asVec3();
-
-        // general case, compatible with all types of different creatures
-        // note: we intentionally do *not* use the collision box offset here, this is required to make
-        // some flying creatures work that have their collision box offset in the air
-        pos.z() += halfExtents.z();
-
-        std::pair<MWWorld::Ptr, osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance, targets);
-        if (result.first.isEmpty())
-            return std::make_pair(MWWorld::Ptr(), osg::Vec3f());
-
-        return std::make_pair(result.first, result.second);
-    }
-
     void World::deleteObject(const Ptr& ptr)
     {
-        if (!ptr.getRefData().isDeleted() && ptr.getContainerStore() == nullptr)
+        if (!ptr.mRef->isDeleted() && ptr.getContainerStore() == nullptr)
         {
             if (ptr == getPlayerPtr())
                 throw std::runtime_error("can not delete player object");
 
-            ptr.getRefData().setCount(0);
+            ptr.getCellRef().setCount(0);
 
             if (ptr.isInCell()
                 && mWorldScene->getActiveCells().find(ptr.getCell()) != mWorldScene->getActiveCells().end()
@@ -1094,9 +1077,9 @@ namespace MWWorld
     {
         if (!ptr.getCellRef().hasContentFile())
             return;
-        if (ptr.getRefData().isDeleted())
+        if (ptr.mRef->isDeleted())
         {
-            ptr.getRefData().setCount(1);
+            ptr.getCellRef().setCount(1);
             if (mWorldScene->getActiveCells().find(ptr.getCell()) != mWorldScene->getActiveCells().end()
                 && ptr.getRefData().isEnabled())
             {
@@ -1425,7 +1408,7 @@ namespace MWWorld
 
     MWWorld::Ptr World::placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos)
     {
-        return copyObjectToCell(ptr, cell, pos, ptr.getRefData().getCount(), false);
+        return copyObjectToCell(ptr, cell, pos, ptr.getCellRef().getCount(), false);
     }
 
     MWWorld::Ptr World::safePlaceObject(const ConstPtr& ptr, const ConstPtr& referenceObject,
@@ -1476,7 +1459,7 @@ namespace MWWorld
             ipos.rot[1] = 0;
         }
 
-        MWWorld::Ptr placed = copyObjectToCell(ptr, referenceCell, ipos, ptr.getRefData().getCount(), false);
+        MWWorld::Ptr placed = copyObjectToCell(ptr, referenceCell, ipos, ptr.getCellRef().getCount(), false);
         adjustPosition(placed, true); // snap to ground
         return placed;
     }
@@ -1769,22 +1752,27 @@ namespace MWWorld
 
     void World::updateSoundListener()
     {
-        osg::Vec3f cameraPosition = mRendering->getCamera()->getPosition();
-        const ESM::Position& refpos = getPlayerPtr().getRefData().getPosition();
-        osg::Vec3f listenerPos;
+        const MWRender::Camera* camera = mRendering->getCamera();
+        const auto& player = getPlayerPtr();
+        const ESM::Position& refpos = player.getRefData().getPosition();
+        osg::Vec3f listenerPos, up, forward;
+        osg::Quat listenerOrient;
 
-        if (isFirstPerson())
-            listenerPos = cameraPosition;
+        if (isFirstPerson() || Settings::sound().mCameraListener)
+            listenerPos = camera->getPosition();
         else
-            listenerPos = refpos.asVec3() + osg::Vec3f(0, 0, 1.85f * mPhysics->getHalfExtents(getPlayerPtr()).z());
+            listenerPos = refpos.asVec3() + osg::Vec3f(0, 0, 1.85f * mPhysics->getHalfExtents(player).z());
 
-        osg::Quat listenerOrient = osg::Quat(refpos.rot[1], osg::Vec3f(0, -1, 0))
-            * osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1));
+        if (isFirstPerson() || Settings::sound().mCameraListener)
+            listenerOrient = camera->getOrient();
+        else
+            listenerOrient = osg::Quat(refpos.rot[1], osg::Vec3f(0, -1, 0))
+                * osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1));
 
-        osg::Vec3f forward = listenerOrient * osg::Vec3f(0, 1, 0);
-        osg::Vec3f up = listenerOrient * osg::Vec3f(0, 0, 1);
+        forward = listenerOrient * osg::Vec3f(0, 1, 0);
+        up = listenerOrient * osg::Vec3f(0, 0, 1);
 
-        bool underwater = isUnderwater(getPlayerPtr().getCell(), cameraPosition);
+        bool underwater = isUnderwater(player.getCell(), camera->getPosition());
 
         MWBase::Environment::get().getSoundManager()->setListenerPosDir(listenerPos, forward, up, underwater);
     }
@@ -1847,9 +1835,10 @@ namespace MWWorld
     }
 
     bool World::castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
-        bool ignorePlayer, bool ignoreActors)
+        bool ignorePlayer, bool ignoreActors, std::span<const MWWorld::Ptr> ignoreList)
     {
-        MWRender::RenderingManager::RayResult rayRes = mRendering->castRay(from, to, ignorePlayer, ignoreActors);
+        MWRender::RenderingManager::RayResult rayRes
+            = mRendering->castRay(from, to, ignorePlayer, ignoreActors, ignoreList);
         res.mHit = rayRes.mHit;
         res.mHitPos = rayRes.mHitPointWorld;
         res.mHitNormal = rayRes.mHitNormalWorld;
@@ -1912,7 +1901,7 @@ namespace MWWorld
         mWeatherManager->changeWeather(region, id);
     }
 
-    void World::modRegion(const ESM::RefId& regionid, const std::vector<char>& chances)
+    void World::modRegion(const ESM::RefId& regionid, const std::vector<uint8_t>& chances)
     {
         mWeatherManager->modRegion(regionid, chances);
     }
@@ -1925,7 +1914,7 @@ namespace MWWorld
         {
             MWWorld::LiveCellRef<ESM::Door>& ref = *static_cast<MWWorld::LiveCellRef<ESM::Door>*>(ptr.getBase());
 
-            if (!ref.mData.isEnabled() || ref.mData.isDeleted())
+            if (!ref.mData.isEnabled() || ref.isDeleted())
                 return true;
 
             if (ref.mRef.getTeleport())
@@ -2336,7 +2325,7 @@ namespace MWWorld
         MWBase::Environment::get().getWindowManager()->watchActor(getPlayerPtr());
 
         mPhysics->remove(getPlayerPtr());
-        mPhysics->addActor(getPlayerPtr(), getPlayerPtr().getClass().getModel(getPlayerPtr()));
+        mPhysics->addActor(getPlayerPtr(), getPlayerPtr().getClass().getCorrectedModel(getPlayerPtr()));
 
         applyLoopingParticles(player);
 
@@ -2398,11 +2387,6 @@ namespace MWWorld
         mRendering->screenshot(image, w, h);
     }
 
-    bool World::screenshot360(osg::Image* image)
-    {
-        return mRendering->screenshot360(image);
-    }
-
     void World::activateDoor(const MWWorld::Ptr& door)
     {
         auto state = door.getClass().getDoorState(door);
@@ -2457,15 +2441,12 @@ namespace MWWorld
 
     bool World::getPlayerCollidingWith(const MWWorld::ConstPtr& object)
     {
-        MWWorld::Ptr player = getPlayerPtr();
-        return mPhysics->isActorCollidingWith(player, object);
+        return mPhysics->isObjectCollidingWith(object, MWPhysics::ScriptedCollisionType_Player);
     }
 
     bool World::getActorCollidingWith(const MWWorld::ConstPtr& object)
     {
-        std::vector<MWWorld::Ptr> actors;
-        mPhysics->getActorsCollidingWith(object, actors);
-        return !actors.empty();
+        return mPhysics->isObjectCollidingWith(object, MWPhysics::ScriptedCollisionType_Actor);
     }
 
     void World::hurtStandingActors(const ConstPtr& object, float healthPerSecond)
@@ -2573,7 +2554,7 @@ namespace MWWorld
 
         bool operator()(const MWWorld::Ptr& ptr)
         {
-            if (ptr.getRefData().isDeleted())
+            if (ptr.mRef->isDeleted())
                 return true;
 
             // vanilla Morrowind does not allow to sell items from containers with zero capacity
@@ -2631,7 +2612,7 @@ namespace MWWorld
             collisionTypes |= MWPhysics::CollisionType_Water;
         }
         MWPhysics::RayCastingResult result
-            = mPhysics->castRay(from, to, MWWorld::Ptr(), std::vector<MWWorld::Ptr>(), collisionTypes);
+            = mPhysics->castRay(from, to, { MWWorld::Ptr() }, std::vector<MWWorld::Ptr>(), collisionTypes);
 
         if (!result.mHit)
             return maxDist;
@@ -2693,7 +2674,11 @@ namespace MWWorld
             for (const MWWorld::LiveCellRef<ESM::Door>& destDoor : source.getReadOnlyDoors().mList)
             {
                 if (cellId == destDoor.mRef.getDestCell())
-                    return destDoor.mRef.getDoorDest();
+                {
+                    ESM::Position doorDest = destDoor.mRef.getDoorDest();
+                    doorDest.rot[0] = doorDest.rot[1] = doorDest.rot[2] = 0;
+                    return doorDest;
+                }
             }
             for (const MWWorld::LiveCellRef<ESM4::Door>& destDoor : source.getReadOnlyEsm4Doors().mList)
             {
@@ -2795,7 +2780,7 @@ namespace MWWorld
 
         int x = ext->getGridX();
         int y = ext->getGridY();
-        osg::Vec2 posFromIndex = indexToPosition(ESM::ExteriorCellLocation(x, y, ext->getWorldSpace()), true);
+        const osg::Vec2f posFromIndex = indexToPosition(ESM::ExteriorCellLocation(x, y, ext->getWorldSpace()), true);
         pos.pos[0] = posFromIndex.x();
         pos.pos[1] = posFromIndex.y();
 
@@ -2959,96 +2944,82 @@ namespace MWWorld
         return result;
     }
 
-    void World::castSpell(const Ptr& actor, bool manualSpell)
+    void World::castSpell(const Ptr& actor, bool scriptedSpell)
     {
         MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
-        // result.
-        std::vector<MWWorld::Ptr> targetActors;
-        if (!actor.isEmpty() && actor != MWMechanics::getPlayer() && !manualSpell)
-            stats.getAiSequence().getCombatTargets(targetActors);
-
-        const float fCombatDistance = mStore.get<ESM::GameSetting>().find("fCombatDistance")->mValue.getFloat();
-
-        osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3();
-
-        // for player we can take faced object first
+        const bool casterIsPlayer = actor == MWMechanics::getPlayer();
         MWWorld::Ptr target;
-        if (actor == MWMechanics::getPlayer())
-            target = getFacedObject();
-
-        // if the faced object can not be activated, do not use it
-        if (!target.isEmpty() && !target.getClass().hasToolTip(target))
-            target = nullptr;
-
-        if (target.isEmpty())
+        // For scripted spells we should not use hit contact
+        if (scriptedSpell)
         {
-            // For scripted spells we should not use hit contact
-            if (manualSpell)
+            if (!casterIsPlayer)
             {
-                if (actor != MWMechanics::getPlayer())
+                for (const auto& package : stats.getAiSequence())
                 {
-                    for (const auto& package : stats.getAiSequence())
+                    if (package->getTypeId() == MWMechanics::AiPackageTypeId::Cast)
                     {
-                        if (package->getTypeId() == MWMechanics::AiPackageTypeId::Cast)
-                        {
-                            target = package->getTarget();
-                            break;
-                        }
+                        target = package->getTarget();
+                        break;
                     }
                 }
             }
-            else
+        }
+        else
+        {
+            if (casterIsPlayer)
+                target = getFacedObject();
+
+            if (target.isEmpty() || !target.getClass().hasToolTip(target))
             {
-                // For actor targets, we want to use hit contact with bounding boxes.
+                // For actor targets, we want to use melee hit contact.
                 // This is to give a slight tolerance for errors, especially with creatures like the Skeleton that would
-                // be very hard to aim at otherwise. For object targets, we want the detailed shapes (rendering
-                // raycast). If we used the bounding boxes for static objects, then we would not be able to target e.g.
+                // be very hard to aim at otherwise.
+                // For object targets, we want the detailed shapes (rendering raycast).
+                // If we used the bounding boxes for static objects, then we would not be able to target e.g.
                 // objects lying on a shelf.
-                std::pair<MWWorld::Ptr, osg::Vec3f> result1 = getHitContact(actor, fCombatDistance, targetActors);
+                const float fCombatDistance = mStore.get<ESM::GameSetting>().find("fCombatDistance")->mValue.getFloat();
+                target = MWMechanics::getHitContact(actor, fCombatDistance).first;
 
-                // Get the target to use for "on touch" effects, using the facing direction from Head node
-                osg::Vec3f origin = getActorHeadTransform(actor).getTrans();
-
-                osg::Quat orient = osg::Quat(actor.getRefData().getPosition().rot[0], osg::Vec3f(-1, 0, 0))
-                    * osg::Quat(actor.getRefData().getPosition().rot[2], osg::Vec3f(0, 0, -1));
-
-                osg::Vec3f direction = orient * osg::Vec3f(0, 1, 0);
-                float distance = getMaxActivationDistance();
-                osg::Vec3f dest = origin + direction * distance;
-
-                MWRender::RenderingManager::RayResult result2 = mRendering->castRay(origin, dest, true, true);
-
-                float dist1 = std::numeric_limits<float>::max();
-                float dist2 = std::numeric_limits<float>::max();
-
-                if (!result1.first.isEmpty() && result1.first.getClass().isActor())
-                    dist1 = (origin - result1.second).length();
-                if (result2.mHit)
-                    dist2 = (origin - result2.mHitPointWorld).length();
-
-                if (!result1.first.isEmpty() && result1.first.getClass().isActor())
+                if (target.isEmpty())
                 {
-                    target = result1.first;
-                    hitPosition = result1.second;
-                    if (dist1 > getMaxActivationDistance())
-                        target = nullptr;
-                }
-                else if (result2.mHit)
-                {
-                    target = result2.mHitObject;
-                    hitPosition = result2.mHitPointWorld;
-                    if (dist2 > getMaxActivationDistance() && !target.isEmpty()
-                        && !target.getClass().hasToolTip(target))
-                        target = nullptr;
+                    // Get the target using the facing direction from Head node
+                    const osg::Vec3f origin = getActorHeadTransform(actor).getTrans();
+                    const osg::Quat orient = osg::Quat(actor.getRefData().getPosition().rot[0], osg::Vec3f(-1, 0, 0))
+                        * osg::Quat(actor.getRefData().getPosition().rot[2], osg::Vec3f(0, 0, -1));
+                    const osg::Vec3f direction = orient * osg::Vec3f(0, 1, 0);
+                    const osg::Vec3f dest = origin + direction * getMaxActivationDistance();
+                    const MWRender::RenderingManager::RayResult result = mRendering->castRay(origin, dest, true, true);
+                    if (result.mHit)
+                        target = result.mHitObject;
                 }
             }
         }
 
+        osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3();
+        if (!target.isEmpty())
+        {
+            // Touch explosion placement doesn't depend on where the target was "touched".
+            // In Morrowind, it's at 0.7 of the actor's AABB height for actors
+            // or at 0.7 of the player's height for non-actors if the player is the caster
+            // This is probably meant to prevent the explosion from being too far above on large objects
+            // but it often puts the explosions way above small objects, so we'll deviate here
+            // and use the object's bounds when reasonable (it's $CURRENT_YEAR, we can afford that)
+            // Note collision object origin is intentionally not used
+            hitPosition = target.getRefData().getPosition().asVec3();
+            constexpr float explosionHeight = 0.7f;
+            float targetHeight = getHalfExtents(target).z() * 2.f;
+            if (!target.getClass().isActor() && casterIsPlayer)
+            {
+                const float playerHeight = getHalfExtents(actor).z() * 2.f;
+                targetHeight = std::min(targetHeight, playerHeight);
+            }
+            hitPosition.z() += targetHeight * explosionHeight;
+        }
+
         const ESM::RefId& selectedSpell = stats.getSpells().getSelectedSpell();
 
-        MWMechanics::CastSpell cast(actor, target, false, manualSpell);
+        MWMechanics::CastSpell cast(actor, target, false, scriptedSpell);
         cast.mHitPosition = hitPosition;
 
         if (!selectedSpell.empty())
@@ -3093,8 +3064,8 @@ namespace MWWorld
             actor.getClass().getCreatureStats(actor).getAiSequence().getCombatTargets(targetActors);
 
         // Check for impact, if yes, handle hit, if not, launch projectile
-        MWPhysics::RayCastingResult result
-            = mPhysics->castRay(sourcePos, worldPos, actor, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
+        MWPhysics::RayCastingResult result = mPhysics->castRay(
+            sourcePos, worldPos, { actor }, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
         if (result.mHit)
             MWMechanics::projectileHit(actor, result.mHitObject, bow, projectile, result.mHitPos, attackStrength);
         else
@@ -3280,22 +3251,71 @@ namespace MWWorld
 
     MWWorld::ConstPtr World::getClosestMarkerFromExteriorPosition(const osg::Vec3f& worldPos, const ESM::RefId& id)
     {
-        MWWorld::ConstPtr closestMarker;
-        float closestDistance = std::numeric_limits<float>::max();
+        const ESM::ExteriorCellLocation posIndex = ESM::positionToExteriorCellLocation(worldPos.x(), worldPos.y());
 
-        std::vector<MWWorld::Ptr> markers;
+        // Potential optimization: don't scan the entire world for markers and actually do the Todd spiral
+        std::vector<Ptr> markers;
         mWorldModel.getExteriorPtrs(id, markers);
+
+        struct MarkerInfo
+        {
+            Ptr mPtr;
+            int mColumn, mRow; // Local coordinates in the valid marker grid
+        };
+        std::vector<MarkerInfo> validMarkers;
+        validMarkers.reserve(markers.size());
+
+        // The idea is to collect all markers that belong to the smallest possible square grid around worldPos
+        // They are grouped with their position on that grid's edge where the origin is the SW corner
+        int minGridSize = std::numeric_limits<int>::max();
         for (const Ptr& marker : markers)
         {
-            osg::Vec3f markerPos = marker.getRefData().getPosition().asVec3();
-            float distance = (worldPos - markerPos).length2();
-            if (distance < closestDistance)
+            const osg::Vec3f markerPos = marker.getRefData().getPosition().asVec3();
+            const ESM::ExteriorCellLocation index = ESM::positionToExteriorCellLocation(markerPos.x(), markerPos.y());
+
+            const int deltaX = index.mX - posIndex.mX;
+            const int deltaY = index.mY - posIndex.mY;
+            const int gridSize = std::max(std::abs(deltaX), std::abs(deltaY)) * 2;
+            if (gridSize == 0)
+                return marker;
+
+            if (gridSize <= minGridSize)
             {
-                closestDistance = distance;
-                closestMarker = marker;
+                if (gridSize < minGridSize)
+                {
+                    validMarkers.clear();
+                    minGridSize = gridSize;
+                }
+                validMarkers.push_back({ marker, gridSize / 2 + deltaX, gridSize / 2 + deltaY });
             }
         }
 
+        ConstPtr closestMarker;
+        if (validMarkers.empty())
+            return closestMarker;
+        if (validMarkers.size() == 1)
+            return validMarkers[0].mPtr;
+
+        // All the markers are on the edge of the grid
+        // Break ties by picking the earliest marker on SW -> SE -> NE -> NW -> SW path
+        int earliestDistance = std::numeric_limits<int>::max();
+        for (const MarkerInfo& marker : validMarkers)
+        {
+            int distance = 0;
+            if (marker.mRow == 0) // South edge (plus SW and SE corners)
+                distance = marker.mColumn;
+            else if (marker.mColumn == minGridSize) // East edge and NE corner
+                distance = minGridSize + marker.mRow;
+            else if (marker.mRow == minGridSize) // North edge and NW corner
+                distance = minGridSize * 3 - marker.mColumn;
+            else // West edge
+                distance = minGridSize * 4 - marker.mRow;
+            if (distance < earliestDistance)
+            {
+                closestMarker = marker.mPtr;
+                earliestDistance = distance;
+            }
+        }
         return closestMarker;
     }
 
@@ -3365,7 +3385,7 @@ namespace MWWorld
                 >= mSquaredDist)
                 return true;
 
-            if (!ptr.getRefData().isEnabled() || ptr.getRefData().isDeleted())
+            if (!ptr.getRefData().isEnabled() || ptr.mRef->isDeleted())
                 return true;
 
             // Consider references inside containers as well (except if we are looking for a Creature, they cannot be in
@@ -3389,9 +3409,10 @@ namespace MWWorld
                                     return true;
                                 }
                             }
-                            catch (const std::exception&)
+                            catch (const std::exception& e)
                             {
-                                // Ignore invalid item id
+                                Log(Debug::Warning)
+                                    << "Failed to process container item " << containerItem.mItem << ": " << e.what();
                             }
                         }
                     }
@@ -3660,15 +3681,16 @@ namespace MWWorld
         if (texture.empty())
             texture = Fallback::Map::getString("Blood_Texture_0");
 
-        std::string model = Misc::ResourceHelpers::correctMeshPath(
-            std::string{ Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3))) }, // [0, 2]
-            mResourceSystem->getVFS());
+        // [0, 2]
+        const int number = Misc::Rng::rollDice(3);
+        const VFS::Path::Normalized model = Misc::ResourceHelpers::correctMeshPath(
+            VFS::Path::Normalized(Fallback::Map::getString("Blood_Model_" + std::to_string(number))));
 
         mRendering->spawnEffect(model, texture, worldPosition, 1.0f, false);
     }
 
-    void World::spawnEffect(const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos,
-        float scale, bool isMagicVFX)
+    void World::spawnEffect(VFS::Path::NormalizedView model, const std::string& textureOverride,
+        const osg::Vec3f& worldPos, float scale, bool isMagicVFX)
     {
         mRendering->spawnEffect(model, textureOverride, worldPos, scale, isMagicVFX);
     }
@@ -3719,49 +3741,44 @@ namespace MWWorld
         return (targetPos - weaponPos);
     }
 
-    float World::getHitDistance(const ConstPtr& actor, const ConstPtr& target)
+    namespace
     {
-        osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
-        osg::Vec3f halfExtents = mPhysics->getHalfExtents(actor);
-        weaponPos.z() += halfExtents.z();
-
-        return mPhysics->getHitDistance(weaponPos, target) - halfExtents.y();
-    }
-
-    void preload(MWWorld::Scene* scene, const ESMStore& store, const ESM::RefId& obj)
-    {
-        if (obj.empty())
-            return;
-        try
-        {
-            MWWorld::ManualRef ref(store, obj);
-            std::string model = ref.getPtr().getClass().getModel(ref.getPtr());
-            if (!model.empty())
-                scene->preload(model, ref.getPtr().getClass().useAnim());
-        }
-        catch (std::exception&)
+        void preload(MWWorld::Scene* scene, const ESMStore& store, const ESM::RefId& obj)
         {
+            if (obj.empty())
+                return;
+            try
+            {
+                MWWorld::ManualRef ref(store, obj);
+                std::string model = ref.getPtr().getClass().getCorrectedModel(ref.getPtr());
+                if (!model.empty())
+                    scene->preload(model, ref.getPtr().getClass().useAnim());
+            }
+            catch (const std::exception& e)
+            {
+                Log(Debug::Warning) << "Failed to preload scene object " << obj << ": " << e.what();
+            }
         }
     }
 
     void World::preloadEffects(const ESM::EffectList* effectList)
     {
-        for (const ESM::ENAMstruct& effectInfo : effectList->mList)
+        for (const ESM::IndexedENAMstruct& effectInfo : effectList->mList)
         {
-            const ESM::MagicEffect* effect = mStore.get<ESM::MagicEffect>().find(effectInfo.mEffectID);
+            const ESM::MagicEffect* effect = mStore.get<ESM::MagicEffect>().find(effectInfo.mData.mEffectID);
 
-            if (MWMechanics::isSummoningEffect(effectInfo.mEffectID))
+            if (MWMechanics::isSummoningEffect(effectInfo.mData.mEffectID))
             {
                 preload(mWorldScene.get(), mStore, ESM::RefId::stringRefId("VFX_Summon_Start"));
-                preload(mWorldScene.get(), mStore, MWMechanics::getSummonedCreature(effectInfo.mEffectID));
+                preload(mWorldScene.get(), mStore, MWMechanics::getSummonedCreature(effectInfo.mData.mEffectID));
             }
 
             preload(mWorldScene.get(), mStore, effect->mCasting);
             preload(mWorldScene.get(), mStore, effect->mHit);
 
-            if (effectInfo.mArea > 0)
+            if (effectInfo.mData.mArea > 0)
                 preload(mWorldScene.get(), mStore, effect->mArea);
-            if (effectInfo.mRange == ESM::RT_Target)
+            if (effectInfo.mData.mRange == ESM::RT_Target)
                 preload(mWorldScene.get(), mStore, effect->mBolt);
         }
     }
@@ -3829,12 +3846,7 @@ namespace MWWorld
     {
         DetourNavigator::reportStats(mNavigator->getStats(), frameNumber, stats);
         mPhysics->reportStats(frameNumber, stats);
-    }
-
-    void World::updateSkyDate()
-    {
-        ESM::EpochTimeStamp currentDate = mTimeManager->getEpochTimeStamp();
-        mRendering->skySetDate(currentDate.mDay, currentDate.mMonth);
+        mWorldScene->reportStats(frameNumber, stats);
     }
 
     std::vector<MWWorld::Ptr> World::getAll(const ESM::RefId& id)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 64bc3666de..0da5a7f1f7 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -7,6 +7,7 @@
 #include <components/esm3/readerscache.hpp>
 #include <components/misc/rng.hpp>
 #include <components/settings/settings.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include "../mwbase/world.hpp"
 
@@ -134,10 +135,11 @@ namespace MWWorld
         ///< only holds doors that are currently moving. 1 = opening, 2 = closing
 
         uint32_t mRandomSeed{};
+        bool mIdsRebuilt{};
 
         // not implemented
-        World(const World&);
-        World& operator=(const World&);
+        World(const World&) = delete;
+        World& operator=(const World&) = delete;
 
         void updateWeather(float duration, bool paused = false);
 
@@ -170,8 +172,6 @@ namespace MWWorld
 
         void fillGlobalVariables();
 
-        void updateSkyDate();
-
         void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
             ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener);
 
@@ -239,6 +239,8 @@ namespace MWWorld
 
         MWWorld::ESMStore& getStore() override { return mStore; }
 
+        const MWWorld::ESMStore& getStore() const override { return mStore; }
+
         const std::vector<int>& getESMVersions() const override;
 
         LocalScripts& getLocalScripts() override;
@@ -273,9 +275,8 @@ namespace MWWorld
         /// \note If cell==0, the cell the player is currently in will be used instead to
         /// generate a name.
         std::string_view getCellName(const MWWorld::Cell& cell) const override;
-        std::string_view getCellName(const ESM::Cell* cell) const override;
 
-        void removeRefScript(MWWorld::RefData* ref) override;
+        void removeRefScript(const MWWorld::CellRef* ref) override;
         //< Remove the script attached to ref from mLocalScripts
 
         Ptr getPtr(const ESM::RefId& name, bool activeOnly) override;
@@ -329,7 +330,7 @@ namespace MWWorld
 
         void setMoonColour(bool red) override;
 
-        void modRegion(const ESM::RefId& regionid, const std::vector<char>& chances) override;
+        void modRegion(const ESM::RefId& regionid, const std::vector<uint8_t>& chances) override;
 
         void changeToInteriorCell(const std::string_view cellName, const ESM::Position& position, bool adjustPlayerPos,
             bool changeEvent = true) override;
@@ -345,12 +346,6 @@ namespace MWWorld
 
         float getDistanceToFacedObject() override;
 
-        /// Returns a pointer to the object the provided object would hit (if within the
-        /// specified distance), and the point where the hit occurs. This will attempt to
-        /// use the "Head" node as a basis.
-        std::pair<MWWorld::Ptr, osg::Vec3f> getHitContact(
-            const MWWorld::ConstPtr& ptr, float distance, std::vector<MWWorld::Ptr>& targets) override;
-
         /// @note No-op for items in containers. Use ContainerStore::removeItem instead.
         void deleteObject(const Ptr& ptr) override;
 
@@ -398,7 +393,7 @@ namespace MWWorld
         const MWPhysics::RayCastingInterface* getRayCasting() const override;
 
         bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
-            bool ignorePlayer, bool ignoreActors) override;
+            bool ignorePlayer, bool ignoreActors, std::span<const MWWorld::Ptr> ignoreList) override;
 
         void setActorCollisionMode(const Ptr& ptr, bool internal, bool external) override;
         bool isActorCollisionEnabled(const Ptr& ptr) override;
@@ -522,7 +517,6 @@ namespace MWWorld
 
         /// \todo this does not belong here
         void screenshot(osg::Image* image, int w, int h) override;
-        bool screenshot360(osg::Image* image) override;
 
         /// Find center of exterior cell above land surface
         /// \return false if exterior with given name not exists, true otherwise
@@ -608,8 +602,8 @@ namespace MWWorld
         /// Spawn a blood effect for \a ptr at \a worldPosition
         void spawnBloodEffect(const MWWorld::Ptr& ptr, const osg::Vec3f& worldPosition) override;
 
-        void spawnEffect(const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos,
-            float scale = 1.f, bool isMagicVFX = true) override;
+        void spawnEffect(VFS::Path::NormalizedView model, const std::string& textureOverride,
+            const osg::Vec3f& worldPos, float scale = 1.f, bool isMagicVFX = true) override;
 
         /// @see MWWorld::WeatherManager::isInStorm
         bool isInStorm() const override;
@@ -627,9 +621,6 @@ namespace MWWorld
         osg::Vec3f aimToTarget(
             const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat) override;
 
-        /// Return the distance between actor's weapon and target's collision box.
-        float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) override;
-
         bool isPlayerInJail() const override;
 
         void setPlayerTraveling(bool traveling) override;
diff --git a/apps/openmw/mwworld/worldmodel.cpp b/apps/openmw/mwworld/worldmodel.cpp
index a488bf0913..39ed27e96b 100644
--- a/apps/openmw/mwworld/worldmodel.cpp
+++ b/apps/openmw/mwworld/worldmodel.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <cassert>
 #include <optional>
+#include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm/defs.hpp>
@@ -53,23 +54,20 @@ namespace MWWorld
 
         const ESM::Cell* createEsmCell(ESM::ExteriorCellLocation location, ESMStore& store)
         {
-            ESM::Cell record;
+            ESM::Cell record = {};
             record.mData.mFlags = ESM::Cell::HasWater;
             record.mData.mX = location.mX;
             record.mData.mY = location.mY;
-            record.mWater = 0;
-            record.mMapColor = 0;
             record.updateId();
             return store.insert(record);
         }
 
         const ESM4::Cell* createEsm4Cell(ESM::ExteriorCellLocation location, ESMStore& store)
         {
-            ESM4::Cell record;
+            ESM4::Cell record = {};
             record.mParent = location.mWorldspace;
             record.mX = location.mX;
             record.mY = location.mY;
-            record.mCellFlags = 0;
             return store.insert(record);
         }
 
@@ -104,6 +102,24 @@ namespace MWWorld
                 return Cell(*cell);
             return std::nullopt;
         }
+
+        CellStore* getOrCreateExterior(const ESM::ExteriorCellLocation& location,
+            std::map<ESM::ExteriorCellLocation, MWWorld::CellStore*>& exteriors, ESMStore& store,
+            ESM::ReadersCache& readers, std::unordered_map<ESM::RefId, CellStore>& cells, bool triggerEvent)
+        {
+            if (const auto it = exteriors.find(location); it != exteriors.end())
+            {
+                assert(it->second != nullptr);
+                return it->second;
+            }
+            auto [cell, created] = createExteriorCell(location, store);
+            const ESM::RefId id = cell.getId();
+            CellStore* const cellStore = &emplaceCellStore(id, std::move(cell), store, readers, cells);
+            exteriors.emplace(location, cellStore);
+            if (created && triggerEvent)
+                MWBase::Environment::get().getLuaManager()->exteriorCreated(*cellStore);
+            return cellStore;
+        }
     }
 }
 
@@ -181,23 +197,7 @@ namespace MWWorld
 {
     CellStore& WorldModel::getExterior(ESM::ExteriorCellLocation location, bool forceLoad) const
     {
-        const auto it = mExteriors.find(location);
-        CellStore* cellStore = nullptr;
-
-        if (it == mExteriors.end())
-        {
-            auto [cell, created] = createExteriorCell(location, mStore);
-            const ESM::RefId id = cell.getId();
-            cellStore = &emplaceCellStore(id, std::move(cell), mStore, mReaders, mCells);
-            mExteriors.emplace(location, cellStore);
-            if (created)
-                MWBase::Environment::get().getLuaManager()->exteriorCreated(*cellStore);
-        }
-        else
-        {
-            assert(it->second != nullptr);
-            cellStore = it->second;
-        }
+        CellStore* cellStore = getOrCreateExterior(location, mExteriors, mStore, mReaders, mCells, true);
 
         if (forceLoad && cellStore->getState() != CellStore::State_Loaded)
             cellStore->load();
@@ -340,6 +340,20 @@ namespace MWWorld
             throw std::runtime_error(std::string("Can't find cell with name ") + std::string(name));
         return *result;
     }
+
+    void WorldModel::registerPtr(const Ptr& ptr)
+    {
+        if (ptr.mRef == nullptr)
+            throw std::logic_error("Ptr with nullptr mRef is not allowed to be registered");
+        mPtrRegistry.insert(ptr);
+        ptr.mRef->mWorldModel = this;
+    }
+
+    void WorldModel::deregisterLiveCellRef(LiveCellRefBase& ref) noexcept
+    {
+        mPtrRegistry.remove(ref);
+        ref.mWorldModel = nullptr;
+    }
 }
 
 MWWorld::Ptr MWWorld::WorldModel::getPtrByRefId(const ESM::RefId& name)
@@ -450,17 +464,26 @@ void MWWorld::WorldModel::write(ESM::ESMWriter& writer, Loading::Listener& progr
         }
 }
 
-struct GetCellStoreCallback : public MWWorld::CellStore::GetCellStoreCallback
+struct MWWorld::WorldModel::GetCellStoreCallback : public CellStore::GetCellStoreCallback
 {
 public:
-    GetCellStoreCallback(MWWorld::WorldModel& worldModel)
+    GetCellStoreCallback(WorldModel& worldModel)
         : mWorldModel(worldModel)
     {
     }
 
-    MWWorld::WorldModel& mWorldModel;
+    WorldModel& mWorldModel;
 
-    MWWorld::CellStore* getCellStore(const ESM::RefId& cellId) override { return mWorldModel.findCell(cellId); }
+    CellStore* getCellStore(const ESM::RefId& cellId) override
+    {
+        if (const auto* exteriorId = cellId.getIf<ESM::ESM3ExteriorCellRefId>())
+        {
+            ESM::ExteriorCellLocation location(exteriorId->getX(), exteriorId->getY(), ESM::Cell::sDefaultWorldspaceId);
+            return getOrCreateExterior(
+                location, mWorldModel.mExteriors, mWorldModel.mStore, mWorldModel.mReaders, mWorldModel.mCells, false);
+        }
+        return mWorldModel.findCell(cellId);
+    }
 };
 
 bool MWWorld::WorldModel::readRecord(ESM::ESMReader& reader, uint32_t type)
@@ -470,7 +493,10 @@ bool MWWorld::WorldModel::readRecord(ESM::ESMReader& reader, uint32_t type)
         ESM::CellState state;
         state.mId = reader.getCellId();
 
-        CellStore* const cellStore = findCell(state.mId);
+        GetCellStoreCallback callback(*this);
+
+        CellStore* const cellStore = callback.getCellStore(state.mId);
+
         if (cellStore == nullptr)
         {
             Log(Debug::Warning) << "Dropping state for cell " << state.mId << " (cell no longer exists)";
@@ -487,8 +513,6 @@ bool MWWorld::WorldModel::readRecord(ESM::ESMReader& reader, uint32_t type)
         if (cellStore->getState() != CellStore::State_Loaded)
             cellStore->load();
 
-        GetCellStoreCallback callback(*this);
-
         cellStore->readReferences(reader, &callback);
 
         return true;
diff --git a/apps/openmw/mwworld/worldmodel.hpp b/apps/openmw/mwworld/worldmodel.hpp
index 58b66e2411..e4b161d16e 100644
--- a/apps/openmw/mwworld/worldmodel.hpp
+++ b/apps/openmw/mwworld/worldmodel.hpp
@@ -7,7 +7,7 @@
 #include <string_view>
 #include <unordered_map>
 
-#include <components/esm/util.hpp>
+#include <components/esm/exteriorcelllocation.hpp>
 #include <components/misc/algorithm.hpp>
 
 #include "cellstore.hpp"
@@ -77,9 +77,11 @@ namespace MWWorld
 
         std::size_t getPtrRegistryRevision() const { return mPtrRegistry.getRevision(); }
 
-        void registerPtr(const Ptr& ptr) { mPtrRegistry.insert(ptr); }
+        void registerPtr(const Ptr& ptr);
 
-        void deregisterPtr(const Ptr& ptr) { mPtrRegistry.remove(ptr); }
+        void deregisterLiveCellRef(LiveCellRefBase& ref) noexcept;
+
+        void assignSaveFileRefNum(ESM::CellRef& ref) { mPtrRegistry.assign(ref); }
 
         template <typename Fn>
         void forEachLoadedCellStore(Fn&& fn)
@@ -102,6 +104,8 @@ namespace MWWorld
         bool readRecord(ESM::ESMReader& reader, uint32_t type);
 
     private:
+        struct GetCellStoreCallback;
+
         PtrRegistry mPtrRegistry; // defined before mCells because during destruction it should be the last
 
         MWWorld::ESMStore& mStore;
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index 1554e252d0..7dfc19d465 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -35,10 +35,6 @@ namespace OpenMW
             bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")->multitoken()->composing(),
             "set fallback BSA archives (later archives have higher priority)");
 
-        addOption("resources",
-            bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
-            "set resources directory");
-
         addOption("start", bpo::value<std::string>()->default_value(""), "set initial cell");
 
         addOption("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
@@ -68,13 +64,6 @@ namespace OpenMW
             "\t1 - show warning but consider script as correctly compiled anyway\n"
             "\t2 - treat warnings as errors");
 
-        addOption("script-blacklist",
-            bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
-            "ignore the specified script (if the use of the blacklist is enabled)");
-
-        addOption("script-blacklist-use", bpo::value<bool>()->implicit_value(true)->default_value(true),
-            "enable script blacklisting");
-
         addOption("load-savegame", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
             "load a save game file on game startup (specify an absolute filename or a filename relative to the current "
             "working directory)");
diff --git a/apps/openmw/profile.hpp b/apps/openmw/profile.hpp
index 526dfa2f00..da9128197c 100644
--- a/apps/openmw/profile.hpp
+++ b/apps/openmw/profile.hpp
@@ -29,6 +29,7 @@ namespace OMW
     {
         Input,
         Sound,
+        LuaSyncUpdate,
         State,
         Script,
         Mechanics,
@@ -36,9 +37,8 @@ namespace OMW
         PhysicsWorker,
         World,
         Gui,
-        Lua,
-        LuaSyncUpdate,
         WindowManager,
+        Lua,
         Number,
     };
 
@@ -79,7 +79,7 @@ namespace OMW
     inline const UserStats UserStatsValue<UserStatsType::Lua>::sValue{ "Lua", "lua" };
 
     template <>
-    inline const UserStats UserStatsValue<UserStatsType::LuaSyncUpdate>::sValue{ " -Sync", "luasyncupdate" };
+    inline const UserStats UserStatsValue<UserStatsType::LuaSyncUpdate>::sValue{ "LuaSync", "luasyncupdate" };
 
     template <>
     inline const UserStats UserStatsValue<UserStatsType::WindowManager>::sValue{ "WindowManager", "windowmanager" };
diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
deleted file mode 100644
index fb32022010..0000000000
--- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include <components/detournavigator/gettilespositions.hpp>
-#include <components/detournavigator/settings.hpp>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-namespace
-{
-    using namespace testing;
-    using namespace DetourNavigator;
-
-    struct CollectTilesPositions
-    {
-        std::vector<TilePosition>& mTilesPositions;
-
-        void operator()(const TilePosition& value) { mTilesPositions.push_back(value); }
-    };
-
-    struct DetourNavigatorGetTilesPositionsTest : Test
-    {
-        RecastSettings mSettings;
-        std::vector<TilePosition> mTilesPositions;
-        CollectTilesPositions mCollect{ mTilesPositions };
-
-        DetourNavigatorGetTilesPositionsTest()
-        {
-            mSettings.mBorderSize = 0;
-            mSettings.mCellSize = 0.5;
-            mSettings.mRecastScaleFactor = 1;
-            mSettings.mTileSize = 64;
-        }
-    };
-
-    TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_in_single_tile_should_return_one_tile)
-    {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(2, 2), osg::Vec2f(31, 31), mSettings), mCollect);
-
-        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
-    }
-
-    TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_x_bounds_in_two_tiles_should_return_two_tiles)
-    {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(32, 31), mSettings), mCollect);
-
-        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(1, 0)));
-    }
-
-    TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_y_bounds_in_two_tiles_should_return_two_tiles)
-    {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31, 32), mSettings), mCollect);
-
-        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(0, 1)));
-    }
-
-    TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_works_only_for_x_and_y_coordinates)
-    {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31, 31), mSettings), mCollect);
-
-        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
-    }
-
-    TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_should_work_with_negative_coordinates)
-    {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(-31, -31), osg::Vec2f(31, 31), mSettings), mCollect);
-
-        EXPECT_THAT(mTilesPositions,
-            ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(0, -1), TilePosition(0, 0)));
-    }
-
-    TEST_F(DetourNavigatorGetTilesPositionsTest, border_size_should_extend_tile_bounds)
-    {
-        mSettings.mBorderSize = 1;
-
-        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31.5, 31.5), mSettings), mCollect);
-
-        EXPECT_THAT(mTilesPositions,
-            ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(-1, 1), TilePosition(0, -1),
-                TilePosition(0, 0), TilePosition(0, 1), TilePosition(1, -1), TilePosition(1, 0), TilePosition(1, 1)));
-    }
-
-    TEST_F(DetourNavigatorGetTilesPositionsTest, should_apply_recast_scale_factor)
-    {
-        mSettings.mRecastScaleFactor = 0.5;
-
-        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(32, 32), mSettings), mCollect);
-
-        EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
-    }
-}
diff --git a/apps/openmw_test_suite/esm3/testsaveload.cpp b/apps/openmw_test_suite/esm3/testsaveload.cpp
deleted file mode 100644
index 96796defd4..0000000000
--- a/apps/openmw_test_suite/esm3/testsaveload.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-#include <components/esm/fourcc.hpp>
-#include <components/esm3/esmreader.hpp>
-#include <components/esm3/esmwriter.hpp>
-#include <components/esm3/loadcont.hpp>
-#include <components/esm3/loaddial.hpp>
-#include <components/esm3/loadregn.hpp>
-#include <components/esm3/loadscpt.hpp>
-#include <components/esm3/player.hpp>
-#include <components/esm3/quickkeys.hpp>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <algorithm>
-#include <array>
-#include <limits>
-#include <memory>
-#include <random>
-#include <type_traits>
-
-namespace ESM
-{
-    namespace
-    {
-        auto tie(const ContItem& value)
-        {
-            return std::tie(value.mCount, value.mItem);
-        }
-
-        auto tie(const ESM::Region::SoundRef& value)
-        {
-            return std::tie(value.mSound, value.mChance);
-        }
-
-        auto tie(const ESM::QuickKeys::QuickKey& value)
-        {
-            return std::tie(value.mType, value.mId);
-        }
-    }
-
-    inline bool operator==(const ESM::ContItem& lhs, const ESM::ContItem& rhs)
-    {
-        return tie(lhs) == tie(rhs);
-    }
-
-    inline std::ostream& operator<<(std::ostream& stream, const ESM::ContItem& value)
-    {
-        return stream << "ESM::ContItem {.mCount = " << value.mCount << ", .mItem = '" << value.mItem << "'}";
-    }
-
-    inline bool operator==(const ESM::Region::SoundRef& lhs, const ESM::Region::SoundRef& rhs)
-    {
-        return tie(lhs) == tie(rhs);
-    }
-
-    inline std::ostream& operator<<(std::ostream& stream, const ESM::Region::SoundRef& value)
-    {
-        return stream << "ESM::Region::SoundRef {.mSound = '" << value.mSound << "', .mChance = " << value.mChance
-                      << "}";
-    }
-
-    inline bool operator==(const ESM::QuickKeys::QuickKey& lhs, const ESM::QuickKeys::QuickKey& rhs)
-    {
-        return tie(lhs) == tie(rhs);
-    }
-
-    inline std::ostream& operator<<(std::ostream& stream, const ESM::QuickKeys::QuickKey& value)
-    {
-        return stream << "ESM::QuickKeys::QuickKey {.mType = '" << static_cast<std::uint32_t>(value.mType)
-                      << "', .mId = " << value.mId << "}";
-    }
-
-    namespace
-    {
-        using namespace ::testing;
-
-        std::vector<ESM::FormatVersion> getFormats()
-        {
-            std::vector<ESM::FormatVersion> result({
-                CurrentContentFormatVersion,
-                MaxLimitedSizeStringsFormatVersion,
-                MaxStringRefIdFormatVersion,
-            });
-            for (ESM::FormatVersion v = result.back() + 1; v <= ESM::CurrentSaveGameFormatVersion; ++v)
-                result.push_back(v);
-            return result;
-        }
-
-        constexpr std::uint32_t fakeRecordId = fourCC("FAKE");
-
-        template <class T>
-        void save(const T& record, ESMWriter& writer)
-        {
-            record.save(writer);
-        }
-
-        void save(const CellRef& record, ESMWriter& writer)
-        {
-            record.save(writer, true);
-        }
-
-        template <typename T>
-        std::unique_ptr<std::istream> makeEsmStream(const T& record, FormatVersion formatVersion)
-        {
-            ESMWriter writer;
-            auto stream = std::make_unique<std::stringstream>();
-            writer.setFormatVersion(formatVersion);
-            writer.save(*stream);
-            writer.startRecord(fakeRecordId);
-            save(record, writer);
-            writer.endRecord(fakeRecordId);
-            return stream;
-        }
-
-        template <class T, class = std::void_t<>>
-        struct HasLoad : std::false_type
-        {
-        };
-
-        template <class T>
-        struct HasLoad<T, std::void_t<decltype(std::declval<T>().load(std::declval<ESMReader&>()))>> : std::true_type
-        {
-        };
-
-        template <class T>
-        auto load(ESMReader& reader, T& record) -> std::enable_if_t<HasLoad<std::decay_t<T>>::value>
-        {
-            record.load(reader);
-        }
-
-        template <class T, class = std::void_t<>>
-        struct HasLoadWithDelete : std::false_type
-        {
-        };
-
-        template <class T>
-        struct HasLoadWithDelete<T,
-            std::void_t<decltype(std::declval<T>().load(std::declval<ESMReader&>(), std::declval<bool&>()))>>
-            : std::true_type
-        {
-        };
-
-        template <class T>
-        auto load(ESMReader& reader, T& record) -> std::enable_if_t<HasLoadWithDelete<std::decay_t<T>>::value>
-        {
-            bool deleted = false;
-            record.load(reader, deleted);
-        }
-
-        void load(ESMReader& reader, CellRef& record)
-        {
-            bool deleted = false;
-            record.load(reader, deleted, true);
-        }
-
-        template <typename T>
-        void saveAndLoadRecord(const T& record, FormatVersion formatVersion, T& result)
-        {
-            ESMReader reader;
-            reader.open(makeEsmStream(record, formatVersion), "stream");
-            ASSERT_TRUE(reader.hasMoreRecs());
-            ASSERT_EQ(reader.getRecName().toInt(), fakeRecordId);
-            reader.getRecHeader();
-            load(reader, result);
-        }
-
-        struct Esm3SaveLoadRecordTest : public TestWithParam<FormatVersion>
-        {
-            std::minstd_rand mRandom;
-            std::uniform_int_distribution<short> mRefIdDistribution{ 'a', 'z' };
-
-            std::string generateRandomString(std::size_t size)
-            {
-                std::string value;
-                while (value.size() < size)
-                    value.push_back(static_cast<char>(mRefIdDistribution(mRandom)));
-                return value;
-            }
-
-            RefId generateRandomRefId(std::size_t size = 33) { return RefId::stringRefId(generateRandomString(size)); }
-
-            template <class T, std::size_t n>
-            void generateArray(T (&dst)[n])
-            {
-                for (auto& v : dst)
-                    v = std::uniform_real_distribution<float>{ -1.0f, 1.0f }(mRandom);
-            }
-        };
-
-        TEST_F(Esm3SaveLoadRecordTest, headerShouldNotChange)
-        {
-            const std::string author = generateRandomString(33);
-            const std::string description = generateRandomString(257);
-
-            auto stream = std::make_unique<std::stringstream>();
-
-            ESMWriter writer;
-            writer.setAuthor(author);
-            writer.setDescription(description);
-            writer.setFormatVersion(CurrentSaveGameFormatVersion);
-            writer.save(*stream);
-            writer.close();
-
-            ESMReader reader;
-            reader.open(std::move(stream), "stream");
-            EXPECT_EQ(reader.getAuthor(), author);
-            EXPECT_EQ(reader.getDesc(), description);
-        }
-
-        TEST_F(Esm3SaveLoadRecordTest, containerContItemShouldSupportRefIdLongerThan32)
-        {
-            Container record;
-            record.blank();
-            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 42, .mItem = generateRandomRefId(33) });
-            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 13, .mItem = generateRandomRefId(33) });
-            Container result;
-            saveAndLoadRecord(record, CurrentSaveGameFormatVersion, result);
-            EXPECT_EQ(result.mInventory.mList, record.mInventory.mList);
-        }
-
-        TEST_F(Esm3SaveLoadRecordTest, regionSoundRefShouldSupportRefIdLongerThan32)
-        {
-            Region record;
-            record.blank();
-            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(33), .mChance = 42 });
-            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(33), .mChance = 13 });
-            Region result;
-            saveAndLoadRecord(record, CurrentSaveGameFormatVersion, result);
-            EXPECT_EQ(result.mSoundList, record.mSoundList);
-        }
-
-        TEST_F(Esm3SaveLoadRecordTest, scriptSoundRefShouldSupportRefIdLongerThan32)
-        {
-            Script record;
-            record.blank();
-            record.mId = generateRandomRefId(33);
-            record.mData.mNumShorts = 42;
-            Script result;
-            saveAndLoadRecord(record, CurrentSaveGameFormatVersion, result);
-            EXPECT_EQ(result.mId, record.mId);
-            EXPECT_EQ(result.mData.mNumShorts, record.mData.mNumShorts);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, playerShouldNotChange)
-        {
-            // Player state is not saved to vanilla ESM format.
-            if (GetParam() == CurrentContentFormatVersion)
-                return;
-            std::minstd_rand random;
-            Player record{};
-            record.mObject.blank();
-            record.mBirthsign = generateRandomRefId();
-            record.mObject.mRef.mRefID = generateRandomRefId();
-            std::generate_n(std::inserter(record.mPreviousItems, record.mPreviousItems.end()), 2,
-                [&] { return std::make_pair(generateRandomRefId(), generateRandomRefId()); });
-            record.mCellId = ESM::RefId::esm3ExteriorCell(0, 0);
-            generateArray(record.mLastKnownExteriorPosition);
-            record.mHasMark = true;
-            record.mMarkedCell = ESM::RefId::esm3ExteriorCell(0, 0);
-            generateArray(record.mMarkedPosition.pos);
-            generateArray(record.mMarkedPosition.rot);
-            record.mCurrentCrimeId = 42;
-            record.mPaidCrimeId = 13;
-            Player result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(record.mObject.mRef.mRefID, result.mObject.mRef.mRefID);
-            EXPECT_EQ(record.mBirthsign, result.mBirthsign);
-            EXPECT_EQ(record.mPreviousItems, result.mPreviousItems);
-            EXPECT_EQ(record.mPreviousItems, result.mPreviousItems);
-            EXPECT_EQ(record.mCellId, result.mCellId);
-            EXPECT_THAT(record.mLastKnownExteriorPosition, ElementsAreArray(result.mLastKnownExteriorPosition));
-            EXPECT_EQ(record.mHasMark, result.mHasMark);
-            EXPECT_EQ(record.mMarkedCell, result.mMarkedCell);
-            EXPECT_THAT(record.mMarkedPosition.pos, ElementsAreArray(result.mMarkedPosition.pos));
-            EXPECT_THAT(record.mMarkedPosition.rot, ElementsAreArray(result.mMarkedPosition.rot));
-            EXPECT_EQ(record.mCurrentCrimeId, result.mCurrentCrimeId);
-            EXPECT_EQ(record.mPaidCrimeId, result.mPaidCrimeId);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, cellRefShouldNotChange)
-        {
-            CellRef record;
-            record.blank();
-            record.mRefNum.mIndex = std::numeric_limits<unsigned>::max();
-            record.mRefNum.mContentFile = std::numeric_limits<int>::max();
-            record.mRefID = generateRandomRefId();
-            record.mScale = 2;
-            record.mOwner = generateRandomRefId();
-            record.mGlobalVariable = generateRandomString(100);
-            record.mSoul = generateRandomRefId();
-            record.mFaction = generateRandomRefId();
-            record.mFactionRank = std::numeric_limits<int>::max();
-            record.mChargeInt = std::numeric_limits<int>::max();
-            record.mEnchantmentCharge = std::numeric_limits<float>::max();
-            record.mGoldValue = std::numeric_limits<int>::max();
-            record.mTeleport = true;
-            generateArray(record.mDoorDest.pos);
-            generateArray(record.mDoorDest.rot);
-            record.mDestCell = generateRandomString(100);
-            record.mLockLevel = 0;
-            record.mIsLocked = true;
-            record.mKey = generateRandomRefId();
-            record.mTrap = generateRandomRefId();
-            record.mReferenceBlocked = std::numeric_limits<signed char>::max();
-            generateArray(record.mPos.pos);
-            generateArray(record.mPos.rot);
-            CellRef result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(record.mRefNum.mIndex, result.mRefNum.mIndex);
-            EXPECT_EQ(record.mRefNum.mContentFile, result.mRefNum.mContentFile);
-            EXPECT_EQ(record.mRefID, result.mRefID);
-            EXPECT_EQ(record.mScale, result.mScale);
-            EXPECT_EQ(record.mOwner, result.mOwner);
-            EXPECT_EQ(record.mGlobalVariable, result.mGlobalVariable);
-            EXPECT_EQ(record.mSoul, result.mSoul);
-            EXPECT_EQ(record.mFaction, result.mFaction);
-            EXPECT_EQ(record.mFactionRank, result.mFactionRank);
-            EXPECT_EQ(record.mChargeInt, result.mChargeInt);
-            EXPECT_EQ(record.mEnchantmentCharge, result.mEnchantmentCharge);
-            EXPECT_EQ(record.mGoldValue, result.mGoldValue);
-            EXPECT_EQ(record.mTeleport, result.mTeleport);
-            EXPECT_EQ(record.mDoorDest, result.mDoorDest);
-            EXPECT_EQ(record.mDestCell, result.mDestCell);
-            EXPECT_EQ(record.mLockLevel, result.mLockLevel);
-            EXPECT_EQ(record.mIsLocked, result.mIsLocked);
-            EXPECT_EQ(record.mKey, result.mKey);
-            EXPECT_EQ(record.mTrap, result.mTrap);
-            EXPECT_EQ(record.mReferenceBlocked, result.mReferenceBlocked);
-            EXPECT_EQ(record.mPos, result.mPos);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, creatureStatsShouldNotChange)
-        {
-            CreatureStats record;
-            record.blank();
-            record.mLastHitAttemptObject = generateRandomRefId();
-            record.mLastHitObject = generateRandomRefId();
-            CreatureStats result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(record.mLastHitAttemptObject, result.mLastHitAttemptObject);
-            EXPECT_EQ(record.mLastHitObject, result.mLastHitObject);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, containerShouldNotChange)
-        {
-            Container record;
-            record.blank();
-            record.mId = generateRandomRefId();
-            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 42, .mItem = generateRandomRefId(32) });
-            record.mInventory.mList.push_back(ESM::ContItem{ .mCount = 13, .mItem = generateRandomRefId(32) });
-            Container result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(result.mId, record.mId);
-            EXPECT_EQ(result.mInventory.mList, record.mInventory.mList);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, regionShouldNotChange)
-        {
-            Region record;
-            record.blank();
-            record.mId = generateRandomRefId();
-            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(32), .mChance = 42 });
-            record.mSoundList.push_back(ESM::Region::SoundRef{ .mSound = generateRandomRefId(32), .mChance = 13 });
-            Region result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(result.mId, record.mId);
-            EXPECT_EQ(result.mSoundList, record.mSoundList);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, scriptShouldNotChange)
-        {
-            Script record;
-            record.blank();
-            record.mId = generateRandomRefId(32);
-            record.mData.mNumShorts = 42;
-            Script result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(result.mId, record.mId);
-            EXPECT_EQ(result.mData.mNumShorts, record.mData.mNumShorts);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, quickKeysShouldNotChange)
-        {
-            const QuickKeys record {
-                .mKeys = {
-                    {
-                        .mType = QuickKeys::Type::Magic,
-                        .mId = generateRandomRefId(32),
-                    },
-                    {
-                        .mType = QuickKeys::Type::MagicItem,
-                        .mId = generateRandomRefId(32),
-                    },
-                },
-            };
-            QuickKeys result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(result.mKeys, record.mKeys);
-        }
-
-        TEST_P(Esm3SaveLoadRecordTest, dialogueShouldNotChange)
-        {
-            Dialogue record;
-            record.blank();
-            record.mStringId = generateRandomString(32);
-            record.mId = ESM::RefId::stringRefId(record.mStringId);
-            Dialogue result;
-            saveAndLoadRecord(record, GetParam(), result);
-            EXPECT_EQ(result.mId, record.mId);
-            EXPECT_EQ(result.mStringId, record.mStringId);
-        }
-
-        INSTANTIATE_TEST_SUITE_P(FormatVersions, Esm3SaveLoadRecordTest, ValuesIn(getFormats()));
-    }
-}
diff --git a/apps/openmw_test_suite/lua/test_async.cpp b/apps/openmw_test_suite/lua/test_async.cpp
deleted file mode 100644
index aa4059b632..0000000000
--- a/apps/openmw_test_suite/lua/test_async.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "gmock/gmock.h"
-#include <gtest/gtest.h>
-
-#include <components/lua/asyncpackage.hpp>
-#include <components/lua/luastate.hpp>
-
-#include "../testing_util.hpp"
-
-namespace
-{
-    using namespace testing;
-    using namespace TestingOpenMW;
-
-    struct LuaCoroutineCallbackTest : Test
-    {
-        void SetUp() override
-        {
-            mLua.sol()["callback"] = [&](sol::protected_function fn) -> LuaUtil::Callback {
-                sol::table hiddenData(mLua.sol(), sol::create);
-                hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{};
-                return LuaUtil::Callback{ std::move(fn), hiddenData };
-            };
-            mLua.sol()["pass"] = [this](LuaUtil::Callback callback) { mCb = callback; };
-        }
-
-        LuaUtil::LuaState mLua{ nullptr, nullptr };
-        LuaUtil::Callback mCb;
-    };
-
-    TEST_F(LuaCoroutineCallbackTest, CoroutineCallbacks)
-    {
-        internal::CaptureStdout();
-        mLua.sol().safe_script(R"X(
-            local s = 'test'
-            coroutine.wrap(function()
-                pass(callback(function(v) print(s) end))
-            end)()
-        )X");
-        mLua.sol().collect_garbage();
-        mCb.call();
-        EXPECT_THAT(internal::GetCapturedStdout(), "test\n");
-    }
-
-    TEST_F(LuaCoroutineCallbackTest, ErrorInCoroutineCallbacks)
-    {
-        mLua.sol().safe_script(R"X(
-            coroutine.wrap(function()
-                pass(callback(function() error('COROUTINE CALLBACK') end))
-            end)()
-        )X");
-        mLua.sol().collect_garbage();
-        EXPECT_ERROR(mCb.call(), "COROUTINE CALLBACK");
-    }
-}
diff --git a/apps/openmw_test_suite/lua/test_l10n.cpp b/apps/openmw_test_suite/lua/test_l10n.cpp
deleted file mode 100644
index 835492f13c..0000000000
--- a/apps/openmw_test_suite/lua/test_l10n.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-#include "gmock/gmock.h"
-#include <gtest/gtest.h>
-
-#include <components/files/fixedpath.hpp>
-
-#include <components/l10n/manager.hpp>
-#include <components/lua/l10n.hpp>
-#include <components/lua/luastate.hpp>
-
-#include "../testing_util.hpp"
-
-namespace
-{
-    using namespace testing;
-    using namespace TestingOpenMW;
-
-    template <typename T>
-    T get(sol::state_view& lua, const std::string& luaCode)
-    {
-        return lua.safe_script("return " + luaCode).get<T>();
-    }
-
-    VFSTestFile invalidScript("not a script");
-    VFSTestFile incorrectScript(
-        "return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
-    VFSTestFile emptyScript("");
-
-    VFSTestFile test1En(R"X(
-good_morning: "Good morning."
-you_have_arrows: |-
-  {count, plural,
-    =0{You have no arrows.}
-    one{You have one arrow.}
-    other{You have {count} arrows.}
-  }
-pc_must_come: |-
-  {PCGender, select,
-     male {He is}
-     female {She is}
-     other {They are}
-  } coming with us.
-quest_completion: "The quest is {done, number, percent} complete."
-ordinal: "You came in {num, ordinal} place."
-spellout: "There {num, plural, one{is {num, spellout} thing} other{are {num, spellout} things}}."
-duration: "It took {num, duration}"
-numbers: "{int} and {double, number, integer} are integers, but {double} is a double"
-rounding: "{value, number, :: .00}"
-)X");
-
-    VFSTestFile test1De(R"X(
-good_morning: "Guten Morgen."
-you_have_arrows: |-
-  {count, plural,
-    one{Du hast ein Pfeil.}
-    other{Du hast {count} Pfeile.}
-  }
-"Hello {name}!": "Hallo {name}!"
-)X");
-
-    VFSTestFile test1EnUS(R"X(
-currency: "You have {money, number, currency}"
-)X");
-
-    VFSTestFile test2En(R"X(
-good_morning: "Morning!"
-you_have_arrows: "Arrows count: {count}"
-)X");
-
-    struct LuaL10nTest : Test
-    {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
-            { "l10n/Test1/en.yaml", &test1En },
-            { "l10n/Test1/en_US.yaml", &test1EnUS },
-            { "l10n/Test1/de.yaml", &test1De },
-            { "l10n/Test2/en.yaml", &test2En },
-            { "l10n/Test3/en.yaml", &test1En },
-            { "l10n/Test3/de.yaml", &test1De },
-        });
-
-        LuaUtil::ScriptsConfiguration mCfg;
-    };
-
-    TEST_F(LuaL10nTest, L10n)
-    {
-        LuaUtil::LuaState lua{ mVFS.get(), &mCfg };
-        sol::state_view& l = lua.sol();
-        internal::CaptureStdout();
-        l10n::Manager l10nManager(mVFS.get());
-        l10nManager.setPreferredLocales({ "de", "en" });
-        EXPECT_THAT(internal::GetCapturedStdout(), "Preferred locales: gmst de en\n");
-
-        l["l10n"] = LuaUtil::initL10nLoader(l, &l10nManager);
-
-        internal::CaptureStdout();
-        l.safe_script("t1 = l10n('Test1')");
-        EXPECT_THAT(internal::GetCapturedStdout(),
-            "Language file \"l10n/Test1/de.yaml\" is enabled\n"
-            "Language file \"l10n/Test1/en.yaml\" is enabled\n");
-
-        internal::CaptureStdout();
-        l.safe_script("t2 = l10n('Test2')");
-        {
-            std::string output = internal::GetCapturedStdout();
-            EXPECT_THAT(output, HasSubstr("Language file \"l10n/Test2/en.yaml\" is enabled"));
-        }
-
-        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Guten Morgen.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "Du hast ein Pfeil.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "Du hast 5 Pfeile.");
-        EXPECT_EQ(get<std::string>(l, "t1('Hello {name}!', {name='World'})"), "Hallo World!");
-        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
-        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
-
-        internal::CaptureStdout();
-        l10nManager.setPreferredLocales({ "en", "de" });
-        EXPECT_THAT(internal::GetCapturedStdout(),
-            "Preferred locales: gmst en de\n"
-            "Language file \"l10n/Test1/en.yaml\" is enabled\n"
-            "Language file \"l10n/Test1/de.yaml\" is enabled\n"
-            "Language file \"l10n/Test2/en.yaml\" is enabled\n");
-
-        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Good morning.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "You have one arrow.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "You have 5 arrows.");
-        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"male\"})"), "He is coming with us.");
-        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"female\"})"), "She is coming with us.");
-        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"blah\"})"), "They are coming with us.");
-        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"other\"})"), "They are coming with us.");
-        EXPECT_EQ(get<std::string>(l, "t1('quest_completion', {done=0.1})"), "The quest is 10% complete.");
-        EXPECT_EQ(get<std::string>(l, "t1('quest_completion', {done=1})"), "The quest is 100% complete.");
-        EXPECT_EQ(get<std::string>(l, "t1('ordinal', {num=1})"), "You came in 1st place.");
-        EXPECT_EQ(get<std::string>(l, "t1('ordinal', {num=100})"), "You came in 100th place.");
-        EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=1})"), "There is one thing.");
-        EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=100})"), "There are one hundred things.");
-        EXPECT_EQ(get<std::string>(l, "t1('duration', {num=100})"), "It took 1:40");
-        EXPECT_EQ(get<std::string>(l, "t1('numbers', {int=123, double=123.456})"),
-            "123 and 123 are integers, but 123.456 is a double");
-        EXPECT_EQ(get<std::string>(l, "t1('rounding', {value=123.456789})"), "123.46");
-        // Check that failed messages display the key instead of an empty string
-        EXPECT_EQ(get<std::string>(l, "t1('{mismatched_braces')"), "{mismatched_braces");
-        EXPECT_EQ(get<std::string>(l, "t1('{unknown_arg}')"), "{unknown_arg}");
-        EXPECT_EQ(get<std::string>(l, "t1('{num, integer}', {num=1})"), "{num, integer}");
-        // Doesn't give a valid currency symbol with `en`. Not that openmw is designed for real world currency.
-        l10nManager.setPreferredLocales({ "en-US", "de" });
-        EXPECT_EQ(get<std::string>(l, "t1('currency', {money=10000.10})"), "You have $10,000.10");
-        // Note: Not defined in English localisation file, so we fall back to the German before falling back to the key
-        EXPECT_EQ(get<std::string>(l, "t1('Hello {name}!', {name='World'})"), "Hallo World!");
-        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
-        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
-
-        // Test that locales with variants and country codes fall back to more generic locales
-        internal::CaptureStdout();
-        l10nManager.setPreferredLocales({ "en-GB-oed", "de" });
-        EXPECT_THAT(internal::GetCapturedStdout(),
-            "Preferred locales: gmst en_GB_OED de\n"
-            "Language file \"l10n/Test1/en.yaml\" is enabled\n"
-            "Language file \"l10n/Test1/de.yaml\" is enabled\n"
-            "Language file \"l10n/Test2/en.yaml\" is enabled\n");
-        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
-
-        // Test setting fallback language
-        l.safe_script("t3 = l10n('Test3', 'de')");
-        l10nManager.setPreferredLocales({ "en" });
-        EXPECT_EQ(get<std::string>(l, "t3('Hello {name}!', {name='World'})"), "Hallo World!");
-    }
-}
diff --git a/apps/openmw_test_suite/lua/test_storage.cpp b/apps/openmw_test_suite/lua/test_storage.cpp
deleted file mode 100644
index 6bba813529..0000000000
--- a/apps/openmw_test_suite/lua/test_storage.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include <filesystem>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <components/lua/asyncpackage.hpp>
-#include <components/lua/storage.hpp>
-
-namespace
-{
-    using namespace testing;
-
-    template <typename T>
-    T get(sol::state_view& lua, std::string luaCode)
-    {
-        return lua.safe_script("return " + luaCode).get<T>();
-    }
-
-    TEST(LuaUtilStorageTest, Basic)
-    {
-        // Note: LuaUtil::Callback can be used only if Lua is initialized via LuaUtil::LuaState
-        LuaUtil::LuaState luaState{ nullptr, nullptr };
-        sol::state_view& mLua = luaState.sol();
-        LuaUtil::LuaStorage::initLuaBindings(mLua);
-        LuaUtil::LuaStorage storage(mLua);
-
-        std::vector<std::string> callbackCalls;
-        sol::table callbackHiddenData(mLua, sol::create);
-        callbackHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{};
-        sol::table callback(mLua, sol::create);
-        callback[1] = [&](const std::string& section, const sol::optional<std::string>& key) {
-            if (key)
-                callbackCalls.push_back(section + "_" + *key);
-            else
-                callbackCalls.push_back(section + "_*");
-        };
-        callback[2] = LuaUtil::AsyncPackageId{ nullptr, 0, callbackHiddenData };
-
-        mLua["mutable"] = storage.getMutableSection("test");
-        mLua["ro"] = storage.getReadOnlySection("test");
-        mLua["ro"]["subscribe"](mLua["ro"], callback);
-
-        mLua.safe_script("mutable:set('x', 5)");
-        EXPECT_EQ(get<int>(mLua, "mutable:get('x')"), 5);
-        EXPECT_EQ(get<int>(mLua, "ro:get('x')"), 5);
-
-        EXPECT_THROW(mLua.safe_script("ro:set('y', 3)"), std::exception);
-
-        mLua.safe_script("t1 = mutable:asTable()");
-        mLua.safe_script("t2 = ro:asTable()");
-        EXPECT_EQ(get<int>(mLua, "t1.x"), 5);
-        EXPECT_EQ(get<int>(mLua, "t2.x"), 5);
-
-        mLua.safe_script("mutable:reset()");
-        EXPECT_TRUE(get<bool>(mLua, "ro:get('x') == nil"));
-
-        mLua.safe_script("mutable:reset({x=4, y=7})");
-        EXPECT_EQ(get<int>(mLua, "ro:get('x')"), 4);
-        EXPECT_EQ(get<int>(mLua, "ro:get('y')"), 7);
-
-        EXPECT_THAT(callbackCalls, ::testing::ElementsAre("test_x", "test_*", "test_*"));
-    }
-
-    TEST(LuaUtilStorageTest, Table)
-    {
-        sol::state mLua;
-        LuaUtil::LuaStorage::initLuaBindings(mLua);
-        LuaUtil::LuaStorage storage(mLua);
-        mLua["mutable"] = storage.getMutableSection("test");
-        mLua["ro"] = storage.getReadOnlySection("test");
-
-        mLua.safe_script("mutable:set('x', { y = 'abc', z = 7 })");
-        EXPECT_EQ(get<int>(mLua, "mutable:get('x').z"), 7);
-        EXPECT_THROW(mLua.safe_script("mutable:get('x').z = 3"), std::exception);
-        EXPECT_NO_THROW(mLua.safe_script("mutable:getCopy('x').z = 3"));
-        EXPECT_EQ(get<int>(mLua, "mutable:get('x').z"), 7);
-        EXPECT_EQ(get<int>(mLua, "ro:get('x').z"), 7);
-        EXPECT_EQ(get<std::string>(mLua, "ro:get('x').y"), "abc");
-    }
-
-    TEST(LuaUtilStorageTest, Saving)
-    {
-        sol::state mLua;
-        LuaUtil::LuaStorage::initLuaBindings(mLua);
-        LuaUtil::LuaStorage storage(mLua);
-
-        mLua["permanent"] = storage.getMutableSection("permanent");
-        mLua["temporary"] = storage.getMutableSection("temporary");
-        mLua.safe_script("temporary:removeOnExit()");
-        mLua.safe_script("permanent:set('x', 1)");
-        mLua.safe_script("temporary:set('y', 2)");
-
-        const auto tmpFile = std::filesystem::temp_directory_path() / "test_storage.bin";
-        storage.save(tmpFile);
-        EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
-        EXPECT_EQ(get<int>(mLua, "temporary:get('y')"), 2);
-
-        storage.clearTemporaryAndRemoveCallbacks();
-        mLua["permanent"] = storage.getMutableSection("permanent");
-        mLua["temporary"] = storage.getMutableSection("temporary");
-        EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
-        EXPECT_TRUE(get<bool>(mLua, "temporary:get('y') == nil"));
-
-        mLua.safe_script("permanent:set('x', 3)");
-        mLua.safe_script("permanent:set('z', 4)");
-
-        LuaUtil::LuaStorage storage2(mLua);
-        storage2.load(tmpFile);
-        mLua["permanent"] = storage2.getMutableSection("permanent");
-        mLua["temporary"] = storage2.getMutableSection("temporary");
-
-        EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
-        EXPECT_TRUE(get<bool>(mLua, "permanent:get('z') == nil"));
-        EXPECT_TRUE(get<bool>(mLua, "temporary:get('y') == nil"));
-    }
-
-}
diff --git a/apps/openmw_test_suite/nif/node.hpp b/apps/openmw_test_suite/nif/node.hpp
deleted file mode 100644
index 7e413d03cd..0000000000
--- a/apps/openmw_test_suite/nif/node.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef OPENMW_TEST_SUITE_NIF_NODE_H
-#define OPENMW_TEST_SUITE_NIF_NODE_H
-
-#include <components/nif/data.hpp>
-#include <components/nif/node.hpp>
-
-namespace Nif::Testing
-{
-    inline void init(Transformation& value)
-    {
-        value = Transformation::getIdentity();
-    }
-
-    inline void init(Extra& value)
-    {
-        value.next = ExtraPtr(nullptr);
-    }
-
-    inline void init(Named& value)
-    {
-        value.extra = ExtraPtr(nullptr);
-        value.extralist = ExtraList();
-        value.controller = ControllerPtr(nullptr);
-    }
-
-    inline void init(Node& value)
-    {
-        init(static_cast<Named&>(value));
-        value.flags = 0;
-        init(value.trafo);
-        value.hasBounds = false;
-        value.isBone = false;
-    }
-
-    inline void init(NiGeometry& value)
-    {
-        init(static_cast<Node&>(value));
-        value.data = NiGeometryDataPtr(nullptr);
-        value.skin = NiSkinInstancePtr(nullptr);
-    }
-
-    inline void init(NiTriShape& value)
-    {
-        init(static_cast<NiGeometry&>(value));
-        value.recType = RC_NiTriShape;
-    }
-
-    inline void init(NiTriStrips& value)
-    {
-        init(static_cast<NiGeometry&>(value));
-        value.recType = RC_NiTriStrips;
-    }
-
-    inline void init(NiSkinInstance& value)
-    {
-        value.data = NiSkinDataPtr(nullptr);
-        value.root = NodePtr(nullptr);
-    }
-
-    inline void init(Controller& value)
-    {
-        value.next = ControllerPtr(nullptr);
-        value.flags = 0;
-        value.frequency = 0;
-        value.phase = 0;
-        value.timeStart = 0;
-        value.timeStop = 0;
-        value.target = NamedPtr(nullptr);
-    }
-}
-
-#endif
diff --git a/apps/openmw_test_suite/testing_util.hpp b/apps/openmw_test_suite/testing_util.hpp
deleted file mode 100644
index 89fb7f9e73..0000000000
--- a/apps/openmw_test_suite/testing_util.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef TESTING_UTIL_H
-#define TESTING_UTIL_H
-
-#include <filesystem>
-#include <sstream>
-
-#include <components/misc/strings/conversion.hpp>
-#include <components/vfs/archive.hpp>
-#include <components/vfs/manager.hpp>
-#include <components/vfs/pathutil.hpp>
-
-namespace TestingOpenMW
-{
-
-    inline std::filesystem::path outputFilePath(const std::string name)
-    {
-        std::filesystem::path dir("tests_output");
-        std::filesystem::create_directory(dir);
-        return dir / Misc::StringUtils::stringToU8String(name);
-    }
-
-    inline std::filesystem::path outputFilePathWithSubDir(const std::filesystem::path& subpath)
-    {
-        std::filesystem::path path("tests_output");
-        path /= subpath;
-        std::filesystem::create_directories(path.parent_path());
-        return path;
-    }
-
-    inline std::filesystem::path temporaryFilePath(const std::string name)
-    {
-        return std::filesystem::temp_directory_path() / name;
-    }
-
-    class VFSTestFile : public VFS::File
-    {
-    public:
-        explicit VFSTestFile(std::string content)
-            : mContent(std::move(content))
-        {
-        }
-
-        Files::IStreamPtr open() override { return std::make_unique<std::stringstream>(mContent, std::ios_base::in); }
-
-        std::filesystem::path getPath() override { return "TestFile"; }
-
-    private:
-        const std::string mContent;
-    };
-
-    struct VFSTestData : public VFS::Archive
-    {
-        std::map<std::string, VFS::File*, VFS::Path::PathLess> mFiles;
-
-        VFSTestData(std::map<std::string, VFS::File*, VFS::Path::PathLess> files)
-            : mFiles(std::move(files))
-        {
-        }
-
-        void listResources(std::map<std::string, VFS::File*>& out) override
-        {
-            for (const auto& [key, value] : mFiles)
-                out.emplace(VFS::Path::normalizeFilename(key), value);
-        }
-
-        bool contains(const std::string& file) const override { return mFiles.count(file) != 0; }
-
-        std::string getDescription() const override { return "TestData"; }
-    };
-
-    inline std::unique_ptr<VFS::Manager> createTestVFS(std::map<std::string, VFS::File*, VFS::Path::PathLess> files)
-    {
-        auto vfs = std::make_unique<VFS::Manager>();
-        vfs->addArchive(std::make_unique<VFSTestData>(std::move(files)));
-        vfs->buildIndex();
-        return vfs;
-    }
-
-#define EXPECT_ERROR(X, ERR_SUBSTR)                                                                                    \
-    try                                                                                                                \
-    {                                                                                                                  \
-        X;                                                                                                             \
-        FAIL() << "Expected error";                                                                                    \
-    }                                                                                                                  \
-    catch (std::exception & e)                                                                                         \
-    {                                                                                                                  \
-        EXPECT_THAT(e.what(), ::testing::HasSubstr(ERR_SUBSTR));                                                       \
-    }
-
-}
-
-#endif // TESTING_UTIL_H
diff --git a/apps/openmw_tests/CMakeLists.txt b/apps/openmw_tests/CMakeLists.txt
new file mode 100644
index 0000000000..9b57113110
--- /dev/null
+++ b/apps/openmw_tests/CMakeLists.txt
@@ -0,0 +1,59 @@
+include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
+include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS})
+
+file(GLOB UNITTEST_SRC_FILES
+    main.cpp
+
+    options.cpp
+
+    mwworld/test_store.cpp
+    mwworld/testduration.cpp
+    mwworld/testtimestamp.cpp
+    mwworld/testptr.cpp
+
+    mwdialogue/test_keywordsearch.cpp
+
+    mwscript/test_scripts.cpp
+)
+
+source_group(apps\\openmw-tests FILES ${UNITTEST_SRC_FILES})
+
+openmw_add_executable(openmw-tests ${UNITTEST_SRC_FILES})
+
+target_link_libraries(openmw-tests
+    GTest::GTest
+    GMock::GMock
+    openmw-lib
+)
+
+# Fix for not visible pthreads functions for linker with glibc 2.15
+if (UNIX AND NOT APPLE)
+    target_link_libraries(openmw-tests ${CMAKE_THREAD_LIBS_INIT})
+endif()
+
+if (BUILD_WITH_CODE_COVERAGE)
+    target_compile_options(openmw-tests PRIVATE --coverage)
+    target_link_libraries(openmw-tests gcov)
+endif()
+
+target_compile_definitions(openmw-tests
+    PRIVATE OPENMW_DATA_DIR=u8"${CMAKE_CURRENT_BINARY_DIR}/data"
+            OPENMW_PROJECT_SOURCE_DIR=u8"${PROJECT_SOURCE_DIR}")
+
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
+    target_precompile_headers(openmw-tests PRIVATE
+        <boost/program_options/options_description.hpp>
+
+        <gtest/gtest.h>
+
+        <sol/sol.hpp>
+
+        <algorithm>
+        <filesystem>
+        <fstream>
+        <functional>
+        <memory>
+        <string>
+        <vector>
+    )
+endif()
diff --git a/apps/openmw_tests/main.cpp b/apps/openmw_tests/main.cpp
new file mode 100644
index 0000000000..6b7298596a
--- /dev/null
+++ b/apps/openmw_tests/main.cpp
@@ -0,0 +1,28 @@
+#include <components/debug/debugging.hpp>
+#include <components/misc/strings/conversion.hpp>
+#include <components/settings/parser.hpp>
+#include <components/settings/values.hpp>
+
+#include <gtest/gtest.h>
+
+#include <filesystem>
+
+int main(int argc, char* argv[])
+{
+    Log::sMinDebugLevel = Debug::getDebugLevel();
+
+    const std::filesystem::path settingsDefaultPath = std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "files"
+        / Misc::StringUtils::stringToU8String("settings-default.cfg");
+
+    Settings::SettingsFileParser parser;
+    parser.loadSettingsFile(settingsDefaultPath, Settings::Manager::mDefaultSettings);
+
+    Settings::StaticValues::initDefaults();
+
+    Settings::Manager::mUserSettings = Settings::Manager::mDefaultSettings;
+
+    Settings::StaticValues::init();
+
+    testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp b/apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
similarity index 99%
rename from apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
rename to apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
index b97f30b319..a3f0d8d3c0 100644
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
@@ -1,4 +1,5 @@
 #include "apps/openmw/mwdialogue/keywordsearch.hpp"
+
 #include <gtest/gtest.h>
 
 struct KeywordSearchTest : public ::testing::Test
diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_tests/mwscript/test_scripts.cpp
similarity index 91%
rename from apps/openmw_test_suite/mwscript/test_scripts.cpp
rename to apps/openmw_tests/mwscript/test_scripts.cpp
index b623084fb9..0de542bdc6 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_tests/mwscript/test_scripts.cpp
@@ -19,7 +19,16 @@ namespace
             mErrorHandler.reset();
             std::istringstream input(scriptBody);
             Compiler::Scanner scanner(mErrorHandler, input, mCompilerContext.getExtensions());
-            scanner.scan(mParser);
+            try
+            {
+                scanner.scan(mParser);
+            }
+            catch (...)
+            {
+                if (!shouldFail)
+                    logErrors();
+                throw;
+            }
             if (mErrorHandler.isGood())
                 return CompiledScript(mParser.getProgram(), mParser.getLocals());
             else if (!shouldFail)
@@ -317,6 +326,8 @@ End)mwscript";
 Addtopic -spells...
 Addtopic -magicka...
 
+player->PositionCell, -97274, -94273, 8064, -12,-12
+
 End)mwscript";
 
     const std::string sIssue4061 = R"mwscript(Begin 01_Rz_neuvazhay-koryto2
@@ -385,6 +396,12 @@ if (player->GameHour == 10)
 set player->GameHour to 20
 endif
 
+End)mwscript";
+
+    const std::string sIssue4996 = R"mwscript(---Begin issue4996
+
+player-> SetPos, Z, myZ + 50
+
 End)mwscript";
 
     const std::string sIssue5087 = R"mwscript(Begin Begin
@@ -457,6 +474,9 @@ set a to 1
 
 -+'\/.,><$@---!=\/?--------(){}------ show a
 
+( GetDisabled == 1 )
+GetDisabled == 1
+
 End)mwscript";
 
     TEST_F(MWScriptTest, mwscript_test_invalid)
@@ -745,7 +765,33 @@ End)mwscript";
                     mTopics.erase(mTopics.begin());
                 }
             };
+            class PositionCell : public Interpreter::Opcode0
+            {
+            public:
+                void execute(Interpreter::Runtime& runtime)
+                {
+                    std::string_view target = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                    Interpreter::Type_Float x = runtime[0].mFloat;
+                    runtime.pop();
+                    Interpreter::Type_Float y = runtime[0].mFloat;
+                    runtime.pop();
+                    Interpreter::Type_Float z = runtime[0].mFloat;
+                    runtime.pop();
+                    Interpreter::Type_Float zRot = runtime[0].mFloat;
+                    runtime.pop();
+                    std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                    EXPECT_EQ(target, "player");
+                    EXPECT_EQ(x, -97274);
+                    EXPECT_EQ(y, -94273);
+                    EXPECT_EQ(z, 8064);
+                    EXPECT_EQ(zRot, -12);
+                    EXPECT_EQ(cellID, "-12");
+                }
+            };
             installOpcode<AddTopic>(Compiler::Dialogue::opcodeAddTopic, topics);
+            installOpcode<PositionCell>(Compiler::Transformation::opcodePositionCellExplicit);
             TestInterpreterContext context;
             run(*script, context);
             EXPECT_TRUE(topics.empty());
@@ -810,6 +856,12 @@ End)mwscript";
         EXPECT_FALSE(!compile(sIssue4888));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_4996)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue4996));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_5087)
     {
         registerExtensions();
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_tests/mwscript/test_utils.hpp
similarity index 100%
rename from apps/openmw_test_suite/mwscript/test_utils.hpp
rename to apps/openmw_tests/mwscript/test_utils.hpp
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_tests/mwworld/test_store.cpp
similarity index 98%
rename from apps/openmw_test_suite/mwworld/test_store.cpp
rename to apps/openmw_tests/mwworld/test_store.cpp
index d8890bc5ab..ba48193836 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_tests/mwworld/test_store.cpp
@@ -22,21 +22,10 @@
 #include <components/files/conversion.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/strings/algorithm.hpp>
+#include <components/testing/util.hpp>
 
-#include "apps/openmw/mwmechanics/spelllist.hpp"
 #include "apps/openmw/mwworld/esmstore.hpp"
 
-#include "../testing_util.hpp"
-
-namespace MWMechanics
-{
-    SpellList::SpellList(const ESM::RefId& id, int type)
-        : mId(id)
-        , mType(type)
-    {
-    }
-}
-
 static Loading::Listener dummyListener;
 
 /// Base class for tests of ESMStore that rely on external content files to produce the test results
@@ -270,10 +259,8 @@ namespace
         std::vector<ESM::FormatVersion> result({
             ESM::DefaultFormatVersion,
             ESM::CurrentContentFormatVersion,
-            ESM::MaxOldWeatherFormatVersion,
-            ESM::MaxOldDeathAnimationFormatVersion,
-            ESM::MaxOldForOfWarFormatVersion,
-            ESM::MaxWerewolfDeprecatedDataFormatVersion,
+            ESM::MaxOldFogOfWarFormatVersion,
+            ESM::MaxUnoptimizedCharacterDataFormatVersion,
             ESM::MaxOldTimeLeftFormatVersion,
             ESM::MaxIntFallbackFormatVersion,
             ESM::MaxClearModifiersFormatVersion,
@@ -499,7 +486,11 @@ namespace
 
             const RecordType* result = nullptr;
             if constexpr (std::is_same_v<RecordType, ESM::LandTexture>)
-                result = esmStore.get<RecordType>().search(index, 0);
+            {
+                const std::string* texture = esmStore.get<RecordType>().search(index, 0);
+                ASSERT_NE(texture, nullptr);
+                return;
+            }
             else if constexpr (ESM::hasIndex<RecordType>)
                 result = esmStore.get<RecordType>().search(index);
             else
diff --git a/apps/openmw_test_suite/mwworld/testduration.cpp b/apps/openmw_tests/mwworld/testduration.cpp
similarity index 100%
rename from apps/openmw_test_suite/mwworld/testduration.cpp
rename to apps/openmw_tests/mwworld/testduration.cpp
diff --git a/apps/openmw_tests/mwworld/testptr.cpp b/apps/openmw_tests/mwworld/testptr.cpp
new file mode 100644
index 0000000000..7bc0bebcec
--- /dev/null
+++ b/apps/openmw_tests/mwworld/testptr.cpp
@@ -0,0 +1,82 @@
+#include "apps/openmw/mwclass/npc.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"
+#include "apps/openmw/mwworld/livecellref.hpp"
+#include "apps/openmw/mwworld/ptr.hpp"
+#include "apps/openmw/mwworld/worldmodel.hpp"
+
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/readerscache.hpp>
+
+#include <gtest/gtest.h>
+
+namespace MWWorld
+{
+    namespace
+    {
+        using namespace testing;
+
+        TEST(MWWorldPtrTest, toStringShouldReturnHumanReadableTextRepresentationOfPtrWithNullRef)
+        {
+            Ptr ptr;
+            EXPECT_EQ(ptr.toString(), "null object");
+        }
+
+        TEST(MWWorldPtrTest, toStringShouldReturnHumanReadableTextRepresentationOfPtrWithDeletedRef)
+        {
+            MWClass::Npc::registerSelf();
+            ESM::NPC npc;
+            npc.blank();
+            npc.mId = ESM::RefId::stringRefId("Player");
+            ESMStore store;
+            store.insert(npc);
+            ESM::CellRef cellRef;
+            cellRef.blank();
+            cellRef.mRefID = npc.mId;
+            cellRef.mRefNum = ESM::RefNum{ .mIndex = 0x2a, .mContentFile = 0xd };
+            LiveCellRef<ESM::NPC> liveCellRef(cellRef, &npc);
+            liveCellRef.mData.setDeletedByContentFile(true);
+            Ptr ptr(&liveCellRef);
+            EXPECT_EQ(ptr.toString(), "deleted object0xd00002a (NPC, \"player\")");
+        }
+
+        TEST(MWWorldPtrTest, toStringShouldReturnHumanReadableTextRepresentationOfPtr)
+        {
+            MWClass::Npc::registerSelf();
+            ESM::NPC npc;
+            npc.blank();
+            npc.mId = ESM::RefId::stringRefId("Player");
+            ESMStore store;
+            store.insert(npc);
+            ESM::CellRef cellRef;
+            cellRef.blank();
+            cellRef.mRefID = npc.mId;
+            cellRef.mRefNum = ESM::RefNum{ .mIndex = 0x2a, .mContentFile = 0xd };
+            LiveCellRef<ESM::NPC> liveCellRef(cellRef, &npc);
+            Ptr ptr(&liveCellRef);
+            EXPECT_EQ(ptr.toString(), "object0xd00002a (NPC, \"player\")");
+        }
+
+        TEST(MWWorldPtrTest, underlyingLiveCellRefShouldBeDeregisteredOnDestruction)
+        {
+            MWClass::Npc::registerSelf();
+            ESM::NPC npc;
+            npc.blank();
+            npc.mId = ESM::RefId::stringRefId("Player");
+            ESMStore store;
+            store.insert(npc);
+            ESM::ReadersCache readersCache;
+            WorldModel worldModel(store, readersCache);
+            ESM::CellRef cellRef;
+            cellRef.blank();
+            cellRef.mRefID = npc.mId;
+            cellRef.mRefNum = ESM::FormId{ .mIndex = 0x2a, .mContentFile = 0xd };
+            {
+                LiveCellRef<ESM::NPC> liveCellRef(cellRef, &npc);
+                Ptr ptr(&liveCellRef);
+                worldModel.registerPtr(ptr);
+                ASSERT_EQ(worldModel.getPtr(cellRef.mRefNum), ptr);
+            }
+            EXPECT_EQ(worldModel.getPtr(cellRef.mRefNum), Ptr());
+        }
+    }
+}
diff --git a/apps/openmw_test_suite/mwworld/testtimestamp.cpp b/apps/openmw_tests/mwworld/testtimestamp.cpp
similarity index 100%
rename from apps/openmw_test_suite/mwworld/testtimestamp.cpp
rename to apps/openmw_tests/mwworld/testtimestamp.cpp
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_tests/options.cpp
similarity index 99%
rename from apps/openmw_test_suite/openmw/options.cpp
rename to apps/openmw_tests/options.cpp
index d79a387645..fe319f64fa 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_tests/options.cpp
@@ -1,4 +1,5 @@
-#include <apps/openmw/options.hpp>
+#include "apps/openmw/options.hpp"
+
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
 
@@ -35,7 +36,7 @@ namespace
         (result.emplace_back(makeString(args)), ...);
         for (int i = 1; i <= std::numeric_limits<char>::max(); ++i)
             if (i != '&' && i != '"' && i != ' ' && i != '\n')
-                result.push_back(std::string(1, i));
+                result.push_back(std::string(1, static_cast<char>(i)));
         return result;
     }
 
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 588b100ef2..f19ed0e489 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -33,21 +33,9 @@ set(WIZARD_HEADER
     utils/componentlistwidget.hpp
 )
 
-set(WIZARD_UI
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/componentselectionpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/conclusionpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/existinginstallationpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/importpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationtargetpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/intropage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/languageselectionpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/methodselectionpage.ui
-)
-
 if (OPENMW_USE_UNSHIELD)
     set (WIZARD ${WIZARD} installationpage.cpp unshield/unshieldworker.cpp)
     set (WIZARD_HEADER ${WIZARD_HEADER} installationpage.hpp unshield/unshieldworker.hpp)
-    set (WIZARD_UI ${WIZARD_UI} ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationpage.ui)
     add_definitions(-DOPENMW_USE_UNSHIELD)
 endif (OPENMW_USE_UNSHIELD)
 
@@ -56,16 +44,16 @@ source_group(wizard FILES ${WIZARD} ${WIZARD_HEADER})
 
 set(QT_USE_QTGUI 1)
 
+set (WIZARD_RES ${CMAKE_SOURCE_DIR}/files/wizard/wizard.qrc)
+
 # Set some platform specific settings
 if(WIN32)
+    set(WIZARD_RES ${WIZARD_RES} ${CMAKE_SOURCE_DIR}/files/windows/QWindowsVistaDark/dark.qrc)
     set(GUI_TYPE WIN32)
     set(QT_USE_QTMAIN TRUE)
 endif(WIN32)
 
-QT_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/wizard/wizard.qrc)
-QT_WRAP_UI(UI_HDRS ${WIZARD_UI})
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+QT_ADD_RESOURCES(RCC_SRCS ${WIZARD_RES})
 
 if (OPENMW_USE_UNSHIELD)
     include_directories(${LIBUNSHIELD_INCLUDE_DIRS})
@@ -76,14 +64,15 @@ openmw_add_executable(openmw-wizard
     ${WIZARD}
     ${WIZARD_HEADER}
     ${RCC_SRCS}
-    ${UI_HDRS}
 )
 
+add_dependencies(openmw-wizard qm-files)
+
 target_link_libraries(openmw-wizard
     components_qt
 )
 
-target_link_libraries(openmw-wizard Qt::Widgets Qt::Core)
+target_link_libraries(openmw-wizard Qt::Widgets Qt::Core Qt::Svg)
 
 if (OPENMW_USE_UNSHIELD)
     target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARIES})
@@ -98,15 +87,12 @@ if (BUILD_WITH_CODE_COVERAGE)
     target_link_libraries(openmw-wizard gcov)
 endif()
 
-# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    target_link_libraries(openmw-wizard dl Xt)
-endif()
-
 if (WIN32)
     INSTALL(TARGETS openmw-wizard RUNTIME DESTINATION ".")
 endif(WIN32)
 
 if(USE_QT)
     set_property(TARGET openmw-wizard PROPERTY AUTOMOC ON)
+    set_property(TARGET openmw-wizard PROPERTY AUTOUIC ON)
+    set_property(TARGET openmw-wizard PROPERTY AUTOUIC_SEARCH_PATHS ui)
 endif(USE_QT)
diff --git a/apps/wizard/componentselectionpage.cpp b/apps/wizard/componentselectionpage.cpp
index e492f4b83a..63f2eff078 100644
--- a/apps/wizard/componentselectionpage.cpp
+++ b/apps/wizard/componentselectionpage.cpp
@@ -138,10 +138,10 @@ bool Wizard::ComponentSelectionPage::validatePage()
                 msgBox.setIcon(QMessageBox::Information);
                 msgBox.setStandardButtons(QMessageBox::Cancel);
                 msgBox.setText(
-                    tr("<html><head/><body><p><b>You are about to install Tribunal</b></p> \
-                                  <p>Bloodmoon is already installed on your computer.</p> \
-                                  <p>However, it is recommended that you install Tribunal before Bloodmoon.</p> \
-                                  <p>Would you like to re-install Bloodmoon?</p></body></html>"));
+                    tr("<html><head/><body><p><b>You are about to install Tribunal</b></p>"
+                       "<p>Bloodmoon is already installed on your computer.</p>"
+                       "<p>However, it is recommended that you install Tribunal before Bloodmoon.</p>"
+                       "<p>Would you like to re-install Bloodmoon?</p></body></html>"));
 
                 QAbstractButton* reinstallButton
                     = msgBox.addButton(tr("Re-install &Bloodmoon"), QMessageBox::ActionRole);
diff --git a/apps/wizard/conclusionpage.cpp b/apps/wizard/conclusionpage.cpp
index a184c745ee..548d55f298 100644
--- a/apps/wizard/conclusionpage.cpp
+++ b/apps/wizard/conclusionpage.cpp
@@ -37,22 +37,23 @@ void Wizard::ConclusionPage::initializePage()
         if (field(QLatin1String("installation.retailDisc")).toBool() == true)
         {
             textLabel->setText(
-                tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your computer.</p> \
-                                  <p>Click Finish to close the Wizard.</p></body></html>"));
+                tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your "
+                   "computer.</p></body></html>"));
         }
         else
         {
-            textLabel->setText(tr(
-                "<html><head/><body><p>The OpenMW Wizard successfully modified your existing Morrowind installation.</p> \
-                                  <p>Click Finish to close the Wizard.</p></body></html>"));
+            textLabel->setText(
+                tr("<html><head/><body><p>The OpenMW Wizard successfully modified your existing Morrowind "
+                   "installation.</body></html>"));
         }
     }
     else
     {
         textLabel->setText(
-            tr("<html><head/><body><p>The OpenMW Wizard failed to install Morrowind on your computer.</p> \
-                              <p>Please report any bugs you might have encountered to our \
-                              <a href=\"https://gitlab.com/OpenMW/openmw/issues\">bug tracker</a>.<br/>Make sure to include the installation log.</p><br/></body></html>"));
+            tr("<html><head/><body><p>The OpenMW Wizard failed to install Morrowind on your computer.</p>"
+               "<p>Please report any bugs you might have encountered to our "
+               "<a href=\"https://gitlab.com/OpenMW/openmw/issues\">bug tracker</a>.<br/>Make sure to include the "
+               "installation log.</p><br/></body></html>"));
     }
 }
 
diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp
index 71ae331a61..0129be9ccf 100644
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@@ -5,6 +5,8 @@
 #include <QFileInfo>
 #include <QMessageBox>
 
+#include <components/misc/scalableicon.hpp>
+
 #include "mainwizard.hpp"
 
 Wizard::ExistingInstallationPage::ExistingInstallationPage(QWidget* parent)
@@ -18,6 +20,8 @@ Wizard::ExistingInstallationPage::ExistingInstallationPage(QWidget* parent)
     QListWidgetItem* emptyItem = new QListWidgetItem(tr("No existing installations detected"));
     emptyItem->setFlags(Qt::NoItemFlags);
 
+    browseButton->setIcon(Misc::ScalableIcon::load(":folder"));
+
     installationsList->insertItem(0, emptyItem);
 }
 
@@ -58,9 +62,9 @@ bool Wizard::ExistingInstallationPage::validatePage()
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Cancel);
         msgBox.setText(
-            QObject::tr("<br><b>Could not find Morrowind.ini</b><br><br> \
-                                   The Wizard needs to update settings in this file.<br><br> \
-                                   Press \"Browse...\" to specify the location manually.<br>"));
+            QObject::tr("<br><b>Could not find Morrowind.ini</b><br><br>"
+                        "The Wizard needs to update settings in this file.<br><br>"
+                        "Press \"Browse...\" to specify the location manually.<br>"));
 
         QAbstractButton* browseButton2 = msgBox.addButton(QObject::tr("B&rowse..."), QMessageBox::ActionRole);
 
@@ -107,8 +111,8 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            QObject::tr("<b>Morrowind.bsa</b> is missing!<br>\
-            Make sure your Morrowind installation is complete."));
+            QObject::tr("<b>Morrowind.bsa</b> is missing!<br>"
+                        "Make sure your Morrowind installation is complete."));
         msgBox.exec();
         return;
     }
@@ -187,8 +191,8 @@ bool Wizard::ExistingInstallationPage::versionIsOK(QString directory_name)
         msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
         msgBox.setDefaultButton(QMessageBox::No);
         msgBox.setText(
-            QObject::tr("<br><b>There may be a more recent version of Morrowind available.</b><br><br>\
-                              Do you wish to continue anyway?<br>"));
+            QObject::tr("<br><b>There may be a more recent version of Morrowind available.</b><br><br>"
+                        "Do you wish to continue anyway?<br>"));
         int ret = msgBox.exec();
         if (ret == QMessageBox::Yes)
         {
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index e06972332a..aec64e275d 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -1,5 +1,6 @@
 #include "installationpage.hpp"
 
+#include <QComboBox>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QThread>
@@ -17,7 +18,7 @@ Wizard::InstallationPage::InstallationPage(QWidget* parent, Config::GameSettings
     mFinished = false;
 
     mThread = std::make_unique<QThread>();
-    mUnshield = std::make_unique<UnshieldWorker>(mGameSettings.value("morrowind-bsa-filesize").toLongLong());
+    mUnshield = std::make_unique<UnshieldWorker>(mGameSettings.value("morrowind-bsa-filesize").value.toLongLong());
     mUnshield->moveToThread(mThread.get());
 
     connect(mThread.get(), &QThread::started, mUnshield.get(), &UnshieldWorker::extract);
@@ -175,8 +176,8 @@ void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
     if (path.isEmpty())
     {
         logTextEdit->appendHtml(
-            tr("<p><br/><span style=\"color:red;\"> \
-                                    <b>Error: The installation was aborted by the user</b></span></p>"));
+            tr("<p><br/><span style=\"color:red;\">"
+               "<b>Error: The installation was aborted by the user</b></span></p>"));
 
         mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
         mWizard->mError = true;
@@ -205,8 +206,8 @@ void Wizard::InstallationPage::showOldVersionDialog()
     if (ret == QMessageBox::No)
     {
         logTextEdit->appendHtml(
-            tr("<p><br/><span style=\"color:red;\"> \
-                                    <b>Error: The installation was aborted by the user</b></span></p>"));
+            tr("<p><br/><span style=\"color:red;\">"
+               "<b>Error: The installation was aborted by the user</b></span></p>"));
 
         mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
         mWizard->mError = true;
@@ -236,14 +237,8 @@ void Wizard::InstallationPage::installationError(const QString& text, const QStr
 {
     installProgressLabel->setText(tr("Installation failed!"));
 
-    logTextEdit->appendHtml(
-        tr("<p><br/><span style=\"color:red;\"> \
-                               <b>Error: %1</b></p>")
-            .arg(text));
-    logTextEdit->appendHtml(
-        tr("<p><span style=\"color:red;\"> \
-                               <b>%1</b></p>")
-            .arg(details));
+    logTextEdit->appendHtml(tr("<p><br/><span style=\"color:red;\"><b>Error: %1</b></p>").arg(text));
+    logTextEdit->appendHtml(tr("<p><span style=\"color:red;\"><b>%1</b></p>").arg(details));
 
     mWizard->addLogText(QLatin1String("Error: ") + text);
     mWizard->addLogText(details);
@@ -254,9 +249,9 @@ void Wizard::InstallationPage::installationError(const QString& text, const QStr
     msgBox.setIcon(QMessageBox::Critical);
     msgBox.setStandardButtons(QMessageBox::Ok);
     msgBox.setText(
-        tr("<html><head/><body><p><b>The Wizard has encountered an error</b></p> \
-                      <p>The error reported was:</p><p>%1</p> \
-                      <p>Press &quot;Show Details...&quot; for more information.</p></body></html>")
+        tr("<html><head/><body><p><b>The Wizard has encountered an error</b></p>"
+           "<p>The error reported was:</p><p>%1</p>"
+           "<p>Press &quot;Show Details...&quot; for more information.</p></body></html>")
             .arg(text));
 
     msgBox.setDetailedText(details);
diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp
index c32573184d..1159d152c6 100644
--- a/apps/wizard/installationtargetpage.cpp
+++ b/apps/wizard/installationtargetpage.cpp
@@ -8,6 +8,7 @@
 
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/scalableicon.hpp>
 
 #include "mainwizard.hpp"
 
@@ -19,6 +20,8 @@ Wizard::InstallationTargetPage::InstallationTargetPage(QWidget* parent, const Fi
 
     setupUi(this);
 
+    folderIcon->setIcon(Misc::ScalableIcon::load(":folder"));
+
     registerField(QLatin1String("installation.path*"), targetLineEdit);
 }
 
@@ -48,9 +51,9 @@ bool Wizard::InstallationTargetPage::validatePage()
             msgBox.setIcon(QMessageBox::Warning);
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(
-                tr("<html><head/><body><p><b>Could not create the destination directory</b></p> \
-                              <p>Please make sure you have the right permissions \
-                              and try again, or specify a different location.</p></body></html>"));
+                tr("<html><head/><body><p><b>Could not create the destination directory</b></p>"
+                   "<p>Please make sure you have the right permissions "
+                   "and try again, or specify a different location.</p></body></html>"));
             msgBox.exec();
             return false;
         }
@@ -65,9 +68,9 @@ bool Wizard::InstallationTargetPage::validatePage()
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<html><head/><body><p><b>Could not write to the destination directory</b></p> \
-                          <p>Please make sure you have the right permissions \
-                          and try again, or specify a different location.</p></body></html>"));
+            tr("<html><head/><body><p><b>Could not write to the destination directory</b></p>"
+               "<p>Please make sure you have the right permissions "
+               "and try again, or specify a different location.</p></body></html>"));
         msgBox.exec();
         return false;
     }
@@ -79,9 +82,10 @@ bool Wizard::InstallationTargetPage::validatePage()
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<html><head/><body><p><b>The destination directory is not empty</b></p> \
-                          <p>An existing Morrowind installation is present in the specified location.</p> \
-                          <p>Please specify a different location, or go back and select the location as an existing installation.</p></body></html>"));
+            tr("<html><head/><body><p><b>The destination directory is not empty</b></p>"
+               "<p>An existing Morrowind installation is present in the specified location.</p>"
+               "<p>Please specify a different location, or go back and select the location as an existing "
+               "installation.</p></body></html>"));
         msgBox.exec();
         return false;
     }
diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp
index 9808d3c56c..895e959545 100644
--- a/apps/wizard/languageselectionpage.cpp
+++ b/apps/wizard/languageselectionpage.cpp
@@ -1,5 +1,7 @@
 #include "languageselectionpage.hpp"
 
+#include <components/misc/scalableicon.hpp>
+
 #include "mainwizard.hpp"
 
 Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
@@ -9,17 +11,21 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
 
     setupUi(this);
 
-    registerField(QLatin1String("installation.language"), languageComboBox);
+    flagIcon->setIcon(Misc::ScalableIcon::load(":preferences-desktop-locale"));
+
+    registerField(QLatin1String("installation.language"), languageComboBox, "currentData", "currentDataChanged");
 }
 
 void Wizard::LanguageSelectionPage::initializePage()
 {
-    QStringList languages;
-    languages << QLatin1String("English") << QLatin1String("French") << QLatin1String("German")
-              << QLatin1String("Italian") << QLatin1String("Polish") << QLatin1String("Russian")
-              << QLatin1String("Spanish");
+    QVector<std::pair<QString, QString>> languages = { { "English", tr("English") }, { "French", tr("French") },
+        { "German", tr("German") }, { "Italian", tr("Italian") }, { "Polish", tr("Polish") },
+        { "Russian", tr("Russian") }, { "Spanish", tr("Spanish") } };
 
-    languageComboBox->addItems(languages);
+    for (auto lang : languages)
+    {
+        languageComboBox->addItem(lang.second, lang.first);
+    }
 }
 
 int Wizard::LanguageSelectionPage::nextId() const
diff --git a/apps/wizard/main.cpp b/apps/wizard/main.cpp
index e2b0d3874b..09a34994e4 100644
--- a/apps/wizard/main.cpp
+++ b/apps/wizard/main.cpp
@@ -1,6 +1,12 @@
-#include <QApplication>
 #include <QDir>
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
+
+#include <components/files/qtconversion.hpp>
+#include <components/l10n/qttranslations.hpp>
+#include <components/platform/application.hpp>
+
 #include "mainwizard.hpp"
 
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
@@ -11,8 +17,13 @@
 
 int main(int argc, char* argv[])
 {
+    boost::program_options::variables_map variables;
+    boost::program_options::options_description description;
+    Files::ConfigurationManager configurationManager;
+    configurationManager.addCommonOptions(description);
+    configurationManager.readConfiguration(variables, description, true);
 
-    QApplication app(argc, argv);
+    Platform::Application app(argc, argv);
 
     // Now we make sure the current dir is set to application path
     QDir dir(QCoreApplication::applicationDirPath());
@@ -28,9 +39,15 @@ int main(int argc, char* argv[])
     app.setLibraryPaths(libraryPaths);
 #endif
 
-    QDir::setCurrent(dir.absolutePath());
+    QString resourcesPath(".");
+    if (!variables["resources"].empty())
+    {
+        resourcesPath = Files::pathToQString(variables["resources"].as<Files::MaybeQuotedPath>().u8string());
+    }
 
-    Wizard::MainWizard wizard;
+    l10n::installQtTranslations(app, "wizard", resourcesPath);
+
+    Wizard::MainWizard wizard(std::move(configurationManager));
 
     wizard.show();
     return app.exec();
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 9abb61cfd7..0b5cadd979 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -24,11 +24,14 @@
 #include "installationpage.hpp"
 #endif
 
+#include <algorithm>
+
 using namespace Process;
 
-Wizard::MainWizard::MainWizard(QWidget* parent)
+Wizard::MainWizard::MainWizard(Files::ConfigurationManager&& cfgMgr, QWidget* parent)
     : QWizard(parent)
     , mInstallations()
+    , mCfgMgr(cfgMgr)
     , mError(false)
     , mGameSettings(mCfgMgr)
 {
@@ -55,9 +58,9 @@ Wizard::MainWizard::MainWizard(QWidget* parent)
         &MainWizard::importerFinished);
 
     mLogError = tr(
-        "<html><head/><body><p><b>Could not open %1 for writing</b></p> \
-                   <p>Please make sure you have the right permissions \
-                   and try again.</p></body></html>");
+        "<html><head/><body><p><b>Could not open %1 for writing</b></p>"
+        "<p>Please make sure you have the right permissions "
+        "and try again.</p></body></html>");
 
     std::filesystem::create_directories(mCfgMgr.getUserConfigPath());
     std::filesystem::create_directories(mCfgMgr.getUserDataPath());
@@ -139,9 +142,9 @@ void Wizard::MainWizard::addLogText(const QString& text)
 void Wizard::MainWizard::setupGameSettings()
 {
     QString message(
-        tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
-                    <p>Please make sure you have the right permissions \
-                    and try again.</p></body></html>"));
+        tr("<html><head/><body><p><b>Could not open %1 for reading</b></p>"
+           "<p>Please make sure you have the right permissions "
+           "and try again.</p></body></html>"));
 
     // Load the user config file first, separately
     // So we can write it properly, uncontaminated
@@ -166,16 +169,13 @@ void Wizard::MainWizard::setupGameSettings()
         QTextStream stream(&file);
         Misc::ensureUtf8Encoding(stream);
 
-        mGameSettings.readUserFile(stream);
+        mGameSettings.readUserFile(stream, QFileInfo(path).dir().path());
     }
 
     file.close();
 
     // Now the rest
-    QStringList paths;
-    paths.append(Files::getUserConfigPathQString(mCfgMgr));
-    paths.append(QLatin1String("openmw.cfg"));
-    paths.append(Files::getGlobalConfigPathQString(mCfgMgr));
+    QStringList paths = Files::getActiveConfigPathsQString(mCfgMgr);
 
     for (const QString& path2 : paths)
     {
@@ -198,7 +198,7 @@ void Wizard::MainWizard::setupGameSettings()
             QTextStream stream(&file);
             Misc::ensureUtf8Encoding(stream);
 
-            mGameSettings.readFile(stream);
+            mGameSettings.readFile(stream, QFileInfo(path2).dir().path());
         }
         file.close();
     }
@@ -210,9 +210,9 @@ void Wizard::MainWizard::setupLauncherSettings()
     path.append(QLatin1String(Config::LauncherSettings::sLauncherConfigFileName));
 
     QString message(
-        tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
-                    <p>Please make sure you have the right permissions \
-                    and try again.</p></body></html>"));
+        tr("<html><head/><body><p><b>Could not open %1 for reading</b></p>"
+           "<p>Please make sure you have the right permissions "
+           "and try again.</p></body></html>"));
 
     QFile file(path);
 
@@ -243,11 +243,11 @@ void Wizard::MainWizard::setupLauncherSettings()
 void Wizard::MainWizard::setupInstallations()
 {
     // Check if the paths actually contain a Morrowind installation
-    for (const QString& path : mGameSettings.getDataDirs())
+    for (const auto& path : mGameSettings.getDataDirs())
     {
 
-        if (findFiles(QLatin1String("Morrowind"), path))
-            addInstallation(path);
+        if (findFiles(QLatin1String("Morrowind"), path.value))
+            addInstallation(path.value);
     }
 }
 
@@ -271,7 +271,6 @@ void Wizard::MainWizard::runSettingsImporter()
 
     // Set encoding
     QString language(field(QLatin1String("installation.language")).toString());
-
     if (language == QLatin1String("Polish"))
     {
         arguments.append(QLatin1String("win1250"));
@@ -335,10 +334,12 @@ void Wizard::MainWizard::addInstallation(const QString& path)
     mInstallations.insert(QDir::toNativeSeparators(path), install);
 
     // Add it to the openmw.cfg too
-    if (!mGameSettings.getDataDirs().contains(path))
+    const auto& dataDirs = mGameSettings.getDataDirs();
+    if (std::none_of(
+            dataDirs.begin(), dataDirs.end(), [&](const Config::SettingValue& dir) { return dir.value == path; }))
     {
-        mGameSettings.setMultiValue(QLatin1String("data"), path);
-        mGameSettings.addDataDir(path);
+        mGameSettings.setMultiValue(QLatin1String("data"), { path });
+        mGameSettings.addDataDir({ path });
     }
 }
 
@@ -397,15 +398,15 @@ void Wizard::MainWizard::writeSettings()
 
     if (language == QLatin1String("Polish"))
     {
-        mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1250"));
+        mGameSettings.setValue(QLatin1String("encoding"), { "win1250" });
     }
     else if (language == QLatin1String("Russian"))
     {
-        mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1251"));
+        mGameSettings.setValue(QLatin1String("encoding"), { "win1251" });
     }
     else
     {
-        mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1252"));
+        mGameSettings.setValue(QLatin1String("encoding"), { "win1252" });
     }
 
     // Write the installation path so that openmw can find them
@@ -413,7 +414,7 @@ void Wizard::MainWizard::writeSettings()
 
     // Make sure the installation path is the last data= entry
     mGameSettings.removeDataDir(path);
-    mGameSettings.addDataDir(path);
+    mGameSettings.addDataDir({ path });
 
     QString userPath(Files::pathToQString(mCfgMgr.getUserConfigPath()));
     QDir dir(userPath);
@@ -427,9 +428,9 @@ void Wizard::MainWizard::writeSettings()
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(
-                tr("<html><head/><body><p><b>Could not create %1</b></p> \
-                              <p>Please make sure you have the right permissions \
-                              and try again.</p></body></html>")
+                tr("<html><head/><body><p><b>Could not create %1</b></p>"
+                   "<p>Please make sure you have the right permissions "
+                   "and try again.</p></body></html>")
                     .arg(userPath));
             connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
             msgBox.exec();
@@ -448,9 +449,9 @@ void Wizard::MainWizard::writeSettings()
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
-                          <p>Please make sure you have the right permissions \
-                          and try again.</p></body></html>")
+            tr("<html><head/><body><p><b>Could not open %1 for writing</b></p>"
+               "<p>Please make sure you have the right permissions "
+               "and try again.</p></body></html>")
                 .arg(file.fileName()));
         connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
@@ -475,9 +476,9 @@ void Wizard::MainWizard::writeSettings()
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
-                          <p>Please make sure you have the right permissions \
-                          and try again.</p></body></html>")
+            tr("<html><head/><body><p><b>Could not open %1 for writing</b></p>"
+               "<p>Please make sure you have the right permissions "
+               "and try again.</p></body></html>")
                 .arg(file.fileName()));
         connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
diff --git a/apps/wizard/mainwizard.hpp b/apps/wizard/mainwizard.hpp
index 60f46fa1a5..2f120f1955 100644
--- a/apps/wizard/mainwizard.hpp
+++ b/apps/wizard/mainwizard.hpp
@@ -45,7 +45,7 @@ namespace Wizard
             Page_Conclusion
         };
 
-        MainWizard(QWidget* parent = nullptr);
+        MainWizard(Files::ConfigurationManager&& cfgMgr, QWidget* parent = nullptr);
         ~MainWizard() override;
 
         bool findFiles(const QString& name, const QString& path);
diff --git a/apps/wizard/methodselectionpage.cpp b/apps/wizard/methodselectionpage.cpp
index b3a1c73635..4447cb60f7 100644
--- a/apps/wizard/methodselectionpage.cpp
+++ b/apps/wizard/methodselectionpage.cpp
@@ -1,6 +1,8 @@
 #include "methodselectionpage.hpp"
 #include "mainwizard.hpp"
 
+#include <components/misc/scalableicon.hpp>
+
 #include <QDesktopServices>
 #include <QUrl>
 
@@ -11,15 +13,24 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget* parent)
 
     setupUi(this);
 
+    installerIcon->setIcon(Misc::ScalableIcon::load(":system-installer"));
+    folderIcon->setIcon(Misc::ScalableIcon::load(":folder"));
+    buyLinkButton->setIcon(Misc::ScalableIcon::load(":dollar"));
+
 #ifndef OPENMW_USE_UNSHIELD
     retailDiscRadioButton->setEnabled(false);
     existingLocationRadioButton->setChecked(true);
     buyLinkButton->released();
 #endif
 
+    QFont font = existingLocationRadioButton->font();
+    font.setBold(true);
+    existingLocationRadioButton->setFont(font);
+    retailDiscRadioButton->setFont(font);
+
     registerField(QLatin1String("installation.retailDisc"), retailDiscRadioButton);
 
-    connect(buyLinkButton, &QCommandLinkButton::released, this, &MethodSelectionPage::handleBuyButton);
+    connect(buyLinkButton, &QPushButton::released, this, &MethodSelectionPage::handleBuyButton);
 }
 
 int Wizard::MethodSelectionPage::nextId() const
diff --git a/files/ui/wizard/componentselectionpage.ui b/apps/wizard/ui/componentselectionpage.ui
similarity index 100%
rename from files/ui/wizard/componentselectionpage.ui
rename to apps/wizard/ui/componentselectionpage.ui
diff --git a/files/ui/wizard/conclusionpage.ui b/apps/wizard/ui/conclusionpage.ui
similarity index 100%
rename from files/ui/wizard/conclusionpage.ui
rename to apps/wizard/ui/conclusionpage.ui
diff --git a/files/ui/wizard/existinginstallationpage.ui b/apps/wizard/ui/existinginstallationpage.ui
similarity index 100%
rename from files/ui/wizard/existinginstallationpage.ui
rename to apps/wizard/ui/existinginstallationpage.ui
diff --git a/files/ui/wizard/importpage.ui b/apps/wizard/ui/importpage.ui
similarity index 93%
rename from files/ui/wizard/importpage.ui
rename to apps/wizard/ui/importpage.ui
index acc0d268ec..669920c5f3 100644
--- a/files/ui/wizard/importpage.ui
+++ b/apps/wizard/ui/importpage.ui
@@ -33,7 +33,7 @@
    <item>
     <widget class="QCheckBox" name="importCheckBox">
      <property name="text">
-      <string>Import settings from Morrowind.ini</string>
+      <string>Import Settings From Morrowind.ini</string>
      </property>
      <property name="checked">
       <bool>true</bool>
@@ -43,7 +43,7 @@
    <item>
     <widget class="QCheckBox" name="addonsCheckBox">
      <property name="text">
-      <string>Import add-on and plugin selection</string>
+      <string>Import Add-on and Plugin Selection</string>
      </property>
      <property name="checked">
       <bool>true</bool>
@@ -53,7 +53,7 @@
    <item>
     <widget class="QCheckBox" name="fontsCheckBox">
      <property name="text">
-      <string>Import bitmap fonts setup from Morrowind.ini</string>
+      <string>Import Bitmap Fonts Setup From Morrowind.ini</string>
      </property>
      <property name="toolTip">
       <string>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
diff --git a/files/ui/wizard/installationpage.ui b/apps/wizard/ui/installationpage.ui
similarity index 100%
rename from files/ui/wizard/installationpage.ui
rename to apps/wizard/ui/installationpage.ui
diff --git a/files/ui/wizard/installationtargetpage.ui b/apps/wizard/ui/installationtargetpage.ui
similarity index 74%
rename from files/ui/wizard/installationtargetpage.ui
rename to apps/wizard/ui/installationtargetpage.ui
index c87214d8d9..f77e0623ac 100644
--- a/files/ui/wizard/installationtargetpage.ui
+++ b/apps/wizard/ui/installationtargetpage.ui
@@ -23,21 +23,18 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="folderIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="folderIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string/>
        </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -83,7 +80,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../wizard/wizard.qrc"/>
+  <include location="../../../files/wizard/wizard.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/files/ui/wizard/intropage.ui b/apps/wizard/ui/intropage.ui
similarity index 100%
rename from files/ui/wizard/intropage.ui
rename to apps/wizard/ui/intropage.ui
diff --git a/files/ui/wizard/languageselectionpage.ui b/apps/wizard/ui/languageselectionpage.ui
similarity index 80%
rename from files/ui/wizard/languageselectionpage.ui
rename to apps/wizard/ui/languageselectionpage.ui
index fccd2aa424..f97381eadc 100644
--- a/files/ui/wizard/languageselectionpage.ui
+++ b/apps/wizard/ui/languageselectionpage.ui
@@ -23,21 +23,18 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="flagIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="flagIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string/>
        </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
diff --git a/files/ui/wizard/methodselectionpage.ui b/apps/wizard/ui/methodselectionpage.ui
similarity index 69%
rename from files/ui/wizard/methodselectionpage.ui
rename to apps/wizard/ui/methodselectionpage.ui
index c2dd260527..61bf81433f 100644
--- a/files/ui/wizard/methodselectionpage.ui
+++ b/apps/wizard/ui/methodselectionpage.ui
@@ -22,9 +22,6 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QRadioButton" name="retailDiscRadioButton">
-     <property name="styleSheet">
-      <string notr="true">font-weight:bold;</string>
-     </property>
      <property name="text">
       <string>Retail CD/DVD</string>
      </property>
@@ -52,27 +49,18 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="installerIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="installerIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string/>
        </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="scaledContents">
-        <bool>false</bool>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-       <property name="buddy">
-        <cstring>retailDiscRadioButton</cstring>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -90,9 +78,6 @@
    </item>
    <item>
     <widget class="QRadioButton" name="existingLocationRadioButton">
-     <property name="styleSheet">
-      <string notr="true">font-weight:bold</string>
-     </property>
      <property name="text">
       <string>Existing Installation</string>
      </property>
@@ -117,21 +102,15 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="folderIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="folderIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -156,6 +135,19 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -163,6 +155,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
    <item>
@@ -173,7 +178,7 @@
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
-        <enum>QSizePolicy::Maximum</enum>
+        <enum>QSizePolicy::Expanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -184,25 +189,21 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="buyIconLabel">
+      <widget class="QPushButton" name="buyLinkButton">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCommandLinkButton" name="buyLinkButton">
        <property name="text">
         <string>Buy the game</string>
        </property>
-       <property name="checkable">
-        <bool>false</bool>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 767d35d4f5..1d7d21b256 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -810,8 +810,7 @@ bool Wizard::UnshieldWorker::extractFile(
     if (!dir.mkpath(path))
         return false;
 
-    QString fileName(path);
-    fileName.append(QString::fromUtf8(unshield_file_name(unshield, index)));
+    path.append(QString::fromUtf8(unshield_file_name(unshield, index)));
 
     // Calculate the percentage done
     int progress = (((float)counter / (float)unshield_file_count(unshield)) * 100);
@@ -825,13 +824,13 @@ bool Wizard::UnshieldWorker::extractFile(
     emit textChanged(tr("Extracting: %1").arg(QString::fromUtf8(unshield_file_name(unshield, index))));
     emit progressChanged(progress);
 
-    QByteArray array(fileName.toUtf8());
+    QByteArray array(path.toUtf8());
     success = unshield_file_save(unshield, index, array.constData());
 
     if (!success)
     {
         qDebug() << "error";
-        dir.remove(fileName);
+        dir.remove(path);
     }
 
     return success;
diff --git a/cmake/FindRecastNavigation.cmake b/cmake/FindRecastNavigation.cmake
deleted file mode 100644
index 8728a5e949..0000000000
--- a/cmake/FindRecastNavigation.cmake
+++ /dev/null
@@ -1,211 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-# Copyright 2021 Bret Curtis for OpenMW
-#[=======================================================================[.rst:
-FindRecastNavigation
--------
-
-Find the RecastNavigation include directory and library.
-
-Use this module by invoking find_package with the form::
-
-.. code-block:: cmake
-
-  find_package(RecastNavigation
-    [version]              # Minimum version e.g. 1.8.0
-    [REQUIRED]             # Fail with error if RECAST is not found
-  )
-
-Imported targets
-^^^^^^^^^^^^^^^^
-
-This module defines the following :prop_tgt:`IMPORTED` targets:
-
-.. variable:: RecastNavigation::Recast
-
-  Imported target for using the RECAST library, if found.
-
-Result variables
-^^^^^^^^^^^^^^^^
-
-.. variable:: RECAST_FOUND
-
-  Set to true if RECAST library found, otherwise false or undefined.
-
-.. variable:: RECAST_INCLUDE_DIRS
-
-  Paths to include directories listed in one variable for use by RECAST client.
-
-.. variable:: RECAST_LIBRARIES
-
-  Paths to libraries to linked against to use RECAST.
-
-.. variable:: RECAST_VERSION
-
-  The version string of RECAST found.
-
-Cache variables
-^^^^^^^^^^^^^^^
-
-For users who wish to edit and control the module behavior, this module
-reads hints about search locations from the following variables::
-
-.. variable:: RECAST_INCLUDE_DIR
-
-  Path to RECAST include directory with ``Recast.h`` header.
-
-.. variable:: RECAST_LIBRARY
-
-  Path to RECAST library to be linked.
-
-NOTE: The variables above should not usually be used in CMakeLists.txt files!
-
-#]=======================================================================]
-
-### Find libraries ##############################################################
-
-if(NOT RECAST_LIBRARY)
-    find_library(RECAST_LIBRARY_RELEASE NAMES Recast HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
-    find_library(RECAST_LIBRARY_DEBUG NAMES Recast-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
-    include(SelectLibraryConfigurations)
-    select_library_configurations(RECAST)
-    mark_as_advanced(RECAST_LIBRARY_RELEASE RECAST_LIBRARY_DEBUG)
-else()
-    file(TO_CMAKE_PATH "${RECAST_LIBRARY}" RECAST_LIBRARY)
-endif()
-
-if(NOT DETOUR_LIBRARY)
-    find_library(DETOUR_LIBRARY_RELEASE NAMES Detour HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
-    find_library(DETOUR_LIBRARY_DEBUG NAMES Detour-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
-    include(SelectLibraryConfigurations)
-    select_library_configurations(DETOUR)
-    mark_as_advanced(DETOUR_LIBRARY_RELEASE DETOUR_LIBRARY_DEBUG)
-else()
-    file(TO_CMAKE_PATH "${DETOUR_LIBRARY}" DETOUR_LIBRARY)
-endif()
-
-if(NOT DEBUGUTILS_LIBRARY)
-    find_library(DEBUGUTILS_LIBRARY_RELEASE NAMES DebugUtils HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
-    find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtils-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
-    include(SelectLibraryConfigurations)
-    select_library_configurations(DEBUGUTILS)
-    mark_as_advanced(DEBUGUTILS_LIBRARY_RELEASE DEBUGUTILS_LIBRARY_DEBUG)
-else()
-    file(TO_CMAKE_PATH "${DEBUGUTILS_LIBRARY}" DEBUGUTILS_LIBRARY)
-endif()
-
-### Find include directory ####################################################
-find_path(RECAST_INCLUDE_DIR NAMES Recast.h HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES include RECAST include/recastnavigation)
-mark_as_advanced(RECAST_INCLUDE_DIR)
-
-if(RECAST_INCLUDE_DIR AND EXISTS "${RECAST_INCLUDE_DIR}/Recast.h")
-    file(STRINGS "${RECAST_INCLUDE_DIR}/Recast.h" _Recast_h_contents
-            REGEX "#define RECAST_VERSION_[A-Z]+[ ]+[0-9]+")
-    string(REGEX REPLACE "#define RECAST_VERSION_MAJOR[ ]+([0-9]+).+" "\\1"
-            RECAST_VERSION_MAJOR "${_Recast_h_contents}")
-    string(REGEX REPLACE ".+#define RECAST_VERSION_MINOR[ ]+([0-9]+).+" "\\1"
-            RECAST_VERSION_MINOR "${_Recast_h_contents}")
-    string(REGEX REPLACE ".+#define RECAST_VERSION_RELEASE[ ]+([0-9]+).*" "\\1"
-            RECAST_VERSION_RELEASE "${_Recast_h_contents}")
-    set(RECAST_VERSION "${RECAST_VERSION_MAJOR}.${RECAST_VERSION_MINOR}.${RECAST_VERSION_RELEASE}")
-    unset(_Recast_h_contents)
-endif()
-
-#TODO: they don't include a version yet
-set(RECAST_VERSION "1.5.1")
-
-### Set result variables ######################################################
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(RecastNavigation DEFAULT_MSG
-        RECAST_LIBRARY RECAST_INCLUDE_DIR RECAST_VERSION)
-
-set(RECAST_LIBRARIES ${RECAST_LIBRARY})
-set(RECAST_INCLUDE_DIRS ${RECAST_INCLUDE_DIR})
-
-set(DETOUR_LIBRARIES ${DETOUR_LIBRARY})
-set(DETOUR_INCLUDE_DIRS ${RECAST_INCLUDE_DIR})
-
-set(DEBUGUTILS_LIBRARIES ${DEBUGUTILS_LIBRARY})
-set(DEBUGUTILS_INCLUDE_DIRS ${RECAST_INCLUDE_DIR})
-
-### Import targets ############################################################
-if(RecastNavigation_FOUND)
-    if(NOT TARGET RecastNavigation::Recast)
-        add_library(RecastNavigation::Recast UNKNOWN IMPORTED)
-        set_target_properties(RecastNavigation::Recast PROPERTIES
-                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                INTERFACE_INCLUDE_DIRECTORIES "${RECAST_INCLUDE_DIR}")
-
-        if(RECAST_LIBRARY_RELEASE)
-            set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(RecastNavigation::Recast PROPERTIES
-                    IMPORTED_LOCATION_RELEASE "${RECAST_LIBRARY_RELEASE}")
-        endif()
-
-        if(RECAST_LIBRARY_DEBUG)
-            set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(RecastNavigation::Recast PROPERTIES
-                    IMPORTED_LOCATION_DEBUG "${RECAST_LIBRARY_DEBUG}")
-        endif()
-
-        if(NOT RECAST_LIBRARY_RELEASE AND NOT RECAST_LIBRARY_DEBUG)
-            set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
-                    IMPORTED_LOCATION "${RECAST_LIBRARY}")
-        endif()
-    endif()
-
-    if(NOT TARGET RecastNavigation::Detour)
-        add_library(RecastNavigation::Detour UNKNOWN IMPORTED)
-        set_target_properties(RecastNavigation::Detour PROPERTIES
-                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                INTERFACE_INCLUDE_DIRECTORIES "${DETOUR_INCLUDE_DIR}")
-
-        if(DETOUR_LIBRARY_RELEASE)
-            set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(RecastNavigation::Detour PROPERTIES
-                    IMPORTED_LOCATION_RELEASE "${DETOUR_LIBRARY_RELEASE}")
-        endif()
-
-        if(DETOUR_LIBRARY_DEBUG)
-            set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(RecastNavigation::Detour PROPERTIES
-                    IMPORTED_LOCATION_DEBUG "${DETOUR_LIBRARY_DEBUG}")
-        endif()
-
-        if(NOT DETOUR_LIBRARY_RELEASE AND NOT DETOUR_LIBRARY_DEBUG)
-            set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
-                    IMPORTED_LOCATION "${DETOUR_LIBRARY}")
-        endif()
-    endif()
-
-    if(NOT TARGET RecastNavigation::DebugUtils)
-        add_library(RecastNavigation::DebugUtils UNKNOWN IMPORTED)
-        set_target_properties(RecastNavigation::DebugUtils PROPERTIES
-                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                INTERFACE_INCLUDE_DIRECTORIES "${DEBUGUTILS_INCLUDE_DIR}")
-
-        if(DEBUGUTILS_LIBRARY_RELEASE)
-            set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(RecastNavigation::DebugUtils PROPERTIES
-                    IMPORTED_LOCATION_RELEASE "${DEBUGUTILS_LIBRARY_RELEASE}")
-        endif()
-
-        if(DEBUGUTILS_LIBRARY_DEBUG)
-            set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(RecastNavigation::DebugUtils PROPERTIES
-                    IMPORTED_LOCATION_DEBUG "${DEBUGUTILS_LIBRARY_DEBUG}")
-        endif()
-
-        if(NOT DEBUGUTILS_LIBRARY_RELEASE AND NOT DEBUGUTILS_LIBRARY_DEBUG)
-            set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
-                    IMPORTED_LOCATION "${DEBUGUTILS_LIBRARY}")
-        endif()
-    endif()
-
-endif()
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
deleted file mode 100644
index 4f2be8c421..0000000000
--- a/cmake/FindSDL2.cmake
+++ /dev/null
@@ -1,129 +0,0 @@
-# Locate SDL2 library
-# This module defines
-# SDL2_LIBRARY, the SDL2 library, with no other libraries
-# SDL2_LIBRARIES, the SDL library and required components with compiler flags
-# SDL2_FOUND, if false, do not try to link to SDL2
-# SDL2_INCLUDE_DIR, where to find SDL.h
-# SDL2_VERSION, the version of the found library
-#
-# This module accepts the following env variables
-#  SDL2DIR - Can be set to ./configure --prefix=$SDL2DIR used in building SDL2. l.e.galup 9-20-02
-# This module responds to the the flag:
-# SDL2_BUILDING_LIBRARY
-# If this is defined, then no SDL2_main will be linked in because
-# only applications need main().
-# Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
-# as part of the returned SDL2_LIBRARIES variable.
-#
-# Don't forget to include SDL2main.h and SDL2main.m your project for the
-# OS X framework based version. (Other versions link to -lSDL2main which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL2 guidelines.
-# Added a search for SDL2main which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL2/SDL.h to just SDL.h
-# This needed to change because "proper" SDL2 convention
-# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL2/ (see FreeBSD).
-#
-# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
-# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
-# was not created for redistribution, and exists temporarily pending official
-# SDL2 CMake modules.
-
-#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(_sdl_lib_suffix lib/x64)
-else()
-    set(_sdl_lib_suffix lib/x86)
-endif()
-
-libfind_pkg_detect(SDL2 sdl2
-    FIND_PATH SDL.h
-        HINTS $ENV{SDL2DIR}
-        PATH_SUFFIXES include SDL2 include/SDL2
-    FIND_LIBRARY SDL2
-        HINTS $ENV{SDL2DIR}
-        PATH_SUFFIXES lib ${_sdl_lib_suffix}
-)
-libfind_version_n_header(SDL2 NAMES SDL_version.h DEFINES SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_PATCHLEVEL)
-
-IF(NOT SDL2_BUILDING_LIBRARY AND NOT APPLE)
-    # Non-OS X framework versions expect you to also dynamically link to
-    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-    # seem to provide SDL2main for compatibility even though they don't
-    # necessarily need it.
-    libfind_pkg_detect(SDL2MAIN sdl2
-        FIND_LIBRARY SDL2main
-            HINTS $ENV{SDL2DIR}
-            PATH_SUFFIXES lib ${_sdl_lib_suffix}
-    )
-    set(SDL2MAIN_FIND_QUIETLY TRUE)
-    libfind_process(SDL2MAIN)
-    list(APPEND SDL2_PROCESS_LIBS SDL2MAIN_LIBRARY)
-ENDIF()
-
-
-set(SDL2_TARGET_SPECIFIC)
-
-if (APPLE)
-    # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-    list(APPEND SDL2_TARGET_SPECIFIC "-framework Cocoa")
-else()
-    # SDL2 may require threads on your system.
-    # The Apple build may not need an explicit flag because one of the
-    # frameworks may already provide it.
-    # But for non-OSX systems, I will use the CMake Threads package.
-    libfind_package(SDL2 Threads)
-    list(APPEND SDL2_TARGET_SPECIFIC ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
-# MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
-# (Actually on second look, I think it only needs one of the m* libraries.)
-if(MINGW)
-    list(APPEND SDL2_TARGET_SPECIFIC mingw32)
-endif()
-
-if(WIN32)
-    list(APPEND SDL2_TARGET_SPECIFIC winmm imm32 version msimg32)
-endif()
-
-set(SDL2_PROCESS_LIBS SDL2_TARGET_SPECIFIC)
-
-libfind_process(SDL2)
-
-if (SDL2_STATIC AND UNIX AND NOT APPLE)
-    execute_process(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_STATIC_FLAGS)
-    string(REGEX REPLACE "(\r?\n)+$" "" SDL2_STATIC_FLAGS "${SDL2_STATIC_FLAGS}")
-    set(SDL2_LIBRARIES ${SDL2_STATIC_FLAGS})
-endif()
diff --git a/cmake/GitVersion.cmake b/cmake/GitVersion.cmake
index ff719d72a7..44b57b17d4 100644
--- a/cmake/GitVersion.cmake
+++ b/cmake/GitVersion.cmake
@@ -1,6 +1,6 @@
 execute_process (
     COMMAND ${GIT_EXECUTABLE} rev-list --tags --max-count=1
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    WORKING_DIRECTORY ${OpenMW_SOURCE_DIR}
     RESULT_VARIABLE EXITCODE1
     OUTPUT_VARIABLE TAGHASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -8,7 +8,7 @@ execute_process (
 
 execute_process (
     COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    WORKING_DIRECTORY ${OpenMW_SOURCE_DIR}
     RESULT_VARIABLE EXITCODE2
     OUTPUT_VARIABLE COMMITHASH
     OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -28,4 +28,5 @@ endif ()
 
 include(${MACROSFILE})
 
-configure_resource_file(${VERSION_IN_FILE} ${VERSION_FILE_PATH_BASE} ${VERSION_FILE_PATH_RELATIVE})
+configure_resource_file(${VERSION_RESOURCE_FILE_IN} ${OpenMW_BINARY_DIR} ${VERSION_RESOURCE_FILE_RELATIVE})
+configure_file("${VERSION_CPP_FILE_IN}" "${VERSION_CPP_FILE_OUT}")
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 9a073b5ca1..b6734e6fc6 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -6,36 +6,60 @@ if(APPLE)
 endif(APPLE)
 
 # Version file
-set (VERSION_IN_FILE "${OpenMW_SOURCE_DIR}/files/version.in")
-set (VERSION_FILE_PATH_BASE "${OpenMW_BINARY_DIR}")
-set (VERSION_FILE_PATH_RELATIVE resources/version)
+set (VERSION_RESOURCE_FILE_IN "${OpenMW_SOURCE_DIR}/files/version.in")
+set (VERSION_RESOURCE_FILE_RELATIVE "resources/version")
+set (VERSION_CPP_FILE "components/version/version.cpp")
+
 if (GIT_CHECKOUT)
     get_generator_is_multi_config(multi_config)
-    add_custom_target (git-version
+    add_custom_target (get-version
+       BYPRODUCTS "${OpenMW_BINARY_DIR}/${VERSION_CPP_FILE}"
+       DEPENDS "${OpenMW_SOURCE_DIR}/${VERSION_CPP_FILE}.in"
        COMMAND ${CMAKE_COMMAND}
             -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
-            -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}
-            -DVERSION_IN_FILE=${VERSION_IN_FILE}
-            -DVERSION_FILE_PATH_BASE=${VERSION_FILE_PATH_BASE}
-            -DVERSION_FILE_PATH_RELATIVE=${VERSION_FILE_PATH_RELATIVE}
+            -DOpenMW_SOURCE_DIR=${OpenMW_SOURCE_DIR}
+            -DOpenMW_BINARY_DIR=${OpenMW_BINARY_DIR}
+            -DVERSION_RESOURCE_FILE_IN=${VERSION_RESOURCE_FILE_IN}
+            -DVERSION_RESOURCE_FILE_RELATIVE=${VERSION_RESOURCE_FILE_RELATIVE}
+            -DVERSION_CPP_FILE_IN=${OpenMW_SOURCE_DIR}/${VERSION_CPP_FILE}.in
+            -DVERSION_CPP_FILE_OUT=${OpenMW_BINARY_DIR}/${VERSION_CPP_FILE}.out
             -DOPENMW_VERSION_MAJOR=${OPENMW_VERSION_MAJOR}
             -DOPENMW_VERSION_MINOR=${OPENMW_VERSION_MINOR}
             -DOPENMW_VERSION_RELEASE=${OPENMW_VERSION_RELEASE}
+            -DOPENMW_LUA_API_REVISION=${OPENMW_LUA_API_REVISION}
+            -DOPENMW_POSTPROCESSING_API_REVISION=${OPENMW_POSTPROCESSING_API_REVISION}
             -DOPENMW_VERSION=${OPENMW_VERSION}
+            -DOPENMW_DOC_BASEURL=${OPENMW_DOC_BASEURL}
             -DMACROSFILE=${CMAKE_SOURCE_DIR}/cmake/OpenMWMacros.cmake
             "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_CONFIGURATION_TYPES}"
             -Dgenerator_is_multi_config_var=${multi_config}
             -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/GitVersion.cmake
-            VERBATIM)
+        COMMAND ${CMAKE_COMMAND}
+            -E copy_if_different ${OpenMW_BINARY_DIR}/${VERSION_CPP_FILE}.out ${OpenMW_BINARY_DIR}/${VERSION_CPP_FILE}
+        VERBATIM)
 else (GIT_CHECKOUT)
-    configure_resource_file(${VERSION_IN_FILE} ${VERSION_FILE_PATH_BASE} ${VERSION_FILE_PATH_RELATIVE})
+    configure_resource_file(${VERSION_RESOURCE_FILE_IN} ${OpenMW_BINARY_DIR} ${VERSION_RESOURCE_FILE_RELATIVE})
+    configure_file("${OpenMW_SOURCE_DIR}/${VERSION_CPP_FILE}.in" "${OpenMW_BINARY_DIR}/${VERSION_CPP_FILE}")
 endif (GIT_CHECKOUT)
 
+list (APPEND COMPONENT_FILES "${OpenMW_BINARY_DIR}/${VERSION_CPP_FILE}")
+
+# OSG plugin checker
+# Helpfully, OSG doesn't export this to its CMake config as it doesn't have one
+list(TRANSFORM USED_OSG_PLUGINS REPLACE "^osgdb_" "" OUTPUT_VARIABLE USED_OSG_PLUGIN_NAMES)
+list(TRANSFORM USED_OSG_PLUGIN_NAMES PREPEND "\"" OUTPUT_VARIABLE USED_OSG_PLUGIN_NAMES_FORMATTED)
+list(TRANSFORM USED_OSG_PLUGIN_NAMES_FORMATTED APPEND "\"")
+list(JOIN USED_OSG_PLUGIN_NAMES_FORMATTED ", " USED_OSG_PLUGIN_NAMES_FORMATTED)
+
+set(OSG_PLUGIN_CHECKER_CPP_FILE "components/misc/osgpluginchecker.cpp")
+configure_file("${OpenMW_SOURCE_DIR}/${OSG_PLUGIN_CHECKER_CPP_FILE}.in" "${OpenMW_BINARY_DIR}/${OSG_PLUGIN_CHECKER_CPP_FILE}")
+list(APPEND COMPONENT_FILES "${OpenMW_BINARY_DIR}/${OSG_PLUGIN_CHECKER_CPP_FILE}")
+
 # source files
 
 add_component_dir (lua
-    luastate scriptscontainer asyncpackage utilpackage serialization configuration l10n storage
-    shapes/box
+    luastate scriptscontainer asyncpackage utilpackage serialization configuration l10n storage utf8
+    shapes/box inputactions yamlloader scripttracker
     )
 
 add_component_dir (l10n
@@ -69,6 +93,9 @@ add_component_dir (settings
     categories/video
     categories/water
     categories/windows
+    gyroscopeaxis
+    hrtfmode
+    navmeshrendermode
     parser
     sanitizer
     sanitizerimpl
@@ -76,19 +103,32 @@ add_component_dir (settings
     settingvalue
     shadermanager
     values
+    windowmode
+    )
+
+add_component_dir (bgsm
+    stream file
     )
 
 add_component_dir (bsa
     bsa_file compressedbsafile ba2gnrlfile ba2dx10file ba2file memorystream
     )
 
+add_component_dir (bullethelpers
+    collisionobject
+    heightfield
+    operators
+    processtrianglecallback
+    transformboundingbox
+    )
+
 add_component_dir (vfs
-    manager archive bsaarchive filesystemarchive registerarchives
+    manager archive bsaarchive filesystemarchive pathutil registerarchives
     )
 
 add_component_dir (resource
-    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem
-    resourcemanager stats animation foreachbulletobject errormarker
+    scenemanager keyframemanager imagemanager animblendrulesmanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem
+    resourcemanager stats animation foreachbulletobject errormarker cachestats bgsmfilemanager
     )
 
 add_component_dir (shader
@@ -98,16 +138,17 @@ add_component_dir (shader
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue pathgridutil waterutil writescene serialize optimizer
-    actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
-    screencapture depth color riggeometryosgaextension extradata unrefqueue lightcommon
+    detourdebugdraw navmesh agentpath animblendrules shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
+    screencapture depth color riggeometryosgaextension extradata unrefqueue lightcommon lightingmethod clearcolor
+    cullsafeboundsvisitor keyframe nodecallback textkeymap glextensions
     )
 
 add_component_dir (nif
-    controlled effect niftypes record controller extra node record_ptr data niffile property nifkey base nifstream physics
+    base controller data effect extra niffile nifkey nifstream niftypes node parent particle physics property record recordptr texture
     )
 
 add_component_dir (nifosg
-    nifloader controller particle matrixtransform
+    nifloader controller particle matrixtransform fog
     )
 
 add_component_dir (nifbullet
@@ -115,19 +156,24 @@ add_component_dir (nifbullet
     )
 
 add_component_dir (to_utf8
+    tables_gen
     to_utf8
     )
 
 add_component_dir(esm attr common defs esmcommon records util luascripts format refid esmbridge esmterrain
     formid
+    fourcc
     stringrefid
     generatedrefid
     indexrefid
     serializerefid
     esm3exteriorcellrefid
+    quaternion
+    vector3
+    exteriorcelllocation
     )
 
-add_component_dir(fx pass technique lexer widgets stateupdater)
+add_component_dir(fx pass technique lexer lexer_types parse_constants widgets stateupdater)
 
 add_component_dir(std140 ubo)
 
@@ -141,10 +187,12 @@ add_component_dir (esm3
     inventorystate containerstate npcstate creaturestate dialoguestate statstate npcstats creaturestats
     weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
     aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings readerscache
-    infoorder timestamp
+    infoorder timestamp formatversion landrecorddata selectiongroup dialoguecondition
+    refnum
     )
 
 add_component_dir (esmterrain
+    gridsampling
     storage
     )
 
@@ -247,8 +295,13 @@ add_component_dir (esm4
 )
 
 add_component_dir (misc
-    constants utf8stream resourcehelpers rng messageformatparser weakcache thread
-    compression osguservalues color tuplemeta tuplehelpers
+    barrier budgetmeasurement color compression constants convert coordinateconverter display endianness float16 frameratelimiter
+    guarded math mathutil messageformatparser notnullptr objectpool osgpluginchecker osguservalues progressreporter resourcehelpers
+    rng strongtypedef thread timeconvert timer tuplehelpers tuplemeta utf8stream weakcache windows
+    )
+
+add_component_dir (misc/strings
+    algorithm conversion format lower
     )
 
 add_component_dir (stereo
@@ -256,9 +309,10 @@ add_component_dir (stereo
     )
 
 add_component_dir (debug
-    debugging debuglog gldebug debugdraw
+    debugging debuglog gldebug debugdraw writeflags
     )
 
+add_definitions(-DMYGUI_DONT_USE_OBSOLETE=ON)
 IF(NOT WIN32 AND NOT APPLE)
     add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}")
     add_definitions(-DGLOBAL_CONFIG_PATH="${GLOBAL_CONFIG_PATH}")
@@ -266,6 +320,7 @@ ENDIF()
 add_component_dir (files
     linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
     constrainedfilestream memorystream hash configfileparser openfile constrainedfilestreambuf conversion
+    istreamptr streamwithbuffer
     )
 
 add_component_dir (compiler
@@ -277,7 +332,7 @@ add_component_dir (compiler
 
 add_component_dir (interpreter
     context controlopcodes genericopcodes installopcodes interpreter localopcodes mathopcodes
-    miscopcodes opcodes runtime types defines
+    miscopcodes opcodes program runtime types defines
     )
 
 add_component_dir (translation
@@ -306,7 +361,15 @@ add_component_dir (fontloader
     )
 
 add_component_dir (sdlutil
-    gl4es_init sdlgraphicswindow imagetosurface sdlinputwrapper sdlvideowrapper events sdlcursormanager sdlmappings
+    events
+    gl4es_init
+    imagetosurface
+    sdlcursormanager
+    sdlgraphicswindow
+    sdlinputwrapper
+    sdlmappings
+    sdlvideowrapper
+    vsyncmode
     )
 
 add_component_dir (version
@@ -406,13 +469,22 @@ add_component_dir(loadinglistener
     reporter
     )
 
+add_component_dir(serialization
+    binaryreader
+    binarywriter
+    osgyaml
+    sizeaccumulator
+    )
+
 add_component_dir(sqlite3
     db
+    request
     statement
     transaction
 )
 
 add_component_dir(esmloader
+    lessbyid
     load
     esmdata
 )
@@ -440,27 +512,34 @@ else ()
         )
 endif()
 
-set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
-    )
+add_component_dir(testing
+    expecterror
+    util
+)
 
 if (USE_QT)
     add_component_qt_dir (contentselector
         model/modelitem model/esmfile
-        model/naturalsort model/contentmodel
+        model/contentmodel
         model/loadordererror
         view/combobox view/contentselector
         )
+
     add_component_qt_dir (config
         gamesettings
         launchersettings
         )
 
+    add_component_qt_dir (l10n
+        qttranslations
+        )
+
     add_component_qt_dir (process
         processinvoker
         )
 
     add_component_qt_dir (misc
-        helpviewer utf8qtextstream hash
+        helpviewer utf8qtextstream hash scalableicon
         )
 
     add_component_qt_dir (files
@@ -468,14 +547,15 @@ if (USE_QT)
         qtconfigpath
         )
 
-    QT_WRAP_UI(ESM_UI_HDR ${ESM_UI})
-endif()
+    add_component_qt_dir (platform
+        application
+        )
 
-if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
-        add_definitions(-fPIC)
-    endif()
-endif ()
+    add_component_qt_dir (vfs
+        qtconversion
+        )
+
+endif()
 
 include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -483,6 +563,10 @@ find_package(SQLite3 REQUIRED)
 
 add_library(components STATIC ${COMPONENT_FILES})
 
+if (ANDROID)
+    set_property(TARGET components PROPERTY POSITION_INDEPENDENT_CODE ON)
+endif()
+
 target_link_libraries(components
     ${COLLADA_DOM_LIBRARIES}
 
@@ -502,11 +586,11 @@ target_link_libraries(components
     ${OSG_LIBRARIES}
     ${OPENTHREADS_LIBRARIES}
 
-    ${Boost_SYSTEM_LIBRARY}
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${Boost_IOSTREAMS_LIBRARY}
+    Boost::system
+    Boost::program_options
+    Boost::iostreams
 
-    ${SDL2_LIBRARIES}
+    SDL2::SDL2
     ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}
     ${LUA_LIBRARIES}
@@ -528,22 +612,15 @@ else()
     target_link_libraries(components yaml-cpp)
 endif()
 
-if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0)
-    target_link_libraries(components ${Boost_ATOMIC_LIBRARY})
-endif()
-
 target_link_libraries(components ${BULLET_LIBRARIES})
 
-if (WIN32)
-    target_link_libraries(components
-    ${Boost_LOCALE_LIBRARY}
-    ${Boost_ZLIB_LIBRARY})
-endif()
-
 if (USE_QT)
-    add_library(components_qt STATIC ${COMPONENT_QT_FILES} ${ESM_UI_HDR})
+    add_library(components_qt STATIC ${COMPONENT_QT_FILES})
     target_link_libraries(components_qt components Qt::Widgets Qt::Core)
-    target_compile_definitions(components_qt PRIVATE OPENMW_DOC_BASEURL="${OPENMW_DOC_BASEURL}")
+
+    if (BUILD_LAUNCHER OR BUILD_WIZARD)
+        add_dependencies(components_qt qm-files)
+    endif()
 
     if (BUILD_WITH_CODE_COVERAGE)
         target_compile_options(components_qt PRIVATE --coverage)
@@ -551,10 +628,6 @@ if (USE_QT)
     endif()
 endif()
 
-if (GIT_CHECKOUT)
-    add_dependencies (components git-version)
-endif (GIT_CHECKOUT)
-
 if (OSG_STATIC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
     find_package(X11 REQUIRED COMPONENTS Xinerama Xrandr)
     target_link_libraries(components ${CMAKE_DL_LIBS} X11::X11 X11::Xinerama X11::Xrandr)
@@ -583,6 +656,7 @@ endif()
 set(COMPONENT_FILES ${COMPONENT_FILES} PARENT_SCOPE)
 
 target_compile_definitions(components PUBLIC BT_USE_DOUBLE_PRECISION)
+target_compile_definitions(components PRIVATE OPENMW_DOC_BASEURL="${OPENMW_DOC_BASEURL}")
 
 if(OSG_STATIC)
     unset(_osg_plugins_static_files)
@@ -614,9 +688,11 @@ endif(OSG_STATIC)
 
 if(USE_QT)
     set_property(TARGET components_qt PROPERTY AUTOMOC ON)
+    set_property(TARGET components_qt PROPERTY AUTOUIC ON)
+    set_property(TARGET components_qt PROPERTY AUTOUIC_SEARCH_PATHS contentselector)
 endif(USE_QT)
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(components PUBLIC
         <sol/sol.hpp>
 
diff --git a/components/bgsm/file.cpp b/components/bgsm/file.cpp
new file mode 100644
index 0000000000..2aaacaf25c
--- /dev/null
+++ b/components/bgsm/file.cpp
@@ -0,0 +1,236 @@
+#include "file.hpp"
+
+#include <array>
+#include <stdexcept>
+
+#include "stream.hpp"
+
+namespace Bgsm
+{
+    MaterialFilePtr parse(Files::IStreamPtr&& inputStream)
+    {
+        std::shared_ptr<Bgsm::MaterialFile> file;
+        BGSMStream stream(std::move(inputStream));
+
+        std::array<char, 4> signature;
+        stream.readArray(signature);
+        std::string shaderType(signature.data(), 4);
+        if (shaderType == "BGEM")
+        {
+            file = std::make_shared<BGEMFile>();
+            file->mShaderType = Bgsm::ShaderType::Effect;
+        }
+        else if (shaderType == "BGSM")
+        {
+            file = std::make_shared<BGSMFile>();
+            file->mShaderType = Bgsm::ShaderType::Lighting;
+        }
+        else
+            throw std::runtime_error("Invalid material file");
+
+        file->read(stream);
+        return file;
+    }
+
+    void MaterialFile::read(BGSMStream& stream)
+    {
+        stream.read(mVersion);
+        stream.read(mClamp);
+        stream.read(mUVOffset);
+        stream.read(mUVScale);
+        stream.read(mTransparency);
+        stream.read(mAlphaBlend);
+        stream.read(mSourceBlendMode);
+        stream.read(mDestinationBlendMode);
+        stream.read(mAlphaTestThreshold);
+        stream.read(mAlphaTest);
+        stream.read(mDepthWrite);
+        stream.read(mDepthTest);
+        stream.read(mSSR);
+        stream.read(mWetnessControlSSR);
+        stream.read(mDecal);
+        stream.read(mTwoSided);
+        stream.read(mDecalNoFade);
+        stream.read(mNonOccluder);
+        stream.read(mRefraction);
+        stream.read(mRefractionFalloff);
+        stream.read(mRefractionPower);
+        if (mVersion < 10)
+        {
+            stream.read(mEnvMapEnabled);
+            stream.read(mEnvMapMaskScale);
+        }
+        else
+        {
+            stream.read(mDepthBias);
+        }
+        stream.read(mGrayscaleToPaletteColor);
+        if (mVersion >= 6)
+            stream.read(mMaskWrites);
+    }
+
+    void BGSMFile::read(BGSMStream& stream)
+    {
+        MaterialFile::read(stream);
+
+        stream.read(mDiffuseMap);
+        stream.read(mNormalMap);
+        stream.read(mSmoothSpecMap);
+        stream.read(mGrayscaleMap);
+        if (mVersion >= 3)
+        {
+            stream.read(mGlowMap);
+            stream.read(mWrinkleMap);
+            stream.read(mSpecularMap);
+            stream.read(mLightingMap);
+            stream.read(mFlowMap);
+            if (mVersion >= 17)
+                stream.read(mDistanceFieldAlphaMap);
+        }
+        else
+        {
+            stream.read(mEnvMap);
+            stream.read(mGlowMap);
+            stream.read(mInnerLayerMap);
+            stream.read(mWrinkleMap);
+            stream.read(mDisplacementMap);
+        }
+        stream.read(mEnableEditorAlphaThreshold);
+        if (mVersion >= 8)
+        {
+            stream.read(mTranslucency);
+            stream.read(mTranslucencyThickObject);
+            stream.read(mTranslucencyMixAlbedoWithSubsurfaceColor);
+            stream.read(mTranslucencySubsurfaceColor);
+            stream.read(mTranslucencyTransmissiveScale);
+            stream.read(mTranslucencyTurbulence);
+        }
+        else
+        {
+            stream.read(mRimLighting);
+            stream.read(mRimPower);
+            stream.read(mBackLightPower);
+            stream.read(mSubsurfaceLighting);
+            stream.read(mSubsurfaceLightingRolloff);
+        }
+        stream.read(mSpecularEnabled);
+        stream.read(mSpecularColor);
+        stream.read(mSpecularMult);
+        stream.read(mSmoothness);
+        stream.read(mFresnelPower);
+        stream.read(mWetnessControlSpecScale);
+        stream.read(mWetnessControlSpecPowerScale);
+        stream.read(mWetnessControlSpecMinvar);
+        if (mVersion < 10)
+            stream.read(mWetnessControlEnvMapScale);
+        stream.read(mWetnessControlFresnelPower);
+        stream.read(mWetnessControlMetalness);
+        if (mVersion >= 3)
+        {
+            stream.read(mPBR);
+            if (mVersion >= 9)
+            {
+                stream.read(mCustomPorosity);
+                stream.read(mPorosityValue);
+            }
+        }
+        stream.read(mRootMaterialPath);
+        stream.read(mAnisoLighting);
+        stream.read(mEmitEnabled);
+        if (mEmitEnabled)
+            stream.read(mEmittanceColor);
+        stream.read(mEmittanceMult);
+        stream.read(mModelSpaceNormals);
+        stream.read(mExternalEmittance);
+        if (mVersion >= 12)
+        {
+            stream.read(mLumEmittance);
+            if (mVersion >= 13)
+            {
+                stream.read(mUseAdaptiveEmissive);
+                stream.read(mAdaptiveEmissiveExposureParams);
+            }
+        }
+        else if (mVersion < 8)
+        {
+            stream.read(mBackLighting);
+        }
+        stream.read(mReceiveShadows);
+        stream.read(mHideSecret);
+        stream.read(mCastShadows);
+        stream.read(mDissolveFade);
+        stream.read(mAssumeShadowmask);
+        stream.read(mGlowMapEnabled);
+        if (mVersion < 7)
+        {
+            stream.read(mEnvMapWindow);
+            stream.read(mEnvMapEye);
+        }
+        stream.read(mHair);
+        stream.read(mHairTintColor);
+        stream.read(mTree);
+        stream.read(mFacegen);
+        stream.read(mSkinTint);
+        stream.read(mTessellate);
+        if (mVersion < 3)
+        {
+            stream.read(mDisplacementMapParams);
+            stream.read(mTessellationParams);
+        }
+        stream.read(mGrayscaleToPaletteScale);
+        if (mVersion >= 1)
+        {
+            stream.read(mSkewSpecularAlpha);
+            stream.read(mTerrain);
+            if (mTerrain)
+            {
+                if (mVersion == 3)
+                    stream.skip(4); // Unknown
+
+                stream.read(mTerrainParams);
+            }
+        }
+    }
+
+    void BGEMFile::read(BGSMStream& stream)
+    {
+        MaterialFile::read(stream);
+
+        stream.read(mBaseMap);
+        stream.read(mGrayscaleMap);
+        stream.read(mEnvMap);
+        stream.read(mNormalMap);
+        stream.read(mEnvMapMask);
+        if (mVersion >= 11)
+        {
+            stream.read(mSpecularMap);
+            stream.read(mLightingMap);
+            stream.read(mGlowMap);
+        }
+        if (mVersion >= 10)
+        {
+            stream.read(mEnvMapEnabled);
+            stream.read(mEnvMapMaskScale);
+        }
+        stream.read(mBlood);
+        stream.read(mEffectLighting);
+        stream.read(mFalloff);
+        stream.read(mFalloffColor);
+        stream.read(mGrayscaleToPaletteAlpha);
+        stream.read(mSoft);
+        stream.read(mBaseColor);
+        stream.read(mBaseColorScale);
+        stream.read(mFalloffParams);
+        stream.read(mLightingInfluence);
+        stream.read(mEnvmapMinLOD);
+        stream.read(mSoftDepth);
+        if (mVersion >= 11)
+            stream.read(mEmittanceColor);
+        if (mVersion >= 15)
+            stream.read(mAdaptiveEmissiveExposureParams);
+        if (mVersion >= 16)
+            stream.read(mGlowMapEnabled);
+        if (mVersion >= 20)
+            stream.read(mEffectPbrSpecular);
+    }
+}
diff --git a/components/bgsm/file.hpp b/components/bgsm/file.hpp
new file mode 100644
index 0000000000..f2e9904715
--- /dev/null
+++ b/components/bgsm/file.hpp
@@ -0,0 +1,170 @@
+#ifndef OPENMW_COMPONENTS_BGSM_FILE_HPP
+#define OPENMW_COMPONENTS_BGSM_FILE_HPP
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <string_view>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+#include <components/files/istreamptr.hpp>
+
+namespace Bgsm
+{
+    class BGSMStream;
+
+    enum class ShaderType
+    {
+        Lighting,
+        Effect,
+    };
+
+    struct MaterialFile
+    {
+        ShaderType mShaderType;
+        std::uint32_t mVersion;
+        std::uint32_t mClamp;
+        osg::Vec2f mUVOffset, mUVScale;
+        float mTransparency;
+        bool mAlphaBlend;
+        std::uint32_t mSourceBlendMode;
+        std::uint32_t mDestinationBlendMode;
+        std::uint8_t mAlphaTestThreshold;
+        bool mAlphaTest;
+        bool mDepthWrite, mDepthTest;
+        bool mSSR;
+        bool mWetnessControlSSR;
+        bool mDecal;
+        bool mTwoSided;
+        bool mDecalNoFade;
+        bool mNonOccluder;
+        bool mRefraction;
+        bool mRefractionFalloff;
+        float mRefractionPower;
+        bool mEnvMapEnabled;
+        float mEnvMapMaskScale;
+        bool mDepthBias;
+        bool mGrayscaleToPaletteColor;
+        std::uint8_t mMaskWrites;
+
+        MaterialFile() = default;
+        virtual void read(BGSMStream& stream);
+        virtual ~MaterialFile() = default;
+
+        bool wrapT() const { return mClamp & 1; }
+        bool wrapS() const { return mClamp & 2; }
+    };
+
+    struct BGSMFile : MaterialFile
+    {
+        std::string mDiffuseMap;
+        std::string mNormalMap;
+        std::string mSmoothSpecMap;
+        std::string mGrayscaleMap;
+        std::string mGlowMap;
+        std::string mWrinkleMap;
+        std::string mSpecularMap;
+        std::string mLightingMap;
+        std::string mFlowMap;
+        std::string mDistanceFieldAlphaMap;
+        std::string mEnvMap;
+        std::string mInnerLayerMap;
+        std::string mDisplacementMap;
+        bool mEnableEditorAlphaThreshold;
+        bool mTranslucency;
+        bool mTranslucencyThickObject;
+        bool mTranslucencyMixAlbedoWithSubsurfaceColor;
+        osg::Vec3f mTranslucencySubsurfaceColor;
+        float mTranslucencyTransmissiveScale;
+        float mTranslucencyTurbulence;
+        bool mRimLighting;
+        float mRimPower;
+        float mBackLightPower;
+        bool mSubsurfaceLighting;
+        float mSubsurfaceLightingRolloff;
+        bool mSpecularEnabled;
+        osg::Vec3f mSpecularColor;
+        float mSpecularMult;
+        float mSmoothness;
+        float mFresnelPower;
+        float mWetnessControlSpecScale;
+        float mWetnessControlSpecPowerScale;
+        float mWetnessControlSpecMinvar;
+        float mWetnessControlEnvMapScale;
+        float mWetnessControlFresnelPower;
+        float mWetnessControlMetalness;
+        bool mPBR;
+        bool mCustomPorosity;
+        float mPorosityValue;
+        std::string mRootMaterialPath;
+        bool mAnisoLighting;
+        bool mEmitEnabled;
+        osg::Vec3f mEmittanceColor;
+        float mEmittanceMult;
+        bool mModelSpaceNormals;
+        bool mExternalEmittance;
+        float mLumEmittance;
+        bool mUseAdaptiveEmissive;
+        osg::Vec3f mAdaptiveEmissiveExposureParams;
+        bool mBackLighting;
+        bool mReceiveShadows;
+        bool mHideSecret;
+        bool mCastShadows;
+        bool mDissolveFade;
+        bool mAssumeShadowmask;
+        bool mGlowMapEnabled;
+        bool mEnvMapWindow;
+        bool mEnvMapEye;
+        bool mHair;
+        osg::Vec3f mHairTintColor;
+        bool mTree;
+        bool mFacegen;
+        bool mSkinTint;
+        bool mTessellate;
+        osg::Vec2f mDisplacementMapParams;
+        osg::Vec3f mTessellationParams;
+        float mGrayscaleToPaletteScale;
+        bool mSkewSpecularAlpha;
+        bool mTerrain;
+        osg::Vec3f mTerrainParams;
+
+        void read(BGSMStream& stream) override;
+    };
+
+    struct BGEMFile : MaterialFile
+    {
+        std::string mBaseMap;
+        std::string mGrayscaleMap;
+        std::string mEnvMap;
+        std::string mNormalMap;
+        std::string mEnvMapMask;
+        std::string mSpecularMap;
+        std::string mLightingMap;
+        std::string mGlowMap;
+        bool mBlood;
+        bool mEffectLighting;
+        bool mFalloff;
+        bool mFalloffColor;
+        bool mGrayscaleToPaletteAlpha;
+        bool mSoft;
+        osg::Vec3f mBaseColor;
+        float mBaseColorScale;
+        osg::Vec4f mFalloffParams;
+        float mLightingInfluence;
+        std::uint8_t mEnvmapMinLOD;
+        float mSoftDepth;
+        osg::Vec3f mEmittanceColor;
+        osg::Vec3f mAdaptiveEmissiveExposureParams;
+        bool mGlowMapEnabled;
+        bool mEffectPbrSpecular;
+
+        void read(BGSMStream& stream) override;
+    };
+
+    using MaterialFilePtr = std::shared_ptr<const Bgsm::MaterialFile>;
+    MaterialFilePtr parse(Files::IStreamPtr&& stream);
+}
+#endif
diff --git a/components/bgsm/stream.cpp b/components/bgsm/stream.cpp
new file mode 100644
index 0000000000..c4fa9c1d8c
--- /dev/null
+++ b/components/bgsm/stream.cpp
@@ -0,0 +1,39 @@
+#include "stream.hpp"
+
+namespace Bgsm
+{
+    template <>
+    void BGSMStream::read<osg::Vec2f>(osg::Vec2f& vec)
+    {
+        readBufferOfType(mStream, vec._v);
+    }
+
+    template <>
+    void BGSMStream::read<osg::Vec3f>(osg::Vec3f& vec)
+    {
+        readBufferOfType(mStream, vec._v);
+    }
+
+    template <>
+    void BGSMStream::read<osg::Vec4f>(osg::Vec4f& vec)
+    {
+        readBufferOfType(mStream, vec._v);
+    }
+
+    template <>
+    void BGSMStream::read<std::string>(std::string& str)
+    {
+        std::uint32_t length;
+        read(length);
+        // Prevent potential memory allocation freezes; strings this long are not expected in BGSM
+        if (length > 1024)
+            throw std::runtime_error("Requested string length is too large: " + std::to_string(length));
+        str = std::string(length, '\0');
+        mStream->read(str.data(), length);
+        if (mStream->bad())
+            throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
+        std::size_t end = str.find('\0');
+        if (end != std::string::npos)
+            str.erase(end);
+    }
+}
diff --git a/components/bgsm/stream.hpp b/components/bgsm/stream.hpp
new file mode 100644
index 0000000000..a355523367
--- /dev/null
+++ b/components/bgsm/stream.hpp
@@ -0,0 +1,77 @@
+#ifndef OPENMW_COMPONENTS_BGSM_STREAM_HPP
+#define OPENMW_COMPONENTS_BGSM_STREAM_HPP
+
+#include <array>
+#include <cassert>
+#include <cstdint>
+#include <istream>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+
+#include <components/files/istreamptr.hpp>
+#include <components/misc/endianness.hpp>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+namespace Bgsm
+{
+    template <std::size_t numInstances, typename T>
+    inline void readBufferOfType(Files::IStreamPtr& pIStream, T* dest)
+    {
+        static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
+        pIStream->read(reinterpret_cast<char*>(dest), numInstances * sizeof(T));
+        if (pIStream->bad())
+            throw std::runtime_error("Failed to read typed (" + std::string(typeid(T).name()) + ") buffer of "
+                + std::to_string(numInstances) + " instances");
+        if constexpr (Misc::IS_BIG_ENDIAN)
+            for (std::size_t i = 0; i < numInstances; i++)
+                Misc::swapEndiannessInplace(dest[i]);
+    }
+
+    template <std::size_t numInstances, typename T>
+    inline void readBufferOfType(Files::IStreamPtr& pIStream, T (&dest)[numInstances])
+    {
+        readBufferOfType<numInstances>(pIStream, static_cast<T*>(dest));
+    }
+
+    class BGSMStream
+    {
+        Files::IStreamPtr mStream;
+
+    public:
+        explicit BGSMStream(Files::IStreamPtr&& stream)
+            : mStream(std::move(stream))
+        {
+        }
+
+        void skip(size_t size) { mStream->ignore(size); }
+
+        /// Read into a single instance of type
+        template <class T>
+        void read(T& data)
+        {
+            readBufferOfType<1>(mStream, &data);
+        }
+
+        /// Read multiple instances of type into an array
+        template <class T, size_t size>
+        void readArray(std::array<T, size>& arr)
+        {
+            readBufferOfType<size>(mStream, arr.data());
+        }
+    };
+
+    template <>
+    void BGSMStream::read<osg::Vec2f>(osg::Vec2f& vec);
+    template <>
+    void BGSMStream::read<osg::Vec3f>(osg::Vec3f& vec);
+    template <>
+    void BGSMStream::read<osg::Vec4f>(osg::Vec4f& vec);
+    template <>
+    void BGSMStream::read<std::string>(std::string& str);
+}
+
+#endif
diff --git a/components/bsa/ba2dx10file.cpp b/components/bsa/ba2dx10file.cpp
index af49c277ad..502ca043ab 100644
--- a/components/bsa/ba2dx10file.cpp
+++ b/components/bsa/ba2dx10file.cpp
@@ -6,17 +6,21 @@
 
 #include <lz4frame.h>
 
-#include <boost/iostreams/copy.hpp>
-#include <boost/iostreams/filtering_stream.hpp>
-#include <boost/iostreams/filtering_streambuf.hpp>
-
 #if defined(_MSC_VER)
+// why is this necessary? These are included with /external:I
 #pragma warning(push)
 #pragma warning(disable : 4706)
+#pragma warning(disable : 4702)
+#include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 #pragma warning(pop)
 #else
+#include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 #endif
 
 #include <boost/iostreams/device/array.hpp>
@@ -76,7 +80,7 @@ namespace Bsa
                     fail("Corrupted BSA");
             }
 
-            mFolders[dirHash][{ nameHash, extHash }] = file;
+            mFolders[dirHash][{ nameHash, extHash }] = std::move(file);
 
             FileStruct fileStruct{};
             mFiles.push_back(fileStruct);
@@ -109,11 +113,26 @@ namespace Bsa
             input.read(reinterpret_cast<char*>(header), 16);
             input.read(reinterpret_cast<char*>(&fileTableOffset), 8);
 
-            if (header[0] == 0x00415342) /*"BSA\x00"*/
-                fail("Unrecognized compressed BSA format");
+            if (header[0] != ESM::fourCC("BTDX"))
+                fail("Unrecognized BA2 signature");
             mVersion = header[1];
-            if (mVersion != 0x01 /*F04*/)
-                fail("Unrecognized compressed BSA version");
+            switch (static_cast<BA2Version>(mVersion))
+            {
+                case BA2Version::Fallout4:
+                case BA2Version::Fallout4NextGen_v7:
+                case BA2Version::Fallout4NextGen_v8:
+                    break;
+                case BA2Version::StarfieldDDS:
+                    uint64_t dummy;
+                    input.read(reinterpret_cast<char*>(&dummy), 8);
+                    uint32_t compressionMethod;
+                    input.read(reinterpret_cast<char*>(&compressionMethod), 4);
+                    if (compressionMethod == 3)
+                        fail("Unsupported LZ4-compressed DDS BA2");
+                    break;
+                default:
+                    fail("Unrecognized DDS BA2 version");
+            }
 
             type = header[2];
             fileCount = header[3];
@@ -172,7 +191,7 @@ namespace Bsa
             return std::nullopt; // folder not found
 
         uint32_t fileHash = generateHash(fileName);
-        uint32_t extHash = *reinterpret_cast<const uint32_t*>(ext.data() + 1);
+        uint32_t extHash = generateExtensionHash(ext);
         auto iter = it->second.find({ fileHash, extHash });
         if (iter == it->second.end())
             return std::nullopt; // file not found
diff --git a/components/bsa/ba2file.cpp b/components/bsa/ba2file.cpp
index b4fc7f9ec2..17cfb03866 100644
--- a/components/bsa/ba2file.cpp
+++ b/components/bsa/ba2file.cpp
@@ -46,4 +46,12 @@ namespace Bsa
         return result;
     }
 
+    uint32_t generateExtensionHash(std::string_view extension)
+    {
+        uint32_t result = 0;
+        for (size_t i = 0; i < 4 && i < extension.size() - 1; i++)
+            result |= static_cast<uint8_t>(extension[i + 1]) << (8 * i);
+        return result;
+    }
+
 } // namespace Bsa
diff --git a/components/bsa/ba2file.hpp b/components/bsa/ba2file.hpp
index e5a68d3caa..9a68d3afd0 100644
--- a/components/bsa/ba2file.hpp
+++ b/components/bsa/ba2file.hpp
@@ -7,6 +7,16 @@
 namespace Bsa
 {
     uint32_t generateHash(const std::string& name);
+    uint32_t generateExtensionHash(std::string_view extension);
+
+    enum class BA2Version : std::uint32_t
+    {
+        Fallout4 = 1,
+        StarfieldGeneral = 2,
+        StarfieldDDS = 3,
+        Fallout4NextGen_v7 = 7,
+        Fallout4NextGen_v8 = 8,
+    };
 }
 
 #endif
diff --git a/components/bsa/ba2gnrlfile.cpp b/components/bsa/ba2gnrlfile.cpp
index bdb0457034..63dd3d1d50 100644
--- a/components/bsa/ba2gnrlfile.cpp
+++ b/components/bsa/ba2gnrlfile.cpp
@@ -6,16 +6,19 @@
 
 #include <lz4frame.h>
 
-#include <boost/iostreams/copy.hpp>
-#include <boost/iostreams/filtering_streambuf.hpp>
-
 #if defined(_MSC_VER)
+// why is this necessary? These are included with /external:I
 #pragma warning(push)
 #pragma warning(disable : 4706)
+#pragma warning(disable : 4702)
+#include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 #pragma warning(pop)
 #else
+#include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 #endif
 
 #include <boost/iostreams/device/array.hpp>
@@ -104,11 +107,22 @@ namespace Bsa
             input.read(reinterpret_cast<char*>(header), 16);
             input.read(reinterpret_cast<char*>(&fileTableOffset), 8);
 
-            if (header[0] == 0x00415342) /*"BSA\x00"*/
-                fail("Unrecognized compressed BSA format");
+            if (header[0] != ESM::fourCC("BTDX"))
+                fail("Unrecognized BA2 signature");
             mVersion = header[1];
-            if (mVersion != 0x01 /*FO4*/)
-                fail("Unrecognized compressed BSA version");
+            switch (static_cast<BA2Version>(mVersion))
+            {
+                case BA2Version::Fallout4:
+                case BA2Version::Fallout4NextGen_v7:
+                case BA2Version::Fallout4NextGen_v8:
+                    break;
+                case BA2Version::StarfieldGeneral:
+                    uint64_t dummy;
+                    input.read(reinterpret_cast<char*>(&dummy), 8);
+                    break;
+                default:
+                    fail("Unrecognized general BA2 version");
+            }
 
             type = header[2];
             fileCount = header[3];
@@ -167,7 +181,7 @@ namespace Bsa
             return FileRecord(); // folder not found, return default which has offset of sInvalidOffset
 
         uint32_t fileHash = generateHash(fileName);
-        uint32_t extHash = *reinterpret_cast<const uint32_t*>(ext.data() + 1);
+        uint32_t extHash = generateExtensionHash(ext);
         auto iter = it->second.find({ fileHash, extHash });
         if (iter == it->second.end())
             return FileRecord(); // file not found, return default which has offset of sInvalidOffset
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index b3e24c75ab..46639a729e 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -325,43 +325,33 @@ BsaVersion Bsa::BSAFile::detectVersion(const std::filesystem::path& filePath)
 {
     std::ifstream input(filePath, std::ios_base::binary);
 
-    // Total archive size
-    std::streamoff fsize = 0;
-    if (input.seekg(0, std::ios_base::end))
-    {
-        fsize = input.tellg();
-        input.seekg(0);
-    }
-
-    if (fsize < 12)
-    {
-        return BSAVER_UNKNOWN;
-    }
-
     // Get essential header numbers
 
     // First 12 bytes
     uint32_t head[3];
 
-    input.read(reinterpret_cast<char*>(head), 12);
+    input.read(reinterpret_cast<char*>(head), sizeof(head));
 
-    if (head[0] == static_cast<uint32_t>(BSAVER_UNCOMPRESSED))
+    if (input.gcount() != sizeof(head))
+        return BsaVersion::Unknown;
+
+    if (head[0] == static_cast<uint32_t>(BsaVersion::Uncompressed))
     {
-        return BSAVER_UNCOMPRESSED;
+        return BsaVersion::Uncompressed;
     }
 
-    if (head[0] == static_cast<uint32_t>(BSAVER_COMPRESSED) || head[0] == ESM::fourCC("BTDX"))
+    if (head[0] == static_cast<uint32_t>(BsaVersion::Compressed))
     {
-        if (head[1] == static_cast<uint32_t>(0x01))
-        {
-            if (head[2] == ESM::fourCC("GNRL"))
-                return BSAVER_BA2_GNRL;
-            if (head[2] == ESM::fourCC("DX10"))
-                return BSAVER_BA2_DX10;
-            return BSAVER_UNKNOWN;
-        }
-        return BSAVER_COMPRESSED;
+        return BsaVersion::Compressed;
     }
 
-    return BSAVER_UNKNOWN;
+    if (head[0] == ESM::fourCC("BTDX"))
+    {
+        if (head[2] == ESM::fourCC("GNRL"))
+            return BsaVersion::BA2GNRL;
+        if (head[2] == ESM::fourCC("DX10"))
+            return BsaVersion::BA2DX10;
+    }
+
+    return BsaVersion::Unknown;
 }
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 8a953245d2..03a0703885 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -35,13 +35,13 @@
 namespace Bsa
 {
 
-    enum BsaVersion
+    enum class BsaVersion : std::uint32_t
     {
-        BSAVER_UNKNOWN = 0x0,
-        BSAVER_UNCOMPRESSED = 0x100,
-        BSAVER_COMPRESSED = 0x415342, // B, S, A,
-        BSAVER_BA2_GNRL, // used by FO4, BSA which contains files
-        BSAVER_BA2_DX10 // used by FO4, BSA which contains textures
+        Unknown = 0x0,
+        Uncompressed = 0x100,
+        Compressed = 0x415342, // B, S, A,
+        BA2GNRL, // used by FO4, BSA which contains files
+        BA2DX10 // used by FO4, BSA which contains textures
     };
 
     /**
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 934197e6ca..14d90f5d91 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -30,16 +30,18 @@
 
 #include <lz4frame.h>
 
-#include <boost/iostreams/copy.hpp>
-#include <boost/iostreams/filtering_streambuf.hpp>
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable : 4706)
+#pragma warning(disable : 4702)
+#include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 #pragma warning(pop)
 #else
+#include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
+#include <boost/iostreams/filtering_streambuf.hpp>
 #endif
 
 #include <boost/iostreams/device/array.hpp>
@@ -70,7 +72,7 @@ namespace Bsa
 
         input.read(reinterpret_cast<char*>(&mHeader), sizeof(mHeader));
 
-        if (mHeader.mFormat != BSAVER_COMPRESSED) // BSA
+        if (mHeader.mFormat != static_cast<std::uint32_t>(BsaVersion::Compressed)) // BSA
             fail("Unrecognized compressed BSA format");
         if (mHeader.mVersion != Version_TES4 && mHeader.mVersion != Version_FO3 && mHeader.mVersion != Version_SSE)
             fail("Unrecognized compressed BSA version");
@@ -144,8 +146,9 @@ namespace Bsa
                 input.read(reinterpret_cast<char*>(&file.mOffset), 4);
             }
         }
+
         if (mHeader.mFolderNamesLength != 0)
-            fail("Failed to read folder names: " + std::to_string(mHeader.mFolderNamesLength) + " bytes remaining");
+            input.ignore(mHeader.mFolderNamesLength);
 
         if (input.bad())
             fail("Failed to read compressed BSA file records: input error");
@@ -167,18 +170,18 @@ namespace Bsa
                     name.resize(input.gcount());
                     if (name.back() != '\0')
                         fail("Failed to read a filename: filename is too long");
-                    mHeader.mFileNamesLength -= input.gcount();
+                    mHeader.mFileNamesLength -= static_cast<std::uint32_t>(input.gcount());
                     file.mName.insert(file.mName.begin(), folder.mName.begin(), folder.mName.end());
                     file.mName.insert(file.mName.begin() + folder.mName.size(), '\\');
                 }
             }
-
-            if (input.bad())
-                fail("Failed to read compressed BSA filenames: input error");
         }
 
         if (mHeader.mFileNamesLength != 0)
-            fail("Failed to read file names: " + std::to_string(mHeader.mFileNamesLength) + " bytes remaining");
+            input.ignore(mHeader.mFileNamesLength);
+
+        if (input.bad())
+            fail("Failed to read compressed BSA filenames: input error");
 
         for (auto& [folder, filelist] : folders)
         {
diff --git a/components/compiler/declarationparser.cpp b/components/compiler/declarationparser.cpp
index d23e3c141a..19d2bae976 100644
--- a/components/compiler/declarationparser.cpp
+++ b/components/compiler/declarationparser.cpp
@@ -2,7 +2,9 @@
 
 #include <components/misc/strings/lower.hpp>
 
+#include "context.hpp"
 #include "errorhandler.hpp"
+#include "extensions.hpp"
 #include "locals.hpp"
 #include "scanner.hpp"
 #include "skipparser.hpp"
@@ -70,6 +72,15 @@ bool Compiler::DeclarationParser::parseKeyword(int keyword, const TokenLoc& loc,
     else if (mState == State_Name)
     {
         // allow keywords to be used as local variable names. MW script compiler, you suck!
+        if (const Extensions* extensions = getContext().getExtensions())
+        {
+            std::string argumentType;
+            bool hasExplicit = false;
+            char returnType;
+            if (extensions->isFunction(keyword, returnType, argumentType, hasExplicit))
+                getErrorHandler().warning("Local variable declaration shadows a function", loc);
+        }
+
         return parseName(loc.mLiteral, loc, scanner);
     }
     else if (mState == State_End)
@@ -104,6 +115,7 @@ bool Compiler::DeclarationParser::parseInt(int value, const TokenLoc& loc, Scann
     if (mState == State_Name)
     {
         // Allow integers to be used as variable names
+        getErrorHandler().warning("Integer is used as a local variable name", loc);
         return parseName(loc.mLiteral, loc, scanner);
     }
     return Parser::parseInt(value, loc, scanner);
diff --git a/components/compiler/extensions.cpp b/components/compiler/extensions.cpp
index 8431589769..2ad5828be4 100644
--- a/components/compiler/extensions.cpp
+++ b/components/compiler/extensions.cpp
@@ -51,11 +51,11 @@ namespace Compiler
     }
 
     void Extensions::registerFunction(
-        const std::string& keyword, ScriptReturn returnType, const ScriptArgs& argumentType, int code, int codeExplicit)
+        std::string_view keyword, ScriptReturn returnType, std::string_view argumentType, int code, int codeExplicit)
     {
         Function function;
 
-        if (argumentType.find('/') == std::string::npos)
+        if (argumentType.find('/') == std::string_view::npos)
         {
             function.mSegment = 5;
             assert(code >= 33554432 && code <= 67108863);
@@ -70,22 +70,22 @@ namespace Compiler
 
         int keywordIndex = mNextKeywordIndex--;
 
-        mKeywords.insert(std::make_pair(keyword, keywordIndex));
+        mKeywords.emplace(keyword, keywordIndex);
 
         function.mReturn = returnType;
         function.mArguments = argumentType;
         function.mCode = code;
         function.mCodeExplicit = codeExplicit;
 
-        mFunctions.insert(std::make_pair(keywordIndex, function));
+        mFunctions.emplace(keywordIndex, std::move(function));
     }
 
     void Extensions::registerInstruction(
-        const std::string& keyword, const ScriptArgs& argumentType, int code, int codeExplicit)
+        std::string_view keyword, std::string_view argumentType, int code, int codeExplicit)
     {
         Instruction instruction;
 
-        if (argumentType.find('/') == std::string::npos)
+        if (argumentType.find('/') == std::string_view::npos)
         {
             instruction.mSegment = 5;
             assert(code >= 33554432 && code <= 67108863);
@@ -100,13 +100,13 @@ namespace Compiler
 
         int keywordIndex = mNextKeywordIndex--;
 
-        mKeywords.insert(std::make_pair(keyword, keywordIndex));
+        mKeywords.emplace(keyword, keywordIndex);
 
         instruction.mArguments = argumentType;
         instruction.mCode = code;
         instruction.mCodeExplicit = codeExplicit;
 
-        mInstructions.insert(std::make_pair(keywordIndex, instruction));
+        mInstructions.emplace(keywordIndex, std::move(instruction));
     }
 
     void Extensions::generateFunctionCode(int keyword, std::vector<Interpreter::Type_Code>& code, Literals& literals,
diff --git a/components/compiler/extensions.hpp b/components/compiler/extensions.hpp
index 016a53d725..b07c666861 100644
--- a/components/compiler/extensions.hpp
+++ b/components/compiler/extensions.hpp
@@ -80,7 +80,7 @@ namespace Compiler
         /// \param explicitReference In: has explicit reference; Out: set to false, if
         /// explicit reference is not available for this instruction.
 
-        void registerFunction(const std::string& keyword, ScriptReturn returnType, const ScriptArgs& argumentType,
+        void registerFunction(std::string_view keyword, ScriptReturn returnType, std::string_view argumentType,
             int code, int codeExplicit = -1);
         ///< Register a custom function
         /// - keyword must be all lower case.
@@ -89,7 +89,7 @@ namespace Compiler
         /// \note Currently only segment 3 and segment 5 opcodes are supported.
 
         void registerInstruction(
-            const std::string& keyword, const ScriptArgs& argumentType, int code, int codeExplicit = -1);
+            std::string_view keyword, std::string_view argumentType, int code, int codeExplicit = -1);
         ///< Register a custom instruction
         /// - keyword must be all lower case.
         /// - keyword must be unique
diff --git a/components/compiler/fileparser.cpp b/components/compiler/fileparser.cpp
index d699f54ca4..ac0f28de10 100644
--- a/components/compiler/fileparser.cpp
+++ b/components/compiler/fileparser.cpp
@@ -1,5 +1,7 @@
 #include "fileparser.hpp"
 
+#include <components/misc/strings/algorithm.hpp>
+
 #include "scanner.hpp"
 #include "tokenloc.hpp"
 
@@ -12,11 +14,6 @@ namespace Compiler
     {
     }
 
-    std::string FileParser::getName() const
-    {
-        return mName;
-    }
-
     Interpreter::Program FileParser::getProgram() const
     {
         return mScriptParser.getProgram();
@@ -39,7 +36,7 @@ namespace Compiler
         if (mState == EndNameState)
         {
             // optional repeated name after end statement
-            if (mName != name)
+            if (!Misc::StringUtils::ciEqual(mName, name))
                 reportWarning("Names for script " + mName + " do not match", loc);
 
             mState = EndCompleteState;
@@ -79,7 +76,7 @@ namespace Compiler
         if (mState == EndNameState)
         {
             // optional repeated name after end statement
-            if (mName != loc.mLiteral)
+            if (!Misc::StringUtils::ciEqual(mName, loc.mLiteral))
                 reportWarning("Names for script " + mName + " do not match", loc);
 
             mState = EndCompleteState;
diff --git a/components/compiler/fileparser.hpp b/components/compiler/fileparser.hpp
index 19e82344fc..e2a7675330 100644
--- a/components/compiler/fileparser.hpp
+++ b/components/compiler/fileparser.hpp
@@ -28,9 +28,6 @@ namespace Compiler
     public:
         FileParser(ErrorHandler& errorHandler, Context& context);
 
-        std::string getName() const;
-        ///< Return script name.
-
         Interpreter::Program getProgram() const;
 
         const Locals& getLocals() const;
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 460dcfb2f9..90bdac1610 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -271,18 +271,14 @@ namespace Compiler
                     mCode.insert(mCode.end(), code.begin(), code.end());
                     extensions->generateInstructionCode(keyword, mCode, mLiterals, mExplicit, optionals);
 
+                    SkipParser skip(getErrorHandler(), getContext(), true);
+                    scanner.scan(skip);
+
                     mState = EndState;
                     return true;
                 }
-            }
 
-            if (const Extensions* extensions = getContext().getExtensions())
-            {
                 char returnType;
-                std::string argumentType;
-
-                bool hasExplicit = mState == ExplicitState;
-
                 if (extensions->isFunction(keyword, returnType, argumentType, hasExplicit))
                 {
                     if (!hasExplicit && mState == ExplicitState)
@@ -302,6 +298,9 @@ namespace Compiler
                         int optionals = mExprParser.parseArguments(argumentType, scanner, code, keyword);
                         mCode.insert(mCode.end(), code.begin(), code.end());
                         extensions->generateFunctionCode(keyword, mCode, mLiterals, mExplicit, optionals);
+
+                        SkipParser skip(getErrorHandler(), getContext(), true);
+                        scanner.scan(skip);
                     }
                     mState = EndState;
                     return true;
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 4794f569b5..49f3999740 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -63,9 +63,22 @@ namespace Compiler
         switch (mPutback)
         {
             case Putback_Special:
-
+            {
                 mPutback = Putback_None;
+                // Replicate behaviour from scanSpecial so putting something back doesn't change the way it's handled
+                if (mExpectName && (mPutbackCode == S_member || mPutbackCode == S_minus))
+                {
+                    mExpectName = false;
+                    bool cont = false;
+                    bool tolerant = mTolerantNames;
+                    mTolerantNames = true;
+                    MultiChar c{ mPutbackCode == S_member ? '.' : '-' };
+                    scanName(c, parser, cont);
+                    mTolerantNames = tolerant;
+                    return cont;
+                }
                 return parser.parseSpecial(mPutbackCode, mPutbackLoc, *this);
+            }
 
             case Putback_Integer:
 
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index d5cea61e7f..34b122413e 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -70,7 +70,11 @@ namespace Compiler
                 && mData[3] == 0;
         }
 
-        bool isDigit() const { return std::isdigit(mData[0]) && mData[1] == 0 && mData[2] == 0 && mData[3] == 0; }
+        bool isDigit() const
+        {
+            return std::isdigit(static_cast<unsigned char>(mData[0])) && mData[1] == 0 && mData[2] == 0
+                && mData[3] == 0;
+        }
 
         bool isMinusSign() const
         {
@@ -85,7 +89,8 @@ namespace Compiler
             if (isMinusSign())
                 return false;
 
-            return std::isalpha(mData[0]) || mData[1] != 0 || mData[2] != 0 || mData[3] != 0;
+            return std::isalpha(static_cast<unsigned char>(mData[0])) || mData[1] != 0 || mData[2] != 0
+                || mData[3] != 0;
         }
 
         void appendTo(std::string& str) const
diff --git a/components/compiler/skipparser.cpp b/components/compiler/skipparser.cpp
index 0036e93dda..39d834c8ca 100644
--- a/components/compiler/skipparser.cpp
+++ b/components/compiler/skipparser.cpp
@@ -1,39 +1,55 @@
 #include "skipparser.hpp"
 
+#include "errorhandler.hpp"
 #include "scanner.hpp"
 
 namespace Compiler
 {
-    SkipParser::SkipParser(ErrorHandler& errorHandler, const Context& context)
+    SkipParser::SkipParser(ErrorHandler& errorHandler, const Context& context, bool reportStrayArguments)
         : Parser(errorHandler, context)
+        , mReportStrayArguments(reportStrayArguments)
     {
     }
 
+    void SkipParser::reportStrayArgument(const TokenLoc& loc)
+    {
+        if (mReportStrayArguments)
+            getErrorHandler().warning("Extra argument", loc);
+    }
+
     bool SkipParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
     {
+        reportStrayArgument(loc);
         return true;
     }
 
     bool SkipParser::parseFloat(float value, const TokenLoc& loc, Scanner& scanner)
     {
+        reportStrayArgument(loc);
         return true;
     }
 
     bool SkipParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
     {
+        reportStrayArgument(loc);
         return true;
     }
 
     bool SkipParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
     {
+        reportStrayArgument(loc);
         return true;
     }
 
     bool SkipParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
     {
         if (code == Scanner::S_newline)
+        {
+            if (mReportStrayArguments)
+                scanner.putbackSpecial(code, loc);
             return false;
-
+        }
+        reportStrayArgument(loc);
         return true;
     }
 }
diff --git a/components/compiler/skipparser.hpp b/components/compiler/skipparser.hpp
index fdc5effc13..304ed40330 100644
--- a/components/compiler/skipparser.hpp
+++ b/components/compiler/skipparser.hpp
@@ -11,8 +11,12 @@ namespace Compiler
 
     class SkipParser : public Parser
     {
+        bool mReportStrayArguments;
+
+        void reportStrayArgument(const TokenLoc& loc);
+
     public:
-        SkipParser(ErrorHandler& errorHandler, const Context& context);
+        SkipParser(ErrorHandler& errorHandler, const Context& context, bool reportStrayArguments = false);
 
         bool parseInt(int value, const TokenLoc& loc, Scanner& scanner) override;
         ///< Handle an int token.
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 42c11628df..3210716a5c 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -13,7 +13,8 @@ const char Config::GameSettings::sDirectoryKey[] = "data";
 
 namespace
 {
-    QStringList reverse(QStringList values)
+    template <typename T>
+    QList<T> reverse(QList<T> values)
     {
         std::reverse(values.begin(), values.end());
         return values;
@@ -23,83 +24,110 @@ namespace
 Config::GameSettings::GameSettings(const Files::ConfigurationManager& cfg)
     : mCfgMgr(cfg)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    // this needs calling once so Qt can see its stream operators, which it needs when dragging and dropping
+    // it's automatic with Qt 6
+    qRegisterMetaTypeStreamOperators<SettingValue>("Config::SettingValue");
+#endif
 }
 
 void Config::GameSettings::validatePaths()
 {
-    QStringList paths = mSettings.values(QString("data"));
-    Files::PathContainer dataDirs;
+    QList<SettingValue> paths = mSettings.values(QString("data"));
 
-    for (const QString& path : paths)
-    {
-        dataDirs.emplace_back(Files::pathFromQString(path));
-    }
-
-    // Parse the data dirs to convert the tokenized paths
-    mCfgMgr.processPaths(dataDirs, /*basePath=*/"");
     mDataDirs.clear();
 
-    for (const auto& dataDir : dataDirs)
+    for (const auto& dataDir : paths)
     {
-        if (is_directory(dataDir))
-            mDataDirs.append(Files::pathToQString(dataDir));
+        if (QDir(dataDir.value).exists())
+        {
+            SettingValue copy = dataDir;
+            copy.value = QDir(dataDir.value).canonicalPath();
+            mDataDirs.append(copy);
+        }
     }
 
     // Do the same for data-local
-    QString local = mSettings.value(QString("data-local"));
-    if (local.length() && local.at(0) == QChar('\"'))
+    const QString& local = mSettings.value(QString("data-local")).value;
+
+    if (!local.isEmpty() && QDir(local).exists())
     {
-        local.remove(0, 1);
-        local.chop(1);
-    }
-
-    if (local.isEmpty())
-        return;
-
-    dataDirs.clear();
-    dataDirs.emplace_back(Files::pathFromQString(local));
-
-    mCfgMgr.processPaths(dataDirs, /*basePath=*/"");
-
-    if (!dataDirs.empty())
-    {
-        const auto& path = dataDirs.front();
-        if (is_directory(path))
-            mDataLocal = Files::pathToQString(path);
+        mDataLocal = QDir(local).canonicalPath();
     }
 }
 
-std::filesystem::path Config::GameSettings::getGlobalDataDir() const
+QString Config::GameSettings::getResourcesVfs() const
 {
-    // global data dir may not exists if OpenMW is not installed (ie if run from build directory)
-    const auto& path = mCfgMgr.getGlobalDataPath();
-    if (std::filesystem::exists(path))
-        return std::filesystem::canonical(path);
-    return {};
+    QString resources = mSettings.value(QString("resources"), { "./resources", "", "" }).value;
+    resources += "/vfs";
+    return QFileInfo(resources).canonicalFilePath();
 }
 
-QStringList Config::GameSettings::values(const QString& key, const QStringList& defaultValues) const
+QList<Config::SettingValue> Config::GameSettings::values(
+    const QString& key, const QList<SettingValue>& defaultValues) const
 {
     if (!mSettings.values(key).isEmpty())
         return mSettings.values(key);
     return defaultValues;
 }
 
-bool Config::GameSettings::readFile(QTextStream& stream, bool ignoreContent)
+bool Config::GameSettings::containsValue(const QString& key, const QString& value) const
 {
-    return readFile(stream, mSettings, ignoreContent);
+    auto [itr, end] = mSettings.equal_range(key);
+    while (itr != end)
+    {
+        if (itr->value == value)
+            return true;
+        ++itr;
+    }
+    return false;
 }
 
-bool Config::GameSettings::readUserFile(QTextStream& stream, bool ignoreContent)
+bool Config::GameSettings::readFile(QTextStream& stream, const QString& context, bool ignoreContent)
 {
-    return readFile(stream, mUserSettings, ignoreContent);
+    if (readFile(stream, mSettings, context, ignoreContent))
+    {
+        mContexts.push_back(context);
+        return true;
+    }
+    return false;
 }
 
-bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QString>& settings, bool ignoreContent)
+bool Config::GameSettings::readUserFile(QTextStream& stream, const QString& context, bool ignoreContent)
 {
-    QMultiMap<QString, QString> cache;
+    return readFile(stream, mUserSettings, context, ignoreContent);
+}
+
+bool Config::GameSettings::readFile(
+    QTextStream& stream, QMultiMap<QString, SettingValue>& settings, const QString& context, bool ignoreContent)
+{
+    QMultiMap<QString, SettingValue> cache;
+    QRegularExpression replaceRe("^\\s*replace\\s*=\\s*(.+)$");
     QRegularExpression keyRe("^([^=]+)\\s*=\\s*(.+)$");
 
+    auto initialPos = stream.pos();
+
+    while (!stream.atEnd())
+    {
+        QString line = stream.readLine();
+
+        if (line.isEmpty() || line.startsWith("#"))
+            continue;
+
+        QRegularExpressionMatch match = replaceRe.match(line);
+        if (match.hasMatch())
+        {
+            QString key = match.captured(1).trimmed();
+            // Replace composing entries with a replace= line
+            if (key == QLatin1String("config") || key == QLatin1String("replace") || key == QLatin1String("data")
+                || key == QLatin1String("fallback-archive") || key == QLatin1String("content")
+                || key == QLatin1String("groundcover") || key == QLatin1String("fallback"))
+                settings.remove(key);
+        }
+    }
+
+    stream.seek(initialPos);
+
     while (!stream.atEnd())
     {
         QString line = stream.readLine();
@@ -111,27 +139,31 @@ bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QStr
         if (match.hasMatch())
         {
             QString key = match.captured(1).trimmed();
-            QString value = match.captured(2).trimmed();
+            SettingValue value{ match.captured(2).trimmed(), value.value, context };
 
             // Don't remove composing entries
-            if (key != QLatin1String("data") && key != QLatin1String("fallback-archive")
-                && key != QLatin1String("content") && key != QLatin1String("groundcover")
-                && key != QLatin1String("script-blacklist"))
+            if (key != QLatin1String("config") && key != QLatin1String("replace") && key != QLatin1String("data")
+                && key != QLatin1String("fallback-archive") && key != QLatin1String("content")
+                && key != QLatin1String("groundcover") && key != QLatin1String("fallback"))
                 settings.remove(key);
 
-            if (key == QLatin1String("data") || key == QLatin1String("data-local") || key == QLatin1String("resources")
+            if (key == QLatin1String("config") || key == QLatin1String("user-data") || key == QLatin1String("resources")
+                || key == QLatin1String("data") || key == QLatin1String("data-local")
                 || key == QLatin1String("load-savegame"))
             {
                 // Path line (e.g. 'data=...'), so needs processing to deal with ampersands and quotes
-                // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not
-                // work as there are too may QStrings involved
+                // The following is based on boost::io::detail::quoted_manip.hpp, but we don't actually use
+                // boost::filesystem::path anymore, and use a custom class MaybeQuotedPath which uses Boost-like quoting
+                // rules but internally stores as a std::filesystem::path.
+                // Caution: This is intentional behaviour to duplicate how Boost and what we replaced it with worked,
+                // and we rely on that.
                 QChar delim = '\"';
                 QChar escape = '&';
 
-                if (value.at(0) == delim)
+                if (value.value.at(0) == delim)
                 {
-                    QString valueOriginal = value;
-                    value = "";
+                    QString valueOriginal = value.value;
+                    value.value = "";
 
                     for (QString::const_iterator it = valueOriginal.begin() + 1; it != valueOriginal.end(); ++it)
                     {
@@ -139,17 +171,29 @@ bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QStr
                             ++it;
                         else if (*it == delim)
                             break;
-                        value += *it;
+                        value.value += *it;
                     }
+                    value.originalRepresentation = value.value;
                 }
+
+                value = processPathSettingValue(value);
             }
             if (ignoreContent && (key == QLatin1String("content") || key == QLatin1String("data")))
                 continue;
 
-            QStringList values = cache.values(key);
+            QList<SettingValue> values = cache.values(key);
             values.append(settings.values(key));
 
-            if (!values.contains(value))
+            bool exists = false;
+            for (const auto& existingValue : values)
+            {
+                if (existingValue.value == value.value)
+                {
+                    exists = true;
+                    break;
+                }
+            }
+            if (!exists)
             {
                 cache.insert(key, value);
             }
@@ -184,15 +228,16 @@ bool Config::GameSettings::writeFile(QTextStream& stream)
         // Boost-like quoting rules but internally stores as a std::filesystem::path.
         // Caution: This is intentional behaviour to duplicate how Boost and what we replaced it with worked, and we
         // rely on that.
-        if (i.key() == QLatin1String("data") || i.key() == QLatin1String("data-local")
-            || i.key() == QLatin1String("resources") || i.key() == QLatin1String("load-savegame"))
+        if (i.key() == QLatin1String("config") || i.key() == QLatin1String("user-data")
+            || i.key() == QLatin1String("resources") || i.key() == QLatin1String("data")
+            || i.key() == QLatin1String("data-local") || i.key() == QLatin1String("load-savegame"))
         {
             stream << i.key() << "=";
 
             // Equivalent to stream << std::quoted(i.value(), '"', '&'), which won't work on QStrings.
             QChar delim = '\"';
             QChar escape = '&';
-            QString string = i.value();
+            QString string = i.value().originalRepresentation;
 
             stream << delim;
             for (auto& it : string)
@@ -207,7 +252,7 @@ bool Config::GameSettings::writeFile(QTextStream& stream)
             continue;
         }
 
-        stream << i.key() << "=" << i.value() << "\n";
+        stream << i.key() << "=" << i.value().originalRepresentation << "\n";
     }
 
     return true;
@@ -362,16 +407,17 @@ bool Config::GameSettings::writeFileWithComments(QFile& file)
             *iter = QString(); // assume no match
             QString key = match.captured(1);
             QString keyVal = match.captured(1) + "=" + match.captured(2);
-            QMultiMap<QString, QString>::const_iterator i = mUserSettings.find(key);
+            QMultiMap<QString, SettingValue>::const_iterator i = mUserSettings.find(key);
             while (i != mUserSettings.end() && i.key() == key)
             {
-                QString settingLine = i.key() + "=" + i.value();
+                // todo: does this need to handle paths?
+                QString settingLine = i.key() + "=" + i.value().originalRepresentation;
                 QRegularExpressionMatch keyMatch = settingRegex.match(settingLine);
                 if (keyMatch.hasMatch())
                 {
                     if ((keyMatch.captured(1) + "=" + keyMatch.captured(2)) == keyVal)
                     {
-                        *iter = settingLine;
+                        *iter = std::move(settingLine);
                         break;
                     }
                 }
@@ -408,15 +454,16 @@ bool Config::GameSettings::writeFileWithComments(QFile& file)
         // Boost-like quoting rules but internally stores as a std::filesystem::path.
         // Caution: This is intentional behaviour to duplicate how Boost and what we replaced it with worked, and we
         // rely on that.
-        if (it.key() == QLatin1String("data") || it.key() == QLatin1String("data-local")
-            || it.key() == QLatin1String("resources") || it.key() == QLatin1String("load-savegame"))
+        if (it.key() == QLatin1String("config") || it.key() == QLatin1String("user-data")
+            || it.key() == QLatin1String("resources") || it.key() == QLatin1String("data")
+            || it.key() == QLatin1String("data-local") || it.key() == QLatin1String("load-savegame"))
         {
             settingLine = it.key() + "=";
 
             // Equivalent to settingLine += std::quoted(it.value(), '"', '&'), which won't work on QStrings.
             QChar delim = '\"';
             QChar escape = '&';
-            QString string = it.value();
+            QString string = it.value().originalRepresentation;
 
             settingLine += delim;
             for (auto& iter : string)
@@ -428,7 +475,7 @@ bool Config::GameSettings::writeFileWithComments(QFile& file)
             settingLine += delim;
         }
         else
-            settingLine = it.key() + "=" + it.value();
+            settingLine = it.key() + "=" + it.value().originalRepresentation;
 
         QRegularExpressionMatch match = settingRegex.match(settingLine);
         if (match.hasMatch())
@@ -487,11 +534,11 @@ bool Config::GameSettings::writeFileWithComments(QFile& file)
 bool Config::GameSettings::hasMaster()
 {
     bool result = false;
-    QStringList content = mSettings.values(QString(Config::GameSettings::sContentKey));
+    QList<SettingValue> content = mSettings.values(QString(Config::GameSettings::sContentKey));
     for (int i = 0; i < content.count(); ++i)
     {
-        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive)
-            || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive))
+        if (content.at(i).value.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive)
+            || content.at(i).value.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive))
         {
             result = true;
             break;
@@ -502,40 +549,70 @@ bool Config::GameSettings::hasMaster()
 }
 
 void Config::GameSettings::setContentList(
-    const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames)
+    const QList<SettingValue>& dirNames, const QList<SettingValue>& archiveNames, const QStringList& fileNames)
 {
-    auto const reset = [this](const char* key, const QStringList& list) {
-        remove(key);
-        for (auto const& item : list)
-            setMultiValue(key, item);
-    };
-
-    reset(sDirectoryKey, dirNames);
-    reset(sArchiveKey, archiveNames);
-    reset(sContentKey, fileNames);
+    remove(sDirectoryKey);
+    for (auto const& item : dirNames)
+        setMultiValue(sDirectoryKey, item);
+    remove(sArchiveKey);
+    for (auto const& item : archiveNames)
+        setMultiValue(sArchiveKey, item);
+    remove(sContentKey);
+    for (auto const& item : fileNames)
+        setMultiValue(sContentKey, { item });
 }
 
-QStringList Config::GameSettings::getDataDirs() const
+QList<Config::SettingValue> Config::GameSettings::getDataDirs() const
 {
     return reverse(mDataDirs);
 }
 
-QStringList Config::GameSettings::getArchiveList() const
+QList<Config::SettingValue> Config::GameSettings::getArchiveList() const
 {
     // QMap returns multiple rows in LIFO order, so need to reverse
     return reverse(values(sArchiveKey));
 }
 
-QStringList Config::GameSettings::getContentList() const
+QList<Config::SettingValue> Config::GameSettings::getContentList() const
 {
     // QMap returns multiple rows in LIFO order, so need to reverse
     return reverse(values(sContentKey));
 }
 
+bool Config::GameSettings::isUserSetting(const SettingValue& settingValue) const
+{
+    return settingValue.context.isEmpty() || settingValue.context == getUserContext();
+}
+
+Config::SettingValue Config::GameSettings::processPathSettingValue(const SettingValue& value)
+{
+    std::filesystem::path path = Files::pathFromQString(value.value);
+    std::filesystem::path basePath = Files::pathFromQString(value.context.isEmpty() ? getUserContext() : value.context);
+    mCfgMgr.processPath(path, basePath);
+    return SettingValue{ Files::pathToQString(path), value.originalRepresentation, value.context };
+}
+
 void Config::GameSettings::clear()
 {
     mSettings.clear();
+    mContexts.clear();
     mUserSettings.clear();
     mDataDirs.clear();
     mDataLocal.clear();
 }
+
+QDataStream& Config::operator<<(QDataStream& out, const SettingValue& settingValue)
+{
+    out << settingValue.value;
+    out << settingValue.originalRepresentation;
+    out << settingValue.context;
+    return out;
+}
+
+QDataStream& Config::operator>>(QDataStream& in, SettingValue& settingValue)
+{
+    in >> settingValue.value;
+    in >> settingValue.originalRepresentation;
+    in >> settingValue.context;
+    return in;
+}
diff --git a/components/config/gamesettings.hpp b/components/config/gamesettings.hpp
index 34e3dc73ea..4b66e6e8e5 100644
--- a/components/config/gamesettings.hpp
+++ b/components/config/gamesettings.hpp
@@ -17,70 +17,108 @@ namespace Files
 
 namespace Config
 {
+    struct SettingValue
+    {
+        QString value = "";
+        // value as found in openmw.cfg, e.g. relative path with ?slug?
+        QString originalRepresentation = value;
+        // path of openmw.cfg, e.g. to resolve relative paths
+        QString context = "";
+
+        friend std::strong_ordering operator<=>(const SettingValue&, const SettingValue&) = default;
+    };
+
     class GameSettings
     {
     public:
         explicit GameSettings(const Files::ConfigurationManager& cfg);
 
-        inline QString value(const QString& key, const QString& defaultValue = QString())
+        inline SettingValue value(const QString& key, const SettingValue& defaultValue = {})
         {
-            return mSettings.value(key).isEmpty() ? defaultValue : mSettings.value(key);
+            return mSettings.contains(key) ? mSettings.value(key) : defaultValue;
         }
 
-        inline void setValue(const QString& key, const QString& value)
+        inline void setValue(const QString& key, const SettingValue& value)
         {
-            mSettings.remove(key);
+            remove(key);
             mSettings.insert(key, value);
-            mUserSettings.remove(key);
-            mUserSettings.insert(key, value);
+            if (isUserSetting(value))
+                mUserSettings.insert(key, value);
         }
 
-        inline void setMultiValue(const QString& key, const QString& value)
+        inline void setMultiValue(const QString& key, const SettingValue& value)
         {
-            QStringList values = mSettings.values(key);
+            QList<SettingValue> values = mSettings.values(key);
             if (!values.contains(value))
                 mSettings.insert(key, value);
 
-            values = mUserSettings.values(key);
-            if (!values.contains(value))
-                mUserSettings.insert(key, value);
+            if (isUserSetting(value))
+            {
+                values = mUserSettings.values(key);
+                if (!values.contains(value))
+                    mUserSettings.insert(key, value);
+            }
         }
 
         inline void remove(const QString& key)
         {
-            mSettings.remove(key);
+            // simplify to removeIf when Qt5 goes
+            for (auto itr = mSettings.lowerBound(key); itr != mSettings.upperBound(key);)
+            {
+                if (isUserSetting(*itr))
+                    itr = mSettings.erase(itr);
+                else
+                    ++itr;
+            }
             mUserSettings.remove(key);
         }
 
-        QStringList getDataDirs() const;
-        std::filesystem::path getGlobalDataDir() const;
+        QList<SettingValue> getDataDirs() const;
 
-        inline void removeDataDir(const QString& dir)
+        QString getResourcesVfs() const;
+
+        inline void removeDataDir(const QString& existingDir)
         {
-            if (!dir.isEmpty())
-                mDataDirs.removeAll(dir);
+            if (!existingDir.isEmpty())
+            {
+                // non-user settings can't be removed as we can't edit the openmw.cfg they're in
+                mDataDirs.erase(
+                    std::remove_if(mDataDirs.begin(), mDataDirs.end(),
+                        [&](const SettingValue& dir) { return isUserSetting(dir) && dir.value == existingDir; }),
+                    mDataDirs.end());
+            }
         }
-        inline void addDataDir(const QString& dir)
+
+        inline void addDataDir(const SettingValue& dir)
         {
-            if (!dir.isEmpty())
+            if (!dir.value.isEmpty())
                 mDataDirs.append(dir);
         }
+
         inline QString getDataLocal() const { return mDataLocal; }
 
         bool hasMaster();
 
-        QStringList values(const QString& key, const QStringList& defaultValues = QStringList()) const;
+        QList<SettingValue> values(const QString& key, const QList<SettingValue>& defaultValues = {}) const;
+        bool containsValue(const QString& key, const QString& value) const;
 
-        bool readFile(QTextStream& stream, bool ignoreContent = false);
-        bool readFile(QTextStream& stream, QMultiMap<QString, QString>& settings, bool ignoreContent = false);
-        bool readUserFile(QTextStream& stream, bool ignoreContent = false);
+        bool readFile(QTextStream& stream, const QString& context, bool ignoreContent = false);
+        bool readFile(QTextStream& stream, QMultiMap<QString, SettingValue>& settings, const QString& context,
+            bool ignoreContent = false);
+        bool readUserFile(QTextStream& stream, const QString& context, bool ignoreContent = false);
 
         bool writeFile(QTextStream& stream);
         bool writeFileWithComments(QFile& file);
 
-        QStringList getArchiveList() const;
-        void setContentList(const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames);
-        QStringList getContentList() const;
+        QList<SettingValue> getArchiveList() const;
+        void setContentList(
+            const QList<SettingValue>& dirNames, const QList<SettingValue>& archiveNames, const QStringList& fileNames);
+        QList<SettingValue> getContentList() const;
+
+        const QString& getUserContext() const { return mContexts.back(); }
+        bool isUserSetting(const SettingValue& settingValue) const;
+
+        SettingValue processPathSettingValue(const SettingValue& value);
 
         void clear();
 
@@ -88,10 +126,12 @@ namespace Config
         const Files::ConfigurationManager& mCfgMgr;
 
         void validatePaths();
-        QMultiMap<QString, QString> mSettings;
-        QMultiMap<QString, QString> mUserSettings;
+        QMultiMap<QString, SettingValue> mSettings;
+        QMultiMap<QString, SettingValue> mUserSettings;
 
-        QStringList mDataDirs;
+        QStringList mContexts;
+
+        QList<SettingValue> mDataDirs;
         QString mDataLocal;
 
         static const char sArchiveKey[];
@@ -100,5 +140,11 @@ namespace Config
 
         static bool isOrderedLine(const QString& line);
     };
+
+    QDataStream& operator<<(QDataStream& out, const SettingValue& settingValue);
+    QDataStream& operator>>(QDataStream& in, SettingValue& settingValue);
 }
+
+Q_DECLARE_METATYPE(Config::SettingValue)
+
 #endif // GAMESETTINGS_HPP
diff --git a/components/config/launchersettings.cpp b/components/config/launchersettings.cpp
index 9d12535619..27f03e7304 100644
--- a/components/config/launchersettings.cpp
+++ b/components/config/launchersettings.cpp
@@ -1,6 +1,7 @@
 #include "launchersettings.hpp"
 
 #include <QDebug>
+#include <QDir>
 #include <QMultiMap>
 #include <QRegularExpression>
 #include <QString>
@@ -19,12 +20,15 @@ namespace Config
         constexpr char sSettingsSection[] = "Settings";
         constexpr char sGeneralSection[] = "General";
         constexpr char sProfilesSection[] = "Profiles";
+        constexpr char sImporterSection[] = "Importer";
         constexpr char sLanguageKey[] = "language";
         constexpr char sCurrentProfileKey[] = "currentprofile";
         constexpr char sDataKey[] = "data";
         constexpr char sArchiveKey[] = "fallback-archive";
         constexpr char sContentKey[] = "content";
         constexpr char sFirstRunKey[] = "firstrun";
+        constexpr char sImportContentSetupKey[] = "importcontentsetup";
+        constexpr char sImportFontSetupKey[] = "importfontsetup";
         constexpr char sMainWindowWidthKey[] = "MainWindow/width";
         constexpr char sMainWindowHeightKey[] = "MainWindow/height";
         constexpr char sMainWindowPosXKey[] = "MainWindow/posx";
@@ -142,6 +146,16 @@ namespace Config
             return false;
         }
 
+        bool parseImporterSection(const QString& key, const QString& value, LauncherSettings::Importer& importer)
+        {
+            if (key == sImportContentSetupKey)
+                return parseBool(value, importer.mImportContentSetup);
+            if (key == sImportFontSetupKey)
+                return parseBool(value, importer.mImportFontSetup);
+
+            return false;
+        }
+
         template <std::size_t size>
         void writeSectionHeader(const char (&name)[size], QTextStream& stream)
         {
@@ -201,6 +215,13 @@ namespace Config
             writeKeyValue(sMainWindowPosXKey, value.mMainWindow.mPosX, stream);
             writeKeyValue(sMainWindowHeightKey, value.mMainWindow.mHeight, stream);
         }
+
+        void writeImporter(const LauncherSettings::Importer& value, QTextStream& stream)
+        {
+            writeSectionHeader(sImporterSection, stream);
+            writeKeyValue(sImportContentSetupKey, value.mImportContentSetup, stream);
+            writeKeyValue(sImportFontSetupKey, value.mImportFontSetup, stream);
+        }
     }
 }
 
@@ -209,6 +230,7 @@ void Config::LauncherSettings::writeFile(QTextStream& stream) const
     writeSettings(mSettings, stream);
     writeProfiles(mProfiles, stream);
     writeGeneral(mGeneral, stream);
+    writeImporter(mImporter, stream);
 }
 
 QStringList Config::LauncherSettings::getContentLists()
@@ -223,9 +245,25 @@ QStringList Config::LauncherSettings::getContentLists()
 void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
 {
     // obtain content list from game settings (if present)
-    QStringList dirs(gameSettings.getDataDirs());
-    const QStringList archives(gameSettings.getArchiveList());
-    const QStringList files(gameSettings.getContentList());
+    QList<SettingValue> dirs(gameSettings.getDataDirs());
+    dirs.erase(std::remove_if(
+                   dirs.begin(), dirs.end(), [&](const SettingValue& dir) { return !gameSettings.isUserSetting(dir); }),
+        dirs.end());
+    // archives and content files aren't preprocessed, so we don't need to track their original form
+    const QList<SettingValue> archivesOriginal(gameSettings.getArchiveList());
+    QStringList archives;
+    for (const auto& archive : archivesOriginal)
+    {
+        if (gameSettings.isUserSetting(archive))
+            archives.push_back(archive.value);
+    }
+    const QList<SettingValue> filesOriginal(gameSettings.getContentList());
+    QStringList files;
+    for (const auto& file : filesOriginal)
+    {
+        if (gameSettings.isUserSetting(file))
+            files.push_back(file.value);
+    }
 
     // if openmw.cfg has no content, exit so we don't create an empty content list.
     if (dirs.isEmpty() || files.isEmpty())
@@ -233,27 +271,48 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
         return;
     }
 
-    // global and local data directories are not part of any profile
-    const auto globalDataDir = Files::pathToQString(gameSettings.getGlobalDataDir());
+    // local data directory and resources/vfs are not part of any profile
+    const auto resourcesVfs = gameSettings.getResourcesVfs();
     const auto dataLocal = gameSettings.getDataLocal();
-    dirs.removeAll(globalDataDir);
-    dirs.removeAll(dataLocal);
+    dirs.erase(
+        std::remove_if(dirs.begin(), dirs.end(), [&](const SettingValue& dir) { return dir.value == resourcesVfs; }),
+        dirs.end());
+    dirs.erase(
+        std::remove_if(dirs.begin(), dirs.end(), [&](const SettingValue& dir) { return dir.value == dataLocal; }),
+        dirs.end());
 
     // if any existing profile in launcher matches the content list, make that profile the default
     for (const QString& listName : getContentLists())
     {
-        if (files == getContentListFiles(listName) && archives == getArchiveList(listName)
-            && dirs == getDataDirectoryList(listName))
-        {
-            setCurrentContentListName(listName);
-            return;
-        }
+        const auto& listDirs = getDataDirectoryList(listName);
+        constexpr auto compareDataDirectories = [](const SettingValue& dir, const QString& listDir) {
+#ifdef Q_OS_WINDOWS
+            constexpr auto caseSensitivity = Qt::CaseInsensitive;
+#else
+            constexpr auto caseSensitivity = Qt::CaseSensitive;
+#endif
+            return dir.originalRepresentation == listDir
+                || QDir::cleanPath(dir.originalRepresentation).compare(QDir::cleanPath(listDir), caseSensitivity) == 0;
+        };
+        if (!std::ranges::equal(dirs, listDirs, compareDataDirectories))
+            continue;
+        constexpr auto compareFiles
+            = [](const QString& a, const QString& b) { return a.compare(b, Qt::CaseInsensitive) == 0; };
+        if (!std::ranges::equal(files, getContentListFiles(listName), compareFiles))
+            continue;
+        if (!std::ranges::equal(archives, getArchiveList(listName), compareFiles))
+            continue;
+        setCurrentContentListName(listName);
+        return;
     }
 
     // otherwise, add content list
     QString newContentListName(makeNewContentListName());
     setCurrentContentListName(newContentListName);
-    setContentList(newContentListName, dirs, archives, files);
+    QStringList newListDirs;
+    for (const auto& dir : dirs)
+        newListDirs.push_back(dir.originalRepresentation);
+    setContentList(newContentListName, newListDirs, archives, files);
 }
 
 void Config::LauncherSettings::setContentList(const QString& contentListName, const QStringList& dirNames,
@@ -297,6 +356,8 @@ bool Config::LauncherSettings::setValue(const QString& sectionPrefix, const QStr
         return parseProfilesSection(key, value, mProfiles);
     if (sectionPrefix == sGeneralSection)
         return parseGeneralSection(key, value, mGeneral);
+    if (sectionPrefix == sImporterSection)
+        return parseImporterSection(key, value, mImporter);
 
     return false;
 }
@@ -352,4 +413,5 @@ void Config::LauncherSettings::clear()
     mSettings = Settings{};
     mGeneral = General{};
     mProfiles = Profiles{};
+    mImporter = Importer{};
 }
diff --git a/components/config/launchersettings.hpp b/components/config/launchersettings.hpp
index 09f2218549..acc83bff85 100644
--- a/components/config/launchersettings.hpp
+++ b/components/config/launchersettings.hpp
@@ -49,6 +49,12 @@ namespace Config
             std::map<QString, Profile> mValues;
         };
 
+        struct Importer
+        {
+            bool mImportContentSetup = true;
+            bool mImportFontSetup = true;
+        };
+
         void readFile(QTextStream& stream);
 
         void clear();
@@ -87,10 +93,19 @@ namespace Config
 
         void setMainWindow(const MainWindow& value) { mGeneral.mMainWindow = value; }
 
+        bool getImportContentSetup() const { return mImporter.mImportContentSetup; }
+
+        void setImportContentSetup(bool value) { mImporter.mImportContentSetup = value; }
+
+        bool getImportFontSetup() const { return mImporter.mImportFontSetup; }
+
+        void setImportFontSetup(bool value) { mImporter.mImportFontSetup = value; }
+
     private:
         Settings mSettings;
         Profiles mProfiles;
         General mGeneral;
+        Importer mImporter;
 
         bool setValue(const QString& sectionPrefix, const QString& key, const QString& value);
 
diff --git a/files/ui/contentselector.ui b/components/contentselector/contentselector.ui
similarity index 100%
rename from files/ui/contentselector.ui
rename to components/contentselector/contentselector.ui
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 7b4f5db158..fe26d37b97 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -1,12 +1,17 @@
 #include "contentmodel.hpp"
 #include "esmfile.hpp"
 
+#include <algorithm>
 #include <fstream>
+#include <memory>
 #include <stdexcept>
 #include <unordered_set>
 
+#include <QDataStream>
 #include <QDebug>
 #include <QDir>
+#include <QFont>
+#include <QIODevice>
 
 #include <components/esm/format.hpp>
 #include <components/esm3/esmreader.hpp>
@@ -14,9 +19,11 @@
 #include <components/files/openfile.hpp>
 #include <components/files/qtconversion.hpp>
 
-ContentSelectorModel::ContentModel::ContentModel(QObject* parent, QIcon& warningIcon, bool showOMWScripts)
+ContentSelectorModel::ContentModel::ContentModel(
+    QObject* parent, QIcon& warningIcon, QIcon& errorIcon, bool showOMWScripts)
     : QAbstractTableModel(parent)
     , mWarningIcon(warningIcon)
+    , mErrorIcon(errorIcon)
     , mShowOMWScripts(showOMWScripts)
     , mMimeType("application/omwcontent")
     , mMimeTypes(QStringList() << mMimeType)
@@ -105,6 +112,9 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex& index
     if (!file)
         return Qt::NoItemFlags;
 
+    if (file->builtIn() || file->fromAnotherConfigFile())
+        return Qt::ItemIsEnabled;
+
     // game files can always be checked
     if (file == mGameFile)
         return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
@@ -126,7 +136,7 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex& index
                 continue;
 
             noGameFiles = false;
-            if (isChecked(depFile->filePath()))
+            if (depFile->builtIn() || depFile->fromAnotherConfigFile() || mCheckedFiles.contains(depFile))
             {
                 gamefileChecked = true;
                 break;
@@ -161,23 +171,22 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int
     {
         case Qt::DecorationRole:
         {
-            return isLoadOrderError(file) ? mWarningIcon : QVariant();
+            if (file->isMissing())
+                return mErrorIcon;
+            else if (isLoadOrderError(file))
+                return mWarningIcon;
+            else
+                return QVariant();
         }
 
-        case Qt::BackgroundRole:
+        case Qt::FontRole:
         {
             if (isNew(file->fileName()))
             {
-                return QVariant(QColor(Qt::green));
-            }
-            return QVariant();
-        }
-
-        case Qt::ForegroundRole:
-        {
-            if (isNew(file->fileName()))
-            {
-                return QVariant(QColor(Qt::black));
+                auto font = QFont();
+                font.setBold(true);
+                font.setItalic(true);
+                return font;
             }
             return QVariant();
         }
@@ -219,7 +228,8 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int
             if (file == mGameFile)
                 return QVariant();
 
-            return mCheckStates[file->filePath()];
+            return (file->builtIn() || file->fromAnotherConfigFile() || mCheckedFiles.contains(file)) ? Qt::Checked
+                                                                                                      : Qt::Unchecked;
         }
 
         case Qt::UserRole:
@@ -233,7 +243,7 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int
         }
 
         case Qt::UserRole + 1:
-            return isChecked(file->filePath());
+            return mCheckedFiles.contains(file);
     }
     return QVariant();
 }
@@ -281,12 +291,17 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex& index, const
         {
             int checkValue = value.toInt();
             bool setState = false;
-            if ((checkValue == Qt::Checked) && !isChecked(file->filePath()))
+            if (file->builtIn() || file->fromAnotherConfigFile())
+            {
+                setState = false;
+                success = false;
+            }
+            else if (checkValue == Qt::Checked && !mCheckedFiles.contains(file))
             {
                 setState = true;
                 success = true;
             }
-            else if ((checkValue == Qt::Checked) && isChecked(file->filePath()))
+            else if (checkValue == Qt::Checked && mCheckedFiles.contains(file))
                 setState = true;
             else if (checkValue == Qt::Unchecked)
                 setState = true;
@@ -319,34 +334,12 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex& index, const
 
 bool ContentSelectorModel::ContentModel::insertRows(int position, int rows, const QModelIndex& parent)
 {
-    if (parent.isValid())
-        return false;
-
-    beginInsertRows(parent, position, position + rows - 1);
-    {
-        for (int row = 0; row < rows; ++row)
-            mFiles.insert(position, new EsmFile);
-    }
-    endInsertRows();
-
-    return true;
+    return false;
 }
 
 bool ContentSelectorModel::ContentModel::removeRows(int position, int rows, const QModelIndex& parent)
 {
-    if (parent.isValid())
-        return false;
-
-    beginRemoveRows(parent, position, position + rows - 1);
-    {
-        for (int row = 0; row < rows; ++row)
-            delete mFiles.takeAt(position);
-    }
-    endRemoveRows();
-
-    // at this point we know that drag and drop has finished.
-    checkForLoadOrderErrors();
-    return true;
+    return false;
 }
 
 Qt::DropActions ContentSelectorModel::ContentModel::supportedDropActions() const
@@ -362,13 +355,14 @@ QStringList ContentSelectorModel::ContentModel::mimeTypes() const
 QMimeData* ContentSelectorModel::ContentModel::mimeData(const QModelIndexList& indexes) const
 {
     QByteArray encodedData;
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
 
     for (const QModelIndex& index : indexes)
     {
         if (!index.isValid())
             continue;
 
-        encodedData.append(item(index.row())->encodedData());
+        stream << index.row();
     }
 
     QMimeData* mimeData = new QMimeData();
@@ -397,29 +391,41 @@ bool ContentSelectorModel::ContentModel::dropMimeData(
     else if (parent.isValid())
         beginRow = parent.row();
 
+    int firstModifiable = 0;
+    while (item(firstModifiable)->builtIn() || item(firstModifiable)->fromAnotherConfigFile())
+        ++firstModifiable;
+
+    if (beginRow < firstModifiable)
+        return false;
+
     QByteArray encodedData = data->data(mMimeType);
     QDataStream stream(&encodedData, QIODevice::ReadOnly);
 
+    std::vector<EsmFile*> toMove;
     while (!stream.atEnd())
     {
-
-        QString value;
-        QStringList values;
-        QStringList gamefiles;
-
-        for (int i = 0; i < EsmFile::FileProperty_GameFile; ++i)
-        {
-            stream >> value;
-            values << value;
-        }
-
-        stream >> gamefiles;
-
-        insertRows(beginRow, 1);
-
-        QModelIndex idx = index(beginRow++, 0, QModelIndex());
-        setData(idx, QStringList() << values << gamefiles, Qt::EditRole);
+        int sourceRow;
+        stream >> sourceRow;
+        toMove.emplace_back(mFiles.at(sourceRow));
     }
+    int minRow = mFiles.size();
+    int maxRow = 0;
+    for (EsmFile* file : toMove)
+    {
+        int from = mFiles.indexOf(file);
+        int to = beginRow;
+        if (from < beginRow)
+            to--;
+        else if (from > beginRow)
+            beginRow++;
+        minRow = std::min(minRow, std::min(to, from));
+        maxRow = std::max(maxRow, std::max(to, from));
+        mFiles.move(from, to);
+    }
+
+    dataChanged(index(minRow, 0), index(maxRow, 0));
+    // at this point we know that drag and drop has finished.
+    checkForLoadOrderErrors();
 
     return true;
 }
@@ -452,26 +458,38 @@ void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newf
     {
         QFileInfo info(dir.absoluteFilePath(path2));
 
-        if (item(info.fileName()))
-            continue;
+        EsmFile* file = const_cast<EsmFile*>(item(info.fileName()));
+        bool add = file == nullptr;
+        std::unique_ptr<EsmFile> newFile;
+        if (add)
+        {
+            newFile = std::make_unique<EsmFile>(path2);
+            file = newFile.get();
+        }
+        else
+        {
+            // We've found the same file in a higher priority dir, update our existing entry
+            file->setFileName(path2);
+            file->setGameFiles({});
+        }
 
-        // Enabled by default in system openmw.cfg; shouldn't be shown in content list.
         if (info.fileName().compare("builtin.omwscripts", Qt::CaseInsensitive) == 0)
-            continue;
+            file->setBuiltIn(true);
+
+        file->setFromAnotherConfigFile(mNonUserContent.contains(info.fileName().toLower()));
 
         if (info.fileName().endsWith(".omwscripts", Qt::CaseInsensitive))
         {
-            EsmFile* file = new EsmFile(path2);
             file->setDate(info.lastModified());
             file->setFilePath(info.absoluteFilePath());
-            addFile(file);
+            if (add)
+                addFile(newFile.release());
             setNew(file->fileName(), newfiles);
             continue;
         }
 
         try
         {
-            EsmFile* file = new EsmFile(path2);
             file->setDate(info.lastModified());
             file->setFilePath(info.absoluteFilePath());
             std::filesystem::path filepath = Files::pathFromQString(info.absoluteFilePath());
@@ -494,27 +512,20 @@ void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newf
                     fileReader.setEncoder(&encoder);
                     fileReader.open(std::move(stream), filepath);
                     file->setAuthor(QString::fromUtf8(fileReader.getAuthor().c_str()));
-                    file->setFormat(fileReader.getFormatVersion());
+                    file->setFormat(QString::number(fileReader.esmVersionF()));
                     file->setDescription(QString::fromUtf8(fileReader.getDesc().c_str()));
                     for (const auto& master : fileReader.getGameFiles())
                         file->addGameFile(QString::fromUtf8(master.name.c_str()));
-
-                    // HACK
-                    // Load order constraint of Bloodmoon.esm needing Tribunal.esm is missing
-                    // from the file supplied by Bethesda, so we have to add it ourselves
-                    if (file->fileName().compare("Bloodmoon.esm", Qt::CaseInsensitive) == 0)
-                        file->addGameFile(QString::fromUtf8("Tribunal.esm"));
-
                     break;
                 }
                 case ESM::Format::Tes4:
                 {
                     ToUTF8::StatelessUtf8Encoder encoder(ToUTF8::calculateEncoding(mEncoding.toStdString()));
-                    ESM4::Reader reader(std::move(stream), filepath, nullptr, &encoder, true);
-                    file->setAuthor(QString::fromUtf8(reader.getAuthor().c_str()));
-                    file->setFormat(reader.esmVersion());
-                    file->setDescription(QString::fromUtf8(reader.getDesc().c_str()));
-                    for (const auto& master : reader.getGameFiles())
+                    ESM4::Reader fileReader(std::move(stream), filepath, nullptr, &encoder, true);
+                    file->setAuthor(QString::fromUtf8(fileReader.getAuthor().c_str()));
+                    file->setFormat(QString::number(fileReader.esmVersionF()));
+                    file->setDescription(QString::fromUtf8(fileReader.getDesc().c_str()));
+                    for (const auto& master : fileReader.getGameFiles())
                         file->addGameFile(QString::fromUtf8(master.name.c_str()));
                     break;
                 }
@@ -527,14 +538,14 @@ void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newf
             }
 
             // Put the file in the table
-            addFile(file);
+            if (add)
+                addFile(newFile.release());
             setNew(file->fileName(), newfiles);
         }
         catch (std::runtime_error& e)
         {
             // An error occurred while reading the .esp
             qWarning() << "Error reading addon file: " << e.what();
-            continue;
         }
     }
 }
@@ -559,6 +570,7 @@ void ContentSelectorModel::ContentModel::clearFiles()
     if (filesCount > 0)
     {
         beginRemoveRows(QModelIndex(), 0, filesCount - 1);
+        qDeleteAll(mFiles);
         mFiles.clear();
         endRemoveRows();
     }
@@ -589,20 +601,55 @@ void ContentSelectorModel::ContentModel::setCurrentGameFile(const EsmFile* file)
 void ContentSelectorModel::ContentModel::sortFiles()
 {
     emit layoutAboutToBeChanged();
+
+    // make both Qt5 (int) and Qt6 (qsizetype aka size_t) happy
+    using index_t = ContentFileList::size_type;
+
+    // ensure built-in are first
+    index_t firstModifiable = 0;
+    for (index_t i = 0; i < mFiles.length(); ++i)
+    {
+        if (mFiles.at(i)->builtIn())
+            mFiles.move(i, firstModifiable++);
+    }
+
+    // then non-user content
+    for (const auto& filename : mNonUserContent)
+    {
+        const EsmFile* file = item(filename);
+        int filePosition = indexFromItem(file).row();
+        if (filePosition >= 0)
+            mFiles.move(filePosition, firstModifiable++);
+        else
+        {
+            // the file is not in the VFS, and will be displayed with an error
+            auto missingFile = std::make_unique<EsmFile>(filename);
+            missingFile->setFromAnotherConfigFile(true);
+            mFiles.insert(firstModifiable++, missingFile.release());
+        }
+    }
+
+    // For the purposes of dependency sort we'll hallucinate that Bloodmoon is dependent on Tribunal
+    const EsmFile* tribunalFile = item("Tribunal.esm");
+    const EsmFile* bloodmoonFile = item("Bloodmoon.esm");
+    const bool sortExpansions = tribunalFile != nullptr && bloodmoonFile != nullptr;
+
     // Dependency sort
     std::unordered_set<const EsmFile*> moved;
-    for (int i = mFiles.size() - 1; i > 0;)
+    for (int i = mFiles.size() - 1; i > firstModifiable;)
     {
         const auto file = mFiles.at(i);
         if (moved.find(file) == moved.end())
         {
             int index = -1;
-            for (int j = 0; j < i; ++j)
+            for (int j = firstModifiable; j < i; ++j)
             {
-                const QStringList& gameFiles = mFiles.at(j)->gameFiles();
+                const EsmFile* addonFile = mFiles.at(j);
+                const QStringList& gameFiles = addonFile->gameFiles();
                 // All addon files are implicitly dependent on the game file
                 // so that they don't accidentally become the game file
-                if (gameFiles.contains(file->fileName(), Qt::CaseInsensitive) || file == mGameFile)
+                if (gameFiles.contains(file->fileName(), Qt::CaseInsensitive) || file == mGameFile
+                    || (sortExpansions && file == tribunalFile && addonFile == bloodmoonFile))
                 {
                     index = j;
                     break;
@@ -621,14 +668,6 @@ void ContentSelectorModel::ContentModel::sortFiles()
     emit layoutChanged();
 }
 
-bool ContentSelectorModel::ContentModel::isChecked(const QString& filepath) const
-{
-    const auto it = mCheckStates.find(filepath);
-    if (it == mCheckStates.end())
-        return false;
-    return it.value() == Qt::Checked;
-}
-
 bool ContentSelectorModel::ContentModel::isEnabled(const QModelIndex& index) const
 {
     return (flags(index) & Qt::ItemIsEnabled);
@@ -655,6 +694,17 @@ void ContentSelectorModel::ContentModel::setNew(const QString& filepath, bool is
     mNewFiles[filepath] = isNew;
 }
 
+void ContentSelectorModel::ContentModel::setNonUserContent(const QStringList& fileList)
+{
+    mNonUserContent.clear();
+    for (const auto& file : fileList)
+        mNonUserContent.append(file.toLower());
+    for (auto* file : mFiles)
+        file->setFromAnotherConfigFile(mNonUserContent.contains(file->fileName().toLower()));
+
+    sortFiles();
+}
+
 bool ContentSelectorModel::ContentModel::isLoadOrderError(const EsmFile* file) const
 {
     return mPluginsWithLoadOrderError.contains(file->filePath());
@@ -668,6 +718,7 @@ void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileL
     {
         if (setCheckState(filepath, true))
         {
+            // setCheckState already gracefully handles builtIn and fromAnotherConfigFile
             // as necessary, move plug-ins in visible list to match sequence of supplied filelist
             const EsmFile* file = item(filepath);
             int filePosition = indexFromItem(file).row();
@@ -689,7 +740,7 @@ void ContentSelectorModel::ContentModel::checkForLoadOrderErrors()
 {
     for (int row = 0; row < mFiles.count(); ++row)
     {
-        EsmFile* file = item(row);
+        EsmFile* file = mFiles.at(row);
         bool isRowInError = checkForLoadOrderErrors(file, row).count() != 0;
         if (isRowInError)
         {
@@ -716,7 +767,7 @@ QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::
         }
         else
         {
-            if (!isChecked(dependentFile->filePath()))
+            if (!mCheckedFiles.contains(dependentFile))
             {
                 errors.append(LoadOrderError(LoadOrderError::ErrorCode_InactiveDependency, dependentfileName));
             }
@@ -726,6 +777,15 @@ QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::
             }
         }
     }
+
+    if (file->fileName().compare("Bloodmoon.esm", Qt::CaseInsensitive) == 0)
+    {
+        // Warn the user if Bloodmoon is loaded before Tribunal (Tribunal is not a hard dependency)
+        const EsmFile* tribunalFile = item("Tribunal.esm");
+        if (tribunalFile != nullptr && mCheckedFiles.contains(tribunalFile) && row < indexFromItem(tribunalFile).row())
+            errors.append(LoadOrderError(LoadOrderError::ErrorCode_LoadOrder, "Tribunal.esm"));
+    }
+
     return errors;
 }
 
@@ -737,8 +797,10 @@ QString ContentSelectorModel::ContentModel::toolTip(const EsmFile* file) const
         int index = indexFromItem(item(file->filePath())).row();
         for (const LoadOrderError& error : checkForLoadOrderErrors(file, index))
         {
+            assert(error.errorCode() != LoadOrderError::ErrorCode::ErrorCode_None);
+
             text += "<p>";
-            text += error.toolTip();
+            text += mErrorToolTips[error.errorCode() - 1].arg(error.fileName());
             text += "</p>";
         }
         text += ("</b>");
@@ -763,22 +825,21 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath,
 
     const EsmFile* file = item(filepath);
 
-    if (!file)
+    if (!file || file->builtIn() || file->fromAnotherConfigFile())
         return false;
 
-    Qt::CheckState state = Qt::Unchecked;
-
     if (checkState)
-        state = Qt::Checked;
+        mCheckedFiles.insert(file);
+    else
+        mCheckedFiles.erase(file);
 
-    mCheckStates[filepath] = state;
     emit dataChanged(indexFromItem(item(filepath)), indexFromItem(item(filepath)));
 
     if (file->isGameFile())
         refreshModel();
 
     // if we're checking an item, ensure all "upstream" files (dependencies) are checked as well.
-    if (state == Qt::Checked)
+    if (checkState)
     {
         for (const QString& upstreamName : file->gameFiles())
         {
@@ -787,14 +848,13 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath,
             if (!upstreamFile)
                 continue;
 
-            if (!isChecked(upstreamFile->filePath()))
-                mCheckStates[upstreamFile->filePath()] = Qt::Checked;
+            mCheckedFiles.insert(upstreamFile);
 
             emit dataChanged(indexFromItem(upstreamFile), indexFromItem(upstreamFile));
         }
     }
     // otherwise, if we're unchecking an item (or the file is a game file) ensure all downstream files are unchecked.
-    if (state == Qt::Unchecked)
+    else
     {
         for (const EsmFile* downstreamFile : mFiles)
         {
@@ -803,14 +863,24 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString& filepath,
 
             if (downstreamFile->gameFiles().contains(filename, Qt::CaseInsensitive))
             {
-                if (mCheckStates.contains(downstreamFile->filePath()))
-                    mCheckStates[downstreamFile->filePath()] = Qt::Unchecked;
+                mCheckedFiles.erase(downstreamFile);
 
                 emit dataChanged(indexFromItem(downstreamFile), indexFromItem(downstreamFile));
             }
         }
     }
 
+    // Need to manually let Bloodmoon entry know if Tribunal is checked/unchecked
+    if (file->fileName().compare("Tribunal.esm", Qt::CaseInsensitive) == 0)
+    {
+        const EsmFile* bloodmoonFile = item("Bloodmoon.esm");
+        if (bloodmoonFile != nullptr)
+        {
+            QModelIndex bloodmoonIndex = indexFromItem(bloodmoonFile);
+            emit dataChanged(bloodmoonIndex, bloodmoonIndex);
+        }
+    }
+
     return true;
 }
 
@@ -822,7 +892,7 @@ ContentSelectorModel::ContentFileList ContentSelectorModel::ContentModel::checke
     // First search for game files and next addons,
     // so we get more or less correct game files vs addons order.
     for (EsmFile* file : mFiles)
-        if (isChecked(file->filePath()))
+        if (mCheckedFiles.contains(file))
             list << file;
 
     return list;
@@ -831,6 +901,6 @@ ContentSelectorModel::ContentFileList ContentSelectorModel::ContentModel::checke
 void ContentSelectorModel::ContentModel::uncheckAll()
 {
     emit layoutAboutToBeChanged();
-    mCheckStates.clear();
+    mCheckedFiles.clear();
     emit layoutChanged();
 }
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index d56f8f9a3b..467a9c032a 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -7,6 +7,8 @@
 #include <QSet>
 #include <QStringList>
 
+#include <set>
+
 namespace ContentSelectorModel
 {
     class EsmFile;
@@ -23,7 +25,7 @@ namespace ContentSelectorModel
     {
         Q_OBJECT
     public:
-        explicit ContentModel(QObject* parent, QIcon& warningIcon, bool showOMWScripts);
+        explicit ContentModel(QObject* parent, QIcon& warningIcon, QIcon& errorIcon, bool showOMWScripts);
         ~ContentModel();
 
         void setEncoding(const QString& encoding);
@@ -57,10 +59,10 @@ namespace ContentSelectorModel
         void setCurrentGameFile(const EsmFile* file);
 
         bool isEnabled(const QModelIndex& index) const;
-        bool isChecked(const QString& filepath) const;
         bool setCheckState(const QString& filepath, bool isChecked);
         bool isNew(const QString& filepath) const;
         void setNew(const QString& filepath, bool isChecked);
+        void setNonUserContent(const QStringList& fileList);
         void setContentList(const QStringList& fileList);
         ContentFileList checkedItems() const;
         void uncheckAll();
@@ -84,14 +86,19 @@ namespace ContentSelectorModel
 
         const EsmFile* mGameFile;
         ContentFileList mFiles;
-        QStringList mArchives;
-        QHash<QString, Qt::CheckState> mCheckStates;
+        QStringList mNonUserContent;
+        std::set<const EsmFile*> mCheckedFiles;
         QHash<QString, bool> mNewFiles;
         QSet<QString> mPluginsWithLoadOrderError;
         QString mEncoding;
         QIcon mWarningIcon;
+        QIcon mErrorIcon;
         bool mShowOMWScripts;
 
+        QString mErrorToolTips[ContentSelectorModel::LoadOrderError::ErrorCode_LoadOrder]
+            = { tr("Unable to find dependent file: %1"), tr("Dependent file needs to be active: %1"),
+                  tr("This file needs to load after %1") };
+
     public:
         QString mMimeType;
         QStringList mMimeTypes;
diff --git a/components/contentselector/model/esmfile.cpp b/components/contentselector/model/esmfile.cpp
index 741ed173a2..02ac0efa70 100644
--- a/components/contentselector/model/esmfile.cpp
+++ b/components/contentselector/model/esmfile.cpp
@@ -1,17 +1,5 @@
 #include "esmfile.hpp"
 
-#include <QDataStream>
-#include <QIODevice>
-
-int ContentSelectorModel::EsmFile::sPropertyCount = 7;
-QString ContentSelectorModel::EsmFile::sToolTip = QString(
-    "<b>Author:</b> %1<br/> \
-                                              <b>Version:</b> %2<br/> \
-                                              <b>Modified:</b> %3<br/> \
-                                              <b>Path:</b><br/>%4<br/> \
-                                              <br/><b>Description:</b><br/>%5<br/> \
-                                              <br/><b>Dependencies: </b>%6<br/>");
-
 ContentSelectorModel::EsmFile::EsmFile(const QString& fileName, ModelItem* parent)
     : ModelItem(parent)
     , mFileName(fileName)
@@ -33,7 +21,7 @@ void ContentSelectorModel::EsmFile::setDate(const QDateTime& modified)
     mModified = modified;
 }
 
-void ContentSelectorModel::EsmFile::setFormat(int format)
+void ContentSelectorModel::EsmFile::setFormat(const QString& format)
 {
     mVersion = format;
 }
@@ -53,15 +41,14 @@ void ContentSelectorModel::EsmFile::setDescription(const QString& description)
     mDescription = description;
 }
 
-QByteArray ContentSelectorModel::EsmFile::encodedData() const
+void ContentSelectorModel::EsmFile::setBuiltIn(bool builtIn)
 {
-    QByteArray encodedData;
-    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+    mBuiltIn = builtIn;
+}
 
-    stream << mFileName << mAuthor << QString::number(mVersion) << mModified.toString() << mPath << mDescription
-           << mGameFiles;
-
-    return encodedData;
+void ContentSelectorModel::EsmFile::setFromAnotherConfigFile(bool fromAnotherConfigFile)
+{
+    mFromAnotherConfigFile = fromAnotherConfigFile;
 }
 
 bool ContentSelectorModel::EsmFile::isGameFile() const
@@ -99,6 +86,14 @@ QVariant ContentSelectorModel::EsmFile::fileProperty(const FileProperty prop) co
             return mDescription;
             break;
 
+        case FileProperty_BuiltIn:
+            return mBuiltIn;
+            break;
+
+        case FileProperty_FromAnotherConfigFile:
+            return mFromAnotherConfigFile;
+            break;
+
         case FileProperty_GameFile:
             return mGameFiles;
             break;
@@ -121,11 +116,11 @@ void ContentSelectorModel::EsmFile::setFileProperty(const FileProperty prop, con
             break;
 
         case FileProperty_Format:
-            mVersion = value.toInt();
+            mVersion = value;
             break;
 
         case FileProperty_DateModified:
-            mModified = QDateTime::fromString(value);
+            mModified = QDateTime::fromString(value, Qt::ISODate);
             break;
 
         case FileProperty_FilePath:
@@ -136,6 +131,15 @@ void ContentSelectorModel::EsmFile::setFileProperty(const FileProperty prop, con
             mDescription = value;
             break;
 
+        // todo: check these work
+        case FileProperty_BuiltIn:
+            mBuiltIn = value == "true";
+            break;
+
+        case FileProperty_FromAnotherConfigFile:
+            mFromAnotherConfigFile = value == "true";
+            break;
+
         case FileProperty_GameFile:
             mGameFiles << value;
             break;
diff --git a/components/contentselector/model/esmfile.hpp b/components/contentselector/model/esmfile.hpp
index 1ffaa8fe72..28b4bd2822 100644
--- a/components/contentselector/model/esmfile.hpp
+++ b/components/contentselector/model/esmfile.hpp
@@ -26,24 +26,24 @@ namespace ContentSelectorModel
             FileProperty_DateModified = 3,
             FileProperty_FilePath = 4,
             FileProperty_Description = 5,
-            FileProperty_GameFile = 6
+            FileProperty_BuiltIn = 6,
+            FileProperty_FromAnotherConfigFile = 7,
+            FileProperty_GameFile = 8,
         };
 
         EsmFile(const QString& fileName = QString(), ModelItem* parent = nullptr);
-        //   EsmFile(const EsmFile &);
-
-        ~EsmFile() {}
 
         void setFileProperty(const FileProperty prop, const QString& value);
 
         void setFileName(const QString& fileName);
         void setAuthor(const QString& author);
-        void setSize(const int size);
         void setDate(const QDateTime& modified);
-        void setFormat(const int format);
+        void setFormat(const QString& format);
         void setFilePath(const QString& path);
         void setGameFiles(const QStringList& gameFiles);
         void setDescription(const QString& description);
+        void setBuiltIn(bool builtIn);
+        void setFromAnotherConfigFile(bool fromAnotherConfigFile);
 
         void addGameFile(const QString& name) { mGameFiles.append(name); }
         QVariant fileProperty(const FileProperty prop) const;
@@ -51,38 +51,57 @@ namespace ContentSelectorModel
         QString fileName() const { return mFileName; }
         QString author() const { return mAuthor; }
         QDateTime modified() const { return mModified; }
-        ESM::FormatVersion formatVersion() const { return mVersion; }
+        QString formatVersion() const { return mVersion; }
         QString filePath() const { return mPath; }
+        bool builtIn() const { return mBuiltIn; }
+        bool fromAnotherConfigFile() const { return mFromAnotherConfigFile; }
+        bool isMissing() const { return mPath.isEmpty(); }
 
         /// @note Contains file names, not paths.
         const QStringList& gameFiles() const { return mGameFiles; }
         QString description() const { return mDescription; }
         QString toolTip() const
         {
-            return sToolTip.arg(mAuthor)
-                .arg(mVersion)
-                .arg(mModified.toString(Qt::ISODate))
-                .arg(mPath)
-                .arg(mDescription)
-                .arg(mGameFiles.join(", "));
+            if (isMissing())
+                return tr("<b>This file is specified in a non-user config file, but does not exist in the VFS.</b>");
+            QString tooltip = mTooltipTemlate.arg(mAuthor)
+                                  .arg(mVersion)
+                                  .arg(mModified.toString(Qt::ISODate))
+                                  .arg(mPath)
+                                  .arg(mDescription)
+                                  .arg(mGameFiles.join(", "));
+
+            if (mBuiltIn)
+                tooltip += tr("<br/><b>This content file cannot be disabled because it is part of OpenMW.</b><br/>");
+            else if (mFromAnotherConfigFile)
+                tooltip += tr(
+                    "<br/><b>This content file cannot be disabled because it is enabled in a config file other than "
+                    "the user one.</b><br/>");
+
+            return tooltip;
         }
 
         bool isGameFile() const;
-        QByteArray encodedData() const;
-
-    public:
-        static int sPropertyCount;
-        static QString sToolTip;
 
     private:
+        QString mTooltipTemlate = tr(
+            "<b>Author:</b> %1<br/>"
+            "<b>Format version:</b> %2<br/>"
+            "<b>Modified:</b> %3<br/>"
+            "<b>Path:</b><br/>%4<br/>"
+            "<br/><b>Description:</b><br/>%5<br/>"
+            "<br/><b>Dependencies: </b>%6<br/>");
+
         QString mFileName;
         QString mAuthor;
         QDateTime mModified;
-        ESM::FormatVersion mVersion = ESM::DefaultFormatVersion;
+        QString mVersion = QString::number(ESM::DefaultFormatVersion);
         QString mPath;
         QStringList mGameFiles;
         QString mDescription;
         QString mToolTip;
+        bool mBuiltIn = false;
+        bool mFromAnotherConfigFile = false;
     };
 }
 
diff --git a/components/contentselector/model/loadordererror.cpp b/components/contentselector/model/loadordererror.cpp
deleted file mode 100644
index c1b2025588..0000000000
--- a/components/contentselector/model/loadordererror.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "loadordererror.hpp"
-#include <cassert>
-
-QString ContentSelectorModel::LoadOrderError::sErrorToolTips[ErrorCode_LoadOrder]
-    = { QString("Unable to find dependent file: %1"), QString("Dependent file needs to be active: %1"),
-          QString("This file needs to load after %1") };
-
-QString ContentSelectorModel::LoadOrderError::toolTip() const
-{
-    assert(mErrorCode);
-    return sErrorToolTips[mErrorCode - 1].arg(mFileName);
-}
diff --git a/components/contentselector/model/loadordererror.hpp b/components/contentselector/model/loadordererror.hpp
index 8f47b6ed6a..b066ce4d4e 100644
--- a/components/contentselector/model/loadordererror.hpp
+++ b/components/contentselector/model/loadordererror.hpp
@@ -28,7 +28,6 @@ namespace ContentSelectorModel
         }
         inline ErrorCode errorCode() const { return mErrorCode; }
         inline QString fileName() const { return mFileName; }
-        QString toolTip() const;
 
     private:
         ErrorCode mErrorCode;
diff --git a/components/contentselector/model/naturalsort.cpp b/components/contentselector/model/naturalsort.cpp
deleted file mode 100644
index b090137d97..0000000000
--- a/components/contentselector/model/naturalsort.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * This file contains code found in the QtGui module of the Qt Toolkit.
- * See Qt's qfilesystemmodel source files for more information
- */
-
-#include "naturalsort.hpp"
-
-static inline QChar getNextChar(const QString& s, int location)
-{
-    return (location < s.length()) ? s.at(location) : QChar();
-}
-
-/*!
- *   Natural number sort, skips spaces.
- *
- *   Examples:
- *   1, 2, 10, 55, 100
- *   01.jpg, 2.jpg, 10.jpg
- *
- *   Note on the algorithm:
- *   Only as many characters as necessary are looked at and at most they all
- *   are looked at once.
- *
- *   Slower then QString::compare() (of course)
- */
-int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs)
-{
-    for (int l1 = 0, l2 = 0; l1 <= s1.count() && l2 <= s2.count(); ++l1, ++l2)
-    {
-        // skip spaces, tabs and 0's
-        QChar c1 = getNextChar(s1, l1);
-        while (c1.isSpace())
-            c1 = getNextChar(s1, ++l1);
-        QChar c2 = getNextChar(s2, l2);
-        while (c2.isSpace())
-            c2 = getNextChar(s2, ++l2);
-
-        if (c1.isDigit() && c2.isDigit())
-        {
-            while (c1.digitValue() == 0)
-                c1 = getNextChar(s1, ++l1);
-            while (c2.digitValue() == 0)
-                c2 = getNextChar(s2, ++l2);
-
-            int lookAheadLocation1 = l1;
-            int lookAheadLocation2 = l2;
-            int currentReturnValue = 0;
-            // find the last digit, setting currentReturnValue as we go if it isn't equal
-            for (QChar lookAhead1 = c1, lookAhead2 = c2;
-                 (lookAheadLocation1 <= s1.length() && lookAheadLocation2 <= s2.length());
-                 lookAhead1 = getNextChar(s1, ++lookAheadLocation1), lookAhead2 = getNextChar(s2, ++lookAheadLocation2))
-            {
-                bool is1ADigit = !lookAhead1.isNull() && lookAhead1.isDigit();
-                bool is2ADigit = !lookAhead2.isNull() && lookAhead2.isDigit();
-                if (!is1ADigit && !is2ADigit)
-                    break;
-                if (!is1ADigit)
-                    return -1;
-                if (!is2ADigit)
-                    return 1;
-                if (currentReturnValue == 0)
-                {
-                    if (lookAhead1 < lookAhead2)
-                    {
-                        currentReturnValue = -1;
-                    }
-                    else if (lookAhead1 > lookAhead2)
-                    {
-                        currentReturnValue = 1;
-                    }
-                }
-            }
-            if (currentReturnValue != 0)
-                return currentReturnValue;
-        }
-
-        if (cs == Qt::CaseInsensitive)
-        {
-            if (!c1.isLower())
-                c1 = c1.toLower();
-            if (!c2.isLower())
-                c2 = c2.toLower();
-        }
-        int r = QString::localeAwareCompare(c1, c2);
-        if (r < 0)
-            return -1;
-        if (r > 0)
-            return 1;
-    }
-    // The two strings are the same (02 == 2) so fall back to the normal sort
-    return QString::compare(s1, s2, cs);
-}
-
-bool naturalSortLessThanCS(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseSensitive) < 0);
-}
-
-bool naturalSortLessThanCI(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseInsensitive) < 0);
-}
-
-bool naturalSortGreaterThanCS(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseSensitive) > 0);
-}
-
-bool naturalSortGreaterThanCI(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseInsensitive) > 0);
-}
diff --git a/components/contentselector/model/naturalsort.hpp b/components/contentselector/model/naturalsort.hpp
deleted file mode 100644
index 6973c55c2e..0000000000
--- a/components/contentselector/model/naturalsort.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef NATURALSORT_H
-#define NATURALSORT_H
-
-#include <QString>
-
-bool naturalSortLessThanCS(const QString& left, const QString& right);
-bool naturalSortLessThanCI(const QString& left, const QString& right);
-bool naturalSortGreaterThanCS(const QString& left, const QString& right);
-bool naturalSortGreaterThanCI(const QString& left, const QString& right);
-
-#endif
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 2f01200927..bce136b335 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -1,5 +1,7 @@
 #include "contentselector.hpp"
 
+#include "ui_contentselector.h"
+
 #include <components/contentselector/model/esmfile.hpp>
 
 #include <QClipboard>
@@ -9,14 +11,15 @@
 
 ContentSelectorView::ContentSelector::ContentSelector(QWidget* parent, bool showOMWScripts)
     : QObject(parent)
+    , ui(std::make_unique<Ui::ContentSelector>())
 {
-    ui.setupUi(parent);
-    ui.addonView->setDragDropMode(QAbstractItemView::InternalMove);
+    ui->setupUi(parent);
+    ui->addonView->setDragDropMode(QAbstractItemView::InternalMove);
 
     if (!showOMWScripts)
     {
-        ui.languageComboBox->setHidden(true);
-        ui.refreshButton->setHidden(true);
+        ui->languageComboBox->setHidden(true);
+        ui->refreshButton->setHidden(true);
     }
 
     buildContentModel(showOMWScripts);
@@ -24,21 +27,24 @@ ContentSelectorView::ContentSelector::ContentSelector(QWidget* parent, bool show
     buildAddonView();
 }
 
+ContentSelectorView::ContentSelector::~ContentSelector() = default;
+
 void ContentSelectorView::ContentSelector::buildContentModel(bool showOMWScripts)
 {
-    QIcon warningIcon(ui.addonView->style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(QSize(16, 15)));
-    mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon, showOMWScripts);
+    QIcon warningIcon(ui->addonView->style()->standardIcon(QStyle::SP_MessageBoxWarning));
+    QIcon errorIcon(ui->addonView->style()->standardIcon(QStyle::SP_MessageBoxCritical));
+    mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon, errorIcon, showOMWScripts);
 }
 
 void ContentSelectorView::ContentSelector::buildGameFileView()
 {
-    ui.gameFileView->addItem("<No game file>");
-    ui.gameFileView->setVisible(true);
+    ui->gameFileView->addItem(tr("<No game file>"));
+    ui->gameFileView->setVisible(true);
 
-    connect(ui.gameFileView, qOverload<int>(&ComboBox::currentIndexChanged), this,
+    connect(ui->gameFileView, qOverload<int>(&ComboBox::currentIndexChanged), this,
         &ContentSelector::slotCurrentGameFileIndexChanged);
 
-    ui.gameFileView->setCurrentIndex(0);
+    ui->gameFileView->setCurrentIndex(0);
 }
 
 class AddOnProxyModel : public QSortFilterProxyModel
@@ -60,9 +66,34 @@ public:
     }
 };
 
+bool ContentSelectorView::ContentSelector::isGamefileSelected() const
+{
+    return ui->gameFileView->currentIndex() > 0;
+}
+
+QWidget* ContentSelectorView::ContentSelector::uiWidget() const
+{
+    return ui->contentGroupBox;
+}
+
+QComboBox* ContentSelectorView::ContentSelector::languageBox() const
+{
+    return ui->languageComboBox;
+}
+
+QToolButton* ContentSelectorView::ContentSelector::refreshButton() const
+{
+    return ui->refreshButton;
+}
+
+QLineEdit* ContentSelectorView::ContentSelector::searchFilter() const
+{
+    return ui->searchFilter;
+}
+
 void ContentSelectorView::ContentSelector::buildAddonView()
 {
-    ui.addonView->setVisible(true);
+    ui->addonView->setVisible(true);
 
     mAddonProxyModel = new AddOnProxyModel(this);
     mAddonProxyModel->setFilterRegularExpression(searchFilter()->text());
@@ -70,28 +101,34 @@ void ContentSelectorView::ContentSelector::buildAddonView()
     mAddonProxyModel->setDynamicSortFilter(true);
     mAddonProxyModel->setSourceModel(mContentModel);
 
-    connect(ui.searchFilter, &QLineEdit::textEdited, mAddonProxyModel, &QSortFilterProxyModel::setFilterWildcard);
-    connect(ui.searchFilter, &QLineEdit::textEdited, this, &ContentSelector::slotSearchFilterTextChanged);
+    connect(ui->searchFilter, &QLineEdit::textEdited, mAddonProxyModel, &QSortFilterProxyModel::setFilterWildcard);
+    connect(ui->searchFilter, &QLineEdit::textEdited, this, &ContentSelector::slotSearchFilterTextChanged);
 
-    ui.addonView->setModel(mAddonProxyModel);
+    ui->addonView->setModel(mAddonProxyModel);
 
-    connect(ui.addonView, &QTableView::activated, this, &ContentSelector::slotAddonTableItemActivated);
+    connect(ui->addonView, &QTableView::activated, this, &ContentSelector::slotAddonTableItemActivated);
     connect(mContentModel, &ContentSelectorModel::ContentModel::dataChanged, this,
         &ContentSelector::signalAddonDataChanged);
+    connect(mContentModel, &ContentSelectorModel::ContentModel::dataChanged, this, &ContentSelector::slotRowsMoved);
     buildContextMenu();
 }
 
 void ContentSelectorView::ContentSelector::buildContextMenu()
 {
-    ui.addonView->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(ui.addonView, &QTableView::customContextMenuRequested, this, &ContentSelector::slotShowContextMenu);
+    ui->addonView->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(ui->addonView, &QTableView::customContextMenuRequested, this, &ContentSelector::slotShowContextMenu);
 
-    mContextMenu = new QMenu(ui.addonView);
+    mContextMenu = new QMenu(ui->addonView);
     mContextMenu->addAction(tr("&Check Selected"), this, SLOT(slotCheckMultiSelectedItems()));
     mContextMenu->addAction(tr("&Uncheck Selected"), this, SLOT(slotUncheckMultiSelectedItems()));
     mContextMenu->addAction(tr("&Copy Path(s) to Clipboard"), this, SLOT(slotCopySelectedItemsPaths()));
 }
 
+void ContentSelectorView::ContentSelector::setNonUserContent(const QStringList& fileList)
+{
+    mContentModel->setNonUserContent(fileList);
+}
+
 void ContentSelectorView::ContentSelector::setProfileContent(const QStringList& fileList)
 {
     clearCheckStates();
@@ -116,7 +153,7 @@ void ContentSelectorView::ContentSelector::setGameFile(const QString& filename)
     if (!filename.isEmpty())
     {
         const ContentSelectorModel::EsmFile* file = mContentModel->item(filename);
-        index = ui.gameFileView->findText(file->fileName());
+        index = ui->gameFileView->findText(file->fileName());
 
         // verify that the current index is also checked in the model
         if (!mContentModel->setCheckState(filename, true))
@@ -126,7 +163,7 @@ void ContentSelectorView::ContentSelector::setGameFile(const QString& filename)
         }
     }
 
-    ui.gameFileView->setCurrentIndex(index);
+    ui->gameFileView->setCurrentIndex(index);
 }
 
 void ContentSelectorView::ContentSelector::clearCheckStates()
@@ -143,7 +180,7 @@ void ContentSelectorView::ContentSelector::setContentList(const QStringList& lis
 {
     if (list.isEmpty())
     {
-        slotCurrentGameFileIndexChanged(ui.gameFileView->currentIndex());
+        slotCurrentGameFileIndexChanged(ui->gameFileView->currentIndex());
     }
     else
         mContentModel->setContentList(list);
@@ -164,14 +201,14 @@ void ContentSelectorView::ContentSelector::addFiles(const QString& path, bool ne
     // add any game files to the combo box
     for (const QString& gameFileName : mContentModel->gameFiles())
     {
-        if (ui.gameFileView->findText(gameFileName) == -1)
+        if (ui->gameFileView->findText(gameFileName) == -1)
         {
-            ui.gameFileView->addItem(gameFileName);
+            ui->gameFileView->addItem(gameFileName);
         }
     }
 
-    if (ui.gameFileView->currentIndex() != 0)
-        ui.gameFileView->setCurrentIndex(0);
+    if (ui->gameFileView->currentIndex() != 0)
+        ui->gameFileView->setCurrentIndex(0);
 
     mContentModel->uncheckAll();
     mContentModel->checkForLoadOrderErrors();
@@ -194,10 +231,10 @@ void ContentSelectorView::ContentSelector::clearFiles()
 
 QString ContentSelectorView::ContentSelector::currentFile() const
 {
-    QModelIndex currentIdx = ui.addonView->currentIndex();
+    QModelIndex currentIdx = ui->addonView->currentIndex();
 
-    if (!currentIdx.isValid() && ui.gameFileView->currentIndex() > 0)
-        return ui.gameFileView->currentText();
+    if (!currentIdx.isValid() && ui->gameFileView->currentIndex() > 0)
+        return ui->gameFileView->currentText();
 
     QModelIndex idx = mContentModel->index(mAddonProxyModel->mapToSource(currentIdx).row(), 0, QModelIndex());
     return mContentModel->data(idx, Qt::DisplayRole).toString();
@@ -225,7 +262,7 @@ void ContentSelectorView::ContentSelector::slotCurrentGameFileIndexChanged(int i
 
 void ContentSelectorView::ContentSelector::setGameFileSelected(int index, bool selected)
 {
-    QString fileName = ui.gameFileView->itemText(index);
+    QString fileName = ui->gameFileView->itemText(index);
     const ContentSelectorModel::EsmFile* file = mContentModel->item(fileName);
     if (file != nullptr)
     {
@@ -253,14 +290,14 @@ void ContentSelectorView::ContentSelector::slotAddonTableItemActivated(const QMo
 
 void ContentSelectorView::ContentSelector::slotShowContextMenu(const QPoint& pos)
 {
-    QPoint globalPos = ui.addonView->viewport()->mapToGlobal(pos);
+    QPoint globalPos = ui->addonView->viewport()->mapToGlobal(pos);
     mContextMenu->exec(globalPos);
 }
 
 void ContentSelectorView::ContentSelector::setCheckStateForMultiSelectedItems(bool checked)
 {
     Qt::CheckState checkState = checked ? Qt::Checked : Qt::Unchecked;
-    for (const QModelIndex& index : ui.addonView->selectionModel()->selectedIndexes())
+    for (const QModelIndex& index : ui->addonView->selectionModel()->selectedIndexes())
     {
         QModelIndex sourceIndex = mAddonProxyModel->mapToSource(index);
         if (mContentModel->data(sourceIndex, Qt::CheckStateRole).toInt() != checkState)
@@ -283,21 +320,26 @@ void ContentSelectorView::ContentSelector::slotCheckMultiSelectedItems()
 void ContentSelectorView::ContentSelector::slotCopySelectedItemsPaths()
 {
     QClipboard* clipboard = QApplication::clipboard();
-    QString filepaths;
-    for (const QModelIndex& index : ui.addonView->selectionModel()->selectedIndexes())
+    QStringList filepaths;
+    for (const QModelIndex& index : ui->addonView->selectionModel()->selectedIndexes())
     {
         int row = mAddonProxyModel->mapToSource(index).row();
         const ContentSelectorModel::EsmFile* file = mContentModel->item(row);
-        filepaths += file->filePath() + "\n";
+        filepaths.push_back(file->filePath());
     }
 
     if (!filepaths.isEmpty())
     {
-        clipboard->setText(filepaths);
+        clipboard->setText(filepaths.join("\n"));
     }
 }
 
 void ContentSelectorView::ContentSelector::slotSearchFilterTextChanged(const QString& newText)
 {
-    ui.addonView->setDragEnabled(newText.isEmpty());
+    ui->addonView->setDragEnabled(newText.isEmpty());
+}
+
+void ContentSelectorView::ContentSelector::slotRowsMoved()
+{
+    ui->addonView->selectionModel()->clearSelection();
 }
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index 5919d2e516..2fdd38c799 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -1,13 +1,22 @@
 #ifndef CONTENTSELECTOR_HPP
 #define CONTENTSELECTOR_HPP
 
-#include <QDialog>
+#include <memory>
+
+#include <QComboBox>
+#include <QDialog>
+#include <QMenu>
+#include <QToolButton>
 
-#include "ui_contentselector.h"
 #include <components/contentselector/model/contentmodel.hpp>
 
 class QSortFilterProxyModel;
 
+namespace Ui
+{
+    class ContentSelector;
+}
+
 namespace ContentSelectorView
 {
     class ContentSelector : public QObject
@@ -23,12 +32,15 @@ namespace ContentSelectorView
     public:
         explicit ContentSelector(QWidget* parent = nullptr, bool showOMWScripts = false);
 
+        ~ContentSelector() override;
+
         QString currentFile() const;
 
         void addFiles(const QString& path, bool newfiles = false);
         void sortFiles();
         bool containsDataFiles(const QString& path);
         void clearFiles();
+        void setNonUserContent(const QStringList& fileList);
         void setProfileContent(const QStringList& fileList);
 
         void clearCheckStates();
@@ -39,18 +51,18 @@ namespace ContentSelectorView
 
         void setGameFile(const QString& filename = QString(""));
 
-        bool isGamefileSelected() const { return ui.gameFileView->currentIndex() > 0; }
+        bool isGamefileSelected() const;
 
-        QWidget* uiWidget() const { return ui.contentGroupBox; }
+        QWidget* uiWidget() const;
 
-        QComboBox* languageBox() const { return ui.languageComboBox; }
+        QComboBox* languageBox() const;
 
-        QToolButton* refreshButton() const { return ui.refreshButton; }
+        QToolButton* refreshButton() const;
 
-        QLineEdit* searchFilter() const { return ui.searchFilter; }
+        QLineEdit* searchFilter() const;
 
     private:
-        Ui::ContentSelector ui;
+        std::unique_ptr<Ui::ContentSelector> ui;
 
         void buildContentModel(bool showOMWScripts);
         void buildGameFileView();
@@ -74,6 +86,7 @@ namespace ContentSelectorView
         void slotUncheckMultiSelectedItems();
         void slotCopySelectedItemsPaths();
         void slotSearchFilterTextChanged(const QString& newText);
+        void slotRowsMoved();
     };
 }
 
diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index 566b3a34fc..cf93a605bd 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -1,23 +1,27 @@
+#include <algorithm>
 #include <cstring>
-#include <errno.h>
 #include <filesystem>
 #include <fstream>
+#include <optional>
+#include <span>
+
+#include <errno.h>
 #include <limits.h>
+#include <pthread.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
+#include <sys/ptrace.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <pthread.h>
-#include <stdbool.h>
-#include <sys/ptrace.h>
-
 #include <components/debug/debuglog.hpp>
+#include <components/files/conversion.hpp>
 
 #include <SDL_messagebox.h>
 
@@ -59,149 +63,214 @@ static struct
 {
     int signum;
     pid_t pid;
-    int has_siginfo;
-    siginfo_t siginfo;
-    char buf[1024];
+    std::optional<siginfo_t> siginfo;
 } crash_info;
 
-static const struct
+namespace
 {
-    const char* name;
-    int signum;
-} signals[] = { { "Segmentation fault", SIGSEGV }, { "Illegal instruction", SIGILL }, { "FPU exception", SIGFPE },
-    { "System BUS error", SIGBUS }, { nullptr, 0 } };
+    constexpr char crash_switch[] = "--cc-handle-crash";
 
-static const struct
-{
-    int code;
-    const char* name;
-} sigill_codes[] = {
+    struct SignalInfo
+    {
+        int mCode;
+        const char* mDescription;
+        const char* mName = "";
+    };
+
+    constexpr SignalInfo signals[] = {
+        { SIGSEGV, "Segmentation fault", "SIGSEGV" },
+        { SIGILL, "Illegal instruction", "SIGILL" },
+        { SIGFPE, "FPU exception", "SIGFPE" },
+        { SIGBUS, "System BUS error", "SIGBUS" },
+        { SIGABRT, "Abnormal termination condition", "SIGABRT" },
+    };
+
+    constexpr SignalInfo sigIllCodes[] = {
 #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
-    { ILL_ILLOPC, "Illegal opcode" }, { ILL_ILLOPN, "Illegal operand" }, { ILL_ILLADR, "Illegal addressing mode" },
-    { ILL_ILLTRP, "Illegal trap" }, { ILL_PRVOPC, "Privileged opcode" }, { ILL_PRVREG, "Privileged register" },
-    { ILL_COPROC, "Coprocessor error" }, { ILL_BADSTK, "Internal stack error" },
+        { ILL_ILLOPC, "Illegal opcode" },
+        { ILL_ILLOPN, "Illegal operand" },
+        { ILL_ILLADR, "Illegal addressing mode" },
+        { ILL_ILLTRP, "Illegal trap" },
+        { ILL_PRVOPC, "Privileged opcode" },
+        { ILL_PRVREG, "Privileged register" },
+        { ILL_COPROC, "Coprocessor error" },
+        { ILL_BADSTK, "Internal stack error" },
 #endif
-    { 0, nullptr }
-};
+    };
 
-static const struct
-{
-    int code;
-    const char* name;
-} sigfpe_codes[] = { { FPE_INTDIV, "Integer divide by zero" }, { FPE_INTOVF, "Integer overflow" },
-    { FPE_FLTDIV, "Floating point divide by zero" }, { FPE_FLTOVF, "Floating point overflow" },
-    { FPE_FLTUND, "Floating point underflow" }, { FPE_FLTRES, "Floating point inexact result" },
-    { FPE_FLTINV, "Floating point invalid operation" }, { FPE_FLTSUB, "Subscript out of range" }, { 0, nullptr } };
+    constexpr SignalInfo sigFpeCodes[] = {
+        { FPE_INTDIV, "Integer divide by zero" },
+        { FPE_INTOVF, "Integer overflow" },
+        { FPE_FLTDIV, "Floating point divide by zero" },
+        { FPE_FLTOVF, "Floating point overflow" },
+        { FPE_FLTUND, "Floating point underflow" },
+        { FPE_FLTRES, "Floating point inexact result" },
+        { FPE_FLTINV, "Floating point invalid operation" },
+        { FPE_FLTSUB, "Subscript out of range" },
+    };
 
-static const struct
-{
-    int code;
-    const char* name;
-} sigsegv_codes[] = {
+    constexpr SignalInfo sigSegvCodes[] = {
 #ifndef __FreeBSD__
-    { SEGV_MAPERR, "Address not mapped to object" }, { SEGV_ACCERR, "Invalid permissions for mapped object" },
+        { SEGV_MAPERR, "Address not mapped to object" },
+        { SEGV_ACCERR, "Invalid permissions for mapped object" },
 #endif
-    { 0, nullptr }
-};
+    };
 
-static const struct
-{
-    int code;
-    const char* name;
-} sigbus_codes[] = {
+    constexpr SignalInfo sigBusCodes[] = {
 #ifndef __FreeBSD__
-    { BUS_ADRALN, "Invalid address alignment" }, { BUS_ADRERR, "Non-existent physical address" },
-    { BUS_OBJERR, "Object specific hardware error" },
+        { BUS_ADRALN, "Invalid address alignment" },
+        { BUS_ADRERR, "Non-existent physical address" },
+        { BUS_OBJERR, "Object specific hardware error" },
 #endif
-    { 0, nullptr }
-};
+    };
 
-static int (*cc_user_info)(char*, char*);
+    const char* findSignalDescription(std::span<const SignalInfo> info, int code)
+    {
+        const auto it = std::find_if(info.begin(), info.end(), [&](const SignalInfo& v) { return v.mCode == code; });
+        return it == info.end() ? "" : it->mDescription;
+    }
 
-static void gdb_info(pid_t pid)
-{
-    char respfile[64];
-    FILE* f;
-    int fd;
+    struct Close
+    {
+        void operator()(const int* value) { close(*value); }
+    };
+
+    struct CloseFile
+    {
+        void operator()(FILE* value) { fclose(value); }
+    };
+
+    struct Remove
+    {
+        void operator()(const char* value) { remove(value); }
+    };
+
+    template <class T>
+    bool printDebuggerInfo(pid_t pid)
+    {
+        // Create a temp file to put gdb commands into.
+        // Note: POSIX.1-2008 declares that the file should be already created with mode 0600 by default.
+        // Modern systems implement it and suggest to do not touch masks in multithreaded applications.
+        // So CoverityScan warning is valid only for ancient versions of stdlib.
+        char scriptPath[64];
+
+        std::snprintf(scriptPath, sizeof(scriptPath), "/tmp/%s-script-XXXXXX", T::sName);
 
-    /*
-     * Create a temp file to put gdb commands into.
-     * Note: POSIX.1-2008 declares that the file should be already created with mode 0600 by default.
-     * Modern systems implement it and suggest to do not touch masks in multithreaded applications.
-     * So CoverityScan warning is valid only for ancient versions of stdlib.
-     */
-    strcpy(respfile, "/tmp/gdb-respfile-XXXXXX");
 #ifdef __COVERITY__
-    umask(0600);
+        umask(0600);
 #endif
-    if ((fd = mkstemp(respfile)) >= 0 && (f = fdopen(fd, "w")) != nullptr)
-    {
-        fprintf(f,
-            "attach %d\n"
-            "shell echo \"\"\n"
-            "shell echo \"* Loaded Libraries\"\n"
-            "info sharedlibrary\n"
-            "shell echo \"\"\n"
-            "shell echo \"* Threads\"\n"
-            "info threads\n"
-            "shell echo \"\"\n"
-            "shell echo \"* FPU Status\"\n"
-            "info float\n"
-            "shell echo \"\"\n"
-            "shell echo \"* Registers\"\n"
-            "info registers\n"
-            "shell echo \"\"\n"
-            "shell echo \"* Backtrace\"\n"
-            "thread apply all backtrace full 1000\n"
-            "detach\n"
-            "quit\n",
-            pid);
-        fclose(f);
 
-        /* Run gdb and print process info. */
-        char cmd_buf[128];
-        snprintf(cmd_buf, sizeof(cmd_buf), "gdb --quiet --batch --command=%s", respfile);
-        printf("Executing: %s\n", cmd_buf);
-        fflush(stdout);
-
-        int ret = system(cmd_buf);
-
-        if (ret != 0)
-            printf(
-                "\nFailed to create a crash report. Please make sure that 'gdb' is installed and present in PATH then "
-                "crash again."
-                "\nCurrent PATH: %s\n",
-                getenv("PATH"));
-        fflush(stdout);
-
-        /* Clean up */
-        if (remove(respfile) != 0)
-            Log(Debug::Warning) << "Warning: can not remove file '" << respfile
-                                << "': " << std::generic_category().message(errno);
-    }
-    else
-    {
-        /* Error creating temp file */
-        if (fd >= 0)
+        const int fd = mkstemp(scriptPath);
+        if (fd == -1)
         {
-            if (close(fd) != 0)
-                Log(Debug::Warning) << "Warning: can not close file '" << respfile
-                                    << "': " << std::generic_category().message(errno);
-            else if (remove(respfile) != 0)
-                Log(Debug::Warning) << "Warning: can not remove file '" << respfile
-                                    << "': " << std::generic_category().message(errno);
+            printf("Failed to call mkstemp: %s\n", std::generic_category().message(errno).c_str());
+            return false;
         }
-        printf("!!! Could not create gdb command file\n");
+        std::unique_ptr<const char, Remove> tempFile(scriptPath);
+        std::unique_ptr<const int, Close> scopedFd(&fd);
+
+        FILE* const file = fdopen(fd, "w");
+        if (file == nullptr)
+        {
+            printf("Failed to open file for %s output \"%s\": %s\n", T::sName, scriptPath,
+                std::generic_category().message(errno).c_str());
+            return false;
+        }
+        std::unique_ptr<FILE, CloseFile> scopedFile(file);
+
+        if (fprintf(file, "%s", T::sScript) < 0)
+        {
+            printf("Failed to write debugger script to file \"%s\": %s\n", scriptPath,
+                std::generic_category().message(errno).c_str());
+            return false;
+        }
+
+        scopedFile = nullptr;
+        scopedFd = nullptr;
+
+        char command[128];
+        snprintf(command, sizeof(command), T::sCommandTemplate, pid, scriptPath);
+        printf("Executing: %s\n", command);
+        fflush(stdout);
+
+        const int ret = system(command);
+
+        const bool result = (ret == 0);
+
+        if (ret == -1)
+            printf(
+                "\nFailed to create a crash report: %s.\n"
+                "Please make sure that '%s' is installed and present in PATH then crash again.\n"
+                "Current PATH: %s\n",
+                std::generic_category().message(errno).c_str(), T::sName, getenv("PATH"));
+        else if (ret != 0)
+            printf(
+                "\nFailed to create a crash report.\n"
+                "Please make sure that '%s' is installed and present in PATH then crash again.\n"
+                "Current PATH: %s\n",
+                T::sName, getenv("PATH"));
+
+        fflush(stdout);
+
+        return result;
+    }
+
+    struct Gdb
+    {
+        static constexpr char sName[] = "gdb";
+        static constexpr char sScript[] = R"(shell echo ""
+shell echo "* Loaded Libraries"
+info sharedlibrary
+shell echo ""
+shell echo "* Threads"
+info threads
+shell echo ""
+shell echo "* FPU Status"
+info float
+shell echo ""
+shell echo "* Registers"
+info registers
+shell echo ""
+shell echo "* Backtrace"
+thread apply all backtrace full 1000
+detach
+quit
+)";
+        static constexpr char sCommandTemplate[] = "gdb --pid %d --quiet --batch --command %s";
+    };
+
+    struct Lldb
+    {
+        static constexpr char sName[] = "lldb";
+        static constexpr char sScript[] = R"(script print("\n* Loaded Libraries")
+image list
+script print('\n* Threads')
+thread list
+script print('\n* Registers')
+register read --all
+script print('\n* Backtrace')
+script print(''.join(f'{t}\n' + ''.join(''.join([f'  {f}\n', ''.join(f'    {s}\n' for s in f.statics), ''.join(f'    {v}\n' for v in f.variables)]) for f in t.frames) for t in lldb.process.threads))
+detach
+quit
+)";
+        static constexpr char sCommandTemplate[] = "lldb --attach-pid %d --batch --source %s";
+    };
+
+    void printProcessInfo(pid_t pid)
+    {
+        if (printDebuggerInfo<Gdb>(pid))
+            return;
+        if (printDebuggerInfo<Lldb>(pid))
+            return;
     }
-    fflush(stdout);
 }
 
-static void sys_info(void)
+static void printSystemInfo(void)
 {
 #ifdef __unix__
     struct utsname info;
-    if (uname(&info))
-        printf("!!! Failed to get system information\n");
+    if (uname(&info) == -1)
+        printf("Failed to get system information: %s\n", std::generic_category().message(errno).c_str());
     else
         printf("System: %s %s %s %s %s\n", info.sysname, info.nodename, info.release, info.version, info.machine);
 
@@ -214,8 +283,8 @@ static size_t safe_write(int fd, const void* buf, size_t len)
     size_t ret = 0;
     while (ret < len)
     {
-        ssize_t rem;
-        if ((rem = write(fd, (const char*)buf + ret, len - ret)) == -1)
+        const ssize_t rem = write(fd, (const char*)buf + ret, len - ret);
+        if (rem == -1)
         {
             if (errno == EINTR)
                 continue;
@@ -226,12 +295,8 @@ static size_t safe_write(int fd, const void* buf, size_t len)
     return ret;
 }
 
-static void crash_catcher(int signum, siginfo_t* siginfo, void* context)
+static void crash_catcher(int signum, siginfo_t* siginfo, void* /*context*/)
 {
-    // ucontext_t *ucontext = (ucontext_t*)context;
-    pid_t dbg_pid;
-    int fd[2];
-
     /* Make sure the effective uid is the real uid */
     if (getuid() != geteuid())
     {
@@ -240,6 +305,7 @@ static void crash_catcher(int signum, siginfo_t* siginfo, void* context)
     }
 
     safe_write(STDERR_FILENO, fatal_err, sizeof(fatal_err) - 1);
+    int fd[2];
     if (pipe(fd) == -1)
     {
         safe_write(STDERR_FILENO, pipe_err, sizeof(pipe_err) - 1);
@@ -249,14 +315,14 @@ static void crash_catcher(int signum, siginfo_t* siginfo, void* context)
 
     crash_info.signum = signum;
     crash_info.pid = getpid();
-    crash_info.has_siginfo = !!siginfo;
-    if (siginfo)
+    if (siginfo == nullptr)
+        crash_info.siginfo = std::nullopt;
+    else
         crash_info.siginfo = *siginfo;
-    if (cc_user_info)
-        cc_user_info(crash_info.buf, crash_info.buf + sizeof(crash_info.buf));
 
+    const pid_t dbg_pid = fork();
     /* Fork off to start a crash handler */
-    switch ((dbg_pid = fork()))
+    switch (dbg_pid)
     {
         /* Error */
         case -1:
@@ -296,110 +362,68 @@ static void crash_catcher(int signum, siginfo_t* siginfo, void* context)
     }
 }
 
-static void crash_handler(const char* logfile)
+[[noreturn]] static void handleCrash(const char* logfile)
 {
-    const char* sigdesc = "";
-    int i;
-
     if (fread(&crash_info, sizeof(crash_info), 1, stdin) != 1)
     {
-        fprintf(stderr, "!!! Failed to retrieve info from crashed process\n");
+        fprintf(stderr, "Failed to retrieve info from crashed process: %s\n",
+            std::generic_category().message(errno).c_str());
         exit(1);
     }
 
-    /* Get the signal description */
-    for (i = 0; signals[i].name; ++i)
-    {
-        if (signals[i].signum == crash_info.signum)
-        {
-            sigdesc = signals[i].name;
-            break;
-        }
-    }
+    const char* sigdesc = findSignalDescription(signals, crash_info.signum);
 
-    if (crash_info.has_siginfo)
+    if (crash_info.siginfo.has_value())
     {
         switch (crash_info.signum)
         {
             case SIGSEGV:
-                for (i = 0; sigsegv_codes[i].name; ++i)
-                {
-                    if (sigsegv_codes[i].code == crash_info.siginfo.si_code)
-                    {
-                        sigdesc = sigsegv_codes[i].name;
-                        break;
-                    }
-                }
+                sigdesc = findSignalDescription(sigSegvCodes, crash_info.siginfo->si_code);
                 break;
 
             case SIGFPE:
-                for (i = 0; sigfpe_codes[i].name; ++i)
-                {
-                    if (sigfpe_codes[i].code == crash_info.siginfo.si_code)
-                    {
-                        sigdesc = sigfpe_codes[i].name;
-                        break;
-                    }
-                }
+                sigdesc = findSignalDescription(sigFpeCodes, crash_info.siginfo->si_code);
                 break;
 
             case SIGILL:
-                for (i = 0; sigill_codes[i].name; ++i)
-                {
-                    if (sigill_codes[i].code == crash_info.siginfo.si_code)
-                    {
-                        sigdesc = sigill_codes[i].name;
-                        break;
-                    }
-                }
+                sigdesc = findSignalDescription(sigIllCodes, crash_info.siginfo->si_code);
                 break;
 
             case SIGBUS:
-                for (i = 0; sigbus_codes[i].name; ++i)
-                {
-                    if (sigbus_codes[i].code == crash_info.siginfo.si_code)
-                    {
-                        sigdesc = sigbus_codes[i].name;
-                        break;
-                    }
-                }
+                sigdesc = findSignalDescription(sigBusCodes, crash_info.siginfo->si_code);
                 break;
         }
     }
     fprintf(stderr, "%s (signal %i)\n", sigdesc, crash_info.signum);
-    if (crash_info.has_siginfo)
-        fprintf(stderr, "Address: %p\n", crash_info.siginfo.si_addr);
+    if (crash_info.siginfo.has_value())
+        fprintf(stderr, "Address: %p\n", crash_info.siginfo->si_addr);
     fputc('\n', stderr);
 
-    if (logfile)
+    /* Create crash log file and redirect shell output to it */
+    if (freopen(logfile, "wa", stdout) != stdout)
     {
-        /* Create crash log file and redirect shell output to it */
-        if (freopen(logfile, "wa", stdout) != stdout)
-        {
-            fprintf(stderr, "!!! Could not create %s following signal\n", logfile);
-            exit(1);
-        }
-        fprintf(stderr, "Generating %s and killing process %d, please wait... ", logfile, crash_info.pid);
-
-        printf(
-            "*** Fatal Error ***\n"
-            "%s (signal %i)\n",
-            sigdesc, crash_info.signum);
-        if (crash_info.has_siginfo)
-            printf("Address: %p\n", crash_info.siginfo.si_addr);
-        fputc('\n', stdout);
-        fflush(stdout);
+        fprintf(stderr, "Could not create %s following signal: %s\n", logfile,
+            std::generic_category().message(errno).c_str());
+        exit(1);
     }
+    fprintf(stderr, "Generating %s and killing process %d, please wait... ", logfile, crash_info.pid);
 
-    sys_info();
+    printf(
+        "*** Fatal Error ***\n"
+        "%s (signal %i)\n",
+        sigdesc, crash_info.signum);
+    if (crash_info.siginfo.has_value())
+        printf("Address: %p\n", crash_info.siginfo->si_addr);
+    fputc('\n', stdout);
+    fflush(stdout);
+
+    printSystemInfo();
 
-    crash_info.buf[sizeof(crash_info.buf) - 1] = '\0';
-    printf("%s\n", crash_info.buf);
     fflush(stdout);
 
     if (crash_info.pid > 0)
     {
-        gdb_info(crash_info.pid);
+        printProcessInfo(crash_info.pid);
         kill(crash_info.pid, SIGKILL);
     }
 
@@ -408,12 +432,9 @@ static void crash_handler(const char* logfile)
     // even faulty applications shouldn't be able to freeze the X server.
     usleep(100000);
 
-    if (logfile)
-    {
-        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(logfile)
-            + "'.\n Please report this to https://gitlab.com/OpenMW/openmw/issues !";
-        SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
-    }
+    const std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(logfile)
+        + "'.\n Please report this to https://gitlab.com/OpenMW/openmw/issues !";
+    SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
 
     exit(0);
 }
@@ -426,13 +447,16 @@ static void getExecPath(char** argv)
 
     if (sysctl(mib, 4, argv0, &size, nullptr, 0) == 0)
         return;
+
+    Log(Debug::Warning) << "Failed to call sysctl: " << std::generic_category().message(errno);
 #endif
 
 #if defined(__APPLE__)
     if (proc_pidpath(getpid(), argv0, sizeof(argv0)) > 0)
         return;
+
+    Log(Debug::Warning) << "Failed to call proc_pidpath: " << std::generic_category().message(errno);
 #endif
-    int cwdlen;
     const char* statusPaths[] = { "/proc/self/exe", "/proc/self/file", "/proc/curproc/exe", "/proc/curproc/file" };
     memset(argv0, 0, sizeof(argv0));
 
@@ -440,60 +464,83 @@ static void getExecPath(char** argv)
     {
         if (readlink(path, argv0, sizeof(argv0)) != -1)
             return;
+
+        Log(Debug::Warning) << "Failed to call readlink for \"" << path
+                            << "\": " << std::generic_category().message(errno);
     }
 
     if (argv[0][0] == '/')
-        snprintf(argv0, sizeof(argv0), "%s", argv[0]);
-    else if (getcwd(argv0, sizeof(argv0)) != nullptr)
     {
-        cwdlen = strlen(argv0);
-        snprintf(argv0 + cwdlen, sizeof(argv0) - cwdlen, "/%s", argv[0]);
+        snprintf(argv0, sizeof(argv0), "%s", argv[0]);
+        return;
     }
+
+    if (getcwd(argv0, sizeof(argv0)) == nullptr)
+    {
+        Log(Debug::Error) << "Failed to call getcwd: " << std::generic_category().message(errno);
+        return;
+    }
+
+    const int cwdlen = strlen(argv0);
+    snprintf(argv0 + cwdlen, sizeof(argv0) - cwdlen, "/%s", argv[0]);
 }
 
-int crashCatcherInstallHandlers(
-    int argc, char** argv, int num_signals, int* signals, const char* logfile, int (*user_info)(char*, char*))
+static bool crashCatcherInstallHandlers(char** argv)
 {
-    struct sigaction sa;
-    stack_t altss;
-    int retval;
-
-    if (argc == 2 && strcmp(argv[1], crash_switch) == 0)
-        crash_handler(logfile);
-
-    cc_user_info = user_info;
-
     getExecPath(argv);
 
     /* Set an alternate signal stack so SIGSEGVs caused by stack overflows
      * still run */
     static char* altstack = new char[SIGSTKSZ];
+    stack_t altss;
     altss.ss_sp = altstack;
     altss.ss_flags = 0;
     altss.ss_size = SIGSTKSZ;
-    sigaltstack(&altss, nullptr);
+    if (sigaltstack(&altss, nullptr) == -1)
+    {
+        Log(Debug::Error) << "Failed to call sigaltstack: " << std::generic_category().message(errno);
+        return false;
+    }
 
+    struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
     sa.sa_sigaction = crash_catcher;
     sa.sa_flags = SA_RESETHAND | SA_NODEFER | SA_SIGINFO | SA_ONSTACK;
-    sigemptyset(&sa.sa_mask);
-
-    retval = 0;
-    while (num_signals--)
+    if (sigemptyset(&sa.sa_mask) == -1)
     {
-        if ((*signals != SIGSEGV && *signals != SIGILL && *signals != SIGFPE && *signals != SIGABRT
-                && *signals != SIGBUS)
-            || sigaction(*signals, &sa, nullptr) == -1)
-        {
-            *signals = 0;
-            retval = -1;
-        }
-        ++signals;
+        Log(Debug::Error) << "Failed to call sigemptyset: " << std::generic_category().message(errno);
+        return false;
     }
-    return retval;
+
+    for (const SignalInfo& signal : signals)
+    {
+        if (sigaction(signal.mCode, &sa, nullptr) == -1)
+        {
+            Log(Debug::Error) << "Failed to call sigaction for signal " << signal.mName << " (" << signal.mCode
+                              << "): " << std::generic_category().message(errno);
+            return false;
+        }
+    }
+
+    return true;
 }
 
-static bool is_debugger_present()
+namespace
+{
+#if defined(__APPLE__)
+    bool isDebuggerPresent(const auto& info)
+    {
+        return (info.kp_proc.p_flag & P_TRACED) != 0;
+    }
+#elif defined(__FreeBSD__)
+    bool isDebuggerPresent(const auto& info)
+    {
+        return (info.ki_flag & P_TRACED) != 0;
+    }
+#endif
+}
+
+static bool isDebuggerPresent()
 {
 #if defined(__linux__)
     std::filesystem::path procstatus = std::filesystem::path("/proc/self/status");
@@ -512,44 +559,23 @@ static bool is_debugger_present()
         }
     }
     return false;
-#elif defined(__APPLE__)
-    int junk;
-    int mib[4];
+#elif defined(__APPLE__) || defined(__FreeBSD__)
     struct kinfo_proc info;
-    size_t size;
-
-    // Initialize the flags so that, if sysctl fails for some bizarre
-    // reason, we get a predictable result.
-
-    info.kp_proc.p_flag = 0;
+    std::memset(&info, 0, sizeof(info));
 
     // Initialize mib, which tells sysctl the info we want, in this case
     // we're looking for information about a specific process ID.
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC;
-    mib[2] = KERN_PROC_PID;
-    mib[3] = getpid();
-
-    // Call sysctl.
-
-    size = sizeof(info);
-    junk = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0);
-    assert(junk == 0);
-
-    // We're being debugged if the P_TRACED flag is set.
-
-    return (info.kp_proc.p_flag & P_TRACED) != 0;
-#elif defined(__FreeBSD__)
-    struct kinfo_proc info;
-    size_t size = sizeof(info);
     int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
 
-    if (sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) == 0)
-        return (info.ki_flag & P_TRACED) != 0;
-    else
-        perror("Failed to retrieve process info");
-    return false;
+    size_t size = sizeof(info);
+    if (sysctl(mib, std::size(mib), &info, &size, nullptr, 0) == -1)
+    {
+        Log(Debug::Warning) << "Failed to call sysctl, assuming no debugger: "
+                            << std::generic_category().message(errno);
+        return false;
+    }
+
+    return isDebuggerPresent(info);
 #else
     return false;
 #endif
@@ -557,14 +583,14 @@ static bool is_debugger_present()
 
 void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath)
 {
-    if ((argc == 2 && strcmp(argv[1], crash_switch) == 0) || !is_debugger_present())
-    {
-        int s[5] = { SIGSEGV, SIGILL, SIGFPE, SIGBUS, SIGABRT };
-        if (crashCatcherInstallHandlers(argc, argv, 5, s, crashLogPath.c_str(), nullptr) == -1)
-        {
-            Log(Debug::Warning) << "Installing crash handler failed";
-        }
-        else
-            Log(Debug::Info) << "Crash handler installed";
-    }
+    if (argc == 2 && strcmp(argv[1], crash_switch) == 0)
+        handleCrash(Files::pathToUnicodeString(crashLogPath).c_str());
+
+    if (isDebuggerPresent())
+        return;
+
+    if (crashCatcherInstallHandlers(argv))
+        Log(Debug::Info) << "Crash handler installed";
+    else
+        Log(Debug::Warning) << "Installing crash handler failed";
 }
diff --git a/components/crashcatcher/crashcatcher.hpp b/components/crashcatcher/crashcatcher.hpp
index a9efcaccdc..16b416cf98 100644
--- a/components/crashcatcher/crashcatcher.hpp
+++ b/components/crashcatcher/crashcatcher.hpp
@@ -2,21 +2,12 @@
 #define CRASHCATCHER_H
 
 #include <filesystem>
-#include <string>
 
 #if (defined(__APPLE__) || (defined(__linux) && !defined(ANDROID)) || (defined(__unix) && !defined(ANDROID))           \
     || defined(__posix))
-#define USE_CRASH_CATCHER 1
+void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath);
 #else
-#define USE_CRASH_CATCHER 0
-#endif
-
-constexpr char crash_switch[] = "--cc-handle-crash";
-
-#if USE_CRASH_CATCHER
-extern void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath);
-#else
-inline void crashCatcherInstall(int, char**, const std::string& crashLogPath) {}
+inline void crashCatcherInstall(int /*argc*/, char** /*argv*/, const std::filesystem::path& /*crashLogPath*/) {}
 #endif
 
 #endif
diff --git a/components/crashcatcher/windows_crashcatcher.hpp b/components/crashcatcher/windows_crashcatcher.hpp
index 385567545f..89678c9ada 100644
--- a/components/crashcatcher/windows_crashcatcher.hpp
+++ b/components/crashcatcher/windows_crashcatcher.hpp
@@ -4,7 +4,7 @@
 #include <filesystem>
 
 #include <components/crashcatcher/crashcatcher.hpp>
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 
 namespace Crash
 {
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index dc76ce3456..3708283efa 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -1,7 +1,7 @@
 #include "windows_crashmonitor.hpp"
 
 #include <Psapi.h>
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 
 #include <DbgHelp.h>
 
@@ -231,6 +231,7 @@ namespace Crash
     void CrashMonitor::handleCrash(bool isFreeze)
     {
         DWORD processId = GetProcessId(mAppProcessHandle);
+        const char* env = getenv("OPENMW_FULL_MEMDUMP");
 
         try
         {
@@ -268,6 +269,10 @@ namespace Crash
             infos.ExceptionPointers = &exp;
             infos.ClientPointers = FALSE;
             MINIDUMP_TYPE type = (MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithHandleData);
+
+            if (env)
+                type = static_cast<MINIDUMP_TYPE>(type | MiniDumpWithFullMemory);
+
             miniDumpWriteDump(mAppProcessHandle, processId, hCrashLog, type, &infos, 0, 0);
         }
         catch (const std::exception& e)
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index 3e6d3adb98..16e173169e 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -1,7 +1,7 @@
 #ifndef WINDOWS_CRASHMONITOR_HPP
 #define WINDOWS_CRASHMONITOR_HPP
 
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 
 #include <atomic>
 #include <unordered_map>
diff --git a/components/crashcatcher/windows_crashshm.hpp b/components/crashcatcher/windows_crashshm.hpp
index b3ba38fb2a..b919757890 100644
--- a/components/crashcatcher/windows_crashshm.hpp
+++ b/components/crashcatcher/windows_crashshm.hpp
@@ -1,7 +1,7 @@
 #ifndef WINDOWS_CRASHSHM_HPP
 #define WINDOWS_CRASHSHM_HPP
 
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 
 namespace Crash
 {
diff --git a/components/debug/debugdraw.cpp b/components/debug/debugdraw.cpp
index 32f71580a8..cd98fe2b6d 100644
--- a/components/debug/debugdraw.cpp
+++ b/components/debug/debugdraw.cpp
@@ -124,7 +124,7 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
     for (int i = 0; i < subdiv; i++)
     {
         float theta = (float(i) / float(subdiv)) * osg::PI * 2.;
-        osg::Vec3 pos = sphereCoordToCartesian(theta, osg::PI_2, 1.);
+        osg::Vec3 pos = sphereCoordToCartesian(theta, osg::PI_2f, 1.);
         pos *= radius;
         pos.z() = height / 2.;
         vertices->push_back(pos);
@@ -150,7 +150,7 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
     for (int i = 0; i < subdiv; i++)
     {
         float theta = float(i) / float(subdiv) * osg::PI * 2.;
-        osg::Vec3 pos = sphereCoordToCartesian(theta, osg::PI_2, 1.);
+        osg::Vec3 pos = sphereCoordToCartesian(theta, osg::PI_2f, 1.);
         pos *= radius;
         pos.z() = -height / 2.;
         vertices->push_back(pos);
@@ -162,7 +162,7 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
     for (int i = 0; i < subdiv; i++)
     {
         float theta = float(i) / float(subdiv) * osg::PI * 2.;
-        osg::Vec3 normal = sphereCoordToCartesian(theta, osg::PI_2, 1.);
+        osg::Vec3 normal = sphereCoordToCartesian(theta, osg::PI_2f, 1.);
         auto posTop = normal;
         posTop *= radius;
         auto posBot = posTop;
@@ -215,12 +215,12 @@ static void generateCylinder(osg::Geometry& geom, float radius, float height, in
     geom.addPrimitiveSet(indices);
 }
 
-static int getIdexBufferReadFromFrame(const long long int& nFrame)
+static int getIndexBufferReadFromFrame(const unsigned int& nFrame)
 {
     return nFrame % 2;
 }
 
-static int getIdexBufferWriteFromFrame(const long long int& nFrame)
+static int getIndexBufferWriteFromFrame(const unsigned int& nFrame)
 {
     return (nFrame + 1) % 2;
 }
@@ -232,7 +232,7 @@ namespace Debug
         auto vertices = new osg::Vec3Array;
         auto color = new osg::Vec3Array;
         lines.setDataVariance(osg::Object::STATIC);
-        lines.setUseVertexArrayObject(true);
+        lines.setUseVertexBufferObjects(true);
         lines.setUseDisplayList(false);
         lines.setCullingActive(false);
 
@@ -248,6 +248,16 @@ namespace Debug
         makeLineInstance(*mLinesToDraw);
     }
 
+    DebugCustomDraw::DebugCustomDraw(const DebugCustomDraw& copy, const osg::CopyOp& copyop)
+        : Drawable(copy, copyop)
+        , mShapesToDraw(copy.mShapesToDraw)
+        , mLinesToDraw(copy.mLinesToDraw)
+        , mCubeGeometry(copy.mCubeGeometry)
+        , mCylinderGeometry(copy.mCylinderGeometry)
+        , mWireCubeGeometry(copy.mWireCubeGeometry)
+    {
+    }
+
     void DebugCustomDraw::drawImplementation(osg::RenderInfo& renderInfo) const
     {
         auto state = renderInfo.getState();
@@ -255,96 +265,61 @@ namespace Debug
 
         const osg::StateSet* stateSet = getStateSet();
 
-        auto program = static_cast<const osg::Program*>(stateSet->getAttribute(osg::StateAttribute::PROGRAM));
-        const osg::Program::PerContextProgram* pcp = program->getPCP(*state);
-        if (!pcp)
-        {
-            return;
-        }
+        const osg::Program::PerContextProgram& pcp = *state->getLastAppliedProgramObject();
+        auto transLocation = pcp.getUniformLocation(stateSet->getUniform("trans")->getNameID());
+        auto colLocation = pcp.getUniformLocation(stateSet->getUniform("color")->getNameID());
+        auto scaleLocation = pcp.getUniformLocation(stateSet->getUniform("scale")->getNameID());
+        auto normalAsColorLocation = pcp.getUniformLocation(stateSet->getUniform("useNormalAsColor")->getNameID());
 
-        const osg::Uniform* uTrans = stateSet->getUniform("trans");
-        const osg::Uniform* uCol = stateSet->getUniform("color");
-        const osg::Uniform* uScale = stateSet->getUniform("scale");
-        const osg::Uniform* uUseNormalAsColor = stateSet->getUniform("useNormalAsColor");
+        auto drawPrimitive = [&](const osg::Drawable* primitive, const osg::Vec3f& pos, const osg::Vec3f& color,
+                                 const osg::Vec3f& scale, const bool normalAsColor) {
+            ext->glUniform3f(transLocation, pos.x(), pos.y(), pos.z());
+            ext->glUniform3f(colLocation, color.x(), color.y(), color.z());
+            ext->glUniform3f(scaleLocation, scale.x(), scale.y(), scale.z());
+            ext->glUniform1i(normalAsColorLocation, normalAsColor);
+            primitive->drawImplementation(renderInfo);
+        };
 
-        auto transLocation = pcp->getUniformLocation(uTrans->getNameID());
-        auto colLocation = pcp->getUniformLocation(uCol->getNameID());
-        auto scaleLocation = pcp->getUniformLocation(uScale->getNameID());
-        auto normalAsColorLocation = pcp->getUniformLocation(uUseNormalAsColor->getNameID());
-
-        ext->glUniform3f(transLocation, 0., 0., 0.);
-        ext->glUniform3f(colLocation, 1., 1., 1.);
-        ext->glUniform3f(scaleLocation, 1., 1., 1.);
-        ext->glUniform1i(normalAsColorLocation, true);
-
-        mLinesToDraw->drawImplementation(renderInfo);
-
-        ext->glUniform1i(normalAsColorLocation, false);
+        drawPrimitive(mLinesToDraw, { 0.f, 0.f, 0.f }, { 1.f, 1.f, 1.f }, { 1.f, 1.f, 1.f }, true);
 
         for (const auto& shapeToDraw : mShapesToDraw)
         {
-            osg::Vec3f translation = shapeToDraw.mPosition;
-            osg::Vec3f color = shapeToDraw.mColor;
-            osg::Vec3f scale = shapeToDraw.mDims;
-
-            ext->glUniform3f(transLocation, translation.x(), translation.y(), translation.z());
-            ext->glUniform3f(colLocation, color.x(), color.y(), color.z());
-            ext->glUniform3f(scaleLocation, scale.x(), scale.y(), scale.z());
-
+            const osg::Geometry* geometry = nullptr;
             switch (shapeToDraw.mDrawShape)
             {
                 case DrawShape::Cube:
-                    mCubeGeometry->drawImplementation(renderInfo);
+                    geometry = mCubeGeometry;
                     break;
                 case DrawShape::Cylinder:
-                    mCylinderGeometry->drawImplementation(renderInfo);
+                    geometry = mCylinderGeometry;
                     break;
                 case DrawShape::WireCube:
-                    mWireCubeGeometry->drawImplementation(renderInfo);
+                    geometry = mWireCubeGeometry;
                     break;
             }
+            drawPrimitive(geometry, shapeToDraw.mPosition, shapeToDraw.mColor, shapeToDraw.mDims, false);
         }
         mShapesToDraw.clear();
         static_cast<osg::Vec3Array*>(mLinesToDraw->getVertexArray())->clear();
         static_cast<osg::Vec3Array*>(mLinesToDraw->getNormalArray())->clear();
+        static_cast<osg::DrawArrays*>(mLinesToDraw->getPrimitiveSet(0))->setCount(0);
+        pcp.resetAppliedUniforms();
     }
-
-    class DebugDrawCallback : public SceneUtil::NodeCallback<DebugDrawCallback>
-    {
-    public:
-        DebugDrawCallback(Debug::DebugDrawer& debugDrawer)
-            : mDebugDrawer(debugDrawer)
-        {
-        }
-
-        void operator()(osg::Node* node, osg::NodeVisitor* nv)
-        {
-            mDebugDrawer.mCurrentFrame = nv->getTraversalNumber();
-            int indexRead = getIdexBufferReadFromFrame(mDebugDrawer.mCurrentFrame);
-            auto& lines = mDebugDrawer.mCustomDebugDrawer[indexRead]->mLinesToDraw;
-            lines->removePrimitiveSet(0, 1);
-            lines->addPrimitiveSet(new osg::DrawArrays(
-                osg::PrimitiveSet::LINES, 0, static_cast<osg::Vec3Array*>(lines->getVertexArray())->size()));
-
-            nv->pushOntoNodePath(mDebugDrawer.mCustomDebugDrawer[indexRead]);
-            nv->apply(*mDebugDrawer.mCustomDebugDrawer[indexRead]);
-            nv->popFromNodePath();
-        }
-
-        Debug::DebugDrawer& mDebugDrawer;
-    };
 }
 
-Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_ptr<osg::Group> parentNode)
-    : mParentNode(std::move(parentNode))
+Debug::DebugDrawer::DebugDrawer(const DebugDrawer& copy, const osg::CopyOp& copyop)
+    : Node(copy, copyop)
+    , mCurrentFrame(copy.mCurrentFrame)
+    , mCustomDebugDrawer(copy.mCustomDebugDrawer)
 {
-    mCurrentFrame = 0;
+}
 
+Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager)
+{
     auto program = shaderManager.getProgram("debug");
 
-    mDebugDrawSceneObjects = new osg::Group;
-    mDebugDrawSceneObjects->setCullingActive(false);
-    osg::StateSet* stateset = mDebugDrawSceneObjects->getOrCreateStateSet();
+    setCullingActive(false);
+    osg::StateSet* stateset = getOrCreateStateSet();
     stateset->addUniform(new osg::Uniform("color", osg::Vec3f(1., 1., 1.)));
     stateset->addUniform(new osg::Uniform("trans", osg::Vec3f(0., 0., 0.)));
     stateset->addUniform(new osg::Uniform("scale", osg::Vec3f(1., 1., 1.)));
@@ -378,19 +353,17 @@ Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_p
         mCustomDebugDrawer[i]->mCubeGeometry = cubeGeometry;
         mCustomDebugDrawer[i]->mCylinderGeometry = cylinderGeom;
     }
-    mDebugDrawSceneObjects->addCullCallback(new DebugDrawCallback(*this));
-
-    mParentNode->addChild(mDebugDrawSceneObjects);
 }
 
-Debug::DebugDrawer::~DebugDrawer()
+void Debug::DebugDrawer::traverse(osg::NodeVisitor& nv)
 {
-    mParentNode->removeChild(mDebugDrawSceneObjects);
+    mCurrentFrame = nv.getTraversalNumber();
+    mCustomDebugDrawer[getIndexBufferReadFromFrame(mCurrentFrame)]->accept(nv);
 }
 
 void Debug::DebugDrawer::drawCube(osg::Vec3f mPosition, osg::Vec3f mDims, osg::Vec3f mColor)
 {
-    mCustomDebugDrawer[getIdexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back(
+    mCustomDebugDrawer[getIndexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back(
         { mPosition, mDims, mColor, DrawShape::Cube });
 }
 
@@ -403,15 +376,16 @@ void Debug::DebugDrawer::drawCubeMinMax(osg::Vec3f min, osg::Vec3f max, osg::Vec
 
 void Debug::DebugDrawer::addDrawCall(const DrawCall& draw)
 {
-    mCustomDebugDrawer[getIdexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back(draw);
+    mCustomDebugDrawer[getIndexBufferWriteFromFrame(mCurrentFrame)]->mShapesToDraw.push_back(draw);
 }
 
 void Debug::DebugDrawer::addLine(const osg::Vec3& start, const osg::Vec3& end, const osg::Vec3 color)
 {
-    const int indexWrite = getIdexBufferWriteFromFrame(mCurrentFrame);
+    const int indexWrite = getIndexBufferWriteFromFrame(mCurrentFrame);
     const auto& lines = mCustomDebugDrawer[indexWrite]->mLinesToDraw;
     auto vertices = static_cast<osg::Vec3Array*>(lines->getVertexArray());
     auto colors = static_cast<osg::Vec3Array*>(lines->getNormalArray());
+    auto primitive = static_cast<osg::DrawArrays*>(lines->getPrimitiveSet(0));
 
     vertices->push_back(start);
     vertices->push_back(end);
@@ -420,4 +394,6 @@ void Debug::DebugDrawer::addLine(const osg::Vec3& start, const osg::Vec3& end, c
     colors->push_back(color);
     colors->push_back(color);
     colors->dirty();
+
+    primitive->setCount(vertices->size());
 }
diff --git a/components/debug/debugdraw.hpp b/components/debug/debugdraw.hpp
index 659968d35a..eb4219e06b 100644
--- a/components/debug/debugdraw.hpp
+++ b/components/debug/debugdraw.hpp
@@ -70,6 +70,9 @@ namespace Debug
     {
     public:
         DebugCustomDraw();
+        DebugCustomDraw(const DebugCustomDraw& copy, const osg::CopyOp& copyop);
+
+        META_Node(Debug, DebugCustomDraw)
 
         mutable std::vector<DrawCall> mShapesToDraw;
         osg::ref_ptr<osg::Geometry> mLinesToDraw;
@@ -81,12 +84,15 @@ namespace Debug
         virtual void drawImplementation(osg::RenderInfo&) const override;
     };
 
-    struct DebugDrawer
+    struct DebugDrawer : public osg::Node
     {
-        friend DebugDrawCallback;
+        DebugDrawer() = default;
+        DebugDrawer(const DebugDrawer& copy, const osg::CopyOp& copyop);
+        DebugDrawer(Shader::ShaderManager& shaderManager);
 
-        DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_ptr<osg::Group> parentNode);
-        ~DebugDrawer();
+        META_Node(Debug, DebugDrawer)
+
+        void traverse(osg::NodeVisitor& nv) override;
 
         void drawCube(
             osg::Vec3f mPosition, osg::Vec3f mDims = osg::Vec3(50., 50., 50.), osg::Vec3f mColor = colorWhite);
@@ -95,11 +101,9 @@ namespace Debug
         void addLine(const osg::Vec3& start, const osg::Vec3& end, const osg::Vec3 color = colorWhite);
 
     private:
-        long long int mCurrentFrame;
+        unsigned int mCurrentFrame = 0;
 
         std::array<osg::ref_ptr<DebugCustomDraw>, 2> mCustomDebugDrawer;
-        osg::ref_ptr<osg::Group> mDebugDrawSceneObjects;
-        osg::ref_ptr<osg::Group> mParentNode;
     };
 }
 #endif // !
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 0bec74ce73..32aec8f0fc 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -1,12 +1,20 @@
 #include "debugging.hpp"
 
 #include <chrono>
+#include <deque>
 #include <fstream>
 #include <iostream>
-#include <map>
 #include <memory>
 
+#ifdef _MSC_VER
+// TODO: why is this necessary? this has /external:I
+#pragma warning(push)
+#pragma warning(disable : 4702)
+#endif
 #include <boost/iostreams/stream.hpp>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include <components/crashcatcher/crashcatcher.hpp>
 #include <components/files/conversion.hpp>
@@ -16,7 +24,7 @@
 #ifdef _WIN32
 #include <components/crashcatcher/windows_crashcatcher.hpp>
 #include <components/files/conversion.hpp>
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 
 #include <Knownfolders.h>
 
@@ -53,6 +61,11 @@ namespace Debug
         bool outRedirected = isRedirected(STD_OUTPUT_HANDLE);
         bool errRedirected = isRedirected(STD_ERROR_HANDLE);
 
+        // Note: Do not spend three days reinvestigating this PowerShell bug thinking its our bug.
+        // https://gitlab.com/OpenMW/openmw/-/merge_requests/408#note_447467393
+        // The handles look valid, but GetFinalPathNameByHandleA can't tell what files they go to and writing to them
+        // doesn't work.
+
         if (AttachConsole(ATTACH_PARENT_PROCESS))
         {
             fflush(stdout);
@@ -65,16 +78,19 @@ namespace Debug
             {
                 _wfreopen(L"CON", L"r", stdin);
                 freopen("CON", "r", stdin);
+                std::cin.clear();
             }
             if (!outRedirected)
             {
                 _wfreopen(L"CON", L"w", stdout);
                 freopen("CON", "w", stdout);
+                std::cout.clear();
             }
             if (!errRedirected)
             {
                 _wfreopen(L"CON", L"w", stderr);
                 freopen("CON", "w", stderr);
+                std::cerr.clear();
             }
 
             return true;
@@ -93,25 +109,22 @@ namespace Debug
     class DebugOutputBase : public boost::iostreams::sink
     {
     public:
-        DebugOutputBase()
-        {
-            if (CurrentDebugLevel == NoLevel)
-                fillCurrentDebugLevel();
-        }
-
         virtual std::streamsize write(const char* str, std::streamsize size)
         {
             if (size <= 0)
                 return size;
-            std::string_view msg{ str, size_t(size) };
+            std::string_view msg{ str, static_cast<size_t>(size) };
 
             // Skip debug level marker
-            Level level = getLevelMarker(str);
-            if (level != NoLevel)
+            Level level = All;
+            if (Log::sWriteLevel)
+            {
+                level = getLevelMarker(msg[0]);
                 msg = msg.substr(1);
+            }
 
             char prefix[32];
-            int prefixSize;
+            std::size_t prefixSize;
             {
                 prefix[0] = '[';
                 const auto now = std::chrono::system_clock::now();
@@ -149,37 +162,11 @@ namespace Debug
         virtual ~DebugOutputBase() = default;
 
     protected:
-        static Level getLevelMarker(const char* str)
+        static Level getLevelMarker(char marker)
         {
-            if (unsigned(*str) <= unsigned(Marker))
-            {
-                return Level(*str);
-            }
-
-            return NoLevel;
-        }
-
-        static void fillCurrentDebugLevel()
-        {
-            const char* env = getenv("OPENMW_DEBUG_LEVEL");
-            if (env)
-            {
-                std::string value(env);
-                if (value == "ERROR")
-                    CurrentDebugLevel = Error;
-                else if (value == "WARNING")
-                    CurrentDebugLevel = Warning;
-                else if (value == "INFO")
-                    CurrentDebugLevel = Info;
-                else if (value == "VERBOSE")
-                    CurrentDebugLevel = Verbose;
-                else if (value == "DEBUG")
-                    CurrentDebugLevel = Debug;
-
-                return;
-            }
-
-            CurrentDebugLevel = Verbose;
+            if (0 <= marker && static_cast<unsigned>(marker) < static_cast<unsigned>(All))
+                return static_cast<Level>(marker);
+            return All;
         }
 
         virtual std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel)
@@ -205,177 +192,292 @@ namespace Debug
     };
 #else
 
-    class Tee : public DebugOutputBase
+    namespace
     {
-    public:
-        Tee(std::ostream& stream, std::ostream& stream2)
-            : out(stream)
-            , out2(stream2)
+        struct Record
         {
-            // TODO: check which stream is stderr?
-            mUseColor = useColoredOutput();
+            std::string mValue;
+            Level mLevel;
+        };
 
-            mColors[Error] = Red;
-            mColors[Warning] = Yellow;
-            mColors[Info] = Reset;
-            mColors[Verbose] = DarkGray;
-            mColors[Debug] = DarkGray;
-            mColors[NoLevel] = Reset;
+        std::deque<Record> globalBuffer;
+
+        Color getColor(Level level)
+        {
+            switch (level)
+            {
+                case Error:
+                    return Red;
+                case Warning:
+                    return Yellow;
+                case Info:
+                    return Reset;
+                case Verbose:
+                    return DarkGray;
+                case Debug:
+                    return DarkGray;
+                case All:
+                    return Reset;
+            }
+            return Reset;
         }
 
-        std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel) override
+        bool useColoredOutput()
         {
-            out.write(str, size);
-            out.flush();
-
-            if (mUseColor)
-            {
-                out2 << "\033[0;" << mColors[debugLevel] << "m";
-                out2.write(str, size);
-                out2 << "\033[0;" << Reset << "m";
-            }
-            else
-            {
-                out2.write(str, size);
-            }
-            out2.flush();
-
-            return size;
-        }
-
-        virtual ~Tee() = default;
-
-    private:
-        static bool useColoredOutput()
-        {
-            // Note: cmd.exe in Win10 should support ANSI colors, but in its own way.
 #if defined(_WIN32)
-            return 0;
-#else
-            char* term = getenv("TERM");
-            bool useColor = term && !getenv("NO_COLOR") && isatty(fileno(stderr));
+            if (std::getenv("NO_COLOR") != nullptr)
+                return false;
 
-            return useColor;
+            DWORD mode;
+            if (GetConsoleMode(GetStdHandle(STD_ERROR_HANDLE), &mode) && mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+                return true;
+
+            // some console emulators may not use the Win32 API, so try the Unixy approach
+            return std::getenv("TERM") != nullptr && GetFileType(GetStdHandle(STD_ERROR_HANDLE)) == FILE_TYPE_CHAR;
+#else
+            return std::getenv("TERM") != nullptr && std::getenv("NO_COLOR") == nullptr && isatty(fileno(stderr));
 #endif
         }
 
-        std::ostream& out;
-        std::ostream& out2;
-        bool mUseColor;
+        class Identity
+        {
+        public:
+            explicit Identity(std::ostream& stream)
+                : mStream(stream)
+            {
+            }
 
-        std::map<Level, int> mColors;
-    };
+            void write(const char* str, std::streamsize size, Level /*level*/)
+            {
+                mStream.write(str, size);
+                mStream.flush();
+            }
+
+        private:
+            std::ostream& mStream;
+        };
+
+        class Coloured
+        {
+        public:
+            explicit Coloured(std::ostream& stream)
+                : mStream(stream)
+                // TODO: check which stream is stderr?
+                , mUseColor(useColoredOutput())
+            {
+            }
+
+            void write(const char* str, std::streamsize size, Level level)
+            {
+                if (mUseColor)
+                    mStream << "\033[0;" << getColor(level) << 'm';
+                mStream.write(str, size);
+                if (mUseColor)
+                    mStream << "\033[0;" << Reset << 'm';
+                mStream.flush();
+            }
+
+        private:
+            std::ostream& mStream;
+            bool mUseColor;
+        };
+
+        class Buffer
+        {
+        public:
+            explicit Buffer(std::size_t capacity, std::deque<Record>& buffer)
+                : mCapacity(capacity)
+                , mBuffer(buffer)
+            {
+            }
+
+            void write(const char* str, std::streamsize size, Level debugLevel)
+            {
+                while (mBuffer.size() >= mCapacity)
+                    mBuffer.pop_front();
+                mBuffer.push_back(Record{ std::string(str, size), debugLevel });
+            }
+
+        private:
+            std::size_t mCapacity;
+            std::deque<Record>& mBuffer;
+        };
+
+        template <class First, class Second>
+        class Tee : public DebugOutputBase
+        {
+        public:
+            explicit Tee(First first, Second second)
+                : mFirst(first)
+                , mSecond(second)
+            {
+            }
+
+            std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel) override
+            {
+                mFirst.write(str, size, debugLevel);
+                mSecond.write(str, size, debugLevel);
+                return size;
+            }
+
+        private:
+            First mFirst;
+            Second mSecond;
+        };
+    }
 #endif
 
-}
-
-static std::unique_ptr<std::ostream> rawStdout = nullptr;
-static std::unique_ptr<std::ostream> rawStderr = nullptr;
-static std::unique_ptr<std::mutex> rawStderrMutex = nullptr;
-static std::ofstream logfile;
+    static std::unique_ptr<std::ostream> rawStdout = nullptr;
+    static std::unique_ptr<std::ostream> rawStderr = nullptr;
+    static std::unique_ptr<std::mutex> rawStderrMutex = nullptr;
+    static std::ofstream logfile;
 
 #if defined(_WIN32) && defined(_DEBUG)
-static boost::iostreams::stream_buffer<Debug::DebugOutput> sb;
+    static boost::iostreams::stream_buffer<DebugOutput> sb;
 #else
-static boost::iostreams::stream_buffer<Debug::Tee> coutsb;
-static boost::iostreams::stream_buffer<Debug::Tee> cerrsb;
+    static boost::iostreams::stream_buffer<Tee<Identity, Coloured>> standardOut;
+    static boost::iostreams::stream_buffer<Tee<Identity, Coloured>> standardErr;
+    static boost::iostreams::stream_buffer<Tee<Buffer, Coloured>> bufferedOut;
+    static boost::iostreams::stream_buffer<Tee<Buffer, Coloured>> bufferedErr;
 #endif
 
-std::ostream& getRawStdout()
-{
-    return rawStdout ? *rawStdout : std::cout;
-}
+    std::ostream& getRawStdout()
+    {
+        return rawStdout ? *rawStdout : std::cout;
+    }
 
-std::ostream& getRawStderr()
-{
-    return rawStderr ? *rawStderr : std::cerr;
-}
+    std::ostream& getRawStderr()
+    {
+        return rawStderr ? *rawStderr : std::cerr;
+    }
 
-Misc::Locked<std::ostream&> getLockedRawStderr()
-{
-    return Misc::Locked<std::ostream&>(*rawStderrMutex, getRawStderr());
-}
+    Misc::Locked<std::ostream&> getLockedRawStderr()
+    {
+        return Misc::Locked<std::ostream&>(*rawStderrMutex, getRawStderr());
+    }
 
-// Redirect cout and cerr to the log file
-void setupLogging(const std::filesystem::path& logDir, std::string_view appName, std::ios_base::openmode mode)
-{
-#if defined(_WIN32) && defined(_DEBUG)
-    // Redirect cout and cerr to VS debug output when running in debug mode
-    sb.open(Debug::DebugOutput());
-    std::cout.rdbuf(&sb);
-    std::cerr.rdbuf(&sb);
-#else
-    const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
-    logfile.open(logDir / logName, mode);
+    Level getDebugLevel()
+    {
+        if (const char* env = getenv("OPENMW_DEBUG_LEVEL"))
+        {
+            const std::string_view value(env);
+            if (value == "ERROR")
+                return Error;
+            if (value == "WARNING")
+                return Warning;
+            if (value == "INFO")
+                return Info;
+            if (value == "VERBOSE")
+                return Verbose;
+            if (value == "DEBUG")
+                return Debug;
+        }
 
-    coutsb.open(Debug::Tee(logfile, *rawStdout));
-    cerrsb.open(Debug::Tee(logfile, *rawStderr));
+        return Verbose;
+    }
 
-    std::cout.rdbuf(&coutsb);
-    std::cerr.rdbuf(&cerrsb);
+    void setupLogging(const std::filesystem::path& logDir, std::string_view appName)
+    {
+        Log::sMinDebugLevel = getDebugLevel();
+        Log::sWriteLevel = true;
+
+#if !(defined(_WIN32) && defined(_DEBUG))
+        const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
+        logfile.open(logDir / logName, std::ios::out);
+
+        Identity log(logfile);
+
+        for (const Record& v : globalBuffer)
+            log.write(v.mValue.data(), v.mValue.size(), v.mLevel);
+
+        globalBuffer.clear();
+
+        standardOut.open(Tee(log, Coloured(*rawStdout)));
+        standardErr.open(Tee(log, Coloured(*rawStderr)));
+
+        std::cout.rdbuf(&standardOut);
+        std::cerr.rdbuf(&standardErr);
 #endif
 
 #ifdef _WIN32
-    if (Crash::CrashCatcher::instance())
-    {
-        Crash::CrashCatcher::instance()->updateDumpPath(logDir);
-    }
-#endif
-}
-
-int wrapApplication(int (*innerApplication)(int argc, char* argv[]), int argc, char* argv[], std::string_view appName)
-{
-#if defined _WIN32
-    (void)Debug::attachParentConsole();
-#endif
-    rawStdout = std::make_unique<std::ostream>(std::cout.rdbuf());
-    rawStderr = std::make_unique<std::ostream>(std::cerr.rdbuf());
-    rawStderrMutex = std::make_unique<std::mutex>();
-
-    int ret = 0;
-    try
-    {
-        if (const auto env = std::getenv("OPENMW_DISABLE_CRASH_CATCHER");
-            env == nullptr || Misc::StringUtils::toNumeric<int>(env, 0) == 0)
+        if (Crash::CrashCatcher::instance())
         {
-#if defined(_WIN32)
-            const std::string crashDumpName = Misc::StringUtils::lowerCase(appName) + "-crash.dmp";
-            const std::string freezeDumpName = Misc::StringUtils::lowerCase(appName) + "-freeze.dmp";
-            std::filesystem::path dumpDirectory = std::filesystem::temp_directory_path();
-            PWSTR userProfile = nullptr;
-            if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Profile, 0, nullptr, &userProfile)))
-            {
-                dumpDirectory = userProfile;
-            }
-            CoTaskMemFree(userProfile);
-            Crash::CrashCatcher crashy(argc, argv, dumpDirectory, crashDumpName, freezeDumpName);
-#else
-            const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.log";
-            // install the crash handler as soon as possible.
-            crashCatcherInstall(
-                argc, argv, Files::pathToUnicodeString(std::filesystem::temp_directory_path() / crashLogName));
-#endif
-            ret = innerApplication(argc, argv);
+            Crash::CrashCatcher::instance()->updateDumpPath(logDir);
         }
-        else
-            ret = innerApplication(argc, argv);
-    }
-    catch (const std::exception& e)
-    {
-#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
-        if (!isatty(fileno(stdin)))
 #endif
-            SDL_ShowSimpleMessageBox(0, (std::string(appName) + ": Fatal error").c_str(), e.what(), nullptr);
-
-        Log(Debug::Error) << "Error: " << e.what();
-
-        ret = 1;
     }
 
-    // Restore cout and cerr
-    std::cout.rdbuf(rawStdout->rdbuf());
-    std::cerr.rdbuf(rawStderr->rdbuf());
-    Debug::CurrentDebugLevel = Debug::NoLevel;
+    int wrapApplication(
+        int (*innerApplication)(int argc, char* argv[]), int argc, char* argv[], std::string_view appName)
+    {
+#if defined _WIN32
+        (void)attachParentConsole();
+#endif
+        rawStdout = std::make_unique<std::ostream>(std::cout.rdbuf());
+        rawStderr = std::make_unique<std::ostream>(std::cerr.rdbuf());
+        rawStderrMutex = std::make_unique<std::mutex>();
 
-    return ret;
+#if defined(_WIN32) && defined(_DEBUG)
+        // Redirect cout and cerr to VS debug output when running in debug mode
+        sb.open(DebugOutput());
+        std::cout.rdbuf(&sb);
+        std::cerr.rdbuf(&sb);
+#else
+        constexpr std::size_t bufferCapacity = 1024;
+
+        bufferedOut.open(Tee(Buffer(bufferCapacity, globalBuffer), Coloured(*rawStdout)));
+        bufferedErr.open(Tee(Buffer(bufferCapacity, globalBuffer), Coloured(*rawStderr)));
+
+        std::cout.rdbuf(&bufferedOut);
+        std::cerr.rdbuf(&bufferedErr);
+#endif
+
+        int ret = 0;
+        try
+        {
+            if (const auto env = std::getenv("OPENMW_DISABLE_CRASH_CATCHER");
+                env == nullptr || Misc::StringUtils::toNumeric<int>(env, 0) == 0)
+            {
+#if defined(_WIN32)
+                const std::string crashDumpName = Misc::StringUtils::lowerCase(appName) + "-crash.dmp";
+                const std::string freezeDumpName = Misc::StringUtils::lowerCase(appName) + "-freeze.dmp";
+                std::filesystem::path dumpDirectory = std::filesystem::temp_directory_path();
+                PWSTR userProfile = nullptr;
+                if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Profile, 0, nullptr, &userProfile)))
+                {
+                    dumpDirectory = userProfile;
+                }
+                CoTaskMemFree(userProfile);
+                Crash::CrashCatcher crashy(argc, argv, dumpDirectory, crashDumpName, freezeDumpName);
+#else
+                const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.log";
+                // install the crash handler as soon as possible.
+                crashCatcherInstall(argc, argv, std::filesystem::temp_directory_path() / crashLogName);
+#endif
+                ret = innerApplication(argc, argv);
+            }
+            else
+                ret = innerApplication(argc, argv);
+        }
+        catch (const std::exception& e)
+        {
+#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
+            if (!isatty(fileno(stdin)))
+#endif
+                SDL_ShowSimpleMessageBox(0, (std::string(appName) + ": Fatal error").c_str(), e.what(), nullptr);
+
+            Log(Debug::Error) << "Fatal error: " << e.what();
+
+            ret = 1;
+        }
+
+        // Restore cout and cerr
+        std::cout.rdbuf(rawStdout->rdbuf());
+        std::cerr.rdbuf(rawStderr->rdbuf());
+
+        Log::sMinDebugLevel = All;
+        Log::sWriteLevel = false;
+
+        return ret;
+    }
 }
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index 6700b5b761..68cdec93a2 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -26,18 +26,21 @@ namespace Debug
 
     using LogListener = std::function<void(Debug::Level, std::string_view prefix, std::string_view msg)>;
     void setLogListener(LogListener);
+
+    // Can be used to print messages without timestamps
+    std::ostream& getRawStdout();
+
+    std::ostream& getRawStderr();
+
+    Misc::Locked<std::ostream&> getLockedRawStderr();
+
+    Level getDebugLevel();
+
+    // Redirect cout and cerr to the log file
+    void setupLogging(const std::filesystem::path& logDir, std::string_view appName);
+
+    int wrapApplication(
+        int (*innerApplication)(int argc, char* argv[]), int argc, char* argv[], std::string_view appName);
 }
 
-// Can be used to print messages without timestamps
-std::ostream& getRawStdout();
-
-std::ostream& getRawStderr();
-
-Misc::Locked<std::ostream&> getLockedRawStderr();
-
-void setupLogging(
-    const std::filesystem::path& logDir, std::string_view appName, std::ios_base::openmode mode = std::ios::out);
-
-int wrapApplication(int (*innerApplication)(int argc, char* argv[]), int argc, char* argv[], std::string_view appName);
-
 #endif
diff --git a/components/debug/debuglog.cpp b/components/debug/debuglog.cpp
index 2bdb8ab139..f8ab034a1c 100644
--- a/components/debug/debuglog.cpp
+++ b/components/debug/debuglog.cpp
@@ -5,15 +5,13 @@
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/conversion.hpp>
 
-namespace Debug
-{
-    Level CurrentDebugLevel = Level::NoLevel;
-}
-
 static std::mutex sLock;
 
+Debug::Level Log::sMinDebugLevel = Debug::All;
+bool Log::sWriteLevel = false;
+
 Log::Log(Debug::Level level)
-    : mShouldLog(level <= Debug::CurrentDebugLevel)
+    : mShouldLog(level <= sMinDebugLevel)
 {
     // No need to hold the lock if there will be no logging anyway
     if (!mShouldLog)
@@ -22,9 +20,7 @@ Log::Log(Debug::Level level)
     // Locks a global lock while the object is alive
     sLock.lock();
 
-    // If the app has no logging system enabled, log level is not specified.
-    // Show all messages without marker - we just use the plain cout in this case.
-    if (Debug::CurrentDebugLevel == Debug::NoLevel)
+    if (!sWriteLevel)
         return;
 
     std::cout << static_cast<unsigned char>(level);
diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index 090f64c5ed..05ebe5fdaa 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -6,24 +6,23 @@
 
 namespace Debug
 {
-    enum Level
+    enum Level : unsigned
     {
         Error = 1,
         Warning = 2,
         Info = 3,
         Verbose = 4,
         Debug = 5,
-        Marker = Debug,
-
-        NoLevel = 6 // Do not filter messages in this case
+        All = 6,
     };
-
-    extern Level CurrentDebugLevel;
 }
 
 class Log
 {
 public:
+    static Debug::Level sMinDebugLevel;
+    static bool sWriteLevel;
+
     explicit Log(Debug::Level level);
     ~Log();
 
diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index 29036af162..482755b761 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -239,7 +239,7 @@ namespace Debug
             group->push(state);
             lastAppliedStack.push_back(group);
         }
-        if (!(lastAppliedStack.back() == this))
+        if (lastAppliedStack.empty() || !(lastAppliedStack.back() == this))
         {
             push(state);
             lastAppliedStack.push_back(this);
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 3a1b6fd77a..24d7cc0d32 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -16,8 +16,9 @@
 
 #include <osg/io_utils>
 
+#include <boost/geometry.hpp>
+
 #include <algorithm>
-#include <numeric>
 #include <optional>
 #include <set>
 #include <tuple>
@@ -49,40 +50,6 @@ namespace DetourNavigator
             return false;
         }
 
-        auto getPriority(const Job& job) noexcept
-        {
-            return std::make_tuple(-static_cast<std::underlying_type_t<JobState>>(job.mState), job.mProcessTime,
-                job.mChangeType, job.mTryNumber, job.mDistanceToPlayer, job.mDistanceToOrigin);
-        }
-
-        struct LessByJobPriority
-        {
-            bool operator()(JobIt lhs, JobIt rhs) const noexcept { return getPriority(*lhs) < getPriority(*rhs); }
-        };
-
-        void insertPrioritizedJob(JobIt job, std::deque<JobIt>& queue)
-        {
-            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobPriority{});
-            queue.insert(it, job);
-        }
-
-        auto getDbPriority(const Job& job) noexcept
-        {
-            return std::make_tuple(static_cast<std::underlying_type_t<JobState>>(job.mState), job.mChangeType,
-                job.mDistanceToPlayer, job.mDistanceToOrigin);
-        }
-
-        struct LessByJobDbPriority
-        {
-            bool operator()(JobIt lhs, JobIt rhs) const noexcept { return getDbPriority(*lhs) < getDbPriority(*rhs); }
-        };
-
-        void insertPrioritizedDbJob(JobIt job, std::deque<JobIt>& queue)
-        {
-            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobDbPriority{});
-            queue.insert(it, job);
-        }
-
         auto getAgentAndTile(const Job& job) noexcept
         {
             return std::make_tuple(job.mAgentBounds, job.mChangedTile);
@@ -97,16 +64,6 @@ namespace DetourNavigator
                 settings.mRecast, settings.mWriteToNavMeshDb);
         }
 
-        void updateJobs(std::deque<JobIt>& jobs, TilePosition playerTile, int maxTiles)
-        {
-            for (JobIt job : jobs)
-            {
-                job->mDistanceToPlayer = getManhattanDistance(job->mChangedTile, playerTile);
-                if (!shouldAddTile(job->mChangedTile, playerTile, maxTiles))
-                    job->mChangeType = ChangeType::remove;
-            }
-        }
-
         std::size_t getNextJobId()
         {
             static std::atomic_size_t nextJobId{ 1 };
@@ -134,7 +91,7 @@ namespace DetourNavigator
     }
 
     Job::Job(const AgentBounds& agentBounds, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
-        std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
+        ESM::RefId worldspace, const TilePosition& changedTile, ChangeType changeType,
         std::chrono::steady_clock::time_point processTime)
         : mId(getNextJobId())
         , mAgentBounds(agentBounds)
@@ -143,11 +100,148 @@ namespace DetourNavigator
         , mChangedTile(changedTile)
         , mProcessTime(processTime)
         , mChangeType(changeType)
-        , mDistanceToPlayer(distanceToPlayer)
-        , mDistanceToOrigin(getManhattanDistance(changedTile, TilePosition{ 0, 0 }))
     {
     }
 
+    void SpatialJobQueue::clear()
+    {
+        mValues.clear();
+        mIndex.clear();
+        mSize = 0;
+    }
+
+    void SpatialJobQueue::push(JobIt job)
+    {
+        auto it = mValues.find(job->mChangedTile);
+
+        if (it == mValues.end())
+        {
+            it = mValues.emplace_hint(it, job->mChangedTile, std::deque<JobIt>());
+            mIndex.insert(IndexValue(IndexPoint(job->mChangedTile.x(), job->mChangedTile.y()), it));
+        }
+
+        it->second.push_back(job);
+
+        ++mSize;
+    }
+
+    std::optional<JobIt> SpatialJobQueue::pop(TilePosition playerTile)
+    {
+        const IndexPoint point(playerTile.x(), playerTile.y());
+        const auto it = mIndex.qbegin(boost::geometry::index::nearest(point, 1));
+
+        if (it == mIndex.qend())
+            return std::nullopt;
+
+        const UpdatingMap::iterator mapIt = it->second;
+        std::deque<JobIt>& tileJobs = mapIt->second;
+        JobIt result = tileJobs.front();
+        tileJobs.pop_front();
+
+        --mSize;
+
+        if (tileJobs.empty())
+        {
+            mValues.erase(mapIt);
+            mIndex.remove(*it);
+        }
+
+        return result;
+    }
+
+    void SpatialJobQueue::update(TilePosition playerTile, int maxTiles, std::vector<JobIt>& removing)
+    {
+        for (auto it = mValues.begin(); it != mValues.end();)
+        {
+            if (shouldAddTile(it->first, playerTile, maxTiles))
+            {
+                ++it;
+                continue;
+            }
+
+            for (JobIt job : it->second)
+            {
+                job->mChangeType = ChangeType::remove;
+                removing.push_back(job);
+            }
+
+            mSize -= it->second.size();
+            mIndex.remove(IndexValue(IndexPoint(it->first.x(), it->first.y()), it));
+            it = mValues.erase(it);
+        }
+    }
+
+    bool JobQueue::hasJob(std::chrono::steady_clock::time_point now) const
+    {
+        return !mRemoving.empty() || mUpdating.size() > 0
+            || (!mDelayed.empty() && mDelayed.front()->mProcessTime <= now);
+    }
+
+    void JobQueue::clear()
+    {
+        mRemoving.clear();
+        mDelayed.clear();
+        mUpdating.clear();
+    }
+
+    void JobQueue::push(JobIt job, std::chrono::steady_clock::time_point now)
+    {
+        if (job->mProcessTime > now)
+        {
+            mDelayed.push_back(job);
+            return;
+        }
+
+        if (job->mChangeType == ChangeType::remove)
+        {
+            mRemoving.push_back(job);
+            return;
+        }
+
+        mUpdating.push(job);
+    }
+
+    std::optional<JobIt> JobQueue::pop(TilePosition playerTile, std::chrono::steady_clock::time_point now)
+    {
+        if (!mRemoving.empty())
+        {
+            const JobIt result = mRemoving.back();
+            mRemoving.pop_back();
+            return result;
+        }
+
+        if (const std::optional<JobIt> result = mUpdating.pop(playerTile))
+            return result;
+
+        if (mDelayed.empty() || mDelayed.front()->mProcessTime > now)
+            return std::nullopt;
+
+        const JobIt result = mDelayed.front();
+        mDelayed.pop_front();
+        return result;
+    }
+
+    void JobQueue::update(TilePosition playerTile, int maxTiles, std::chrono::steady_clock::time_point now)
+    {
+        mUpdating.update(playerTile, maxTiles, mRemoving);
+
+        while (!mDelayed.empty() && mDelayed.front()->mProcessTime <= now)
+        {
+            const JobIt job = mDelayed.front();
+            mDelayed.pop_front();
+
+            if (shouldAddTile(job->mChangedTile, playerTile, maxTiles))
+            {
+                mUpdating.push(job);
+            }
+            else
+            {
+                job->mChangeType = ChangeType::remove;
+                mRemoving.push_back(job);
+            }
+        }
+    }
+
     AsyncNavMeshUpdater::AsyncNavMeshUpdater(const Settings& settings, TileCachedRecastMeshManager& recastMeshManager,
         OffMeshConnectionsManager& offMeshConnectionsManager, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
@@ -167,8 +261,7 @@ namespace DetourNavigator
     }
 
     void AsyncNavMeshUpdater::post(const AgentBounds& agentBounds, const SharedNavMeshCacheItem& navMeshCacheItem,
-        const TilePosition& playerTile, std::string_view worldspace,
-        const std::map<TilePosition, ChangeType>& changedTiles)
+        const TilePosition& playerTile, ESM::RefId worldspace, const std::map<TilePosition, ChangeType>& changedTiles)
     {
         bool playerTileChanged = false;
         {
@@ -180,48 +273,47 @@ namespace DetourNavigator
         if (!playerTileChanged && changedTiles.empty())
             return;
 
-        const dtNavMeshParams params = *navMeshCacheItem->lockConst()->getImpl().getParams();
-        const int maxTiles = std::min(mSettings.get().mMaxTilesNumber, params.maxTiles);
-
         std::unique_lock lock(mMutex);
 
         if (playerTileChanged)
-            updateJobs(mWaiting, playerTile, maxTiles);
+        {
+            Log(Debug::Debug) << "Player tile has been changed to " << playerTile;
+            mWaiting.update(playerTile, mSettings.get().mMaxTilesNumber);
+        }
 
         for (const auto& [changedTile, changeType] : changedTiles)
         {
             if (mPushed.emplace(agentBounds, changedTile).second)
             {
-                const auto processTime = changeType == ChangeType::update
-                    ? mLastUpdates[std::tie(agentBounds, changedTile)] + mSettings.get().mMinUpdateInterval
-                    : std::chrono::steady_clock::time_point();
+                const auto processTime = [&, changedTile = changedTile, changeType = changeType] {
+                    if (changeType != ChangeType::update)
+                        return std::chrono::steady_clock::time_point();
+                    const auto lastUpdate = mLastUpdates.find(std::tie(agentBounds, changedTile));
+                    if (lastUpdate == mLastUpdates.end())
+                        return std::chrono::steady_clock::time_point();
+                    return lastUpdate->second + mSettings.get().mMinUpdateInterval;
+                }();
 
-                const JobIt it = mJobs.emplace(mJobs.end(), agentBounds, navMeshCacheItem, worldspace, changedTile,
-                    changeType, getManhattanDistance(changedTile, playerTile), processTime);
+                const JobIt it = mJobs.emplace(
+                    mJobs.end(), agentBounds, navMeshCacheItem, worldspace, changedTile, changeType, processTime);
 
                 Log(Debug::Debug) << "Post job " << it->mId << " for agent=(" << it->mAgentBounds << ")"
-                                  << " changedTile=(" << it->mChangedTile << ") "
+                                  << " changedTile=(" << it->mChangedTile << ")"
                                   << " changeType=" << it->mChangeType;
 
-                if (playerTileChanged)
-                    mWaiting.push_back(it);
-                else
-                    insertPrioritizedJob(it, mWaiting);
+                mWaiting.push(it);
             }
         }
 
-        if (playerTileChanged)
-            std::sort(mWaiting.begin(), mWaiting.end(), LessByJobPriority{});
-
         Log(Debug::Debug) << "Posted " << mJobs.size() << " navigator jobs";
 
-        if (!mWaiting.empty())
+        if (mWaiting.hasJob())
             mHasJob.notify_all();
 
         lock.unlock();
 
         if (playerTileChanged && mDbWorker != nullptr)
-            mDbWorker->updateJobs(playerTile, maxTiles);
+            mDbWorker->update(playerTile);
     }
 
     void AsyncNavMeshUpdater::wait(WaitConditionType waitConditionType, Loading::Listener* listener)
@@ -313,7 +405,7 @@ namespace DetourNavigator
         {
             const std::lock_guard<std::mutex> lock(mMutex);
             result.mJobs = mJobs.size();
-            result.mWaiting = mWaiting.size();
+            result.mWaiting = mWaiting.getStats();
             result.mPushed = mPushed.size();
         }
         result.mProcessing = mProcessingTiles.lockConst()->size();
@@ -335,7 +427,8 @@ namespace DetourNavigator
                 if (JobIt job = getNextJob(); job != mJobs.end())
                 {
                     const JobStatus status = processJob(*job);
-                    Log(Debug::Debug) << "Processed job " << job->mId << " with status=" << status;
+                    Log(Debug::Debug) << "Processed job " << job->mId << " with status=" << status
+                                      << " changeType=" << job->mChangeType;
                     switch (status)
                     {
                         case JobStatus::Done:
@@ -346,7 +439,8 @@ namespace DetourNavigator
                                 removeJob(job);
                             break;
                         case JobStatus::Fail:
-                            repost(job);
+                            unlockTile(job->mId, job->mAgentBounds, job->mChangedTile);
+                            removeJob(job);
                             break;
                         case JobStatus::MemoryCacheMiss:
                         {
@@ -368,7 +462,9 @@ namespace DetourNavigator
 
     JobStatus AsyncNavMeshUpdater::processJob(Job& job)
     {
-        Log(Debug::Debug) << "Processing job " << job.mId << " by thread=" << std::this_thread::get_id();
+        Log(Debug::Debug) << "Processing job " << job.mId << " for agent=(" << job.mAgentBounds << ")"
+                          << " changedTile=(" << job.mChangedTile << ")"
+                          << " changeType=" << job.mChangeType << " by thread=" << std::this_thread::get_id();
 
         const auto navMeshCacheItem = job.mNavMeshCacheItem.lock();
 
@@ -376,11 +472,11 @@ namespace DetourNavigator
             return JobStatus::Done;
 
         const auto playerTile = *mPlayerTile.lockConst();
-        const auto params = *navMeshCacheItem->lockConst()->getImpl().getParams();
 
-        if (!shouldAddTile(job.mChangedTile, playerTile, std::min(mSettings.get().mMaxTilesNumber, params.maxTiles)))
+        if (!shouldAddTile(job.mChangedTile, playerTile, mSettings.get().mMaxTilesNumber))
         {
             Log(Debug::Debug) << "Ignore add tile by job " << job.mId << ": too far from player";
+            job.mChangeType = ChangeType::remove;
             navMeshCacheItem->lock()->removeTile(job.mChangedTile);
             return JobStatus::Done;
         }
@@ -548,9 +644,8 @@ namespace DetourNavigator
 
         bool shouldStop = false;
         const auto hasJob = [&] {
-            shouldStop = mShouldStop;
-            return shouldStop
-                || (!mWaiting.empty() && mWaiting.front()->mProcessTime <= std::chrono::steady_clock::now());
+            shouldStop = mShouldStop.load();
+            return shouldStop || mWaiting.hasJob();
         };
 
         if (!mHasJob.wait_for(lock, std::chrono::milliseconds(10), hasJob))
@@ -563,9 +658,15 @@ namespace DetourNavigator
         if (shouldStop)
             return mJobs.end();
 
-        const JobIt job = mWaiting.front();
+        const TilePosition playerTile = *mPlayerTile.lockConst();
 
-        mWaiting.pop_front();
+        JobIt job = mJobs.end();
+
+        if (const std::optional<JobIt> nextJob = mWaiting.pop(playerTile))
+            job = *nextJob;
+
+        if (job == mJobs.end())
+            return job;
 
         Log(Debug::Debug) << "Pop job " << job->mId << " by thread=" << std::this_thread::get_id();
 
@@ -574,9 +675,9 @@ namespace DetourNavigator
 
         if (!lockTile(job->mId, job->mAgentBounds, job->mChangedTile))
         {
-            Log(Debug::Debug) << "Failed to lock tile by job " << job->mId << " try=" << job->mTryNumber;
-            ++job->mTryNumber;
-            insertPrioritizedJob(job, mWaiting);
+            Log(Debug::Debug) << "Failed to lock tile by job " << job->mId;
+            job->mProcessTime = std::chrono::steady_clock::now() + mSettings.get().mMinUpdateInterval;
+            mWaiting.push(job);
             return mJobs.end();
         }
 
@@ -600,7 +701,7 @@ namespace DetourNavigator
             if (mSettings.get().mEnableRecastMeshFileNameRevision)
                 recastMeshRevision = revision;
             if (mSettings.get().mEnableNavMeshFileNameRevision)
-                navMeshRevision = revision;
+                navMeshRevision = std::move(revision);
         }
         if (recastMesh && mSettings.get().mEnableWriteRecastMeshToFile)
             writeToFile(*recastMesh,
@@ -612,26 +713,6 @@ namespace DetourNavigator
                 writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
     }
 
-    void AsyncNavMeshUpdater::repost(JobIt job)
-    {
-        unlockTile(job->mId, job->mAgentBounds, job->mChangedTile);
-
-        if (mShouldStop || job->mTryNumber > 2)
-            return;
-
-        const std::lock_guard<std::mutex> lock(mMutex);
-
-        if (mPushed.emplace(job->mAgentBounds, job->mChangedTile).second)
-        {
-            ++job->mTryNumber;
-            insertPrioritizedJob(job, mWaiting);
-            mHasJob.notify_all();
-            return;
-        }
-
-        mJobs.erase(job);
-    }
-
     bool AsyncNavMeshUpdater::lockTile(
         std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile)
     {
@@ -676,7 +757,7 @@ namespace DetourNavigator
     {
         Log(Debug::Debug) << "Enqueueing job " << job->mId << " by thread=" << std::this_thread::get_id();
         const std::lock_guard lock(mMutex);
-        insertPrioritizedJob(job, mWaiting);
+        mWaiting.push(job);
         mHasJob.notify_all();
     }
 
@@ -690,40 +771,47 @@ namespace DetourNavigator
     void DbJobQueue::push(JobIt job)
     {
         const std::lock_guard lock(mMutex);
-        insertPrioritizedDbJob(job, mJobs);
         if (isWritingDbJob(*job))
-            ++mWritingJobs;
+            mWriting.push_back(job);
         else
-            ++mReadingJobs;
+            mReading.push(job);
         mHasJob.notify_all();
     }
 
     std::optional<JobIt> DbJobQueue::pop()
     {
         std::unique_lock lock(mMutex);
-        mHasJob.wait(lock, [&] { return mShouldStop || !mJobs.empty(); });
-        if (mJobs.empty())
+
+        const auto hasJob = [&] { return mShouldStop || mReading.size() > 0 || mWriting.size() > 0; };
+
+        mHasJob.wait(lock, hasJob);
+
+        if (mShouldStop)
             return std::nullopt;
-        const JobIt job = mJobs.front();
-        mJobs.pop_front();
-        if (isWritingDbJob(*job))
-            --mWritingJobs;
-        else
-            --mReadingJobs;
+
+        if (const std::optional<JobIt> job = mReading.pop(mPlayerTile))
+            return job;
+
+        if (mWriting.empty())
+            return std::nullopt;
+
+        const JobIt job = mWriting.front();
+        mWriting.pop_front();
+
         return job;
     }
 
-    void DbJobQueue::update(TilePosition playerTile, int maxTiles)
+    void DbJobQueue::update(TilePosition playerTile)
     {
         const std::lock_guard lock(mMutex);
-        updateJobs(mJobs, playerTile, maxTiles);
-        std::sort(mJobs.begin(), mJobs.end(), LessByJobDbPriority{});
+        mPlayerTile = playerTile;
     }
 
     void DbJobQueue::stop()
     {
         const std::lock_guard lock(mMutex);
-        mJobs.clear();
+        mReading.clear();
+        mWriting.clear();
         mShouldStop = true;
         mHasJob.notify_all();
     }
@@ -731,7 +819,10 @@ namespace DetourNavigator
     DbJobQueueStats DbJobQueue::getStats() const
     {
         const std::lock_guard lock(mMutex);
-        return DbJobQueueStats{ .mWritingJobs = mWritingJobs, .mReadingJobs = mReadingJobs };
+        return DbJobQueueStats{
+            .mReadingJobs = mReading.size(),
+            .mWritingJobs = mWriting.size(),
+        };
     }
 
     DbWorker::DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db, TileVersion version,
@@ -760,8 +851,10 @@ namespace DetourNavigator
 
     DbWorkerStats DbWorker::getStats() const
     {
-        return DbWorkerStats{ .mJobs = mQueue.getStats(),
-            .mGetTileCount = mGetTileCount.load(std::memory_order_relaxed) };
+        return DbWorkerStats{
+            .mJobs = mQueue.getStats(),
+            .mGetTileCount = mGetTileCount.load(std::memory_order_relaxed),
+        };
     }
 
     void DbWorker::stop()
@@ -813,6 +906,23 @@ namespace DetourNavigator
                         Log(Debug::Warning)
                             << "Writes to navmeshdb are disabled to avoid concurrent writes from multiple processes";
                     }
+                    else if (message.find("UNIQUE constraint failed: tiles.tile_id") != std::string_view::npos)
+                    {
+                        Log(Debug::Warning) << "Found duplicate navmeshdb tile_id, please report the "
+                                               "issue to https://gitlab.com/OpenMW/openmw/-/issues, attach openmw.log: "
+                                            << mNextTileId;
+                        try
+                        {
+                            mNextTileId = TileId(mDb->getMaxTileId() + 1);
+                            Log(Debug::Info) << "Updated navmeshdb tile_id to: " << mNextTileId;
+                        }
+                        catch (const std::exception& e)
+                        {
+                            mWriteToDb = false;
+                            Log(Debug::Warning)
+                                << "Failed to update next tile_id, writes to navmeshdb are disabled: " << e.what();
+                        }
+                    }
                 }
             }
         };
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 9b95d4f4b3..a4c446afc9 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -14,6 +14,9 @@
 #include "tileposition.hpp"
 #include "waitconditiontype.hpp"
 
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/index/rtree.hpp>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -47,13 +50,10 @@ namespace DetourNavigator
         const std::size_t mId;
         const AgentBounds mAgentBounds;
         const std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
-        const std::string mWorldspace;
+        const ESM::RefId mWorldspace;
         const TilePosition mChangedTile;
-        const std::chrono::steady_clock::time_point mProcessTime;
-        unsigned mTryNumber = 0;
+        std::chrono::steady_clock::time_point mProcessTime;
         ChangeType mChangeType;
-        int mDistanceToPlayer;
-        const int mDistanceToOrigin;
         JobState mState = JobState::Initial;
         std::vector<std::byte> mInput;
         std::shared_ptr<RecastMesh> mRecastMesh;
@@ -61,12 +61,65 @@ namespace DetourNavigator
         std::unique_ptr<PreparedNavMeshData> mGeneratedNavMeshData;
 
         Job(const AgentBounds& agentBounds, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
-            std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
+            ESM::RefId worldspace, const TilePosition& changedTile, ChangeType changeType,
             std::chrono::steady_clock::time_point processTime);
     };
 
     using JobIt = std::list<Job>::iterator;
 
+    class SpatialJobQueue
+    {
+    public:
+        std::size_t size() const { return mSize; }
+
+        void clear();
+
+        void push(JobIt job);
+
+        std::optional<JobIt> pop(TilePosition playerTile);
+
+        void update(TilePosition playerTile, int maxTiles, std::vector<JobIt>& removing);
+
+    private:
+        using IndexPoint = boost::geometry::model::point<int, 2, boost::geometry::cs::cartesian>;
+        using UpdatingMap = std::map<TilePosition, std::deque<JobIt>>;
+        using IndexValue = std::pair<IndexPoint, UpdatingMap::iterator>;
+
+        std::size_t mSize = 0;
+        UpdatingMap mValues;
+        boost::geometry::index::rtree<IndexValue, boost::geometry::index::linear<4>> mIndex;
+    };
+
+    class JobQueue
+    {
+    public:
+        JobQueueStats getStats() const
+        {
+            return JobQueueStats{
+                .mRemoving = mRemoving.size(),
+                .mUpdating = mUpdating.size(),
+                .mDelayed = mDelayed.size(),
+            };
+        }
+
+        bool hasJob(std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now()) const;
+
+        void clear();
+
+        void push(JobIt job, std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now());
+
+        std::optional<JobIt> pop(
+            TilePosition playerTile, std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now());
+
+        void update(TilePosition playerTile, int maxTiles,
+            std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now());
+
+    private:
+        std::vector<JobIt> mRemoving;
+        SpatialJobQueue mUpdating;
+        std::deque<JobIt> mDelayed;
+    };
+
     enum class JobStatus
     {
         Done,
@@ -83,7 +136,7 @@ namespace DetourNavigator
 
         std::optional<JobIt> pop();
 
-        void update(TilePosition playerTile, int maxTiles);
+        void update(TilePosition playerTile);
 
         void stop();
 
@@ -92,10 +145,10 @@ namespace DetourNavigator
     private:
         mutable std::mutex mMutex;
         std::condition_variable mHasJob;
-        std::deque<JobIt> mJobs;
+        SpatialJobQueue mReading;
+        std::deque<JobIt> mWriting;
+        TilePosition mPlayerTile;
         bool mShouldStop = false;
-        std::size_t mWritingJobs = 0;
-        std::size_t mReadingJobs = 0;
     };
 
     class AsyncNavMeshUpdater;
@@ -112,7 +165,7 @@ namespace DetourNavigator
 
         void enqueueJob(JobIt job);
 
-        void updateJobs(TilePosition playerTile, int maxTiles) { mQueue.update(playerTile, maxTiles); }
+        void update(TilePosition playerTile) { mQueue.update(playerTile); }
 
         void stop();
 
@@ -146,7 +199,7 @@ namespace DetourNavigator
         ~AsyncNavMeshUpdater();
 
         void post(const AgentBounds& agentBounds, const SharedNavMeshCacheItem& navMeshCacheItem,
-            const TilePosition& playerTile, std::string_view worldspace,
+            const TilePosition& playerTile, ESM::RefId worldspace,
             const std::map<TilePosition, ChangeType>& changedTiles);
 
         void wait(WaitConditionType waitConditionType, Loading::Listener* listener);
@@ -169,7 +222,7 @@ namespace DetourNavigator
         std::condition_variable mDone;
         std::condition_variable mProcessed;
         std::list<Job> mJobs;
-        std::deque<JobIt> mWaiting;
+        JobQueue mWaiting;
         std::set<std::tuple<AgentBounds, TilePosition>> mPushed;
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
         NavMeshTilesCache mNavMeshTilesCache;
@@ -197,8 +250,6 @@ namespace DetourNavigator
 
         void writeDebugFiles(const Job& job, const RecastMesh* recastMesh) const;
 
-        void repost(JobIt job);
-
         bool lockTile(std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile);
 
         void unlockTile(std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile);
diff --git a/components/detournavigator/cellgridbounds.hpp b/components/detournavigator/cellgridbounds.hpp
new file mode 100644
index 0000000000..75d1fce350
--- /dev/null
+++ b/components/detournavigator/cellgridbounds.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_CELLGRIDBOUNDS_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_CELLGRIDBOUNDS_H
+
+#include <osg/Vec2i>
+
+namespace DetourNavigator
+{
+    struct CellGridBounds
+    {
+        osg::Vec2i mCenter;
+        int mHalfSize;
+    };
+}
+
+#endif
diff --git a/components/detournavigator/changetype.hpp b/components/detournavigator/changetype.hpp
index e6d0bce0a9..63a43e88fb 100644
--- a/components/detournavigator/changetype.hpp
+++ b/components/detournavigator/changetype.hpp
@@ -6,15 +6,9 @@ namespace DetourNavigator
     enum class ChangeType
     {
         remove = 0,
-        mixed = 1,
-        add = 2,
-        update = 3,
+        add = 1,
+        update = 2,
     };
-
-    inline ChangeType addChangeType(const ChangeType current, const ChangeType add)
-    {
-        return current == add ? current : ChangeType::mixed;
-    }
 }
 
 #endif
diff --git a/components/detournavigator/collisionshapetype.cpp b/components/detournavigator/collisionshapetype.cpp
index b20ae6147f..b68d5cd239 100644
--- a/components/detournavigator/collisionshapetype.cpp
+++ b/components/detournavigator/collisionshapetype.cpp
@@ -15,7 +15,7 @@ namespace DetourNavigator
                 return static_cast<CollisionShapeType>(value);
         }
         std::string error("Invalid CollisionShapeType value: \"");
-        error += value;
+        error += std::to_string(value);
         error += '"';
         throw std::invalid_argument(error);
     }
diff --git a/components/detournavigator/commulativeaabb.hpp b/components/detournavigator/commulativeaabb.hpp
index 5d24c329ca..46cf64b348 100644
--- a/components/detournavigator/commulativeaabb.hpp
+++ b/components/detournavigator/commulativeaabb.hpp
@@ -3,7 +3,7 @@
 
 #include <BulletCollision/Gimpact/btBoxCollision.h>
 
-#include <cstdint>
+#include <cstddef>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp
index 835f37f999..5ce1464bdd 100644
--- a/components/detournavigator/debug.cpp
+++ b/components/detournavigator/debug.cpp
@@ -79,13 +79,13 @@ namespace DetourNavigator
         switch (v)
         {
             case CollisionShapeType::Aabb:
-                return s << "AgentShapeType::Aabb";
+                return s << "CollisionShapeType::Aabb";
             case CollisionShapeType::RotatingBox:
-                return s << "AgentShapeType::RotatingBox";
+                return s << "CollisionShapeType::RotatingBox";
             case CollisionShapeType::Cylinder:
-                return s << "AgentShapeType::Cylinder";
+                return s << "CollisionShapeType::Cylinder";
         }
-        return s << "AgentShapeType::" << static_cast<std::underlying_type_t<CollisionShapeType>>(v);
+        return s << "CollisionShapeType::" << static_cast<std::underlying_type_t<CollisionShapeType>>(v);
     }
 
     std::ostream& operator<<(std::ostream& s, const AgentBounds& v)
@@ -184,8 +184,6 @@ namespace DetourNavigator
         {
             case ChangeType::remove:
                 return stream << "ChangeType::remove";
-            case ChangeType::mixed:
-                return stream << "ChangeType::mixed";
             case ChangeType::add:
                 return stream << "ChangeType::add";
             case ChangeType::update:
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index b038226797..e5efa8815f 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -16,55 +16,55 @@
 #include <array>
 #include <cassert>
 #include <functional>
+#include <iterator>
 #include <span>
 #include <vector>
 
 namespace DetourNavigator
 {
-    template <class OutputIterator, class Function>
-    class OutputTransformIterator
+    template <std::output_iterator<osg::Vec3f> OutputIterator>
+    class FromNavMeshCoordinatesIterator
     {
     public:
-        explicit OutputTransformIterator(OutputIterator& impl, Function&& function)
+        using iterator_category = std::output_iterator_tag;
+        using value_type = osg::Vec3f;
+        using difference_type = std::ptrdiff_t;
+        using pointer = osg::Vec3f*;
+        using reference = osg::Vec3f&;
+
+        explicit FromNavMeshCoordinatesIterator(OutputIterator& impl, const RecastSettings& settings)
             : mImpl(impl)
-            , mFunction(std::forward<Function>(function))
+            , mSettings(settings)
         {
         }
 
-        OutputTransformIterator& operator*() { return *this; }
+        FromNavMeshCoordinatesIterator& operator*() { return *this; }
 
-        OutputTransformIterator& operator++()
+        FromNavMeshCoordinatesIterator& operator++()
         {
             ++mImpl.get();
             return *this;
         }
 
-        OutputTransformIterator operator++(int)
+        FromNavMeshCoordinatesIterator operator++(int)
         {
             const auto copy = *this;
             ++(*this);
             return copy;
         }
 
-        OutputTransformIterator& operator=(const osg::Vec3f& value)
+        FromNavMeshCoordinatesIterator& operator=(const osg::Vec3f& value)
         {
-            *mImpl.get() = mFunction(value);
+            *mImpl.get() = fromNavMeshCoordinates(mSettings, value);
             return *this;
         }
 
     private:
         std::reference_wrapper<OutputIterator> mImpl;
-        Function mFunction;
+        std::reference_wrapper<const RecastSettings> mSettings;
     };
 
-    template <class OutputIterator>
-    auto withFromNavMeshCoordinates(OutputIterator& impl, const RecastSettings& settings)
-    {
-        return OutputTransformIterator(
-            impl, [&settings](const osg::Vec3f& value) { return fromNavMeshCoordinates(settings, value); });
-    }
-
-    inline std::optional<std::size_t> findPath(const dtNavMeshQuery& navMeshQuery, const dtPolyRef startRef,
+    inline std::optional<std::size_t> findPolygonPath(const dtNavMeshQuery& navMeshQuery, const dtPolyRef startRef,
         const dtPolyRef endRef, const osg::Vec3f& startPos, const osg::Vec3f& endPos, const dtQueryFilter& queryFilter,
         std::span<dtPolyRef> pathBuffer)
     {
@@ -78,10 +78,9 @@ namespace DetourNavigator
         return static_cast<std::size_t>(pathLen);
     }
 
-    template <class OutputIterator>
     Status makeSmoothPath(const dtNavMeshQuery& navMeshQuery, const osg::Vec3f& start, const osg::Vec3f& end,
         std::span<dtPolyRef> polygonPath, std::size_t polygonPathSize, std::size_t maxSmoothPathSize,
-        OutputIterator& out)
+        std::output_iterator<osg::Vec3f> auto& out)
     {
         assert(polygonPathSize <= polygonPath.size());
 
@@ -102,10 +101,9 @@ namespace DetourNavigator
         return Status::Success;
     }
 
-    template <class OutputIterator>
     Status findSmoothPath(const dtNavMeshQuery& navMeshQuery, const osg::Vec3f& halfExtents, const osg::Vec3f& start,
         const osg::Vec3f& end, const Flags includeFlags, const AreaCosts& areaCosts, const DetourSettings& settings,
-        float endTolerance, OutputIterator out)
+        float endTolerance, std::output_iterator<osg::Vec3f> auto out)
     {
         dtQueryFilter queryFilter;
         queryFilter.setIncludeFlags(includeFlags);
@@ -134,7 +132,7 @@ namespace DetourNavigator
 
         std::vector<dtPolyRef> polygonPath(settings.mMaxPolygonPathSize);
         const auto polygonPathSize
-            = findPath(navMeshQuery, startRef, endRef, startNavMeshPos, endNavMeshPos, queryFilter, polygonPath);
+            = findPolygonPath(navMeshQuery, startRef, endRef, startNavMeshPos, endNavMeshPos, queryFilter, polygonPath);
 
         if (!polygonPathSize.has_value())
             return Status::FindPathOverPolygonsFailed;
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index a96a554302..118114181e 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -22,7 +22,7 @@ namespace DetourNavigator
     {
         struct Ignore
         {
-            std::string_view mWorldspace;
+            ESM::RefId mWorldspace;
             const TilePosition& mTilePosition;
             std::shared_ptr<NavMeshTileConsumer> mConsumer;
 
@@ -34,10 +34,10 @@ namespace DetourNavigator
         };
     }
 
-    GenerateNavMeshTile::GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
+    GenerateNavMeshTile::GenerateNavMeshTile(ESM::RefId worldspace, const TilePosition& tilePosition,
         RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds,
         const DetourNavigator::Settings& settings, std::weak_ptr<NavMeshTileConsumer> consumer)
-        : mWorldspace(std::move(worldspace))
+        : mWorldspace(worldspace)
         , mTilePosition(tilePosition)
         , mRecastMeshProvider(recastMeshProvider)
         , mAgentBounds(agentBounds)
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index c132ef6160..76ef55ce56 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -35,18 +35,18 @@ namespace DetourNavigator
         virtual std::int64_t resolveMeshSource(const MeshSource& source) = 0;
 
         virtual std::optional<NavMeshTileInfo> find(
-            std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
+            ESM::RefId worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
             = 0;
 
-        virtual void ignore(std::string_view worldspace, const TilePosition& tilePosition) = 0;
+        virtual void ignore(ESM::RefId worldspace, const TilePosition& tilePosition) = 0;
 
-        virtual void identity(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId) = 0;
+        virtual void identity(ESM::RefId worldspace, const TilePosition& tilePosition, std::int64_t tileId) = 0;
 
-        virtual void insert(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t version,
+        virtual void insert(ESM::RefId worldspace, const TilePosition& tilePosition, std::int64_t version,
             const std::vector<std::byte>& input, PreparedNavMeshData& data)
             = 0;
 
-        virtual void update(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId,
+        virtual void update(ESM::RefId worldspace, const TilePosition& tilePosition, std::int64_t tileId,
             std::int64_t version, PreparedNavMeshData& data)
             = 0;
 
@@ -56,14 +56,14 @@ namespace DetourNavigator
     class GenerateNavMeshTile final : public SceneUtil::WorkItem
     {
     public:
-        GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
+        GenerateNavMeshTile(ESM::RefId worldspace, const TilePosition& tilePosition,
             RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds, const Settings& settings,
             std::weak_ptr<NavMeshTileConsumer> consumer);
 
         void doWork() final;
 
     private:
-        const std::string mWorldspace;
+        const ESM::RefId mWorldspace;
         const TilePosition mTilePosition;
         const RecastMeshProvider mRecastMeshProvider;
         const AgentBounds mAgentBounds;
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
index a3f46f3f85..343140633f 100644
--- a/components/detournavigator/gettilespositions.cpp
+++ b/components/detournavigator/gettilespositions.cpp
@@ -76,4 +76,13 @@ namespace DetourNavigator
             return {};
         return TilesPositionsRange{ TilePosition(beginX, beginY), TilePosition(endX, endY) };
     }
+
+    TilesPositionsRange getUnion(const TilesPositionsRange& a, const TilesPositionsRange& b) noexcept
+    {
+        const int beginX = std::min(a.mBegin.x(), b.mBegin.x());
+        const int endX = std::max(a.mEnd.x(), b.mEnd.x());
+        const int beginY = std::min(a.mBegin.y(), b.mBegin.y());
+        const int endY = std::max(a.mEnd.y(), b.mEnd.y());
+        return TilesPositionsRange{ .mBegin = TilePosition(beginX, beginY), .mEnd = TilePosition(endX, endY) };
+    }
 }
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 32733224f3..66c3a90d1b 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -50,6 +50,8 @@ namespace DetourNavigator
     }
 
     TilesPositionsRange getIntersection(const TilesPositionsRange& a, const TilesPositionsRange& b) noexcept;
+
+    TilesPositionsRange getUnion(const TilesPositionsRange& a, const TilesPositionsRange& b) noexcept;
 }
 
 #endif
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 4bac85f420..f037da69f8 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -186,16 +186,35 @@ namespace DetourNavigator
                 &context, solid, width, height, bmin.ptr(), bmax.ptr(), settings.mCellSize, settings.mCellHeight);
         }
 
+        bool isSupportedCoordinate(float value)
+        {
+            constexpr float maxVertexCoordinate = static_cast<float>(1 << 22);
+            return -maxVertexCoordinate < value && value < maxVertexCoordinate;
+        }
+
+        template <class Iterator>
+        bool isSupportedCoordinates(Iterator begin, Iterator end)
+        {
+            return std::all_of(begin, end, isSupportedCoordinate);
+        }
+
         [[nodiscard]] bool rasterizeTriangles(RecastContext& context, const Mesh& mesh, const RecastSettings& settings,
             const RecastParams& params, rcHeightfield& solid)
         {
             std::vector<unsigned char> areas(mesh.getAreaTypes().begin(), mesh.getAreaTypes().end());
             std::vector<float> vertices = mesh.getVertices();
 
-            for (std::size_t i = 0; i < vertices.size(); i += 3)
+            constexpr std::size_t verticesPerTriangle = 3;
+
+            for (std::size_t i = 0; i < vertices.size(); i += verticesPerTriangle)
             {
-                for (std::size_t j = 0; j < 3; ++j)
-                    vertices[i + j] = toNavMeshCoordinates(settings, vertices[i + j]);
+                for (std::size_t j = 0; j < verticesPerTriangle; ++j)
+                {
+                    const float coordinate = toNavMeshCoordinates(settings, vertices[i + j]);
+                    if (!isSupportedCoordinate(coordinate))
+                        return false;
+                    vertices[i + j] = coordinate;
+                }
                 std::swap(vertices[i + 1], vertices[i + 2]);
             }
 
@@ -217,6 +236,9 @@ namespace DetourNavigator
                 rectangle.mBounds.mMax.x(), rectangle.mHeight, rectangle.mBounds.mMin.y(), // vertex 3
             };
 
+            if (!isSupportedCoordinates(vertices.begin(), vertices.end()))
+                return false;
+
             const std::array indices{
                 0, 1, 2, // triangle 0
                 0, 2, 3, // triangle 1
@@ -458,15 +480,6 @@ namespace DetourNavigator
             return true;
         }
 
-        template <class T>
-        unsigned long getMinValuableBitsNumber(const T value)
-        {
-            unsigned long power = 0;
-            while (power < sizeof(T) * 8 && (static_cast<T>(1) << power) < value)
-                ++power;
-            return power;
-        }
-
         std::pair<float, float> getBoundsByZ(
             const RecastMesh& recastMesh, float agentHalfExtentsZ, const RecastSettings& settings)
         {
@@ -506,13 +519,9 @@ namespace DetourNavigator
             return { minZ, maxZ };
         }
     }
-} // namespace DetourNavigator
 
-namespace DetourNavigator
-{
-    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
-        std::string_view worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds,
-        const RecastSettings& settings)
+    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh, ESM::RefId worldspace,
+        const TilePosition& tilePosition, const AgentBounds& agentBounds, const RecastSettings& settings)
     {
         RecastContext context(worldspace, tilePosition, agentBounds);
 
@@ -599,22 +608,12 @@ namespace DetourNavigator
 
     void initEmptyNavMesh(const Settings& settings, dtNavMesh& navMesh)
     {
-        // Max tiles and max polys affect how the tile IDs are caculated.
-        // There are 22 bits available for identifying a tile and a polygon.
-        const int polysAndTilesBits = 22;
-        const auto polysBits = getMinValuableBitsNumber(settings.mDetour.mMaxPolys);
-
-        if (polysBits >= polysAndTilesBits)
-            throw InvalidArgument("Too many polygons per tile");
-
-        const auto tilesBits = polysAndTilesBits - polysBits;
-
         dtNavMeshParams params;
         std::fill_n(params.orig, 3, 0.0f);
         params.tileWidth = settings.mRecast.mTileSize * settings.mRecast.mCellSize;
         params.tileHeight = settings.mRecast.mTileSize * settings.mRecast.mCellSize;
-        params.maxTiles = 1 << tilesBits;
-        params.maxPolys = 1 << polysBits;
+        params.maxTiles = settings.mMaxTilesNumber;
+        params.maxPolys = settings.mDetour.mMaxPolys;
 
         const auto status = navMesh.init(&params);
 
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 25bbca6d3c..d78f946230 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -4,6 +4,8 @@
 #include "recastmesh.hpp"
 #include "tileposition.hpp"
 
+#include <components/esm/refid.hpp>
+
 #include <memory>
 #include <vector>
 
@@ -41,9 +43,8 @@ namespace DetourNavigator
             && recastMesh.getHeightfields().empty() && recastMesh.getFlatHeightfields().empty();
     }
 
-    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
-        std::string_view worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds,
-        const RecastSettings& settings);
+    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh, ESM::RefId worldspace,
+        const TilePosition& tilePosition, const AgentBounds& agentBounds, const RecastSettings& settings);
 
     NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
         const std::vector<OffMeshConnection>& offMeshConnections, const AgentBounds& agentBounds,
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index f2acc8c9d6..3f27bc1479 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -1,8 +1,11 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVIGATOR_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVIGATOR_H
 
+#include <cassert>
 #include <filesystem>
+#include <optional>
 
+#include "cellgridbounds.hpp"
 #include "heightfieldshape.hpp"
 #include "objectid.hpp"
 #include "objecttransform.hpp"
@@ -11,6 +14,7 @@
 #include "updateguard.hpp"
 #include "waitconditiontype.hpp"
 
+#include <components/esm/refid.hpp>
 #include <components/resource/bulletshape.hpp>
 
 namespace ESM
@@ -86,17 +90,10 @@ namespace DetourNavigator
          */
         virtual void removeAgent(const AgentBounds& agentBounds) = 0;
 
-        /**
-         * @brief setWorldspace should be called before adding object from new worldspace
-         * @param worldspace
-         */
-        virtual void setWorldspace(std::string_view worldspace, const UpdateGuard* guard) = 0;
-
-        /**
-         * @brief updateBounds should be called before adding object from loading cell
-         * @param playerPosition corresponds to the bounds center
-         */
-        virtual void updateBounds(const osg::Vec3f& playerPosition, const UpdateGuard* guard) = 0;
+        // Updates bounds for recast mesh and navmesh tiles, removes tiles outside the range.
+        virtual void updateBounds(ESM::RefId worldspace, const std::optional<CellGridBounds>& cellGridBounds,
+            const osg::Vec3f& playerPosition, const UpdateGuard* guard)
+            = 0;
 
         /**
          * @brief addObject is used to add complex object with allowed to walk and avoided to walk shapes
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 514a70b336..1cb35a58c6 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -33,14 +33,10 @@ namespace DetourNavigator
             --it->second;
     }
 
-    void NavigatorImpl::setWorldspace(std::string_view worldspace, const UpdateGuard* guard)
+    void NavigatorImpl::updateBounds(ESM::RefId worldspace, const std::optional<CellGridBounds>& cellGridBounds,
+        const osg::Vec3f& playerPosition, const UpdateGuard* guard)
     {
-        mNavMeshManager.setWorldspace(worldspace, guard);
-    }
-
-    void NavigatorImpl::updateBounds(const osg::Vec3f& playerPosition, const UpdateGuard* guard)
-    {
-        mNavMeshManager.updateBounds(playerPosition, guard);
+        mNavMeshManager.updateBounds(worldspace, cellGridBounds, playerPosition, guard);
     }
 
     void NavigatorImpl::addObject(
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 1439a89f28..413fd8ef6b 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -8,7 +8,6 @@
 #include <map>
 #include <memory>
 #include <optional>
-#include <string_view>
 #include <unordered_map>
 
 namespace DetourNavigator
@@ -28,9 +27,8 @@ namespace DetourNavigator
 
         void removeAgent(const AgentBounds& agentBounds) override;
 
-        void setWorldspace(std::string_view worldspace, const UpdateGuard* guard) override;
-
-        void updateBounds(const osg::Vec3f& playerPosition, const UpdateGuard* guard) override;
+        void updateBounds(ESM::RefId worldspace, const std::optional<CellGridBounds>& cellGridBounds,
+            const osg::Vec3f& playerPosition, const UpdateGuard* guard) override;
 
         void addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform,
             const UpdateGuard* guard) override;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 7b93811c15..7102722517 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -24,7 +24,10 @@ namespace DetourNavigator
 
         void removeAgent(const AgentBounds& /*agentBounds*/) override {}
 
-        void setWorldspace(std::string_view /*worldspace*/, const UpdateGuard* /*guard*/) override {}
+        void updateBounds(ESM::RefId /*worldspace*/, const std::optional<CellGridBounds>& /*cellGridBounds*/,
+            const osg::Vec3f& /*playerPosition*/, const UpdateGuard* /*guard*/) override
+        {
+        }
 
         void addObject(const ObjectId /*id*/, const ObjectShapes& /*shapes*/, const btTransform& /*transform*/,
             const UpdateGuard* /*guard*/) override
@@ -68,8 +71,6 @@ namespace DetourNavigator
 
         void update(const osg::Vec3f& /*playerPosition*/, const UpdateGuard* /*guard*/) override {}
 
-        void updateBounds(const osg::Vec3f& /*playerPosition*/, const UpdateGuard* /*guard*/) override {}
-
         void wait(WaitConditionType /*waitConditionType*/, Loading::Listener* /*listener*/) override {}
 
         SharedNavMeshCacheItem getNavMesh(const AgentBounds& /*agentBounds*/) const override
diff --git a/components/detournavigator/navigatorutils.cpp b/components/detournavigator/navigatorutils.cpp
index cad201825c..2f9fbbb32e 100644
--- a/components/detournavigator/navigatorutils.cpp
+++ b/components/detournavigator/navigatorutils.cpp
@@ -1,8 +1,11 @@
 #include "navigatorutils.hpp"
+#include "debug.hpp"
 #include "findrandompointaroundcircle.hpp"
 #include "navigator.hpp"
 #include "raycast.hpp"
 
+#include <components/debug/debuglog.hpp>
+
 namespace DetourNavigator
 {
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const AgentBounds& agentBounds,
@@ -37,4 +40,41 @@ namespace DetourNavigator
             return std::nullopt;
         return fromNavMeshCoordinates(settings.mRecast, *result);
     }
+
+    std::optional<osg::Vec3f> findNearestNavMeshPosition(const Navigator& navigator, const AgentBounds& agentBounds,
+        const osg::Vec3f& position, const osg::Vec3f& searchAreaHalfExtents, const Flags includeFlags)
+    {
+        const auto navMesh = navigator.getNavMesh(agentBounds);
+        if (navMesh == nullptr)
+            return std::nullopt;
+
+        const auto& settings = navigator.getSettings();
+        const osg::Vec3f navMeshPosition = toNavMeshCoordinates(settings.mRecast, position);
+        const auto lockedNavMesh = navMesh->lockConst();
+
+        dtNavMeshQuery navMeshQuery;
+        if (const dtStatus status
+            = navMeshQuery.init(&lockedNavMesh->getImpl(), settings.mDetour.mMaxNavMeshQueryNodes);
+            dtStatusFailed(status))
+        {
+            Log(Debug::Error) << "Failed to init dtNavMeshQuery for findNearestNavMeshPosition: "
+                              << WriteDtStatus{ status };
+            return std::nullopt;
+        }
+
+        dtQueryFilter queryFilter;
+        queryFilter.setIncludeFlags(includeFlags);
+
+        osg::Vec3f nearestNavMeshPos;
+        const osg::Vec3f endPolyHalfExtents = toNavMeshCoordinates(settings.mRecast, searchAreaHalfExtents);
+        dtPolyRef polyRef;
+        if (const dtStatus status = navMeshQuery.findNearestPoly(
+                navMeshPosition.ptr(), endPolyHalfExtents.ptr(), &queryFilter, &polyRef, nearestNavMeshPos.ptr());
+            dtStatusFailed(status) || polyRef == 0)
+        {
+            return std::nullopt;
+        }
+
+        return fromNavMeshCoordinates(settings.mRecast, nearestNavMeshPos);
+    }
 }
diff --git a/components/detournavigator/navigatorutils.hpp b/components/detournavigator/navigatorutils.hpp
index 927066b6bb..ca02682ecd 100644
--- a/components/detournavigator/navigatorutils.hpp
+++ b/components/detournavigator/navigatorutils.hpp
@@ -9,34 +9,31 @@
 
 #include <components/misc/guarded.hpp>
 
+#include <iterator>
 #include <optional>
 
 namespace DetourNavigator
 {
     /**
      * @brief findPath fills output iterator with points of scene surfaces to be used for actor to walk through.
-     * @param agentBounds allows to find navmesh for given actor.
+     * @param agentBounds defines which navmesh to use.
      * @param start path from given point.
      * @param end path at given point.
-     * @param includeFlags setup allowed surfaces for actor to walk.
+     * @param includeFlags setup allowed navmesh areas.
      * @param out the beginning of the destination range.
      * @param endTolerance defines maximum allowed distance to end path point in addition to agentHalfExtents
-     * @return Output iterator to the element in the destination range, one past the last element of found path.
+     * @return Status.
      * Equal to out if no path is found.
      */
-    template <class OutputIterator>
     inline Status findPath(const Navigator& navigator, const AgentBounds& agentBounds, const osg::Vec3f& start,
         const osg::Vec3f& end, const Flags includeFlags, const AreaCosts& areaCosts, float endTolerance,
-        OutputIterator out)
+        std::output_iterator<osg::Vec3f> auto out)
     {
-        static_assert(std::is_same<typename std::iterator_traits<OutputIterator>::iterator_category,
-                          std::output_iterator_tag>::value,
-            "out is not an OutputIterator");
         const auto navMesh = navigator.getNavMesh(agentBounds);
         if (navMesh == nullptr)
             return Status::NavMeshNotFound;
         const Settings& settings = navigator.getSettings();
-        auto outTransform = withFromNavMeshCoordinates(out, settings.mRecast);
+        FromNavMeshCoordinatesIterator outTransform(out, settings.mRecast);
         const auto locked = navMesh->lock();
         return findSmoothPath(locked->getQuery(), toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents),
             toNavMeshCoordinates(settings.mRecast, start), toNavMeshCoordinates(settings.mRecast, end), includeFlags,
@@ -45,10 +42,10 @@ namespace DetourNavigator
 
     /**
      * @brief findRandomPointAroundCircle returns random location on navmesh within the reach of specified location.
-     * @param agentBounds allows to find navmesh for given actor.
+     * @param agentBounds defines which navmesh to use.
      * @param start is a position where the search starts.
      * @param maxRadius limit maximum distance from start.
-     * @param includeFlags setup allowed surfaces for actor to walk.
+     * @param includeFlags setup allowed navmesh areas.
      * @return not empty optional with position if point is found and empty optional if point is not found.
      */
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const AgentBounds& agentBounds,
@@ -56,14 +53,25 @@ namespace DetourNavigator
 
     /**
      * @brief raycast finds farest navmesh point from start on a line from start to end that has path from start.
-     * @param agentBounds allows to find navmesh for given actor.
+     * @param agentBounds defines which navmesh to use.
      * @param start of the line
      * @param end of the line
-     * @param includeFlags setup allowed surfaces for actor to walk.
+     * @param includeFlags setup allowed navmesh areas.
      * @return not empty optional with position if point is found and empty optional if point is not found.
      */
     std::optional<osg::Vec3f> raycast(const Navigator& navigator, const AgentBounds& agentBounds,
         const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags);
+
+    /**
+     * @brief findNearestNavMeshPosition finds nearest position on navmesh within given area having given flags.
+     * @param agentBounds defines which navmesh to use.
+     * @param position is a center of the search area.
+     * @param searchAreaHalfExtents defines AABB like area around given postion.
+     * @param includeFlags setup allowed navmesh areas.
+     * @return not empty optional with position if position is found and empty optional if position is not found.
+     */
+    std::optional<osg::Vec3f> findNearestNavMeshPosition(const Navigator& navigator, const AgentBounds& agentBounds,
+        const osg::Vec3f& position, const osg::Vec3f& searchAreaHalfExtents, const Flags includeFlags);
 }
 
 #endif
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index ec76b56a46..120a374195 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -131,6 +131,15 @@ namespace DetourNavigator
                     function(position, tile.mVersion, *meshTile);
         }
 
+        template <class Function>
+        void forEachTilePosition(Function&& function) const
+        {
+            for (const auto& [position, tile] : mUsedTiles)
+                function(position);
+            for (const TilePosition& position : mEmptyTiles)
+                function(position);
+        }
+
     private:
         struct Tile
         {
diff --git a/components/detournavigator/navmeshdb.cpp b/components/detournavigator/navmeshdb.cpp
index d5c6fdb46b..76f0811f16 100644
--- a/components/detournavigator/navmeshdb.cpp
+++ b/components/detournavigator/navmeshdb.cpp
@@ -200,34 +200,35 @@ namespace DetourNavigator
     }
 
     std::optional<Tile> NavMeshDb::findTile(
-        std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
+        ESM::RefId worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
     {
         Tile result;
         auto row = std::tie(result.mTileId, result.mVersion);
         const std::vector<std::byte> compressedInput = Misc::compress(input);
-        if (&row == request(*mDb, mFindTile, &row, 1, worldspace, tilePosition, compressedInput))
+        if (&row == request(*mDb, mFindTile, &row, 1, worldspace.serializeText(), tilePosition, compressedInput))
             return {};
         return result;
     }
 
     std::optional<TileData> NavMeshDb::getTileData(
-        std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
+        ESM::RefId worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input)
     {
         TileData result;
         auto row = std::tie(result.mTileId, result.mVersion, result.mData);
         const std::vector<std::byte> compressedInput = Misc::compress(input);
-        if (&row == request(*mDb, mGetTileData, &row, 1, worldspace, tilePosition, compressedInput))
+        if (&row == request(*mDb, mGetTileData, &row, 1, worldspace.serializeText(), tilePosition, compressedInput))
             return {};
         result.mData = Misc::decompress(result.mData);
         return result;
     }
 
-    int NavMeshDb::insertTile(TileId tileId, std::string_view worldspace, const TilePosition& tilePosition,
+    int NavMeshDb::insertTile(TileId tileId, ESM::RefId worldspace, const TilePosition& tilePosition,
         TileVersion version, const std::vector<std::byte>& input, const std::vector<std::byte>& data)
     {
         const std::vector<std::byte> compressedInput = Misc::compress(input);
         const std::vector<std::byte> compressedData = Misc::compress(data);
-        return execute(*mDb, mInsertTile, tileId, worldspace, tilePosition, version, compressedInput, compressedData);
+        return execute(*mDb, mInsertTile, tileId, worldspace.serializeText(), tilePosition, version, compressedInput,
+            compressedData);
     }
 
     int NavMeshDb::updateTile(TileId tileId, TileVersion version, const std::vector<std::byte>& data)
@@ -236,20 +237,19 @@ namespace DetourNavigator
         return execute(*mDb, mUpdateTile, tileId, version, compressedData);
     }
 
-    int NavMeshDb::deleteTilesAt(std::string_view worldspace, const TilePosition& tilePosition)
+    int NavMeshDb::deleteTilesAt(ESM::RefId worldspace, const TilePosition& tilePosition)
     {
-        return execute(*mDb, mDeleteTilesAt, worldspace, tilePosition);
+        return execute(*mDb, mDeleteTilesAt, worldspace.serializeText(), tilePosition);
     }
 
-    int NavMeshDb::deleteTilesAtExcept(
-        std::string_view worldspace, const TilePosition& tilePosition, TileId excludeTileId)
+    int NavMeshDb::deleteTilesAtExcept(ESM::RefId worldspace, const TilePosition& tilePosition, TileId excludeTileId)
     {
-        return execute(*mDb, mDeleteTilesAtExcept, worldspace, tilePosition, excludeTileId);
+        return execute(*mDb, mDeleteTilesAtExcept, worldspace.serializeText(), tilePosition, excludeTileId);
     }
 
-    int NavMeshDb::deleteTilesOutsideRange(std::string_view worldspace, const TilesPositionsRange& range)
+    int NavMeshDb::deleteTilesOutsideRange(ESM::RefId worldspace, const TilesPositionsRange& range)
     {
-        return execute(*mDb, mDeleteTilesOutsideRange, worldspace, range);
+        return execute(*mDb, mDeleteTilesOutsideRange, worldspace.serializeText(), range);
     }
 
     ShapeId NavMeshDb::getMaxShapeId()
diff --git a/components/detournavigator/navmeshdb.hpp b/components/detournavigator/navmeshdb.hpp
index 3cf1bdcdca..9918dca9f5 100644
--- a/components/detournavigator/navmeshdb.hpp
+++ b/components/detournavigator/navmeshdb.hpp
@@ -2,10 +2,10 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHDB_H
 
 #include "tileposition.hpp"
+#include "tilespositionsrange.hpp"
 
-#include <components/detournavigator/tilespositionsrange.hpp>
+#include <components/esm/refid.hpp>
 #include <components/misc/strongtypedef.hpp>
-
 #include <components/sqlite3/db.hpp>
 #include <components/sqlite3/statement.hpp>
 #include <components/sqlite3/transaction.hpp>
@@ -13,13 +13,8 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <cstring>
-#include <memory>
 #include <optional>
-#include <stdexcept>
 #include <string_view>
-#include <tuple>
-#include <utility>
 #include <vector>
 
 struct sqlite3;
@@ -148,21 +143,21 @@ namespace DetourNavigator
         TileId getMaxTileId();
 
         std::optional<Tile> findTile(
-            std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input);
+            ESM::RefId worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input);
 
         std::optional<TileData> getTileData(
-            std::string_view worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input);
+            ESM::RefId worldspace, const TilePosition& tilePosition, const std::vector<std::byte>& input);
 
-        int insertTile(TileId tileId, std::string_view worldspace, const TilePosition& tilePosition,
-            TileVersion version, const std::vector<std::byte>& input, const std::vector<std::byte>& data);
+        int insertTile(TileId tileId, ESM::RefId worldspace, const TilePosition& tilePosition, TileVersion version,
+            const std::vector<std::byte>& input, const std::vector<std::byte>& data);
 
         int updateTile(TileId tileId, TileVersion version, const std::vector<std::byte>& data);
 
-        int deleteTilesAt(std::string_view worldspace, const TilePosition& tilePosition);
+        int deleteTilesAt(ESM::RefId worldspace, const TilePosition& tilePosition);
 
-        int deleteTilesAtExcept(std::string_view worldspace, const TilePosition& tilePosition, TileId excludeTileId);
+        int deleteTilesAtExcept(ESM::RefId worldspace, const TilePosition& tilePosition, TileId excludeTileId);
 
-        int deleteTilesOutsideRange(std::string_view worldspace, const TilesPositionsRange& range);
+        int deleteTilesOutsideRange(ESM::RefId worldspace, const TilesPositionsRange& range);
 
         ShapeId getMaxShapeId();
 
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 5c93aee5e7..5db582f152 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -1,4 +1,5 @@
 #include "navmeshmanager.hpp"
+
 #include "debug.hpp"
 #include "gettilespositions.hpp"
 #include "makenavmesh.hpp"
@@ -8,13 +9,12 @@
 #include "waitconditiontype.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm/util.hpp>
 
 #include <osg/io_utils>
 
 #include <DetourNavMesh.h>
 
-#include <iterator>
-
 namespace
 {
     /// Safely reset shared_ptr with definite underlying object destrutor call.
@@ -37,15 +37,46 @@ namespace DetourNavigator
 {
     namespace
     {
-        TilesPositionsRange makeRange(const TilePosition& center, int maxTiles)
+        int getMaxRadius(int maxTiles)
+        {
+            return static_cast<int>(std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1));
+        }
+
+        TilesPositionsRange makeRange(const TilePosition& center, int radius)
         {
-            const int radius = static_cast<int>(std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1));
             return TilesPositionsRange{
                 .mBegin = center - TilePosition(radius, radius),
                 .mEnd = center + TilePosition(radius + 1, radius + 1),
             };
         }
 
+        osg::Vec2f getMinCellGridPosition(const osg::Vec2i& center, int offset, float cellSize)
+        {
+            const osg::Vec2i cell = center + osg::Vec2i(offset, offset);
+            return osg::Vec2f(static_cast<float>(cell.x()) * cellSize, static_cast<float>(cell.y()) * cellSize);
+        }
+
+        TilesPositionsRange makeCellGridRange(
+            const RecastSettings& settings, ESM::RefId worldspace, const CellGridBounds& bounds)
+        {
+            const float floatCellSize = static_cast<float>(ESM::getCellSize(worldspace));
+            const osg::Vec2f min = getMinCellGridPosition(bounds.mCenter, -bounds.mHalfSize, floatCellSize);
+            const osg::Vec2f max = getMinCellGridPosition(bounds.mCenter, bounds.mHalfSize + 1, floatCellSize);
+            return TilesPositionsRange{
+                .mBegin = getTilePosition(settings, toNavMeshCoordinates(settings, min)),
+                .mEnd = getTilePosition(settings, toNavMeshCoordinates(settings, max)),
+            };
+        }
+
+        TilesPositionsRange makeRange(const Settings& settings, ESM::RefId worldspace,
+            const std::optional<CellGridBounds>& bounds, int radius, const TilePosition& center)
+        {
+            TilesPositionsRange result = makeRange(center, radius);
+            if (bounds.has_value())
+                result = getIntersection(result, makeCellGridRange(settings.mRecast, worldspace, *bounds));
+            return result;
+        }
+
         TilePosition toNavMeshTilePosition(const RecastSettings& settings, const osg::Vec3f& position)
         {
             return getTilePosition(settings, toNavMeshCoordinates(settings, position));
@@ -54,27 +85,28 @@ namespace DetourNavigator
 
     NavMeshManager::NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
+        , mMaxRadius(getMaxRadius(settings.mMaxTilesNumber))
         , mRecastMeshManager(settings.mRecast)
         , mOffMeshConnectionsManager(settings.mRecast)
         , mAsyncNavMeshUpdater(settings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db))
     {
     }
 
-    void NavMeshManager::setWorldspace(std::string_view worldspace, const UpdateGuard* guard)
+    void NavMeshManager::updateBounds(ESM::RefId worldspace, const std::optional<CellGridBounds>& cellGridBounds,
+        const osg::Vec3f& playerPosition, const UpdateGuard* guard)
     {
-        if (worldspace == mWorldspace)
-            return;
-        mRecastMeshManager.setWorldspace(worldspace, guard);
-        for (auto& [agent, cache] : mCache)
-            cache = std::make_shared<GuardedNavMeshCacheItem>(++mGenerationCounter, mSettings);
-        mWorldspace = worldspace;
-    }
+        if (worldspace != mWorldspace)
+        {
+            mRecastMeshManager.setWorldspace(worldspace, guard);
+            for (auto& [agent, cache] : mCache)
+                cache = std::make_shared<GuardedNavMeshCacheItem>(++mGenerationCounter, mSettings);
+            mWorldspace = worldspace;
+        }
 
-    void NavMeshManager::updateBounds(const osg::Vec3f& playerPosition, const UpdateGuard* guard)
-    {
         const TilePosition playerTile = toNavMeshTilePosition(mSettings.mRecast, playerPosition);
-        const TilesPositionsRange range = makeRange(playerTile, mSettings.mMaxTilesNumber);
-        mRecastMeshManager.setRange(range, guard);
+
+        mRecastMeshManager.setRange(makeRange(mSettings, worldspace, cellGridBounds, mMaxRadius, playerTile), guard);
+        mCellGridBounds = cellGridBounds;
     }
 
     bool NavMeshManager::addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
@@ -166,6 +198,7 @@ namespace DetourNavigator
             return;
         mLastRecastMeshManagerRevision = mRecastMeshManager.getRevision();
         mPlayerTile = playerTile;
+        mRecastMeshManager.setRange(makeRange(mSettings, mWorldspace, mCellGridBounds, mMaxRadius, playerTile), guard);
         const auto changedTiles = mRecastMeshManager.takeChangedTiles(guard);
         const TilesPositionsRange range = mRecastMeshManager.getLimitedObjectsRange();
         for (const auto& [agentBounds, cached] : mCache)
@@ -177,11 +210,10 @@ namespace DetourNavigator
         const std::map<osg::Vec2i, ChangeType>& changedTiles)
     {
         std::map<osg::Vec2i, ChangeType> tilesToPost = changedTiles;
-        std::map<osg::Vec2i, ChangeType> tilesToPost1;
         {
+            const int maxTiles = mSettings.mMaxTilesNumber;
             const auto locked = cached->lockConst();
             const auto& navMesh = locked->getImpl();
-            const auto maxTiles = std::min(mSettings.mMaxTilesNumber, navMesh.getParams()->maxTiles);
             getTilesPositions(range, [&](const TilePosition& tile) {
                 if (changedTiles.find(tile) != changedTiles.end())
                     return;
@@ -190,7 +222,11 @@ namespace DetourNavigator
                 if (shouldAdd && !presentInNavMesh)
                     tilesToPost.emplace(tile, locked->isEmptyTile(tile) ? ChangeType::update : ChangeType::add);
                 else if (!shouldAdd && presentInNavMesh)
-                    tilesToPost.emplace(tile, ChangeType::mixed);
+                    tilesToPost.emplace(tile, ChangeType::remove);
+            });
+            locked->forEachTilePosition([&](const TilePosition& tile) {
+                if (!shouldAddTile(tile, playerTile, maxTiles))
+                    tilesToPost.emplace(tile, ChangeType::remove);
             });
         }
         mAsyncNavMeshUpdater.post(agentBounds, cached, playerTile, mWorldspace, tilesToPost);
@@ -215,7 +251,10 @@ namespace DetourNavigator
 
     Stats NavMeshManager::getStats() const
     {
-        return Stats{ .mUpdater = mAsyncNavMeshUpdater.getStats() };
+        return Stats{
+            .mUpdater = mAsyncNavMeshUpdater.getStats(),
+            .mRecast = mRecastMeshManager.getStats(),
+        };
     }
 
     RecastMeshTiles NavMeshManager::getRecastMeshTiles() const
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index b50d6fb9f2..ed4703f4b1 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -3,6 +3,7 @@
 
 #include "agentbounds.hpp"
 #include "asyncnavmeshupdater.hpp"
+#include "cellgridbounds.hpp"
 #include "heightfieldshape.hpp"
 #include "offmeshconnectionsmanager.hpp"
 #include "recastmeshtiles.hpp"
@@ -24,9 +25,8 @@ namespace DetourNavigator
 
         ScopedUpdateGuard makeUpdateGuard() { return mRecastMeshManager.makeUpdateGuard(); }
 
-        void setWorldspace(std::string_view worldspace, const UpdateGuard* guard);
-
-        void updateBounds(const osg::Vec3f& playerPosition, const UpdateGuard* guard);
+        void updateBounds(ESM::RefId worldspace, const std::optional<CellGridBounds>& cellGridBounds,
+            const osg::Vec3f& playerPosition, const UpdateGuard* guard);
 
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
             const AreaType areaType, const UpdateGuard* guard);
@@ -67,7 +67,9 @@ namespace DetourNavigator
 
     private:
         const Settings& mSettings;
-        std::string mWorldspace;
+        const int mMaxRadius;
+        ESM::RefId mWorldspace;
+        std::optional<CellGridBounds> mCellGridBounds;
         TileCachedRecastMeshManager mRecastMeshManager;
         OffMeshConnectionsManager mOffMeshConnectionsManager;
         AsyncNavMeshUpdater mAsyncNavMeshUpdater;
diff --git a/components/detournavigator/objecttransform.hpp b/components/detournavigator/objecttransform.hpp
index e56f5dd392..1d52817f52 100644
--- a/components/detournavigator/objecttransform.hpp
+++ b/components/detournavigator/objecttransform.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_OBJECTTRANSFORM_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_OBJECTTRANSFORM_H
 
-#include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 
 #include <tuple>
 
diff --git a/components/detournavigator/recastcontext.cpp b/components/detournavigator/recastcontext.cpp
index 7ac7bcb66e..225f251f4d 100644
--- a/components/detournavigator/recastcontext.cpp
+++ b/components/detournavigator/recastcontext.cpp
@@ -24,7 +24,7 @@ namespace DetourNavigator
         }
 
         std::string formatPrefix(
-            std::string_view worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds)
+            ESM::RefId worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds)
         {
             std::ostringstream stream;
             stream << "Worldspace: " << worldspace << "; tile position: " << tilePosition.x() << ", "
@@ -34,7 +34,7 @@ namespace DetourNavigator
     }
 
     RecastContext::RecastContext(
-        std::string_view worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds)
+        ESM::RefId worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds)
         : mPrefix(formatPrefix(worldspace, tilePosition, agentBounds))
     {
     }
diff --git a/components/detournavigator/recastcontext.hpp b/components/detournavigator/recastcontext.hpp
index 3d65bbe95a..8e75f50b34 100644
--- a/components/detournavigator/recastcontext.hpp
+++ b/components/detournavigator/recastcontext.hpp
@@ -3,6 +3,8 @@
 
 #include "tileposition.hpp"
 
+#include <components/esm/refid.hpp>
+
 #include <string>
 
 #include <Recast.h>
@@ -14,8 +16,7 @@ namespace DetourNavigator
     class RecastContext final : public rcContext
     {
     public:
-        explicit RecastContext(
-            std::string_view worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds);
+        explicit RecastContext(ESM::RefId worldspace, const TilePosition& tilePosition, const AgentBounds& agentBounds);
 
         const std::string& getPrefix() const { return mPrefix; }
 
diff --git a/components/detournavigator/recastglobalallocator.hpp b/components/detournavigator/recastglobalallocator.hpp
index 956f050a72..f69805eb97 100644
--- a/components/detournavigator/recastglobalallocator.hpp
+++ b/components/detournavigator/recastglobalallocator.hpp
@@ -3,6 +3,7 @@
 
 #include "recasttempallocator.hpp"
 
+#include <DetourAlloc.h>
 #include <RecastAlloc.h>
 
 #include <cstdlib>
@@ -14,10 +15,14 @@ namespace DetourNavigator
     public:
         static void init() { instance(); }
 
-        static void* alloc(size_t size, rcAllocHint hint)
+        static void* recastAlloc(size_t size, rcAllocHint hint) { return alloc(size, hint == RC_ALLOC_TEMP); }
+
+        static void* detourAlloc(size_t size, dtAllocHint hint) { return alloc(size, hint == DT_ALLOC_TEMP); }
+
+        static void* alloc(size_t size, bool temp)
         {
             void* result = nullptr;
-            if (rcLikely(hint == RC_ALLOC_TEMP))
+            if (rcLikely(temp))
                 result = tempAllocator().alloc(size);
             if (rcUnlikely(!result))
                 result = allocPerm(size);
@@ -38,7 +43,11 @@ namespace DetourNavigator
         }
 
     private:
-        RecastGlobalAllocator() { rcAllocSetCustom(&RecastGlobalAllocator::alloc, &RecastGlobalAllocator::free); }
+        RecastGlobalAllocator()
+        {
+            rcAllocSetCustom(&RecastGlobalAllocator::recastAlloc, &RecastGlobalAllocator::free);
+            dtAllocSetCustom(&RecastGlobalAllocator::detourAlloc, &RecastGlobalAllocator::free);
+        }
 
         static RecastGlobalAllocator& instance()
         {
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index ac487d3b68..6d06db0799 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -10,6 +10,7 @@
 #include <osg/Vec2i>
 #include <osg/Vec3f>
 
+#include <cstdint>
 #include <memory>
 #include <numeric>
 #include <string>
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 1684e3e542..6c15b441e7 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -189,42 +189,18 @@ namespace DetourNavigator
     void RecastMeshBuilder::addObject(const btBoxShape& shape, const btTransform& transform, const AreaType areaType)
     {
         constexpr std::array<int, 36> indices{ {
-            0,
-            2,
-            3,
-            3,
-            1,
-            0,
-            0,
-            4,
-            6,
-            6,
-            2,
-            0,
-            0,
-            1,
-            5,
-            5,
-            4,
-            0,
-            7,
-            5,
-            1,
-            1,
-            3,
-            7,
-            7,
-            3,
-            2,
-            2,
-            6,
-            7,
-            7,
-            6,
-            4,
-            4,
-            5,
-            7,
+            0, 2, 3, // triangle 0
+            3, 1, 0, // triangle 1
+            0, 4, 6, // triangle 2
+            6, 2, 0, // triangle 3
+            0, 1, 5, // triangle 4
+            5, 4, 0, // triangle 5
+            7, 5, 1, // triangle 6
+            1, 3, 7, // triangle 7
+            7, 3, 2, // triangle 8
+            2, 6, 7, // triangle 9
+            7, 6, 4, // triangle 10
+            4, 5, 7, // triangle 11
         } };
 
         for (std::size_t i = 0; i < indices.size(); i += 3)
diff --git a/components/detournavigator/recastmeshprovider.hpp b/components/detournavigator/recastmeshprovider.hpp
index d0cba1c348..6759daa65a 100644
--- a/components/detournavigator/recastmeshprovider.hpp
+++ b/components/detournavigator/recastmeshprovider.hpp
@@ -20,7 +20,7 @@ namespace DetourNavigator
         {
         }
 
-        std::shared_ptr<RecastMesh> getMesh(std::string_view worldspace, const TilePosition& tilePosition) const
+        std::shared_ptr<RecastMesh> getMesh(ESM::RefId worldspace, const TilePosition& tilePosition) const
         {
             return mImpl.get().getNewMesh(worldspace, tilePosition);
         }
diff --git a/components/detournavigator/recasttempallocator.hpp b/components/detournavigator/recasttempallocator.hpp
index bb23dc8494..08db5f9fca 100644
--- a/components/detournavigator/recasttempallocator.hpp
+++ b/components/detournavigator/recasttempallocator.hpp
@@ -52,7 +52,6 @@ namespace DetourNavigator
                 mTop = mPrev;
                 mPrev = getTempPtrPrev(mTop);
             }
-            return;
         }
 
     private:
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index 0470c629e5..5e555050f7 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -3,41 +3,81 @@
 #include <components/misc/constants.hpp>
 #include <components/settings/values.hpp>
 
+#include <algorithm>
+#include <stdexcept>
+#include <string>
+
 namespace DetourNavigator
 {
-    RecastSettings makeRecastSettingsFromSettingsManager()
+    namespace
     {
-        RecastSettings result;
+        struct NavMeshLimits
+        {
+            int mMaxTiles;
+            int mMaxPolys;
+        };
 
-        result.mBorderSize = ::Settings::navigator().mBorderSize;
-        result.mCellHeight = ::Settings::navigator().mCellHeight;
-        result.mCellSize = ::Settings::navigator().mCellSize;
-        result.mDetailSampleDist = ::Settings::navigator().mDetailSampleDist;
-        result.mDetailSampleMaxError = ::Settings::navigator().mDetailSampleMaxError;
-        result.mMaxClimb = Constants::sStepSizeUp;
-        result.mMaxSimplificationError = ::Settings::navigator().mMaxSimplificationError;
-        result.mMaxSlope = Constants::sMaxSlope;
-        result.mRecastScaleFactor = ::Settings::navigator().mRecastScaleFactor;
-        result.mSwimHeightScale = 0;
-        result.mMaxEdgeLen = ::Settings::navigator().mMaxEdgeLen;
-        result.mMaxVertsPerPoly = ::Settings::navigator().mMaxVertsPerPoly;
-        result.mRegionMergeArea = ::Settings::navigator().mRegionMergeArea;
-        result.mRegionMinArea = ::Settings::navigator().mRegionMinArea;
-        result.mTileSize = ::Settings::navigator().mTileSize;
+        template <class T>
+        unsigned long getMinValuableBitsNumber(const T value)
+        {
+            unsigned long power = 0;
+            while (power < sizeof(T) * 8 && (static_cast<T>(1) << power) < value)
+                ++power;
+            return power;
+        }
 
-        return result;
-    }
+        NavMeshLimits getNavMeshTileLimits(const DetourSettings& settings)
+        {
+            // Max tiles and max polys affect how the tile IDs are caculated.
+            // There are 22 bits available for identifying a tile and a polygon.
+            constexpr int polysAndTilesBits = 22;
+            const unsigned long polysBits = getMinValuableBitsNumber(settings.mMaxPolys);
 
-    DetourSettings makeDetourSettingsFromSettingsManager()
-    {
-        DetourSettings result;
+            if (polysBits >= polysAndTilesBits)
+                throw std::invalid_argument("Too many polygons per tile: " + std::to_string(settings.mMaxPolys));
 
-        result.mMaxNavMeshQueryNodes = ::Settings::navigator().mMaxNavMeshQueryNodes;
-        result.mMaxPolys = ::Settings::navigator().mMaxPolygonsPerTile;
-        result.mMaxPolygonPathSize = ::Settings::navigator().mMaxPolygonPathSize;
-        result.mMaxSmoothPathSize = ::Settings::navigator().mMaxSmoothPathSize;
+            const unsigned long tilesBits = polysAndTilesBits - polysBits;
 
-        return result;
+            return NavMeshLimits{
+                .mMaxTiles = static_cast<int>(1 << tilesBits),
+                .mMaxPolys = static_cast<int>(1 << polysBits),
+            };
+        }
+
+        RecastSettings makeRecastSettingsFromSettingsManager()
+        {
+            RecastSettings result;
+
+            result.mBorderSize = ::Settings::navigator().mBorderSize;
+            result.mCellHeight = ::Settings::navigator().mCellHeight;
+            result.mCellSize = ::Settings::navigator().mCellSize;
+            result.mDetailSampleDist = ::Settings::navigator().mDetailSampleDist;
+            result.mDetailSampleMaxError = ::Settings::navigator().mDetailSampleMaxError;
+            result.mMaxClimb = Constants::sStepSizeUp;
+            result.mMaxSimplificationError = ::Settings::navigator().mMaxSimplificationError;
+            result.mMaxSlope = Constants::sMaxSlope;
+            result.mRecastScaleFactor = ::Settings::navigator().mRecastScaleFactor;
+            result.mSwimHeightScale = 0;
+            result.mMaxEdgeLen = ::Settings::navigator().mMaxEdgeLen;
+            result.mMaxVertsPerPoly = ::Settings::navigator().mMaxVertsPerPoly;
+            result.mRegionMergeArea = ::Settings::navigator().mRegionMergeArea;
+            result.mRegionMinArea = ::Settings::navigator().mRegionMinArea;
+            result.mTileSize = ::Settings::navigator().mTileSize;
+
+            return result;
+        }
+
+        DetourSettings makeDetourSettingsFromSettingsManager()
+        {
+            DetourSettings result;
+
+            result.mMaxNavMeshQueryNodes = ::Settings::navigator().mMaxNavMeshQueryNodes;
+            result.mMaxPolys = ::Settings::navigator().mMaxPolygonsPerTile;
+            result.mMaxPolygonPathSize = ::Settings::navigator().mMaxPolygonPathSize;
+            result.mMaxSmoothPathSize = ::Settings::navigator().mMaxSmoothPathSize;
+
+            return result;
+        }
     }
 
     Settings makeSettingsFromSettingsManager()
@@ -46,7 +86,12 @@ namespace DetourNavigator
 
         result.mRecast = makeRecastSettingsFromSettingsManager();
         result.mDetour = makeDetourSettingsFromSettingsManager();
-        result.mMaxTilesNumber = ::Settings::navigator().mMaxTilesNumber;
+
+        const NavMeshLimits limits = getNavMeshTileLimits(result.mDetour);
+
+        result.mDetour.mMaxPolys = limits.mMaxPolys;
+
+        result.mMaxTilesNumber = std::min(limits.mMaxTiles, ::Settings::navigator().mMaxTilesNumber.get());
         result.mWaitUntilMinDistanceToPlayer = ::Settings::navigator().mWaitUntilMinDistanceToPlayer;
         result.mAsyncNavMeshUpdaterThreads = ::Settings::navigator().mAsyncNavMeshUpdaterThreads;
         result.mMaxNavMeshTilesCacheSize = ::Settings::navigator().mMaxNavMeshTilesCacheSize;
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index 45bcf15dbf..1d1f6f5847 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -55,10 +55,6 @@ namespace DetourNavigator
 
     inline constexpr std::int64_t navMeshFormatVersion = 2;
 
-    RecastSettings makeRecastSettingsFromSettingsManager();
-
-    DetourSettings makeDetourSettingsFromSettingsManager();
-
     Settings makeSettingsFromSettingsManager();
 }
 
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 10e99d002f..c9d8665d51 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -47,6 +47,7 @@ namespace DetourNavigator
         return position;
     }
 
+    // Returns value in NavMesh coordinates
     inline float getTileSize(const RecastSettings& settings)
     {
         return static_cast<float>(settings.mTileSize) * settings.mCellSize;
@@ -62,16 +63,19 @@ namespace DetourNavigator
         return static_cast<int>(v);
     }
 
+    // Returns integer tile position for position in navmesh coordinates
     inline TilePosition getTilePosition(const RecastSettings& settings, const osg::Vec2f& position)
     {
         return TilePosition(getTilePosition(settings, position.x()), getTilePosition(settings, position.y()));
     }
 
+    // Returns integer tile position for position in navmesh coordinates
     inline TilePosition getTilePosition(const RecastSettings& settings, const osg::Vec3f& position)
     {
         return getTilePosition(settings, osg::Vec2f(position.x(), position.z()));
     }
 
+    // Returns tile bounds in navmesh coordinates
     inline TileBounds makeTileBounds(const RecastSettings& settings, const TilePosition& tilePosition)
     {
         return TileBounds{
@@ -80,6 +84,7 @@ namespace DetourNavigator
         };
     }
 
+    // Returns border size relative to cell size
     inline float getBorderSize(const RecastSettings& settings)
     {
         return static_cast<float>(settings.mBorderSize) * settings.mCellSize;
@@ -95,6 +100,7 @@ namespace DetourNavigator
         return std::floor(std::sqrt(settings.mMaxTilesNumber / osg::PI)) - 1;
     }
 
+    // Returns tile bounds in real coordinates
     inline TileBounds makeRealTileBoundsWithBorder(const RecastSettings& settings, const TilePosition& tilePosition)
     {
         TileBounds result = makeTileBounds(settings, tilePosition);
diff --git a/components/detournavigator/stats.cpp b/components/detournavigator/stats.cpp
index 1d7dcac553..39251b0f76 100644
--- a/components/detournavigator/stats.cpp
+++ b/components/detournavigator/stats.cpp
@@ -9,16 +9,18 @@ namespace DetourNavigator
         void reportStats(const AsyncNavMeshUpdaterStats& stats, unsigned int frameNumber, osg::Stats& out)
         {
             out.setAttribute(frameNumber, "NavMesh Jobs", static_cast<double>(stats.mJobs));
-            out.setAttribute(frameNumber, "NavMesh Waiting", static_cast<double>(stats.mWaiting));
+            out.setAttribute(frameNumber, "NavMesh Removing", static_cast<double>(stats.mWaiting.mRemoving));
+            out.setAttribute(frameNumber, "NavMesh Updating", static_cast<double>(stats.mWaiting.mUpdating));
+            out.setAttribute(frameNumber, "NavMesh Delayed", static_cast<double>(stats.mWaiting.mDelayed));
             out.setAttribute(frameNumber, "NavMesh Pushed", static_cast<double>(stats.mPushed));
             out.setAttribute(frameNumber, "NavMesh Processing", static_cast<double>(stats.mProcessing));
 
             if (stats.mDb.has_value())
             {
-                out.setAttribute(
-                    frameNumber, "NavMesh DbJobs Write", static_cast<double>(stats.mDb->mJobs.mWritingJobs));
                 out.setAttribute(
                     frameNumber, "NavMesh DbJobs Read", static_cast<double>(stats.mDb->mJobs.mReadingJobs));
+                out.setAttribute(
+                    frameNumber, "NavMesh DbJobs Write", static_cast<double>(stats.mDb->mJobs.mWritingJobs));
 
                 out.setAttribute(frameNumber, "NavMesh DbCache Get", static_cast<double>(stats.mDb->mGetTileCount));
                 out.setAttribute(frameNumber, "NavMesh DbCache Hit", static_cast<double>(stats.mDbGetTileHits));
@@ -30,11 +32,19 @@ namespace DetourNavigator
             out.setAttribute(frameNumber, "NavMesh Cache Get", static_cast<double>(stats.mCache.mGetCount));
             out.setAttribute(frameNumber, "NavMesh Cache Hit", static_cast<double>(stats.mCache.mHitCount));
         }
+
+        void reportStats(const TileCachedRecastMeshManagerStats& stats, unsigned int frameNumber, osg::Stats& out)
+        {
+            out.setAttribute(frameNumber, "NavMesh Recast Tiles", static_cast<double>(stats.mTiles));
+            out.setAttribute(frameNumber, "NavMesh Recast Objects", static_cast<double>(stats.mObjects));
+            out.setAttribute(frameNumber, "NavMesh Recast Heightfields", static_cast<double>(stats.mHeightfields));
+            out.setAttribute(frameNumber, "NavMesh Recast Water", static_cast<double>(stats.mWater));
+        }
     }
 
     void reportStats(const Stats& stats, unsigned int frameNumber, osg::Stats& out)
     {
-        if (stats.mUpdater.has_value())
-            reportStats(*stats.mUpdater, frameNumber, out);
+        reportStats(stats.mUpdater, frameNumber, out);
+        reportStats(stats.mRecast, frameNumber, out);
     }
 }
diff --git a/components/detournavigator/stats.hpp b/components/detournavigator/stats.hpp
index c644f1db87..38a9febc26 100644
--- a/components/detournavigator/stats.hpp
+++ b/components/detournavigator/stats.hpp
@@ -11,10 +11,17 @@ namespace osg
 
 namespace DetourNavigator
 {
+    struct JobQueueStats
+    {
+        std::size_t mRemoving = 0;
+        std::size_t mUpdating = 0;
+        std::size_t mDelayed = 0;
+    };
+
     struct DbJobQueueStats
     {
-        std::size_t mWritingJobs = 0;
         std::size_t mReadingJobs = 0;
+        std::size_t mWritingJobs = 0;
     };
 
     struct DbWorkerStats
@@ -35,7 +42,7 @@ namespace DetourNavigator
     struct AsyncNavMeshUpdaterStats
     {
         std::size_t mJobs = 0;
-        std::size_t mWaiting = 0;
+        JobQueueStats mWaiting;
         std::size_t mPushed = 0;
         std::size_t mProcessing = 0;
         std::size_t mDbGetTileHits = 0;
@@ -43,9 +50,18 @@ namespace DetourNavigator
         NavMeshTilesCacheStats mCache;
     };
 
+    struct TileCachedRecastMeshManagerStats
+    {
+        std::size_t mTiles = 0;
+        std::size_t mObjects = 0;
+        std::size_t mHeightfields = 0;
+        std::size_t mWater = 0;
+    };
+
     struct Stats
     {
-        std::optional<AsyncNavMeshUpdaterStats> mUpdater;
+        AsyncNavMeshUpdaterStats mUpdater;
+        TileCachedRecastMeshManagerStats mRecast;
     };
 
     void reportStats(const Stats& stats, unsigned int frameNumber, osg::Stats& out);
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 1e55719c13..cf5a914ceb 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -1,8 +1,10 @@
 #include "tilecachedrecastmeshmanager.hpp"
+
 #include "changetype.hpp"
 #include "gettilespositions.hpp"
 #include "recastmeshbuilder.hpp"
 #include "settingsutils.hpp"
+#include "stats.hpp"
 #include "updateguard.hpp"
 
 #include <components/bullethelpers/aabb.hpp>
@@ -10,9 +12,7 @@
 
 #include <boost/geometry/geometry.hpp>
 
-#include <algorithm>
 #include <limits>
-#include <vector>
 
 namespace DetourNavigator
 {
@@ -54,6 +54,15 @@ namespace DetourNavigator
         private:
             const std::optional<std::unique_lock<Mutex>> mImpl;
         };
+
+        TilesPositionsRange getIndexRange(const auto& index)
+        {
+            const auto bounds = index.bounds();
+            return TilesPositionsRange{
+                .mBegin = makeTilePosition(bounds.min_corner()),
+                .mEnd = makeTilePosition(bounds.max_corner()) + TilePosition(1, 1),
+            };
+        }
     }
 
     TileCachedRecastMeshManager::TileCachedRecastMeshManager(const RecastSettings& settings)
@@ -91,30 +100,48 @@ namespace DetourNavigator
                     }
                 });
             }
+
+            getTilesPositions(mRange, [&](const TilePosition& v) {
+                if (!isInTilesPositionsRange(range, v))
+                    mCache.erase(v);
+            });
         }
 
+        const MaybeLockGuard lock(mMutex, guard);
+
         if (changed)
-        {
-            const MaybeLockGuard lock(mMutex, guard);
             ++mRevision;
-        }
 
         mRange = range;
     }
 
     TilesPositionsRange TileCachedRecastMeshManager::getLimitedObjectsRange() const
     {
-        if (mObjects.empty())
-            return {};
-        const auto bounds = mObjectIndex.bounds();
-        const TilesPositionsRange objectsRange{
-            .mBegin = makeTilePosition(bounds.min_corner()),
-            .mEnd = makeTilePosition(bounds.max_corner()) + TilePosition(1, 1),
-        };
-        return getIntersection(mRange, objectsRange);
+        std::optional<TilesPositionsRange> result;
+        if (!mWater.empty())
+            result = getIndexRange(mWaterIndex);
+        if (!mHeightfields.empty())
+        {
+            const TilesPositionsRange range = getIndexRange(mHeightfieldIndex);
+            if (result.has_value())
+                result = getUnion(*result, range);
+            else
+                result = range;
+        }
+        if (!mObjects.empty())
+        {
+            const TilesPositionsRange range = getIndexRange(mObjectIndex);
+            if (result.has_value())
+                result = getUnion(*result, range);
+            else
+                result = range;
+        }
+        if (result.has_value())
+            return getIntersection(mRange, *result);
+        return {};
     }
 
-    void TileCachedRecastMeshManager::setWorldspace(std::string_view worldspace, const UpdateGuard* guard)
+    void TileCachedRecastMeshManager::setWorldspace(ESM::RefId worldspace, const UpdateGuard* guard)
     {
         const MaybeLockGuard lock(mMutex, guard);
         if (mWorldspace == worldspace)
@@ -323,12 +350,14 @@ namespace DetourNavigator
     }
 
     std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(
-        std::string_view worldspace, const TilePosition& tilePosition)
+        ESM::RefId worldspace, const TilePosition& tilePosition)
     {
         {
             const std::lock_guard lock(mMutex);
             if (mWorldspace != worldspace)
                 return nullptr;
+            if (!isInTilesPositionsRange(mRange, tilePosition))
+                return nullptr;
             const auto it = mCache.find(tilePosition);
             if (it != mCache.end() && it->second.mRecastMesh->getVersion() == it->second.mVersion)
                 return it->second.mRecastMesh;
@@ -347,11 +376,13 @@ namespace DetourNavigator
     }
 
     std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getCachedMesh(
-        std::string_view worldspace, const TilePosition& tilePosition) const
+        ESM::RefId worldspace, const TilePosition& tilePosition) const
     {
         const std::lock_guard lock(mMutex);
         if (mWorldspace != worldspace)
             return nullptr;
+        if (!isInTilesPositionsRange(mRange, tilePosition))
+            return nullptr;
         const auto it = mCache.find(tilePosition);
         if (it == mCache.end())
             return nullptr;
@@ -359,7 +390,7 @@ namespace DetourNavigator
     }
 
     std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getNewMesh(
-        std::string_view worldspace, const TilePosition& tilePosition) const
+        ESM::RefId worldspace, const TilePosition& tilePosition) const
     {
         {
             const std::lock_guard lock(mMutex);
@@ -393,7 +424,7 @@ namespace DetourNavigator
         if (tile == mChangedTiles.end())
             mChangedTiles.emplace(tilePosition, changeType);
         else
-            tile->second = addChangeType(tile->second, changeType);
+            tile->second = changeType == ChangeType::remove ? changeType : tile->second;
     }
 
     std::map<osg::Vec2i, ChangeType> TileCachedRecastMeshManager::takeChangedTiles(const UpdateGuard* guard)
@@ -407,6 +438,17 @@ namespace DetourNavigator
         return std::move(mChangedTiles);
     }
 
+    TileCachedRecastMeshManagerStats TileCachedRecastMeshManager::getStats() const
+    {
+        const std::lock_guard lock(mMutex);
+        return TileCachedRecastMeshManagerStats{
+            .mTiles = mCache.size(),
+            .mObjects = mObjects.size(),
+            .mHeightfields = mHeightfields.size(),
+            .mWater = mWater.size(),
+        };
+    }
+
     TileCachedRecastMeshManager::IndexPoint TileCachedRecastMeshManager::makeIndexPoint(
         const TilePosition& tilePosition)
     {
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 12e8ddee2e..fc4ace118d 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -25,14 +25,12 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <string>
-#include <string_view>
 #include <unordered_map>
-#include <vector>
 
 namespace DetourNavigator
 {
     class RecastMesh;
+    struct TileCachedRecastMeshManagerStats;
 
     class TileCachedRecastMeshManager
     {
@@ -49,7 +47,7 @@ namespace DetourNavigator
 
         TilesPositionsRange getLimitedObjectsRange() const;
 
-        void setWorldspace(std::string_view worldspace, const UpdateGuard* guard);
+        void setWorldspace(ESM::RefId worldspace, const UpdateGuard* guard);
 
         bool addObject(ObjectId id, const CollisionShape& shape, const btTransform& transform, AreaType areaType,
             const UpdateGuard* guard);
@@ -67,11 +65,11 @@ namespace DetourNavigator
 
         void removeHeightfield(const osg::Vec2i& cellPosition, const UpdateGuard* guard);
 
-        std::shared_ptr<RecastMesh> getMesh(std::string_view worldspace, const TilePosition& tilePosition);
+        std::shared_ptr<RecastMesh> getMesh(ESM::RefId worldspace, const TilePosition& tilePosition);
 
-        std::shared_ptr<RecastMesh> getCachedMesh(std::string_view worldspace, const TilePosition& tilePosition) const;
+        std::shared_ptr<RecastMesh> getCachedMesh(ESM::RefId worldspace, const TilePosition& tilePosition) const;
 
-        std::shared_ptr<RecastMesh> getNewMesh(std::string_view worldspace, const TilePosition& tilePosition) const;
+        std::shared_ptr<RecastMesh> getNewMesh(ESM::RefId worldspace, const TilePosition& tilePosition) const;
 
         std::size_t getRevision() const { return mRevision; }
 
@@ -81,6 +79,8 @@ namespace DetourNavigator
 
         std::map<osg::Vec2i, ChangeType> takeChangedTiles(const UpdateGuard* guard);
 
+        TileCachedRecastMeshManagerStats getStats() const;
+
     private:
         struct Report
         {
@@ -128,7 +128,7 @@ namespace DetourNavigator
 
         const RecastSettings& mSettings;
         TilesPositionsRange mRange;
-        std::string mWorldspace;
+        ESM::RefId mWorldspace;
         std::unordered_map<ObjectId, std::unique_ptr<ObjectData>> mObjects;
         boost::geometry::index::rtree<ObjectIndexValue, boost::geometry::index::quadratic<16>> mObjectIndex;
         std::map<osg::Vec2i, WaterData> mWater;
diff --git a/components/esm/common.hpp b/components/esm/common.hpp
index c0e6151e24..90c60ad6ab 100644
--- a/components/esm/common.hpp
+++ b/components/esm/common.hpp
@@ -25,12 +25,13 @@ namespace ESM
         VER_120 = 0x3f99999a, // TES3
         VER_130 = 0x3fa66666, // TES3
         VER_080 = 0x3f4ccccd, // TES4
-        VER_100 = 0x3f800000, // TES4
+        VER_100 = 0x3f800000, // TES4, FO4
         VER_132 = 0x3fa8f5c3, // FONV Courier's Stash, DeadMoney
         VER_133 = 0x3faa3d71, // FONV HonestHearts
         VER_134 = 0x3fab851f, // FONV, GunRunnersArsenal, LonesomeRoad, OldWorldBlues
         VER_094 = 0x3f70a3d7, // TES5/FO3
-        VER_170 = 0x3fd9999a // TES5
+        VER_170 = 0x3fd9999a, // TES5
+        VER_095 = 0x3f733333, // FO4
     };
 
     // Defines another files (esm or esp) that this file depends upon.
diff --git a/components/esm/decompose.hpp b/components/esm/decompose.hpp
new file mode 100644
index 0000000000..f9fecec067
--- /dev/null
+++ b/components/esm/decompose.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_COMPONENTS_ESM_DECOMPOSE_H
+#define OPENMW_COMPONENTS_ESM_DECOMPOSE_H
+
+namespace ESM
+{
+    template <class T>
+    void decompose(T&& value, const auto& apply) = delete;
+
+    std::size_t getCompositeSize(const auto& value)
+    {
+        std::size_t result = 0;
+        decompose(value, [&](const auto&... args) { result = (0 + ... + sizeof(args)); });
+        return result;
+    }
+}
+
+#endif
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 96d70f6fea..52b2afb8de 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -4,12 +4,8 @@
 #include <stdexcept>
 #include <stdint.h>
 
-#include <tuple>
-
-#include <osg/Vec3f>
-
-#include "components/esm/fourcc.hpp"
 #include <components/esm/esmcommon.hpp>
+#include <components/esm/fourcc.hpp>
 #include <components/esm4/common.hpp>
 
 namespace ESM
@@ -18,9 +14,9 @@ namespace ESM
     struct EpochTimeStamp
     {
         float mGameHour;
-        int mDay;
-        int mMonth;
-        int mYear;
+        int32_t mDay;
+        int32_t mMonth;
+        int32_t mYear;
     };
 
     // Pixel color value. Standard four-byte rr,gg,bb,aa format.
@@ -33,37 +29,6 @@ namespace ESM
         RT_Target = 2
     };
 
-    // Position and rotation
-    struct Position
-    {
-        float pos[3]{};
-
-        // In radians
-        float rot[3]{};
-
-        osg::Vec3f asVec3() const { return osg::Vec3f(pos[0], pos[1], pos[2]); }
-
-        osg::Vec3f asRotationVec3() const { return osg::Vec3f(rot[0], rot[1], rot[2]); }
-
-        friend inline bool operator<(const Position& l, const Position& r)
-        {
-            const auto tuple = [](const Position& v) { return std::tuple(v.asVec3(), v.asRotationVec3()); };
-            return tuple(l) < tuple(r);
-        }
-    };
-
-    bool inline operator==(const Position& left, const Position& right) noexcept
-    {
-        return left.pos[0] == right.pos[0] && left.pos[1] == right.pos[1] && left.pos[2] == right.pos[2]
-            && left.rot[0] == right.rot[0] && left.rot[1] == right.rot[1] && left.rot[2] == right.rot[2];
-    }
-
-    bool inline operator!=(const Position& left, const Position& right) noexcept
-    {
-        return left.pos[0] != right.pos[0] || left.pos[1] != right.pos[1] || left.pos[2] != right.pos[2]
-            || left.rot[0] != right.rot[0] || left.rot[1] != right.rot[1] || left.rot[2] != right.rot[2];
-    }
-
     constexpr unsigned int sEsm4RecnameFlag = 0x00800000;
 
     constexpr unsigned int esm3Recname(const char (&name)[5])
@@ -146,8 +111,6 @@ namespace ESM
 
         // format 0 - saved games
         REC_SAVE = esm3Recname("SAVE"),
-        REC_JOUR_LEGACY = esm3Recname("\xa4UOR"), // "\xa4UOR", rather than "JOUR", little oversight when magic numbers
-                                                  // were calculated by hand, needs to be supported for older files now
         REC_JOUR = esm3Recname("JOUR"),
         REC_QUES = esm3Recname("QUES"),
         REC_GSCR = esm3Recname("GSCR"),
@@ -172,6 +135,8 @@ namespace ESM
         // format 1
         REC_FILT = esm3Recname("FILT"),
         REC_DBGP = esm3Recname("DBGP"), ///< only used in project files
+        REC_SELG = esm3Recname("SELG"),
+
         REC_LUAL = esm3Recname("LUAL"), // LuaScriptsCfg (only in omwgame or omwaddon)
 
         // format 16 - Lua scripts in saved games
diff --git a/components/esm/esm3exteriorcellrefid.hpp b/components/esm/esm3exteriorcellrefid.hpp
index 5fca8dc597..fd6a9b128d 100644
--- a/components/esm/esm3exteriorcellrefid.hpp
+++ b/components/esm/esm3exteriorcellrefid.hpp
@@ -3,7 +3,7 @@
 
 #include <functional>
 #include <iosfwd>
-
+#include <string>
 #include <utility>
 
 #include <components/misc/hash.hpp>
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index e92ae06806..69b877c9c9 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -13,12 +13,6 @@
 
 namespace ESM
 {
-    enum Version
-    {
-        VER_12 = 0x3f99999a,
-        VER_13 = 0x3fa66666
-    };
-
     enum RecordFlag
     {
         // This flag exists, but is not used to determine if a record has been deleted while loading
diff --git a/components/esm/exteriorcelllocation.hpp b/components/esm/exteriorcelllocation.hpp
new file mode 100644
index 0000000000..bf6a2c920f
--- /dev/null
+++ b/components/esm/exteriorcelllocation.hpp
@@ -0,0 +1,59 @@
+#ifndef OPENMW_COMPONENTS_ESM_EXTERIORCELLLOCATION_H
+#define OPENMW_COMPONENTS_ESM_EXTERIORCELLLOCATION_H
+
+#include "refid.hpp"
+
+#include <components/esm3/loadcell.hpp>
+
+#include <ostream>
+#include <tuple>
+
+namespace ESM
+{
+    struct ExteriorCellLocation
+    {
+        int mX = 0;
+        int mY = 0;
+        ESM::RefId mWorldspace = ESM::Cell::sDefaultWorldspaceId;
+
+        ExteriorCellLocation() = default;
+
+        ExteriorCellLocation(int x, int y, ESM::RefId worldspace)
+            : mX(x)
+            , mY(y)
+            , mWorldspace(worldspace)
+        {
+        }
+
+        friend bool operator==(const ExteriorCellLocation& lhs, const ExteriorCellLocation& rhs) = default;
+
+        friend inline bool operator<(const ExteriorCellLocation& lhs, const ExteriorCellLocation& rhs)
+        {
+            return std::make_tuple(lhs.mX, lhs.mY, lhs.mWorldspace) < std::make_tuple(rhs.mX, rhs.mY, rhs.mWorldspace);
+        }
+
+        friend inline std::ostream& operator<<(std::ostream& stream, const ExteriorCellLocation& value)
+        {
+            return stream << "{" << value.mX << ", " << value.mY << ", " << value.mWorldspace << "}";
+        }
+    };
+}
+
+namespace std
+{
+    template <>
+    struct hash<ESM::ExteriorCellLocation>
+    {
+        std::size_t operator()(const ESM::ExteriorCellLocation& toHash) const
+        {
+            // Compute individual hash values for first,
+            // second and third and combine them using XOR
+            // and bit shifting:
+
+            return ((hash<int>()(toHash.mX) ^ (hash<int>()(toHash.mY) << 1)) >> 1)
+                ^ (hash<ESM::RefId>()(toHash.mWorldspace) << 1);
+        }
+    };
+}
+
+#endif
diff --git a/components/esm/format.cpp b/components/esm/format.cpp
index aa869ab998..04edc5c7db 100644
--- a/components/esm/format.cpp
+++ b/components/esm/format.cpp
@@ -3,6 +3,7 @@
 #include <cstring>
 #include <istream>
 #include <stdexcept>
+#include <string>
 
 namespace ESM
 {
diff --git a/components/esm/generatedrefid.hpp b/components/esm/generatedrefid.hpp
index c5cd1bcef5..e9d07ff314 100644
--- a/components/esm/generatedrefid.hpp
+++ b/components/esm/generatedrefid.hpp
@@ -4,6 +4,7 @@
 #include <cstdint>
 #include <functional>
 #include <iosfwd>
+#include <string>
 
 namespace ESM
 {
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 8f2048d8a7..81cc867aff 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -38,7 +38,7 @@ std::string ESM::loadLuaBinaryData(ESMReader& esm)
     {
         esm.getSubHeader();
         data.resize(esm.getSubSize());
-        esm.getExact(data.data(), static_cast<int>(data.size()));
+        esm.getExact(data.data(), data.size());
     }
     return data;
 }
@@ -56,7 +56,7 @@ void ESM::LuaScriptsCfg::load(ESMReader& esm)
     {
         mScripts.emplace_back();
         ESM::LuaScriptCfg& script = mScripts.back();
-        script.mScriptPath = esm.getHString();
+        script.mScriptPath = VFS::Path::Normalized(esm.getHString());
 
         esm.getSubNameIs("LUAF");
         esm.getSubHeader();
@@ -161,7 +161,7 @@ void ESM::LuaScripts::load(ESMReader& esm)
 {
     while (esm.isNextSub("LUAS"))
     {
-        std::string name = esm.getHString();
+        VFS::Path::Normalized name(esm.getHString());
         std::string data = loadLuaBinaryData(esm);
         std::vector<LuaTimer> timers;
         while (esm.isNextSub("LUAT"))
diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp
index 2a6bf0dbb1..705e3f106c 100644
--- a/components/esm/luascripts.hpp
+++ b/components/esm/luascripts.hpp
@@ -2,6 +2,8 @@
 #define OPENMW_ESM_LUASCRIPTS_H
 
 #include <components/esm/refid.hpp>
+#include <components/vfs/pathutil.hpp>
+
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -20,10 +22,12 @@ namespace ESM
         static constexpr Flags sCustom = 1ull << 1; // local; can be attached/detached by a global script
         static constexpr Flags sPlayer = 1ull << 2; // auto attach to players
 
-        static constexpr Flags sMerge = 1ull
-            << 3; // merge with configuration for this script from previous content files.
+        // merge with configuration for this script from previous content files.
+        static constexpr Flags sMerge = 1ull << 3;
 
-        std::string mScriptPath; // VFS path to the script.
+        static constexpr Flags sMenu = 1ull << 4; // start as a menu script
+
+        VFS::Path::Normalized mScriptPath;
         std::string mInitializationData; // Serialized Lua table. It is a binary data. Can contain '\0'.
         Flags mFlags; // bitwise OR of Flags.
 
@@ -83,7 +87,7 @@ namespace ESM
 
     struct LuaScript
     {
-        std::string mScriptPath;
+        VFS::Path::Normalized mScriptPath;
         std::string mData; // Serialized Lua table. It is a binary data. Can contain '\0'.
         std::vector<LuaTimer> mTimers;
     };
diff --git a/components/esm/position.hpp b/components/esm/position.hpp
new file mode 100644
index 0000000000..d48997610e
--- /dev/null
+++ b/components/esm/position.hpp
@@ -0,0 +1,47 @@
+#ifndef OPENMW_ESM3_POSITION_H
+#define OPENMW_ESM3_POSITION_H
+
+#include <components/misc/concepts.hpp>
+#include <osg/Vec3f>
+#include <tuple>
+
+namespace ESM
+{
+    // Position and rotation
+    struct Position
+    {
+        float pos[3]{};
+
+        // In radians
+        float rot[3]{};
+
+        osg::Vec3f asVec3() const { return osg::Vec3f(pos[0], pos[1], pos[2]); }
+
+        osg::Vec3f asRotationVec3() const { return osg::Vec3f(rot[0], rot[1], rot[2]); }
+
+        friend inline bool operator<(const Position& l, const Position& r)
+        {
+            const auto tuple = [](const Position& v) { return std::tuple(v.asVec3(), v.asRotationVec3()); };
+            return tuple(l) < tuple(r);
+        }
+    };
+
+    bool inline operator==(const Position& left, const Position& right) noexcept
+    {
+        return left.pos[0] == right.pos[0] && left.pos[1] == right.pos[1] && left.pos[2] == right.pos[2]
+            && left.rot[0] == right.rot[0] && left.rot[1] == right.rot[1] && left.rot[2] == right.rot[2];
+    }
+
+    bool inline operator!=(const Position& left, const Position& right) noexcept
+    {
+        return left.pos[0] != right.pos[0] || left.pos[1] != right.pos[1] || left.pos[2] != right.pos[2]
+            || left.rot[0] != right.rot[0] || left.rot[1] != right.rot[1] || left.rot[2] != right.rot[2];
+    }
+
+    template <Misc::SameAsWithoutCvref<Position> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.pos, v.rot);
+    }
+}
+#endif
\ No newline at end of file
diff --git a/components/esm/quaternion.hpp b/components/esm/quaternion.hpp
new file mode 100644
index 0000000000..0f2f94a4e6
--- /dev/null
+++ b/components/esm/quaternion.hpp
@@ -0,0 +1,29 @@
+#ifndef OPENMW_COMPONENTS_ESM_QUATERNION_H
+#define OPENMW_COMPONENTS_ESM_QUATERNION_H
+
+#include <osg/Quat>
+
+namespace ESM
+{
+    // format 0, savegames only
+    struct Quaternion
+    {
+        float mValues[4];
+
+        Quaternion() = default;
+
+        Quaternion(const osg::Quat& q)
+            : mValues{
+                static_cast<float>(q.w()),
+                static_cast<float>(q.x()),
+                static_cast<float>(q.y()),
+                static_cast<float>(q.z()),
+            }
+        {
+        }
+
+        operator osg::Quat() const { return osg::Quat(mValues[1], mValues[2], mValues[3], mValues[0]); }
+    };
+}
+
+#endif
diff --git a/components/esm/records.hpp b/components/esm/records.hpp
index 4af60db8b5..0b60b44cf0 100644
--- a/components/esm/records.hpp
+++ b/components/esm/records.hpp
@@ -55,20 +55,25 @@
 #include <components/esm4/loadcont.hpp>
 #include <components/esm4/loadcrea.hpp>
 #include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadflor.hpp>
 #include <components/esm4/loadfurn.hpp>
 #include <components/esm4/loadhair.hpp>
 #include <components/esm4/loadhdpt.hpp>
+#include <components/esm4/loadimod.hpp>
 #include <components/esm4/loadingr.hpp>
 #include <components/esm4/loadland.hpp>
 #include <components/esm4/loadligh.hpp>
+#include <components/esm4/loadltex.hpp>
 #include <components/esm4/loadlvlc.hpp>
 #include <components/esm4/loadlvli.hpp>
 #include <components/esm4/loadlvln.hpp>
 #include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmstt.hpp>
 #include <components/esm4/loadnpc.hpp>
 #include <components/esm4/loadotft.hpp>
 #include <components/esm4/loadrace.hpp>
 #include <components/esm4/loadrefr.hpp>
+#include <components/esm4/loadscol.hpp>
 #include <components/esm4/loadstat.hpp>
 #include <components/esm4/loadterm.hpp>
 #include <components/esm4/loadtree.hpp>
diff --git a/components/esm/util.cpp b/components/esm/util.cpp
index 0dc38d59aa..9a7faa6917 100644
--- a/components/esm/util.cpp
+++ b/components/esm/util.cpp
@@ -1,8 +1,9 @@
 #include "util.hpp"
+
 #include <components/esm3/loadland.hpp>
 #include <components/esm4/loadland.hpp>
 
-osg::Vec2 ESM::indexToPosition(const ESM::ExteriorCellLocation& cellIndex, bool centre)
+osg::Vec2f ESM::indexToPosition(const ESM::ExteriorCellLocation& cellIndex, bool centre)
 {
     const int cellSize = ESM::getCellSize(cellIndex.mWorldspace);
 
@@ -14,7 +15,8 @@ osg::Vec2 ESM::indexToPosition(const ESM::ExteriorCellLocation& cellIndex, bool
         x += cellSize / 2;
         y += cellSize / 2;
     }
-    return osg::Vec2(x, y);
+
+    return osg::Vec2f(x, y);
 }
 
 int ESM::getLandSize(ESM::RefId worldspaceId)
diff --git a/components/esm/util.hpp b/components/esm/util.hpp
index d7ebcf8f6f..ae756baf6a 100644
--- a/components/esm/util.hpp
+++ b/components/esm/util.hpp
@@ -1,79 +1,18 @@
-#ifndef OPENMW_ESM_UTIL_H
-#define OPENMW_ESM_UTIL_H
+#ifndef OPENMW_COMPONENTS_ESM_UTIL_H
+#define OPENMW_COMPONENTS_ESM_UTIL_H
+
 #include <cmath>
 
-#include <osg/Quat>
-#include <osg/Vec2>
-#include <osg/Vec2i>
-#include <osg/Vec3f>
+#include <osg/Vec2f>
 
-#include <components/esm/refid.hpp>
-#include <components/esm3/loadcell.hpp>
-#include <components/misc/constants.hpp>
+#include "components/esm3/loadcell.hpp"
+#include "components/misc/constants.hpp"
+
+#include "exteriorcelllocation.hpp"
+#include "refid.hpp"
 
 namespace ESM
 {
-
-    // format 0, savegames only
-
-    struct Quaternion
-    {
-        float mValues[4];
-
-        Quaternion() = default;
-
-        Quaternion(const osg::Quat& q)
-        {
-            mValues[0] = q.w();
-            mValues[1] = q.x();
-            mValues[2] = q.y();
-            mValues[3] = q.z();
-        }
-
-        operator osg::Quat() const { return osg::Quat(mValues[1], mValues[2], mValues[3], mValues[0]); }
-    };
-
-    struct Vector3
-    {
-        float mValues[3];
-
-        Vector3() = default;
-
-        Vector3(const osg::Vec3f& v)
-        {
-            mValues[0] = v.x();
-            mValues[1] = v.y();
-            mValues[2] = v.z();
-        }
-
-        operator osg::Vec3f() const { return osg::Vec3f(mValues[0], mValues[1], mValues[2]); }
-    };
-
-    struct ExteriorCellLocation
-    {
-        int mX = 0;
-        int mY = 0;
-        ESM::RefId mWorldspace = ESM::Cell::sDefaultWorldspaceId;
-        ExteriorCellLocation() = default;
-
-        ExteriorCellLocation(int x, int y, ESM::RefId worldspace)
-            : mX(x)
-            , mY(y)
-            , mWorldspace(worldspace)
-        {
-        }
-
-        bool operator==(const ExteriorCellLocation& other) const
-        {
-            return mX == other.mX && mY == other.mY && mWorldspace == other.mWorldspace;
-        }
-
-        bool operator<(const ExteriorCellLocation& other) const
-        {
-            return std::make_tuple(mX, mY, mWorldspace) < std::make_tuple(other.mX, other.mY, other.mWorldspace);
-        }
-    };
-
     inline bool isEsm4Ext(ESM::RefId worldspaceId)
     {
         return worldspaceId != ESM::Cell::sDefaultWorldspaceId;
@@ -81,7 +20,6 @@ namespace ESM
 
     inline int getCellSize(ESM::RefId worldspaceId)
     {
-
         return isEsm4Ext(worldspaceId) ? Constants::ESM4CellSizeInUnits : Constants::CellSizeInUnits;
     }
 
@@ -95,25 +33,8 @@ namespace ESM
         return { static_cast<int>(std::floor(x / cellSize)), static_cast<int>(std::floor(y / cellSize)), worldspaceId };
     }
 
-    osg::Vec2 indexToPosition(const ESM::ExteriorCellLocation& cellIndex, bool centre = false);
-    ///< Convert cell numbers to position.
-}
-
-namespace std
-{
-    template <>
-    struct hash<ESM::ExteriorCellLocation>
-    {
-        std::size_t operator()(const ESM::ExteriorCellLocation& toHash) const
-        {
-            // Compute individual hash values for first,
-            // second and third and combine them using XOR
-            // and bit shifting:
-
-            return ((hash<int>()(toHash.mX) ^ (hash<int>()(toHash.mY) << 1)) >> 1)
-                ^ (hash<ESM::RefId>()(toHash.mWorldspace) << 1);
-        }
-    };
+    // Convert exterior cell location to position.
+    osg::Vec2f indexToPosition(const ESM::ExteriorCellLocation& cellIndex, bool centre = false);
 }
 
 #endif
diff --git a/components/esm/vector3.hpp b/components/esm/vector3.hpp
new file mode 100644
index 0000000000..dd0262b78d
--- /dev/null
+++ b/components/esm/vector3.hpp
@@ -0,0 +1,24 @@
+#ifndef OPENMW_COMPONENTS_ESM_VECTOR3_H
+#define OPENMW_COMPONENTS_ESM_VECTOR3_H
+
+#include <osg/Vec3f>
+
+namespace ESM
+{
+    // format 0, savegames only
+    struct Vector3
+    {
+        float mValues[3];
+
+        Vector3() = default;
+
+        Vector3(const osg::Vec3f& v)
+            : mValues{ v.x(), v.y(), v.z() }
+        {
+        }
+
+        operator osg::Vec3f() const { return osg::Vec3f(mValues[0], mValues[1], mValues[2]); }
+    };
+}
+
+#endif
diff --git a/components/esm3/activespells.cpp b/components/esm3/activespells.cpp
index 8ce47b7719..7c84afe489 100644
--- a/components/esm3/activespells.cpp
+++ b/components/esm3/activespells.cpp
@@ -93,11 +93,12 @@ namespace ESM
         {
             for (const auto& params : spells)
             {
-                esm.writeHNRefId(tag, params.mId);
+                esm.writeHNRefId(tag, params.mSourceSpellId);
+                esm.writeHNRefId("SPID", params.mActiveSpellId);
 
                 esm.writeHNT("CAST", params.mCasterActorId);
                 esm.writeHNString("DISP", params.mDisplayName);
-                esm.writeHNT("TYPE", params.mType);
+                esm.writeHNT("FLAG", params.mFlags);
                 if (params.mItem.isSet())
                     esm.writeFormId(params.mItem, true, "ITEM");
                 if (params.mWorsenings >= 0)
@@ -130,23 +131,44 @@ namespace ESM
             while (esm.isNextSub(tag))
             {
                 ActiveSpells::ActiveSpellParams params;
-                params.mId = esm.getRefId();
+                params.mSourceSpellId = esm.getRefId();
+                if (format > MaxActiveSpellTypeVersion)
+                    params.mActiveSpellId = esm.getHNRefId("SPID");
                 esm.getHNT(params.mCasterActorId, "CAST");
                 params.mDisplayName = esm.getHNString("DISP");
                 if (format <= MaxClearModifiersFormatVersion)
-                    params.mType = ActiveSpells::Type_Temporary;
+                    params.mFlags = Compatibility::ActiveSpells::Type_Temporary_Flags;
                 else
                 {
-                    esm.getHNT(params.mType, "TYPE");
-                    if (esm.peekNextSub("ITEM"))
+                    if (format <= MaxActiveSpellTypeVersion)
                     {
-                        if (format <= MaxActiveSpellSlotIndexFormatVersion)
-                            // Previous versions saved slot index in this record.
-                            // Ignore these values as we can't use them
-                            esm.getFormId(true, "ITEM");
-                        else
-                            params.mItem = esm.getFormId(true, "ITEM");
+                        Compatibility::ActiveSpells::EffectType type;
+                        esm.getHNT(type, "TYPE");
+                        switch (type)
+                        {
+                            case Compatibility::ActiveSpells::Type_Ability:
+                                params.mFlags = Compatibility::ActiveSpells::Type_Ability_Flags;
+                                break;
+                            case Compatibility::ActiveSpells::Type_Consumable:
+                                params.mFlags = Compatibility::ActiveSpells::Type_Consumable_Flags;
+                                break;
+                            case Compatibility::ActiveSpells::Type_Enchantment:
+                                params.mFlags = Compatibility::ActiveSpells::Type_Enchantment_Flags;
+                                break;
+                            case Compatibility::ActiveSpells::Type_Permanent:
+                                params.mFlags = Compatibility::ActiveSpells::Type_Permanent_Flags;
+                                break;
+                            case Compatibility::ActiveSpells::Type_Temporary:
+                                params.mFlags = Compatibility::ActiveSpells::Type_Temporary_Flags;
+                                break;
+                        }
                     }
+                    else
+                    {
+                        esm.getHNT(params.mFlags, "FLAG");
+                    }
+                    if (esm.peekNextSub("ITEM"))
+                        params.mItem = esm.getFormId(true, "ITEM");
                 }
                 if (esm.isNextSub("WORS"))
                 {
diff --git a/components/esm3/activespells.hpp b/components/esm3/activespells.hpp
index 0e4e01eda3..19e1f53be5 100644
--- a/components/esm3/activespells.hpp
+++ b/components/esm3/activespells.hpp
@@ -46,23 +46,27 @@ namespace ESM
     // format 0, saved games only
     struct ActiveSpells
     {
-        enum EffectType
+        enum Flags : uint32_t
         {
-            Type_Temporary,
-            Type_Ability,
-            Type_Enchantment,
-            Type_Permanent,
-            Type_Consumable
+            Flag_Temporary = 1 << 0, //!< Effect will end automatically once its duration ends.
+            Flag_Equipment = 1 << 1, //!< Effect will end automatically if item is unequipped.
+            Flag_SpellStore = 1 << 2, //!< Effect will end automatically if removed from the actor's spell store.
+            Flag_AffectsBaseValues = 1 << 3, //!< Effects will affect base values instead of current values.
+            Flag_Stackable
+            = 1 << 4, //!< Effect can stack. If this flag is not set, spells from the same caster and item cannot stack.
+            Flag_Lua
+            = 1 << 5, //!< Effect was added via Lua. Should not do any vfx/sound as this is handled by Lua scripts.
         };
 
         struct ActiveSpellParams
         {
-            RefId mId;
+            RefId mActiveSpellId;
+            RefId mSourceSpellId;
             std::vector<ActiveEffect> mEffects;
             std::string mDisplayName;
             int32_t mCasterActorId;
             RefNum mItem;
-            EffectType mType;
+            Flags mFlags;
             int32_t mWorsenings;
             TimeStamp mNextWorsening;
         };
@@ -73,6 +77,29 @@ namespace ESM
         void load(ESMReader& esm);
         void save(ESMWriter& esm) const;
     };
+
+    namespace Compatibility
+    {
+        namespace ActiveSpells
+        {
+            enum EffectType
+            {
+                Type_Temporary,
+                Type_Ability,
+                Type_Enchantment,
+                Type_Permanent,
+                Type_Consumable,
+            };
+
+            using Flags = ESM::ActiveSpells::Flags;
+            constexpr Flags Type_Temporary_Flags = Flags::Flag_Temporary;
+            constexpr Flags Type_Consumable_Flags = static_cast<Flags>(Flags::Flag_Temporary | Flags::Flag_Stackable);
+            constexpr Flags Type_Permanent_Flags = Flags::Flag_SpellStore;
+            constexpr Flags Type_Ability_Flags
+                = static_cast<Flags>(Flags::Flag_SpellStore | Flags::Flag_AffectsBaseValues);
+            constexpr Flags Type_Enchantment_Flags = Flags::Flag_Equipment;
+        }
+    }
 }
 
 #endif
diff --git a/components/esm3/aipackage.cpp b/components/esm3/aipackage.cpp
index 4d4c03c349..33b8a0bca2 100644
--- a/components/esm3/aipackage.cpp
+++ b/components/esm3/aipackage.cpp
@@ -5,9 +5,35 @@
 
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<AIWander> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mDistance, v.mDuration, v.mTimeOfDay, v.mIdle, v.mShouldRepeat);
+    }
+
+    template <Misc::SameAsWithoutCvref<AITravel> T>
+    void decompose(T&& v, const auto& f)
+    {
+        char padding[3] = { 0, 0, 0 };
+        f(v.mX, v.mY, v.mZ, v.mShouldRepeat, padding);
+    }
+
+    template <Misc::SameAsWithoutCvref<AITarget> T>
+    void decompose(T&& v, const auto& f)
+    {
+        char padding = 0;
+        f(v.mX, v.mY, v.mZ, v.mDuration, v.mId.mData, v.mShouldRepeat, padding);
+    }
+
+    template <Misc::SameAsWithoutCvref<AIActivate> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mName.mData, v.mShouldRepeat);
+    }
+
     void AIData::blank()
     {
-        mHello = mFight = mFlee = mAlarm = mU1 = mU2 = mU3 = 0;
+        mHello = mFight = mFlee = mAlarm = 0;
         mServices = 0;
     }
 
@@ -28,58 +54,53 @@ namespace ESM
         else if (esm.retSubName() == AI_Wander)
         {
             pack.mType = AI_Wander;
-            esm.getHExact(&pack.mWander, 14);
+            esm.getSubComposite(pack.mWander);
             mList.push_back(pack);
         }
         else if (esm.retSubName() == AI_Travel)
         {
             pack.mType = AI_Travel;
-            esm.getHExact(&pack.mTravel, 16);
+            esm.getSubComposite(pack.mTravel);
             mList.push_back(pack);
         }
         else if (esm.retSubName() == AI_Escort || esm.retSubName() == AI_Follow)
         {
             pack.mType = (esm.retSubName() == AI_Escort) ? AI_Escort : AI_Follow;
-            esm.getHExact(&pack.mTarget, 48);
+            esm.getSubComposite(pack.mTarget);
             mList.push_back(pack);
         }
         else if (esm.retSubName() == AI_Activate)
         {
             pack.mType = AI_Activate;
-            esm.getHExact(&pack.mActivate, 33);
+            esm.getSubComposite(pack.mActivate);
             mList.push_back(pack);
         }
-        else
-        { // not AI package related data, so leave
-            return;
-        }
     }
 
     void AIPackageList::save(ESMWriter& esm) const
     {
-        typedef std::vector<AIPackage>::const_iterator PackageIter;
-        for (PackageIter it = mList.begin(); it != mList.end(); ++it)
+        for (const AIPackage& package : mList)
         {
-            switch (it->mType)
+            switch (package.mType)
             {
                 case AI_Wander:
-                    esm.writeHNT("AI_W", it->mWander, sizeof(it->mWander));
+                    esm.writeNamedComposite("AI_W", package.mWander);
                     break;
 
                 case AI_Travel:
-                    esm.writeHNT("AI_T", it->mTravel, sizeof(it->mTravel));
+                    esm.writeNamedComposite("AI_T", package.mTravel);
                     break;
 
                 case AI_Activate:
-                    esm.writeHNT("AI_A", it->mActivate, sizeof(it->mActivate));
+                    esm.writeNamedComposite("AI_A", package.mActivate);
                     break;
 
                 case AI_Escort:
                 case AI_Follow:
                 {
-                    const NAME name = (it->mType == AI_Escort) ? NAME("AI_E") : NAME("AI_F");
-                    esm.writeHNT(name, it->mTarget, sizeof(it->mTarget));
-                    esm.writeHNOCString("CNDT", it->mCellName);
+                    const NAME name = (package.mType == AI_Escort) ? NAME("AI_E") : NAME("AI_F");
+                    esm.writeNamedComposite(name, package.mTarget);
+                    esm.writeHNOCString("CNDT", package.mCellName);
                     break;
                 }
 
diff --git a/components/esm3/aipackage.hpp b/components/esm3/aipackage.hpp
index 61aea2750a..10e7be8f00 100644
--- a/components/esm3/aipackage.hpp
+++ b/components/esm3/aipackage.hpp
@@ -5,21 +5,18 @@
 #include <vector>
 
 #include "components/esm/esmcommon.hpp"
+#include "components/misc/concepts.hpp"
 
 namespace ESM
 {
     class ESMReader;
     class ESMWriter;
 
-#pragma pack(push)
-#pragma pack(1)
-
     struct AIData
     {
-        unsigned short mHello; // This is the base value for greeting distance [0, 65535]
+        uint16_t mHello; // This is the base value for greeting distance [0, 65535]
         unsigned char mFight, mFlee, mAlarm; // These are probabilities [0, 100]
-        char mU1, mU2, mU3; // Unknown values
-        int mServices; // See the Services enum
+        int32_t mServices; // See the Services enum
 
         void blank();
         ///< Set record to default state (does not touch the ID).
@@ -27,8 +24,8 @@ namespace ESM
 
     struct AIWander
     {
-        short mDistance;
-        short mDuration;
+        int16_t mDistance;
+        int16_t mDuration;
         unsigned char mTimeOfDay;
         unsigned char mIdle[8];
         unsigned char mShouldRepeat;
@@ -38,16 +35,14 @@ namespace ESM
     {
         float mX, mY, mZ;
         unsigned char mShouldRepeat;
-        unsigned char mPadding[3];
     };
 
     struct AITarget
     {
         float mX, mY, mZ;
-        short mDuration;
+        int16_t mDuration;
         NAME32 mId;
         unsigned char mShouldRepeat;
-        unsigned char mPadding;
     };
 
     struct AIActivate
@@ -56,8 +51,6 @@ namespace ESM
         unsigned char mShouldRepeat;
     };
 
-#pragma pack(pop)
-
     enum AiPackageType : std::uint32_t
     {
         AI_Wander = 0x575f4941,
@@ -98,6 +91,13 @@ namespace ESM
 
         void save(ESMWriter& esm) const;
     };
+
+    template <Misc::SameAsWithoutCvref<AIData> T>
+    void decompose(T&& v, const auto& f)
+    {
+        char padding[3] = { 0, 0, 0 };
+        f(v.mHello, v.mFight, v.mFlee, v.mAlarm, padding, v.mServices);
+    }
 }
 
 #endif
diff --git a/components/esm3/aisequence.cpp b/components/esm3/aisequence.cpp
index 668b36c871..c316c2db86 100644
--- a/components/esm3/aisequence.cpp
+++ b/components/esm3/aisequence.cpp
@@ -3,45 +3,66 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 #include <algorithm>
 #include <memory>
 
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<AiSequence::AiWanderData> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mDistance, v.mDuration, v.mTimeOfDay, v.mIdle, v.mShouldRepeat);
+    }
+
+    template <Misc::SameAsWithoutCvref<AiSequence::AiWanderDuration> T>
+    void decompose(T&& v, const auto& f)
+    {
+        std::uint32_t unused = 0;
+        f(v.mRemainingDuration, unused);
+    }
+
+    template <Misc::SameAsWithoutCvref<AiSequence::AiTravelData> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mX, v.mY, v.mZ);
+    }
+
+    template <Misc::SameAsWithoutCvref<AiSequence::AiEscortData> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mX, v.mY, v.mZ, v.mDuration);
+    }
+
     namespace AiSequence
     {
-
         void AiWander::load(ESMReader& esm)
         {
-            esm.getHNT("DATA", mData.mDistance, mData.mDuration, mData.mTimeOfDay, mData.mIdle, mData.mShouldRepeat);
-            esm.getHNT("STAR", mDurationData.mRemainingDuration, mDurationData.unused); // was mStartTime
-            mStoredInitialActorPosition = false;
-            if (esm.isNextSub("POS_"))
-            {
-                mStoredInitialActorPosition = true;
-                esm.getHT(mInitialActorPosition.mValues);
-            }
+            esm.getNamedComposite("DATA", mData);
+            esm.getNamedComposite("STAR", mDurationData); // was mStartTime
+            mStoredInitialActorPosition = esm.getHNOT("POS_", mInitialActorPosition.mValues);
         }
 
         void AiWander::save(ESMWriter& esm) const
         {
-            esm.writeHNT("DATA", mData);
-            esm.writeHNT("STAR", mDurationData);
+            esm.writeNamedComposite("DATA", mData);
+            esm.writeNamedComposite("STAR", mDurationData); // was mStartTime
             if (mStoredInitialActorPosition)
-                esm.writeHNT("POS_", mInitialActorPosition);
+                esm.writeHNT("POS_", mInitialActorPosition.mValues);
         }
 
         void AiTravel::load(ESMReader& esm)
         {
-            esm.getHNT("DATA", mData.mX, mData.mY, mData.mZ);
-            esm.getHNOT(mHidden, "HIDD");
+            esm.getNamedComposite("DATA", mData);
+            esm.getHNT(mHidden, "HIDD");
             mRepeat = false;
             esm.getHNOT(mRepeat, "REPT");
         }
 
         void AiTravel::save(ESMWriter& esm) const
         {
-            esm.writeHNT("DATA", mData);
+            esm.writeNamedComposite("DATA", mData);
             esm.writeHNT("HIDD", mHidden);
             if (mRepeat)
                 esm.writeHNT("REPT", mRepeat);
@@ -49,7 +70,7 @@ namespace ESM
 
         void AiEscort::load(ESMReader& esm)
         {
-            esm.getHNT("DATA", mData.mX, mData.mY, mData.mZ, mData.mDuration);
+            esm.getNamedComposite("DATA", mData);
             mTargetId = esm.getHNRefId("TARG");
             mTargetActorId = -1;
             esm.getHNOT(mTargetActorId, "TAID");
@@ -69,7 +90,7 @@ namespace ESM
 
         void AiEscort::save(ESMWriter& esm) const
         {
-            esm.writeHNT("DATA", mData);
+            esm.writeNamedComposite("DATA", mData);
             esm.writeHNRefId("TARG", mTargetId);
             esm.writeHNT("TAID", mTargetActorId);
             esm.writeHNT("DURA", mRemainingDuration);
@@ -81,7 +102,7 @@ namespace ESM
 
         void AiFollow::load(ESMReader& esm)
         {
-            esm.getHNT("DATA", mData.mX, mData.mY, mData.mZ, mData.mDuration);
+            esm.getNamedComposite("DATA", mData);
             mTargetId = esm.getHNRefId("TARG");
             mTargetActorId = -1;
             esm.getHNOT(mTargetActorId, "TAID");
@@ -106,7 +127,7 @@ namespace ESM
 
         void AiFollow::save(ESMWriter& esm) const
         {
-            esm.writeHNT("DATA", mData);
+            esm.writeNamedComposite("DATA", mData);
             esm.writeHNRefId("TARG", mTargetId);
             esm.writeHNT("TAID", mTargetActorId);
             esm.writeHNT("DURA", mRemainingDuration);
@@ -196,7 +217,7 @@ namespace ESM
             int count = 0;
             while (esm.isNextSub("AIPK"))
             {
-                int type;
+                int32_t type;
                 esm.getHT(type);
 
                 mPackages.emplace_back();
@@ -263,7 +284,7 @@ namespace ESM
                 }
             }
 
-            esm.getHNOT(mLastAiPackage, "LAST");
+            esm.getHNT(mLastAiPackage, "LAST");
 
             if (count > 1 && esm.getFormatVersion() <= MaxOldAiPackageFormatVersion)
             {
diff --git a/components/esm3/aisequence.hpp b/components/esm3/aisequence.hpp
index 107fdf3bdb..729a914544 100644
--- a/components/esm3/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include "components/esm/refid.hpp"
-#include "components/esm/util.hpp"
+#include <components/esm/refid.hpp>
+#include <components/esm/vector3.hpp>
 
 namespace ESM
 {
@@ -36,32 +36,31 @@ namespace ESM
             virtual ~AiPackage() {}
         };
 
-#pragma pack(push, 1)
         struct AiWanderData
         {
             int16_t mDistance;
             int16_t mDuration;
-            unsigned char mTimeOfDay;
-            unsigned char mIdle[8];
-            unsigned char mShouldRepeat;
+            std::uint8_t mTimeOfDay;
+            std::uint8_t mIdle[8];
+            std::uint8_t mShouldRepeat;
         };
+
         struct AiWanderDuration
         {
             float mRemainingDuration;
-            int32_t unused;
         };
+
         struct AiTravelData
         {
             float mX, mY, mZ;
         };
+
         struct AiEscortData
         {
             float mX, mY, mZ;
             int16_t mDuration;
         };
 
-#pragma pack(pop)
-
         struct AiWander : AiPackage
         {
             AiWanderData mData;
diff --git a/components/esm3/animationstate.cpp b/components/esm3/animationstate.cpp
index 14edf01a83..79dcad7578 100644
--- a/components/esm3/animationstate.cpp
+++ b/components/esm3/animationstate.cpp
@@ -21,18 +21,7 @@ namespace ESM
             anim.mGroup = esm.getHString();
             esm.getHNOT(anim.mTime, "TIME");
             esm.getHNOT(anim.mAbsolute, "ABST");
-
-            esm.getSubNameIs("COUN");
-            // workaround bug in earlier version where size_t was used
-            esm.getSubHeader();
-            if (esm.getSubSize() == 8)
-                esm.getT(anim.mLoopCount);
-            else
-            {
-                uint32_t loopcount;
-                esm.getT(loopcount);
-                anim.mLoopCount = (uint64_t)loopcount;
-            }
+            esm.getHNT(anim.mLoopCount, "COUN");
 
             mScriptedAnims.push_back(anim);
         }
diff --git a/components/esm3/cellid.cpp b/components/esm3/cellid.cpp
index 3df1336c6c..4d08691034 100644
--- a/components/esm3/cellid.cpp
+++ b/components/esm3/cellid.cpp
@@ -3,25 +3,23 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 #include <components/misc/algorithm.hpp>
+#include <components/misc/concepts.hpp>
 
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<CellId::CellIndex> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mX, v.mY);
+    }
 
     void CellId::load(ESMReader& esm)
     {
         mWorldspace = esm.getHNString("SPAC");
 
-        if (esm.isNextSub("CIDX"))
-        {
-            esm.getHT(mIndex.mX, mIndex.mY);
-            mPaged = true;
-        }
-        else
-        {
-            mPaged = false;
-            mIndex.mX = 0;
-            mIndex.mY = 0;
-        }
+        mIndex.mX = 0;
+        mIndex.mY = 0;
+        mPaged = esm.getOptionalComposite("CIDX", mIndex);
     }
 
     void CellId::save(ESMWriter& esm) const
@@ -29,7 +27,7 @@ namespace ESM
         esm.writeHNString("SPAC", mWorldspace);
 
         if (mPaged)
-            esm.writeHNT("CIDX", mIndex, 8);
+            esm.writeNamedComposite("CIDX", mIndex);
     }
 
     struct VisitCellRefId
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index c4c2fca986..927f517495 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -107,16 +107,16 @@ namespace ESM
                         getHTOrSkip(cellRef.mChargeInt);
                         break;
                     case fourCC("NAM9"):
-                        getHTOrSkip(cellRef.mGoldValue);
+                        getHTOrSkip(cellRef.mCount);
                         break;
                     case fourCC("DODT"):
                         if constexpr (load)
                         {
-                            esm.getHT(cellRef.mDoorDest.pos, cellRef.mDoorDest.rot);
+                            esm.getSubComposite(cellRef.mDoorDest);
                             cellRef.mTeleport = true;
                         }
                         else
-                            esm.skipHTSized<24, ESM::Position>();
+                            esm.skipHSub();
                         break;
                     case fourCC("DNAM"):
                         getHStringOrSkip(cellRef.mDestCell);
@@ -132,9 +132,9 @@ namespace ESM
                         break;
                     case fourCC("DATA"):
                         if constexpr (load)
-                            esm.getHT(cellRef.mPos.pos, cellRef.mPos.rot);
+                            esm.getSubComposite(cellRef.mPos);
                         else
-                            esm.skipHTSized<24, decltype(cellRef.mPos)>();
+                            esm.skipHSub();
                         break;
                     case fourCC("NAM0"):
                     {
@@ -219,23 +219,25 @@ namespace ESM
         if (mChargeInt != -1)
             esm.writeHNT("INTV", mChargeInt);
 
-        if (mGoldValue > 1)
-            esm.writeHNT("NAM9", mGoldValue);
+        if (mCount != 1)
+            esm.writeHNT("NAM9", mCount);
 
         if (!inInventory && mTeleport)
         {
-            esm.writeHNT("DODT", mDoorDest);
+            esm.writeNamedComposite("DODT", mDoorDest);
             esm.writeHNOCString("DNAM", mDestCell);
         }
 
         if (!inInventory)
         {
-            int lockLevel = mLockLevel;
-            if (lockLevel == 0 && mIsLocked)
-                lockLevel = ZeroLock;
-            if (lockLevel != 0)
+            if (mIsLocked)
+            {
+                int lockLevel = mLockLevel;
+                if (lockLevel == 0)
+                    lockLevel = ZeroLock;
                 esm.writeHNT("FLTV", lockLevel);
-            esm.writeHNOCRefId("KNAM", mKey);
+                esm.writeHNOCRefId("KNAM", mKey);
+            }
             esm.writeHNOCRefId("TNAM", mTrap);
         }
 
@@ -243,7 +245,7 @@ namespace ESM
             esm.writeHNT("UNAM", mReferenceBlocked);
 
         if (!inInventory)
-            esm.writeHNT("DATA", mPos, 24);
+            esm.writeNamedComposite("DATA", mPos);
     }
 
     void CellRef::blank()
@@ -259,7 +261,7 @@ namespace ESM
         mChargeInt = -1;
         mChargeIntRemainder = 0.0f;
         mEnchantmentCharge = -1;
-        mGoldValue = 1;
+        mCount = 1;
         mDestCell.clear();
         mLockLevel = 0;
         mIsLocked = false;
@@ -285,4 +287,10 @@ namespace ESM
         loadDataImpl<false>(esm, isDeleted, cellRef);
     }
 
+    CellRef makeBlankCellRef()
+    {
+        CellRef result;
+        result.blank();
+        return result;
+    }
 }
diff --git a/components/esm3/cellref.hpp b/components/esm3/cellref.hpp
index 10ab4505ce..683bde200d 100644
--- a/components/esm3/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -4,16 +4,17 @@
 #include <cstdint>
 #include <string>
 
-#include "components/esm/defs.hpp"
-#include "components/esm/refid.hpp"
+#include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
+#include <components/esm/refid.hpp>
+
+#include "refnum.hpp"
 
 namespace ESM
 {
     class ESMWriter;
     class ESMReader;
 
-    using RefNum = ESM::FormId;
-
     /* Cell reference. This represents ONE object (of many) inside the
     cell. The cell references are not loaded as part of the normal
     loading process, but are rather loaded later on demand when we are
@@ -60,13 +61,12 @@ namespace ESM
             int32_t mChargeInt; // Used by everything except lights
             float mChargeFloat; // Used only by lights
         };
-        float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt
+        float mChargeIntRemainder; // Fractional part of mChargeInt
 
         // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
         float mEnchantmentCharge;
 
-        // This is 5 for Gold_005 references, 100 for Gold_100 and so on.
-        int32_t mGoldValue;
+        int32_t mCount;
 
         // For doors - true if this door teleports to somewhere else, false
         // if it should open through animation.
@@ -105,6 +105,8 @@ namespace ESM
     };
 
     void skipLoadCellRef(ESMReader& esm, bool wideRefNum = false);
+
+    CellRef makeBlankCellRef();
 }
 
 #endif
diff --git a/components/esm3/creaturelevliststate.hpp b/components/esm3/creaturelevliststate.hpp
index f8fb7162ff..e7121cf8ac 100644
--- a/components/esm3/creaturelevliststate.hpp
+++ b/components/esm3/creaturelevliststate.hpp
@@ -9,7 +9,7 @@ namespace ESM
 
     struct CreatureLevListState final : public ObjectState
     {
-        int mSpawnActorId;
+        int32_t mSpawnActorId;
         bool mSpawn;
 
         void load(ESMReader& esm) override;
diff --git a/components/esm3/creaturestats.cpp b/components/esm3/creaturestats.cpp
index d8fb0d6969..44c3bd993b 100644
--- a/components/esm3/creaturestats.cpp
+++ b/components/esm3/creaturestats.cpp
@@ -38,23 +38,15 @@ namespace ESM
         mHitRecovery = false;
         mBlock = false;
         mRecalcDynamicStats = false;
-        if (esm.getFormatVersion() <= MaxWerewolfDeprecatedDataFormatVersion)
+        if (esm.getFormatVersion() <= MaxUnoptimizedCharacterDataFormatVersion)
         {
             esm.getHNOT(mDead, "DEAD");
             esm.getHNOT(mDeathAnimationFinished, "DFNT");
-            if (esm.getFormatVersion() <= MaxOldDeathAnimationFormatVersion && mDead)
-                mDeathAnimationFinished = true;
             esm.getHNOT(mDied, "DIED");
             esm.getHNOT(mMurdered, "MURD");
-            if (esm.isNextSub("FRHT"))
-                esm.skipHSub(); // Friendly hits, no longer used
             esm.getHNOT(mTalkedTo, "TALK");
             esm.getHNOT(mAlarmed, "ALRM");
             esm.getHNOT(mAttacked, "ATKD");
-            if (esm.isNextSub("HOST"))
-                esm.skipHSub(); // Hostile, no longer used
-            if (esm.isNextSub("ATCK"))
-                esm.skipHSub(); // attackingOrSpell, no longer used
             esm.getHNOT(mKnockdown, "KNCK");
             esm.getHNOT(mKnockdownOneFrame, "KNC1");
             esm.getHNOT(mKnockdownOverOneFrame, "KNCO");
@@ -82,9 +74,6 @@ namespace ESM
         mMovementFlags = 0;
         esm.getHNOT(mMovementFlags, "MOVE");
 
-        if (esm.isNextSub("ASTR"))
-            esm.skipHSub(); // attackStrength, no longer used
-
         mFallHeight = 0;
         esm.getHNOT(mFallHeight, "FALL");
 
@@ -92,7 +81,7 @@ namespace ESM
 
         mLastHitAttemptObject = esm.getHNORefId("LHAT");
 
-        if (esm.getFormatVersion() <= MaxWerewolfDeprecatedDataFormatVersion)
+        if (esm.getFormatVersion() <= MaxUnoptimizedCharacterDataFormatVersion)
             esm.getHNOT(mRecalcDynamicStats, "CALC");
 
         mDrawState = 0;
diff --git a/components/esm3/creaturestats.hpp b/components/esm3/creaturestats.hpp
index 63ba49cdaa..6e65a52354 100644
--- a/components/esm3/creaturestats.hpp
+++ b/components/esm3/creaturestats.hpp
@@ -47,9 +47,8 @@ namespace ESM
         std::vector<int> mSummonGraveyard;
 
         TimeStamp mTradeTime;
-        int mGoldPool;
-        int mActorId;
-        // int mHitAttemptActorId;
+        int32_t mGoldPool;
+        int32_t mActorId;
 
         enum Flags
         {
diff --git a/components/esm3/debugprofile.hpp b/components/esm3/debugprofile.hpp
index fc48fb23f6..a86e84bfd5 100644
--- a/components/esm3/debugprofile.hpp
+++ b/components/esm3/debugprofile.hpp
@@ -24,14 +24,14 @@ namespace ESM
             Flag_Global = 4 // make available from main menu (i.e. not location specific)
         };
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
 
         std::string mDescription;
 
         std::string mScriptText;
 
-        unsigned int mFlags;
+        uint32_t mFlags;
 
         void load(ESMReader& esm, bool& isDeleted);
         void save(ESMWriter& esm, bool isDeleted = false) const;
diff --git a/components/esm3/dialoguecondition.cpp b/components/esm3/dialoguecondition.cpp
new file mode 100644
index 0000000000..a6a28307c2
--- /dev/null
+++ b/components/esm3/dialoguecondition.cpp
@@ -0,0 +1,206 @@
+#include "dialoguecondition.hpp"
+
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
+#include "variant.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/misc/concepts.hpp>
+#include <components/misc/strings/conversion.hpp>
+
+namespace ESM
+{
+    std::optional<DialogueCondition> DialogueCondition::load(ESMReader& esm, ESM::RefId context)
+    {
+        std::string rule = esm.getHString();
+        ESM::Variant variant;
+        variant.read(esm, Variant::Format_Info);
+        if (rule.size() < 5)
+        {
+            Log(Debug::Warning) << "Found invalid SCVR rule of size " << rule.size() << " in INFO " << context;
+            return {};
+        }
+        if (rule[4] < '0' || rule[4] > '5')
+        {
+            Log(Debug::Warning) << "Found invalid SCVR comparison operator " << static_cast<int>(rule[4]) << " in INFO "
+                                << context;
+            return {};
+        }
+        DialogueCondition condition;
+        if (rule[0] >= '0' && rule[0] <= '9')
+            condition.mIndex = rule[0] - '0';
+        else
+        {
+            Log(Debug::Info) << "Found invalid SCVR index " << static_cast<int>(rule[0]) << " in INFO " << context;
+            condition.mIndex = 0;
+        }
+        if (rule[1] == '1')
+        {
+            int function = Misc::StringUtils::toNumeric<int>(std::string_view{ rule }.substr(2, 2), -1);
+            if (function >= Function_FacReactionLowest && function <= Function_PcWerewolfKills)
+                condition.mFunction = static_cast<Function>(function);
+            else
+            {
+                Log(Debug::Warning) << "Encountered invalid SCVR function index " << function << " in INFO " << context;
+                return {};
+            }
+        }
+        else if ((rule[1] > '1' && rule[1] <= '9') || (rule[1] >= 'A' && rule[1] <= 'C'))
+        {
+            if (rule.size() == 5)
+            {
+                Log(Debug::Warning) << "Missing variable for SCVR of type " << rule[1] << " in INFO " << context;
+                return {};
+            }
+            bool malformed = rule[3] != 'X';
+            if (rule[1] == '2')
+            {
+                condition.mFunction = Function_Global;
+                malformed |= rule[2] != 'f' && rule[2] != 'l' && rule[2] != 's';
+            }
+            else if (rule[1] == '3')
+            {
+                condition.mFunction = Function_Local;
+                malformed |= rule[2] != 'f' && rule[2] != 'l' && rule[2] != 's';
+            }
+            else if (rule[1] == '4')
+            {
+                condition.mFunction = Function_Journal;
+                malformed |= rule[2] != 'J';
+            }
+            else if (rule[1] == '5')
+            {
+                condition.mFunction = Function_Item;
+                malformed |= rule[2] != 'I';
+            }
+            else if (rule[1] == '6')
+            {
+                condition.mFunction = Function_Dead;
+                malformed |= rule[2] != 'D';
+            }
+            else if (rule[1] == '7')
+            {
+                condition.mFunction = Function_NotId;
+                malformed |= rule[2] != 'X';
+            }
+            else if (rule[1] == '8')
+            {
+                condition.mFunction = Function_NotFaction;
+                malformed |= rule[2] != 'F';
+            }
+            else if (rule[1] == '9')
+            {
+                condition.mFunction = Function_NotClass;
+                malformed |= rule[2] != 'C';
+            }
+            else if (rule[1] == 'A')
+            {
+                condition.mFunction = Function_NotRace;
+                malformed |= rule[2] != 'R';
+            }
+            else if (rule[1] == 'B')
+            {
+                condition.mFunction = Function_NotCell;
+                malformed |= rule[2] != 'L';
+            }
+            else if (rule[1] == 'C')
+            {
+                condition.mFunction = Function_NotLocal;
+                malformed |= rule[2] != 'f' && rule[2] != 'l' && rule[2] != 's';
+            }
+            if (malformed)
+                Log(Debug::Info) << "Found malformed SCVR rule in INFO " << context;
+        }
+        else
+        {
+            Log(Debug::Warning) << "Found invalid SCVR function " << static_cast<int>(rule[1]) << " in INFO "
+                                << context;
+            return {};
+        }
+        condition.mComparison = static_cast<Comparison>(rule[4]);
+        condition.mVariable = rule.substr(5);
+        if (variant.getType() == VT_Int)
+            condition.mValue = variant.getInteger();
+        else if (variant.getType() == VT_Float)
+            condition.mValue = variant.getFloat();
+        else
+        {
+            Log(Debug::Warning) << "Found invalid SCVR variant " << variant.getType() << " in INFO " << context;
+            return {};
+        }
+        return condition;
+    }
+
+    void DialogueCondition::save(ESMWriter& esm) const
+    {
+        auto variant = std::visit([](auto value) { return ESM::Variant(value); }, mValue);
+        if (variant.getType() != VT_Float)
+            variant.setType(VT_Int);
+        std::string rule;
+        rule.reserve(5 + mVariable.size());
+        rule += static_cast<char>(mIndex + '0');
+        const auto appendVariableType = [&]() {
+            if (variant.getType() == VT_Float)
+                rule += "fX";
+            else
+            {
+                int32_t value = variant.getInteger();
+                if (static_cast<int16_t>(value) == value)
+                    rule += "sX";
+                else
+                    rule += "lX";
+            }
+        };
+        if (mFunction == Function_Global)
+        {
+            rule += '2';
+            appendVariableType();
+        }
+        else if (mFunction == Function_Local)
+        {
+            rule += '3';
+            appendVariableType();
+        }
+        else if (mFunction == Function_Journal)
+            rule += "4JX";
+        else if (mFunction == Function_Item)
+            rule += "5IX";
+        else if (mFunction == Function_Dead)
+            rule += "6DX";
+        else if (mFunction == Function_NotId)
+            rule += "7XX";
+        else if (mFunction == Function_NotFaction)
+            rule += "8FX";
+        else if (mFunction == Function_NotClass)
+            rule += "9CX";
+        else if (mFunction == Function_NotRace)
+            rule += "ARX";
+        else if (mFunction == Function_NotCell)
+            rule += "BLX";
+        else if (mFunction == Function_NotLocal)
+        {
+            rule += 'C';
+            appendVariableType();
+        }
+        else
+        {
+            rule += "100";
+            char* start = rule.data() + rule.size();
+            char* end = start;
+            if (mFunction < Function_PcStrength)
+                start--;
+            else
+                start -= 2;
+            auto result = std::to_chars(start, end, static_cast<int>(mFunction));
+            if (result.ec != std::errc())
+            {
+                Log(Debug::Error) << "Failed to save SCVR rule";
+                return;
+            }
+        }
+        rule += static_cast<char>(mComparison);
+        rule += mVariable;
+        esm.writeHNString("SCVR", rule);
+        variant.write(esm, Variant::Format_Info);
+    }
+}
diff --git a/components/esm3/dialoguecondition.hpp b/components/esm3/dialoguecondition.hpp
new file mode 100644
index 0000000000..c06d50b601
--- /dev/null
+++ b/components/esm3/dialoguecondition.hpp
@@ -0,0 +1,134 @@
+#ifndef OPENMW_ESM3_DIALOGUECONDITION_H
+#define OPENMW_ESM3_DIALOGUECONDITION_H
+
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <variant>
+
+#include <components/esm/refid.hpp>
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+
+    struct DialogueCondition
+    {
+        enum Function : std::int8_t
+        {
+            Function_FacReactionLowest = 0,
+            Function_FacReactionHighest,
+            Function_RankRequirement,
+            Function_Reputation,
+            Function_Health_Percent,
+            Function_PcReputation,
+            Function_PcLevel,
+            Function_PcHealthPercent,
+            Function_PcMagicka,
+            Function_PcFatigue,
+            Function_PcStrength,
+            Function_PcBlock,
+            Function_PcArmorer,
+            Function_PcMediumArmor,
+            Function_PcHeavyArmor,
+            Function_PcBluntWeapon,
+            Function_PcLongBlade,
+            Function_PcAxe,
+            Function_PcSpear,
+            Function_PcAthletics,
+            Function_PcEnchant,
+            Function_PcDestruction,
+            Function_PcAlteration,
+            Function_PcIllusion,
+            Function_PcConjuration,
+            Function_PcMysticism,
+            Function_PcRestoration,
+            Function_PcAlchemy,
+            Function_PcUnarmored,
+            Function_PcSecurity,
+            Function_PcSneak,
+            Function_PcAcrobatics,
+            Function_PcLightArmor,
+            Function_PcShortBlade,
+            Function_PcMarksman,
+            Function_PcMerchantile,
+            Function_PcSpeechcraft,
+            Function_PcHandToHand,
+            Function_PcGender,
+            Function_PcExpelled,
+            Function_PcCommonDisease,
+            Function_PcBlightDisease,
+            Function_PcClothingModifier,
+            Function_PcCrimeLevel,
+            Function_SameSex,
+            Function_SameRace,
+            Function_SameFaction,
+            Function_FactionRankDifference,
+            Function_Detected,
+            Function_Alarmed,
+            Function_Choice,
+            Function_PcIntelligence,
+            Function_PcWillpower,
+            Function_PcAgility,
+            Function_PcSpeed,
+            Function_PcEndurance,
+            Function_PcPersonality,
+            Function_PcLuck,
+            Function_PcCorprus,
+            Function_Weather,
+            Function_PcVampire,
+            Function_Level,
+            Function_Attacked,
+            Function_TalkedToPc,
+            Function_PcHealth,
+            Function_CreatureTarget,
+            Function_FriendHit,
+            Function_Fight,
+            Function_Hello,
+            Function_Alarm,
+            Function_Flee,
+            Function_ShouldAttack,
+            Function_Werewolf,
+            Function_PcWerewolfKills = 73,
+
+            Function_Global,
+            Function_Local,
+            Function_Journal,
+            Function_Item,
+            Function_Dead,
+            Function_NotId,
+            Function_NotFaction,
+            Function_NotClass,
+            Function_NotRace,
+            Function_NotCell,
+            Function_NotLocal,
+
+            Function_None, // Editor only
+        };
+
+        enum Comparison : char
+        {
+            Comp_Eq = '0',
+            Comp_Ne = '1',
+            Comp_Gt = '2',
+            Comp_Ge = '3',
+            Comp_Ls = '4',
+            Comp_Le = '5',
+
+            Comp_None = ' ', // Editor only
+        };
+
+        std::string mVariable;
+        std::variant<int32_t, float> mValue = 0;
+        std::uint8_t mIndex = 0;
+        Function mFunction = Function_None;
+        Comparison mComparison = Comp_None;
+
+        static std::optional<DialogueCondition> load(ESMReader& esm, ESM::RefId context);
+
+        void save(ESMWriter& esm) const;
+    };
+}
+
+#endif
diff --git a/components/esm3/dialoguestate.cpp b/components/esm3/dialoguestate.cpp
index 88fbe9659a..7095e096cb 100644
--- a/components/esm3/dialoguestate.cpp
+++ b/components/esm3/dialoguestate.cpp
@@ -22,14 +22,6 @@ namespace ESM
                 esm.getHNT(reaction, "INTV");
                 mChangedFactionReaction[faction][faction2] = reaction;
             }
-
-            // no longer used
-            while (esm.isNextSub("REAC"))
-            {
-                esm.skipHSub();
-                esm.getSubName();
-                esm.skipHSub();
-            }
         }
     }
 
diff --git a/components/esm3/doorstate.hpp b/components/esm3/doorstate.hpp
index 5298327707..c23ffd5ad2 100644
--- a/components/esm3/doorstate.hpp
+++ b/components/esm3/doorstate.hpp
@@ -9,7 +9,7 @@ namespace ESM
 
     struct DoorState final : public ObjectState
     {
-        int mDoorState = 0;
+        int32_t mDoorState = 0;
 
         void load(ESMReader& esm) override;
         void save(ESMWriter& esm, bool inInventory = false) const override;
diff --git a/components/esm3/effectlist.cpp b/components/esm3/effectlist.cpp
index 701552b312..a71eccfb84 100644
--- a/components/esm3/effectlist.cpp
+++ b/components/esm3/effectlist.cpp
@@ -3,8 +3,15 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<ENAMstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mEffectID, v.mSkill, v.mAttribute, v.mRange, v.mArea, v.mDuration, v.mMagnMin, v.mMagnMax);
+    }
 
     void EffectList::load(ESMReader& esm)
     {
@@ -15,19 +22,40 @@ namespace ESM
         }
     }
 
+    void EffectList::populate(const std::vector<ENAMstruct>& effects)
+    {
+        mList.clear();
+        for (size_t i = 0; i < effects.size(); i++)
+            mList.push_back({ effects[i], static_cast<uint32_t>(i) });
+    }
+
+    void EffectList::updateIndexes()
+    {
+        for (size_t i = 0; i < mList.size(); i++)
+            mList[i].mIndex = i;
+    }
+
     void EffectList::add(ESMReader& esm)
     {
         ENAMstruct s;
-        esm.getHT(s.mEffectID, s.mSkill, s.mAttribute, s.mRange, s.mArea, s.mDuration, s.mMagnMin, s.mMagnMax);
-        mList.push_back(s);
+        esm.getSubComposite(s);
+        mList.push_back({ s, static_cast<uint32_t>(mList.size()) });
     }
 
     void EffectList::save(ESMWriter& esm) const
     {
-        for (std::vector<ENAMstruct>::const_iterator it = mList.begin(); it != mList.end(); ++it)
+        for (const IndexedENAMstruct& enam : mList)
         {
-            esm.writeHNT<ENAMstruct>("ENAM", *it, 24);
+            esm.writeNamedComposite("ENAM", enam.mData);
         }
     }
 
+    bool IndexedENAMstruct::operator!=(const IndexedENAMstruct& rhs) const
+    {
+        return mData.mEffectID != rhs.mData.mEffectID || mData.mArea != rhs.mData.mArea
+            || mData.mRange != rhs.mData.mRange || mData.mSkill != rhs.mData.mSkill
+            || mData.mAttribute != rhs.mData.mAttribute || mData.mMagnMin != rhs.mData.mMagnMin
+            || mData.mMagnMax != rhs.mData.mMagnMax || mData.mDuration != rhs.mData.mDuration;
+    }
+
 } // end namespace
diff --git a/components/esm3/effectlist.hpp b/components/esm3/effectlist.hpp
index 8f2cb959d6..8eb347d6c8 100644
--- a/components/esm3/effectlist.hpp
+++ b/components/esm3/effectlist.hpp
@@ -9,9 +9,6 @@ namespace ESM
     class ESMReader;
     class ESMWriter;
 
-#pragma pack(push)
-#pragma pack(1)
-
     /** Defines a spell effect. Shared between SPEL (Spells), ALCH
      (Potions) and ENCH (Item enchantments) records
      */
@@ -28,12 +25,22 @@ namespace ESM
         int32_t mRange; // 0 - self, 1 - touch, 2 - target (RangeType enum)
         int32_t mArea, mDuration, mMagnMin, mMagnMax;
     };
-#pragma pack(pop)
+
+    struct IndexedENAMstruct
+    {
+        bool operator!=(const IndexedENAMstruct& rhs) const;
+        bool operator==(const IndexedENAMstruct& rhs) const { return !(this->operator!=(rhs)); }
+        ENAMstruct mData;
+        uint32_t mIndex;
+    };
 
     /// EffectList, ENAM subrecord
     struct EffectList
     {
-        std::vector<ENAMstruct> mList;
+        std::vector<IndexedENAMstruct> mList;
+
+        void populate(const std::vector<ENAMstruct>& effects);
+        void updateIndexes();
 
         /// Load one effect, assumes subrecord name was already read
         void add(ESMReader& esm);
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 77468f22d5..4f69b8edef 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -153,7 +153,7 @@ namespace ESM
     {
         if (isNextSub(name))
             return getHString();
-        return "";
+        return {};
     }
 
     ESM::RefId ESMReader::getHNORefId(NAME name)
@@ -244,26 +244,11 @@ namespace ESM
         skipHString();
     }
 
-    void ESMReader::getHExact(void* p, int size)
-    {
-        getSubHeader();
-        if (size != static_cast<int>(mCtx.leftSub))
-            reportSubSizeMismatch(size, mCtx.leftSub);
-        getExact(p, size);
-    }
-
-    // Read the given number of bytes from a named subrecord
-    void ESMReader::getHNExact(void* p, int size, NAME name)
-    {
-        getSubNameIs(name);
-        getHExact(p, size);
-    }
-
     FormId ESMReader::getFormId(bool wide, NAME tag)
     {
         FormId res;
         if (wide)
-            getHNTSized<8>(res, tag);
+            getHNT(tag, res.mIndex, res.mContentFile);
         else
             getHNT(res.mIndex, tag);
         return res;
@@ -316,7 +301,7 @@ namespace ESM
 
         // reading the subrecord data anyway.
         const std::size_t subNameSize = decltype(mCtx.subName)::sCapacity;
-        getExact(mCtx.subName.mData, static_cast<int>(subNameSize));
+        getExact(mCtx.subName.mData, subNameSize);
         mCtx.leftRec -= static_cast<std::uint32_t>(subNameSize);
     }
 
@@ -326,10 +311,10 @@ namespace ESM
         skip(mCtx.leftSub);
     }
 
-    void ESMReader::skipHSubSize(int size)
+    void ESMReader::skipHSubSize(std::size_t size)
     {
         skipHSub();
-        if (static_cast<int>(mCtx.leftSub) != size)
+        if (mCtx.leftSub != size)
             reportSubSizeMismatch(mCtx.leftSub, size);
     }
 
@@ -496,7 +481,8 @@ namespace ESM
             case RefIdType::FormId:
             {
                 FormId formId{};
-                getTSized<8>(formId);
+                getT(formId.mIndex);
+                getT(formId.mContentFile);
                 if (applyContentFileMapping(formId))
                     return RefId(formId);
                 else
@@ -505,7 +491,7 @@ namespace ESM
             case RefIdType::Generated:
             {
                 std::uint64_t generated{};
-                getExact(&generated, sizeof(std::uint64_t));
+                getT(generated);
                 return RefId::generated(generated);
             }
             case RefIdType::Index:
@@ -513,14 +499,14 @@ namespace ESM
                 RecNameInts recordType{};
                 getExact(&recordType, sizeof(std::uint32_t));
                 std::uint32_t index{};
-                getExact(&index, sizeof(std::uint32_t));
+                getT(index);
                 return RefId::index(recordType, index);
             }
             case RefIdType::ESM3ExteriorCell:
             {
                 int32_t x, y;
-                getExact(&x, sizeof(std::int32_t));
-                getExact(&y, sizeof(std::int32_t));
+                getT(x);
+                getT(y);
                 return RefId::esm3ExteriorCell(x, y);
             }
         }
@@ -528,7 +514,7 @@ namespace ESM
         fail("Unsupported RefIdType: " + std::to_string(static_cast<unsigned>(refIdType)));
     }
 
-    [[noreturn]] void ESMReader::fail(const std::string& msg)
+    [[noreturn]] void ESMReader::fail(std::string_view msg)
     {
         std::stringstream ss;
 
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index 63db1634fc..5af5e75573 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -12,8 +12,10 @@
 
 #include <components/to_utf8/to_utf8.hpp>
 
+#include "components/esm/decompose.hpp"
 #include "components/esm/esmcommon.hpp"
 #include "components/esm/refid.hpp"
+
 #include "loadtes3.hpp"
 
 namespace ESM
@@ -53,9 +55,9 @@ namespace ESM
          *
          *************************************************************************/
 
-        int getVer() const { return mHeader.mData.version; }
+        int getVer() const { return mHeader.mData.version.ui; }
         int getRecordCount() const { return mHeader.mData.records; }
-        float getFVer() const { return (mHeader.mData.version == VER_12) ? 1.2f : 1.3f; }
+        float esmVersionF() const { return (mHeader.mData.version.f); }
         const std::string& getAuthor() const { return mHeader.mData.author; }
         const std::string& getDesc() const { return mHeader.mData.desc; }
         const std::vector<Header::MasterData>& getGameFiles() const { return mHeader.mMaster; }
@@ -131,10 +133,10 @@ namespace ESM
         ESM::RefId getCellId();
 
         // Read data of a given type, stored in a subrecord of a given name
-        template <typename X, typename = std::enable_if_t<IsReadable<X>>>
+        template <typename X>
         void getHNT(X& x, NAME name)
         {
-            getHNTSized<sizeof(X)>(x, name);
+            getHNT(name, x);
         }
 
         template <class... Args>
@@ -149,26 +151,21 @@ namespace ESM
         }
 
         // Optional version of getHNT
-        template <typename X, typename = std::enable_if_t<IsReadable<X>>>
+        template <typename X>
         void getHNOT(X& x, NAME name)
         {
-            getHNOTSized<sizeof(X)>(x, name);
+            getHNOT(name, x);
         }
 
-        // Version with extra size checking, to make sure the compiler
-        // doesn't mess up our struct padding.
-        template <std::size_t size, typename X>
-        void getHNTSized(X& x, NAME name)
-        {
-            getSubNameIs(name);
-            getHTSized<size>(x);
-        }
-
-        template <std::size_t size, typename X>
-        void getHNOTSized(X& x, NAME name)
+        template <class... Args>
+        bool getHNOT(NAME name, Args&... args)
         {
             if (isNextSub(name))
-                getHTSized<size>(x);
+            {
+                getHT(args...);
+                return true;
+            }
+            return false;
         }
 
         // Get data of a given type/size, including subrecord header
@@ -182,40 +179,41 @@ namespace ESM
             (getT(args), ...);
         }
 
+        void getNamedComposite(NAME name, auto& value)
+        {
+            decompose(value, [&](auto&... args) { getHNT(name, args...); });
+        }
+
+        bool getOptionalComposite(NAME name, auto& value)
+        {
+            if (isNextSub(name))
+            {
+                getSubComposite(value);
+                return true;
+            }
+            return false;
+        }
+
+        void getComposite(auto& value)
+        {
+            decompose(value, [&](auto&... args) { (getT(args), ...); });
+        }
+
+        void getSubComposite(auto& value)
+        {
+            decompose(value, [&](auto&... args) { getHT(args...); });
+        }
+
         template <typename T, typename = std::enable_if_t<IsReadable<T>>>
         void skipHT()
         {
-            skipHTSized<sizeof(T), T>();
-        }
-
-        // Version with extra size checking, to make sure the compiler
-        // doesn't mess up our struct padding.
-        template <std::size_t size, typename X>
-        void getHTSized(X& x)
-        {
-            getSubHeader();
-            if (mCtx.leftSub != size)
-                reportSubSizeMismatch(size, mCtx.leftSub);
-            getTSized<size>(x);
-        }
-
-        template <std::size_t size, typename T>
-        void skipHTSized()
-        {
-            static_assert(sizeof(T) == size);
+            constexpr size_t size = sizeof(T);
             getSubHeader();
             if (mCtx.leftSub != size)
                 reportSubSizeMismatch(size, mCtx.leftSub);
             skip(size);
         }
 
-        template <std::size_t size, typename X>
-        void getTSized(X& x)
-        {
-            static_assert(sizeof(X) == size);
-            getExact(&x, size);
-        }
-
         // Read a string by the given name if it is the next record.
         std::string getHNOString(NAME name);
 
@@ -239,12 +237,6 @@ namespace ESM
 
         void skipHRefId();
 
-        // Read the given number of bytes from a subrecord
-        void getHExact(void* p, int size);
-
-        // Read the given number of bytes from a named subrecord
-        void getHNExact(void* p, int size, NAME name);
-
         ESM::FormId getFormId(bool wide = false, NAME tag = "FRMR");
 
         /*************************************************************************
@@ -277,7 +269,7 @@ namespace ESM
         void skipHSub();
 
         // Skip sub record and check its size
-        void skipHSubSize(int size);
+        void skipHSubSize(std::size_t size);
 
         // Skip all subrecords until the given subrecord or no more subrecords remaining
         void skipHSubUntil(NAME name);
@@ -333,7 +325,7 @@ namespace ESM
             mEsm->read(static_cast<char*>(x), static_cast<std::streamsize>(size));
         }
 
-        void getName(NAME& name) { getTSized<4>(name); }
+        void getName(NAME& name) { getT(name.mData); }
         void getUint(uint32_t& u) { getT(u); }
 
         std::string getMaybeFixedStringSize(std::size_t size);
@@ -356,7 +348,7 @@ namespace ESM
         }
 
         /// Used for error handling
-        [[noreturn]] void fail(const std::string& msg);
+        [[noreturn]] void fail(std::string_view msg);
 
         /// Sets font encoder for ESM strings
         void setEncoder(ToUTF8::Utf8Encoder* encoder) { mEncoder = encoder; }
diff --git a/components/esm3/esmwriter.cpp b/components/esm3/esmwriter.cpp
index 66788aa924..47c861e3ca 100644
--- a/components/esm3/esmwriter.cpp
+++ b/components/esm3/esmwriter.cpp
@@ -84,12 +84,12 @@ namespace ESM
 
     unsigned int ESMWriter::getVersion() const
     {
-        return mHeader.mData.version;
+        return mHeader.mData.version.ui;
     }
 
     void ESMWriter::setVersion(unsigned int ver)
     {
-        mHeader.mData.version = ver;
+        mHeader.mData.version.ui = ver;
     }
 
     void ESMWriter::setType(int type)
@@ -97,14 +97,14 @@ namespace ESM
         mHeader.mData.type = type;
     }
 
-    void ESMWriter::setAuthor(const std::string& auth)
+    void ESMWriter::setAuthor(std::string_view auth)
     {
-        mHeader.mData.author.assign(auth);
+        mHeader.mData.author = auth;
     }
 
-    void ESMWriter::setDescription(const std::string& desc)
+    void ESMWriter::setDescription(std::string_view desc)
     {
-        mHeader.mData.desc.assign(desc);
+        mHeader.mData.desc = desc;
     }
 
     void ESMWriter::setRecordCount(int count)
@@ -122,7 +122,7 @@ namespace ESM
         mHeader.mMaster.clear();
     }
 
-    void ESMWriter::addMaster(const std::string& name, uint64_t size)
+    void ESMWriter::addMaster(std::string_view name, uint64_t size)
     {
         Header::MasterData d;
         d.name = name;
@@ -208,14 +208,14 @@ namespace ESM
         endRecord(NAME(name));
     }
 
-    void ESMWriter::writeHNString(NAME name, const std::string& data)
+    void ESMWriter::writeHNString(NAME name, std::string_view data)
     {
         startSubRecord(name);
         writeHString(data);
         endRecord(name);
     }
 
-    void ESMWriter::writeHNString(NAME name, const std::string& data, size_t size)
+    void ESMWriter::writeHNString(NAME name, std::string_view data, size_t size)
     {
         assert(data.size() <= size);
         startSubRecord(name);
@@ -278,9 +278,9 @@ namespace ESM
         write(string.c_str(), string.size());
     }
 
-    void ESMWriter::writeHString(const std::string& data)
+    void ESMWriter::writeHString(std::string_view data)
     {
-        if (data.size() == 0)
+        if (data.empty())
             write("\0", 1);
         else
         {
@@ -291,7 +291,7 @@ namespace ESM
         }
     }
 
-    void ESMWriter::writeHCString(const std::string& data)
+    void ESMWriter::writeHCString(std::string_view data)
     {
         writeHString(data);
         if (data.size() > 0 && data[data.size() - 1] != '\0')
diff --git a/components/esm3/esmwriter.hpp b/components/esm3/esmwriter.hpp
index 5086005b1f..96445bcdae 100644
--- a/components/esm3/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -5,6 +5,7 @@
 #include <list>
 #include <type_traits>
 
+#include "components/esm/decompose.hpp"
 #include "components/esm/esmcommon.hpp"
 #include "components/esm/refid.hpp"
 
@@ -37,8 +38,8 @@ namespace ESM
         void setVersion(unsigned int ver = 0x3fa66666);
         void setType(int type);
         void setEncoder(ToUTF8::Utf8Encoder* encoding);
-        void setAuthor(const std::string& author);
-        void setDescription(const std::string& desc);
+        void setAuthor(std::string_view author);
+        void setDescription(std::string_view desc);
         void setHeader(const Header& value) { mHeader = value; }
 
         // Set the record count for writing it in the file header
@@ -53,7 +54,7 @@ namespace ESM
 
         void clearMaster();
 
-        void addMaster(const std::string& name, uint64_t size);
+        void addMaster(std::string_view name, uint64_t size);
 
         void save(std::ostream& file);
         ///< Start saving a file by writing the TES3 header.
@@ -61,20 +62,20 @@ namespace ESM
         void close();
         ///< \note Does not close the stream.
 
-        void writeHNString(NAME name, const std::string& data);
-        void writeHNString(NAME name, const std::string& data, size_t size);
-        void writeHNCString(NAME name, const std::string& data)
+        void writeHNString(NAME name, std::string_view data);
+        void writeHNString(NAME name, std::string_view data, size_t size);
+        void writeHNCString(NAME name, std::string_view data)
         {
             startSubRecord(name);
             writeHCString(data);
             endRecord(name);
         }
-        void writeHNOString(NAME name, const std::string& data)
+        void writeHNOString(NAME name, std::string_view data)
         {
             if (!data.empty())
                 writeHNString(name, data);
         }
-        void writeHNOCString(NAME name, const std::string& data)
+        void writeHNOCString(NAME name, std::string_view data)
         {
             if (!data.empty())
                 writeHNCString(name, data);
@@ -121,10 +122,25 @@ namespace ESM
             endRecord(name);
         }
 
+        void writeNamedComposite(NAME name, const auto& value)
+        {
+            decompose(value, [&](const auto&... args) {
+                startSubRecord(name);
+                (writeT(args), ...);
+                endRecord(name);
+            });
+        }
+
+        void writeComposite(const auto& value)
+        {
+            decompose(value, [&](const auto&... args) { (writeT(args), ...); });
+        }
+
         // Prevent using writeHNT with strings. This already happened by accident and results in
         // state being discarded without any error on writing or reading it. :(
         // writeHNString and friends must be used instead.
         void writeHNT(NAME name, const std::string& data) = delete;
+        void writeHNT(NAME name, std::string_view data) = delete;
 
         void writeT(NAME data) = delete;
 
@@ -132,7 +148,7 @@ namespace ESM
         void writeHNT(NAME name, const T (&data)[size], int) = delete;
 
         template <typename T>
-        void writeHNT(NAME name, const T& data, int size)
+        void writeHNT(NAME name, const T& data, std::size_t size)
         {
             startSubRecord(name);
             writeT(data, size);
@@ -166,8 +182,8 @@ namespace ESM
         void endRecord(NAME name);
         void endRecord(uint32_t name);
         void writeMaybeFixedSizeString(const std::string& data, std::size_t size);
-        void writeHString(const std::string& data);
-        void writeHCString(const std::string& data);
+        void writeHString(std::string_view data);
+        void writeHCString(std::string_view data);
 
         void writeMaybeFixedSizeRefId(RefId value, std::size_t size);
 
diff --git a/components/esm3/filter.hpp b/components/esm3/filter.hpp
index c4642285af..6a978a2596 100644
--- a/components/esm3/filter.hpp
+++ b/components/esm3/filter.hpp
@@ -17,7 +17,7 @@ namespace ESM
 
         static constexpr std::string_view getRecordType() { return "Filter"; }
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
 
         std::string mDescription;
diff --git a/components/esm3/fogstate.cpp b/components/esm3/fogstate.cpp
index 3ee4600c90..194e4ae745 100644
--- a/components/esm3/fogstate.cpp
+++ b/components/esm3/fogstate.cpp
@@ -61,6 +61,11 @@ namespace ESM
         if (esm.isNextSub("BOUN"))
             esm.getHT(mBounds.mMinX, mBounds.mMinY, mBounds.mMaxX, mBounds.mMaxY);
         esm.getHNOT(mNorthMarkerAngle, "ANGL");
+        if (!esm.getHNOT("CNTR", mCenterX, mCenterY))
+        {
+            mCenterX = (mBounds.mMinX + mBounds.mMaxX) / 2;
+            mCenterY = (mBounds.mMinY + mBounds.mMaxY) / 2;
+        }
         const FormatVersion dataFormat = esm.getFormatVersion();
         while (esm.isNextSub("FTEX"))
         {
@@ -74,7 +79,7 @@ namespace ESM
             tex.mImageData.resize(imageSize);
             esm.getExact(tex.mImageData.data(), imageSize);
 
-            if (dataFormat <= MaxOldForOfWarFormatVersion)
+            if (dataFormat <= MaxOldFogOfWarFormatVersion)
                 convertFogOfWar(tex.mImageData);
 
             mFogTextures.push_back(tex);
@@ -87,13 +92,17 @@ namespace ESM
         {
             esm.writeHNT("BOUN", mBounds);
             esm.writeHNT("ANGL", mNorthMarkerAngle);
+            esm.startSubRecord("CNTR");
+            esm.writeT(mCenterX);
+            esm.writeT(mCenterY);
+            esm.endRecord("CNTR");
         }
-        for (std::vector<FogTexture>::const_iterator it = mFogTextures.begin(); it != mFogTextures.end(); ++it)
+        for (const FogTexture& texture : mFogTextures)
         {
             esm.startSubRecord("FTEX");
-            esm.writeT(it->mX);
-            esm.writeT(it->mY);
-            esm.write(it->mImageData.data(), it->mImageData.size());
+            esm.writeT(texture.mX);
+            esm.writeT(texture.mY);
+            esm.write(texture.mImageData.data(), texture.mImageData.size());
             esm.endRecord("FTEX");
         }
     }
diff --git a/components/esm3/fogstate.hpp b/components/esm3/fogstate.hpp
index 7348f3cb01..dd6c95fe1f 100644
--- a/components/esm3/fogstate.hpp
+++ b/components/esm3/fogstate.hpp
@@ -28,6 +28,8 @@ namespace ESM
             float mMaxX;
             float mMaxY;
         } mBounds;
+        float mCenterX;
+        float mCenterY;
 
         std::vector<FogTexture> mFogTextures;
 
diff --git a/components/esm3/formatversion.hpp b/components/esm3/formatversion.hpp
index 644298b00d..32e245d7d1 100644
--- a/components/esm3/formatversion.hpp
+++ b/components/esm3/formatversion.hpp
@@ -9,12 +9,12 @@ namespace ESM
 
     inline constexpr FormatVersion DefaultFormatVersion = 0;
     inline constexpr FormatVersion CurrentContentFormatVersion = 1;
-    inline constexpr FormatVersion MaxOldWeatherFormatVersion = 1;
-    inline constexpr FormatVersion MaxOldDeathAnimationFormatVersion = 2;
-    inline constexpr FormatVersion MaxOldForOfWarFormatVersion = 6;
-    inline constexpr FormatVersion MaxWerewolfDeprecatedDataFormatVersion = 7;
+    inline constexpr FormatVersion MaxOldGoldValueFormatVersion = 5;
+    inline constexpr FormatVersion MaxOldFogOfWarFormatVersion = 6;
+    inline constexpr FormatVersion MaxUnoptimizedCharacterDataFormatVersion = 7;
     inline constexpr FormatVersion MaxOldTimeLeftFormatVersion = 8;
     inline constexpr FormatVersion MaxIntFallbackFormatVersion = 10;
+    inline constexpr FormatVersion MaxOldRestockingFormatVersion = 14;
     inline constexpr FormatVersion MaxClearModifiersFormatVersion = 16;
     inline constexpr FormatVersion MaxOldAiPackageFormatVersion = 17;
     inline constexpr FormatVersion MaxOldSkillsAndAttributesFormatVersion = 18;
@@ -25,7 +25,14 @@ namespace ESM
     inline constexpr FormatVersion MaxNameIsRefIdOnlyFormatVersion = 25;
     inline constexpr FormatVersion MaxUseEsmCellIdFormatVersion = 26;
     inline constexpr FormatVersion MaxActiveSpellSlotIndexFormatVersion = 27;
-    inline constexpr FormatVersion CurrentSaveGameFormatVersion = 28;
+    inline constexpr FormatVersion MaxOldCountFormatVersion = 30;
+    inline constexpr FormatVersion MaxActiveSpellTypeVersion = 31;
+    inline constexpr FormatVersion MaxPlayerBeforeCellDataFormatVersion = 32;
+    inline constexpr FormatVersion CurrentSaveGameFormatVersion = 34;
+
+    inline constexpr FormatVersion MinSupportedSaveGameFormatVersion = 5;
+    inline constexpr FormatVersion OpenMW0_48SaveGameFormatVersion = 21;
+    inline constexpr FormatVersion OpenMW0_49SaveGameFormatVersion = CurrentSaveGameFormatVersion;
 }
 
 #endif
diff --git a/components/esm3/inventorystate.cpp b/components/esm3/inventorystate.cpp
index e58d0335bf..f3dce52f29 100644
--- a/components/esm3/inventorystate.cpp
+++ b/components/esm3/inventorystate.cpp
@@ -7,40 +7,32 @@
 
 namespace ESM
 {
+    namespace
+    {
+        constexpr uint32_t sInvalidSlot = static_cast<uint32_t>(-1);
+    }
 
     void InventoryState::load(ESMReader& esm)
     {
         // obsolete
-        int index = 0;
         while (esm.isNextSub("IOBJ"))
         {
-            int unused; // no longer used
-            esm.getHT(unused);
+            esm.skipHT<int32_t>();
 
             ObjectState state;
 
-            // obsolete
-            if (esm.isNextSub("SLOT"))
-            {
-                int slot;
-                esm.getHT(slot);
-                mEquipmentSlots[index] = slot;
-            }
-
             state.mRef.loadId(esm, true);
             state.load(esm);
 
-            if (state.mCount == 0)
+            if (state.mRef.mCount == 0)
                 continue;
 
             mItems.push_back(state);
-
-            ++index;
         }
 
-        int itemsCount = 0;
+        uint32_t itemsCount = 0;
         esm.getHNOT(itemsCount, "ICNT");
-        for (int i = 0; i < itemsCount; i++)
+        for (; itemsCount > 0; --itemsCount)
         {
             ObjectState state;
 
@@ -51,26 +43,23 @@ namespace ESM
             if (!esm.applyContentFileMapping(state.mRef.mRefNum))
                 state.mRef.mRefNum = FormId(); // content file removed; unset refnum, but keep object.
 
-            if (state.mCount == 0)
+            if (state.mRef.mCount == 0)
                 continue;
 
             mItems.push_back(state);
         }
 
+        std::map<std::pair<ESM::RefId, std::string>, int32_t> levelledItemMap;
         // Next item is Levelled item
         while (esm.isNextSub("LEVM"))
         {
             // Get its name
             ESM::RefId id = esm.getRefId();
-            int count;
-            std::string parentGroup;
+            int32_t count;
             // Then get its count
             esm.getHNT(count, "COUN");
-            // Old save formats don't have information about parent group; check for that
-            if (esm.isNextSub("LGRP"))
-                // Newest saves contain parent group
-                parentGroup = esm.getHString();
-            mLevelledItemMap[std::make_pair(id, parentGroup)] = count;
+            std::string parentGroup = esm.getHNString("LGRP");
+            levelledItemMap[std::make_pair(id, parentGroup)] = count;
         }
 
         while (esm.isNextSub("MAGI"))
@@ -85,15 +74,15 @@ namespace ESM
                 esm.getHNT(multiplier, "MULT");
                 params.emplace_back(rand, multiplier);
             }
-            mPermanentMagicEffectMagnitudes[id] = params;
+            mPermanentMagicEffectMagnitudes[id] = std::move(params);
         }
 
         while (esm.isNextSub("EQUI"))
         {
             esm.getSubHeader();
-            int equipIndex;
+            int32_t equipIndex;
             esm.getT(equipIndex);
-            int slot;
+            int32_t slot;
             esm.getT(slot);
             mEquipmentSlots[equipIndex] = slot;
         }
@@ -101,38 +90,42 @@ namespace ESM
         if (esm.isNextSub("EQIP"))
         {
             esm.getSubHeader();
-            int slotsCount = 0;
+            uint32_t slotsCount = 0;
             esm.getT(slotsCount);
-            for (int i = 0; i < slotsCount; i++)
+            for (; slotsCount > 0; --slotsCount)
             {
-                int equipIndex;
+                int32_t equipIndex;
                 esm.getT(equipIndex);
-                int slot;
+                int32_t slot;
                 esm.getT(slot);
                 mEquipmentSlots[equipIndex] = slot;
             }
         }
 
-        mSelectedEnchantItem = -1;
-        esm.getHNOT(mSelectedEnchantItem, "SELE");
+        uint32_t selectedEnchantItem = sInvalidSlot;
+        esm.getHNOT(selectedEnchantItem, "SELE");
+        if (selectedEnchantItem == sInvalidSlot)
+            mSelectedEnchantItem.reset();
+        else
+            mSelectedEnchantItem = selectedEnchantItem;
 
         // Old saves had restocking levelled items in a special map
         // This turns items from that map into negative quantities
-        for (const auto& entry : mLevelledItemMap)
+        for (const auto& entry : levelledItemMap)
         {
             const ESM::RefId& id = entry.first.first;
             const int count = entry.second;
             for (auto& item : mItems)
             {
-                if (item.mCount == count && id == item.mRef.mRefID)
-                    item.mCount = -count;
+                if (item.mRef.mCount == count && id == item.mRef.mRefID)
+                    item.mRef.mCount = -count;
             }
         }
     }
 
     void InventoryState::save(ESMWriter& esm) const
     {
-        int itemsCount = static_cast<int>(mItems.size());
+        uint32_t itemsCount = static_cast<uint32_t>(mItems.size());
         if (itemsCount > 0)
         {
             esm.writeHNT("ICNT", itemsCount);
@@ -142,41 +135,32 @@ namespace ESM
             }
         }
 
-        for (auto it = mLevelledItemMap.begin(); it != mLevelledItemMap.end(); ++it)
+        for (const auto& [id, params] : mPermanentMagicEffectMagnitudes)
         {
-            esm.writeHNRefId("LEVM", it->first.first);
-            esm.writeHNT("COUN", it->second);
-            esm.writeHNString("LGRP", it->first.second);
-        }
+            esm.writeHNRefId("MAGI", id);
 
-        for (TEffectMagnitudes::const_iterator it = mPermanentMagicEffectMagnitudes.begin();
-             it != mPermanentMagicEffectMagnitudes.end(); ++it)
-        {
-            esm.writeHNRefId("MAGI", it->first);
-
-            const std::vector<std::pair<float, float>>& params = it->second;
-            for (std::vector<std::pair<float, float>>::const_iterator pIt = params.begin(); pIt != params.end(); ++pIt)
+            for (const auto& [rand, mult] : params)
             {
-                esm.writeHNT("RAND", pIt->first);
-                esm.writeHNT("MULT", pIt->second);
+                esm.writeHNT("RAND", rand);
+                esm.writeHNT("MULT", mult);
             }
         }
 
-        int slotsCount = static_cast<int>(mEquipmentSlots.size());
+        uint32_t slotsCount = static_cast<uint32_t>(mEquipmentSlots.size());
         if (slotsCount > 0)
         {
             esm.startSubRecord("EQIP");
             esm.writeT(slotsCount);
-            for (std::map<int, int>::const_iterator it = mEquipmentSlots.begin(); it != mEquipmentSlots.end(); ++it)
+            for (const auto& [index, slot] : mEquipmentSlots)
             {
-                esm.writeT(it->first);
-                esm.writeT(it->second);
+                esm.writeT(index);
+                esm.writeT(slot);
             }
             esm.endRecord("EQIP");
         }
 
-        if (mSelectedEnchantItem != -1)
-            esm.writeHNT("SELE", mSelectedEnchantItem);
+        if (mSelectedEnchantItem)
+            esm.writeHNT("SELE", *mSelectedEnchantItem);
     }
 
 }
diff --git a/components/esm3/inventorystate.hpp b/components/esm3/inventorystate.hpp
index a0fd948951..814236ce46 100644
--- a/components/esm3/inventorystate.hpp
+++ b/components/esm3/inventorystate.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESM_INVENTORYSTATE_H
 
 #include <map>
+#include <optional>
 
 #include "objectstate.hpp"
 #include <components/esm/refid.hpp>
@@ -19,20 +20,13 @@ namespace ESM
         std::vector<ObjectState> mItems;
 
         // <Index in mItems, equipment slot>
-        std::map<int, int> mEquipmentSlots;
+        std::map<uint32_t, int32_t> mEquipmentSlots;
 
-        std::map<std::pair<ESM::RefId, std::string>, int> mLevelledItemMap;
+        std::map<ESM::RefId, std::vector<std::pair<float, float>>> mPermanentMagicEffectMagnitudes;
 
-        typedef std::map<ESM::RefId, std::vector<std::pair<float, float>>> TEffectMagnitudes;
-        TEffectMagnitudes mPermanentMagicEffectMagnitudes;
+        std::optional<uint32_t> mSelectedEnchantItem; // For inventories only
 
-        int mSelectedEnchantItem; // For inventories only
-
-        InventoryState()
-            : mSelectedEnchantItem(-1)
-        {
-        }
-        virtual ~InventoryState() {}
+        virtual ~InventoryState() = default;
 
         virtual void load(ESMReader& esm);
         virtual void save(ESMWriter& esm) const;
diff --git a/components/esm3/landrecorddata.hpp b/components/esm3/landrecorddata.hpp
index e7db0d9f3a..14acd4a543 100644
--- a/components/esm3/landrecorddata.hpp
+++ b/components/esm3/landrecorddata.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_COMPONENTS_ESM3_LANDRECORDDATA_H
 #define OPENMW_COMPONENTS_ESM3_LANDRECORDDATA_H
 
+#include <array>
 #include <cstdint>
 
 namespace ESM
@@ -19,27 +20,21 @@ namespace ESM
         // total number of textures per land
         static constexpr unsigned sLandNumTextures = sLandTextureSize * sLandTextureSize;
 
-        // Initial reference height for the first vertex, only needed for filling mHeights
-        float mHeightOffset = 0;
         // Height in world space for each vertex
-        float mHeights[sLandNumVerts];
+        std::array<float, sLandNumVerts> mHeights;
         float mMinHeight = 0;
         float mMaxHeight = 0;
 
         // 24-bit normals, these aren't always correct though. Edge and corner normals may be garbage.
-        std::int8_t mNormals[sLandNumVerts * 3];
+        std::array<std::int8_t, 3 * sLandNumVerts> mNormals;
 
         // 2D array of texture indices. An index can be used to look up an LandTexture,
         // but to do so you must subtract 1 from the index first!
         // An index of 0 indicates the default texture.
-        std::uint16_t mTextures[sLandNumTextures];
+        std::array<std::uint16_t, sLandNumTextures> mTextures;
 
         // 24-bit RGB color for each vertex
-        std::uint8_t mColours[3 * sLandNumVerts];
-
-        // ???
-        std::uint16_t mUnk1 = 0;
-        std::uint8_t mUnk2 = 0;
+        std::array<std::uint8_t, 3 * sLandNumVerts> mColours;
 
         int mDataLoaded = 0;
     };
diff --git a/components/esm3/loadalch.cpp b/components/esm3/loadalch.cpp
index 2b01dd9b09..4e6c2ad1e2 100644
--- a/components/esm3/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Potion::ALDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mFlags);
+    }
+
     void Potion::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -36,7 +44,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("ALDT"):
-                    esm.getHT(mData.mWeight, mData.mValue, mData.mAutoCalc);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("ENAM"):
@@ -71,7 +79,7 @@ namespace ESM
         esm.writeHNOCString("TEXT", mIcon);
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("ALDT", mData, 12);
+        esm.writeNamedComposite("ALDT", mData);
         mEffects.save(esm);
     }
 
@@ -80,7 +88,7 @@ namespace ESM
         mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
-        mData.mAutoCalc = 0;
+        mData.mFlags = 0;
         mName.clear();
         mModel.clear();
         mIcon.clear();
diff --git a/components/esm3/loadalch.hpp b/components/esm3/loadalch.hpp
index ddecd7e3c7..814d21937b 100644
--- a/components/esm3/loadalch.hpp
+++ b/components/esm3/loadalch.hpp
@@ -25,11 +25,16 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "Potion"; }
 
+        enum Flags
+        {
+            Autocalc = 1 // Determines value
+        };
+
         struct ALDTstruct
         {
             float mWeight;
             int32_t mValue;
-            int32_t mAutoCalc;
+            int32_t mFlags;
         };
         ALDTstruct mData;
 
diff --git a/components/esm3/loadappa.cpp b/components/esm3/loadappa.cpp
index ecc00222b8..40d9fc3f72 100644
--- a/components/esm3/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Apparatus::AADTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mType, v.mQuality, v.mWeight, v.mValue);
+    }
+
     void Apparatus::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("AADT"):
-                    esm.getHT(mData.mType, mData.mQuality, mData.mWeight, mData.mValue);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -65,7 +73,7 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNCString("FNAM", mName);
-        esm.writeHNT("AADT", mData, 16);
+        esm.writeNamedComposite("AADT", mData);
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNCString("ITEX", mIcon);
     }
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index 1832014173..37290ae39a 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -3,8 +3,15 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Armor::AODTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mType, v.mWeight, v.mValue, v.mHealth, v.mEnchant, v.mArmor);
+    }
 
     void PartReferenceList::add(ESMReader& esm)
     {
@@ -59,7 +66,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("AODT"):
-                    esm.getHT(mData.mType, mData.mWeight, mData.mValue, mData.mHealth, mData.mEnchant, mData.mArmor);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -103,7 +110,7 @@ namespace ESM
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
         esm.writeHNOCRefId("SCRI", mScript);
-        esm.writeHNT("AODT", mData, 24);
+        esm.writeNamedComposite("AODT", mData);
         esm.writeHNOCString("ITEX", mIcon);
         mParts.save(esm);
         esm.writeHNOCRefId("ENAM", mEnchant);
diff --git a/components/esm3/loadbody.cpp b/components/esm3/loadbody.cpp
index 066e5ec949..8c944c6da0 100644
--- a/components/esm3/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<BodyPart::BYDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mPart, v.mVampire, v.mFlags, v.mType);
+    }
+
     void BodyPart::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mRace = esm.getRefId();
                     break;
                 case fourCC("BYDT"):
-                    esm.getHT(mData.mPart, mData.mVampire, mData.mFlags, mData.mType);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case SREC_DELE:
@@ -59,7 +67,7 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCRefId("FNAM", mRace);
-        esm.writeHNT("BYDT", mData, 4);
+        esm.writeNamedComposite("BYDT", mData);
     }
 
     void BodyPart::blank()
diff --git a/components/esm3/loadbook.cpp b/components/esm3/loadbook.cpp
index 8083c59828..bece59d31b 100644
--- a/components/esm3/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Book::BKDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mIsScroll, v.mSkillId, v.mEnchant);
+    }
+
     void Book::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("BKDT"):
-                    esm.getHT(mData.mWeight, mData.mValue, mData.mIsScroll, mData.mSkillId, mData.mEnchant);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -70,7 +78,7 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("BKDT", mData, 20);
+        esm.writeNamedComposite("BKDT", mData);
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
         esm.writeHNOString("TEXT", mText);
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index 25a9878658..b1efea1aec 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -5,6 +5,7 @@
 #include <string>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/concepts.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
 #include "esmreader.hpp"
@@ -17,7 +18,7 @@ namespace ESM
         ///< Translate 8bit/24bit code (stored in refNum.mIndex) into a proper refNum
         void adjustRefNum(RefNum& refNum, const ESMReader& reader)
         {
-            unsigned int local = (refNum.mIndex & 0xff000000) >> 24;
+            uint32_t local = (refNum.mIndex & 0xff000000) >> 24;
 
             // If we have an index value that does not make sense, assume that it was an addition
             // by the present plugin (but a faulty one)
@@ -41,6 +42,18 @@ namespace ESM
 {
     const StringRefId Cell::sDefaultWorldspaceId = StringRefId("sys::default");
 
+    template <Misc::SameAsWithoutCvref<Cell::DATAstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mFlags, v.mX, v.mY);
+    }
+
+    template <Misc::SameAsWithoutCvref<Cell::AMBIstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mAmbient, v.mSunlight, v.mFog, v.mFogDensity);
+    }
+
     // Some overloaded compare operators.
     bool operator==(const MovedCellRef& ref, const RefNum& refNum)
     {
@@ -93,7 +106,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("DATA"):
-                    esm.getHTSized<12>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case SREC_DELE:
@@ -118,21 +131,22 @@ namespace ESM
         bool overriding = !mName.empty();
         bool isLoaded = false;
         mHasAmbi = false;
+        mHasWaterHeightSub = false;
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
                 case fourCC("INTV"):
-                    int waterl;
+                    int32_t waterl;
                     esm.getHT(waterl);
+                    mHasWaterHeightSub = true;
                     mWater = static_cast<float>(waterl);
-                    mWaterInt = true;
                     break;
                 case fourCC("WHGT"):
                     float waterLevel;
                     esm.getHT(waterLevel);
-                    mWaterInt = false;
+                    mHasWaterHeightSub = true;
                     if (!std::isfinite(waterLevel))
                     {
                         if (!overriding)
@@ -144,7 +158,7 @@ namespace ESM
                         mWater = waterLevel;
                     break;
                 case fourCC("AMBI"):
-                    esm.getHTSized<16>(mAmbi);
+                    esm.getSubComposite(mAmbi);
                     mHasAmbi = true;
                     break;
                 case fourCC("RGNN"):
@@ -180,7 +194,7 @@ namespace ESM
     void Cell::save(ESMWriter& esm, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mName);
-        esm.writeHNT("DATA", mData, 12);
+        esm.writeNamedComposite("DATA", mData);
 
         if (isDeleted)
         {
@@ -190,25 +204,15 @@ namespace ESM
 
         if (mData.mFlags & Interior)
         {
-            if (mWaterInt)
-            {
-                int water = (mWater >= 0) ? (int)(mWater + 0.5) : (int)(mWater - 0.5);
-                esm.writeHNT("INTV", water);
-            }
-            else
-            {
+            // Try to avoid saving ambient information when it's unnecessary.
+            // This is to fix black lighting and flooded water
+            // in resaved cell records that lack this information.
+            if (mHasWaterHeightSub)
                 esm.writeHNT("WHGT", mWater);
-            }
-
             if (mData.mFlags & QuasiEx)
                 esm.writeHNOCRefId("RGNN", mRegion);
-            else
-            {
-                // Try to avoid saving ambient lighting information when it's unnecessary.
-                // This is to fix black lighting in resaved cell records that lack this information.
-                if (mHasAmbi)
-                    esm.writeHNT("AMBI", mAmbi, 16);
-            }
+            else if (mHasAmbi)
+                esm.writeNamedComposite("AMBI", mAmbi);
         }
         else
         {
@@ -218,13 +222,13 @@ namespace ESM
         }
     }
 
-    void Cell::saveTempMarker(ESMWriter& esm, int tempCount) const
+    void Cell::saveTempMarker(ESMWriter& esm, int32_t tempCount) const
     {
         if (tempCount != 0)
             esm.writeHNT("NAM0", tempCount);
     }
 
-    void Cell::restore(ESMReader& esm, int iCtx) const
+    void Cell::restore(ESMReader& esm, size_t iCtx) const
     {
         esm.restoreContext(mContextList.at(iCtx));
     }
@@ -321,10 +325,9 @@ namespace ESM
 
     void Cell::blank()
     {
-        mName = "";
+        mName.clear();
         mRegion = ESM::RefId();
         mWater = 0;
-        mWaterInt = false;
         mMapColor = 0;
         mRefNumCounter = 0;
 
@@ -333,6 +336,7 @@ namespace ESM
         mData.mY = 0;
 
         mHasAmbi = true;
+        mHasWaterHeightSub = true;
         mAmbi.mAmbient = 0;
         mAmbi.mSunlight = 0;
         mAmbi.mFog = 0;
diff --git a/components/esm3/loadcell.hpp b/components/esm3/loadcell.hpp
index b7cf6bf2eb..3f16bcca31 100644
--- a/components/esm3/loadcell.hpp
+++ b/components/esm3/loadcell.hpp
@@ -34,7 +34,7 @@ namespace ESM
         RefNum mRefNum;
 
         // Coordinates of target exterior cell
-        int mTarget[2];
+        int32_t mTarget[2];
 
         // The content file format does not support moving objects to an interior cell.
         // The save game format does support moving to interior cells, but uses a different mechanism
@@ -96,8 +96,8 @@ namespace ESM
 
         struct DATAstruct
         {
-            int mFlags{ 0 };
-            int mX{ 0 }, mY{ 0 };
+            int32_t mFlags{ 0 };
+            int32_t mX{ 0 }, mY{ 0 };
         };
 
         struct AMBIstruct
@@ -111,7 +111,7 @@ namespace ESM
             , mRegion(ESM::RefId())
             , mHasAmbi(true)
             , mWater(0)
-            , mWaterInt(false)
+            , mHasWaterHeightSub(false)
             , mMapColor(0)
             , mRefNumCounter(0)
         {
@@ -131,12 +131,12 @@ namespace ESM
         bool mHasAmbi;
 
         float mWater; // Water level
-        bool mWaterInt;
-        int mMapColor;
+        bool mHasWaterHeightSub;
+        int32_t mMapColor;
         // Counter for RefNums. This is only used during content file editing and has no impact on gameplay.
         // It prevents overwriting previous refNums, even if they were deleted.
         // as that would collide with refs when a content file is upgraded.
-        int mRefNumCounter;
+        int32_t mRefNumCounter;
 
         // References "leased" from another cell (i.e. a different cell
         //  introduced this ref, and it has been moved here by a plugin)
@@ -153,16 +153,18 @@ namespace ESM
             ESMReader& esm, bool saveContext = true); // Load everything, except NAME, DATAstruct and references
 
         void save(ESMWriter& esm, bool isDeleted = false) const;
-        void saveTempMarker(ESMWriter& esm, int tempCount) const;
+        void saveTempMarker(ESMWriter& esm, int32_t tempCount) const;
 
         bool isExterior() const { return !(mData.mFlags & Interior); }
 
-        int getGridX() const { return mData.mX; }
+        int32_t getGridX() const { return mData.mX; }
 
-        int getGridY() const { return mData.mY; }
+        int32_t getGridY() const { return mData.mY; }
 
         bool hasWater() const { return ((mData.mFlags & HasWater) != 0) || isExterior(); }
 
+        void setHasWaterHeightSub(bool hasWater) { mHasWaterHeightSub = hasWater; }
+
         bool hasAmbient() const { return mHasAmbi; }
 
         void setHasAmbient(bool hasAmbi) { mHasAmbi = hasAmbi; }
@@ -172,7 +174,7 @@ namespace ESM
         // somewhere other than the file system, you need to pre-open the
         // ESMReader, and the filename must match the stored filename
         // exactly.
-        void restore(ESMReader& esm, int iCtx) const;
+        void restore(ESMReader& esm, size_t iCtx) const;
 
         std::string getDescription() const;
         ///< Return a short string describing the cell (mostly used for debugging/logging purpose)
diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp
index 0c58f1d45a..1fd22e2a49 100644
--- a/components/esm3/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -2,7 +2,9 @@
 
 #include <stdexcept>
 
-#include "components/esm/defs.hpp"
+#include <components/esm/defs.hpp>
+#include <components/misc/concepts.hpp>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
@@ -10,6 +12,13 @@ namespace ESM
 {
     const std::string_view Class::sGmstSpecializationIds[3]
         = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
+    const std::array<std::string_view, 3> Class::specializationIndexToLuaId = { "combat", "magic", "stealth" };
+
+    template <Misc::SameAsWithoutCvref<Class::CLDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mAttribute, v.mSpecialization, v.mSkills, v.mIsPlayable, v.mServices);
+    }
 
     int32_t& Class::CLDTstruct::getSkill(int index, bool major)
     {
@@ -41,8 +50,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("CLDT"):
-                    esm.getHT(
-                        mData.mAttribute, mData.mSpecialization, mData.mSkills, mData.mIsPlayable, mData.mServices);
+                    esm.getSubComposite(mData);
                     if (mData.mIsPlayable > 1)
                         esm.fail("Unknown bool value");
                     hasData = true;
@@ -76,7 +84,7 @@ namespace ESM
         }
 
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("CLDT", mData, 60);
+        esm.writeNamedComposite("CLDT", mData);
         esm.writeHNOString("DESC", mDescription);
     }
 
diff --git a/components/esm3/loadclas.hpp b/components/esm3/loadclas.hpp
index 47b8b73b7e..a804a8da8e 100644
--- a/components/esm3/loadclas.hpp
+++ b/components/esm3/loadclas.hpp
@@ -32,6 +32,7 @@ namespace ESM
         };
 
         static const std::string_view sGmstSpecializationIds[3];
+        static const std::array<std::string_view, 3> specializationIndexToLuaId;
 
         struct CLDTstruct
         {
diff --git a/components/esm3/loadclot.cpp b/components/esm3/loadclot.cpp
index 7d60c82197..8e778243fc 100644
--- a/components/esm3/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Clothing::CTDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mType, v.mWeight, v.mValue, v.mEnchant);
+    }
+
     void Clothing::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -30,7 +38,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("CTDT"):
-                    esm.getHT(mData.mType, mData.mWeight, mData.mValue, mData.mEnchant);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -73,7 +81,7 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("CTDT", mData, 12);
+        esm.writeNamedComposite("CTDT", mData);
 
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
diff --git a/components/esm3/loadcont.cpp b/components/esm3/loadcont.cpp
index d016654fea..9d90491448 100644
--- a/components/esm3/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -100,8 +100,8 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("CNDT", mWeight, 4);
-        esm.writeHNT("FLAG", mFlags, 4);
+        esm.writeHNT("CNDT", mWeight);
+        esm.writeHNT("FLAG", mFlags);
 
         esm.writeHNOCRefId("SCRI", mScript);
 
diff --git a/components/esm3/loadcont.hpp b/components/esm3/loadcont.hpp
index 3921821da0..3c1fb6468e 100644
--- a/components/esm3/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -19,7 +19,7 @@ namespace ESM
 
     struct ContItem
     {
-        int mCount{ 0 };
+        int32_t mCount{ 0 };
         ESM::RefId mItem;
     };
 
@@ -48,12 +48,12 @@ namespace ESM
             Unknown = 8
         };
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mScript;
         std::string mName, mModel;
 
         float mWeight; // Not sure, might be max total weight allowed?
-        int mFlags;
+        int32_t mFlags;
         InventoryList mInventory;
 
         void load(ESMReader& esm, bool& isDeleted);
diff --git a/components/esm3/loadcrea.cpp b/components/esm3/loadcrea.cpp
index 27cc98c1f2..83bdbd06ad 100644
--- a/components/esm3/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -1,12 +1,19 @@
 #include "loadcrea.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/concepts.hpp>
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Creature::NPDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mType, v.mLevel, v.mAttributes, v.mHealth, v.mMana, v.mFatigue, v.mSoul, v.mCombat, v.mMagic, v.mStealth,
+            v.mAttack, v.mGold);
+    }
 
     void Creature::load(ESMReader& esm, bool& isDeleted)
     {
@@ -48,7 +55,7 @@ namespace ESM
                     mScript = esm.getRefId();
                     break;
                 case fourCC("NPDT"):
-                    esm.getHTSized<96>(mData);
+                    esm.getSubComposite(mData);
                     hasNpdt = true;
                     break;
                 case fourCC("FLAG"):
@@ -68,7 +75,7 @@ namespace ESM
                     mSpells.add(esm);
                     break;
                 case fourCC("AIDT"):
-                    esm.getHExact(&mAiData, sizeof(mAiData));
+                    esm.getSubComposite(mAiData);
                     break;
                 case fourCC("DODT"):
                 case fourCC("DNAM"):
@@ -120,7 +127,7 @@ namespace ESM
         esm.writeHNOCRefId("CNAM", mOriginal);
         esm.writeHNOCString("FNAM", mName);
         esm.writeHNOCRefId("SCRI", mScript);
-        esm.writeHNT("NPDT", mData, 96);
+        esm.writeNamedComposite("NPDT", mData);
         esm.writeHNT("FLAG", ((mBloodType << 10) + mFlags));
         if (mScale != 1.0)
         {
@@ -129,7 +136,7 @@ namespace ESM
 
         mInventory.save(esm);
         mSpells.save(esm);
-        esm.writeHNT("AIDT", mAiData, sizeof(mAiData));
+        esm.writeNamedComposite("AIDT", mAiData);
         mTransport.save(esm);
         mAiPackage.save(esm);
     }
@@ -139,8 +146,7 @@ namespace ESM
         mRecordFlags = 0;
         mData.mType = 0;
         mData.mLevel = 0;
-        mData.mStrength = mData.mIntelligence = mData.mWillpower = mData.mAgility = mData.mSpeed = mData.mEndurance
-            = mData.mPersonality = mData.mLuck = 0;
+        mData.mAttributes.fill(0);
         mData.mHealth = mData.mMana = mData.mFatigue = 0;
         mData.mSoul = 0;
         mData.mCombat = mData.mMagic = mData.mStealth = 0;
diff --git a/components/esm3/loadcrea.hpp b/components/esm3/loadcrea.hpp
index 42e5007328..ff4e698fa8 100644
--- a/components/esm3/loadcrea.hpp
+++ b/components/esm3/loadcrea.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESM_CREA_H
 #define OPENMW_ESM_CREA_H
 
+#include <array>
 #include <string>
 
 #include "aipackage.hpp"
@@ -8,6 +9,7 @@
 #include "spelllist.hpp"
 #include "transport.hpp"
 
+#include "components/esm/attr.hpp"
 #include "components/esm/defs.hpp"
 #include "components/esm/refid.hpp"
 
@@ -52,30 +54,30 @@ namespace ESM
 
         struct NPDTstruct
         {
-            int mType;
+            int32_t mType;
             // For creatures we obviously have to use ints, not shorts and
             // bytes like we use for NPCs.... this file format just makes so
             // much sense! (Still, _much_ easier to decode than the NIFs.)
-            int mLevel;
-            int mStrength, mIntelligence, mWillpower, mAgility, mSpeed, mEndurance, mPersonality, mLuck;
+            int32_t mLevel;
+            std::array<int32_t, Attribute::Length> mAttributes;
 
-            int mHealth, mMana, mFatigue; // Stats
-            int mSoul; // The creatures soul value (used with soul gems.)
+            int32_t mHealth, mMana, mFatigue; // Stats
+            int32_t mSoul; // The creatures soul value (used with soul gems.)
             // Creatures have generalized combat, magic and stealth stats which substitute for
             // the specific skills (in the same way as specializations).
-            int mCombat, mMagic, mStealth;
-            int mAttack[6]; // AttackMin1, AttackMax1, ditto2, ditto3
-            int mGold;
+            int32_t mCombat, mMagic, mStealth;
+            int32_t mAttack[6]; // AttackMin1, AttackMax1, ditto2, ditto3
+            int32_t mGold;
         }; // 96 byte
 
         NPDTstruct mData;
 
-        int mBloodType;
+        int32_t mBloodType;
         unsigned char mFlags;
 
         float mScale;
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mScript;
         std::string mModel;
         std::string mName;
diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp
index 788e140573..4b546f0d9c 100644
--- a/components/esm3/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -82,10 +82,10 @@ namespace ESM
             if (mId != mStringId)
                 throw std::runtime_error("Trying to save Dialogue record with name \"" + mStringId
                     + "\" not maching id " + mId.toDebugString());
-            esm.writeHNString("NAME", mStringId);
+            esm.writeHNCString("NAME", mStringId);
         }
         else if (esm.getFormatVersion() <= MaxNameIsRefIdOnlyFormatVersion)
-            esm.writeHNRefId("NAME", mId);
+            esm.writeHNCRefId("NAME", mId);
         else
             esm.writeHNRefId("ID__", mId);
 
diff --git a/components/esm3/loadench.cpp b/components/esm3/loadench.cpp
index 1d19b690f0..9eb4fae301 100644
--- a/components/esm3/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Enchantment::ENDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mType, v.mCost, v.mCharge, v.mFlags);
+    }
+
     void Enchantment::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -23,7 +31,7 @@ namespace ESM
                     hasName = true;
                     break;
                 case fourCC("ENDT"):
-                    esm.getHT(mData.mType, mData.mCost, mData.mCharge, mData.mFlags);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("ENAM"):
@@ -55,7 +63,7 @@ namespace ESM
             return;
         }
 
-        esm.writeHNT("ENDT", mData, 16);
+        esm.writeNamedComposite("ENDT", mData);
         mEffects.save(esm);
     }
 
diff --git a/components/esm3/loadfact.cpp b/components/esm3/loadfact.cpp
index 768de4f513..1dd1fe1a0e 100644
--- a/components/esm3/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -7,26 +7,67 @@
 
 namespace ESM
 {
-    int& Faction::FADTstruct::getSkill(int index, bool)
+    int32_t& Faction::FADTstruct::getSkill(size_t index, bool)
     {
         return mSkills.at(index);
     }
 
-    int Faction::FADTstruct::getSkill(int index, bool) const
+    int32_t Faction::FADTstruct::getSkill(size_t index, bool) const
     {
         return mSkills.at(index);
     }
 
+    void RankData::load(ESMReader& esm)
+    {
+        esm.getT(mAttribute1);
+        esm.getT(mAttribute2);
+        esm.getT(mPrimarySkill);
+        esm.getT(mFavouredSkill);
+        esm.getT(mFactReaction);
+    }
+
+    void RankData::save(ESMWriter& esm) const
+    {
+        esm.writeT(mAttribute1);
+        esm.writeT(mAttribute2);
+        esm.writeT(mPrimarySkill);
+        esm.writeT(mFavouredSkill);
+        esm.writeT(mFactReaction);
+    }
+
+    void Faction::FADTstruct::load(ESMReader& esm)
+    {
+        esm.getSubHeader();
+        esm.getT(mAttribute);
+        for (auto& rank : mRankData)
+            rank.load(esm);
+        esm.getT(mSkills);
+        esm.getT(mIsHidden);
+        if (mIsHidden > 1)
+            esm.fail("Unknown flag!");
+    }
+
+    void Faction::FADTstruct::save(ESMWriter& esm) const
+    {
+        esm.startSubRecord("FADT");
+        esm.writeT(mAttribute);
+        for (const auto& rank : mRankData)
+            rank.save(esm);
+        esm.writeT(mSkills);
+        esm.writeT(mIsHidden);
+        esm.endRecord("FADT");
+    }
+
     void Faction::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
 
         mReactions.clear();
-        for (int i = 0; i < 10; ++i)
-            mRanks[i].clear();
+        for (auto& rank : mRanks)
+            rank.clear();
 
-        int rankCounter = 0;
+        size_t rankCounter = 0;
         bool hasName = false;
         bool hasData = false;
         while (esm.hasMoreSubs())
@@ -42,20 +83,18 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("RNAM"):
-                    if (rankCounter >= 10)
+                    if (rankCounter >= mRanks.size())
                         esm.fail("Rank out of range");
                     mRanks[rankCounter++] = esm.getHString();
                     break;
                 case fourCC("FADT"):
-                    esm.getHTSized<240>(mData);
-                    if (mData.mIsHidden > 1)
-                        esm.fail("Unknown flag!");
+                    mData.load(esm);
                     hasData = true;
                     break;
                 case fourCC("ANAM"):
                 {
                     ESM::RefId faction = esm.getRefId();
-                    int reaction;
+                    int32_t reaction;
                     esm.getHNT(reaction, "INTV");
                     // Prefer the lowest reaction in case a faction is listed multiple times
                     auto it = mReactions.find(faction);
@@ -93,15 +132,15 @@ namespace ESM
 
         esm.writeHNOCString("FNAM", mName);
 
-        for (int i = 0; i < 10; i++)
+        for (const auto& rank : mRanks)
         {
-            if (mRanks[i].empty())
+            if (rank.empty())
                 break;
 
-            esm.writeHNString("RNAM", mRanks[i], 32);
+            esm.writeHNString("RNAM", rank, 32);
         }
 
-        esm.writeHNT("FADT", mData, 240);
+        mData.save(esm);
 
         for (auto it = mReactions.begin(); it != mReactions.end(); ++it)
         {
diff --git a/components/esm3/loadfact.hpp b/components/esm3/loadfact.hpp
index 0ba71dc06f..eef2126514 100644
--- a/components/esm3/loadfact.hpp
+++ b/components/esm3/loadfact.hpp
@@ -21,15 +21,18 @@ namespace ESM
     // Requirements for each rank
     struct RankData
     {
-        int mAttribute1, mAttribute2; // Attribute level
+        int32_t mAttribute1, mAttribute2; // Attribute level
 
         // Skill level (faction skills given in
         // skillID below.) You need one skill at
         // level 'mPrimarySkill' and two skills at level
         // 'mFavouredSkill' to advance to this rank.
-        int mPrimarySkill, mFavouredSkill;
+        int32_t mPrimarySkill, mFavouredSkill;
 
-        int mFactReaction; // Reaction from faction members
+        int32_t mFactReaction; // Reaction from faction members
+
+        void load(ESMReader& esm);
+        void save(ESMWriter& esm) const;
     };
 
     struct Faction
@@ -39,36 +42,39 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "Faction"; }
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         std::string mName;
         RefId mId;
 
         struct FADTstruct
         {
             // Which attributes we like
-            std::array<int, 2> mAttribute;
+            std::array<int32_t, 2> mAttribute;
 
             std::array<RankData, 10> mRankData;
 
-            std::array<int, 7> mSkills; // IDs of skills this faction require
-                                        // Each element will either contain an Skill index, or -1.
+            std::array<int32_t, 7> mSkills; // IDs of skills this faction require
+                                            // Each element will either contain an Skill index, or -1.
 
-            int mIsHidden; // 1 - hidden from player
+            int32_t mIsHidden; // 1 - hidden from player
 
-            int& getSkill(int index, bool ignored = false);
+            int32_t& getSkill(size_t index, bool ignored = false);
             ///< Throws an exception for invalid values of \a index.
 
-            int getSkill(int index, bool ignored = false) const;
+            int32_t getSkill(size_t index, bool ignored = false) const;
             ///< Throws an exception for invalid values of \a index.
+
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
         }; // 240 bytes
 
         FADTstruct mData;
 
         // <Faction ID, Reaction>
-        std::map<ESM::RefId, int> mReactions;
+        std::map<ESM::RefId, int32_t> mReactions;
 
         // Name of faction ranks (may be empty for NPC factions)
-        std::string mRanks[10];
+        std::array<std::string, 10> mRanks;
 
         void load(ESMReader& esm, bool& isDeleted);
         void save(ESMWriter& esm, bool isDeleted = false) const;
diff --git a/components/esm3/loadglob.hpp b/components/esm3/loadglob.hpp
index eed53a5f7b..c78bc83917 100644
--- a/components/esm3/loadglob.hpp
+++ b/components/esm3/loadglob.hpp
@@ -25,7 +25,7 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "Global"; }
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         ESM::RefId mId;
         Variant mValue;
 
diff --git a/components/esm3/loadgmst.hpp b/components/esm3/loadgmst.hpp
index 72d30b9ea9..c827be5b6b 100644
--- a/components/esm3/loadgmst.hpp
+++ b/components/esm3/loadgmst.hpp
@@ -26,7 +26,7 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "GameSetting"; }
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
 
         Variant mValue;
diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp
index 8807f7b03f..8b1147ed45 100644
--- a/components/esm3/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -3,8 +3,17 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<DialInfo::DATAstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        char padding = 0;
+        f(v.mType, v.mDisposition, v.mRank, v.mGender, v.mPCrank, padding);
+    }
+
     void DialInfo::load(ESMReader& esm, bool& isDeleted)
     {
         mId = esm.getHNRefId("INAM");
@@ -23,7 +32,7 @@ namespace ESM
             switch (esm.retSubName().toInt())
             {
                 case fourCC("DATA"):
-                    esm.getHTSized<12>(mData);
+                    esm.getSubComposite(mData);
                     break;
                 case fourCC("ONAM"):
                     mActor = esm.getRefId();
@@ -57,10 +66,9 @@ namespace ESM
                     break;
                 case fourCC("SCVR"):
                 {
-                    SelectStruct ss;
-                    ss.mSelectRule = esm.getHString();
-                    ss.mValue.read(esm, Variant::Format_Info);
-                    mSelects.push_back(ss);
+                    auto filter = DialogueCondition::load(esm, mId);
+                    if (filter)
+                        mSelects.emplace_back(std::move(*filter));
                     break;
                 }
                 case fourCC("BNAM"):
@@ -101,7 +109,7 @@ namespace ESM
             return;
         }
 
-        esm.writeHNT("DATA", mData, 12);
+        esm.writeNamedComposite("DATA", mData);
         esm.writeHNOCRefId("ONAM", mActor);
         esm.writeHNOCRefId("RNAM", mRace);
         esm.writeHNOCRefId("CNAM", mClass);
@@ -111,11 +119,8 @@ namespace ESM
         esm.writeHNOCString("SNAM", mSound);
         esm.writeHNOString("NAME", mResponse);
 
-        for (std::vector<SelectStruct>::const_iterator it = mSelects.begin(); it != mSelects.end(); ++it)
-        {
-            esm.writeHNString("SCVR", it->mSelectRule);
-            it->mValue.write(esm, Variant::Format_Info);
-        }
+        for (const auto& rule : mSelects)
+            rule.save(esm);
 
         esm.writeHNOString("BNAM", mResultScript);
 
diff --git a/components/esm3/loadinfo.hpp b/components/esm3/loadinfo.hpp
index 84db0d4f85..a3fb4abffa 100644
--- a/components/esm3/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -4,8 +4,10 @@
 #include <string>
 #include <vector>
 
-#include "components/esm/defs.hpp"
-#include "components/esm/refid.hpp"
+#include <components/esm/defs.hpp>
+#include <components/esm/refid.hpp>
+
+#include "dialoguecondition.hpp"
 #include "variant.hpp"
 
 namespace ESM
@@ -35,26 +37,18 @@ namespace ESM
 
         struct DATAstruct
         {
-            int mUnknown1 = 0;
+            int32_t mType = 0; // See Dialogue::Type
             union
             {
-                int mDisposition = 0; // Used for dialogue responses
-                int mJournalIndex; // Used for journal entries
+                int32_t mDisposition = 0; // Used for dialogue responses
+                int32_t mJournalIndex; // Used for journal entries
             };
             signed char mRank = -1; // Rank of NPC
             signed char mGender = Gender::NA; // See Gender enum
             signed char mPCrank = -1; // Player rank
-            signed char mUnknown2 = 0;
         }; // 12 bytes
         DATAstruct mData;
 
-        // The rules for whether or not we will select this dialog item.
-        struct SelectStruct
-        {
-            std::string mSelectRule; // This has a complicated format
-            Variant mValue;
-        };
-
         // Journal quest indices (introduced with the quest system in Tribunal)
         enum QuestStatus
         {
@@ -66,7 +60,7 @@ namespace ESM
 
         // Rules for when to include this item in the final list of options
         // visible to the player.
-        std::vector<SelectStruct> mSelects;
+        std::vector<DialogueCondition> mSelects;
 
         // Id of this, previous and next INFO items
         RefId mId, mPrev, mNext;
diff --git a/components/esm3/loadingr.cpp b/components/esm3/loadingr.cpp
index fef7a93feb..6a4753d8e4 100644
--- a/components/esm3/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Ingredient::IRDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mEffectID, v.mSkills, v.mAttributes);
+    }
+
     void Ingredient::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("IRDT"):
-                    esm.getHTSized<56>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -82,7 +90,7 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("IRDT", mData, 56);
+        esm.writeNamedComposite("IRDT", mData);
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
     }
diff --git a/components/esm3/loadingr.hpp b/components/esm3/loadingr.hpp
index 02b237f386..2a8748e067 100644
--- a/components/esm3/loadingr.hpp
+++ b/components/esm3/loadingr.hpp
@@ -26,14 +26,14 @@ namespace ESM
         struct IRDTstruct
         {
             float mWeight;
-            int mValue;
-            int mEffectID[4]; // Effect, -1 means none
-            int mSkills[4]; // SkillEnum related to effect
-            int mAttributes[4]; // Attribute related to effect
+            int32_t mValue;
+            int32_t mEffectID[4]; // Effect, -1 means none
+            int32_t mSkills[4]; // SkillEnum related to effect
+            int32_t mAttributes[4]; // Attribute related to effect
         };
 
         IRDTstruct mData;
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mScript;
         std::string mName, mModel, mIcon;
 
diff --git a/components/esm3/loadland.cpp b/components/esm3/loadland.cpp
index 98e07b530f..7ab14cc304 100644
--- a/components/esm3/loadland.cpp
+++ b/components/esm3/loadland.cpp
@@ -5,7 +5,9 @@
 #include <limits>
 #include <utility>
 
-#include "components/esm/defs.hpp"
+#include <components/esm/defs.hpp>
+#include <components/misc/concepts.hpp>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
@@ -13,27 +15,43 @@ namespace ESM
 {
     namespace
     {
+        struct VHGT
+        {
+            float mHeightOffset;
+            std::int8_t mHeightData[LandRecordData::sLandNumVerts];
+        };
+
+        template <Misc::SameAsWithoutCvref<VHGT> T>
+        void decompose(T&& v, const auto& f)
+        {
+            char padding[3] = { 0, 0, 0 };
+            f(v.mHeightOffset, v.mHeightData, padding);
+        }
+
         void transposeTextureData(const std::uint16_t* in, std::uint16_t* out)
         {
-            int readPos = 0; // bit ugly, but it works
-            for (int y1 = 0; y1 < 4; y1++)
-                for (int x1 = 0; x1 < 4; x1++)
-                    for (int y2 = 0; y2 < 4; y2++)
-                        for (int x2 = 0; x2 < 4; x2++)
+            size_t readPos = 0; // bit ugly, but it works
+            for (size_t y1 = 0; y1 < 4; y1++)
+                for (size_t x1 = 0; x1 < 4; x1++)
+                    for (size_t y2 = 0; y2 < 4; y2++)
+                        for (size_t x2 = 0; x2 < 4; x2++)
                             out[(y1 * 4 + y2) * 16 + (x1 * 4 + x2)] = in[readPos++];
         }
 
         // Loads data and marks it as loaded. Return true if data is actually loaded from reader, false otherwise
         // including the case when data is already loaded.
-        bool condLoad(ESMReader& reader, int flags, int& targetFlags, int dataFlag, void* ptr, unsigned int size)
+        bool condLoad(ESMReader& reader, int dataTypes, int& targetDataTypes, int dataFlag, auto& in)
         {
-            if ((targetFlags & dataFlag) == 0 && (flags & dataFlag) != 0)
+            if ((targetDataTypes & dataFlag) == 0 && (dataTypes & dataFlag) != 0)
             {
-                reader.getHExact(ptr, size);
-                targetFlags |= dataFlag;
+                if constexpr (std::is_same_v<std::remove_cvref_t<decltype(in)>, VHGT>)
+                    reader.getSubComposite(in);
+                else
+                    reader.getHT(in);
+                targetDataTypes |= dataFlag;
                 return true;
             }
-            reader.skipHSubSize(size);
+            reader.skipHSub();
             return false;
         }
     }
@@ -50,11 +68,7 @@ namespace ESM
             switch (esm.retSubName().toInt())
             {
                 case fourCC("INTV"):
-                    esm.getSubHeader();
-                    if (esm.getSubSize() != 8)
-                        esm.fail("Subrecord size is not equal to 8");
-                    esm.getT(mX);
-                    esm.getT(mY);
+                    esm.getHT(mX, mY);
                     hasLocation = true;
                     break;
                 case fourCC("DATA"):
@@ -87,23 +101,28 @@ namespace ESM
             {
                 case fourCC("VNML"):
                     esm.skipHSub();
-                    mDataTypes |= DATA_VNML;
+                    if (mFlags & Flag_HeightsNormals)
+                        mDataTypes |= DATA_VNML;
                     break;
                 case fourCC("VHGT"):
                     esm.skipHSub();
-                    mDataTypes |= DATA_VHGT;
+                    if (mFlags & Flag_HeightsNormals)
+                        mDataTypes |= DATA_VHGT;
                     break;
                 case fourCC("WNAM"):
-                    esm.getHExact(mWnam.data(), mWnam.size());
-                    mDataTypes |= DATA_WNAM;
+                    esm.getHT(mWnam);
+                    if (mFlags & Flag_HeightsNormals)
+                        mDataTypes |= DATA_WNAM;
                     break;
                 case fourCC("VCLR"):
                     esm.skipHSub();
-                    mDataTypes |= DATA_VCLR;
+                    if (mFlags & Flag_Colors)
+                        mDataTypes |= DATA_VCLR;
                     break;
                 case fourCC("VTEX"):
                     esm.skipHSub();
-                    mDataTypes |= DATA_VTEX;
+                    if (mFlags & Flag_Textures)
+                        mDataTypes |= DATA_VTEX;
                     break;
                 default:
                     esm.fail("Unknown subrecord");
@@ -136,24 +155,22 @@ namespace ESM
             if (mDataTypes & Land::DATA_VHGT)
             {
                 VHGT offsets;
-                offsets.mHeightOffset = mLandData->mHeights[0] / HEIGHT_SCALE;
-                offsets.mUnk1 = mLandData->mUnk1;
-                offsets.mUnk2 = mLandData->mUnk2;
+                offsets.mHeightOffset = mLandData->mHeights[0] / sHeightScale;
 
                 float prevY = mLandData->mHeights[0];
-                int number = 0; // avoid multiplication
-                for (int i = 0; i < LAND_SIZE; ++i)
+                size_t number = 0; // avoid multiplication
+                for (unsigned i = 0; i < LandRecordData::sLandSize; ++i)
                 {
-                    float diff = (mLandData->mHeights[number] - prevY) / HEIGHT_SCALE;
+                    float diff = (mLandData->mHeights[number] - prevY) / sHeightScale;
                     offsets.mHeightData[number]
                         = diff >= 0 ? static_cast<std::int8_t>(diff + 0.5) : static_cast<std::int8_t>(diff - 0.5);
 
                     float prevX = prevY = mLandData->mHeights[number];
                     ++number;
 
-                    for (int j = 1; j < LAND_SIZE; ++j)
+                    for (unsigned j = 1; j < LandRecordData::sLandSize; ++j)
                     {
-                        diff = (mLandData->mHeights[number] - prevX) / HEIGHT_SCALE;
+                        diff = (mLandData->mHeights[number] - prevX) / sHeightScale;
                         offsets.mHeightData[number]
                             = diff >= 0 ? static_cast<std::int8_t>(diff + 0.5) : static_cast<std::int8_t>(diff - 0.5);
 
@@ -161,26 +178,13 @@ namespace ESM
                         ++number;
                     }
                 }
-                esm.writeHNT("VHGT", offsets, sizeof(VHGT));
+                esm.writeNamedComposite("VHGT", offsets);
             }
             if (mDataTypes & Land::DATA_WNAM)
             {
                 // Generate WNAM record
-                std::int8_t wnam[LAND_GLOBAL_MAP_LOD_SIZE];
-                constexpr float max = std::numeric_limits<std::int8_t>::max();
-                constexpr float min = std::numeric_limits<std::int8_t>::min();
-                constexpr float vertMult = static_cast<float>(Land::LAND_SIZE - 1) / LAND_GLOBAL_MAP_LOD_SIZE_SQRT;
-                for (int row = 0; row < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++row)
-                {
-                    for (int col = 0; col < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++col)
-                    {
-                        float height = mLandData->mHeights[static_cast<int>(row * vertMult) * Land::LAND_SIZE
-                            + static_cast<int>(col * vertMult)];
-                        height /= height > 0 ? 128.f : 16.f;
-                        height = std::clamp(height, min, max);
-                        wnam[row * LAND_GLOBAL_MAP_LOD_SIZE_SQRT + col] = static_cast<std::int8_t>(height);
-                    }
-                }
+                std::array<std::int8_t, sGlobalMapLodSize> wnam;
+                generateWnam(mLandData->mHeights, wnam);
                 esm.writeHNT("WNAM", wnam);
             }
             if (mDataTypes & Land::DATA_VCLR)
@@ -189,8 +193,8 @@ namespace ESM
             }
             if (mDataTypes & Land::DATA_VTEX)
             {
-                uint16_t vtex[LAND_NUM_TEXTURES];
-                transposeTextureData(mLandData->mTextures, vtex);
+                uint16_t vtex[LandRecordData::sLandNumTextures];
+                transposeTextureData(mLandData->mTextures.data(), vtex);
                 esm.writeHNT("VTEX", vtex);
             }
         }
@@ -200,25 +204,22 @@ namespace ESM
     {
         setPlugin(0);
 
-        std::fill(std::begin(mWnam), std::end(mWnam), 0);
+        mWnam.fill(0);
 
         if (mLandData == nullptr)
             mLandData = std::make_unique<LandData>();
 
-        mLandData->mHeightOffset = 0;
-        std::fill(std::begin(mLandData->mHeights), std::end(mLandData->mHeights), 0);
-        mLandData->mMinHeight = 0;
-        mLandData->mMaxHeight = 0;
-        for (int i = 0; i < LAND_NUM_VERTS; ++i)
+        mLandData->mHeights.fill(DEFAULT_HEIGHT);
+        mLandData->mMinHeight = DEFAULT_HEIGHT;
+        mLandData->mMaxHeight = DEFAULT_HEIGHT;
+        for (size_t i = 0; i < LandRecordData::sLandNumVerts; ++i)
         {
             mLandData->mNormals[i * 3 + 0] = 0;
             mLandData->mNormals[i * 3 + 1] = 0;
             mLandData->mNormals[i * 3 + 2] = 127;
         }
-        std::fill(std::begin(mLandData->mTextures), std::end(mLandData->mTextures), 0);
-        std::fill(std::begin(mLandData->mColours), std::end(mLandData->mColours), 255);
-        mLandData->mUnk1 = 0;
-        mLandData->mUnk2 = 0;
+        mLandData->mTextures.fill(0);
+        mLandData->mColours.fill(255);
         mLandData->mDataLoaded
             = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_WNAM | Land::DATA_VCLR | Land::DATA_VTEX;
         mDataTypes = mLandData->mDataLoaded;
@@ -227,20 +228,20 @@ namespace ESM
         mContext.filename.clear();
     }
 
-    void Land::loadData(int flags) const
+    void Land::loadData(int dataTypes) const
     {
         if (mLandData == nullptr)
             mLandData = std::make_unique<LandData>();
 
-        loadData(flags, *mLandData);
+        loadData(dataTypes, *mLandData);
     }
 
-    void Land::loadData(int flags, LandData& data) const
+    void Land::loadData(int dataTypes, LandData& data) const
     {
         // Try to load only available data
-        flags = flags & mDataTypes;
+        dataTypes = dataTypes & mDataTypes;
         // Return if all required data is loaded
-        if ((data.mDataLoaded & flags) == flags)
+        if ((data.mDataLoaded & dataTypes) == dataTypes)
         {
             return;
         }
@@ -257,59 +258,7 @@ namespace ESM
         ESMReader reader;
         reader.restoreContext(mContext);
 
-        if (reader.isNextSub("VNML"))
-        {
-            condLoad(reader, flags, data.mDataLoaded, DATA_VNML, data.mNormals, sizeof(data.mNormals));
-        }
-
-        if (reader.isNextSub("VHGT"))
-        {
-            VHGT vhgt;
-            if (condLoad(reader, flags, data.mDataLoaded, DATA_VHGT, &vhgt, sizeof(vhgt)))
-            {
-                data.mMinHeight = std::numeric_limits<float>::max();
-                data.mMaxHeight = -std::numeric_limits<float>::max();
-                float rowOffset = vhgt.mHeightOffset;
-                for (int y = 0; y < LAND_SIZE; y++)
-                {
-                    rowOffset += vhgt.mHeightData[y * LAND_SIZE];
-
-                    data.mHeights[y * LAND_SIZE] = rowOffset * HEIGHT_SCALE;
-                    if (rowOffset * HEIGHT_SCALE > data.mMaxHeight)
-                        data.mMaxHeight = rowOffset * HEIGHT_SCALE;
-                    if (rowOffset * HEIGHT_SCALE < data.mMinHeight)
-                        data.mMinHeight = rowOffset * HEIGHT_SCALE;
-
-                    float colOffset = rowOffset;
-                    for (int x = 1; x < LAND_SIZE; x++)
-                    {
-                        colOffset += vhgt.mHeightData[y * LAND_SIZE + x];
-                        data.mHeights[x + y * LAND_SIZE] = colOffset * HEIGHT_SCALE;
-
-                        if (colOffset * HEIGHT_SCALE > data.mMaxHeight)
-                            data.mMaxHeight = colOffset * HEIGHT_SCALE;
-                        if (colOffset * HEIGHT_SCALE < data.mMinHeight)
-                            data.mMinHeight = colOffset * HEIGHT_SCALE;
-                    }
-                }
-                data.mUnk1 = vhgt.mUnk1;
-                data.mUnk2 = vhgt.mUnk2;
-            }
-        }
-
-        if (reader.isNextSub("WNAM"))
-            reader.skipHSub();
-
-        if (reader.isNextSub("VCLR"))
-            condLoad(reader, flags, data.mDataLoaded, DATA_VCLR, data.mColours, 3 * LAND_NUM_VERTS);
-        if (reader.isNextSub("VTEX"))
-        {
-            uint16_t vtex[LAND_NUM_TEXTURES];
-            if (condLoad(reader, flags, data.mDataLoaded, DATA_VTEX, vtex, sizeof(vtex)))
-            {
-                transposeTextureData(vtex, data.mTextures);
-            }
-        }
+        loadLandRecordData(dataTypes, reader, data);
     }
 
     void Land::unloadData()
@@ -357,4 +306,75 @@ namespace ESM
         mDataTypes |= flags;
         mLandData->mDataLoaded |= flags;
     }
+
+    void loadLandRecordData(int dataTypes, ESMReader& reader, LandRecordData& data)
+    {
+        if (reader.isNextSub("VNML"))
+            condLoad(reader, dataTypes, data.mDataLoaded, Land::DATA_VNML, data.mNormals);
+
+        if (reader.isNextSub("VHGT"))
+        {
+            VHGT vhgt;
+            if (condLoad(reader, dataTypes, data.mDataLoaded, Land::DATA_VHGT, vhgt))
+            {
+                data.mMinHeight = std::numeric_limits<float>::max();
+                data.mMaxHeight = -std::numeric_limits<float>::max();
+                float rowOffset = vhgt.mHeightOffset;
+                for (unsigned y = 0; y < LandRecordData::sLandSize; y++)
+                {
+                    rowOffset += vhgt.mHeightData[y * LandRecordData::sLandSize];
+
+                    data.mHeights[y * LandRecordData::sLandSize] = rowOffset * Land::sHeightScale;
+                    if (rowOffset * Land::sHeightScale > data.mMaxHeight)
+                        data.mMaxHeight = rowOffset * Land::sHeightScale;
+                    if (rowOffset * Land::sHeightScale < data.mMinHeight)
+                        data.mMinHeight = rowOffset * Land::sHeightScale;
+
+                    float colOffset = rowOffset;
+                    for (unsigned x = 1; x < LandRecordData::sLandSize; x++)
+                    {
+                        colOffset += vhgt.mHeightData[y * LandRecordData::sLandSize + x];
+                        data.mHeights[x + y * LandRecordData::sLandSize] = colOffset * Land::sHeightScale;
+
+                        if (colOffset * Land::sHeightScale > data.mMaxHeight)
+                            data.mMaxHeight = colOffset * Land::sHeightScale;
+                        if (colOffset * Land::sHeightScale < data.mMinHeight)
+                            data.mMinHeight = colOffset * Land::sHeightScale;
+                    }
+                }
+            }
+        }
+
+        if (reader.isNextSub("WNAM"))
+            reader.skipHSub();
+
+        if (reader.isNextSub("VCLR"))
+            condLoad(reader, dataTypes, data.mDataLoaded, Land::DATA_VCLR, data.mColours);
+
+        if (reader.isNextSub("VTEX"))
+        {
+            std::uint16_t vtex[LandRecordData::sLandNumTextures];
+            if (condLoad(reader, dataTypes, data.mDataLoaded, Land::DATA_VTEX, vtex))
+                transposeTextureData(vtex, data.mTextures.data());
+        }
+    }
+
+    void generateWnam(const std::array<float, LandRecordData::sLandNumVerts>& heights,
+        std::array<std::int8_t, Land::sGlobalMapLodSize>& wnam)
+    {
+        constexpr float max = std::numeric_limits<std::int8_t>::max();
+        constexpr float min = std::numeric_limits<std::int8_t>::min();
+        constexpr float vertMult = static_cast<float>(LandRecordData::sLandSize - 1) / Land::sGlobalMapLodSizeSqrt;
+        for (std::size_t row = 0; row < Land::sGlobalMapLodSizeSqrt; ++row)
+        {
+            for (std::size_t col = 0; col < Land::sGlobalMapLodSizeSqrt; ++col)
+            {
+                float height = heights[static_cast<std::size_t>(row * vertMult) * LandRecordData::sLandSize
+                    + static_cast<std::size_t>(col * vertMult)];
+                height /= height > 0 ? 128.f : 16.f;
+                height = std::clamp(height, min, max);
+                wnam[row * Land::sGlobalMapLodSizeSqrt + col] = static_cast<std::int8_t>(height);
+            }
+        }
+    }
 }
diff --git a/components/esm3/loadland.hpp b/components/esm3/loadland.hpp
index 0d32407a5d..f6a25c1ecb 100644
--- a/components/esm3/loadland.hpp
+++ b/components/esm3/loadland.hpp
@@ -66,6 +66,13 @@ namespace ESM
             DATA_VTEX = 16
         };
 
+        enum Flags
+        {
+            Flag_HeightsNormals = 0x1,
+            Flag_Colors = 0x2,
+            Flag_Textures = 0x4
+        };
+
         // default height to use in case there is no Land record
         static constexpr int DEFAULT_HEIGHT = -2048;
 
@@ -78,7 +85,7 @@ namespace ESM
         // total number of vertices
         static constexpr int LAND_NUM_VERTS = LandRecordData::sLandNumVerts;
 
-        static constexpr int HEIGHT_SCALE = 8;
+        static constexpr int sHeightScale = 8;
 
         // number of textures per side of land
         static constexpr int LAND_TEXTURE_SIZE = LandRecordData::sLandTextureSize;
@@ -86,33 +93,25 @@ namespace ESM
         // total number of textures per land
         static constexpr int LAND_NUM_TEXTURES = LandRecordData::sLandNumTextures;
 
-        static constexpr int LAND_GLOBAL_MAP_LOD_SIZE = 81;
+        static constexpr std::size_t sGlobalMapLodSizeSqrt = 9;
 
-        static constexpr int LAND_GLOBAL_MAP_LOD_SIZE_SQRT = 9;
-
-#pragma pack(push, 1)
-        struct VHGT
-        {
-            float mHeightOffset;
-            std::int8_t mHeightData[LAND_NUM_VERTS];
-            std::uint16_t mUnk1;
-            std::uint8_t mUnk2;
-        };
-#pragma pack(pop)
+        static constexpr std::size_t sGlobalMapLodSize = sGlobalMapLodSizeSqrt * sGlobalMapLodSizeSqrt;
 
         using LandData = ESM::LandRecordData;
 
         // low-LOD heightmap (used for rendering the global map)
-        std::array<std::int8_t, LAND_GLOBAL_MAP_LOD_SIZE> mWnam;
+        std::array<std::int8_t, sGlobalMapLodSize> mWnam;
+
+        mutable std::unique_ptr<LandData> mLandData;
 
         void load(ESMReader& esm, bool& isDeleted);
         void save(ESMWriter& esm, bool isDeleted = false) const;
 
         void blank();
 
-        void loadData(int flags) const;
+        void loadData(int dataTypes) const;
 
-        void loadData(int flags, LandData& data) const;
+        void loadData(int dataTypes, LandData& data) const;
 
         /**
          * Frees memory allocated for mLandData
@@ -128,25 +127,21 @@ namespace ESM
         const LandData* getLandData(int flags) const;
 
         /// Return land data without loading first anything. Can return a 0-pointer.
-        const LandData* getLandData() const
-        {
-            return mLandData.get();
-        }
+        const LandData* getLandData() const { return mLandData.get(); }
 
         /// Return land data without loading first anything. Can return a 0-pointer.
-        LandData* getLandData()
-        {
-            return mLandData.get();
-        }
+        LandData* getLandData() { return mLandData.get(); }
 
         /// \attention Must not be called on objects that aren't fully loaded.
         ///
         /// \note Added data fields will be uninitialised
         void add(int flags);
-
-    private:
-        mutable std::unique_ptr<LandData> mLandData;
     };
 
+    void loadLandRecordData(int dataTypes, ESMReader& reader, LandRecordData& data);
+
+    void generateWnam(const std::array<float, LandRecordData::sLandNumVerts>& heights,
+        std::array<std::int8_t, Land::sGlobalMapLodSize>& wnam);
 }
+
 #endif
diff --git a/components/esm3/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
index 970174ada2..f37009d6f9 100644
--- a/components/esm3/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -30,7 +30,7 @@ namespace ESM
                     break;
                 case fourCC("INDX"):
                 {
-                    int length = 0;
+                    uint32_t length = 0;
                     esm.getHT(length);
                     mList.resize(length);
 
@@ -87,12 +87,12 @@ namespace ESM
 
         esm.writeHNT("DATA", mFlags);
         esm.writeHNT("NNAM", mChanceNone);
-        esm.writeHNT<int>("INDX", mList.size());
+        esm.writeHNT("INDX", static_cast<uint32_t>(mList.size()));
 
-        for (std::vector<LevelItem>::const_iterator it = mList.begin(); it != mList.end(); ++it)
+        for (const auto& item : mList)
         {
-            esm.writeHNCRefId(recName, it->mId);
-            esm.writeHNT("INTV", it->mLevel);
+            esm.writeHNCRefId(recName, item.mId);
+            esm.writeHNT("INTV", item.mLevel);
         }
     }
 
diff --git a/components/esm3/loadlevlist.hpp b/components/esm3/loadlevlist.hpp
index 809c89102e..536b865d90 100644
--- a/components/esm3/loadlevlist.hpp
+++ b/components/esm3/loadlevlist.hpp
@@ -24,15 +24,15 @@ namespace ESM
 
     struct LevelledListBase
     {
-        int mFlags;
+        int32_t mFlags;
         unsigned char mChanceNone; // Chance that none are selected (0-100)
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
 
         struct LevelItem
         {
             RefId mId;
-            short mLevel;
+            uint16_t mLevel;
         };
 
         std::vector<LevelItem> mList;
diff --git a/components/esm3/loadligh.cpp b/components/esm3/loadligh.cpp
index 150baccec0..bb4f6bac7b 100644
--- a/components/esm3/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Light::LHDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mTime, v.mRadius, v.mColor, v.mFlags);
+    }
+
     void Light::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -31,7 +39,7 @@ namespace ESM
                     mIcon = esm.getHString();
                     break;
                 case fourCC("LHDT"):
-                    esm.getHTSized<24>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -68,7 +76,7 @@ namespace ESM
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
         esm.writeHNOCString("ITEX", mIcon);
-        esm.writeHNT("LHDT", mData, 24);
+        esm.writeNamedComposite("LHDT", mData);
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNOCRefId("SNAM", mSound);
     }
diff --git a/components/esm3/loadligh.hpp b/components/esm3/loadligh.hpp
index 7ee24d26fc..67c171b0bc 100644
--- a/components/esm3/loadligh.hpp
+++ b/components/esm3/loadligh.hpp
@@ -41,16 +41,16 @@ namespace ESM
         struct LHDTstruct
         {
             float mWeight;
-            int mValue;
-            int mTime; // Duration
-            int mRadius;
-            unsigned int mColor; // 4-byte rgba value
-            int mFlags;
+            int32_t mValue;
+            int32_t mTime; // Duration
+            int32_t mRadius;
+            uint32_t mColor; // 4-byte rgba value
+            int32_t mFlags;
         }; // Size = 24 bytes
 
         LHDTstruct mData;
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         std::string mModel, mIcon, mName;
         ESM::RefId mId, mSound, mScript;
 
diff --git a/components/esm3/loadlock.cpp b/components/esm3/loadlock.cpp
index 0e87558871..019d6f9952 100644
--- a/components/esm3/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Lockpick::Data> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mQuality, v.mUses);
+    }
+
     void Lockpick::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("LKDT"):
-                    esm.getHTSized<16>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -66,7 +74,7 @@ namespace ESM
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
 
-        esm.writeHNT("LKDT", mData, 16);
+        esm.writeNamedComposite("LKDT", mData);
         esm.writeHNORefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
     }
diff --git a/components/esm3/loadlock.hpp b/components/esm3/loadlock.hpp
index 1b94fd61bb..ae08243d69 100644
--- a/components/esm3/loadlock.hpp
+++ b/components/esm3/loadlock.hpp
@@ -22,14 +22,14 @@ namespace ESM
         struct Data
         {
             float mWeight;
-            int mValue;
+            int32_t mValue;
 
             float mQuality;
-            int mUses;
+            int32_t mUses;
         }; // Size = 16
 
         Data mData;
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mScript;
         std::string mName, mModel, mIcon;
 
diff --git a/components/esm3/loadltex.hpp b/components/esm3/loadltex.hpp
index e6dc2de73e..7a5ff7d613 100644
--- a/components/esm3/loadltex.hpp
+++ b/components/esm3/loadltex.hpp
@@ -26,10 +26,9 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "LandTexture"; }
 
-        // mId is merely a user friendly name for the texture in the editor.
         std::string mTexture;
         RefId mId;
-        int mIndex;
+        uint32_t mIndex;
 
         void load(ESMReader& esm, bool& isDeleted);
         void save(ESMWriter& esm, bool isDeleted = false) const;
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index 7d3879a341..3ff725fcf7 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -36,7 +36,7 @@ namespace ESM
 
         esm.getSubNameIs("MEDT");
         esm.getSubHeader();
-        int school;
+        int32_t school;
         esm.getT(school);
         mData.mSchool = MagicSchool::indexToSkillRefId(school);
         esm.getT(mData.mBaseCost);
@@ -132,53 +132,61 @@ namespace ESM
         esm.writeHNOString("DESC", mDescription);
     }
 
+    namespace
+    {
+        std::map<short, short> makeEffectsMap()
+        {
+            std::map<short, short> effects;
+
+            effects[MagicEffect::Effects::DisintegrateArmor] = MagicEffect::Effects::Sanctuary;
+            effects[MagicEffect::Effects::DisintegrateWeapon] = MagicEffect::Effects::Sanctuary;
+
+            for (int i = MagicEffect::Effects::DrainAttribute; i <= MagicEffect::Effects::DamageSkill; ++i)
+                effects[i] = MagicEffect::Effects::ResistMagicka;
+            for (int i = MagicEffect::Effects::AbsorbAttribute; i <= MagicEffect::Effects::AbsorbSkill; ++i)
+                effects[i] = MagicEffect::Effects::ResistMagicka;
+            for (int i = MagicEffect::Effects::WeaknessToFire; i <= MagicEffect::Effects::WeaknessToNormalWeapons; ++i)
+                effects[i] = MagicEffect::Effects::ResistMagicka;
+
+            effects[MagicEffect::Effects::Burden] = MagicEffect::Effects::ResistMagicka;
+            effects[MagicEffect::Effects::Charm] = MagicEffect::Effects::ResistMagicka;
+            effects[MagicEffect::Effects::Silence] = MagicEffect::Effects::ResistMagicka;
+            effects[MagicEffect::Effects::Blind] = MagicEffect::Effects::ResistMagicka;
+            effects[MagicEffect::Effects::Sound] = MagicEffect::Effects::ResistMagicka;
+
+            for (int i = 0; i < 2; ++i)
+            {
+                effects[MagicEffect::Effects::CalmHumanoid + i] = MagicEffect::Effects::ResistMagicka;
+                effects[MagicEffect::Effects::FrenzyHumanoid + i] = MagicEffect::Effects::ResistMagicka;
+                effects[MagicEffect::Effects::DemoralizeHumanoid + i] = MagicEffect::Effects::ResistMagicka;
+                effects[MagicEffect::Effects::RallyHumanoid + i] = MagicEffect::Effects::ResistMagicka;
+            }
+
+            effects[MagicEffect::Effects::TurnUndead] = MagicEffect::Effects::ResistMagicka;
+
+            effects[MagicEffect::Effects::FireDamage] = MagicEffect::Effects::ResistFire;
+            effects[MagicEffect::Effects::FrostDamage] = MagicEffect::Effects::ResistFrost;
+            effects[MagicEffect::Effects::ShockDamage] = MagicEffect::Effects::ResistShock;
+            effects[MagicEffect::Effects::Vampirism] = MagicEffect::Effects::ResistCommonDisease;
+            effects[MagicEffect::Effects::Corprus] = MagicEffect::Effects::ResistCorprusDisease;
+            effects[MagicEffect::Effects::Poison] = MagicEffect::Effects::ResistPoison;
+            effects[MagicEffect::Effects::Paralyze] = MagicEffect::Effects::ResistParalysis;
+
+            return effects;
+        }
+    }
+
     short MagicEffect::getResistanceEffect(short effect)
     {
         // Source https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attribute
 
         // <Effect, Effect providing resistance against first effect>
-        static std::map<short, short> effects;
-        if (effects.empty())
-        {
-            effects[DisintegrateArmor] = Sanctuary;
-            effects[DisintegrateWeapon] = Sanctuary;
+        static const std::map<short, short> effects = makeEffectsMap();
 
-            for (int i = DrainAttribute; i <= DamageSkill; ++i)
-                effects[i] = ResistMagicka;
-            for (int i = AbsorbAttribute; i <= AbsorbSkill; ++i)
-                effects[i] = ResistMagicka;
-            for (int i = WeaknessToFire; i <= WeaknessToNormalWeapons; ++i)
-                effects[i] = ResistMagicka;
+        if (const auto it = effects.find(effect); it != effects.end())
+            return it->second;
 
-            effects[Burden] = ResistMagicka;
-            effects[Charm] = ResistMagicka;
-            effects[Silence] = ResistMagicka;
-            effects[Blind] = ResistMagicka;
-            effects[Sound] = ResistMagicka;
-
-            for (int i = 0; i < 2; ++i)
-            {
-                effects[CalmHumanoid + i] = ResistMagicka;
-                effects[FrenzyHumanoid + i] = ResistMagicka;
-                effects[DemoralizeHumanoid + i] = ResistMagicka;
-                effects[RallyHumanoid + i] = ResistMagicka;
-            }
-
-            effects[TurnUndead] = ResistMagicka;
-
-            effects[FireDamage] = ResistFire;
-            effects[FrostDamage] = ResistFrost;
-            effects[ShockDamage] = ResistShock;
-            effects[Vampirism] = ResistCommonDisease;
-            effects[Corprus] = ResistCorprusDisease;
-            effects[Poison] = ResistPoison;
-            effects[Paralyze] = ResistParalysis;
-        }
-
-        if (effects.find(effect) != effects.end())
-            return effects[effect];
-        else
-            return -1;
+        return -1;
     }
 
     short MagicEffect::getWeaknessEffect(short effect)
@@ -588,7 +596,7 @@ namespace ESM
         mData.mRed = 0;
         mData.mGreen = 0;
         mData.mBlue = 0;
-        mData.mSpeed = 0;
+        mData.mSpeed = 1;
 
         mIcon.clear();
         mParticle.clear();
@@ -631,7 +639,7 @@ namespace ESM
     {
         auto name = sIndexNameToIndexMap.find(effect);
         if (name == sIndexNameToIndexMap.end())
-            throw std::runtime_error("Unimplemented effect " + std::string(effect));
+            return -1;
 
         return name->second;
     }
diff --git a/components/esm3/loadmgef.hpp b/components/esm3/loadmgef.hpp
index 9d68bad609..25ec7d0655 100644
--- a/components/esm3/loadmgef.hpp
+++ b/components/esm3/loadmgef.hpp
@@ -25,7 +25,7 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "MagicEffect"; }
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
 
         enum Flags
@@ -74,9 +74,9 @@ namespace ESM
         {
             RefId mSchool; // Skill id
             float mBaseCost;
-            int mFlags;
+            int32_t mFlags;
             // Glow color for enchanted items with this effect
-            int mRed, mGreen, mBlue;
+            int32_t mRed, mGreen, mBlue;
 
             float mUnknown1; // Called "Size X" in CS
             float mSpeed; // Speed of fired projectile
@@ -107,7 +107,7 @@ namespace ESM
         // there. They can be redefined in mods by setting the name in GMST
         // sEffectSummonCreature04/05 creature id in
         // sMagicCreature04ID/05ID.
-        int mIndex;
+        int32_t mIndex;
 
         void load(ESMReader& esm, bool& isDeleted);
         void save(ESMWriter& esm, bool isDeleted = false) const;
diff --git a/components/esm3/loadmisc.cpp b/components/esm3/loadmisc.cpp
index 780e8077fe..63df1c6551 100644
--- a/components/esm3/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Miscellaneous::MCDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mFlags);
+    }
+
     void Miscellaneous::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("MCDT"):
-                    esm.getHTSized<12>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -65,7 +73,7 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("MCDT", mData, 12);
+        esm.writeNamedComposite("MCDT", mData);
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
     }
diff --git a/components/esm3/loadmisc.hpp b/components/esm3/loadmisc.hpp
index 9c46b7494e..f3eaf7d10f 100644
--- a/components/esm3/loadmisc.hpp
+++ b/components/esm3/loadmisc.hpp
@@ -27,8 +27,8 @@ namespace ESM
         struct MCDTstruct
         {
             float mWeight;
-            int mValue;
-            int mFlags;
+            int32_t mValue;
+            int32_t mFlags;
         };
 
         enum Flags
@@ -38,7 +38,7 @@ namespace ESM
 
         MCDTstruct mData;
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mScript;
         std::string mName, mModel, mIcon;
 
diff --git a/components/esm3/loadnpc.cpp b/components/esm3/loadnpc.cpp
index 24a79d2e4c..03c47d4d73 100644
--- a/components/esm3/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -3,8 +3,34 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    namespace
+    {
+        struct NPDTstruct12
+        {
+            NPC::NPDTstruct52& mStruct;
+        };
+    }
+
+    template <Misc::SameAsWithoutCvref<NPC::NPDTstruct52> T>
+    void decompose(T&& v, const auto& f)
+    {
+        char padding1 = 0;
+        char padding2 = 0;
+        f(v.mLevel, v.mAttributes, v.mSkills, padding1, v.mHealth, v.mMana, v.mFatigue, v.mDisposition, v.mReputation,
+            v.mRank, padding2, v.mGold);
+    }
+
+    template <Misc::SameAsWithoutCvref<NPDTstruct12> T>
+    void decompose(T&& v, const auto& f)
+    {
+        char padding[] = { 0, 0, 0 };
+        f(v.mStruct.mLevel, v.mStruct.mDisposition, v.mStruct.mReputation, v.mStruct.mRank, padding, v.mStruct.mGold);
+    }
+
     void NPC::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -56,33 +82,29 @@ namespace ESM
                 case fourCC("NPDT"):
                     hasNpdt = true;
                     esm.getSubHeader();
-                    if (esm.getSubSize() == 52)
+                    if (esm.getSubSize() == getCompositeSize(mNpdt))
                     {
                         mNpdtType = NPC_DEFAULT;
-                        esm.getExact(&mNpdt, 52);
-                    }
-                    else if (esm.getSubSize() == 12)
-                    {
-                        // Reading into temporary NPDTstruct12 object
-                        NPDTstruct12 npdt12;
-                        mNpdtType = NPC_WITH_AUTOCALCULATED_STATS;
-                        esm.getExact(&npdt12, 12);
-
-                        // Clearing the mNdpt struct to initialize all values
-                        blankNpdt();
-                        // Swiching to an internal representation
-                        mNpdt.mLevel = npdt12.mLevel;
-                        mNpdt.mDisposition = npdt12.mDisposition;
-                        mNpdt.mReputation = npdt12.mReputation;
-                        mNpdt.mRank = npdt12.mRank;
-                        mNpdt.mGold = npdt12.mGold;
+                        esm.getComposite(mNpdt);
                     }
                     else
-                        esm.fail("NPC_NPDT must be 12 or 52 bytes long");
+                    {
+                        NPDTstruct12 data{ mNpdt };
+                        if (esm.getSubSize() == getCompositeSize(data))
+                        {
+                            mNpdtType = NPC_WITH_AUTOCALCULATED_STATS;
+
+                            // Clearing the mNdpt struct to initialize all values
+                            blankNpdt();
+                            esm.getComposite(data);
+                        }
+                        else
+                            esm.fail("NPC_NPDT must be 12 or 52 bytes long");
+                    }
                     break;
                 case fourCC("FLAG"):
                     hasFlags = true;
-                    int flags;
+                    int32_t flags;
                     esm.getHT(flags);
                     mFlags = flags & 0xFF;
                     mBloodType = ((flags >> 8) & 0xFF) >> 2;
@@ -94,7 +116,7 @@ namespace ESM
                     mInventory.add(esm);
                     break;
                 case fourCC("AIDT"):
-                    esm.getHExact(&mAiData, sizeof(mAiData));
+                    esm.getSubComposite(mAiData);
                     break;
                 case fourCC("DODT"):
                 case fourCC("DNAM"):
@@ -146,27 +168,18 @@ namespace ESM
 
         if (mNpdtType == NPC_DEFAULT)
         {
-            esm.writeHNT("NPDT", mNpdt, 52);
+            esm.writeNamedComposite("NPDT", mNpdt);
         }
         else if (mNpdtType == NPC_WITH_AUTOCALCULATED_STATS)
         {
-            NPDTstruct12 npdt12;
-            npdt12.mLevel = mNpdt.mLevel;
-            npdt12.mDisposition = mNpdt.mDisposition;
-            npdt12.mReputation = mNpdt.mReputation;
-            npdt12.mRank = mNpdt.mRank;
-            npdt12.mUnknown1 = 0;
-            npdt12.mUnknown2 = 0;
-            npdt12.mUnknown3 = 0;
-            npdt12.mGold = mNpdt.mGold;
-            esm.writeHNT("NPDT", npdt12, 12);
+            esm.writeNamedComposite("NPDT", NPDTstruct12{ const_cast<NPDTstruct52&>(mNpdt) });
         }
 
         esm.writeHNT("FLAG", ((mBloodType << 10) + mFlags));
 
         mInventory.save(esm);
         mSpells.save(esm);
-        esm.writeHNT("AIDT", mAiData, sizeof(mAiData));
+        esm.writeNamedComposite("AIDT", mAiData);
 
         mTransport.save(esm);
 
@@ -213,15 +226,12 @@ namespace ESM
     void NPC::blankNpdt()
     {
         mNpdt.mLevel = 0;
-        mNpdt.mStrength = mNpdt.mIntelligence = mNpdt.mWillpower = mNpdt.mAgility = mNpdt.mSpeed = mNpdt.mEndurance
-            = mNpdt.mPersonality = mNpdt.mLuck = 0;
+        mNpdt.mAttributes.fill(0);
         mNpdt.mSkills.fill(0);
         mNpdt.mReputation = 0;
         mNpdt.mHealth = mNpdt.mMana = mNpdt.mFatigue = 0;
         mNpdt.mDisposition = 0;
-        mNpdt.mUnknown1 = 0;
         mNpdt.mRank = 0;
-        mNpdt.mUnknown2 = 0;
         mNpdt.mGold = 0;
     }
 
diff --git a/components/esm3/loadnpc.hpp b/components/esm3/loadnpc.hpp
index f0d726434b..40ec0f0347 100644
--- a/components/esm3/loadnpc.hpp
+++ b/components/esm3/loadnpc.hpp
@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "aipackage.hpp"
+#include "components/esm/attr.hpp"
 #include "components/esm/defs.hpp"
 #include "components/esm/refid.hpp"
 #include "loadcont.hpp"
@@ -74,36 +75,19 @@ namespace ESM
             NPC_DEFAULT = 52
         };
 
-#pragma pack(push)
-#pragma pack(1)
-
         struct NPDTstruct52
         {
-            short mLevel;
-            unsigned char mStrength, mIntelligence, mWillpower, mAgility, mSpeed, mEndurance, mPersonality, mLuck;
+            int16_t mLevel;
+            std::array<unsigned char, Attribute::Length> mAttributes;
 
             // mSkill can grow up to 200, it must be unsigned
             std::array<unsigned char, Skill::Length> mSkills;
 
-            char mUnknown1;
-            unsigned short mHealth, mMana, mFatigue;
+            uint16_t mHealth, mMana, mFatigue;
             unsigned char mDisposition, mReputation, mRank;
-            char mUnknown2;
-            int mGold;
+            int32_t mGold;
         }; // 52 bytes
 
-        // Structure for autocalculated characters.
-        //  This is only used for load and save operations.
-        struct NPDTstruct12
-        {
-            short mLevel;
-            // see above
-            unsigned char mDisposition, mReputation, mRank;
-            char mUnknown1, mUnknown2, mUnknown3;
-            int mGold;
-        }; // 12 bytes
-#pragma pack(pop)
-
         unsigned char mNpdtType;
         // Worth noting when saving the struct:
         //  Although we might read a NPDTstruct12 in, we use NPDTstruct52 internally
@@ -111,7 +95,7 @@ namespace ESM
 
         int getFactionRank() const; /// wrapper for mNpdt*, -1 = no rank
 
-        int mBloodType;
+        int32_t mBloodType;
         unsigned char mFlags;
 
         InventoryList mInventory;
@@ -125,7 +109,7 @@ namespace ESM
 
         AIPackageList mAiPackage;
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mRace, mClass, mFaction, mScript;
         std::string mModel, mName;
 
diff --git a/components/esm3/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
index ea0b53d8d2..c438fd73eb 100644
--- a/components/esm3/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -3,25 +3,38 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Pathgrid::DATAstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mX, v.mY, v.mGranularity, v.mPoints);
+    }
+
+    template <Misc::SameAsWithoutCvref<Pathgrid::Point> T>
+    void decompose(T&& v, const auto& f)
+    {
+        char padding[2] = { 0, 0 };
+        f(v.mX, v.mY, v.mZ, v.mAutogenerated, v.mConnectionNum, padding);
+    }
+
     Pathgrid::Point& Pathgrid::Point::operator=(const float rhs[3])
     {
-        mX = static_cast<int>(rhs[0]);
-        mY = static_cast<int>(rhs[1]);
-        mZ = static_cast<int>(rhs[2]);
+        mX = static_cast<int32_t>(rhs[0]);
+        mY = static_cast<int32_t>(rhs[1]);
+        mZ = static_cast<int32_t>(rhs[2]);
         mAutogenerated = 0;
         mConnectionNum = 0;
-        mUnknown = 0;
         return *this;
     }
     Pathgrid::Point::Point(const float rhs[3])
-        : mX(static_cast<int>(rhs[0]))
-        , mY(static_cast<int>(rhs[1]))
-        , mZ(static_cast<int>(rhs[2]))
+        : mX(static_cast<int32_t>(rhs[0]))
+        , mY(static_cast<int32_t>(rhs[1]))
+        , mZ(static_cast<int32_t>(rhs[2]))
         , mAutogenerated(0)
         , mConnectionNum(0)
-        , mUnknown(0)
     {
     }
     Pathgrid::Point::Point()
@@ -30,7 +43,6 @@ namespace ESM
         , mZ(0)
         , mAutogenerated(0)
         , mConnectionNum(0)
-        , mUnknown(0)
     {
     }
 
@@ -42,7 +54,7 @@ namespace ESM
         mEdges.clear();
 
         // keep track of total connections so we can reserve edge vector size
-        int edgeCount = 0;
+        size_t edgeCount = 0;
 
         bool hasData = false;
         while (esm.hasMoreSubs())
@@ -54,24 +66,22 @@ namespace ESM
                     mCell = esm.getRefId();
                     break;
                 case fourCC("DATA"):
-                    esm.getHTSized<12>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("PGRP"):
                 {
                     esm.getSubHeader();
-                    int size = esm.getSubSize();
-                    // Check that the sizes match up. Size = 16 * s2 (path points)
-                    if (size != static_cast<int>(sizeof(Point) * mData.mS2))
+                    uint32_t size = esm.getSubSize();
+                    if (size != getCompositeSize(Point{}) * mData.mPoints)
                         esm.fail("Path point subrecord size mismatch");
                     else
                     {
-                        int pointCount = mData.mS2;
-                        mPoints.reserve(pointCount);
-                        for (int i = 0; i < pointCount; ++i)
+                        mPoints.reserve(mData.mPoints);
+                        for (uint16_t i = 0; i < mData.mPoints; ++i)
                         {
                             Point p;
-                            esm.getExact(&p, sizeof(Point));
+                            esm.getComposite(p);
                             mPoints.push_back(p);
                             edgeCount += p.mConnectionNum;
                         }
@@ -81,21 +91,19 @@ namespace ESM
                 case fourCC("PGRC"):
                 {
                     esm.getSubHeader();
-                    int size = esm.getSubSize();
-                    if (size % sizeof(int) != 0)
+                    uint32_t size = esm.getSubSize();
+                    if (size % sizeof(uint32_t) != 0)
                         esm.fail("PGRC size not a multiple of 4");
                     else
                     {
-                        int rawConnNum = size / sizeof(int);
+                        size_t rawConnNum = size / sizeof(uint32_t);
                         std::vector<size_t> rawConnections;
                         rawConnections.reserve(rawConnNum);
-                        for (int i = 0; i < rawConnNum; ++i)
+                        for (size_t i = 0; i < rawConnNum; ++i)
                         {
-                            int currentValue;
+                            uint32_t currentValue;
                             esm.getT(currentValue);
-                            if (currentValue < 0)
-                                esm.fail("currentValue is less than 0");
-                            rawConnections.push_back(static_cast<size_t>(currentValue));
+                            rawConnections.push_back(currentValue);
                         }
 
                         auto rawIt = rawConnections.begin();
@@ -138,7 +146,7 @@ namespace ESM
         // Correct connection count and sort edges by point
         // Can probably be optimized
         PointList correctedPoints = mPoints;
-        std::vector<int> sortedEdges;
+        std::vector<uint32_t> sortedEdges;
 
         sortedEdges.reserve(mEdges.size());
 
@@ -150,7 +158,7 @@ namespace ESM
             {
                 if (edge.mV0 == point)
                 {
-                    sortedEdges.push_back(static_cast<int>(edge.mV1));
+                    sortedEdges.push_back(static_cast<uint32_t>(edge.mV1));
                     ++correctedPoints[point].mConnectionNum;
                 }
             }
@@ -158,20 +166,20 @@ namespace ESM
 
         // Save
         esm.writeHNCRefId("NAME", mCell);
-        esm.writeHNT("DATA", mData, 12);
+        esm.writeNamedComposite("DATA", mData);
 
         if (isDeleted)
         {
-            esm.writeHNString("DELE", "", 3);
+            esm.writeHNString("DELE", {}, 3);
             return;
         }
 
         if (!correctedPoints.empty())
         {
             esm.startSubRecord("PGRP");
-            for (PointList::const_iterator it = correctedPoints.begin(); it != correctedPoints.end(); ++it)
+            for (const Point& point : correctedPoints)
             {
-                esm.writeT(*it);
+                esm.writeComposite(point);
             }
             esm.endRecord("PGRP");
         }
@@ -179,9 +187,9 @@ namespace ESM
         if (!sortedEdges.empty())
         {
             esm.startSubRecord("PGRC");
-            for (std::vector<int>::const_iterator it = sortedEdges.begin(); it != sortedEdges.end(); ++it)
+            for (const uint32_t& edge : sortedEdges)
             {
-                esm.writeT(*it);
+                esm.writeT(edge);
             }
             esm.endRecord("PGRC");
         }
@@ -192,8 +200,8 @@ namespace ESM
         mCell = ESM::RefId();
         mData.mX = 0;
         mData.mY = 0;
-        mData.mS1 = 0;
-        mData.mS2 = 0;
+        mData.mGranularity = 0;
+        mData.mPoints = 0;
         mPoints.clear();
         mEdges.clear();
     }
diff --git a/components/esm3/loadpgrd.hpp b/components/esm3/loadpgrd.hpp
index 464358fef4..f2a33f9b9a 100644
--- a/components/esm3/loadpgrd.hpp
+++ b/components/esm3/loadpgrd.hpp
@@ -25,18 +25,16 @@ namespace ESM
 
         struct DATAstruct
         {
-            int mX, mY; // Grid location, matches cell for exterior cells
-            short mS1; // ?? Usually but not always a power of 2. Doesn't seem
-                       // to have any relation to the size of PGRC.
-            short mS2; // Number of path points.
+            int32_t mX, mY; // Grid location, matches cell for exterior cells
+            int16_t mGranularity; // Granularity with which the graph was autogenerated
+            uint16_t mPoints; // Number of path points.
         }; // 12 bytes
 
         struct Point // path grid point
         {
-            int mX, mY, mZ; // Location of point
+            int32_t mX, mY, mZ; // Location of point
             unsigned char mAutogenerated; // autogenerated vs. user coloring flag?
             unsigned char mConnectionNum; // number of connections for this point
-            short mUnknown;
             Point& operator=(const float[3]);
             Point(const float[3]);
             Point();
@@ -46,7 +44,6 @@ namespace ESM
                 , mZ(z)
                 , mAutogenerated(0)
                 , mConnectionNum(0)
-                , mUnknown(0)
             {
             }
         }; // 16 bytes
diff --git a/components/esm3/loadprob.cpp b/components/esm3/loadprob.cpp
index 779f0d1534..5e3086c7b9 100644
--- a/components/esm3/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Probe::Data> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mQuality, v.mUses);
+    }
+
     void Probe::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("PBDT"):
-                    esm.getHTSized<16>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -66,7 +74,7 @@ namespace ESM
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
 
-        esm.writeHNT("PBDT", mData, 16);
+        esm.writeNamedComposite("PBDT", mData);
         esm.writeHNORefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
     }
diff --git a/components/esm3/loadprob.hpp b/components/esm3/loadprob.hpp
index 328c1eaecd..74e02e7d10 100644
--- a/components/esm3/loadprob.hpp
+++ b/components/esm3/loadprob.hpp
@@ -22,14 +22,14 @@ namespace ESM
         struct Data
         {
             float mWeight;
-            int mValue;
+            int32_t mValue;
 
             float mQuality;
-            int mUses;
+            int32_t mUses;
         }; // Size = 16
 
         Data mData;
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mScript;
         std::string mName, mModel, mIcon;
 
diff --git a/components/esm3/loadrace.cpp b/components/esm3/loadrace.cpp
index eb8faf40e9..0996a5ac48 100644
--- a/components/esm3/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -3,16 +3,63 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/esm/attr.hpp>
+
 namespace ESM
 {
-    int Race::MaleFemale::getValue(bool male) const
+    int32_t Race::RADTstruct::getAttribute(ESM::RefId attribute, bool male) const
     {
-        return male ? mMale : mFemale;
+        int index = ESM::Attribute::refIdToIndex(attribute);
+        if (index < 0)
+            return 0;
+        index *= 2;
+        if (!male)
+            index++;
+        return mAttributeValues[static_cast<size_t>(index)];
     }
 
-    float Race::MaleFemaleF::getValue(bool male) const
+    void Race::RADTstruct::setAttribute(ESM::RefId attribute, bool male, int32_t value)
     {
-        return male ? mMale : mFemale;
+        int index = ESM::Attribute::refIdToIndex(attribute);
+        if (index < 0)
+            return;
+        index *= 2;
+        if (!male)
+            index++;
+        mAttributeValues[static_cast<size_t>(index)] = value;
+    }
+
+    void Race::RADTstruct::load(ESMReader& esm)
+    {
+        esm.getSubHeader();
+        for (auto& bonus : mBonus)
+        {
+            esm.getT(bonus.mSkill);
+            esm.getT(bonus.mBonus);
+        }
+        esm.getT(mAttributeValues);
+        esm.getT(mMaleHeight);
+        esm.getT(mFemaleHeight);
+        esm.getT(mMaleWeight);
+        esm.getT(mFemaleWeight);
+        esm.getT(mFlags);
+    }
+
+    void Race::RADTstruct::save(ESMWriter& esm) const
+    {
+        esm.startSubRecord("RADT");
+        for (const auto& bonus : mBonus)
+        {
+            esm.writeT(bonus.mSkill);
+            esm.writeT(bonus.mBonus);
+        }
+        esm.writeT(mAttributeValues);
+        esm.writeT(mMaleHeight);
+        esm.writeT(mFemaleHeight);
+        esm.writeT(mMaleWeight);
+        esm.writeT(mFemaleWeight);
+        esm.writeT(mFlags);
+        esm.endRecord("RADT");
     }
 
     void Race::load(ESMReader& esm, bool& isDeleted)
@@ -37,7 +84,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("RADT"):
-                    esm.getHTSized<140>(mData);
+                    mData.load(esm);
                     hasData = true;
                     break;
                 case fourCC("DESC"):
@@ -71,7 +118,7 @@ namespace ESM
         }
 
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("RADT", mData, 140);
+        mData.save(esm);
         mPowers.save(esm);
         esm.writeHNOString("DESC", mDescription);
     }
@@ -90,11 +137,10 @@ namespace ESM
             bonus.mBonus = 0;
         }
 
-        for (auto& attribute : mData.mAttributeValues)
-            attribute.mMale = attribute.mFemale = 1;
+        mData.mAttributeValues.fill(1);
 
-        mData.mHeight.mMale = mData.mHeight.mFemale = 1;
-        mData.mWeight.mMale = mData.mWeight.mFemale = 1;
+        mData.mMaleHeight = mData.mFemaleHeight = 1;
+        mData.mMaleWeight = mData.mFemaleWeight = 1;
 
         mData.mFlags = 0;
     }
diff --git a/components/esm3/loadrace.hpp b/components/esm3/loadrace.hpp
index 8dd60bdef1..4493240ac8 100644
--- a/components/esm3/loadrace.hpp
+++ b/components/esm3/loadrace.hpp
@@ -27,22 +27,8 @@ namespace ESM
 
         struct SkillBonus
         {
-            int mSkill; // SkillEnum
-            int mBonus;
-        };
-
-        struct MaleFemale
-        {
-            int mMale, mFemale;
-
-            int getValue(bool male) const;
-        };
-
-        struct MaleFemaleF
-        {
-            float mMale, mFemale;
-
-            float getValue(bool male) const;
+            int32_t mSkill; // SkillEnum
+            int32_t mBonus;
         };
 
         enum Flags
@@ -57,19 +43,25 @@ namespace ESM
             std::array<SkillBonus, 7> mBonus;
 
             // Attribute values for male/female
-            std::array<MaleFemale, 8> mAttributeValues;
+            std::array<int32_t, 16> mAttributeValues;
 
             // The actual eye level height (in game units) is (probably) given
             // as 'height' times 128. This has not been tested yet.
-            MaleFemaleF mHeight, mWeight;
+            float mMaleHeight, mFemaleHeight, mMaleWeight, mFemaleWeight;
 
-            int mFlags; // 0x1 - playable, 0x2 - beast race
+            int32_t mFlags; // 0x1 - playable, 0x2 - beast race
+
+            int32_t getAttribute(ESM::RefId attribute, bool male) const;
+            void setAttribute(ESM::RefId attribute, bool male, int32_t value);
+
+            void load(ESMReader& esm);
+            void save(ESMWriter& esm) const;
 
         }; // Size = 140 bytes
 
         RADTstruct mData;
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         std::string mName, mDescription;
         RefId mId;
         SpellList mPowers;
diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 3411d49a7c..63e785882e 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -2,6 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include <components/esm/common.hpp>
 
 namespace ESM
 {
@@ -27,15 +28,14 @@ namespace ESM
                 {
                     esm.getSubHeader();
                     // Cold weather not included before 1.3
-                    if (esm.getSubSize() == sizeof(mData))
+                    if (esm.getSubSize() == mData.mProbabilities.size())
                     {
-                        esm.getTSized<10>(mData);
+                        esm.getT(mData.mProbabilities);
                     }
-                    else if (esm.getSubSize() == sizeof(mData) - 2)
+                    else if (esm.getSubSize() == mData.mProbabilities.size() - 2)
                     {
-                        mData.mSnow = 0;
-                        mData.mBlizzard = 0;
-                        esm.getExact(&mData, sizeof(mData) - 2);
+                        mData.mProbabilities.fill(0);
+                        esm.getExact(&mData.mProbabilities, esm.getSubSize());
                     }
                     else
                     {
@@ -84,10 +84,10 @@ namespace ESM
 
         esm.writeHNOCString("FNAM", mName);
 
-        if (esm.getVersion() == VER_12)
-            esm.writeHNT("WEAT", mData, sizeof(mData) - 2);
+        if (esm.getVersion() == VER_120)
+            esm.writeHNT("WEAT", mData.mProbabilities, mData.mProbabilities.size() - 2);
         else
-            esm.writeHNT("WEAT", mData);
+            esm.writeHNT("WEAT", mData.mProbabilities);
 
         esm.writeHNOCRefId("BNAM", mSleepList);
 
@@ -104,8 +104,7 @@ namespace ESM
     void Region::blank()
     {
         mRecordFlags = 0;
-        mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain = mData.mThunder = mData.mAsh
-            = mData.mBlight = mData.mSnow = mData.mBlizzard = 0;
+        mData.mProbabilities.fill(0);
 
         mMapColor = 0;
 
diff --git a/components/esm3/loadregn.hpp b/components/esm3/loadregn.hpp
index 00c5546e2f..757566a360 100644
--- a/components/esm3/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESM_REGN_H
 #define OPENMW_ESM_REGN_H
 
+#include <array>
 #include <string>
 #include <vector>
 
@@ -24,26 +25,24 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "Region"; }
 
-#pragma pack(push)
-#pragma pack(1)
         struct WEATstruct
         {
             // These are probabilities that add up to 100
-            unsigned char mClear, mCloudy, mFoggy, mOvercast, mRain, mThunder, mAsh, mBlight, mSnow, mBlizzard;
+            // Clear, Cloudy, Foggy, Overcast, Rain, Thunder, Ash, Blight, Snow, Blizzard
+            std::array<uint8_t, 10> mProbabilities;
         }; // 10 bytes
-#pragma pack(pop)
 
         // Reference to a sound that is played randomly in this region
         struct SoundRef
         {
             ESM::RefId mSound;
-            unsigned char mChance;
+            uint8_t mChance;
         };
 
         WEATstruct mData;
-        int mMapColor; // RGBA
+        int32_t mMapColor; // RGBA
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         // sleepList refers to a leveled list of creatures you can meet if
         // you sleep outside in this region.
         RefId mId, mSleepList;
diff --git a/components/esm3/loadrepa.cpp b/components/esm3/loadrepa.cpp
index ea0fc29f19..886072ab56 100644
--- a/components/esm3/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Repair::Data> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mUses, v.mQuality);
+    }
+
     void Repair::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -28,7 +36,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("RIDT"):
-                    esm.getHTSized<16>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -66,7 +74,7 @@ namespace ESM
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
 
-        esm.writeHNT("RIDT", mData, 16);
+        esm.writeNamedComposite("RIDT", mData);
         esm.writeHNORefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
     }
diff --git a/components/esm3/loadrepa.hpp b/components/esm3/loadrepa.hpp
index 63f0a2959d..37fe94c349 100644
--- a/components/esm3/loadrepa.hpp
+++ b/components/esm3/loadrepa.hpp
@@ -22,14 +22,14 @@ namespace ESM
         struct Data
         {
             float mWeight;
-            int mValue;
+            int32_t mValue;
 
-            int mUses;
+            int32_t mUses;
             float mQuality;
         }; // Size = 16
 
         Data mData;
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mScript;
         std::string mName, mModel, mIcon;
 
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index 51752deca3..91f952f3f0 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -1,83 +1,105 @@
 #include "loadscpt.hpp"
 
 #include <algorithm>
+#include <numeric>
+#include <optional>
 #include <sstream>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/concepts.hpp>
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
 namespace ESM
 {
-    void Script::loadSCVR(ESMReader& esm)
+    namespace
     {
-        int s = mData.mStringTableSize;
-
-        std::vector<char> tmp(s);
-        // not using getHExact, vanilla doesn't seem to mind unused bytes at the end
-        esm.getSubHeader();
-        int left = esm.getSubSize();
-        if (left < s)
-            esm.fail("SCVR string list is smaller than specified");
-        esm.getExact(tmp.data(), s);
-        if (left > s)
-            esm.skip(left - s); // skip the leftover junk
-
-        // Set up the list of variable names
-        mVarNames.resize(mData.mNumShorts + mData.mNumLongs + mData.mNumFloats);
-
-        // The tmp buffer is a null-byte separated string list, we
-        // just have to pick out one string at a time.
-        char* str = tmp.data();
-        if (tmp.empty())
+        struct SCHD
         {
-            if (mVarNames.size() > 0)
-                Log(Debug::Warning) << "SCVR with no variable names";
+            /// Data from script-precompling in the editor.
+            /// \warning Do not use them. OpenCS currently does not precompile scripts.
+            std::uint32_t mNumShorts = 0;
+            std::uint32_t mNumLongs = 0;
+            std::uint32_t mNumFloats = 0;
+            std::uint32_t mScriptDataSize = 0;
+            std::uint32_t mStringTableSize = 0;
+        };
 
-            return;
+        template <Misc::SameAsWithoutCvref<SCHD> T>
+        void decompose(T&& v, const auto& f)
+        {
+            f(v.mNumShorts, v.mNumLongs, v.mNumFloats, v.mScriptDataSize, v.mStringTableSize);
         }
 
-        // Support '\r' terminated strings like vanilla.  See Bug #1324.
-        std::replace(tmp.begin(), tmp.end(), '\r', '\0');
-        // Avoid heap corruption
-        if (tmp.back() != '\0')
+        void loadVarNames(const SCHD& header, std::vector<std::string>& varNames, ESMReader& esm)
         {
-            tmp.emplace_back('\0');
-            std::stringstream ss;
-            ss << "Malformed string table";
-            ss << "\n  File: " << esm.getName();
-            ss << "\n  Record: " << esm.getContext().recName.toStringView();
-            ss << "\n  Subrecord: "
-               << "SCVR";
-            ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
-            Log(Debug::Verbose) << ss.str();
-            str = tmp.data();
-        }
+            uint32_t s = header.mStringTableSize;
 
-        const auto tmpEnd = tmp.data() + tmp.size();
-        for (size_t i = 0; i < mVarNames.size(); i++)
-        {
-            mVarNames[i] = std::string(str);
-            str += mVarNames[i].size() + 1;
-            if (str >= tmpEnd)
+            std::vector<char> tmp(s);
+            // not using getHExact, vanilla doesn't seem to mind unused bytes at the end
+            esm.getSubHeader();
+            uint32_t left = esm.getSubSize();
+            if (left < s)
+                esm.fail("SCVR string list is smaller than specified");
+            esm.getExact(tmp.data(), s);
+            if (left > s)
+                esm.skip(left - s); // skip the leftover junk
+
+            // Set up the list of variable names
+            varNames.resize(header.mNumShorts + header.mNumLongs + header.mNumFloats);
+
+            // The tmp buffer is a null-byte separated string list, we
+            // just have to pick out one string at a time.
+            if (tmp.empty())
             {
-                if (str > tmpEnd)
+                if (!varNames.empty())
+                    Log(Debug::Warning) << "SCVR with no variable names";
+
+                return;
+            }
+
+            // Support '\r' terminated strings like vanilla.  See Bug #1324.
+            std::replace(tmp.begin(), tmp.end(), '\r', '\0');
+            // Avoid heap corruption
+            if (tmp.back() != '\0')
+            {
+                tmp.push_back('\0');
+                std::stringstream ss;
+                ss << "Malformed string table";
+                ss << "\n  File: " << esm.getName();
+                ss << "\n  Record: " << esm.getContext().recName.toStringView();
+                ss << "\n  Subrecord: "
+                   << "SCVR";
+                ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
+                Log(Debug::Verbose) << ss.str();
+            }
+
+            const char* str = tmp.data();
+            const char* const tmpEnd = tmp.data() + tmp.size();
+            for (size_t i = 0; i < varNames.size(); i++)
+            {
+                varNames[i] = std::string(str);
+                str += varNames[i].size() + 1;
+                if (str >= tmpEnd)
                 {
-                    // SCVR subrecord is unused and variable names are determined
-                    // from the script source, so an overflow is not fatal.
-                    std::stringstream ss;
-                    ss << "String table overflow";
-                    ss << "\n  File: " << esm.getName();
-                    ss << "\n  Record: " << esm.getContext().recName.toStringView();
-                    ss << "\n  Subrecord: "
-                       << "SCVR";
-                    ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
-                    Log(Debug::Verbose) << ss.str();
+                    if (str > tmpEnd)
+                    {
+                        // SCVR subrecord is unused and variable names are determined
+                        // from the script source, so an overflow is not fatal.
+                        std::stringstream ss;
+                        ss << "String table overflow";
+                        ss << "\n  File: " << esm.getName();
+                        ss << "\n  Record: " << esm.getContext().recName.toStringView();
+                        ss << "\n  Subrecord: "
+                           << "SCVR";
+                        ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
+                        Log(Debug::Verbose) << ss.str();
+                    }
+                    // Get rid of empty strings in the list.
+                    varNames.resize(i + 1);
+                    break;
                 }
-                // Get rid of empty strings in the list.
-                mVarNames.resize(i + 1);
-                break;
             }
         }
     }
@@ -89,7 +111,7 @@ namespace ESM
 
         mVarNames.clear();
 
-        bool hasHeader = false;
+        std::optional<SCHD> header;
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
@@ -99,22 +121,27 @@ namespace ESM
                 {
                     esm.getSubHeader();
                     mId = esm.getMaybeFixedRefIdSize(32);
-                    esm.getTSized<20>(mData);
-
-                    hasHeader = true;
+                    esm.getComposite(header.emplace());
+                    mNumShorts = header->mNumShorts;
+                    mNumLongs = header->mNumLongs;
+                    mNumFloats = header->mNumFloats;
                     break;
                 }
                 case fourCC("SCVR"):
-                    // list of local variables
-                    loadSCVR(esm);
+                    if (!header.has_value())
+                        esm.fail("SCVR is placed before SCHD record");
+                    loadVarNames(*header, mVarNames, esm);
                     break;
                 case fourCC("SCDT"):
                 {
+                    if (!header.has_value())
+                        esm.fail("SCDT is placed before SCHD record");
+
                     // compiled script
                     esm.getSubHeader();
                     uint32_t subSize = esm.getSubSize();
 
-                    if (subSize != static_cast<uint32_t>(mData.mScriptDataSize))
+                    if (subSize != header->mScriptDataSize)
                     {
                         std::stringstream ss;
                         ss << "Script data size defined in SCHD subrecord does not match size of SCDT subrecord";
@@ -140,20 +167,21 @@ namespace ESM
             }
         }
 
-        if (!hasHeader)
+        if (!header.has_value())
             esm.fail("Missing SCHD subrecord");
     }
 
     void Script::save(ESMWriter& esm, bool isDeleted) const
     {
-        std::string varNameString;
-        if (!mVarNames.empty())
-            for (std::vector<std::string>::const_iterator it = mVarNames.begin(); it != mVarNames.end(); ++it)
-                varNameString.append(*it);
-
         esm.startSubRecord("SCHD");
         esm.writeMaybeFixedSizeRefId(mId, 32);
-        esm.writeT(mData, 20);
+        esm.writeComposite(SCHD{
+            .mNumShorts = mNumShorts,
+            .mNumLongs = mNumLongs,
+            .mNumFloats = mNumFloats,
+            .mScriptDataSize = static_cast<std::uint32_t>(mScriptData.size()),
+            .mStringTableSize = computeScriptStringTableSize(mVarNames),
+        });
         esm.endRecord("SCHD");
 
         if (isDeleted)
@@ -165,15 +193,13 @@ namespace ESM
         if (!mVarNames.empty())
         {
             esm.startSubRecord("SCVR");
-            for (std::vector<std::string>::const_iterator it = mVarNames.begin(); it != mVarNames.end(); ++it)
-            {
-                esm.writeHCString(*it);
-            }
+            for (const std::string& v : mVarNames)
+                esm.writeHCString(v);
             esm.endRecord("SCVR");
         }
 
         esm.startSubRecord("SCDT");
-        esm.write(reinterpret_cast<const char*>(mScriptData.data()), mData.mScriptDataSize);
+        esm.write(reinterpret_cast<const char*>(mScriptData.data()), mScriptData.size());
         esm.endRecord("SCDT");
 
         esm.writeHNOString("SCTX", mScriptText);
@@ -182,9 +208,9 @@ namespace ESM
     void Script::blank()
     {
         mRecordFlags = 0;
-        mData.mNumShorts = mData.mNumLongs = mData.mNumFloats = 0;
-        mData.mScriptDataSize = 0;
-        mData.mStringTableSize = 0;
+        mNumShorts = 0;
+        mNumLongs = 0;
+        mNumFloats = 0;
 
         mVarNames.clear();
         mScriptData.clear();
@@ -195,4 +221,9 @@ namespace ESM
             mScriptText = "Begin " + stringId + "\n\nEnd " + stringId + "\n";
     }
 
+    std::uint32_t computeScriptStringTableSize(const std::vector<std::string>& varNames)
+    {
+        return std::accumulate(varNames.begin(), varNames.end(), static_cast<std::uint32_t>(0),
+            [](std::uint32_t r, const std::string& v) { return r + 1 + static_cast<std::uint32_t>(v.size()); });
+    }
 }
diff --git a/components/esm3/loadscpt.hpp b/components/esm3/loadscpt.hpp
index f0fab766cf..2b98807e7b 100644
--- a/components/esm3/loadscpt.hpp
+++ b/components/esm3/loadscpt.hpp
@@ -1,11 +1,12 @@
 #ifndef OPENMW_ESM_SCPT_H
 #define OPENMW_ESM_SCPT_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
-#include "components/esm/defs.hpp"
-#include "components/esm/refid.hpp"
+#include <components/esm/defs.hpp>
+#include <components/esm/refid.hpp>
 
 namespace ESM
 {
@@ -25,22 +26,12 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "Script"; }
 
-        struct SCHDstruct
-        {
-            /// Data from script-precompling in the editor.
-            /// \warning Do not use them. OpenCS currently does not precompile scripts.
-            int mNumShorts, mNumLongs, mNumFloats, mScriptDataSize, mStringTableSize;
-        };
-        struct SCHD
-        {
-            std::string mName;
-            Script::SCHDstruct mData;
-        };
-
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
 
-        SCHDstruct mData;
+        std::uint32_t mNumShorts;
+        std::uint32_t mNumLongs;
+        std::uint32_t mNumFloats;
 
         /// Variable names generated by script-precompiling in the editor.
         /// \warning Do not use this field. OpenCS currently does not precompile scripts.
@@ -58,9 +49,8 @@ namespace ESM
 
         void blank();
         ///< Set record to default state (does not touch the ID/index).
-
-    private:
-        void loadSCVR(ESMReader& esm);
     };
+
+    std::uint32_t computeScriptStringTableSize(const std::vector<std::string>& varNames);
 }
 #endif
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index 8661230e8c..28ea3eadba 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -3,6 +3,7 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
 #include <cstdint>
@@ -37,6 +38,12 @@ namespace ESM
     const SkillId Skill::Speechcraft("Speechcraft");
     const SkillId Skill::HandToHand("HandToHand");
 
+    template <Misc::SameAsWithoutCvref<Skill::SKDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mAttribute, v.mSpecialization, v.mUseValue);
+    }
+
     void Skill::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false; // Skill record can't be deleted now (may be changed in the future)
@@ -55,7 +62,7 @@ namespace ESM
                     hasIndex = true;
                     break;
                 case fourCC("SKDT"):
-                    esm.getHTSized<24>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("DESC"):
@@ -78,7 +85,7 @@ namespace ESM
     void Skill::save(ESMWriter& esm, bool /*isDeleted*/) const
     {
         esm.writeHNT("INDX", refIdToIndex(mId));
-        esm.writeHNT("SKDT", mData, 24);
+        esm.writeNamedComposite("SKDT", mData);
         esm.writeHNOString("DESC", mDescription);
     }
 
diff --git a/components/esm3/loadskil.hpp b/components/esm3/loadskil.hpp
index dac7745d3f..d8e365aca1 100644
--- a/components/esm3/loadskil.hpp
+++ b/components/esm3/loadskil.hpp
@@ -24,7 +24,7 @@ namespace ESM
         ESM::RefId mFailureSound;
         ESM::RefId mHitSound;
         std::string mName;
-        int mAutoCalcMax;
+        int32_t mAutoCalcMax;
 
         static constexpr int Length = 6;
 
@@ -44,16 +44,48 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "Skill"; }
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         SkillId mId;
 
+        //! Enum that defines the index into SKDTstruct::mUseValue for all vanilla skill uses
+        enum UseType
+        {
+            // These are shared by multiple skills
+            Armor_HitByOpponent = 0,
+            Block_Success = 0,
+            Spellcast_Success = 0,
+            Weapon_SuccessfulHit = 0,
+
+            // Skill-specific use types
+            Alchemy_CreatePotion = 0,
+            Alchemy_UseIngredient = 1,
+            Enchant_Recharge = 0,
+            Enchant_UseMagicItem = 1,
+            Enchant_CreateMagicItem = 2,
+            Enchant_CastOnStrike = 3,
+            Acrobatics_Jump = 0,
+            Acrobatics_Fall = 1,
+            Mercantile_Success = 0,
+            Mercantile_Bribe = 1, //!< \Note This is bugged in vanilla and is not actually in use.
+            Security_DisarmTrap = 0,
+            Security_PickLock = 1,
+            Sneak_AvoidNotice = 0,
+            Sneak_PickPocket = 1,
+            Speechcraft_Success = 0,
+            Speechcraft_Fail = 1,
+            Armorer_Repair = 0,
+            Athletics_RunOneSecond = 0,
+            Athletics_SwimOneSecond = 1,
+
+        };
+
         struct SKDTstruct
         {
-            int mAttribute; // see defs.hpp
-            int mSpecialization; // 0 - Combat, 1 - Magic, 2 - Stealth
+            int32_t mAttribute; // see defs.hpp
+            int32_t mSpecialization; // 0 - Combat, 1 - Magic, 2 - Stealth
             float mUseValue[4]; // How much skill improves through use. Meaning
                                 // of each field depends on what skill this
-                                // is. We should document this better later.
+                                // is. See UseType above
         }; // Total size: 24 bytes
         SKDTstruct mData;
 
diff --git a/components/esm3/loadsndg.cpp b/components/esm3/loadsndg.cpp
index 4e2e2aa3f9..12a68b3afe 100644
--- a/components/esm3/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -57,7 +57,7 @@ namespace ESM
             return;
         }
 
-        esm.writeHNT("DATA", mType, 4);
+        esm.writeHNT("DATA", mType);
         esm.writeHNOCRefId("CNAM", mCreature);
         esm.writeHNOCRefId("SNAM", mSound);
     }
diff --git a/components/esm3/loadsndg.hpp b/components/esm3/loadsndg.hpp
index fff4b98439..3337220d9d 100644
--- a/components/esm3/loadsndg.hpp
+++ b/components/esm3/loadsndg.hpp
@@ -36,9 +36,9 @@ namespace ESM
         };
 
         // Type
-        int mType;
+        int32_t mType;
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mCreature, mSound;
 
         void load(ESMReader& esm, bool& isDeleted);
diff --git a/components/esm3/loadsoun.cpp b/components/esm3/loadsoun.cpp
index af7d7b3710..6f72a49a60 100644
--- a/components/esm3/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<SOUNstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mVolume, v.mMinRange, v.mMaxRange);
+    }
+
     void Sound::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -25,7 +33,7 @@ namespace ESM
                     mSound = esm.getHString();
                     break;
                 case fourCC("DATA"):
-                    esm.getHTSized<3>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case SREC_DELE:
@@ -55,7 +63,7 @@ namespace ESM
         }
 
         esm.writeHNOCString("FNAM", mSound);
-        esm.writeHNT("DATA", mData, 3);
+        esm.writeNamedComposite("DATA", mData);
     }
 
     void Sound::blank()
diff --git a/components/esm3/loadsoun.hpp b/components/esm3/loadsoun.hpp
index 0da915b0f1..0129d1fe40 100644
--- a/components/esm3/loadsoun.hpp
+++ b/components/esm3/loadsoun.hpp
@@ -25,7 +25,7 @@ namespace ESM
         static std::string_view getRecordType() { return "Sound"; }
 
         SOUNstruct mData;
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         std::string mSound;
         RefId mId;
 
diff --git a/components/esm3/loadspel.cpp b/components/esm3/loadspel.cpp
index d94073d33c..e40c03d007 100644
--- a/components/esm3/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -3,8 +3,16 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Spell::SPDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mType, v.mCost, v.mFlags);
+    }
+
     void Spell::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -27,13 +35,11 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("SPDT"):
-                    esm.getHTSized<12>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("ENAM"):
-                    ENAMstruct s;
-                    esm.getHTSized<24>(s);
-                    mEffects.mList.push_back(s);
+                    mEffects.add(esm);
                     break;
                 case SREC_DELE:
                     esm.skipHSub();
@@ -62,7 +68,7 @@ namespace ESM
         }
 
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("SPDT", mData, 12);
+        esm.writeNamedComposite("SPDT", mData);
         mEffects.save(esm);
     }
 
diff --git a/components/esm3/loadspel.hpp b/components/esm3/loadspel.hpp
index 50ed65d3de..6477f8c7df 100644
--- a/components/esm3/loadspel.hpp
+++ b/components/esm3/loadspel.hpp
@@ -39,13 +39,13 @@ namespace ESM
 
         struct SPDTstruct
         {
-            int mType; // SpellType
-            int mCost; // Mana cost
-            int mFlags; // Flags
+            int32_t mType; // SpellType
+            int32_t mCost; // Mana cost
+            int32_t mFlags; // Flags
         };
 
         SPDTstruct mData;
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         std::string mName;
         RefId mId;
         EffectList mEffects;
diff --git a/components/esm3/loadsscr.hpp b/components/esm3/loadsscr.hpp
index 6c9163e4e6..34349d8ea4 100644
--- a/components/esm3/loadsscr.hpp
+++ b/components/esm3/loadsscr.hpp
@@ -28,7 +28,7 @@ namespace ESM
         static std::string_view getRecordType() { return "StartScript"; }
 
         std::string mData;
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
 
         // Load a record and add it to the list
diff --git a/components/esm3/loadstat.hpp b/components/esm3/loadstat.hpp
index abe589563b..4c0341f4ea 100644
--- a/components/esm3/loadstat.hpp
+++ b/components/esm3/loadstat.hpp
@@ -31,7 +31,7 @@ namespace ESM
         /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
         static std::string_view getRecordType() { return "Static"; }
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId;
         std::string mModel;
 
diff --git a/components/esm3/loadtes3.cpp b/components/esm3/loadtes3.cpp
index 86b62234da..eeb2d38761 100644
--- a/components/esm3/loadtes3.cpp
+++ b/components/esm3/loadtes3.cpp
@@ -9,7 +9,7 @@ namespace ESM
 
     void Header::blank()
     {
-        mData.version = VER_13;
+        mData.version.ui = VER_130;
         mData.type = 0;
         mData.author.clear();
         mData.desc.clear();
@@ -20,15 +20,13 @@ namespace ESM
 
     void Header::load(ESMReader& esm)
     {
-        if (esm.isNextSub("FORM"))
-            esm.getHT(mFormatVersion);
-        else
-            mFormatVersion = DefaultFormatVersion;
+        mFormatVersion = DefaultFormatVersion;
+        esm.getHNOT("FORM", mFormatVersion);
 
         if (esm.isNextSub("HEDR"))
         {
             esm.getSubHeader();
-            esm.getT(mData.version);
+            esm.getT(mData.version.ui);
             esm.getT(mData.type);
             mData.author = esm.getMaybeFixedStringSize(32);
             mData.desc = esm.getMaybeFixedStringSize(256);
@@ -43,10 +41,8 @@ namespace ESM
             mMaster.push_back(m);
         }
 
-        if (esm.isNextSub("GMDT"))
-        {
-            esm.getHTSized<124>(mGameData);
-        }
+        esm.getHNOT("GMDT", mGameData.mCurrentHealth, mGameData.mMaximumHealth, mGameData.mHour, mGameData.unknown1,
+            mGameData.mCurrentCell.mData, mGameData.unknown2, mGameData.mPlayerName.mData);
         if (esm.isNextSub("SCRD"))
         {
             esm.getSubHeader();
diff --git a/components/esm3/loadtes3.hpp b/components/esm3/loadtes3.hpp
index 7927b35cee..54fd303485 100644
--- a/components/esm3/loadtes3.hpp
+++ b/components/esm3/loadtes3.hpp
@@ -3,6 +3,7 @@
 
 #include <vector>
 
+#include "components/esm/common.hpp"
 #include "components/esm/esmcommon.hpp"
 #include "components/esm3/formatversion.hpp"
 
@@ -11,20 +12,13 @@ namespace ESM
     class ESMReader;
     class ESMWriter;
 
-#pragma pack(push)
-#pragma pack(1)
-
     struct Data
     {
-        /* File format version. This is actually a float, the supported
-            versions are 1.2 and 1.3. These correspond to:
-            1.2 = 0x3f99999a and 1.3 = 0x3fa66666
-        */
-        unsigned int version;
-        int type; // 0=esp, 1=esm, 32=ess (unused)
+        ESM::ESMVersion version;
+        int32_t type; // 0=esp, 1=esm, 32=ess (unused)
         std::string author; // Author's name
         std::string desc; // File description
-        int records; // Number of records
+        int32_t records; // Number of records
     };
 
     struct GMDT
@@ -38,8 +32,6 @@ namespace ESM
         NAME32 mPlayerName;
     };
 
-#pragma pack(pop)
-
     /// \brief File header record
     struct Header
     {
diff --git a/components/esm3/loadweap.cpp b/components/esm3/loadweap.cpp
index 501f0602e4..f06abf4e7c 100644
--- a/components/esm3/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -1,11 +1,20 @@
 #include "loadweap.hpp"
 
-#include "components/esm/defs.hpp"
+#include <components/esm/defs.hpp>
+#include <components/misc/concepts.hpp>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<Weapon::WPDTstruct> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mWeight, v.mValue, v.mType, v.mHealth, v.mSpeed, v.mReach, v.mEnchant, v.mChop, v.mSlash, v.mThrust,
+            v.mFlags);
+    }
+
     void Weapon::load(ESMReader& esm, bool& isDeleted)
     {
         isDeleted = false;
@@ -29,7 +38,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case fourCC("WPDT"):
-                    esm.getHTSized<32>(mData);
+                    esm.getSubComposite(mData);
                     hasData = true;
                     break;
                 case fourCC("SCRI"):
@@ -67,7 +76,7 @@ namespace ESM
 
         esm.writeHNCString("MODL", mModel);
         esm.writeHNOCString("FNAM", mName);
-        esm.writeHNT("WPDT", mData, 32);
+        esm.writeNamedComposite("WPDT", mData);
         esm.writeHNOCRefId("SCRI", mScript);
         esm.writeHNOCString("ITEX", mIcon);
         esm.writeHNOCRefId("ENAM", mEnchant);
@@ -83,9 +92,9 @@ namespace ESM
         mData.mSpeed = 0;
         mData.mReach = 0;
         mData.mEnchant = 0;
-        mData.mChop[0] = mData.mChop[1] = 0;
-        mData.mSlash[0] = mData.mSlash[1] = 0;
-        mData.mThrust[0] = mData.mThrust[1] = 0;
+        mData.mChop.fill(0);
+        mData.mSlash.fill(0);
+        mData.mThrust.fill(0);
         mData.mFlags = 0;
 
         mName.clear();
diff --git a/components/esm3/loadweap.hpp b/components/esm3/loadweap.hpp
index 6eec3a9ef4..8323176a64 100644
--- a/components/esm3/loadweap.hpp
+++ b/components/esm3/loadweap.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESM_WEAP_H
 #define OPENMW_ESM_WEAP_H
 
+#include <array>
 #include <string>
 
 #include "components/esm/refid.hpp"
@@ -24,6 +25,7 @@ namespace ESM
 
         enum Type
         {
+            First = -4,
             PickProbe = -4,
             HandToHand = -3,
             Spell = -2,
@@ -41,7 +43,8 @@ namespace ESM
             MarksmanCrossbow = 10,
             MarksmanThrown = 11,
             Arrow = 12,
-            Bolt = 13
+            Bolt = 13,
+            Last = 13
         };
 
         enum AttackType
@@ -57,24 +60,21 @@ namespace ESM
             Silver = 0x02
         };
 
-#pragma pack(push)
-#pragma pack(1)
         struct WPDTstruct
         {
             float mWeight;
-            int mValue;
-            short mType;
-            unsigned short mHealth;
+            int32_t mValue;
+            int16_t mType;
+            uint16_t mHealth;
             float mSpeed, mReach;
-            unsigned short mEnchant; // Enchantment points. The real value is mEnchant/10.f
-            unsigned char mChop[2], mSlash[2], mThrust[2]; // Min and max
-            int mFlags;
+            uint16_t mEnchant; // Enchantment points. The real value is mEnchant/10.f
+            std::array<unsigned char, 2> mChop, mSlash, mThrust; // Min and max
+            int32_t mFlags;
         }; // 32 bytes
-#pragma pack(pop)
 
         WPDTstruct mData;
 
-        unsigned int mRecordFlags;
+        uint32_t mRecordFlags;
         RefId mId, mEnchant, mScript;
         std::string mName, mModel, mIcon;
 
diff --git a/components/esm3/magiceffects.cpp b/components/esm3/magiceffects.cpp
index 346cc2c568..a8a759949b 100644
--- a/components/esm3/magiceffects.cpp
+++ b/components/esm3/magiceffects.cpp
@@ -20,8 +20,8 @@ namespace ESM
     {
         while (esm.isNextSub("EFID"))
         {
-            int id;
-            std::pair<int, float> params;
+            int32_t id;
+            std::pair<int32_t, float> params;
             esm.getHT(id);
             esm.getHNT(params.first, "BASE");
             if (esm.getFormatVersion() <= MaxClearModifiersFormatVersion)
diff --git a/components/esm3/magiceffects.hpp b/components/esm3/magiceffects.hpp
index 3f141355c8..74a6e34743 100644
--- a/components/esm3/magiceffects.hpp
+++ b/components/esm3/magiceffects.hpp
@@ -16,7 +16,7 @@ namespace ESM
     struct MagicEffects
     {
         // <Effect Id, Base value, Modifier>
-        std::map<int, std::pair<int, float>> mEffects;
+        std::map<int32_t, std::pair<int32_t, float>> mEffects;
 
         void load(ESMReader& esm);
         void save(ESMWriter& esm) const;
@@ -24,16 +24,16 @@ namespace ESM
 
     struct SummonKey
     {
-        SummonKey(int effectId, const ESM::RefId& sourceId, int index)
+        SummonKey(int32_t effectId, const ESM::RefId& sourceId, int32_t index)
             : mEffectId(effectId)
             , mSourceId(sourceId)
             , mEffectIndex(index)
         {
         }
 
-        int mEffectId;
+        int32_t mEffectId;
         ESM::RefId mSourceId;
-        int mEffectIndex;
+        int32_t mEffectIndex;
     };
 
     inline auto makeTupleRef(const SummonKey& value) noexcept
diff --git a/components/esm3/npcstats.cpp b/components/esm3/npcstats.cpp
index c34205f6c2..371f506fb4 100644
--- a/components/esm3/npcstats.cpp
+++ b/components/esm3/npcstats.cpp
@@ -21,7 +21,7 @@ namespace ESM
 
             Faction faction;
 
-            int expelled = 0;
+            int32_t expelled = 0;
             esm.getHNOT(expelled, "FAEX");
 
             if (expelled)
@@ -37,50 +37,13 @@ namespace ESM
         mDisposition = 0;
         esm.getHNOT(mDisposition, "DISP");
 
+        mCrimeDispositionModifier = 0;
+        esm.getHNOT(mCrimeDispositionModifier, "DISM");
+
         const bool intFallback = esm.getFormatVersion() <= MaxIntFallbackFormatVersion;
         for (auto& skill : mSkills)
             skill.load(esm, intFallback);
 
-        mWerewolfDeprecatedData = false;
-        if (esm.getFormatVersion() <= MaxWerewolfDeprecatedDataFormatVersion && esm.peekNextSub("STBA"))
-        {
-            // we have deprecated werewolf skills, stored interleaved
-            // Load into one big vector, then remove every 2nd value
-            mWerewolfDeprecatedData = true;
-            std::vector<StatState<float>> skills(mSkills.begin(), mSkills.end());
-
-            for (size_t i = 0; i < std::size(mSkills); ++i)
-            {
-                StatState<float> skill;
-                skill.load(esm, intFallback);
-                skills.push_back(skill);
-            }
-
-            int i = 0;
-            for (std::vector<StatState<float>>::iterator it = skills.begin(); it != skills.end(); ++i)
-            {
-                if (i % 2 == 1)
-                    it = skills.erase(it);
-                else
-                    ++it;
-            }
-            if (skills.size() != std::size(mSkills))
-                throw std::runtime_error(
-                    "Invalid number of skill for werewolf deprecated data: " + std::to_string(skills.size()));
-            std::copy(skills.begin(), skills.end(), mSkills.begin());
-        }
-
-        // No longer used
-        bool hasWerewolfAttributes = false;
-        esm.getHNOT(hasWerewolfAttributes, "HWAT");
-        if (hasWerewolfAttributes)
-        {
-            StatState<int> dummy;
-            for (int i = 0; i < ESM::Attribute::Length; ++i)
-                dummy.load(esm, intFallback);
-            mWerewolfDeprecatedData = true;
-        }
-
         mIsWerewolf = false;
         esm.getHNOT(mIsWerewolf, "WOLF");
 
@@ -93,14 +56,6 @@ namespace ESM
         mWerewolfKills = 0;
         esm.getHNOT(mWerewolfKills, "WKIL");
 
-        // No longer used
-        if (esm.isNextSub("PROF"))
-            esm.skipHSub(); // int profit
-
-        // No longer used
-        if (esm.isNextSub("ASTR"))
-            esm.skipHSub(); // attackStrength
-
         mLevelProgress = 0;
         esm.getHNOT(mLevelProgress, "LPRO");
 
@@ -116,40 +71,35 @@ namespace ESM
         mTimeToStartDrowning = 0;
         esm.getHNOT(mTimeToStartDrowning, "DRTI");
 
-        // No longer used
-        float lastDrowningHit = 0;
-        esm.getHNOT(lastDrowningHit, "DRLH");
-
-        // No longer used
-        float levelHealthBonus = 0;
-        esm.getHNOT(levelHealthBonus, "LVLH");
-
         mCrimeId = -1;
         esm.getHNOT(mCrimeId, "CRID");
     }
 
     void NpcStats::save(ESMWriter& esm) const
     {
-        for (auto iter(mFactions.begin()); iter != mFactions.end(); ++iter)
+        for (const auto& [id, faction] : mFactions)
         {
-            esm.writeHNRefId("FACT", iter->first);
+            esm.writeHNRefId("FACT", id);
 
-            if (iter->second.mExpelled)
+            if (faction.mExpelled)
             {
-                int expelled = 1;
+                int32_t expelled = 1;
                 esm.writeHNT("FAEX", expelled);
             }
 
-            if (iter->second.mRank >= 0)
-                esm.writeHNT("FARA", iter->second.mRank);
+            if (faction.mRank >= 0)
+                esm.writeHNT("FARA", faction.mRank);
 
-            if (iter->second.mReputation)
-                esm.writeHNT("FARE", iter->second.mReputation);
+            if (faction.mReputation)
+                esm.writeHNT("FARE", faction.mReputation);
         }
 
         if (mDisposition)
             esm.writeHNT("DISP", mDisposition);
 
+        if (mCrimeDispositionModifier)
+            esm.writeHNT("DISM", mCrimeDispositionModifier);
+
         for (const auto& skill : mSkills)
             skill.save(esm);
 
@@ -169,7 +119,7 @@ namespace ESM
             esm.writeHNT("LPRO", mLevelProgress);
 
         bool saveSkillIncreases = false;
-        for (int increase : mSkillIncrease)
+        for (int32_t increase : mSkillIncrease)
         {
             if (increase != 0)
             {
@@ -183,8 +133,8 @@ namespace ESM
         if (mSpecIncreases[0] != 0 || mSpecIncreases[1] != 0 || mSpecIncreases[2] != 0)
             esm.writeHNT("SPEC", mSpecIncreases);
 
-        for (auto iter(mUsedIds.begin()); iter != mUsedIds.end(); ++iter)
-            esm.writeHNRefId("USED", *iter);
+        for (const RefId& id : mUsedIds)
+            esm.writeHNRefId("USED", id);
 
         if (mTimeToStartDrowning)
             esm.writeHNT("DRTI", mTimeToStartDrowning);
@@ -195,9 +145,9 @@ namespace ESM
 
     void NpcStats::blank()
     {
-        mWerewolfDeprecatedData = false;
         mIsWerewolf = false;
         mDisposition = 0;
+        mCrimeDispositionModifier = 0;
         mBounty = 0;
         mReputation = 0;
         mWerewolfKills = 0;
diff --git a/components/esm3/npcstats.hpp b/components/esm3/npcstats.hpp
index e80ec04c25..b539602e06 100644
--- a/components/esm3/npcstats.hpp
+++ b/components/esm3/npcstats.hpp
@@ -23,28 +23,27 @@ namespace ESM
         struct Faction
         {
             bool mExpelled;
-            int mRank;
-            int mReputation;
+            int32_t mRank;
+            int32_t mReputation;
 
             Faction();
         };
 
         bool mIsWerewolf;
 
-        bool mWerewolfDeprecatedData;
-
-        std::map<ESM::RefId, Faction> mFactions; // lower case IDs
-        int mDisposition;
+        std::map<ESM::RefId, Faction> mFactions;
+        int32_t mDisposition;
+        int32_t mCrimeDispositionModifier;
         std::array<StatState<float>, ESM::Skill::Length> mSkills;
-        int mBounty;
-        int mReputation;
-        int mWerewolfKills;
-        int mLevelProgress;
-        std::array<int, ESM::Attribute::Length> mSkillIncrease;
-        std::array<int, 3> mSpecIncreases;
-        std::vector<ESM::RefId> mUsedIds; // lower case IDs
+        int32_t mBounty;
+        int32_t mReputation;
+        int32_t mWerewolfKills;
+        int32_t mLevelProgress;
+        std::array<int32_t, ESM::Attribute::Length> mSkillIncrease;
+        std::array<int32_t, 3> mSpecIncreases;
+        std::vector<ESM::RefId> mUsedIds;
         float mTimeToStartDrowning;
-        int mCrimeId;
+        int32_t mCrimeId;
 
         /// Initialize to default state
         void blank();
diff --git a/components/esm3/objectstate.cpp b/components/esm3/objectstate.cpp
index a56988843a..f3017e2d0d 100644
--- a/components/esm3/objectstate.cpp
+++ b/components/esm3/objectstate.cpp
@@ -29,29 +29,19 @@ namespace ESM
         mEnabled = 1;
         esm.getHNOT(mEnabled, "ENAB");
 
-        mCount = 1;
-        esm.getHNOT(mCount, "COUN");
-
-        if (esm.isNextSub("POS_"))
+        if (mVersion <= MaxOldCountFormatVersion)
         {
-            std::array<float, 6> pos;
-            esm.getHT(pos);
-            memcpy(mPosition.pos, pos.data(), sizeof(float) * 3);
-            memcpy(mPosition.rot, pos.data() + 3, sizeof(float) * 3);
+            if (mVersion <= MaxOldGoldValueFormatVersion)
+                mRef.mCount = std::max(1, mRef.mCount);
+            esm.getHNOT("COUN", mRef.mCount);
         }
-        else
-            mPosition = mRef.mPos;
 
-        if (esm.isNextSub("LROT"))
-            esm.skipHSub(); // local rotation, no longer used
+        mPosition = mRef.mPos;
+        esm.getOptionalComposite("POS_", mPosition);
 
         mFlags = 0;
         esm.getHNOT(mFlags, "FLAG");
 
-        // obsolete
-        int unused;
-        esm.getHNOT(unused, "LTIM");
-
         mAnimationState.load(esm);
 
         // FIXME: assuming "false" as default would make more sense, but also break compatibility with older save files
@@ -74,15 +64,9 @@ namespace ESM
         if (!mEnabled && !inInventory)
             esm.writeHNT("ENAB", mEnabled);
 
-        if (mCount != 1)
-            esm.writeHNT("COUN", mCount);
-
         if (!inInventory && mPosition != mRef.mPos)
         {
-            std::array<float, 6> pos;
-            memcpy(pos.data(), mPosition.pos, sizeof(float) * 3);
-            memcpy(pos.data() + 3, mPosition.rot, sizeof(float) * 3);
-            esm.writeHNT("POS_", pos, 24);
+            esm.writeNamedComposite("POS_", mPosition);
         }
 
         if (mFlags != 0)
@@ -99,7 +83,6 @@ namespace ESM
         mRef.blank();
         mHasLocals = 0;
         mEnabled = false;
-        mCount = 1;
         for (int i = 0; i < 3; ++i)
         {
             mPosition.pos[i] = 0;
@@ -179,6 +162,6 @@ namespace ESM
         throw std::logic_error(error.str());
     }
 
-    ObjectState::~ObjectState() {}
+    ObjectState::~ObjectState() = default;
 
 }
diff --git a/components/esm3/objectstate.hpp b/components/esm3/objectstate.hpp
index 67f4d27706..c947adcd97 100644
--- a/components/esm3/objectstate.hpp
+++ b/components/esm3/objectstate.hpp
@@ -4,8 +4,9 @@
 #include <string>
 #include <vector>
 
-#include "components/esm/luascripts.hpp"
-#include "components/esm3/formatversion.hpp"
+#include <components/esm/luascripts.hpp>
+#include <components/esm/position.hpp>
+#include <components/esm3/formatversion.hpp>
 
 #include "animationstate.hpp"
 #include "cellref.hpp"
@@ -32,9 +33,8 @@ namespace ESM
         Locals mLocals;
         LuaScripts mLuaScripts;
         unsigned char mEnabled;
-        int mCount;
         Position mPosition;
-        unsigned int mFlags;
+        uint32_t mFlags;
 
         // Is there any class-specific state following the ObjectState
         bool mHasCustomState;
@@ -46,7 +46,6 @@ namespace ESM
         ObjectState()
             : mHasLocals(0)
             , mEnabled(0)
-            , mCount(0)
             , mFlags(0)
             , mHasCustomState(true)
         {
diff --git a/components/esm3/player.cpp b/components/esm3/player.cpp
index 3b52f8d779..bf5864ce4c 100644
--- a/components/esm3/player.cpp
+++ b/components/esm3/player.cpp
@@ -13,16 +13,11 @@ namespace ESM
 
         mCellId = esm.getCellId();
 
-        esm.getHNTSized<12>(mLastKnownExteriorPosition, "LKEP");
+        esm.getHNT("LKEP", mLastKnownExteriorPosition);
 
-        if (esm.isNextSub("MARK"))
-        {
-            mHasMark = true;
-            esm.getHTSized<24>(mMarkedPosition);
+        mHasMark = esm.getOptionalComposite("MARK", mMarkedPosition);
+        if (mHasMark)
             mMarkedCell = esm.getCellId();
-        }
-        else
-            mHasMark = false;
 
         // Automove, no longer used.
         if (esm.isNextSub("AMOV"))
@@ -35,16 +30,12 @@ namespace ESM
         mPaidCrimeId = -1;
         esm.getHNOT(mPaidCrimeId, "PAYD");
 
-        bool checkPrevItems = true;
-        while (checkPrevItems)
+        while (esm.peekNextSub("BOUN"))
         {
-            ESM::RefId boundItemId = esm.getHNORefId("BOUN");
-            ESM::RefId prevItemId = esm.getHNORefId("PREV");
+            ESM::RefId boundItemId = esm.getHNRefId("BOUN");
+            ESM::RefId prevItemId = esm.getHNRefId("PREV");
 
-            if (!boundItemId.empty())
-                mPreviousItems[boundItemId] = prevItemId;
-            else
-                checkPrevItems = false;
+            mPreviousItems[boundItemId] = prevItemId;
         }
 
         if (esm.getFormatVersion() <= MaxOldSkillsAndAttributesFormatVersion)
@@ -99,7 +90,7 @@ namespace ESM
 
         if (mHasMark)
         {
-            esm.writeHNT("MARK", mMarkedPosition, 24);
+            esm.writeNamedComposite("MARK", mMarkedPosition);
             esm.writeCellId(mMarkedCell);
         }
 
@@ -108,10 +99,10 @@ namespace ESM
         esm.writeHNT("CURD", mCurrentCrimeId);
         esm.writeHNT("PAYD", mPaidCrimeId);
 
-        for (PreviousItems::const_iterator it = mPreviousItems.begin(); it != mPreviousItems.end(); ++it)
+        for (const auto& [bound, prev] : mPreviousItems)
         {
-            esm.writeHNRefId("BOUN", it->first);
-            esm.writeHNRefId("PREV", it->second);
+            esm.writeHNRefId("BOUN", bound);
+            esm.writeHNRefId("PREV", prev);
         }
 
         esm.writeHNT("WWAT", mSaveAttributes);
diff --git a/components/esm3/player.hpp b/components/esm3/player.hpp
index f691f22e86..0cc0c22dc3 100644
--- a/components/esm3/player.hpp
+++ b/components/esm3/player.hpp
@@ -3,11 +3,11 @@
 
 #include <string>
 
-#include "components/esm/defs.hpp"
-#include "npcstate.hpp"
+#include <components/esm/attr.hpp>
+#include <components/esm/position.hpp>
 
-#include "components/esm/attr.hpp"
 #include "loadskil.hpp"
+#include "npcstate.hpp"
 
 namespace ESM
 {
@@ -27,14 +27,13 @@ namespace ESM
         RefId mMarkedCell;
         ESM::RefId mBirthsign;
 
-        int mCurrentCrimeId;
-        int mPaidCrimeId;
+        int32_t mCurrentCrimeId;
+        int32_t mPaidCrimeId;
 
         float mSaveAttributes[Attribute::Length];
         float mSaveSkills[Skill::Length];
 
-        typedef std::map<ESM::RefId, ESM::RefId> PreviousItems; // previous equipped items, needed for bound spells
-        PreviousItems mPreviousItems;
+        std::map<ESM::RefId, ESM::RefId> mPreviousItems; // previous equipped items, needed for bound spells
 
         void load(ESMReader& esm);
         void save(ESMWriter& esm) const;
diff --git a/components/esm3/projectilestate.cpp b/components/esm3/projectilestate.cpp
index 15ff5fff64..e20cefa882 100644
--- a/components/esm3/projectilestate.cpp
+++ b/components/esm3/projectilestate.cpp
@@ -17,8 +17,8 @@ namespace ESM
     void BaseProjectileState::load(ESMReader& esm)
     {
         mId = esm.getHNRefId("ID__");
-        esm.getHNTSized<12>(mPosition, "VEC3");
-        esm.getHNTSized<16>(mOrientation, "QUAT");
+        esm.getHNT("VEC3", mPosition.mValues);
+        esm.getHNT("QUAT", mOrientation.mValues);
         esm.getHNT(mActorId, "ACTO");
     }
 
@@ -37,18 +37,11 @@ namespace ESM
         BaseProjectileState::load(esm);
 
         mSpellId = esm.getHNRefId("SPEL");
-        if (esm.isNextSub("SRCN")) // for backwards compatibility
-            esm.skipHSub();
-        EffectList().load(esm); // for backwards compatibility
         esm.getHNT(mSpeed, "SPED");
         if (esm.peekNextSub("ITEM"))
             mItem = esm.getFormId(true, "ITEM");
         if (esm.isNextSub("SLOT")) // for backwards compatibility
             esm.skipHSub();
-        if (esm.isNextSub("STCK")) // for backwards compatibility
-            esm.skipHSub();
-        if (esm.isNextSub("SOUN")) // for backwards compatibility
-            esm.skipHSub();
     }
 
     void ProjectileState::save(ESMWriter& esm) const
@@ -65,7 +58,7 @@ namespace ESM
         BaseProjectileState::load(esm);
 
         mBowId = esm.getHNRefId("BOW_");
-        esm.getHNTSized<12>(mVelocity, "VEL_");
+        esm.getHNT("VEL_", mVelocity.mValues);
 
         mAttackStrength = 1.f;
         esm.getHNOT(mAttackStrength, "STR_");
diff --git a/components/esm3/projectilestate.hpp b/components/esm3/projectilestate.hpp
index 7a7651f364..c89d55c0e5 100644
--- a/components/esm3/projectilestate.hpp
+++ b/components/esm3/projectilestate.hpp
@@ -1,18 +1,19 @@
 #ifndef OPENMW_ESM_PROJECTILESTATE_H
 #define OPENMW_ESM_PROJECTILESTATE_H
 
-#include <string>
-
 #include <osg/Quat>
 #include <osg/Vec3f>
 
-#include "effectlist.hpp"
-
+#include "components/esm/quaternion.hpp"
 #include "components/esm/refid.hpp"
-#include "components/esm/util.hpp"
+#include "components/esm/vector3.hpp"
+
+#include "refnum.hpp"
 
 namespace ESM
 {
+    class ESMReader;
+    class ESMWriter;
 
     // format 0, savegames only
 
@@ -23,7 +24,7 @@ namespace ESM
         Vector3 mPosition;
         Quaternion mOrientation;
 
-        int mActorId;
+        int32_t mActorId;
 
         void load(ESMReader& esm);
         void save(ESMWriter& esm) const;
diff --git a/components/esm3/queststate.hpp b/components/esm3/queststate.hpp
index 5858714df0..6d9fd6c4fb 100644
--- a/components/esm3/queststate.hpp
+++ b/components/esm3/queststate.hpp
@@ -14,7 +14,7 @@ namespace ESM
     struct QuestState
     {
         ESM::RefId mTopic; // lower case id
-        int mState;
+        int32_t mState;
         unsigned char mFinished;
 
         void load(ESMReader& esm);
diff --git a/components/esm3/quickkeys.cpp b/components/esm3/quickkeys.cpp
index ababa535b7..7477fd24fa 100644
--- a/components/esm3/quickkeys.cpp
+++ b/components/esm3/quickkeys.cpp
@@ -8,9 +8,6 @@ namespace ESM
 
     void QuickKeys::load(ESMReader& esm)
     {
-        if (esm.isNextSub("KEY_"))
-            esm.getSubHeader(); // no longer used, because sub-record hierachies do not work properly in esmreader
-
         while (esm.isNextSub("TYPE"))
         {
             QuickKey key;
@@ -18,9 +15,6 @@ namespace ESM
             key.mId = esm.getHNRefId("ID__");
 
             mKeys.push_back(key);
-
-            if (esm.isNextSub("KEY_"))
-                esm.getSubHeader(); // no longer used, because sub-record hierachies do not work properly in esmreader
         }
     }
 
diff --git a/components/esm3/readerscache.cpp b/components/esm3/readerscache.cpp
index deae2a3dc7..732a2a22ba 100644
--- a/components/esm3/readerscache.cpp
+++ b/components/esm3/readerscache.cpp
@@ -86,4 +86,12 @@ namespace ESM
             it->mState = State::Closed;
         }
     }
+
+    void ReadersCache::clear()
+    {
+        mIndex.clear();
+        mBusyItems.clear();
+        mFreeItems.clear();
+        mClosedItems.clear();
+    }
 }
diff --git a/components/esm3/readerscache.hpp b/components/esm3/readerscache.hpp
index 94bee206ec..80ca5d1ef3 100644
--- a/components/esm3/readerscache.hpp
+++ b/components/esm3/readerscache.hpp
@@ -9,8 +9,6 @@
 #include <optional>
 #include <string>
 
-#include <components/to_utf8/to_utf8.hpp>
-
 namespace ESM
 {
     class ReadersCache
@@ -57,15 +55,7 @@ namespace ESM
 
         BusyItem get(std::size_t index);
 
-        void setStatelessEncoder(const ToUTF8::StatelessUtf8Encoder& statelessEncoderPtr)
-        {
-            mStatelessEncoder.emplace(statelessEncoderPtr);
-        }
-
-        const ToUTF8::StatelessUtf8Encoder* getStatelessEncoder()
-        {
-            return mStatelessEncoder.has_value() ? &mStatelessEncoder.value() : nullptr;
-        }
+        void clear();
 
     private:
         const std::size_t mCapacity;
@@ -73,7 +63,7 @@ namespace ESM
         std::list<Item> mBusyItems;
         std::list<Item> mFreeItems;
         std::list<Item> mClosedItems;
-        std::optional<ToUTF8::StatelessUtf8Encoder> mStatelessEncoder;
+
         inline void closeExtraReaders();
 
         inline void releaseItem(std::list<Item>::iterator it) noexcept;
diff --git a/components/esm3/refnum.hpp b/components/esm3/refnum.hpp
new file mode 100644
index 0000000000..6e21d6893e
--- /dev/null
+++ b/components/esm3/refnum.hpp
@@ -0,0 +1,11 @@
+#ifndef OPENMW_COMPONENTS_ESM3_REFNUM_H
+#define OPENMW_COMPONENTS_ESM3_REFNUM_H
+
+#include <components/esm/formid.hpp>
+
+namespace ESM
+{
+    using RefNum = ESM::FormId;
+}
+
+#endif
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 6652179ea9..212925b61d 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -3,8 +3,17 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <components/misc/algorithm.hpp>
+#include <components/misc/concepts.hpp>
+
 namespace ESM
 {
+    template <Misc::SameAsWithoutCvref<EpochTimeStamp> T>
+    void decompose(T&& v, const auto& f)
+    {
+        f(v.mGameHour, v.mDay, v.mMonth, v.mYear);
+    }
+
     void SavedGame::load(ESMReader& esm)
     {
         mPlayerName = esm.getHNString("PLNA");
@@ -17,7 +26,7 @@ namespace ESM
             mPlayerCellName = esm.getHNRefId("PLCE").toString();
         else
             mPlayerCellName = esm.getHNString("PLCE");
-        esm.getHNTSized<16>(mInGameTime, "TSTM");
+        esm.getNamedComposite("TSTM", mInGameTime);
         esm.getHNT(mTimePlayed, "TIME");
         mDescription = esm.getHNString("DESC");
 
@@ -28,6 +37,10 @@ namespace ESM
         esm.getSubHeader();
         mScreenshot.resize(esm.getSubSize());
         esm.getExact(mScreenshot.data(), mScreenshot.size());
+
+        esm.getHNOT(mCurrentDay, "CDAY");
+        esm.getHNOT(mCurrentHealth, "CHLT");
+        esm.getHNOT(mMaximumHealth, "MHLT");
     }
 
     void SavedGame::save(ESMWriter& esm) const
@@ -41,16 +54,36 @@ namespace ESM
             esm.writeHNString("PLCN", mPlayerClassName);
 
         esm.writeHNString("PLCE", mPlayerCellName);
-        esm.writeHNT("TSTM", mInGameTime, 16);
+        esm.writeNamedComposite("TSTM", mInGameTime);
         esm.writeHNT("TIME", mTimePlayed);
         esm.writeHNString("DESC", mDescription);
 
-        for (std::vector<std::string>::const_iterator iter(mContentFiles.begin()); iter != mContentFiles.end(); ++iter)
-            esm.writeHNString("DEPE", *iter);
+        for (const std::string& dependency : mContentFiles)
+            esm.writeHNString("DEPE", dependency);
 
         esm.startSubRecord("SCRN");
         esm.write(mScreenshot.data(), mScreenshot.size());
         esm.endRecord("SCRN");
+
+        esm.writeHNT("CDAY", mCurrentDay);
+        esm.writeHNT("CHLT", mCurrentHealth);
+        esm.writeHNT("MHLT", mMaximumHealth);
     }
 
+    std::vector<std::string_view> SavedGame::getMissingContentFiles(
+        const std::vector<std::string>& allContentFiles) const
+    {
+        std::vector<std::string_view> missingFiles;
+        for (const std::string& contentFile : mContentFiles)
+        {
+            auto it = std::find_if(allContentFiles.begin(), allContentFiles.end(),
+                [&](const std::string& file) { return Misc::StringUtils::ciEqual(file, contentFile); });
+            if (it == allContentFiles.end())
+            {
+                missingFiles.emplace_back(contentFile);
+            }
+        }
+
+        return missingFiles;
+    }
 }
diff --git a/components/esm3/savedgame.hpp b/components/esm3/savedgame.hpp
index 0777b2498b..f174340203 100644
--- a/components/esm3/savedgame.hpp
+++ b/components/esm3/savedgame.hpp
@@ -20,7 +20,7 @@ namespace ESM
 
         std::vector<std::string> mContentFiles;
         std::string mPlayerName;
-        int mPlayerLevel;
+        int32_t mPlayerLevel;
 
         // ID of class
         ESM::RefId mPlayerClassId;
@@ -34,8 +34,14 @@ namespace ESM
         std::string mDescription;
         std::vector<char> mScreenshot; // raw jpg-encoded data
 
+        int32_t mCurrentDay = 0;
+        float mCurrentHealth = 0;
+        float mMaximumHealth = 0;
+
         void load(ESMReader& esm);
         void save(ESMWriter& esm) const;
+
+        std::vector<std::string_view> getMissingContentFiles(const std::vector<std::string>& allContentFiles) const;
     };
 }
 
diff --git a/components/esm3/selectiongroup.cpp b/components/esm3/selectiongroup.cpp
new file mode 100644
index 0000000000..6b819a4bbc
--- /dev/null
+++ b/components/esm3/selectiongroup.cpp
@@ -0,0 +1,38 @@
+#include "selectiongroup.hpp"
+
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
+
+namespace ESM
+{
+    void SelectionGroup::load(ESMReader& esm, bool& isDeleted)
+    {
+
+        while (esm.hasMoreSubs())
+        {
+            esm.getSubName();
+            switch (esm.retSubName().toInt())
+            {
+                case fourCC("SELC"):
+                    mId = esm.getRefId();
+                    break;
+                case fourCC("SELI"):
+                    selectedInstances.push_back(esm.getRefId().getRefIdString());
+                    break;
+                default:
+                    esm.fail("Unknown subrecord");
+                    break;
+            }
+        }
+    }
+
+    void SelectionGroup::save(ESMWriter& esm, bool isDeleted) const
+    {
+        esm.writeHNCRefId("SELC", mId);
+        for (std::string id : selectedInstances)
+            esm.writeHNCString("SELI", id);
+    }
+
+    void SelectionGroup::blank() {}
+
+}
diff --git a/components/esm3/selectiongroup.hpp b/components/esm3/selectiongroup.hpp
new file mode 100644
index 0000000000..021f3c95d5
--- /dev/null
+++ b/components/esm3/selectiongroup.hpp
@@ -0,0 +1,34 @@
+#ifndef COMPONENTS_ESM_SELECTIONGROUP_H
+#define COMPONENTS_ESM_SELECTIONGROUP_H
+
+#include <string>
+
+#include "components/esm/defs.hpp"
+#include "components/esm/refid.hpp"
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+
+    struct SelectionGroup
+    {
+        constexpr static RecNameInts sRecordId = REC_SELG;
+
+        static constexpr std::string_view getRecordType() { return "SelectionGroup"; }
+
+        uint32_t mRecordFlags = 0;
+
+        RefId mId;
+
+        std::vector<std::string> selectedInstances;
+
+        void load(ESMReader& esm, bool& isDeleted);
+        void save(ESMWriter& esm, bool isDeleted = false) const;
+
+        /// Set record to default state (does not touch the ID).
+        void blank();
+    };
+}
+
+#endif
diff --git a/components/esm3/spellstate.cpp b/components/esm3/spellstate.cpp
index 41591f56b7..39c98e7c0f 100644
--- a/components/esm3/spellstate.cpp
+++ b/components/esm3/spellstate.cpp
@@ -33,7 +33,7 @@ namespace ESM
                     state.mPurgedEffects.insert(index);
                 }
 
-                mSpellParams[id] = state;
+                mSpellParams[id] = std::move(state);
                 mSpells.emplace_back(id);
             }
         }
@@ -69,7 +69,7 @@ namespace ESM
                 esm.getHNT(info.mMagnitude, "MAGN");
                 permEffectList.push_back(info);
             }
-            mPermanentSpellEffects[spellId] = permEffectList;
+            mPermanentSpellEffects[spellId] = std::move(permEffectList);
         }
 
         // Obsolete
diff --git a/components/esm3/statstate.cpp b/components/esm3/statstate.cpp
index b5ddc54985..b46c2e34fd 100644
--- a/components/esm3/statstate.cpp
+++ b/components/esm3/statstate.cpp
@@ -21,21 +21,17 @@ namespace ESM
         // We changed stats values from integers to floats; ensure backwards compatibility
         if (intFallback)
         {
-            int base = 0;
+            int32_t base = 0;
             esm.getHNT(base, "STBA");
             mBase = static_cast<T>(base);
 
-            int mod = 0;
+            int32_t mod = 0;
             esm.getHNOT(mod, "STMO");
             mMod = static_cast<T>(mod);
 
-            int current = 0;
+            int32_t current = 0;
             esm.getHNOT(current, "STCU");
             mCurrent = static_cast<T>(current);
-
-            int oldDamage = 0;
-            esm.getHNOT(oldDamage, "STDA");
-            mDamage = static_cast<float>(oldDamage);
         }
         else
         {
diff --git a/components/esm3/transport.cpp b/components/esm3/transport.cpp
index 8b131b1b5f..a72cdbbaf8 100644
--- a/components/esm3/transport.cpp
+++ b/components/esm3/transport.cpp
@@ -13,7 +13,7 @@ namespace ESM
         if (esm.retSubName().toInt() == fourCC("DODT"))
         {
             Dest dodt;
-            esm.getHExact(&dodt.mPos, 24);
+            esm.getSubComposite(dodt.mPos);
             mList.push_back(dodt);
         }
         else if (esm.retSubName().toInt() == fourCC("DNAM"))
@@ -28,11 +28,10 @@ namespace ESM
 
     void Transport::save(ESMWriter& esm) const
     {
-        typedef std::vector<Dest>::const_iterator DestIter;
-        for (DestIter it = mList.begin(); it != mList.end(); ++it)
+        for (const Dest& dest : mList)
         {
-            esm.writeHNT("DODT", it->mPos, sizeof(it->mPos));
-            esm.writeHNOCString("DNAM", it->mCellName);
+            esm.writeNamedComposite("DODT", dest.mPos);
+            esm.writeHNOCString("DNAM", dest.mCellName);
         }
     }
 
diff --git a/components/esm3/transport.hpp b/components/esm3/transport.hpp
index 555504c994..69bc1119c2 100644
--- a/components/esm3/transport.hpp
+++ b/components/esm3/transport.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "components/esm/defs.hpp"
+#include <components/esm/position.hpp>
 
 namespace ESM
 {
diff --git a/components/esm3/variant.cpp b/components/esm3/variant.cpp
index 3d5daa2cb3..48621818eb 100644
--- a/components/esm3/variant.cpp
+++ b/components/esm3/variant.cpp
@@ -17,7 +17,7 @@ namespace ESM
         template <typename T, bool orDefault = false>
         struct GetValue
         {
-            constexpr T operator()(int value) const { return static_cast<T>(value); }
+            constexpr T operator()(int32_t value) const { return static_cast<T>(value); }
 
             constexpr T operator()(float value) const { return static_cast<T>(value); }
 
@@ -41,7 +41,7 @@ namespace ESM
             {
             }
 
-            void operator()(int& value) const { value = static_cast<int>(mValue); }
+            void operator()(int32_t& value) const { value = static_cast<int32_t>(mValue); }
 
             void operator()(float& value) const { value = static_cast<float>(mValue); }
 
@@ -58,9 +58,9 @@ namespace ESM
         return std::get<std::string>(mData);
     }
 
-    int Variant::getInteger() const
+    int32_t Variant::getInteger() const
     {
-        return std::visit(GetValue<int>{}, mData);
+        return std::visit(GetValue<int32_t>{}, mData);
     }
 
     float Variant::getFloat() const
@@ -194,17 +194,17 @@ namespace ESM
 
             case VT_Short:
 
-                stream << "variant short: " << std::get<int>(mData);
+                stream << "variant short: " << std::get<int32_t>(mData);
                 break;
 
             case VT_Int:
 
-                stream << "variant int: " << std::get<int>(mData);
+                stream << "variant int: " << std::get<int32_t>(mData);
                 break;
 
             case VT_Long:
 
-                stream << "variant long: " << std::get<int>(mData);
+                stream << "variant long: " << std::get<int32_t>(mData);
                 break;
 
             case VT_Float:
@@ -259,7 +259,7 @@ namespace ESM
         std::get<std::string>(mData) = std::move(value);
     }
 
-    void Variant::setInteger(int value)
+    void Variant::setInteger(int32_t value)
     {
         std::visit(SetValue(value), mData);
     }
diff --git a/components/esm3/variant.hpp b/components/esm3/variant.hpp
index d00ccb2746..ed72b1dc05 100644
--- a/components/esm3/variant.hpp
+++ b/components/esm3/variant.hpp
@@ -25,7 +25,7 @@ namespace ESM
     class Variant
     {
         VarType mType;
-        std::variant<std::monostate, int, float, std::string> mData;
+        std::variant<std::monostate, int32_t, float, std::string> mData;
 
     public:
         enum Format
@@ -54,7 +54,7 @@ namespace ESM
         {
         }
 
-        explicit Variant(int value)
+        explicit Variant(int32_t value)
             : mType(VT_Long)
             , mData(value)
         {
@@ -71,7 +71,7 @@ namespace ESM
         const std::string& getString() const;
         ///< Will throw an exception, if value can not be represented as a string.
 
-        int getInteger() const;
+        int32_t getInteger() const;
         ///< Will throw an exception, if value can not be represented as an integer (implicit
         /// casting of float values is permitted).
 
@@ -93,7 +93,7 @@ namespace ESM
         void setString(std::string&& value);
         ///< Will throw an exception, if type is not compatible with string.
 
-        void setInteger(int value);
+        void setInteger(int32_t value);
         ///< Will throw an exception, if type is not compatible with integer.
 
         void setFloat(float value);
diff --git a/components/esm3/variantimp.cpp b/components/esm3/variantimp.cpp
index 410f4ade8d..31248556ec 100644
--- a/components/esm3/variantimp.cpp
+++ b/components/esm3/variantimp.cpp
@@ -46,7 +46,7 @@ namespace ESM
         esm.writeHNString("STRV", in);
     }
 
-    void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, int& out)
+    void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, int32_t& out)
     {
         if (type != VT_Short && type != VT_Long && type != VT_Int)
             throw std::logic_error("not an integer type");
@@ -60,9 +60,9 @@ namespace ESM
                 if (std::isnan(value))
                     out = 0;
                 else
-                    out = static_cast<short>(value);
+                    out = static_cast<int16_t>(value);
             else if (type == VT_Long)
-                out = static_cast<int>(value);
+                out = static_cast<int32_t>(value);
             else
                 esm.fail("unsupported global variable integer type");
         }
@@ -82,7 +82,7 @@ namespace ESM
         {
             if (type == VT_Short)
             {
-                short value;
+                int16_t value;
                 esm.getHT(value);
                 out = value;
             }
@@ -95,7 +95,7 @@ namespace ESM
         }
     }
 
-    void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, int in)
+    void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, int32_t in)
     {
         if (type != VT_Short && type != VT_Long && type != VT_Int)
             throw std::logic_error("not an integer type");
@@ -126,7 +126,7 @@ namespace ESM
         else if (format == Variant::Format_Local)
         {
             if (type == VT_Short)
-                esm.writeHNT("STTV", static_cast<short>(in));
+                esm.writeHNT("STTV", static_cast<int16_t>(in));
             else if (type == VT_Int)
                 esm.writeHNT("INTV", in);
             else
diff --git a/components/esm3/variantimp.hpp b/components/esm3/variantimp.hpp
index 90f45a420f..365cff988a 100644
--- a/components/esm3/variantimp.hpp
+++ b/components/esm3/variantimp.hpp
@@ -12,13 +12,13 @@ namespace ESM
 
     void readESMVariantValue(ESMReader& reader, Variant::Format format, VarType type, float& value);
 
-    void readESMVariantValue(ESMReader& reader, Variant::Format format, VarType type, int& value);
+    void readESMVariantValue(ESMReader& reader, Variant::Format format, VarType type, int32_t& value);
 
     void writeESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type, const std::string& value);
 
     void writeESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type, float value);
 
-    void writeESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type, int value);
+    void writeESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type, int32_t value);
 
     struct ReadESMVariantValue
     {
diff --git a/components/esm3/weatherstate.cpp b/components/esm3/weatherstate.cpp
index 4c6896d37e..a7a10fe624 100644
--- a/components/esm3/weatherstate.cpp
+++ b/components/esm3/weatherstate.cpp
@@ -41,7 +41,7 @@ namespace ESM
             esm.getHNT(region.mWeather, regionWeatherRecord);
             while (esm.isNextSub(regionChanceRecord))
             {
-                char chance;
+                uint8_t chance;
                 esm.getHT(chance);
                 region.mChances.push_back(chance);
             }
@@ -66,9 +66,9 @@ namespace ESM
         {
             esm.writeHNCRefId(regionNameRecord, it->first);
             esm.writeHNT(regionWeatherRecord, it->second.mWeather);
-            for (size_t i = 0; i < it->second.mChances.size(); ++i)
+            for (const uint8_t& chance : it->second.mChances)
             {
-                esm.writeHNT(regionChanceRecord, it->second.mChances[i]);
+                esm.writeHNT(regionChanceRecord, chance);
             }
         }
     }
diff --git a/components/esm3/weatherstate.hpp b/components/esm3/weatherstate.hpp
index 3fad90ddb4..625ba0ba6e 100644
--- a/components/esm3/weatherstate.hpp
+++ b/components/esm3/weatherstate.hpp
@@ -13,8 +13,8 @@ namespace ESM
 
     struct RegionWeatherState
     {
-        int mWeather;
-        std::vector<char> mChances;
+        int32_t mWeather;
+        std::vector<uint8_t> mChances;
     };
 
     struct WeatherState
@@ -24,9 +24,9 @@ namespace ESM
         bool mFastForward;
         float mWeatherUpdateTime;
         float mTransitionFactor;
-        int mCurrentWeather;
-        int mNextWeather;
-        int mQueuedWeather;
+        int32_t mCurrentWeather;
+        int32_t mNextWeather;
+        int32_t mQueuedWeather;
         std::map<ESM::RefId, RegionWeatherState> mRegions;
 
         void load(ESMReader& esm);
diff --git a/components/esm4/common.hpp b/components/esm4/common.hpp
index 8f37bfb8d4..a50151b10a 100644
--- a/components/esm4/common.hpp
+++ b/components/esm4/common.hpp
@@ -176,687 +176,6 @@ namespace ESM4
         REC_MSET = fourCC("MSET") // Media Set
     };
 
-    enum SubRecordTypes
-    {
-        SUB_ACBS = fourCC("ACBS"),
-        SUB_ACEC = fourCC("ACEC"), // TES5 Dawnguard
-        SUB_ACEP = fourCC("ACEP"), // TES5 Dawnguard
-        SUB_ACID = fourCC("ACID"), // TES5 Dawnguard
-        SUB_ACPR = fourCC("ACPR"), // TES5
-        SUB_ACSR = fourCC("ACSR"), // TES5 Dawnguard
-        SUB_ACTV = fourCC("ACTV"), // FO4
-        SUB_ACUN = fourCC("ACUN"), // TES5 Dawnguard
-        SUB_AHCF = fourCC("AHCF"),
-        SUB_AHCM = fourCC("AHCM"),
-        SUB_AIDT = fourCC("AIDT"),
-        SUB_ALCA = fourCC("ALCA"), // TES5
-        SUB_ALCC = fourCC("ALCC"), // FO4
-        SUB_ALCL = fourCC("ALCL"), // TES5
-        SUB_ALCO = fourCC("ALCO"), // TES5
-        SUB_ALCS = fourCC("ALCS"), // FO4
-        SUB_ALDI = fourCC("ALDI"), // FO4
-        SUB_ALDN = fourCC("ALDN"), // TES5
-        SUB_ALEA = fourCC("ALEA"), // TES5
-        SUB_ALED = fourCC("ALED"), // TES5
-        SUB_ALEQ = fourCC("ALEQ"), // TES5
-        SUB_ALFA = fourCC("ALFA"), // TES5
-        SUB_ALFC = fourCC("ALFC"), // TES5
-        SUB_ALFD = fourCC("ALFD"), // TES5
-        SUB_ALFE = fourCC("ALFE"), // TES5
-        SUB_ALFI = fourCC("ALFI"), // TES5
-        SUB_ALFL = fourCC("ALFL"), // TES5
-        SUB_ALFR = fourCC("ALFR"), // TES5
-        SUB_ALFV = fourCC("ALFV"), // FO4
-        SUB_ALID = fourCC("ALID"), // TES5
-        SUB_ALLA = fourCC("ALLA"), // FO4
-        SUB_ALLS = fourCC("ALLS"), // TES5
-        SUB_ALMI = fourCC("ALMI"), // FO4
-        SUB_ALNA = fourCC("ALNA"), // TES5
-        SUB_ALNT = fourCC("ALNT"), // TES5
-        SUB_ALPC = fourCC("ALPC"), // TES5
-        SUB_ALRT = fourCC("ALRT"), // TES5
-        SUB_ALSP = fourCC("ALSP"), // TES5
-        SUB_ALST = fourCC("ALST"), // TES5
-        SUB_ALUA = fourCC("ALUA"), // TES5
-        SUB_ANAM = fourCC("ANAM"),
-        SUB_AOR2 = fourCC("AOR2"), // FO4
-        SUB_APPR = fourCC("APPR"), // FO4
-        SUB_ATKD = fourCC("ATKD"),
-        SUB_ATKE = fourCC("ATKE"),
-        SUB_ATKR = fourCC("ATKR"),
-        SUB_ATKS = fourCC("ATKS"), // FO4
-        SUB_ATKT = fourCC("ATKT"), // FO4
-        SUB_ATKW = fourCC("ATKW"), // FO4
-        SUB_ATTN = fourCC("ATTN"), // FO4
-        SUB_ATTR = fourCC("ATTR"),
-        SUB_ATTX = fourCC("ATTX"), // FO4
-        SUB_ATXT = fourCC("ATXT"),
-        SUB_AVFL = fourCC("AVFL"), // FO4
-        SUB_AVSK = fourCC("AVSK"), // TES5
-        SUB_BAMT = fourCC("BAMT"),
-        SUB_BCLF = fourCC("BCLF"), // FO4
-        SUB_BIDS = fourCC("BIDS"),
-        SUB_BIPL = fourCC("BIPL"), // FO3
-        SUB_BMCT = fourCC("BMCT"),
-        SUB_BMDT = fourCC("BMDT"),
-        SUB_BMMP = fourCC("BMMP"), // FO4
-        SUB_BNAM = fourCC("BNAM"),
-        SUB_BOD2 = fourCC("BOD2"),
-        SUB_BODT = fourCC("BODT"),
-        SUB_BPND = fourCC("BPND"),
-        SUB_BPNI = fourCC("BPNI"),
-        SUB_BPNN = fourCC("BPNN"),
-        SUB_BPNT = fourCC("BPNT"),
-        SUB_BPTN = fourCC("BPTN"),
-        SUB_BRUS = fourCC("BRUS"), // FONV
-        SUB_BSIZ = fourCC("BSIZ"), // FO4
-        SUB_BSMB = fourCC("BSMB"), // FO4
-        SUB_BSMP = fourCC("BSMP"), // FO4
-        SUB_BSMS = fourCC("BSMS"), // FO4
-        SUB_BTXT = fourCC("BTXT"),
-        SUB_CDIX = fourCC("CDIX"), // FO4
-        SUB_CIS1 = fourCC("CIS1"), // TES5
-        SUB_CIS2 = fourCC("CIS2"), // TES5
-        SUB_CITC = fourCC("CITC"), // TES5
-        SUB_CLSZ = fourCC("CLSZ"), // FO4
-        SUB_CNAM = fourCC("CNAM"),
-        SUB_CNTO = fourCC("CNTO"),
-        SUB_COCT = fourCC("COCT"),
-        SUB_COED = fourCC("COED"),
-        SUB_CRDT = fourCC("CRDT"),
-        SUB_CRGR = fourCC("CRGR"), // TES5
-        SUB_CRIF = fourCC("CRIF"),
-        SUB_CRIS = fourCC("CRIS"), // FO4
-        SUB_CRVA = fourCC("CRVA"), // TES5
-        SUB_CS2D = fourCC("CS2D"), // FO4
-        SUB_CS2E = fourCC("CS2E"), // FO4
-        SUB_CS2F = fourCC("CS2F"), // FO4
-        SUB_CS2H = fourCC("CS2H"), // FO4
-        SUB_CS2K = fourCC("CS2K"), // FO4
-        SUB_CSCR = fourCC("CSCR"),
-        SUB_CSCV = fourCC("CSCV"), // FO4
-        SUB_CSDC = fourCC("CSDC"),
-        SUB_CSDI = fourCC("CSDI"),
-        SUB_CSDT = fourCC("CSDT"),
-        SUB_CSFL = fourCC("CSFL"), // TES5
-        SUB_CSGD = fourCC("CSGD"), // TES5
-        SUB_CSLR = fourCC("CSLR"), // TES5
-        SUB_CSMD = fourCC("CSMD"), // TES5
-        SUB_CSME = fourCC("CSME"), // TES5
-        SUB_CSRA = fourCC("CSRA"), // FO4
-        SUB_CTDA = fourCC("CTDA"),
-        SUB_CTDT = fourCC("CTDT"),
-        SUB_CUSD = fourCC("CUSD"), // FO4
-        SUB_CVPA = fourCC("CVPA"), // FO4
-        SUB_DALC = fourCC("DALC"), // FO3
-        SUB_DAMA = fourCC("DAMA"), // FO4
-        SUB_DAMC = fourCC("DAMC"), // FO4
-        SUB_DAT2 = fourCC("DAT2"), // FONV
-        SUB_DATA = fourCC("DATA"),
-        SUB_DELE = fourCC("DELE"),
-        SUB_DEMO = fourCC("DEMO"), // TES5
-        SUB_DESC = fourCC("DESC"),
-        SUB_DEST = fourCC("DEST"),
-        SUB_DEVA = fourCC("DEVA"), // TES5
-        SUB_DFTF = fourCC("DFTF"),
-        SUB_DFTM = fourCC("DFTM"),
-        SUB_DMAX = fourCC("DMAX"), // TES5
-        SUB_DMDC = fourCC("DMDC"), // FO4
-        SUB_DMDL = fourCC("DMDL"),
-        SUB_DMDS = fourCC("DMDS"),
-        SUB_DMDT = fourCC("DMDT"),
-        SUB_DMIN = fourCC("DMIN"), // TES5
-        SUB_DNAM = fourCC("DNAM"),
-        SUB_DODT = fourCC("DODT"),
-        SUB_DOFT = fourCC("DOFT"),
-        SUB_DPLT = fourCC("DPLT"),
-        SUB_DSTA = fourCC("DSTA"), // FO4
-        SUB_DSTD = fourCC("DSTD"),
-        SUB_DSTF = fourCC("DSTF"),
-        SUB_DTGT = fourCC("DTGT"), // FO4
-        SUB_DTID = fourCC("DTID"), // FO4
-        SUB_EAMT = fourCC("EAMT"),
-        SUB_ECOR = fourCC("ECOR"),
-        SUB_EDID = fourCC("EDID"),
-        SUB_EFID = fourCC("EFID"),
-        SUB_EFIT = fourCC("EFIT"),
-        SUB_EFSD = fourCC("EFSD"), // FONV DeadMoney
-        SUB_EITM = fourCC("EITM"),
-        SUB_ENAM = fourCC("ENAM"),
-        SUB_ENIT = fourCC("ENIT"),
-        SUB_EPF2 = fourCC("EPF2"),
-        SUB_EPF3 = fourCC("EPF3"),
-        SUB_EPFB = fourCC("EPFB"), // FO4
-        SUB_EPFD = fourCC("EPFD"),
-        SUB_EPFT = fourCC("EPFT"),
-        SUB_ESCE = fourCC("ESCE"),
-        SUB_ETYP = fourCC("ETYP"),
-        SUB_FCHT = fourCC("FCHT"), // TES5
-        SUB_FCPL = fourCC("FCPL"), // FO4
-        SUB_FFFF = fourCC("FFFF"),
-        SUB_FGGA = fourCC("FGGA"),
-        SUB_FGGS = fourCC("FGGS"),
-        SUB_FGTS = fourCC("FGTS"),
-        SUB_FIMD = fourCC("FIMD"), // FO4
-        SUB_FLMV = fourCC("FLMV"),
-        SUB_FLTR = fourCC("FLTR"), // TES5
-        SUB_FLTV = fourCC("FLTV"),
-        SUB_FMIN = fourCC("FMIN"), // FO4
-        SUB_FMRI = fourCC("FMRI"), // FO4
-        SUB_FMRN = fourCC("FMRN"), // FO4
-        SUB_FMRS = fourCC("FMRS"), // FO4
-        SUB_FNAM = fourCC("FNAM"),
-        SUB_FNMK = fourCC("FNMK"),
-        SUB_FNPR = fourCC("FNPR"),
-        SUB_FPRT = fourCC("FPRT"), // TES5
-        SUB_FTSF = fourCC("FTSF"),
-        SUB_FTSM = fourCC("FTSM"),
-        SUB_FTST = fourCC("FTST"),
-        SUB_FTYP = fourCC("FTYP"), // FO4
-        SUB_FULL = fourCC("FULL"),
-        SUB_FVPA = fourCC("FVPA"), // FO4
-        SUB_GNAM = fourCC("GNAM"),
-        SUB_GREE = fourCC("GREE"), // FO4
-        SUB_GWOR = fourCC("GWOR"), // TES5
-        SUB_HCLF = fourCC("HCLF"),
-        SUB_HCLR = fourCC("HCLR"),
-        SUB_HEAD = fourCC("HEAD"),
-        SUB_HEDR = fourCC("HEDR"),
-        SUB_HLTX = fourCC("HLTX"), // FO4
-        SUB_HNAM = fourCC("HNAM"),
-        SUB_HTID = fourCC("HTID"), // TES5
-        SUB_ICO2 = fourCC("ICO2"),
-        SUB_ICON = fourCC("ICON"),
-        SUB_IDLA = fourCC("IDLA"),
-        SUB_IDLB = fourCC("IDLB"), // FO3
-        SUB_IDLC = fourCC("IDLC"),
-        SUB_IDLF = fourCC("IDLF"),
-        SUB_IDLT = fourCC("IDLT"),
-        SUB_IMPF = fourCC("IMPF"), // FO3 Anchorage
-        SUB_IMPS = fourCC("IMPS"), // FO3 Anchorage
-        SUB_IMSP = fourCC("IMSP"), // TES5
-        SUB_INAM = fourCC("INAM"),
-        SUB_INCC = fourCC("INCC"),
-        SUB_INDX = fourCC("INDX"),
-        SUB_INFC = fourCC("INFC"), // FONV
-        SUB_INFX = fourCC("INFX"), // FONV
-        SUB_INRD = fourCC("INRD"), // FO4
-        SUB_INTT = fourCC("INTT"), // FO4
-        SUB_INTV = fourCC("INTV"),
-        SUB_IOVR = fourCC("IOVR"), // FO4
-        SUB_ISIZ = fourCC("ISIZ"), // FO4
-        SUB_ITID = fourCC("ITID"), // FO4
-        SUB_ITMC = fourCC("ITMC"), // FO4
-        SUB_ITME = fourCC("ITME"), // FO4
-        SUB_ITMS = fourCC("ITMS"), // FO4
-        SUB_ITXT = fourCC("ITXT"),
-        SUB_JAIL = fourCC("JAIL"), // TES5
-        SUB_JNAM = fourCC("JNAM"), // FONV
-        SUB_JOUT = fourCC("JOUT"), // TES5
-        SUB_KFFZ = fourCC("KFFZ"),
-        SUB_KNAM = fourCC("KNAM"),
-        SUB_KSIZ = fourCC("KSIZ"),
-        SUB_KWDA = fourCC("KWDA"),
-        SUB_LCEC = fourCC("LCEC"), // TES5
-        SUB_LCEP = fourCC("LCEP"), // TES5
-        SUB_LCID = fourCC("LCID"), // TES5
-        SUB_LCPR = fourCC("LCPR"), // TES5
-        SUB_LCSR = fourCC("LCSR"), // TES5
-        SUB_LCUN = fourCC("LCUN"), // TES5
-        SUB_LFSD = fourCC("LFSD"), // FO4
-        SUB_LFSP = fourCC("LFSP"), // FO4
-        SUB_LLCT = fourCC("LLCT"),
-        SUB_LLKC = fourCC("LLKC"), // FO4
-        SUB_LNAM = fourCC("LNAM"),
-        SUB_LTMP = fourCC("LTMP"),
-        SUB_LTPC = fourCC("LTPC"), // FO4
-        SUB_LTPT = fourCC("LTPT"), // FO4
-        SUB_LVLD = fourCC("LVLD"),
-        SUB_LVLF = fourCC("LVLF"),
-        SUB_LVLG = fourCC("LVLG"), // FO3
-        SUB_LVLM = fourCC("LVLM"), // FO4
-        SUB_LVLO = fourCC("LVLO"),
-        SUB_LVSG = fourCC("LVSG"), // FO4
-        SUB_MASE = fourCC("MASE"), // FO4
-        SUB_MAST = fourCC("MAST"),
-        SUB_MCHT = fourCC("MCHT"), // TES5
-        SUB_MDOB = fourCC("MDOB"),
-        SUB_MHDT = fourCC("MHDT"),
-        SUB_MIC2 = fourCC("MIC2"),
-        SUB_MICO = fourCC("MICO"),
-        SUB_MLSI = fourCC("MLSI"), // FO4
-        SUB_MMRK = fourCC("MMRK"), // FONV
-        SUB_MNAM = fourCC("MNAM"),
-        SUB_MO2B = fourCC("MO2B"),
-        SUB_MO2C = fourCC("MO2C"), // FO4
-        SUB_MO2F = fourCC("MO2F"), // FO4
-        SUB_MO2S = fourCC("MO2S"),
-        SUB_MO2T = fourCC("MO2T"),
-        SUB_MO3B = fourCC("MO3B"),
-        SUB_MO3C = fourCC("MO3C"), // FO4
-        SUB_MO3F = fourCC("MO3F"), // FO4
-        SUB_MO3S = fourCC("MO3S"), // FO3
-        SUB_MO3T = fourCC("MO3T"),
-        SUB_MO4B = fourCC("MO4B"),
-        SUB_MO4C = fourCC("MO4C"), // FO4
-        SUB_MO4F = fourCC("MO4F"), // FO4
-        SUB_MO4S = fourCC("MO4S"),
-        SUB_MO4T = fourCC("MO4T"),
-        SUB_MO5C = fourCC("MO5C"), // FO4
-        SUB_MO5F = fourCC("MO5F"), // FO4
-        SUB_MO5S = fourCC("MO5S"), // TES5
-        SUB_MO5T = fourCC("MO5T"),
-        SUB_MOD2 = fourCC("MOD2"),
-        SUB_MOD3 = fourCC("MOD3"),
-        SUB_MOD4 = fourCC("MOD4"),
-        SUB_MOD5 = fourCC("MOD5"),
-        SUB_MODB = fourCC("MODB"),
-        SUB_MODC = fourCC("MODC"), // FO4
-        SUB_MODD = fourCC("MODD"), // FO3
-        SUB_MODF = fourCC("MODF"), // FO4
-        SUB_MODL = fourCC("MODL"),
-        SUB_MODQ = fourCC("MODQ"), // FO4
-        SUB_MODS = fourCC("MODS"),
-        SUB_MODT = fourCC("MODT"),
-        SUB_MOSD = fourCC("MOSD"), // FO3
-        SUB_MPAI = fourCC("MPAI"),
-        SUB_MPAV = fourCC("MPAV"),
-        SUB_MPCD = fourCC("MPCD"), // FO4
-        SUB_MPGN = fourCC("MPGN"), // FO4
-        SUB_MPGS = fourCC("MPGS"), // FO4
-        SUB_MPPC = fourCC("MPPC"), // FO4
-        SUB_MPPF = fourCC("MPPF"), // FO4
-        SUB_MPPI = fourCC("MPPI"), // FO4
-        SUB_MPPK = fourCC("MPPK"), // FO4
-        SUB_MPPM = fourCC("MPPM"), // FO4
-        SUB_MPPN = fourCC("MPPN"), // FO4
-        SUB_MPPT = fourCC("MPPT"), // FO4
-        SUB_MPRT = fourCC("MPRT"), // TES5
-        SUB_MRSV = fourCC("MRSV"), // FO4
-        SUB_MSDK = fourCC("MSDK"), // FO4
-        SUB_MSDV = fourCC("MSDV"), // FO4
-        SUB_MSID = fourCC("MSID"), // FO4
-        SUB_MSM0 = fourCC("MSM0"), // FO4
-        SUB_MSM1 = fourCC("MSM1"), // FO4
-        SUB_MTNM = fourCC("MTNM"),
-        SUB_MTYP = fourCC("MTYP"),
-        SUB_MWD1 = fourCC("MWD1"), // FONV
-        SUB_MWD2 = fourCC("MWD2"), // FONV
-        SUB_MWD3 = fourCC("MWD3"), // FONV
-        SUB_MWD4 = fourCC("MWD4"), // FONV
-        SUB_MWD5 = fourCC("MWD5"), // FONV
-        SUB_MWD6 = fourCC("MWD6"), // FONV
-        SUB_MWD7 = fourCC("MWD7"), // FONV
-        SUB_MWGT = fourCC("MWGT"), // FO4
-        SUB_NAM0 = fourCC("NAM0"),
-        SUB_NAM1 = fourCC("NAM1"),
-        SUB_NAM2 = fourCC("NAM2"),
-        SUB_NAM3 = fourCC("NAM3"),
-        SUB_NAM4 = fourCC("NAM4"),
-        SUB_NAM5 = fourCC("NAM5"),
-        SUB_NAM6 = fourCC("NAM6"),
-        SUB_NAM7 = fourCC("NAM7"),
-        SUB_NAM8 = fourCC("NAM8"),
-        SUB_NAM9 = fourCC("NAM9"),
-        SUB_NAMA = fourCC("NAMA"),
-        SUB_NAME = fourCC("NAME"),
-        SUB_NETO = fourCC("NETO"), // FO4
-        SUB_NEXT = fourCC("NEXT"), // FO3
-        SUB_NIFT = fourCC("NIFT"),
-        SUB_NIFZ = fourCC("NIFZ"),
-        SUB_NNAM = fourCC("NNAM"),
-        SUB_NNGS = fourCC("NNGS"), // FO4
-        SUB_NNGT = fourCC("NNGT"), // FO4
-        SUB_NNUS = fourCC("NNUS"), // FO4
-        SUB_NNUT = fourCC("NNUT"), // FO4
-        SUB_NONE = fourCC("NONE"), // FO4
-        SUB_NPOS = fourCC("NPOS"), // FO4
-        SUB_NPOT = fourCC("NPOT"), // FO4
-        SUB_NQUS = fourCC("NQUS"), // FO4
-        SUB_NQUT = fourCC("NQUT"), // FO4
-        SUB_NTOP = fourCC("NTOP"), // FO4
-        SUB_NTRM = fourCC("NTRM"), // FO4
-        SUB_NULL = fourCC("NULL"),
-        SUB_NVCA = fourCC("NVCA"), // FO3
-        SUB_NVCI = fourCC("NVCI"), // FO3
-        SUB_NVDP = fourCC("NVDP"), // FO3
-        SUB_NVER = fourCC("NVER"),
-        SUB_NVEX = fourCC("NVEX"), // FO3
-        SUB_NVGD = fourCC("NVGD"), // FO3
-        SUB_NVMI = fourCC("NVMI"),
-        SUB_NVNM = fourCC("NVNM"),
-        SUB_NVPP = fourCC("NVPP"),
-        SUB_NVSI = fourCC("NVSI"),
-        SUB_NVTR = fourCC("NVTR"), // FO3
-        SUB_NVVX = fourCC("NVVX"), // FO3
-        SUB_OBND = fourCC("OBND"),
-        SUB_OBTE = fourCC("OBTE"), // FO4
-        SUB_OBTF = fourCC("OBTF"), // FO4
-        SUB_OBTS = fourCC("OBTS"), // FO4
-        SUB_OCOR = fourCC("OCOR"), // TES5
-        SUB_OFST = fourCC("OFST"), // TES4 only?
-        SUB_ONAM = fourCC("ONAM"),
-        SUB_PCMB = fourCC("PCMB"), // FO4
-        SUB_PDTO = fourCC("PDTO"),
-        SUB_PFIG = fourCC("PFIG"),
-        SUB_PFO2 = fourCC("PFO2"), // TES5
-        SUB_PFOR = fourCC("PFOR"), // TES5
-        SUB_PFPC = fourCC("PFPC"),
-        SUB_PFRN = fourCC("PFRN"), // FO4
-        SUB_PGAG = fourCC("PGAG"),
-        SUB_PGRI = fourCC("PGRI"),
-        SUB_PGRL = fourCC("PGRL"),
-        SUB_PGRP = fourCC("PGRP"),
-        SUB_PGRR = fourCC("PGRR"),
-        SUB_PHTN = fourCC("PHTN"),
-        SUB_PHWT = fourCC("PHWT"),
-        SUB_PKAM = fourCC("PKAM"), // FO3
-        SUB_PKC2 = fourCC("PKC2"), // TES5
-        SUB_PKCU = fourCC("PKCU"), // TES5
-        SUB_PKD2 = fourCC("PKD2"), // FO3
-        SUB_PKDD = fourCC("PKDD"), // FO3
-        SUB_PKDT = fourCC("PKDT"),
-        SUB_PKE2 = fourCC("PKE2"), // FO3
-        SUB_PKED = fourCC("PKED"), // FO3
-        SUB_PKFD = fourCC("PKFD"), // FO3
-        SUB_PKID = fourCC("PKID"),
-        SUB_PKPT = fourCC("PKPT"), // FO3
-        SUB_PKW3 = fourCC("PKW3"), // FO3
-        SUB_PLCN = fourCC("PLCN"), // TES5
-        SUB_PLD2 = fourCC("PLD2"), // FO3
-        SUB_PLDT = fourCC("PLDT"),
-        SUB_PLVD = fourCC("PLVD"), // TES5
-        SUB_PNAM = fourCC("PNAM"),
-        SUB_POBA = fourCC("POBA"), // FO3
-        SUB_POCA = fourCC("POCA"), // FO3
-        SUB_POEA = fourCC("POEA"), // FO3
-        SUB_PRCB = fourCC("PRCB"), // TES5
-        SUB_PRKC = fourCC("PRKC"),
-        SUB_PRKE = fourCC("PRKE"),
-        SUB_PRKF = fourCC("PRKF"),
-        SUB_PRKR = fourCC("PRKR"),
-        SUB_PRKZ = fourCC("PRKZ"),
-        SUB_PRPS = fourCC("PRPS"), // FO4
-        SUB_PSDT = fourCC("PSDT"),
-        SUB_PTD2 = fourCC("PTD2"), // FO3
-        SUB_PTDA = fourCC("PTDA"), // TES5
-        SUB_PTDT = fourCC("PTDT"),
-        SUB_PTOP = fourCC("PTOP"), // FO4
-        SUB_PTRN = fourCC("PTRN"), // FO4
-        SUB_PUID = fourCC("PUID"), // FO3
-        SUB_QNAM = fourCC("QNAM"),
-        SUB_QOBJ = fourCC("QOBJ"), // FO3
-        SUB_QSDT = fourCC("QSDT"),
-        SUB_QSTA = fourCC("QSTA"),
-        SUB_QSTI = fourCC("QSTI"),
-        SUB_QSTR = fourCC("QSTR"),
-        SUB_QTGL = fourCC("QTGL"), // TES5
-        SUB_QTOP = fourCC("QTOP"), // FO4
-        SUB_QUAL = fourCC("QUAL"),
-        SUB_RADR = fourCC("RADR"), // FO4
-        SUB_RAGA = fourCC("RAGA"),
-        SUB_RBPC = fourCC("RBPC"), // FO4
-        SUB_RCEC = fourCC("RCEC"), // TES5
-        SUB_RCIL = fourCC("RCIL"), // FONV
-        SUB_RCLR = fourCC("RCLR"),
-        SUB_RCPR = fourCC("RCPR"), // TES5 Dawnguard
-        SUB_RCSR = fourCC("RCSR"), // TES5
-        SUB_RCUN = fourCC("RCUN"), // TES5
-        SUB_RDAT = fourCC("RDAT"),
-        SUB_RDGS = fourCC("RDGS"),
-        SUB_RDID = fourCC("RDID"), // FONV
-        SUB_RDMD = fourCC("RDMD"), // TES4 only?
-        SUB_RDMO = fourCC("RDMO"),
-        SUB_RDMP = fourCC("RDMP"),
-        SUB_RDOT = fourCC("RDOT"),
-        SUB_RDSA = fourCC("RDSA"),
-        SUB_RDSB = fourCC("RDSB"), // FONV
-        SUB_RDSD = fourCC("RDSD"), // TES4 only?
-        SUB_RDSI = fourCC("RDSI"), // FONV
-        SUB_RDWT = fourCC("RDWT"),
-        SUB_REPL = fourCC("REPL"), // FO3
-        SUB_REPT = fourCC("REPT"), // FO4
-        SUB_RLDM = fourCC("RLDM"), // FO4
-        SUB_RNAM = fourCC("RNAM"),
-        SUB_RNMV = fourCC("RNMV"),
-        SUB_RPLD = fourCC("RPLD"),
-        SUB_RPLI = fourCC("RPLI"),
-        SUB_RPRF = fourCC("RPRF"),
-        SUB_RPRM = fourCC("RPRM"),
-        SUB_RVIS = fourCC("RVIS"), // FO4
-        SUB_SADD = fourCC("SADD"), // FO4
-        SUB_SAKD = fourCC("SAKD"), // FO4
-        SUB_SAPT = fourCC("SAPT"), // FO4
-        SUB_SCDA = fourCC("SCDA"),
-        SUB_SCHD = fourCC("SCHD"),
-        SUB_SCHR = fourCC("SCHR"),
-        SUB_SCIT = fourCC("SCIT"),
-        SUB_SCQS = fourCC("SCQS"), // FO4
-        SUB_SCRI = fourCC("SCRI"),
-        SUB_SCRN = fourCC("SCRN"),
-        SUB_SCRO = fourCC("SCRO"),
-        SUB_SCRV = fourCC("SCRV"), // FONV
-        SUB_SCTX = fourCC("SCTX"),
-        SUB_SCVR = fourCC("SCVR"), // FONV
-        SUB_SDSC = fourCC("SDSC"),
-        SUB_SGNM = fourCC("SGNM"), // FO4
-        SUB_SHRT = fourCC("SHRT"),
-        SUB_SLCP = fourCC("SLCP"),
-        SUB_SLSD = fourCC("SLSD"), // FONV
-        SUB_SNAM = fourCC("SNAM"),
-        SUB_SNDD = fourCC("SNDD"),
-        SUB_SNDX = fourCC("SNDX"),
-        SUB_SNMV = fourCC("SNMV"),
-        SUB_SOFT = fourCC("SOFT"),
-        SUB_SOUL = fourCC("SOUL"),
-        SUB_SPCT = fourCC("SPCT"),
-        SUB_SPED = fourCC("SPED"),
-        SUB_SPIT = fourCC("SPIT"),
-        SUB_SPLO = fourCC("SPLO"),
-        SUB_SPMV = fourCC("SPMV"), // TES5
-        SUB_SPOR = fourCC("SPOR"),
-        SUB_SRAC = fourCC("SRAC"), // FO4
-        SUB_SRAF = fourCC("SRAF"), // FO4
-        SUB_SSPN = fourCC("SSPN"), // FO4
-        SUB_STCP = fourCC("STCP"), // FO4
-        SUB_STKD = fourCC("STKD"), // FO4
-        SUB_STOL = fourCC("STOL"), // TES5
-        SUB_STOP = fourCC("STOP"), // FO4
-        SUB_STSC = fourCC("STSC"), // FO4
-        SUB_SWMV = fourCC("SWMV"),
-        SUB_TCFU = fourCC("TCFU"), // FONV
-        SUB_TCLF = fourCC("TCLF"),
-        SUB_TCLT = fourCC("TCLT"),
-        SUB_TDUM = fourCC("TDUM"), // FONV
-        SUB_TEND = fourCC("TEND"), // FO4
-        SUB_TETI = fourCC("TETI"), // FO4
-        SUB_TIAS = fourCC("TIAS"),
-        SUB_TIFC = fourCC("TIFC"), // TES5
-        SUB_TINC = fourCC("TINC"),
-        SUB_TIND = fourCC("TIND"),
-        SUB_TINI = fourCC("TINI"),
-        SUB_TINL = fourCC("TINL"),
-        SUB_TINP = fourCC("TINP"),
-        SUB_TINT = fourCC("TINT"),
-        SUB_TINV = fourCC("TINV"),
-        SUB_TIQS = fourCC("TIQS"), // FO4
-        SUB_TIRS = fourCC("TIRS"),
-        SUB_TNAM = fourCC("TNAM"),
-        SUB_TPIC = fourCC("TPIC"),
-        SUB_TPLT = fourCC("TPLT"),
-        SUB_TPTA = fourCC("TPTA"), // FO4
-        SUB_TRDA = fourCC("TRDA"), // FO4
-        SUB_TRDT = fourCC("TRDT"),
-        SUB_TSCE = fourCC("TSCE"), // FO4
-        SUB_TTEB = fourCC("TTEB"), // FO4
-        SUB_TTEC = fourCC("TTEC"), // FO4
-        SUB_TTED = fourCC("TTED"), // FO4
-        SUB_TTEF = fourCC("TTEF"), // FO4
-        SUB_TTET = fourCC("TTET"), // FO4
-        SUB_TTGE = fourCC("TTGE"), // FO4
-        SUB_TTGP = fourCC("TTGP"), // FO4
-        SUB_TVDT = fourCC("TVDT"),
-        SUB_TWAT = fourCC("TWAT"), // TES5
-        SUB_TX00 = fourCC("TX00"),
-        SUB_TX01 = fourCC("TX01"),
-        SUB_TX02 = fourCC("TX02"),
-        SUB_TX03 = fourCC("TX03"),
-        SUB_TX04 = fourCC("TX04"),
-        SUB_TX05 = fourCC("TX05"),
-        SUB_TX06 = fourCC("TX06"),
-        SUB_TX07 = fourCC("TX07"),
-        SUB_UNAM = fourCC("UNAM"),
-        SUB_UNES = fourCC("UNES"),
-        SUB_UNWP = fourCC("UNWP"), // FO4
-        SUB_VANM = fourCC("VANM"), // FONV
-        SUB_VATS = fourCC("VATS"), // FONV
-        SUB_VCLR = fourCC("VCLR"),
-        SUB_VENC = fourCC("VENC"), // TES5
-        SUB_VEND = fourCC("VEND"), // TES5
-        SUB_VENV = fourCC("VENV"), // TES5
-        SUB_VHGT = fourCC("VHGT"),
-        SUB_VISI = fourCC("VISI"), // FO4
-        SUB_VMAD = fourCC("VMAD"),
-        SUB_VNAM = fourCC("VNAM"),
-        SUB_VNML = fourCC("VNML"),
-        SUB_VTCK = fourCC("VTCK"),
-        SUB_VTEX = fourCC("VTEX"),
-        SUB_VTXT = fourCC("VTXT"),
-        SUB_WAIT = fourCC("WAIT"), // TES5
-        SUB_WAMD = fourCC("WAMD"), // FO4
-        SUB_WBDT = fourCC("WBDT"),
-        SUB_WCTR = fourCC("WCTR"),
-        SUB_WGDR = fourCC("WGDR"), // FO4
-        SUB_WKMV = fourCC("WKMV"),
-        SUB_WLEV = fourCC("WLEV"), // FO4
-        SUB_WLST = fourCC("WLST"),
-        SUB_WMAP = fourCC("WMAP"), // FO4
-        SUB_WMI1 = fourCC("WMI1"), // FONV
-        SUB_WMI2 = fourCC("WMI2"), // FONV
-        SUB_WMI3 = fourCC("WMI3"), // FONV
-        SUB_WMS1 = fourCC("WMS1"), // FONV
-        SUB_WMS2 = fourCC("WMS2"), // FONV
-        SUB_WNAM = fourCC("WNAM"),
-        SUB_WNM1 = fourCC("WNM1"), // FONV
-        SUB_WNM2 = fourCC("WNM2"), // FONV
-        SUB_WNM3 = fourCC("WNM3"), // FONV
-        SUB_WNM4 = fourCC("WNM4"), // FONV
-        SUB_WNM5 = fourCC("WNM5"), // FONV
-        SUB_WNM6 = fourCC("WNM6"), // FONV
-        SUB_WNM7 = fourCC("WNM7"), // FONV
-        SUB_WZMD = fourCC("WZMD"), // FO4
-        SUB_XACT = fourCC("XACT"),
-        SUB_XALP = fourCC("XALP"),
-        SUB_XAMC = fourCC("XAMC"), // FO3
-        SUB_XAMT = fourCC("XAMT"), // FO3
-        SUB_XAPD = fourCC("XAPD"),
-        SUB_XAPR = fourCC("XAPR"),
-        SUB_XASP = fourCC("XASP"), // FO4
-        SUB_XATO = fourCC("XATO"), // FONV
-        SUB_XATP = fourCC("XATP"), // FO4
-        SUB_XATR = fourCC("XATR"),
-        SUB_XBSD = fourCC("XBSD"), // FO4
-        SUB_XCAS = fourCC("XCAS"),
-        SUB_XCCM = fourCC("XCCM"),
-        SUB_XCCP = fourCC("XCCP"),
-        SUB_XCET = fourCC("XCET"), // FO3
-        SUB_XCGD = fourCC("XCGD"),
-        SUB_XCHG = fourCC("XCHG"), // thievery.exp
-        SUB_XCIM = fourCC("XCIM"),
-        SUB_XCLC = fourCC("XCLC"),
-        SUB_XCLL = fourCC("XCLL"),
-        SUB_XCLP = fourCC("XCLP"), // FO3
-        SUB_XCLR = fourCC("XCLR"),
-        SUB_XCLW = fourCC("XCLW"),
-        SUB_XCMO = fourCC("XCMO"),
-        SUB_XCMT = fourCC("XCMT"), // TES4 only?
-        SUB_XCNT = fourCC("XCNT"),
-        SUB_XCRI = fourCC("XCRI"), // FO4
-        SUB_XCVL = fourCC("XCVL"),
-        SUB_XCVR = fourCC("XCVR"),
-        SUB_XCWT = fourCC("XCWT"),
-        SUB_XCZA = fourCC("XCZA"),
-        SUB_XCZC = fourCC("XCZC"),
-        SUB_XCZR = fourCC("XCZR"), // TES5
-        SUB_XDCR = fourCC("XDCR"), // FO3
-        SUB_XEMI = fourCC("XEMI"),
-        SUB_XESP = fourCC("XESP"),
-        SUB_XEZN = fourCC("XEZN"),
-        SUB_XFVC = fourCC("XFVC"),
-        SUB_XGDR = fourCC("XGDR"), // FO4
-        SUB_XGLB = fourCC("XGLB"),
-        SUB_XHLP = fourCC("XHLP"), // FO3
-        SUB_XHLT = fourCC("XHLT"), // Unofficial Oblivion Patch
-        SUB_XHOR = fourCC("XHOR"),
-        SUB_XHRS = fourCC("XHRS"),
-        SUB_XHTW = fourCC("XHTW"),
-        SUB_XIBS = fourCC("XIBS"), // FO3
-        SUB_XILL = fourCC("XILL"),
-        SUB_XILW = fourCC("XILW"), // FO4
-        SUB_XIS2 = fourCC("XIS2"),
-        SUB_XLCM = fourCC("XLCM"),
-        SUB_XLCN = fourCC("XLCN"),
-        SUB_XLIB = fourCC("XLIB"),
-        SUB_XLIG = fourCC("XLIG"),
-        SUB_XLKR = fourCC("XLKR"),
-        SUB_XLKT = fourCC("XLKT"), // FO4
-        SUB_XLOC = fourCC("XLOC"),
-        SUB_XLOD = fourCC("XLOD"),
-        SUB_XLRL = fourCC("XLRL"),
-        SUB_XLRM = fourCC("XLRM"),
-        SUB_XLRT = fourCC("XLRT"),
-        SUB_XLTW = fourCC("XLTW"),
-        SUB_XLYR = fourCC("XLYR"), // FO4
-        SUB_XMBO = fourCC("XMBO"),
-        SUB_XMBP = fourCC("XMBP"),
-        SUB_XMBR = fourCC("XMBR"),
-        SUB_XMRC = fourCC("XMRC"),
-        SUB_XMRK = fourCC("XMRK"),
-        SUB_XMSP = fourCC("XMSP"), // FO4
-        SUB_XNAM = fourCC("XNAM"),
-        SUB_XNDP = fourCC("XNDP"),
-        SUB_XOCP = fourCC("XOCP"),
-        SUB_XORD = fourCC("XORD"), // FO3
-        SUB_XOWN = fourCC("XOWN"),
-        SUB_XPCI = fourCC("XPCI"),
-        SUB_XPDD = fourCC("XPDD"), // FO4
-        SUB_XPLK = fourCC("XPLK"), // FO4
-        SUB_XPOD = fourCC("XPOD"),
-        SUB_XPPA = fourCC("XPPA"),
-        SUB_XPRD = fourCC("XPRD"),
-        SUB_XPRI = fourCC("XPRI"), // FO4
-        SUB_XPRM = fourCC("XPRM"),
-        SUB_XPTL = fourCC("XPTL"),
-        SUB_XPWR = fourCC("XPWR"),
-        SUB_XRAD = fourCC("XRAD"), // FO3
-        SUB_XRDO = fourCC("XRDO"), // FO3
-        SUB_XRDS = fourCC("XRDS"),
-        SUB_XRFG = fourCC("XRFG"), // FO4
-        SUB_XRGB = fourCC("XRGB"),
-        SUB_XRGD = fourCC("XRGD"),
-        SUB_XRMR = fourCC("XRMR"),
-        SUB_XRNK = fourCC("XRNK"), // TES4 only?
-        SUB_XRTM = fourCC("XRTM"),
-        SUB_XSCL = fourCC("XSCL"),
-        SUB_XSED = fourCC("XSED"),
-        SUB_XSPC = fourCC("XSPC"),
-        SUB_XSRD = fourCC("XSRD"), // FONV
-        SUB_XSRF = fourCC("XSRF"), // FONV
-        SUB_XTEL = fourCC("XTEL"),
-        SUB_XTNM = fourCC("XTNM"),
-        SUB_XTRG = fourCC("XTRG"),
-        SUB_XTRI = fourCC("XTRI"),
-        SUB_XWCN = fourCC("XWCN"),
-        SUB_XWCS = fourCC("XWCS"),
-        SUB_XWCU = fourCC("XWCU"),
-        SUB_XWEM = fourCC("XWEM"),
-        SUB_XWPG = fourCC("XWPG"), // FO4
-        SUB_XWPN = fourCC("XWPN"), // FO4
-        SUB_XXXX = fourCC("XXXX"),
-        SUB_YNAM = fourCC("YNAM"),
-        SUB_ZNAM = fourCC("ZNAM"),
-    };
-
     // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format#Records
     enum RecordFlag
     {
diff --git a/components/esm4/loadachr.cpp b/components/esm4/loadachr.cpp
index 1a6d47497e..6ccdc0a8c7 100644
--- a/components/esm4/loadachr.cpp
+++ b/components/esm4/loadachr.cpp
@@ -42,22 +42,22 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getZString(mFullName);
                 break;
-            case ESM4::SUB_NAME:
+            case ESM::fourCC("NAME"):
                 reader.getFormId(mBaseObj);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mPos);
                 break;
-            case ESM4::SUB_XSCL:
+            case ESM::fourCC("XSCL"):
                 reader.get(mScale);
                 break;
-            case ESM4::SUB_XOWN:
+            case ESM::fourCC("XOWN"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -78,53 +78,57 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XESP:
+            case ESM::fourCC("XESP"):
                 reader.getFormId(mEsp.parent);
                 reader.get(mEsp.flags);
                 break;
-            case ESM4::SUB_XRGD: // ragdoll
-            case ESM4::SUB_XRGB: // ragdoll biped
-            case ESM4::SUB_XHRS: // horse formId
-            case ESM4::SUB_XMRC: // merchant container formId
+            case ESM::fourCC("XCNT"):
+            {
+                reader.get(mCount);
+                break;
+            }
+            case ESM::fourCC("XRGD"): // ragdoll
+            case ESM::fourCC("XRGB"): // ragdoll biped
+            case ESM::fourCC("XHRS"): // horse formId
+            case ESM::fourCC("XMRC"): // merchant container formId
             // TES5
-            case ESM4::SUB_XAPD: // activation parent
-            case ESM4::SUB_XAPR: // active parent
-            case ESM4::SUB_XEZN: // encounter zone
-            case ESM4::SUB_XHOR:
-            case ESM4::SUB_XLCM: // levelled creature
-            case ESM4::SUB_XLCN: // location
-            case ESM4::SUB_XLKR: // location route?
-            case ESM4::SUB_XLRT: // location type
+            case ESM::fourCC("XAPD"): // activation parent
+            case ESM::fourCC("XAPR"): // active parent
+            case ESM::fourCC("XEZN"): // encounter zone
+            case ESM::fourCC("XHOR"):
+            case ESM::fourCC("XLCM"): // levelled creature
+            case ESM::fourCC("XLCN"): // location
+            case ESM::fourCC("XLKR"): // location route?
+            case ESM::fourCC("XLRT"): // location type
             //
-            case ESM4::SUB_XPRD:
-            case ESM4::SUB_XPPA:
-            case ESM4::SUB_INAM:
-            case ESM4::SUB_PDTO:
+            case ESM::fourCC("XPRD"):
+            case ESM::fourCC("XPPA"):
+            case ESM::fourCC("INAM"):
+            case ESM::fourCC("PDTO"):
             //
-            case ESM4::SUB_XIS2:
-            case ESM4::SUB_XPCI: // formId
-            case ESM4::SUB_XLOD:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_XLRL: // Unofficial Skyrim Patch
-            case ESM4::SUB_XRDS: // FO3
-            case ESM4::SUB_XIBS: // FO3
-            case ESM4::SUB_SCHR: // FO3
-            case ESM4::SUB_TNAM: // FO3
-            case ESM4::SUB_XATO: // FONV
-            case ESM4::SUB_MNAM: // FO4
-            case ESM4::SUB_XATP: // FO4
-            case ESM4::SUB_XCNT: // FO4
-            case ESM4::SUB_XEMI: // FO4
-            case ESM4::SUB_XFVC: // FO4
-            case ESM4::SUB_XHLT: // FO4
-            case ESM4::SUB_XHTW: // FO4
-            case ESM4::SUB_XLKT: // FO4
-            case ESM4::SUB_XLYR: // FO4
-            case ESM4::SUB_XMBR: // FO4
-            case ESM4::SUB_XMSP: // FO4
-            case ESM4::SUB_XPLK: // FO4
-            case ESM4::SUB_XRFG: // FO4
-            case ESM4::SUB_XRNK: // FO4
+            case ESM::fourCC("XIS2"):
+            case ESM::fourCC("XPCI"): // formId
+            case ESM::fourCC("XLOD"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("XLRL"): // Unofficial Skyrim Patch
+            case ESM::fourCC("XRDS"): // FO3
+            case ESM::fourCC("XIBS"): // FO3
+            case ESM::fourCC("SCHR"): // FO3
+            case ESM::fourCC("TNAM"): // FO3
+            case ESM::fourCC("XATO"): // FONV
+            case ESM::fourCC("MNAM"): // FO4
+            case ESM::fourCC("XATP"): // FO4
+            case ESM::fourCC("XEMI"): // FO4
+            case ESM::fourCC("XFVC"): // FO4
+            case ESM::fourCC("XHLT"): // FO4
+            case ESM::fourCC("XHTW"): // FO4
+            case ESM::fourCC("XLKT"): // FO4
+            case ESM::fourCC("XLYR"): // FO4
+            case ESM::fourCC("XMBR"): // FO4
+            case ESM::fourCC("XMSP"): // FO4
+            case ESM::fourCC("XPLK"): // FO4
+            case ESM::fourCC("XRFG"): // FO4
+            case ESM::fourCC("XRNK"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadachr.hpp b/components/esm4/loadachr.hpp
index dd867bbafd..526ab4c057 100644
--- a/components/esm4/loadachr.hpp
+++ b/components/esm4/loadachr.hpp
@@ -30,6 +30,7 @@
 #include <cstdint>
 
 #include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 #include <components/esm/refid.hpp>
 
 #include "reference.hpp" // Placement, EnableParent
@@ -57,6 +58,8 @@ namespace ESM4
 
         EnableParent mEsp;
 
+        std::int32_t mCount = 1;
+
         void load(ESM4::Reader& reader);
         // void save(ESM4::Writer& writer) const;
 
diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp
index 74eaff2dab..0609e4e1bf 100644
--- a/components/esm4/loadacti.cpp
+++ b/components/esm4/loadacti.cpp
@@ -41,69 +41,69 @@ void ESM4::Activator::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mLoopingSound);
                 break;
-            case ESM4::SUB_VNAM:
+            case ESM::fourCC("VNAM"):
                 reader.getFormId(mActivationSound);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_INAM:
+            case ESM::fourCC("INAM"):
                 reader.getFormId(mRadioTemplate);
                 break; // FONV
-            case ESM4::SUB_RNAM:
+            case ESM::fourCC("RNAM"):
                 reader.getFormId(mRadioStation);
                 break;
-            case ESM4::SUB_XATO:
+            case ESM::fourCC("XATO"):
                 reader.getZString(mActivationPrompt);
                 break; // FONV
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_FNAM:
-            case ESM4::SUB_KNAM:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_PNAM:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_WNAM:
-            case ESM4::SUB_CTDA:
-            case ESM4::SUB_CIS1:
-            case ESM4::SUB_CIS2:
-            case ESM4::SUB_CITC:
-            case ESM4::SUB_NVNM:
-            case ESM4::SUB_ATTX: // FO4
-            case ESM4::SUB_FTYP: // FO4
-            case ESM4::SUB_NTRM: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_RADR: // FO4
-            case ESM4::SUB_STCP: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("FNAM"):
+            case ESM::fourCC("KNAM"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("PNAM"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("WNAM"):
+            case ESM::fourCC("CTDA"):
+            case ESM::fourCC("CIS1"):
+            case ESM::fourCC("CIS2"):
+            case ESM::fourCC("CITC"):
+            case ESM::fourCC("NVNM"):
+            case ESM::fourCC("ATTX"): // FO4
+            case ESM::fourCC("FTYP"): // FO4
+            case ESM::fourCC("NTRM"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("RADR"): // FO4
+            case ESM::fourCC("STCP"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadalch.cpp b/components/esm4/loadalch.cpp
index 1ecfda25e8..4a289ab760 100644
--- a/components/esm4/loadalch.cpp
+++ b/components/esm4/loadalch.cpp
@@ -42,35 +42,35 @@ void ESM4::Potion::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MICO:
+            case ESM::fourCC("MICO"):
                 reader.getZString(mMiniIcon);
                 break; // FO3
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_SCIT:
+            case ESM::fourCC("SCIT"):
                 reader.get(mEffect);
                 reader.adjustFormId(mEffect.formId);
                 break;
-            case ESM4::SUB_ENIT:
+            case ESM::fourCC("ENIT"):
                 if (subHdr.dataSize == 8) // TES4
                 {
                     reader.get(&mItem, 8);
@@ -82,36 +82,36 @@ void ESM4::Potion::load(ESM4::Reader& reader)
                 reader.adjustFormId(mItem.withdrawl);
                 reader.adjustFormId(mItem.sound);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_EFID:
-            case ESM4::SUB_EFIT:
-            case ESM4::SUB_CTDA:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_ETYP: // FO3
-            case ESM4::SUB_DESC:
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_DNAM: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_CUSD: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("EFID"):
+            case ESM::fourCC("EFIT"):
+            case ESM::fourCC("CTDA"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("ETYP"): // FO3
+            case ESM::fourCC("DESC"):
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("DNAM"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("CUSD"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadaloc.cpp b/components/esm4/loadaloc.cpp
index 690684df7c..1b3bfd7e5b 100644
--- a/components/esm4/loadaloc.cpp
+++ b/components/esm4/loadaloc.cpp
@@ -42,34 +42,34 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getZString(mFullName);
                 break;
-            case ESM4::SUB_GNAM:
+            case ESM::fourCC("GNAM"):
                 reader.getFormId(mBattleSets.emplace_back());
                 break;
-            case ESM4::SUB_LNAM:
+            case ESM::fourCC("LNAM"):
                 reader.getFormId(mLocationSets.emplace_back());
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mEnemySets.emplace_back());
                 break;
-            case ESM4::SUB_HNAM:
+            case ESM::fourCC("HNAM"):
                 reader.getFormId(mNeutralSets.emplace_back());
                 break;
-            case ESM4::SUB_XNAM:
+            case ESM::fourCC("XNAM"):
                 reader.getFormId(mFriendSets.emplace_back());
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mAllySets.emplace_back());
                 break;
-            case ESM4::SUB_RNAM:
+            case ESM::fourCC("RNAM"):
                 reader.getFormId(mConditionalFaction);
                 break;
-            case ESM4::SUB_NAM1:
+            case ESM::fourCC("NAM1"):
             {
                 reader.get(mMediaFlags);
                 std::uint8_t flags = mMediaFlags.loopingOptions;
@@ -77,21 +77,21 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader)
                 mMediaFlags.factionNotFound = flags & 0x0F; // WARN: overwriting data
                 break;
             }
-            case ESM4::SUB_NAM4:
+            case ESM::fourCC("NAM4"):
                 reader.get(mLocationDelay);
                 break;
-            case ESM4::SUB_NAM7:
+            case ESM::fourCC("NAM7"):
                 reader.get(mRetriggerDelay);
                 break;
-            case ESM4::SUB_NAM5:
+            case ESM::fourCC("NAM5"):
                 reader.get(mDayStart);
                 break;
-            case ESM4::SUB_NAM6:
+            case ESM::fourCC("NAM6"):
                 reader.get(mNightStart);
                 break;
-            case ESM4::SUB_NAM2: // always 0? 4 bytes
-            case ESM4::SUB_NAM3: // always 0? 4 bytes
-            case ESM4::SUB_FNAM: // always 0? 4 bytes
+            case ESM::fourCC("NAM2"): // always 0? 4 bytes
+            case ESM::fourCC("NAM3"): // always 0? 4 bytes
+            case ESM::fourCC("FNAM"): // always 0? 4 bytes
             {
 #if 0
                 std::vector<unsigned char> mDataBuf(subHdr.dataSize);
diff --git a/components/esm4/loadammo.cpp b/components/esm4/loadammo.cpp
index 8c5bc45c85..39c42fc83f 100644
--- a/components/esm4/loadammo.cpp
+++ b/components/esm4/loadammo.cpp
@@ -41,13 +41,13 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 switch (subHdr.dataSize)
                 {
                     case 18: // TES4
@@ -86,7 +86,7 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
                         break;
                 }
                 break;
-            case ESM4::SUB_DAT2:
+            case ESM::fourCC("DAT2"):
                 if (subHdr.dataSize == 20)
                 {
                     reader.get(mData.mProjPerShot);
@@ -100,71 +100,71 @@ void ESM4::Ammunition::load(ESM4::Reader& reader)
                     reader.skipSubRecordData();
                 }
                 break;
-            case ESM4::SUB_DNAM:
+            case ESM::fourCC("DNAM"):
                 reader.getFormId(mData.mProjectile);
                 reader.get(mData.mFlags);
                 mData.mFlags &= 0xFF;
                 reader.get(mData.mDamage);
                 reader.get(mData.mHealth);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MICO:
+            case ESM::fourCC("MICO"):
                 reader.getZString(mMiniIcon);
                 break; // FO3
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.get(mEnchantmentPoints);
                 break;
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.getFormId(mEnchantment);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mText);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_ONAM:
+            case ESM::fourCC("ONAM"):
                 reader.getLocalizedString(mShortName);
                 break;
-            case ESM4::SUB_QNAM: // FONV
+            case ESM::fourCC("QNAM"): // FONV
                 reader.getLocalizedString(mAbbrev);
                 break;
-            case ESM4::SUB_RCIL:
+            case ESM::fourCC("RCIL"):
                 reader.getFormId(mAmmoEffects.emplace_back());
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScript);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_NAM1: // FO4 casing model data
-            case ESM4::SUB_NAM2: //
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("NAM1"): // FO4 casing model data
+            case ESM::fourCC("NAM2"): //
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadanio.cpp b/components/esm4/loadanio.cpp
index fa440f5ace..a8156eef2b 100644
--- a/components/esm4/loadanio.cpp
+++ b/components/esm4/loadanio.cpp
@@ -41,25 +41,25 @@ void ESM4::AnimObject::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_BNAM:
+            case ESM::fourCC("BNAM"):
                 reader.getZString(mUnloadEvent);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.getFormId(mIdleAnim);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadappa.cpp b/components/esm4/loadappa.cpp
index 45e12739b9..8c74d020a6 100644
--- a/components/esm4/loadappa.cpp
+++ b/components/esm4/loadappa.cpp
@@ -41,13 +41,13 @@ void ESM4::Apparatus::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 {
                     reader.get(mData.value);
@@ -61,24 +61,24 @@ void ESM4::Apparatus::load(ESM4::Reader& reader)
                     reader.get(mData.quality);
                 }
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mText);
                 break;
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_QUAL:
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("QUAL"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadarma.cpp b/components/esm4/loadarma.cpp
index 3390e59828..a1a1a10845 100644
--- a/components/esm4/loadarma.cpp
+++ b/components/esm4/loadarma.cpp
@@ -43,39 +43,39 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_MOD2:
+            case ESM::fourCC("MOD2"):
                 reader.getZString(mModelMale);
                 break;
-            case ESM4::SUB_MOD3:
+            case ESM::fourCC("MOD3"):
                 reader.getZString(mModelFemale);
                 break;
-            case ESM4::SUB_MOD4:
-            case ESM4::SUB_MOD5:
+            case ESM::fourCC("MOD4"):
+            case ESM::fourCC("MOD5"):
             {
                 std::string model;
                 reader.getZString(model);
                 break;
             }
-            case ESM4::SUB_NAM0:
+            case ESM::fourCC("NAM0"):
                 reader.getFormId(mTextureMale);
                 break;
-            case ESM4::SUB_NAM1:
+            case ESM::fourCC("NAM1"):
                 reader.getFormId(mTextureFemale);
                 break;
-            case ESM4::SUB_RNAM:
+            case ESM::fourCC("RNAM"):
                 reader.getFormId(mRacePrimary);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 if ((esmVer == ESM::VER_094 || esmVer == ESM::VER_170) && subHdr.dataSize == 4) // TES5
                     reader.getFormId(mRaces.emplace_back());
                 else
                     reader.skipSubRecordData(); // FIXME: this should be mModelMale for FO3/FONV
 
                 break;
-            case ESM4::SUB_BODT: // body template
+            case ESM::fourCC("BODT"): // body template
                 reader.get(mBodyTemplate.bodyPart);
                 reader.get(mBodyTemplate.flags);
                 reader.get(mBodyTemplate.unknown1); // probably padding
@@ -83,7 +83,7 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader)
                 reader.get(mBodyTemplate.unknown3); // probably padding
                 reader.get(mBodyTemplate.type);
                 break;
-            case ESM4::SUB_BOD2: // TES5+
+            case ESM::fourCC("BOD2"): // TES5+
                 reader.get(mBodyTemplate.bodyPart);
                 mBodyTemplate.flags = 0;
                 mBodyTemplate.unknown1 = 0; // probably padding
@@ -94,41 +94,57 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader)
                     reader.get(mBodyTemplate.type);
 
                 break;
-            case ESM4::SUB_DNAM:
-            case ESM4::SUB_MO2T: // FIXME: should group with MOD2
-            case ESM4::SUB_MO2S: // FIXME: should group with MOD2
-            case ESM4::SUB_MO2C: // FIXME: should group with MOD2
-            case ESM4::SUB_MO2F: // FIXME: should group with MOD2
-            case ESM4::SUB_MO3T: // FIXME: should group with MOD3
-            case ESM4::SUB_MO3S: // FIXME: should group with MOD3
-            case ESM4::SUB_MO3C: // FIXME: should group with MOD3
-            case ESM4::SUB_MO3F: // FIXME: should group with MOD3
-            case ESM4::SUB_MOSD: // FO3 // FIXME: should group with MOD3
-            case ESM4::SUB_MO4T: // FIXME: should group with MOD4
-            case ESM4::SUB_MO4S: // FIXME: should group with MOD4
-            case ESM4::SUB_MO4C: // FIXME: should group with MOD4
-            case ESM4::SUB_MO4F: // FIXME: should group with MOD4
-            case ESM4::SUB_MO5T:
-            case ESM4::SUB_MO5S:
-            case ESM4::SUB_MO5C:
-            case ESM4::SUB_MO5F:
-            case ESM4::SUB_NAM2: // txst formid male
-            case ESM4::SUB_NAM3: // txst formid female
-            case ESM4::SUB_SNDD: // footset sound formid
-            case ESM4::SUB_BMDT: // FO3
-            case ESM4::SUB_DATA: // FO3
-            case ESM4::SUB_ETYP: // FO3
-            case ESM4::SUB_FULL: // FO3
-            case ESM4::SUB_ICO2: // FO3 // female
-            case ESM4::SUB_ICON: // FO3 // male
-            case ESM4::SUB_MODT: // FO3 // FIXME: should group with MODL
-            case ESM4::SUB_MODS: // FO3 // FIXME: should group with MODL
-            case ESM4::SUB_MODD: // FO3 // FIXME: should group with MODL
-            case ESM4::SUB_OBND: // FO3
-            case ESM4::SUB_BSMB: // FO4
-            case ESM4::SUB_BSMP: // FO4
-            case ESM4::SUB_BSMS: // FO4
-            case ESM4::SUB_ONAM: // FO4
+            case ESM::fourCC("DNAM"):
+                if (subHdr.dataSize == 12)
+                {
+                    std::uint16_t unknownInt16;
+                    std::uint8_t unknownInt8;
+                    reader.get(mMalePriority);
+                    reader.get(mFemalePriority);
+                    reader.get(mWeightSliderMale);
+                    reader.get(mWeightSliderFemale);
+                    reader.get(unknownInt16);
+                    reader.get(mDetectionSoundValue);
+                    reader.get(unknownInt8);
+                    reader.get(mWeaponAdjust);
+                }
+                else
+                    reader.skipSubRecordData();
+                break;
+            case ESM::fourCC("MO2T"): // FIXME: should group with MOD2
+            case ESM::fourCC("MO2S"): // FIXME: should group with MOD2
+            case ESM::fourCC("MO2C"): // FIXME: should group with MOD2
+            case ESM::fourCC("MO2F"): // FIXME: should group with MOD2
+            case ESM::fourCC("MO3T"): // FIXME: should group with MOD3
+            case ESM::fourCC("MO3S"): // FIXME: should group with MOD3
+            case ESM::fourCC("MO3C"): // FIXME: should group with MOD3
+            case ESM::fourCC("MO3F"): // FIXME: should group with MOD3
+            case ESM::fourCC("MOSD"): // FO3 // FIXME: should group with MOD3
+            case ESM::fourCC("MO4T"): // FIXME: should group with MOD4
+            case ESM::fourCC("MO4S"): // FIXME: should group with MOD4
+            case ESM::fourCC("MO4C"): // FIXME: should group with MOD4
+            case ESM::fourCC("MO4F"): // FIXME: should group with MOD4
+            case ESM::fourCC("MO5T"):
+            case ESM::fourCC("MO5S"):
+            case ESM::fourCC("MO5C"):
+            case ESM::fourCC("MO5F"):
+            case ESM::fourCC("NAM2"): // txst formid male
+            case ESM::fourCC("NAM3"): // txst formid female
+            case ESM::fourCC("SNDD"): // footset sound formid
+            case ESM::fourCC("BMDT"): // FO3
+            case ESM::fourCC("DATA"): // FO3
+            case ESM::fourCC("ETYP"): // FO3
+            case ESM::fourCC("FULL"): // FO3
+            case ESM::fourCC("ICO2"): // FO3 // female
+            case ESM::fourCC("ICON"): // FO3 // male
+            case ESM::fourCC("MODT"): // FO3 // FIXME: should group with MODL
+            case ESM::fourCC("MODS"): // FO3 // FIXME: should group with MODL
+            case ESM::fourCC("MODD"): // FO3 // FIXME: should group with MODL
+            case ESM::fourCC("OBND"): // FO3
+            case ESM::fourCC("BSMB"): // FO4
+            case ESM::fourCC("BSMP"): // FO4
+            case ESM::fourCC("BSMS"): // FO4
+            case ESM::fourCC("ONAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadarma.hpp b/components/esm4/loadarma.hpp
index 24fa8b1093..6733184aa8 100644
--- a/components/esm4/loadarma.hpp
+++ b/components/esm4/loadarma.hpp
@@ -59,6 +59,16 @@ namespace ESM4
 
         BodyTemplate mBodyTemplate; // TES5
 
+        std::uint8_t mMalePriority = 0;
+        std::uint8_t mFemalePriority = 0;
+
+        // Flag 0x2 in mWeightSlider means that there are 2 world models for different weights: _0.nif and _1.nif
+        std::uint8_t mWeightSliderMale = 0;
+        std::uint8_t mWeightSliderFemale = 0;
+
+        std::uint8_t mDetectionSoundValue = 0;
+        float mWeaponAdjust = 0;
+
         void load(ESM4::Reader& reader);
         // void save(ESM4::Writer& writer) const;
 
diff --git a/components/esm4/loadarmo.cpp b/components/esm4/loadarmo.cpp
index 572cbd6ecd..dc926f7a01 100644
--- a/components/esm4/loadarmo.cpp
+++ b/components/esm4/loadarmo.cpp
@@ -41,13 +41,13 @@ void ESM4::Armor::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -69,12 +69,12 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_INDX: // FO4
+            case ESM::fourCC("INDX"): // FO4
             {
                 reader.get(currentIndex);
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
             {
                 if (subHdr.dataSize == 4)
                 {
@@ -97,28 +97,28 @@ void ESM4::Armor::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_MOD2:
+            case ESM::fourCC("MOD2"):
                 reader.getZString(mModelMaleWorld);
                 break;
-            case ESM4::SUB_MOD3:
+            case ESM::fourCC("MOD3"):
                 reader.getZString(mModelFemale);
                 break;
-            case ESM4::SUB_MOD4:
+            case ESM::fourCC("MOD4"):
                 reader.getZString(mModelFemaleWorld);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIconMale);
                 break;
-            case ESM4::SUB_MICO:
+            case ESM::fourCC("MICO"):
                 reader.getZString(mMiniIconMale);
                 break;
-            case ESM4::SUB_ICO2:
+            case ESM::fourCC("ICO2"):
                 reader.getZString(mIconFemale);
                 break;
-            case ESM4::SUB_MIC2:
+            case ESM::fourCC("MIC2"):
                 reader.getZString(mMiniIconFemale);
                 break;
-            case ESM4::SUB_BMDT:
+            case ESM::fourCC("BMDT"):
                 if (subHdr.dataSize == 8) // FO3
                 {
                     reader.get(mArmorFlags);
@@ -133,7 +133,7 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                     mGeneralFlags |= TYPE_TES4;
                 }
                 break;
-            case ESM4::SUB_BODT:
+            case ESM::fourCC("BODT"):
             {
                 reader.get(mArmorFlags);
                 uint32_t flags = 0;
@@ -146,7 +146,7 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                 mGeneralFlags |= TYPE_TES5;
                 break;
             }
-            case ESM4::SUB_BOD2:
+            case ESM::fourCC("BOD2"):
                 // FO4, TES5
                 if (subHdr.dataSize == 4 || subHdr.dataSize == 8)
                 {
@@ -163,75 +163,75 @@ void ESM4::Armor::load(ESM4::Reader& reader)
                     reader.skipSubRecordData();
                 }
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.get(mEnchantmentPoints);
                 break;
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.getFormId(mEnchantment);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mText);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_MO2B:
-            case ESM4::SUB_MO3B:
-            case ESM4::SUB_MO4B:
-            case ESM4::SUB_MO2T:
-            case ESM4::SUB_MO2S:
-            case ESM4::SUB_MO3T:
-            case ESM4::SUB_MO4T:
-            case ESM4::SUB_MO4S:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_RNAM: // race formid
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_TNAM:
-            case ESM4::SUB_DNAM:
-            case ESM4::SUB_BAMT:
-            case ESM4::SUB_BIDS:
-            case ESM4::SUB_ETYP:
-            case ESM4::SUB_BMCT:
-            case ESM4::SUB_EAMT:
-            case ESM4::SUB_EITM:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_REPL: // FO3
-            case ESM4::SUB_BIPL: // FO3
-            case ESM4::SUB_MODD: // FO3
-            case ESM4::SUB_MOSD: // FO3
-            case ESM4::SUB_MODS: // FO3
-            case ESM4::SUB_MO3S: // FO3
-            case ESM4::SUB_BNAM: // FONV
-            case ESM4::SUB_SNAM: // FONV
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_APPR: // FO4
-            case ESM4::SUB_DAMA: // FO4
-            case ESM4::SUB_FNAM: // FO4
-            case ESM4::SUB_INRD: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_OBTE: // FO4 object template start
-            case ESM4::SUB_OBTF:
-            case ESM4::SUB_OBTS:
-            case ESM4::SUB_STOP: // FO4 object template end
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("MO2B"):
+            case ESM::fourCC("MO3B"):
+            case ESM::fourCC("MO4B"):
+            case ESM::fourCC("MO2T"):
+            case ESM::fourCC("MO2S"):
+            case ESM::fourCC("MO3T"):
+            case ESM::fourCC("MO4T"):
+            case ESM::fourCC("MO4S"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("RNAM"): // race formid
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("TNAM"):
+            case ESM::fourCC("DNAM"):
+            case ESM::fourCC("BAMT"):
+            case ESM::fourCC("BIDS"):
+            case ESM::fourCC("ETYP"):
+            case ESM::fourCC("BMCT"):
+            case ESM::fourCC("EAMT"):
+            case ESM::fourCC("EITM"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("REPL"): // FO3
+            case ESM::fourCC("BIPL"): // FO3
+            case ESM::fourCC("MODD"): // FO3
+            case ESM::fourCC("MOSD"): // FO3
+            case ESM::fourCC("MODS"): // FO3
+            case ESM::fourCC("MO3S"): // FO3
+            case ESM::fourCC("BNAM"): // FONV
+            case ESM::fourCC("SNAM"): // FONV
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("APPR"): // FO4
+            case ESM::fourCC("DAMA"): // FO4
+            case ESM::fourCC("FNAM"): // FO4
+            case ESM::fourCC("INRD"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("OBTE"): // FO4 object template start
+            case ESM::fourCC("OBTF"):
+            case ESM::fourCC("OBTS"):
+            case ESM::fourCC("STOP"): // FO4 object template end
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadaspc.cpp b/components/esm4/loadaspc.cpp
index d79df9d8ef..e8fe9d3b34 100644
--- a/components/esm4/loadaspc.cpp
+++ b/components/esm4/loadaspc.cpp
@@ -41,35 +41,35 @@ void ESM4::AcousticSpace::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.get(mEnvironmentType);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mAmbientLoopSounds.emplace_back());
                 break;
-            case ESM4::SUB_RDAT:
+            case ESM::fourCC("RDAT"):
                 reader.getFormId(mSoundRegion);
                 break;
-            case ESM4::SUB_INAM:
+            case ESM::fourCC("INAM"):
                 reader.get(mIsInterior);
                 break;
-            case ESM4::SUB_XTRI:
+            case ESM::fourCC("XTRI"):
                 std::uint8_t isInterior;
                 reader.get(isInterior);
                 mIsInterior = isInterior;
                 break;
-            case ESM4::SUB_WNAM:
+            case ESM::fourCC("WNAM"):
             {
                 // usually 0 for FONV (maybe # of close Actors for Walla to trigger) (4 bytes)
                 // Weather attenuation in FO4 (2 bytes)
                 reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_BNAM: // TES5 reverb formid
-            case ESM4::SUB_OBND:
+            case ESM::fourCC("BNAM"): // TES5 reverb formid
+            case ESM::fourCC("OBND"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadbook.cpp b/components/esm4/loadbook.cpp
index f2842e5313..cef942074a 100644
--- a/components/esm4/loadbook.cpp
+++ b/components/esm4/loadbook.cpp
@@ -42,16 +42,16 @@ void ESM4::Book::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mText);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -82,53 +82,53 @@ void ESM4::Book::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.get(mEnchantmentPoints);
                 break;
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.getFormId(mEnchantment);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_CNAM:
-            case ESM4::SUB_INAM:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_DNAM: // FO4
-            case ESM4::SUB_FIMD: // FO4
-            case ESM4::SUB_MICO: // FO4
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("CNAM"):
+            case ESM::fourCC("INAM"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("DNAM"): // FO4
+            case ESM::fourCC("FIMD"): // FO4
+            case ESM::fourCC("MICO"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadbptd.cpp b/components/esm4/loadbptd.cpp
index 509eadfcf1..5ff3b5908b 100644
--- a/components/esm4/loadbptd.cpp
+++ b/components/esm4/loadbptd.cpp
@@ -56,56 +56,56 @@ void ESM4::BodyPartData::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_BPTN:
+            case ESM::fourCC("BPTN"):
                 reader.getLocalizedString(bodyPart.mPartName);
                 break;
-            case ESM4::SUB_BPNN:
+            case ESM::fourCC("BPNN"):
                 reader.getZString(bodyPart.mNodeName);
                 break;
-            case ESM4::SUB_BPNT:
+            case ESM::fourCC("BPNT"):
                 reader.getZString(bodyPart.mVATSTarget);
                 break;
-            case ESM4::SUB_BPNI:
+            case ESM::fourCC("BPNI"):
                 reader.getZString(bodyPart.mIKStartNode);
                 break;
-            case ESM4::SUB_BPND:
+            case ESM::fourCC("BPND"):
                 if (subHdr.dataSize == sizeof(bodyPart.mData))
                     reader.get(bodyPart.mData);
                 // FIXME: FO4
                 else
                     reader.skipSubRecordData();
                 break;
-            case ESM4::SUB_NAM1:
+            case ESM::fourCC("NAM1"):
                 reader.getZString(bodyPart.mLimbReplacementModel);
                 break;
-            case ESM4::SUB_NAM4: // FIXME: assumed occurs last
+            case ESM::fourCC("NAM4"): // FIXME: assumed occurs last
                 reader.getZString(bodyPart.mGoreEffectsTarget); // target bone
                 mBodyParts.push_back(bodyPart); // FIXME: possible without copying?
                 bodyPart.clear();
                 break;
-            case ESM4::SUB_NAM5:
-            case ESM4::SUB_RAGA: // ragdoll
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_BNAM: // FO4
-            case ESM4::SUB_CNAM: // FO4
-            case ESM4::SUB_DNAM: // FO4
-            case ESM4::SUB_ENAM: // FO4
-            case ESM4::SUB_FNAM: // FO4
-            case ESM4::SUB_INAM: // FO4
-            case ESM4::SUB_JNAM: // FO4
-            case ESM4::SUB_NAM2: // FO4
+            case ESM::fourCC("NAM5"):
+            case ESM::fourCC("RAGA"): // ragdoll
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("BNAM"): // FO4
+            case ESM::fourCC("CNAM"): // FO4
+            case ESM::fourCC("DNAM"): // FO4
+            case ESM::fourCC("ENAM"): // FO4
+            case ESM::fourCC("FNAM"): // FO4
+            case ESM::fourCC("INAM"): // FO4
+            case ESM::fourCC("JNAM"): // FO4
+            case ESM::fourCC("NAM2"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp
index 0091ab0bd6..8106c1637f 100644
--- a/components/esm4/loadcell.cpp
+++ b/components/esm4/loadcell.cpp
@@ -78,7 +78,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
             {
                 if (!reader.getZString(mEditorId))
                     throw std::runtime_error("CELL EDID data read error");
@@ -89,7 +89,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
 #endif
                 break;
             }
-            case ESM4::SUB_XCLC:
+            case ESM::fourCC("XCLC"):
             {
                 //(X, Y) grid location of the cell followed by flags. Always in
                 // exterior cells and never in interior cells.
@@ -114,10 +114,10 @@ void ESM4::Cell::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 if (subHdr.dataSize == 2)
                     reader.get(mCellFlags);
@@ -131,7 +131,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XCLR: // for exterior cells
+            case ESM::fourCC("XCLR"): // for exterior cells
             {
                 mRegions.resize(subHdr.dataSize / sizeof(ESM::FormId32));
                 for (std::vector<ESM::FormId>::iterator it = mRegions.begin(); it != mRegions.end(); ++it)
@@ -145,7 +145,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XOWN:
+            case ESM::fourCC("XOWN"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -166,19 +166,19 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XGLB:
+            case ESM::fourCC("XGLB"):
                 reader.getFormId(mGlobal);
                 break; // Oblivion only?
-            case ESM4::SUB_XCCM:
+            case ESM::fourCC("XCCM"):
                 reader.getFormId(mClimate);
                 break;
-            case ESM4::SUB_XCWT:
+            case ESM::fourCC("XCWT"):
                 reader.getFormId(mWater);
                 break;
-            case ESM4::SUB_XCLW:
+            case ESM::fourCC("XCLW"):
                 reader.get(mWaterHeight);
                 break;
-            case ESM4::SUB_XCLL:
+            case ESM::fourCC("XCLL"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -197,45 +197,45 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XCMT:
+            case ESM::fourCC("XCMT"):
                 reader.get(mMusicType);
                 break; // Oblivion only?
-            case ESM4::SUB_LTMP:
+            case ESM::fourCC("LTMP"):
                 reader.getFormId(mLightingTemplate);
                 break;
-            case ESM4::SUB_LNAM:
+            case ESM::fourCC("LNAM"):
                 reader.get(mLightingTemplateFlags);
                 break; // seems to always follow LTMP
-            case ESM4::SUB_XCMO:
+            case ESM::fourCC("XCMO"):
                 reader.getFormId(mMusic);
                 break;
-            case ESM4::SUB_XCAS:
+            case ESM::fourCC("XCAS"):
                 reader.getFormId(mAcousticSpace);
                 break;
-            case ESM4::SUB_TVDT:
-            case ESM4::SUB_MHDT:
-            case ESM4::SUB_XCGD:
-            case ESM4::SUB_XNAM:
-            case ESM4::SUB_XLCN:
-            case ESM4::SUB_XWCS:
-            case ESM4::SUB_XWCU:
-            case ESM4::SUB_XWCN:
-            case ESM4::SUB_XCIM:
-            case ESM4::SUB_XEZN:
-            case ESM4::SUB_XWEM:
-            case ESM4::SUB_XILL:
-            case ESM4::SUB_XRNK:
-            case ESM4::SUB_XCET: // FO3
-            case ESM4::SUB_IMPF: // FO3 Zeta
-            case ESM4::SUB_CNAM: // FO4
-            case ESM4::SUB_PCMB: // FO4
-            case ESM4::SUB_RVIS: // FO4
-            case ESM4::SUB_VISI: // FO4
-            case ESM4::SUB_XGDR: // FO4
-            case ESM4::SUB_XILW: // FO4
-            case ESM4::SUB_XCRI: // FO4
-            case ESM4::SUB_XPRI: // FO4
-            case ESM4::SUB_ZNAM: // FO4
+            case ESM::fourCC("TVDT"):
+            case ESM::fourCC("MHDT"):
+            case ESM::fourCC("XCGD"):
+            case ESM::fourCC("XNAM"):
+            case ESM::fourCC("XLCN"):
+            case ESM::fourCC("XWCS"):
+            case ESM::fourCC("XWCU"):
+            case ESM::fourCC("XWCN"):
+            case ESM::fourCC("XCIM"):
+            case ESM::fourCC("XEZN"):
+            case ESM::fourCC("XWEM"):
+            case ESM::fourCC("XILL"):
+            case ESM::fourCC("XRNK"):
+            case ESM::fourCC("XCET"): // FO3
+            case ESM::fourCC("IMPF"): // FO3 Zeta
+            case ESM::fourCC("CNAM"): // FO4
+            case ESM::fourCC("PCMB"): // FO4
+            case ESM::fourCC("RVIS"): // FO4
+            case ESM::fourCC("VISI"): // FO4
+            case ESM::fourCC("XGDR"): // FO4
+            case ESM::fourCC("XILW"): // FO4
+            case ESM::fourCC("XCRI"): // FO4
+            case ESM::fourCC("XPRI"): // FO4
+            case ESM::fourCC("ZNAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadcell.hpp b/components/esm4/loadcell.hpp
index 58d1f0da43..7b874b4179 100644
--- a/components/esm4/loadcell.hpp
+++ b/components/esm4/loadcell.hpp
@@ -32,8 +32,8 @@
 #include <vector>
 
 #include <components/esm/defs.hpp>
+#include <components/esm/exteriorcelllocation.hpp>
 #include <components/esm/refid.hpp>
-#include <components/esm/util.hpp>
 #include <components/esm4/reader.hpp>
 #include <components/misc/constants.hpp>
 
diff --git a/components/esm4/loadclas.cpp b/components/esm4/loadclas.cpp
index 7d232a0aa1..e80b36849e 100644
--- a/components/esm4/loadclas.cpp
+++ b/components/esm4/loadclas.cpp
@@ -41,21 +41,21 @@ void ESM4::Class::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mDesc);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_DATA:
-            case ESM4::SUB_ATTR:
-            case ESM4::SUB_PRPS:
+            case ESM::fourCC("DATA"):
+            case ESM::fourCC("ATTR"):
+            case ESM::fourCC("PRPS"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadclfm.cpp b/components/esm4/loadclfm.cpp
index bc887cd15c..b7157877c7 100644
--- a/components/esm4/loadclfm.cpp
+++ b/components/esm4/loadclfm.cpp
@@ -41,22 +41,22 @@ void ESM4::Colour::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_CNAM:
+            case ESM::fourCC("CNAM"):
                 reader.get(mColour.red);
                 reader.get(mColour.green);
                 reader.get(mColour.blue);
                 reader.get(mColour.custom);
                 break;
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
                 reader.get(mPlayable);
                 break;
-            case ESM4::SUB_CTDA:
+            case ESM::fourCC("CTDA"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadclot.cpp b/components/esm4/loadclot.cpp
index c67ac3df6b..48999adb18 100644
--- a/components/esm4/loadclot.cpp
+++ b/components/esm4/loadclot.cpp
@@ -41,55 +41,55 @@ void ESM4::Clothing::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getZString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_BMDT:
+            case ESM::fourCC("BMDT"):
                 reader.get(mClothingFlags);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.getFormId(mEnchantment);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.get(mEnchantmentPoints);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModelMale);
                 break;
-            case ESM4::SUB_MOD2:
+            case ESM::fourCC("MOD2"):
                 reader.getZString(mModelMaleWorld);
                 break;
-            case ESM4::SUB_MOD3:
+            case ESM::fourCC("MOD3"):
                 reader.getZString(mModelFemale);
                 break;
-            case ESM4::SUB_MOD4:
+            case ESM::fourCC("MOD4"):
                 reader.getZString(mModelFemaleWorld);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIconMale);
                 break;
-            case ESM4::SUB_ICO2:
+            case ESM::fourCC("ICO2"):
                 reader.getZString(mIconFemale);
                 break;
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_MO2B:
-            case ESM4::SUB_MO3B:
-            case ESM4::SUB_MO4B:
-            case ESM4::SUB_MO2T:
-            case ESM4::SUB_MO3T:
-            case ESM4::SUB_MO4T:
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("MO2B"):
+            case ESM::fourCC("MO3B"):
+            case ESM::fourCC("MO4B"):
+            case ESM::fourCC("MO2T"):
+            case ESM::fourCC("MO3T"):
+            case ESM::fourCC("MO4T"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadcont.cpp b/components/esm4/loadcont.cpp
index d650678093..70f05b4375 100644
--- a/components/esm4/loadcont.cpp
+++ b/components/esm4/loadcont.cpp
@@ -41,65 +41,65 @@ void ESM4::Container::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mDataFlags);
                 reader.get(mWeight);
                 break;
-            case ESM4::SUB_CNTO:
+            case ESM::fourCC("CNTO"):
             {
-                static InventoryItem inv; // FIXME: use unique_ptr here?
+                InventoryItem inv; // FIXME: use unique_ptr here?
                 reader.get(inv);
                 reader.adjustFormId(inv.item);
                 mInventory.push_back(inv);
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mOpenSound);
                 break;
-            case ESM4::SUB_QNAM:
+            case ESM::fourCC("QNAM"):
                 reader.getFormId(mCloseSound);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_VMAD: // TES5 only
-            case ESM4::SUB_OBND: // TES5 only
-            case ESM4::SUB_COCT: // TES5 only
-            case ESM4::SUB_COED: // TES5 only
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_ONAM:
-            case ESM4::SUB_RNAM: // FONV
-            case ESM4::SUB_TNAM:
-            case ESM4::SUB_FTYP: // FO4
-            case ESM4::SUB_NTRM: // FO4
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("VMAD"): // TES5 only
+            case ESM::fourCC("OBND"): // TES5 only
+            case ESM::fourCC("COCT"): // TES5 only
+            case ESM::fourCC("COED"): // TES5 only
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("ONAM"):
+            case ESM::fourCC("RNAM"): // FONV
+            case ESM::fourCC("TNAM"):
+            case ESM::fourCC("FTYP"): // FO4
+            case ESM::fourCC("NTRM"): // FO4
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadcrea.cpp b/components/esm4/loadcrea.cpp
index 0c07eb92e3..0af39364b5 100644
--- a/components/esm4/loadcrea.cpp
+++ b/components/esm4/loadcrea.cpp
@@ -45,93 +45,93 @@ void ESM4::Creature::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getZString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_CNTO:
+            case ESM::fourCC("CNTO"):
             {
-                static InventoryItem inv; // FIXME: use unique_ptr here?
+                InventoryItem inv; // FIXME: use unique_ptr here?
                 reader.get(inv);
                 reader.adjustFormId(inv.item);
                 mInventory.push_back(inv);
                 break;
             }
-            case ESM4::SUB_SPLO:
+            case ESM::fourCC("SPLO"):
                 reader.getFormId(mSpell.emplace_back());
                 break;
-            case ESM4::SUB_PKID:
+            case ESM::fourCC("PKID"):
                 reader.getFormId(mAIPackages.emplace_back());
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.get(mFaction);
                 reader.adjustFormId(mFaction.faction);
                 break;
-            case ESM4::SUB_INAM:
+            case ESM::fourCC("INAM"):
                 reader.getFormId(mDeathItem);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_AIDT:
+            case ESM::fourCC("AIDT"):
                 if (subHdr.dataSize == 20) // FO3
                     reader.skipSubRecordData();
                 else
                     reader.get(mAIData); // 12 bytes
                 break;
-            case ESM4::SUB_ACBS:
+            case ESM::fourCC("ACBS"):
                 // if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
                 if (subHdr.dataSize == 24)
                     reader.get(mBaseConfig);
                 else
                     reader.get(&mBaseConfig, 16); // TES4
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 if (subHdr.dataSize == 17) // FO3
                     reader.skipSubRecordData();
                 else
                     reader.get(mData);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mCombatStyle);
                 break;
-            case ESM4::SUB_CSCR:
+            case ESM::fourCC("CSCR"):
                 reader.getFormId(mSoundBase);
                 break;
-            case ESM4::SUB_CSDI:
+            case ESM::fourCC("CSDI"):
                 reader.getFormId(mSound);
                 break;
-            case ESM4::SUB_CSDC:
+            case ESM::fourCC("CSDC"):
                 reader.get(mSoundChance);
                 break;
-            case ESM4::SUB_BNAM:
+            case ESM::fourCC("BNAM"):
                 reader.get(mBaseScale);
                 break;
-            case ESM4::SUB_TNAM:
+            case ESM::fourCC("TNAM"):
                 reader.get(mTurningSpeed);
                 break;
-            case ESM4::SUB_WNAM:
+            case ESM::fourCC("WNAM"):
                 reader.get(mFootWeight);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_NAM0:
+            case ESM::fourCC("NAM0"):
                 reader.getZString(mBloodSpray);
                 break;
-            case ESM4::SUB_NAM1:
+            case ESM::fourCC("NAM1"):
                 reader.getZString(mBloodDecal);
                 break;
-            case ESM4::SUB_NIFZ:
+            case ESM::fourCC("NIFZ"):
                 if (!reader.getZeroTerminatedStringArray(mNif))
                     throw std::runtime_error("CREA NIFZ data read error");
                 break;
-            case ESM4::SUB_NIFT:
+            case ESM::fourCC("NIFT"):
             {
                 if (subHdr.dataSize != 4) // FIXME: FO3
                 {
@@ -147,33 +147,33 @@ void ESM4::Creature::load(ESM4::Reader& reader)
                     Log(Debug::Verbose) << "CREA NIFT " << mId << ", non-zero " << nift;
                 break;
             }
-            case ESM4::SUB_KFFZ:
+            case ESM::fourCC("KFFZ"):
                 if (!reader.getZeroTerminatedStringArray(mKf))
                     throw std::runtime_error("CREA KFFZ data read error");
                 break;
-            case ESM4::SUB_TPLT:
+            case ESM::fourCC("TPLT"):
                 reader.getFormId(mBaseTemplate);
                 break; // FO3
-            case ESM4::SUB_PNAM: // FO3/FONV/TES5
+            case ESM::fourCC("PNAM"): // FO3/FONV/TES5
                 reader.getFormId(mBodyParts.emplace_back());
                 break;
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_RNAM:
-            case ESM4::SUB_CSDT:
-            case ESM4::SUB_OBND: // FO3
-            case ESM4::SUB_EAMT: // FO3
-            case ESM4::SUB_VTCK: // FO3
-            case ESM4::SUB_NAM4: // FO3
-            case ESM4::SUB_NAM5: // FO3
-            case ESM4::SUB_CNAM: // FO3
-            case ESM4::SUB_LNAM: // FO3
-            case ESM4::SUB_EITM: // FO3
-            case ESM4::SUB_DEST: // FO3
-            case ESM4::SUB_DSTD: // FO3
-            case ESM4::SUB_DSTF: // FO3
-            case ESM4::SUB_DMDL: // FO3
-            case ESM4::SUB_DMDT: // FO3
-            case ESM4::SUB_COED: // FO3
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("RNAM"):
+            case ESM::fourCC("CSDT"):
+            case ESM::fourCC("OBND"): // FO3
+            case ESM::fourCC("EAMT"): // FO3
+            case ESM::fourCC("VTCK"): // FO3
+            case ESM::fourCC("NAM4"): // FO3
+            case ESM::fourCC("NAM5"): // FO3
+            case ESM::fourCC("CNAM"): // FO3
+            case ESM::fourCC("LNAM"): // FO3
+            case ESM::fourCC("EITM"): // FO3
+            case ESM::fourCC("DEST"): // FO3
+            case ESM::fourCC("DSTD"): // FO3
+            case ESM::fourCC("DSTF"): // FO3
+            case ESM::fourCC("DMDL"): // FO3
+            case ESM::fourCC("DMDT"): // FO3
+            case ESM::fourCC("COED"): // FO3
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loaddial.cpp b/components/esm4/loaddial.cpp
index 19e1099482..3ed9b79e0a 100644
--- a/components/esm4/loaddial.cpp
+++ b/components/esm4/loaddial.cpp
@@ -42,19 +42,19 @@ void ESM4::Dialogue::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mTopicName);
                 break;
-            case ESM4::SUB_QSTI:
+            case ESM::fourCC("QSTI"):
                 reader.getFormId(mQuests.emplace_back());
                 break;
-            case ESM4::SUB_QSTR: // Seems never used in TES4
+            case ESM::fourCC("QSTR"): // Seems never used in TES4
                 reader.getFormId(mQuestsRemoved.emplace_back());
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 if (subHdr.dataSize == 4) // TES5
                 {
@@ -74,20 +74,20 @@ void ESM4::Dialogue::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PNAM:
+            case ESM::fourCC("PNAM"):
                 reader.get(mPriority);
                 break; // FO3/FONV
-            case ESM4::SUB_TDUM:
+            case ESM::fourCC("TDUM"):
                 reader.getZString(mTextDumb);
                 break; // FONV
-            case ESM4::SUB_SCRI:
-            case ESM4::SUB_INFC: // FONV info connection
-            case ESM4::SUB_INFX: // FONV info index
-            case ESM4::SUB_QNAM: // TES5
-            case ESM4::SUB_BNAM: // TES5
-            case ESM4::SUB_SNAM: // TES5
-            case ESM4::SUB_TIFC: // TES5
-            case ESM4::SUB_KNAM: // FO4
+            case ESM::fourCC("SCRI"):
+            case ESM::fourCC("INFC"): // FONV info connection
+            case ESM::fourCC("INFX"): // FONV info index
+            case ESM::fourCC("QNAM"): // TES5
+            case ESM::fourCC("BNAM"): // TES5
+            case ESM::fourCC("SNAM"): // TES5
+            case ESM::fourCC("TIFC"): // TES5
+            case ESM::fourCC("KNAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loaddobj.cpp b/components/esm4/loaddobj.cpp
index 50135fc7a1..9c0c193f81 100644
--- a/components/esm4/loaddobj.cpp
+++ b/components/esm4/loaddobj.cpp
@@ -44,10 +44,10 @@ void ESM4::DefaultObj::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break; // "DefaultObjectManager"
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.getFormId(mData.stimpack);
                 reader.getFormId(mData.superStimpack);
                 reader.getFormId(mData.radX);
@@ -87,7 +87,7 @@ void ESM4::DefaultObj::load(ESM4::Reader& reader)
                     reader.getFormId(mData.cateyeMobileEffectNYI);
                 }
                 break;
-            case ESM4::SUB_DNAM:
+            case ESM::fourCC("DNAM"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loaddoor.cpp b/components/esm4/loaddoor.cpp
index 7fe38b6b7a..10171085c3 100644
--- a/components/esm4/loaddoor.cpp
+++ b/components/esm4/loaddoor.cpp
@@ -41,57 +41,57 @@ void ESM4::Door::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mOpenSound);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.getFormId(mCloseSound);
                 break;
-            case ESM4::SUB_BNAM:
+            case ESM::fourCC("BNAM"):
                 reader.getFormId(mLoopSound);
                 break;
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
                 reader.get(mDoorFlags);
                 break;
-            case ESM4::SUB_TNAM:
+            case ESM::fourCC("TNAM"):
                 reader.getFormId(mRandomTeleport);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_CNAM: // FO4
-            case ESM4::SUB_NTRM: // FO4
-            case ESM4::SUB_ONAM: // FO4
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("CNAM"): // FO4
+            case ESM::fourCC("NTRM"): // FO4
+            case ESM::fourCC("ONAM"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadeyes.cpp b/components/esm4/loadeyes.cpp
index 28f6d33c6e..7e356889d9 100644
--- a/components/esm4/loadeyes.cpp
+++ b/components/esm4/loadeyes.cpp
@@ -41,16 +41,16 @@ void ESM4::Eyes::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
             default:
diff --git a/components/esm4/loadflor.cpp b/components/esm4/loadflor.cpp
index 69f1c82b13..164f97eff1 100644
--- a/components/esm4/loadflor.cpp
+++ b/components/esm4/loadflor.cpp
@@ -41,53 +41,53 @@ void ESM4::Flora::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_PFIG:
+            case ESM::fourCC("PFIG"):
                 reader.getFormId(mIngredient);
                 break;
-            case ESM4::SUB_PFPC:
+            case ESM::fourCC("PFPC"):
                 reader.get(mPercentHarvest);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mSound);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_FNAM:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_PNAM:
-            case ESM4::SUB_RNAM:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_ATTX: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("FNAM"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("PNAM"):
+            case ESM::fourCC("RNAM"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("ATTX"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadflst.cpp b/components/esm4/loadflst.cpp
index 9da17bc84b..4acf4d28d2 100644
--- a/components/esm4/loadflst.cpp
+++ b/components/esm4/loadflst.cpp
@@ -41,13 +41,13 @@ void ESM4::FormIdList::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_LNAM:
+            case ESM::fourCC("LNAM"):
                 reader.getFormId(mObjects.emplace_back());
                 break;
             default:
diff --git a/components/esm4/loadfurn.cpp b/components/esm4/loadfurn.cpp
index 40ea04955e..75dc3751a6 100644
--- a/components/esm4/loadfurn.cpp
+++ b/components/esm4/loadfurn.cpp
@@ -41,77 +41,77 @@ void ESM4::Furniture::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
             {
                 std::string name;
                 reader.getLocalizedString(name);
                 // FIXME: subsequent FULL subrecords name object combinations (FO4)
                 if (mFullName.empty())
-                    mFullName = name;
+                    mFullName = std::move(name);
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_MNAM:
+            case ESM::fourCC("MNAM"):
                 reader.get(mActiveMarkerFlags);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_ENAM:
-            case ESM4::SUB_FNAM:
-            case ESM4::SUB_FNMK:
-            case ESM4::SUB_FNPR:
-            case ESM4::SUB_KNAM:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_NAM0:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_PNAM:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_WBDT:
-            case ESM4::SUB_XMRK:
-            case ESM4::SUB_PRPS:
-            case ESM4::SUB_CTDA:
-            case ESM4::SUB_CIS1:
-            case ESM4::SUB_CIS2:
-            case ESM4::SUB_APPR: // FO4
-            case ESM4::SUB_ATTX: // FO4
-            case ESM4::SUB_CITC: // FO4
-            case ESM4::SUB_CNTO: // FO4
-            case ESM4::SUB_COCT: // FO4
-            case ESM4::SUB_COED: // FO4
-            case ESM4::SUB_FTYP: // FO4
-            case ESM4::SUB_NAM1: // FO4
-            case ESM4::SUB_NTRM: // FO4
-            case ESM4::SUB_NVNM: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_SNAM: // FO4
-            case ESM4::SUB_WNAM: // FO4
-            case ESM4::SUB_OBTE: // FO4 object template start
-            case ESM4::SUB_OBTF:
-            case ESM4::SUB_OBTS:
-            case ESM4::SUB_STOP: // FO4 object template end
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("ENAM"):
+            case ESM::fourCC("FNAM"):
+            case ESM::fourCC("FNMK"):
+            case ESM::fourCC("FNPR"):
+            case ESM::fourCC("KNAM"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("NAM0"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("PNAM"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("WBDT"):
+            case ESM::fourCC("XMRK"):
+            case ESM::fourCC("PRPS"):
+            case ESM::fourCC("CTDA"):
+            case ESM::fourCC("CIS1"):
+            case ESM::fourCC("CIS2"):
+            case ESM::fourCC("APPR"): // FO4
+            case ESM::fourCC("ATTX"): // FO4
+            case ESM::fourCC("CITC"): // FO4
+            case ESM::fourCC("CNTO"): // FO4
+            case ESM::fourCC("COCT"): // FO4
+            case ESM::fourCC("COED"): // FO4
+            case ESM::fourCC("FTYP"): // FO4
+            case ESM::fourCC("NAM1"): // FO4
+            case ESM::fourCC("NTRM"): // FO4
+            case ESM::fourCC("NVNM"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("SNAM"): // FO4
+            case ESM::fourCC("WNAM"): // FO4
+            case ESM::fourCC("OBTE"): // FO4 object template start
+            case ESM::fourCC("OBTF"):
+            case ESM::fourCC("OBTS"):
+            case ESM::fourCC("STOP"): // FO4 object template end
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadglob.cpp b/components/esm4/loadglob.cpp
index 39593a4a7d..4349bcb072 100644
--- a/components/esm4/loadglob.cpp
+++ b/components/esm4/loadglob.cpp
@@ -41,22 +41,19 @@ void ESM4::GlobalVariable::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("XALG"): // FO76
+                reader.get(mExtraFlags2);
+                break;
+            case ESM::fourCC("FNAM"):
                 reader.get(mType);
                 break;
-            case ESM4::SUB_FLTV:
+            case ESM::fourCC("FLTV"):
                 reader.get(mValue);
                 break;
-            case ESM4::SUB_FULL:
-            case ESM4::SUB_MODL:
-            case ESM4::SUB_MODB:
-            case ESM4::SUB_ICON:
-            case ESM4::SUB_DATA:
-            case ESM4::SUB_OBND: // TES5
-            case ESM4::SUB_VMAD: // TES5
+            case ESM::fourCC("NTWK"): // FO76
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadglob.hpp b/components/esm4/loadglob.hpp
index c9c83f58b4..89959bcab1 100644
--- a/components/esm4/loadglob.hpp
+++ b/components/esm4/loadglob.hpp
@@ -42,6 +42,7 @@ namespace ESM4
     {
         ESM::FormId mId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+        std::uint64_t mExtraFlags2;
 
         std::string mEditorId;
 
diff --git a/components/esm4/loadgmst.cpp b/components/esm4/loadgmst.cpp
index f22ed5848d..0b2df075f2 100644
--- a/components/esm4/loadgmst.cpp
+++ b/components/esm4/loadgmst.cpp
@@ -67,10 +67,10 @@ namespace ESM4
             const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
             switch (subHdr.typeId)
             {
-                case ESM4::SUB_EDID:
+                case ESM::fourCC("EDID"):
                     reader.getZString(mEditorId);
                     break;
-                case ESM4::SUB_DATA:
+                case ESM::fourCC("DATA"):
                     mData = readData(mId, mEditorId, reader);
                     break;
                 default:
diff --git a/components/esm4/loadgras.cpp b/components/esm4/loadgras.cpp
index ebcdde04a1..8514b3aa0a 100644
--- a/components/esm4/loadgras.cpp
+++ b/components/esm4/loadgras.cpp
@@ -41,23 +41,23 @@ void ESM4::Grass::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_OBND:
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadhair.cpp b/components/esm4/loadhair.cpp
index 3ab983d6b6..f3e5a8a1c3 100644
--- a/components/esm4/loadhair.cpp
+++ b/components/esm4/loadhair.cpp
@@ -41,25 +41,25 @@ void ESM4::Hair::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getZString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT:
+            case ESM::fourCC("MODT"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp
index 7592db5486..27623e5203 100644
--- a/components/esm4/loadhdpt.cpp
+++ b/components/esm4/loadhdpt.cpp
@@ -37,6 +37,9 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
 {
     mId = reader.getFormIdFromHeader();
     mFlags = reader.hdr().record.flags;
+    mExtraFlags2 = 0;
+    mData = 0;
+    mType = 0;
 
     std::optional<std::uint32_t> type;
 
@@ -45,29 +48,32 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("XALG"): // FO76
+                reader.get(mExtraFlags2);
+                break;
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_HNAM:
-                reader.getFormId(mAdditionalPart);
+            case ESM::fourCC("HNAM"):
+                reader.getFormId(mExtraParts.emplace_back());
                 break;
-            case ESM4::SUB_NAM0: // TES5
+            case ESM::fourCC("NAM0"): // TES5
             {
                 std::uint32_t value;
                 reader.get(value);
                 type = value;
                 break;
             }
-            case ESM4::SUB_NAM1: // TES5
+            case ESM::fourCC("NAM1"): // TES5
             {
                 std::string file;
                 reader.getZString(file);
@@ -84,17 +90,29 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
                 mTriFile[*type] = std::move(file);
                 break;
             }
-            case ESM4::SUB_TNAM:
+            case ESM::fourCC("TNAM"):
                 reader.getFormId(mBaseTexture);
                 break;
-            case ESM4::SUB_PNAM:
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_RNAM:
-            case ESM4::SUB_CNAM:
-            case ESM4::SUB_CTDA:
+            case ESM::fourCC("CNAM"):
+                reader.getFormId(mColor);
+                break;
+            case ESM::fourCC("RNAM"):
+                reader.getFormId(mValidRaces.emplace_back());
+                break;
+            case ESM::fourCC("PNAM"):
+                reader.get(mType);
+                break;
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"):
+            case ESM::fourCC("ENLM"):
+            case ESM::fourCC("XFLG"):
+            case ESM::fourCC("ENLT"):
+            case ESM::fourCC("ENLS"):
+            case ESM::fourCC("AUUV"):
+            case ESM::fourCC("MODD"): // Model data end
+            case ESM::fourCC("CTDA"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadhdpt.hpp b/components/esm4/loadhdpt.hpp
index 6f08d72961..5d17720100 100644
--- a/components/esm4/loadhdpt.hpp
+++ b/components/esm4/loadhdpt.hpp
@@ -43,17 +43,40 @@ namespace ESM4
     {
         ESM::FormId mId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+        std::uint64_t mExtraFlags2;
 
         std::string mEditorId;
         std::string mFullName;
         std::string mModel;
 
         std::uint8_t mData;
+        std::uint32_t mType;
 
-        ESM::FormId mAdditionalPart;
+        enum Type : std::uint32_t
+        {
+            Type_Misc = 0,
+            Type_Face = 1,
+            Type_Eyes = 2,
+            Type_Hair = 3,
+            Type_FacialHair = 4,
+            Type_Scar = 5,
+            Type_Eyebrows = 6,
+            // FO4+
+            Type_Meatcaps = 7,
+            Type_Teeth = 8,
+            Type_HeadRear = 9,
+            // Starfield
+            // 10 and 11 are unknown
+            Type_LeftEye = 12,
+            Type_Eyelashes = 13,
+        };
+
+        std::vector<ESM::FormId> mExtraParts;
 
         std::array<std::string, 3> mTriFile;
         ESM::FormId mBaseTexture;
+        ESM::FormId mColor;
+        std::vector<ESM::FormId> mValidRaces;
 
         void load(ESM4::Reader& reader);
         // void save(ESM4::Writer& writer) const;
diff --git a/components/esm4/loadidle.cpp b/components/esm4/loadidle.cpp
index 310c43b2e1..18a408f053 100644
--- a/components/esm4/loadidle.cpp
+++ b/components/esm4/loadidle.cpp
@@ -41,16 +41,16 @@ void ESM4::IdleAnimation::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_DNAM:
+            case ESM::fourCC("DNAM"):
                 reader.getZString(mCollision);
                 break;
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.getZString(mEvent);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -74,21 +74,21 @@ void ESM4::IdleAnimation::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_CTDA: // formId
-            case ESM4::SUB_CTDT:
-            case ESM4::SUB_CIS1:
-            case ESM4::SUB_CIS2:
-            case ESM4::SUB_DATA:
-            case ESM4::SUB_MODD:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_GNAM: // FO4
+            case ESM::fourCC("CTDA"): // formId
+            case ESM::fourCC("CTDT"):
+            case ESM::fourCC("CIS1"):
+            case ESM::fourCC("CIS2"):
+            case ESM::fourCC("DATA"):
+            case ESM::fourCC("MODD"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("GNAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadidlm.cpp b/components/esm4/loadidlm.cpp
index 3f1ed9518c..0aec281c6c 100644
--- a/components/esm4/loadidlm.cpp
+++ b/components/esm4/loadidlm.cpp
@@ -43,13 +43,13 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_IDLF:
+            case ESM::fourCC("IDLF"):
                 reader.get(mIdleFlags);
                 break;
-            case ESM4::SUB_IDLC:
+            case ESM::fourCC("IDLC"):
                 if (subHdr.dataSize != 1) // FO3 can have 4?
                 {
                     reader.skipSubRecordData();
@@ -58,10 +58,10 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
 
                 reader.get(mIdleCount);
                 break;
-            case ESM4::SUB_IDLT:
+            case ESM::fourCC("IDLT"):
                 reader.get(mIdleTimer);
                 break;
-            case ESM4::SUB_IDLA:
+            case ESM::fourCC("IDLA"):
             {
                 bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
                 if (esmVer == ESM::VER_094 || isFONV) // FO3? 4 or 8 bytes
@@ -75,17 +75,17 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader)
                     reader.getFormId(value);
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_OBND: // object bounds
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_QNAM:
+            case ESM::fourCC("OBND"): // object bounds
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("QNAM"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadimod.cpp b/components/esm4/loadimod.cpp
index 7382946e2c..76f51357a3 100644
--- a/components/esm4/loadimod.cpp
+++ b/components/esm4/loadimod.cpp
@@ -43,19 +43,53 @@ void ESM4::ItemMod::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_FULL:
-            case ESM4::SUB_MODL:
-            case ESM4::SUB_ICON:
-            case ESM4::SUB_MICO:
-            case ESM4::SUB_SCRI:
-            case ESM4::SUB_DESC:
-            case ESM4::SUB_YNAM:
-            case ESM4::SUB_ZNAM:
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("FULL"):
+                reader.getLocalizedString(mFullName);
+                break;
+            case ESM::fourCC("MODL"):
+                reader.getZString(mModel);
+                break;
+            case ESM::fourCC("MODB"):
+                reader.get(mBoundRadius);
+                break;
+            case ESM::fourCC("DESC"):
+                reader.getLocalizedString(mText);
+                break;
+            case ESM::fourCC("ICON"):
+                reader.getZString(mIcon);
+                break;
+            case ESM::fourCC("MICO"):
+                reader.getZString(mMiniIcon);
+                break;
+            case ESM::fourCC("SCRI"):
+                reader.getFormId(mScriptId);
+                break;
+            case ESM::fourCC("YNAM"):
+                reader.getFormId(mPickUpSound);
+                break;
+            case ESM::fourCC("ZNAM"):
+                reader.getFormId(mDropSound);
+                break;
+            case ESM::fourCC("DATA"):
+                reader.get(mData.mValue);
+                reader.get(mData.mWeight);
+                break;
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODD"): // Model data end
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadimod.hpp b/components/esm4/loadimod.hpp
index f1faed978c..1f6250ae72 100644
--- a/components/esm4/loadimod.hpp
+++ b/components/esm4/loadimod.hpp
@@ -42,10 +42,29 @@ namespace ESM4
 
     struct ItemMod
     {
+        struct Data
+        {
+            std::uint32_t mValue{ 0 };
+            float mWeight{ 0.f };
+        };
+
         ESM::FormId mId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mText;
+        std::string mIcon;
+        std::string mMiniIcon;
+
+        ESM::FormId mScriptId;
+        ESM::FormId mPickUpSound;
+        ESM::FormId mDropSound;
+
+        float mBoundRadius;
+
+        Data mData;
 
         void load(ESM4::Reader& reader);
         // void save(ESM4::Writer& writer) const;
diff --git a/components/esm4/loadinfo.cpp b/components/esm4/loadinfo.cpp
index 1b001c1665..d3339d350a 100644
--- a/components/esm4/loadinfo.cpp
+++ b/components/esm4/loadinfo.cpp
@@ -41,7 +41,6 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 
     mEditorId = ESM::RefId(mId).serializeText(); // FIXME: quick workaround to use existing code
 
-    static ScriptLocalVariableData localVar;
     bool ignore = false;
 
     while (reader.getSubRecordHeader())
@@ -49,13 +48,13 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_QSTI:
+            case ESM::fourCC("QSTI"):
                 reader.getFormId(mQuest);
                 break; // FormId quest id
-            case ESM4::SUB_SNDD:
+            case ESM::fourCC("SNDD"):
                 reader.getFormId(mSound);
                 break; // FO3 (not used in FONV?)
-            case ESM4::SUB_TRDT:
+            case ESM::fourCC("TRDT"):
             {
                 if (subHdr.dataSize == 16) // TES4
                     reader.get(&mResponseData, 16);
@@ -70,16 +69,16 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_NAM1:
+            case ESM::fourCC("NAM1"):
                 reader.getLocalizedString(mResponse);
                 break; // response text
-            case ESM4::SUB_NAM2:
+            case ESM::fourCC("NAM2"):
                 reader.getZString(mNotes);
                 break; // actor notes
-            case ESM4::SUB_NAM3:
+            case ESM::fourCC("NAM3"):
                 reader.getZString(mEdits);
                 break; // not in TES4
-            case ESM4::SUB_CTDA: // FIXME: how to detect if 1st/2nd param is a formid?
+            case ESM::fourCC("CTDA"): // FIXME: how to detect if 1st/2nd param is a formid?
             {
                 if (subHdr.dataSize == 24) // TES4
                     reader.get(&mTargetCondition, 24);
@@ -105,7 +104,7 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_SCHR:
+            case ESM::fourCC("SCHR"):
             {
                 if (!ignore)
                     reader.get(mScript.scriptHeader);
@@ -114,37 +113,39 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_SCDA:
+            case ESM::fourCC("SCDA"):
                 reader.skipSubRecordData();
                 break; // compiled script data
-            case ESM4::SUB_SCTX:
+            case ESM::fourCC("SCTX"):
                 reader.getString(mScript.scriptSource);
                 break;
-            case ESM4::SUB_SCRO:
+            case ESM::fourCC("SCRO"):
                 reader.getFormId(mScript.globReference);
                 break;
-            case ESM4::SUB_SLSD:
+            case ESM::fourCC("SLSD"):
             {
-                localVar.clear();
+                ScriptLocalVariableData localVar;
                 reader.get(localVar.index);
                 reader.get(localVar.unknown1);
                 reader.get(localVar.unknown2);
                 reader.get(localVar.unknown3);
                 reader.get(localVar.type);
                 reader.get(localVar.unknown4);
+                mScript.localVarData.push_back(std::move(localVar));
                 // WARN: assumes SCVR will follow immediately
 
                 break;
             }
-            case ESM4::SUB_SCVR: // assumed always pair with SLSD
+            case ESM::fourCC("SCVR"): // assumed always pair with SLSD
             {
-                reader.getZString(localVar.variableName);
-
-                mScript.localVarData.push_back(localVar);
+                if (!mScript.localVarData.empty())
+                    reader.getZString(mScript.localVarData.back().variableName);
+                else
+                    reader.skipSubRecordData();
 
                 break;
             }
-            case ESM4::SUB_SCRV:
+            case ESM::fourCC("SCRV"):
             {
                 std::uint32_t index;
                 reader.get(index);
@@ -153,13 +154,13 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_NEXT: // FO3/FONV marker for next script header
+            case ESM::fourCC("NEXT"): // FO3/FONV marker for next script header
             {
                 ignore = true;
 
                 break;
             }
-            case ESM4::SUB_DATA: // always 3 for TES4 ?
+            case ESM::fourCC("DATA"): // always 3 for TES4 ?
             {
                 if (subHdr.dataSize == 4) // FO3/FONV
                 {
@@ -171,48 +172,48 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader)
                     reader.skipSubRecordData(); // FIXME
                 break;
             }
-            case ESM4::SUB_NAME: // FormId add topic (not always present)
-            case ESM4::SUB_CTDT: // older version of CTDA? 20 bytes
-            case ESM4::SUB_SCHD: // 28 bytes
-            case ESM4::SUB_TCLT: // FormId choice
-            case ESM4::SUB_TCLF: // FormId
-            case ESM4::SUB_PNAM: // TES4 DLC
-            case ESM4::SUB_TPIC: // TES4 DLC
-            case ESM4::SUB_ANAM: // FO3 speaker formid
-            case ESM4::SUB_DNAM: // FO3 speech challenge
-            case ESM4::SUB_KNAM: // FO3 formid
-            case ESM4::SUB_LNAM: // FONV
-            case ESM4::SUB_TCFU: // FONV
-            case ESM4::SUB_TIFC: // TES5
-            case ESM4::SUB_TWAT: // TES5
-            case ESM4::SUB_CIS1: // TES5
-            case ESM4::SUB_CIS2: // TES5
-            case ESM4::SUB_CNAM: // TES5
-            case ESM4::SUB_ENAM: // TES5
-            case ESM4::SUB_EDID: // TES5
-            case ESM4::SUB_VMAD: // TES5
-            case ESM4::SUB_BNAM: // TES5
-            case ESM4::SUB_SNAM: // TES5
-            case ESM4::SUB_ONAM: // TES5
-            case ESM4::SUB_QNAM: // TES5 for mScript
-            case ESM4::SUB_RNAM: // TES5
-            case ESM4::SUB_ALFA: // FO4
-            case ESM4::SUB_GNAM: // FO4
-            case ESM4::SUB_GREE: // FO4
-            case ESM4::SUB_INAM: // FO4
-            case ESM4::SUB_INCC: // FO4
-            case ESM4::SUB_INTV: // FO4
-            case ESM4::SUB_IOVR: // FO4
-            case ESM4::SUB_MODQ: // FO4
-            case ESM4::SUB_NAM0: // FO4
-            case ESM4::SUB_NAM4: // FO4
-            case ESM4::SUB_NAM9: // FO4
-            case ESM4::SUB_SRAF: // FO4
-            case ESM4::SUB_TIQS: // FO4
-            case ESM4::SUB_TNAM: // FO4
-            case ESM4::SUB_TRDA: // FO4
-            case ESM4::SUB_TSCE: // FO4
-            case ESM4::SUB_WZMD: // FO4
+            case ESM::fourCC("NAME"): // FormId add topic (not always present)
+            case ESM::fourCC("CTDT"): // older version of CTDA? 20 bytes
+            case ESM::fourCC("SCHD"): // 28 bytes
+            case ESM::fourCC("TCLT"): // FormId choice
+            case ESM::fourCC("TCLF"): // FormId
+            case ESM::fourCC("PNAM"): // TES4 DLC
+            case ESM::fourCC("TPIC"): // TES4 DLC
+            case ESM::fourCC("ANAM"): // FO3 speaker formid
+            case ESM::fourCC("DNAM"): // FO3 speech challenge
+            case ESM::fourCC("KNAM"): // FO3 formid
+            case ESM::fourCC("LNAM"): // FONV
+            case ESM::fourCC("TCFU"): // FONV
+            case ESM::fourCC("TIFC"): // TES5
+            case ESM::fourCC("TWAT"): // TES5
+            case ESM::fourCC("CIS1"): // TES5
+            case ESM::fourCC("CIS2"): // TES5
+            case ESM::fourCC("CNAM"): // TES5
+            case ESM::fourCC("ENAM"): // TES5
+            case ESM::fourCC("EDID"): // TES5
+            case ESM::fourCC("VMAD"): // TES5
+            case ESM::fourCC("BNAM"): // TES5
+            case ESM::fourCC("SNAM"): // TES5
+            case ESM::fourCC("ONAM"): // TES5
+            case ESM::fourCC("QNAM"): // TES5 for mScript
+            case ESM::fourCC("RNAM"): // TES5
+            case ESM::fourCC("ALFA"): // FO4
+            case ESM::fourCC("GNAM"): // FO4
+            case ESM::fourCC("GREE"): // FO4
+            case ESM::fourCC("INAM"): // FO4
+            case ESM::fourCC("INCC"): // FO4
+            case ESM::fourCC("INTV"): // FO4
+            case ESM::fourCC("IOVR"): // FO4
+            case ESM::fourCC("MODQ"): // FO4
+            case ESM::fourCC("NAM0"): // FO4
+            case ESM::fourCC("NAM4"): // FO4
+            case ESM::fourCC("NAM9"): // FO4
+            case ESM::fourCC("SRAF"): // FO4
+            case ESM::fourCC("TIQS"): // FO4
+            case ESM::fourCC("TNAM"): // FO4
+            case ESM::fourCC("TRDA"): // FO4
+            case ESM::fourCC("TSCE"): // FO4
+            case ESM::fourCC("WZMD"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadingr.cpp b/components/esm4/loadingr.cpp
index d0b81fd4a1..64103058e5 100644
--- a/components/esm4/loadingr.cpp
+++ b/components/esm4/loadingr.cpp
@@ -42,10 +42,10 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
             {
                 if (mFullName.empty())
                 {
@@ -64,7 +64,7 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
                     break;
                 }
             }
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 8) // FO3 is size 4 even though VER_094
@@ -74,49 +74,49 @@ void ESM4::Ingredient::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_ENIT:
+            case ESM::fourCC("ENIT"):
                 reader.get(mEnchantment);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_SCIT:
+            case ESM::fourCC("SCIT"):
             {
                 reader.get(mEffect);
                 reader.adjustFormId(mEffect.formId);
                 break;
             }
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_EFID:
-            case ESM4::SUB_EFIT:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_YNAM:
-            case ESM4::SUB_ZNAM:
-            case ESM4::SUB_ETYP: // FO3
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("EFID"):
+            case ESM::fourCC("EFIT"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("YNAM"):
+            case ESM::fourCC("ZNAM"):
+            case ESM::fourCC("ETYP"): // FO3
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
             {
                 reader.skipSubRecordData();
                 break;
diff --git a/components/esm4/loadkeym.cpp b/components/esm4/loadkeym.cpp
index 9b0c280b8b..b430f7ce3d 100644
--- a/components/esm4/loadkeym.cpp
+++ b/components/esm4/loadkeym.cpp
@@ -41,54 +41,54 @@ void ESM4::Key::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MICO:
+            case ESM::fourCC("MICO"):
                 reader.getZString(mMiniIcon);
                 break; // FO3
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp
index 2215b56dd1..53fb1de083 100644
--- a/components/esm4/loadland.cpp
+++ b/components/esm4/loadland.cpp
@@ -65,18 +65,18 @@ void ESM4::Land::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 reader.get(mLandFlags);
                 break;
             }
-            case ESM4::SUB_VNML: // vertex normals, 33x33x(1+1+1) = 3267
+            case ESM::fourCC("VNML"): // vertex normals, 33x33x(1+1+1) = 3267
             {
                 reader.get(mVertNorm);
                 mDataTypes |= LAND_VNML;
                 break;
             }
-            case ESM4::SUB_VHGT: // vertex height gradient, 4+33x33+3 = 4+1089+3 = 1096
+            case ESM::fourCC("VHGT"): // vertex height gradient, 4+33x33+3 = 4+1089+3 = 1096
             {
 #if 0
                 reader.get(mHeightMap.heightOffset);
@@ -88,13 +88,13 @@ void ESM4::Land::load(ESM4::Reader& reader)
                 mDataTypes |= LAND_VHGT;
                 break;
             }
-            case ESM4::SUB_VCLR: // vertex colours, 24bit RGB, 33x33x(1+1+1) = 3267
+            case ESM::fourCC("VCLR"): // vertex colours, 24bit RGB, 33x33x(1+1+1) = 3267
             {
                 reader.get(mVertColr);
                 mDataTypes |= LAND_VCLR;
                 break;
             }
-            case ESM4::SUB_BTXT:
+            case ESM::fourCC("BTXT"):
             {
                 BTXT base;
                 if (reader.getExact(base))
@@ -112,7 +112,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_ATXT:
+            case ESM::fourCC("ATXT"):
             {
                 if (currentAddQuad != -1)
                 {
@@ -144,7 +144,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
                 currentAddQuad = layer.texture.quadrant;
                 break;
             }
-            case ESM4::SUB_VTXT:
+            case ESM::fourCC("VTXT"):
             {
                 if (currentAddQuad == -1)
                     throw std::runtime_error("VTXT without ATXT found");
@@ -177,7 +177,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
                 // std::cout << "VTXT: count " << std::dec << count << std::endl;
                 break;
             }
-            case ESM4::SUB_VTEX: // only in Oblivion?
+            case ESM::fourCC("VTEX"): // only in Oblivion?
             {
                 const std::uint16_t count = reader.subRecordHeader().dataSize / sizeof(ESM::FormId32);
                 if ((reader.subRecordHeader().dataSize % sizeof(ESM::FormId32)) != 0)
@@ -191,7 +191,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_MPCD: // FO4
+            case ESM::fourCC("MPCD"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadlgtm.cpp b/components/esm4/loadlgtm.cpp
index 0959be10a2..ce895ea5b8 100644
--- a/components/esm4/loadlgtm.cpp
+++ b/components/esm4/loadlgtm.cpp
@@ -44,10 +44,10 @@ void ESM4::LightingTemplate::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 if (subHdr.dataSize == 36) // TES4
                     reader.get(&mLighting, 36);
                 if (subHdr.dataSize == 40) // FO3/FONV
@@ -60,7 +60,7 @@ void ESM4::LightingTemplate::load(ESM4::Reader& reader)
                 else
                     reader.skipSubRecordData(); // throw?
                 break;
-            case ESM4::SUB_DALC: // TES5
+            case ESM::fourCC("DALC"): // TES5
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadligh.cpp b/components/esm4/loadligh.cpp
index 0848ee8435..32432c97e1 100644
--- a/components/esm4/loadligh.cpp
+++ b/components/esm4/loadligh.cpp
@@ -40,15 +40,19 @@ void ESM4::Light::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
-                if (subHdr.dataSize != 32 && subHdr.dataSize != 48 && subHdr.dataSize != 64)
+                // 24: older TES4 records (found in GOG release)
+                // 32: newer TES4 records, FO3/FNV
+                // 48: TES5
+                // 64: FO4/FO76
+                if (subHdr.dataSize != 24 && subHdr.dataSize != 32 && subHdr.dataSize != 48 && subHdr.dataSize != 64)
                 {
                     reader.skipSubRecordData();
                     break;
@@ -57,68 +61,70 @@ void ESM4::Light::load(ESM4::Reader& reader)
                 reader.get(mData.radius);
                 reader.get(mData.colour);
                 reader.get(mData.flags);
-                reader.get(mData.falloff);
-                reader.get(mData.FOV);
-                // TES5, FO4
-                if (subHdr.dataSize >= 48)
+                if (subHdr.dataSize >= 32)
                 {
-                    reader.get(mData.nearClip);
-                    reader.get(mData.frequency);
-                    reader.get(mData.intensityAmplitude);
-                    reader.get(mData.movementAmplitude);
-                    if (subHdr.dataSize == 64)
+                    reader.get(mData.falloff);
+                    reader.get(mData.FOV);
+                    if (subHdr.dataSize >= 48)
                     {
-                        reader.get(mData.constant);
-                        reader.get(mData.scalar);
-                        reader.get(mData.exponent);
-                        reader.get(mData.godRaysNearClip);
+                        reader.get(mData.nearClip);
+                        reader.get(mData.frequency);
+                        reader.get(mData.intensityAmplitude);
+                        reader.get(mData.movementAmplitude);
+                        if (subHdr.dataSize == 64)
+                        {
+                            reader.get(mData.constant);
+                            reader.get(mData.scalar);
+                            reader.get(mData.exponent);
+                            reader.get(mData.godRaysNearClip);
+                        }
                     }
                 }
                 reader.get(mData.value);
                 reader.get(mData.weight);
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mSound);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
                 reader.get(mFade);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_LNAM: // FO4
-            case ESM4::SUB_MICO: // FO4
-            case ESM4::SUB_NAM0: // FO4
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_WGDR: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("LNAM"): // FO4
+            case ESM::fourCC("MICO"): // FO4
+            case ESM::fourCC("NAM0"): // FO4
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("WGDR"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadligh.hpp b/components/esm4/loadligh.hpp
index 5845f3769a..8fc59b7687 100644
--- a/components/esm4/loadligh.hpp
+++ b/components/esm4/loadligh.hpp
@@ -56,9 +56,9 @@ namespace ESM4
 
         struct Data
         {
-            std::int32_t time;
-            std::uint32_t radius;
-            std::uint32_t colour; // RGBA
+            std::int32_t time = 0;
+            std::uint32_t radius = 0;
+            std::uint32_t colour = 0; // RGBA
             // flags:
             // 0x00000001 = Dynamic
             // 0x00000002 = Can be Carried
@@ -70,19 +70,19 @@ namespace ESM4
             // 0x00000100 = Pulse Slow
             // 0x00000200 = Spot Light
             // 0x00000400 = Spot Shadow
-            std::int32_t flags;
+            std::int32_t flags = 0;
             float falloff = 1.f;
             float FOV = 90; // FIXME: FOV in degrees or radians?
-            float nearClip; // TES5+
-            float frequency; // TES5+
-            float intensityAmplitude; // TES5+
-            float movementAmplitude; // TES5+
-            float constant; // FO4
-            float scalar; // FO4
-            float exponent; // FO4
-            float godRaysNearClip; // FO4
-            std::uint32_t value; // gold
-            float weight;
+            float nearClip = 0.f; // TES5+
+            float frequency = 0.f; // TES5+
+            float intensityAmplitude = 0.f; // TES5+
+            float movementAmplitude = 0.f; // TES5+
+            float constant = 0.f; // FO4
+            float scalar = 0.f; // FO4
+            float exponent = 0.f; // FO4
+            float godRaysNearClip = 0.f; // FO4
+            std::uint32_t value = 0; // gold
+            float weight = 0.f;
         };
 
         ESM::FormId mId; // from the header
diff --git a/components/esm4/loadltex.cpp b/components/esm4/loadltex.cpp
index 955ac938e3..a8b6c9ec81 100644
--- a/components/esm4/loadltex.cpp
+++ b/components/esm4/loadltex.cpp
@@ -41,10 +41,10 @@ void ESM4::LandTexture::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_HNAM:
+            case ESM::fourCC("HNAM"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -61,21 +61,24 @@ void ESM4::LandTexture::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mTextureFile);
                 break; // Oblivion only?
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.get(mTextureSpecular);
                 break;
-            case ESM4::SUB_GNAM:
+            case ESM::fourCC("GNAM"):
                 reader.getFormId(mGrass.emplace_back());
                 break;
-            case ESM4::SUB_TNAM:
+            case ESM::fourCC("TNAM"):
                 reader.getFormId(mTexture);
                 break; // TES5, FO4
-            case ESM4::SUB_MNAM:
+            case ESM::fourCC("MNAM"):
                 reader.getFormId(mMaterial);
                 break; // TES5, FO4
+            case ESM::fourCC("INAM"):
+                reader.get(mMaterialFlags);
+                break; // SSE
             default:
                 throw std::runtime_error("ESM4::LTEX::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
         }
diff --git a/components/esm4/loadltex.hpp b/components/esm4/loadltex.hpp
index bed5887f5c..33c1683ac0 100644
--- a/components/esm4/loadltex.hpp
+++ b/components/esm4/loadltex.hpp
@@ -63,6 +63,17 @@ namespace ESM4
 
         // ----------------------
 
+        // ------ SSE -----------
+
+        enum MaterialFlags
+        {
+            Flag_IsSnow = 0x1,
+        };
+
+        std::uint32_t mMaterialFlags;
+
+        // ----------------------
+
         void load(ESM4::Reader& reader);
         // void save(ESM4::Writer& writer) const;
 
diff --git a/components/esm4/loadlvlc.cpp b/components/esm4/loadlvlc.cpp
index b1a0a0f241..844c27f8da 100644
--- a/components/esm4/loadlvlc.cpp
+++ b/components/esm4/loadlvlc.cpp
@@ -41,24 +41,24 @@ void ESM4::LevelledCreature::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_TNAM:
+            case ESM::fourCC("TNAM"):
                 reader.getFormId(mTemplate);
                 break;
-            case ESM4::SUB_LVLD:
+            case ESM::fourCC("LVLD"):
                 reader.get(mChanceNone);
                 break;
-            case ESM4::SUB_LVLF:
+            case ESM::fourCC("LVLF"):
                 reader.get(mLvlCreaFlags);
                 break;
-            case ESM4::SUB_LVLO:
+            case ESM::fourCC("LVLO"):
             {
-                static LVLO lvlo;
+                LVLO lvlo;
                 if (subHdr.dataSize != 12)
                 {
                     if (subHdr.dataSize == 8)
@@ -83,7 +83,7 @@ void ESM4::LevelledCreature::load(ESM4::Reader& reader)
                 mLvlObject.push_back(lvlo);
                 break;
             }
-            case ESM4::SUB_OBND: // FO3
+            case ESM::fourCC("OBND"): // FO3
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadlvli.cpp b/components/esm4/loadlvli.cpp
index cab8db4a21..aa99a9dd12 100644
--- a/components/esm4/loadlvli.cpp
+++ b/components/esm4/loadlvli.cpp
@@ -41,22 +41,22 @@ void ESM4::LevelledItem::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_LVLD:
+            case ESM::fourCC("LVLD"):
                 reader.get(mChanceNone);
                 break;
-            case ESM4::SUB_LVLF:
+            case ESM::fourCC("LVLF"):
                 reader.get(mLvlItemFlags);
                 mHasLvlItemFlags = true;
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_LVLO:
+            case ESM::fourCC("LVLO"):
             {
-                static LVLO lvlo;
+                LVLO lvlo;
                 if (subHdr.dataSize != 12)
                 {
                     if (subHdr.dataSize == 8)
@@ -76,14 +76,14 @@ void ESM4::LevelledItem::load(ESM4::Reader& reader)
                 mLvlObject.push_back(lvlo);
                 break;
             }
-            case ESM4::SUB_LLCT:
-            case ESM4::SUB_OBND: // FO3/FONV
-            case ESM4::SUB_COED: // FO3/FONV
-            case ESM4::SUB_LVLG: // FO3/FONV
-            case ESM4::SUB_LLKC: // FO4
-            case ESM4::SUB_LVLM: // FO4
-            case ESM4::SUB_LVSG: // FO4
-            case ESM4::SUB_ONAM: // FO4
+            case ESM::fourCC("LLCT"):
+            case ESM::fourCC("OBND"): // FO3/FONV
+            case ESM::fourCC("COED"): // FO3/FONV
+            case ESM::fourCC("LVLG"): // FO3/FONV
+            case ESM::fourCC("LLKC"): // FO4
+            case ESM::fourCC("LVLM"): // FO4
+            case ESM::fourCC("LVSG"): // FO4
+            case ESM::fourCC("ONAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadlvln.cpp b/components/esm4/loadlvln.cpp
index febdcbeca9..03efc4a08f 100644
--- a/components/esm4/loadlvln.cpp
+++ b/components/esm4/loadlvln.cpp
@@ -42,24 +42,24 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_LLCT:
+            case ESM::fourCC("LLCT"):
                 reader.get(mListCount);
                 break;
-            case ESM4::SUB_LVLD:
+            case ESM::fourCC("LVLD"):
                 reader.get(mChanceNone);
                 break;
-            case ESM4::SUB_LVLF:
+            case ESM::fourCC("LVLF"):
                 reader.get(mLvlActorFlags);
                 break;
-            case ESM4::SUB_LVLO:
+            case ESM::fourCC("LVLO"):
             {
-                static LVLO lvlo;
+                LVLO lvlo;
                 if (subHdr.dataSize != 12)
                 {
                     if (subHdr.dataSize == 8)
@@ -89,15 +89,15 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader)
                 mLvlObject.push_back(lvlo);
                 break;
             }
-            case ESM4::SUB_COED: // owner
-            case ESM4::SUB_OBND: // object bounds
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_LLKC: // FO4
-            case ESM4::SUB_LVLG: // FO4
-            case ESM4::SUB_LVLM: // FO4
+            case ESM::fourCC("COED"): // owner
+            case ESM::fourCC("OBND"): // object bounds
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("LLKC"): // FO4
+            case ESM::fourCC("LVLG"): // FO4
+            case ESM::fourCC("LVLM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadmato.cpp b/components/esm4/loadmato.cpp
index 13d5e7d83d..6d45b689ba 100644
--- a/components/esm4/loadmato.cpp
+++ b/components/esm4/loadmato.cpp
@@ -41,18 +41,18 @@ void ESM4::Material::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_DNAM:
-            case ESM4::SUB_DATA:
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
+            case ESM::fourCC("DNAM"):
+            case ESM::fourCC("DATA"):
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadmisc.cpp b/components/esm4/loadmisc.cpp
index 6dfd69148d..b27e38f055 100644
--- a/components/esm4/loadmisc.cpp
+++ b/components/esm4/loadmisc.cpp
@@ -41,58 +41,58 @@ void ESM4::MiscItem::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MICO:
+            case ESM::fourCC("MICO"):
                 reader.getZString(mMiniIcon);
                 break; // FO3
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_RNAM: // FONV
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_CDIX: // FO4
-            case ESM4::SUB_CVPA: // FO4
-            case ESM4::SUB_FIMD: // FO4
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("RNAM"): // FONV
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("CDIX"): // FO4
+            case ESM::fourCC("CVPA"): // FO4
+            case ESM::fourCC("FIMD"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadmset.cpp b/components/esm4/loadmset.cpp
index e15c508bc1..f7c088c47f 100644
--- a/components/esm4/loadmset.cpp
+++ b/components/esm4/loadmset.cpp
@@ -41,91 +41,91 @@ void ESM4::MediaSet::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getZString(mFullName);
                 break;
-            case ESM4::SUB_NAM1:
+            case ESM::fourCC("NAM1"):
                 reader.get(mSetType);
                 break;
-            case ESM4::SUB_PNAM:
+            case ESM::fourCC("PNAM"):
                 reader.get(mEnabled);
                 break;
-            case ESM4::SUB_NAM2:
+            case ESM::fourCC("NAM2"):
                 reader.getZString(mSet2);
                 break;
-            case ESM4::SUB_NAM3:
+            case ESM::fourCC("NAM3"):
                 reader.getZString(mSet3);
                 break;
-            case ESM4::SUB_NAM4:
+            case ESM::fourCC("NAM4"):
                 reader.getZString(mSet4);
                 break;
-            case ESM4::SUB_NAM5:
+            case ESM::fourCC("NAM5"):
                 reader.getZString(mSet5);
                 break;
-            case ESM4::SUB_NAM6:
+            case ESM::fourCC("NAM6"):
                 reader.getZString(mSet6);
                 break;
-            case ESM4::SUB_NAM7:
+            case ESM::fourCC("NAM7"):
                 reader.getZString(mSet7);
                 break;
-            case ESM4::SUB_HNAM:
+            case ESM::fourCC("HNAM"):
                 reader.getFormId(mSoundIntro);
                 break;
-            case ESM4::SUB_INAM:
+            case ESM::fourCC("INAM"):
                 reader.getFormId(mSoundOutro);
                 break;
-            case ESM4::SUB_NAM8:
+            case ESM::fourCC("NAM8"):
                 reader.get(mLevel8);
                 break;
-            case ESM4::SUB_NAM9:
+            case ESM::fourCC("NAM9"):
                 reader.get(mLevel9);
                 break;
-            case ESM4::SUB_NAM0:
+            case ESM::fourCC("NAM0"):
                 reader.get(mLevel0);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.get(mLevelA);
                 break;
-            case ESM4::SUB_BNAM:
+            case ESM::fourCC("BNAM"):
                 reader.get(mLevelB);
                 break;
-            case ESM4::SUB_CNAM:
+            case ESM::fourCC("CNAM"):
                 reader.get(mLevelC);
                 break;
-            case ESM4::SUB_JNAM:
+            case ESM::fourCC("JNAM"):
                 reader.get(mBoundaryDayOuter);
                 break;
-            case ESM4::SUB_KNAM:
+            case ESM::fourCC("KNAM"):
                 reader.get(mBoundaryDayMiddle);
                 break;
-            case ESM4::SUB_LNAM:
+            case ESM::fourCC("LNAM"):
                 reader.get(mBoundaryDayInner);
                 break;
-            case ESM4::SUB_MNAM:
+            case ESM::fourCC("MNAM"):
                 reader.get(mBoundaryNightOuter);
                 break;
-            case ESM4::SUB_NNAM:
+            case ESM::fourCC("NNAM"):
                 reader.get(mBoundaryNightMiddle);
                 break;
-            case ESM4::SUB_ONAM:
+            case ESM::fourCC("ONAM"):
                 reader.get(mBoundaryNightInner);
                 break;
-            case ESM4::SUB_DNAM:
+            case ESM::fourCC("DNAM"):
                 reader.get(mTime1);
                 break;
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.get(mTime2);
                 break;
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
                 reader.get(mTime3);
                 break;
-            case ESM4::SUB_GNAM:
+            case ESM::fourCC("GNAM"):
                 reader.get(mTime4);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadmstt.cpp b/components/esm4/loadmstt.cpp
index 14091e96f0..3e0cc9ea2d 100644
--- a/components/esm4/loadmstt.cpp
+++ b/components/esm4/loadmstt.cpp
@@ -41,41 +41,41 @@ void ESM4::MovableStatic::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mLoopingSound);
                 break;
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_OBND: // object bounds
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_MODB:
-            case ESM4::SUB_PRPS:
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("OBND"): // object bounds
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("MODB"):
+            case ESM::fourCC("PRPS"):
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadmusc.cpp b/components/esm4/loadmusc.cpp
index 47ed71b2cf..a06b4dc81c 100644
--- a/components/esm4/loadmusc.cpp
+++ b/components/esm4/loadmusc.cpp
@@ -43,16 +43,16 @@ void ESM4::Music::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
                 reader.getZString(mMusicFile);
                 break;
-            case ESM4::SUB_ANAM: // FONV float (attenuation in db? loop if positive?)
-            case ESM4::SUB_WNAM: // TES5
-            case ESM4::SUB_PNAM: // TES5
-            case ESM4::SUB_TNAM: // TES5
+            case ESM::fourCC("ANAM"): // FONV float (attenuation in db? loop if positive?)
+            case ESM::fourCC("WNAM"): // TES5
+            case ESM::fourCC("PNAM"): // TES5
+            case ESM::fourCC("TNAM"): // TES5
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp
index 09868d258f..47befbf268 100644
--- a/components/esm4/loadnavi.cpp
+++ b/components/esm4/loadnavi.cpp
@@ -241,17 +241,16 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID: // seems to be unused?
+            case ESM::fourCC("EDID"): // seems to be unused?
             {
                 if (!reader.getZString(mEditorId))
                     throw std::runtime_error("NAVI EDID data read error");
                 break;
             }
-            case ESM4::SUB_NVPP:
+            case ESM::fourCC("NVPP"):
             {
-                // FIXME: this is both the version for FO4 and for some TES4 files
-                // How to distinguish?
-                if (esmVer == ESM::VER_100)
+                // FIXME: FO4 updates the format
+                if (reader.hasFormVersion() && (esmVer == ESM::VER_095 || esmVer == ESM::VER_100))
                 {
                     reader.skipSubRecordData();
                     break;
@@ -331,14 +330,14 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_NVER:
+            case ESM::fourCC("NVER"):
             {
                 std::uint32_t version; // always the same? (0x0c)
                 reader.get(version); // TODO: store this or use it for merging?
                 // std::cout << "NAVI version " << std::dec << version << std::endl;
                 break;
             }
-            case ESM4::SUB_NVMI: // multiple
+            case ESM::fourCC("NVMI"): // multiple
             {
                 // Can only read TES4 navmesh data
                 // Note FO4 FIXME above
@@ -354,8 +353,8 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
                 mNavMeshInfo.push_back(nvmi);
                 break;
             }
-            case ESM4::SUB_NVSI: // from Dawnguard onwards
-            case ESM4::SUB_NVCI: // FO3
+            case ESM::fourCC("NVSI"): // from Dawnguard onwards
+            case ESM::fourCC("NVCI"): // FO3
             {
                 reader.skipSubRecordData(); // FIXME:
                 break;
diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp
index 6298964f28..ebe6a7dbbb 100644
--- a/components/esm4/loadnavm.cpp
+++ b/components/esm4/loadnavm.cpp
@@ -209,11 +209,11 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_NVNM:
+            case ESM::fourCC("NVNM"):
             {
                 // See FIXME in ESM4::Navigation::load.
                 // FO4 updates the format
-                if (esmVer == ESM::VER_100)
+                if (reader.hasFormVersion() && (esmVer == ESM::VER_095 || esmVer == ESM::VER_100))
                 {
                     reader.skipSubRecordData();
                     break;
@@ -224,19 +224,19 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
                 mData.push_back(nvnm); // FIXME try swap
                 break;
             }
-            case ESM4::SUB_ONAM:
-            case ESM4::SUB_PNAM:
-            case ESM4::SUB_NNAM:
-            case ESM4::SUB_NVER: // FO3
-            case ESM4::SUB_DATA: // FO3
-            case ESM4::SUB_NVVX: // FO3
-            case ESM4::SUB_NVTR: // FO3
-            case ESM4::SUB_NVCA: // FO3
-            case ESM4::SUB_NVDP: // FO3
-            case ESM4::SUB_NVGD: // FO3
-            case ESM4::SUB_NVEX: // FO3
-            case ESM4::SUB_EDID: // FO3
-            case ESM4::SUB_MNAM: // FO4
+            case ESM::fourCC("ONAM"):
+            case ESM::fourCC("PNAM"):
+            case ESM::fourCC("NNAM"):
+            case ESM::fourCC("NVER"): // FO3
+            case ESM::fourCC("DATA"): // FO3
+            case ESM::fourCC("NVVX"): // FO3
+            case ESM::fourCC("NVTR"): // FO3
+            case ESM::fourCC("NVCA"): // FO3
+            case ESM::fourCC("NVDP"): // FO3
+            case ESM::fourCC("NVGD"): // FO3
+            case ESM::fourCC("NVEX"): // FO3
+            case ESM::fourCC("EDID"): // FO3
+            case ESM::fourCC("MNAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadnote.cpp b/components/esm4/loadnote.cpp
index 9c1b4b3140..aee7909e88 100644
--- a/components/esm4/loadnote.cpp
+++ b/components/esm4/loadnote.cpp
@@ -41,41 +41,41 @@ void ESM4::Note::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_DATA:
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_ONAM:
-            case ESM4::SUB_SNAM:
-            case ESM4::SUB_TNAM:
-            case ESM4::SUB_XNAM:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_DNAM: // FO4
-            case ESM4::SUB_PNAM: // FO4
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("DATA"):
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("ONAM"):
+            case ESM::fourCC("SNAM"):
+            case ESM::fourCC("TNAM"):
+            case ESM::fourCC("XNAM"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("DNAM"): // FO4
+            case ESM::fourCC("PNAM"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadnpc.cpp b/components/esm4/loadnpc.cpp
index 65292e63a8..f3aba6998f 100644
--- a/components/esm4/loadnpc.cpp
+++ b/components/esm4/loadnpc.cpp
@@ -39,7 +39,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
     mFlags = reader.hdr().record.flags;
 
     std::uint32_t esmVer = reader.esmVersion();
-    mIsTES4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
+    mIsTES4 = (esmVer == ESM::VER_080 || esmVer == ESM::VER_100) && !reader.hasFormVersion();
     mIsFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
     // mIsTES5 = esmVer == ESM::VER_094 || esmVer == ESM::VER_170; // WARN: FO3 is also VER_094
 
@@ -48,30 +48,30 @@ void ESM4::Npc::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break; // not for TES5, see Race
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_CNTO:
+            case ESM::fourCC("CNTO"):
             {
-                static InventoryItem inv; // FIXME: use unique_ptr here?
+                InventoryItem inv; // FIXME: use unique_ptr here?
                 reader.get(inv);
                 reader.adjustFormId(inv.item);
                 mInventory.push_back(inv);
                 break;
             }
-            case ESM4::SUB_SPLO:
+            case ESM::fourCC("SPLO"):
                 reader.getFormId(mSpell.emplace_back());
                 break;
-            case ESM4::SUB_PKID:
+            case ESM::fourCC("PKID"):
                 reader.getFormId(mAIPackages.emplace_back());
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
             {
                 // FO4, FO76
                 if (subHdr.dataSize == 5)
@@ -81,27 +81,27 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                 reader.adjustFormId(mFaction.faction);
                 break;
             }
-            case ESM4::SUB_RNAM:
+            case ESM::fourCC("RNAM"):
                 reader.getFormId(mRace);
                 break;
-            case ESM4::SUB_CNAM:
+            case ESM::fourCC("CNAM"):
                 reader.getFormId(mClass);
                 break;
-            case ESM4::SUB_HNAM:
+            case ESM::fourCC("HNAM"):
                 reader.getFormId(mHair);
                 break; // not for TES5
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.getFormId(mEyes);
                 break;
             //
-            case ESM4::SUB_INAM:
+            case ESM::fourCC("INAM"):
                 reader.getFormId(mDeathItem);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
             //
-            case ESM4::SUB_AIDT:
+            case ESM::fourCC("AIDT"):
             {
                 if (subHdr.dataSize != 12)
                 {
@@ -112,13 +112,15 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                 reader.get(mAIData); // TES4
                 break;
             }
-            case ESM4::SUB_ACBS:
+            case ESM::fourCC("ACBS"):
             {
                 switch (subHdr.dataSize)
                 {
+                    case 20: // FO4
+                        mIsFO4 = true;
+                        [[fallthrough]];
                     case 16: // TES4
                     case 24: // FO3/FNV, TES5
-                    case 20: // FO4
                         reader.get(&mBaseConfig, subHdr.dataSize);
                         break;
                     default:
@@ -127,7 +129,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 if (subHdr.dataSize == 0)
                     break;
@@ -138,19 +140,19 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                     reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mCombatStyle);
                 break;
-            case ESM4::SUB_CSCR:
+            case ESM::fourCC("CSCR"):
                 reader.getFormId(mSoundBase);
                 break;
-            case ESM4::SUB_CSDI:
+            case ESM::fourCC("CSDI"):
                 reader.getFormId(mSound);
                 break;
-            case ESM4::SUB_CSDC:
+            case ESM::fourCC("CSDC"):
                 reader.get(mSoundChance);
                 break;
-            case ESM4::SUB_WNAM:
+            case ESM::fourCC("WNAM"):
             {
                 // FIXME: should be read into mWornArmor for FO4
                 if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
@@ -159,10 +161,10 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                     reader.get(mFootWeight);
                 break;
             }
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_KFFZ:
+            case ESM::fourCC("KFFZ"):
             {
                 // Seems to be only below 3, and only happens 3 times while loading TES4:
                 //   Forward_SheogorathWithCane.kf
@@ -172,10 +174,10 @@ void ESM4::Npc::load(ESM4::Reader& reader)
                     throw std::runtime_error("NPC_ KFFZ data read error");
                 break;
             }
-            case ESM4::SUB_LNAM:
+            case ESM::fourCC("LNAM"):
                 reader.get(mHairLength);
                 break;
-            case ESM4::SUB_HCLR:
+            case ESM::fourCC("HCLR"):
             {
                 reader.get(mHairColour.red);
                 reader.get(mHairColour.green);
@@ -184,10 +186,10 @@ void ESM4::Npc::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_TPLT:
+            case ESM::fourCC("TPLT"):
                 reader.getFormId(mBaseTemplate);
                 break;
-            case ESM4::SUB_FGGS:
+            case ESM::fourCC("FGGS"):
             {
                 mSymShapeModeCoefficients.resize(50);
                 for (std::size_t i = 0; i < 50; ++i)
@@ -195,7 +197,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FGGA:
+            case ESM::fourCC("FGGA"):
             {
                 mAsymShapeModeCoefficients.resize(30);
                 for (std::size_t i = 0; i < 30; ++i)
@@ -203,7 +205,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FGTS:
+            case ESM::fourCC("FGTS"):
             {
                 mSymTextureModeCoefficients.resize(50);
                 for (std::size_t i = 0; i < 50; ++i)
@@ -211,122 +213,122 @@ void ESM4::Npc::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
             {
                 reader.get(mFgRace);
                 // std::cout << "race " << mEditorId << " " << mRace << std::endl; // FIXME
                 // std::cout << "fg race " << mEditorId << " " << mFgRace << std::endl; // FIXME
                 break;
             }
-            case ESM4::SUB_PNAM: // FO3/FONV/TES5
+            case ESM::fourCC("PNAM"): // FO3/FONV/TES5
                 reader.getFormId(mHeadParts.emplace_back());
                 break;
-            case ESM4::SUB_HCLF: // TES5 hair colour
+            case ESM::fourCC("HCLF"): // TES5 hair colour
             {
                 reader.getFormId(mHairColourId);
 
                 break;
             }
-            case ESM4::SUB_BCLF:
+            case ESM::fourCC("BCLF"):
             {
                 reader.getFormId(mBeardColourId);
                 break;
             }
-            case ESM4::SUB_COCT: // TES5
+            case ESM::fourCC("COCT"): // TES5
             {
                 std::uint32_t count;
                 reader.get(count);
 
                 break;
             }
-            case ESM4::SUB_DOFT:
+            case ESM::fourCC("DOFT"):
                 reader.getFormId(mDefaultOutfit);
                 break;
-            case ESM4::SUB_SOFT:
+            case ESM::fourCC("SOFT"):
                 reader.getFormId(mSleepOutfit);
                 break;
-            case ESM4::SUB_DPLT:
+            case ESM::fourCC("DPLT"):
                 reader.getFormId(mDefaultPkg);
                 break; // AI package list
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_NAM6: // height mult
-            case ESM4::SUB_NAM7: // weight mult
-            case ESM4::SUB_ATKR:
-            case ESM4::SUB_CRIF:
-            case ESM4::SUB_CSDT:
-            case ESM4::SUB_DNAM:
-            case ESM4::SUB_ECOR:
-            case ESM4::SUB_ANAM:
-            case ESM4::SUB_ATKD:
-            case ESM4::SUB_ATKE:
-            case ESM4::SUB_FTST:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_NAM5:
-            case ESM4::SUB_NAM8:
-            case ESM4::SUB_NAM9:
-            case ESM4::SUB_NAMA:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_PRKR:
-            case ESM4::SUB_PRKZ:
-            case ESM4::SUB_QNAM:
-            case ESM4::SUB_SPCT:
-            case ESM4::SUB_TIAS:
-            case ESM4::SUB_TINC:
-            case ESM4::SUB_TINI:
-            case ESM4::SUB_TINV:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_VTCK:
-            case ESM4::SUB_GNAM:
-            case ESM4::SUB_SHRT:
-            case ESM4::SUB_SPOR:
-            case ESM4::SUB_EAMT: // FO3
-            case ESM4::SUB_NAM4: // FO3
-            case ESM4::SUB_COED: // FO3
-            case ESM4::SUB_APPR: // FO4
-            case ESM4::SUB_ATKS: // FO4
-            case ESM4::SUB_ATKT: // FO4
-            case ESM4::SUB_ATKW: // FO4
-            case ESM4::SUB_ATTX: // FO4
-            case ESM4::SUB_FTYP: // FO4
-            case ESM4::SUB_LTPT: // FO4
-            case ESM4::SUB_LTPC: // FO4
-            case ESM4::SUB_MWGT: // FO4
-            case ESM4::SUB_NTRM: // FO4
-            case ESM4::SUB_PFRN: // FO4
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_STCP: // FO4
-            case ESM4::SUB_TETI: // FO4
-            case ESM4::SUB_TEND: // FO4
-            case ESM4::SUB_TPTA: // FO4
-            case ESM4::SUB_OBTE: // FO4 object template start
-            case ESM4::SUB_OBTF: //
-            case ESM4::SUB_OBTS: //
-            case ESM4::SUB_STOP: // FO4 object template end
-            case ESM4::SUB_OCOR: // FO4 new package lists start
-            case ESM4::SUB_GWOR: //
-            case ESM4::SUB_FCPL: //
-            case ESM4::SUB_RCLR: // FO4 new package lists end
-            case ESM4::SUB_CS2D: // FO4 actor sound subrecords
-            case ESM4::SUB_CS2E: //
-            case ESM4::SUB_CS2F: //
-            case ESM4::SUB_CS2H: //
-            case ESM4::SUB_CS2K: // FO4 actor sound subrecords end
-            case ESM4::SUB_MSDK: // FO4 morph subrecords start
-            case ESM4::SUB_MSDV: //
-            case ESM4::SUB_MRSV: //
-            case ESM4::SUB_FMRI: //
-            case ESM4::SUB_FMRS: //
-            case ESM4::SUB_FMIN: // FO4 morph subrecords end
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("NAM6"): // height mult
+            case ESM::fourCC("NAM7"): // weight mult
+            case ESM::fourCC("ATKR"):
+            case ESM::fourCC("CRIF"):
+            case ESM::fourCC("CSDT"):
+            case ESM::fourCC("DNAM"):
+            case ESM::fourCC("ECOR"):
+            case ESM::fourCC("ANAM"):
+            case ESM::fourCC("ATKD"):
+            case ESM::fourCC("ATKE"):
+            case ESM::fourCC("FTST"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("NAM5"):
+            case ESM::fourCC("NAM8"):
+            case ESM::fourCC("NAM9"):
+            case ESM::fourCC("NAMA"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("PRKR"):
+            case ESM::fourCC("PRKZ"):
+            case ESM::fourCC("QNAM"):
+            case ESM::fourCC("SPCT"):
+            case ESM::fourCC("TIAS"):
+            case ESM::fourCC("TINC"):
+            case ESM::fourCC("TINI"):
+            case ESM::fourCC("TINV"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("VTCK"):
+            case ESM::fourCC("GNAM"):
+            case ESM::fourCC("SHRT"):
+            case ESM::fourCC("SPOR"):
+            case ESM::fourCC("EAMT"): // FO3
+            case ESM::fourCC("NAM4"): // FO3
+            case ESM::fourCC("COED"): // FO3
+            case ESM::fourCC("APPR"): // FO4
+            case ESM::fourCC("ATKS"): // FO4
+            case ESM::fourCC("ATKT"): // FO4
+            case ESM::fourCC("ATKW"): // FO4
+            case ESM::fourCC("ATTX"): // FO4
+            case ESM::fourCC("FTYP"): // FO4
+            case ESM::fourCC("LTPT"): // FO4
+            case ESM::fourCC("LTPC"): // FO4
+            case ESM::fourCC("MWGT"): // FO4
+            case ESM::fourCC("NTRM"): // FO4
+            case ESM::fourCC("PFRN"): // FO4
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("STCP"): // FO4
+            case ESM::fourCC("TETI"): // FO4
+            case ESM::fourCC("TEND"): // FO4
+            case ESM::fourCC("TPTA"): // FO4
+            case ESM::fourCC("OBTE"): // FO4 object template start
+            case ESM::fourCC("OBTF"): //
+            case ESM::fourCC("OBTS"): //
+            case ESM::fourCC("STOP"): // FO4 object template end
+            case ESM::fourCC("OCOR"): // FO4 new package lists start
+            case ESM::fourCC("GWOR"): //
+            case ESM::fourCC("FCPL"): //
+            case ESM::fourCC("RCLR"): // FO4 new package lists end
+            case ESM::fourCC("CS2D"): // FO4 actor sound subrecords
+            case ESM::fourCC("CS2E"): //
+            case ESM::fourCC("CS2F"): //
+            case ESM::fourCC("CS2H"): //
+            case ESM::fourCC("CS2K"): // FO4 actor sound subrecords end
+            case ESM::fourCC("MSDK"): // FO4 morph subrecords start
+            case ESM::fourCC("MSDV"): //
+            case ESM::fourCC("MRSV"): //
+            case ESM::fourCC("FMRI"): //
+            case ESM::fourCC("FMRS"): //
+            case ESM::fourCC("FMIN"): // FO4 morph subrecords end
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadnpc.hpp b/components/esm4/loadnpc.hpp
index 6f4b3c7e24..04e56b7bd9 100644
--- a/components/esm4/loadnpc.hpp
+++ b/components/esm4/loadnpc.hpp
@@ -78,6 +78,7 @@ namespace ESM4
             FO3_NoRotateHead = 0x40000000
         };
 
+        // In FO4 flags seem to be the same.
         enum ACBS_TES5
         {
             TES5_Female = 0x00000001,
@@ -101,27 +102,32 @@ namespace ESM4
             TES5_Invulnerable = 0x80000000
         };
 
+        // All FO3+ games.
         enum Template_Flags
         {
-            TES5_UseTraits = 0x0001, // Destructible Object; Traits tab, including race, gender, height, weight,
-                                     // voice type, death item; Sounds tab; Animation tab; Character Gen tabs
-            TES5_UseStats = 0x0002, // Stats tab, including level, autocalc, skills, health/magicka/stamina,
-                                    // speed, bleedout, class
-            TES5_UseFactions = 0x0004, // both factions and assigned crime faction
-            TES5_UseSpellList = 0x0008, // both spells and perks
-            TES5_UseAIData = 0x0010, // AI Data tab, including aggression/confidence/morality, combat style and
-                                     // gift filter
-            TES5_UseAIPackage = 0x0020, // only the basic Packages listed on the AI Packages tab;
-                                        // rest of tab controlled by Def Pack List
-            TES5_UseBaseData = 0x0080, // including name and short name, and flags for Essential, Protected,
-                                       // Respawn, Summonable, Simple Actor, and Doesn't affect stealth meter
-            TES5_UseInventory = 0x0100, // Inventory tab, including all outfits and geared-up item
-                                        // -- but not death item
-            TES5_UseScript = 0x0200,
-            TES5_UseDefined = 0x0400, // Def Pack List (the dropdown-selected package lists on the AI Packages tab)
-            TES5_UseAtkData = 0x0800, // Attack Data tab, including override from behavior graph race,
-                                      // events, and data)
-            TES5_UseKeywords = 0x1000
+            Template_UseTraits = 0x0001, // Destructible Object; Traits tab, including race, gender, height, weight,
+                                         // voice type, death item; Sounds tab; Animation tab; Character Gen tabs
+            Template_UseStats = 0x0002, // Stats tab, including level, autocalc, skills, health/magicka/stamina,
+                                        // speed, bleedout, class
+            Template_UseFactions = 0x0004, // both factions and assigned crime faction
+            Template_UseSpellList = 0x0008, // both spells and perks
+            Template_UseAIData = 0x0010, // AI Data tab, including aggression/confidence/morality, combat style and
+                                         // gift filter
+            Template_UseAIPackage = 0x0020, // only the basic Packages listed on the AI Packages tab;
+                                            // rest of tab controlled by Def Pack List
+            Template_UseModel = 0x0040, // FO3, FONV; probably not used in TES5+
+            Template_UseBaseData = 0x0080, // including name and short name, and flags for Essential, Protected,
+                                           // Respawn, Summonable, Simple Actor, and Doesn't affect stealth meter
+            Template_UseInventory = 0x0100, // Inventory tab, including all outfits and geared-up item,
+                                            // but not death item
+            Template_UseScript = 0x0200,
+
+            // The following flags were added in TES5+:
+
+            Template_UseDefined = 0x0400, // Def Pack List (the dropdown-selected package lists on the AI Packages tab)
+            Template_UseAtkData = 0x0800, // Attack Data tab, including override from behavior graph race,
+                                          // events, and data)
+            Template_UseKeywords = 0x1000
         };
 
 #pragma pack(push, 1)
@@ -172,6 +178,7 @@ namespace ESM4
 
         bool mIsTES4;
         bool mIsFONV;
+        bool mIsFO4 = false;
 
         std::string mEditorId;
         std::string mFullName;
diff --git a/components/esm4/loadotft.cpp b/components/esm4/loadotft.cpp
index b980de4a8c..a5fec9b002 100644
--- a/components/esm4/loadotft.cpp
+++ b/components/esm4/loadotft.cpp
@@ -41,10 +41,10 @@ void ESM4::Outfit::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_INAM:
+            case ESM::fourCC("INAM"):
             {
                 mInventory.resize(subHdr.dataSize / sizeof(ESM::FormId32));
                 for (ESM::FormId& formId : mInventory)
diff --git a/components/esm4/loadpack.cpp b/components/esm4/loadpack.cpp
index ab75598121..eed1574cef 100644
--- a/components/esm4/loadpack.cpp
+++ b/components/esm4/loadpack.cpp
@@ -42,10 +42,10 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_PKDT:
+            case ESM::fourCC("PKDT"):
             {
                 if (subHdr.dataSize != sizeof(PKDT) && subHdr.dataSize == 4)
                 {
@@ -60,7 +60,7 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PSDT: // reader.get(mSchedule); break;
+            case ESM::fourCC("PSDT"): // reader.get(mSchedule); break;
             {
                 if (subHdr.dataSize != sizeof(mSchedule))
                     reader.skipSubRecordData(); // FIXME:
@@ -69,7 +69,7 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PLDT:
+            case ESM::fourCC("PLDT"):
             {
                 if (subHdr.dataSize != sizeof(mLocation))
                     reader.skipSubRecordData(); // FIXME:
@@ -82,7 +82,7 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PTDT:
+            case ESM::fourCC("PTDT"):
             {
                 if (subHdr.dataSize != sizeof(mTarget))
                     reader.skipSubRecordData(); // FIXME: FO3
@@ -95,7 +95,7 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_CTDA:
+            case ESM::fourCC("CTDA"):
             {
                 if (subHdr.dataSize != sizeof(CTDA))
                 {
@@ -103,7 +103,7 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
                     break;
                 }
 
-                static CTDA condition;
+                CTDA condition;
                 reader.get(condition);
                 // FIXME: how to "unadjust" if not FormId?
                 // adjustFormId(condition.param1);
@@ -112,55 +112,55 @@ void ESM4::AIPackage::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_CTDT: // always 20 for TES4
-            case ESM4::SUB_TNAM: // FO3
-            case ESM4::SUB_INAM: // FO3
-            case ESM4::SUB_CNAM: // FO3
-            case ESM4::SUB_SCHR: // FO3
-            case ESM4::SUB_POBA: // FO3
-            case ESM4::SUB_POCA: // FO3
-            case ESM4::SUB_POEA: // FO3
-            case ESM4::SUB_SCTX: // FO3
-            case ESM4::SUB_SCDA: // FO3
-            case ESM4::SUB_SCRO: // FO3
-            case ESM4::SUB_IDLA: // FO3
-            case ESM4::SUB_IDLC: // FO3
-            case ESM4::SUB_IDLF: // FO3
-            case ESM4::SUB_IDLT: // FO3
-            case ESM4::SUB_PKDD: // FO3
-            case ESM4::SUB_PKD2: // FO3
-            case ESM4::SUB_PKPT: // FO3
-            case ESM4::SUB_PKED: // FO3
-            case ESM4::SUB_PKE2: // FO3
-            case ESM4::SUB_PKAM: // FO3
-            case ESM4::SUB_PUID: // FO3
-            case ESM4::SUB_PKW3: // FO3
-            case ESM4::SUB_PTD2: // FO3
-            case ESM4::SUB_PLD2: // FO3
-            case ESM4::SUB_PKFD: // FO3
-            case ESM4::SUB_SLSD: // FO3
-            case ESM4::SUB_SCVR: // FO3
-            case ESM4::SUB_SCRV: // FO3
-            case ESM4::SUB_IDLB: // FO3
-            case ESM4::SUB_ANAM: // TES5
-            case ESM4::SUB_BNAM: // TES5
-            case ESM4::SUB_FNAM: // TES5
-            case ESM4::SUB_PNAM: // TES5
-            case ESM4::SUB_QNAM: // TES5
-            case ESM4::SUB_UNAM: // TES5
-            case ESM4::SUB_XNAM: // TES5
-            case ESM4::SUB_PDTO: // TES5
-            case ESM4::SUB_PTDA: // TES5
-            case ESM4::SUB_PFOR: // TES5
-            case ESM4::SUB_PFO2: // TES5
-            case ESM4::SUB_PRCB: // TES5
-            case ESM4::SUB_PKCU: // TES5
-            case ESM4::SUB_PKC2: // TES5
-            case ESM4::SUB_CITC: // TES5
-            case ESM4::SUB_CIS1: // TES5
-            case ESM4::SUB_CIS2: // TES5
-            case ESM4::SUB_VMAD: // TES5
-            case ESM4::SUB_TPIC: // TES5
+            case ESM::fourCC("CTDT"): // always 20 for TES4
+            case ESM::fourCC("TNAM"): // FO3
+            case ESM::fourCC("INAM"): // FO3
+            case ESM::fourCC("CNAM"): // FO3
+            case ESM::fourCC("SCHR"): // FO3
+            case ESM::fourCC("POBA"): // FO3
+            case ESM::fourCC("POCA"): // FO3
+            case ESM::fourCC("POEA"): // FO3
+            case ESM::fourCC("SCTX"): // FO3
+            case ESM::fourCC("SCDA"): // FO3
+            case ESM::fourCC("SCRO"): // FO3
+            case ESM::fourCC("IDLA"): // FO3
+            case ESM::fourCC("IDLC"): // FO3
+            case ESM::fourCC("IDLF"): // FO3
+            case ESM::fourCC("IDLT"): // FO3
+            case ESM::fourCC("PKDD"): // FO3
+            case ESM::fourCC("PKD2"): // FO3
+            case ESM::fourCC("PKPT"): // FO3
+            case ESM::fourCC("PKED"): // FO3
+            case ESM::fourCC("PKE2"): // FO3
+            case ESM::fourCC("PKAM"): // FO3
+            case ESM::fourCC("PUID"): // FO3
+            case ESM::fourCC("PKW3"): // FO3
+            case ESM::fourCC("PTD2"): // FO3
+            case ESM::fourCC("PLD2"): // FO3
+            case ESM::fourCC("PKFD"): // FO3
+            case ESM::fourCC("SLSD"): // FO3
+            case ESM::fourCC("SCVR"): // FO3
+            case ESM::fourCC("SCRV"): // FO3
+            case ESM::fourCC("IDLB"): // FO3
+            case ESM::fourCC("ANAM"): // TES5
+            case ESM::fourCC("BNAM"): // TES5
+            case ESM::fourCC("FNAM"): // TES5
+            case ESM::fourCC("PNAM"): // TES5
+            case ESM::fourCC("QNAM"): // TES5
+            case ESM::fourCC("UNAM"): // TES5
+            case ESM::fourCC("XNAM"): // TES5
+            case ESM::fourCC("PDTO"): // TES5
+            case ESM::fourCC("PTDA"): // TES5
+            case ESM::fourCC("PFOR"): // TES5
+            case ESM::fourCC("PFO2"): // TES5
+            case ESM::fourCC("PRCB"): // TES5
+            case ESM::fourCC("PKCU"): // TES5
+            case ESM::fourCC("PKC2"): // TES5
+            case ESM::fourCC("CITC"): // TES5
+            case ESM::fourCC("CIS1"): // TES5
+            case ESM::fourCC("CIS2"): // TES5
+            case ESM::fourCC("VMAD"): // TES5
+            case ESM::fourCC("TPIC"): // TES5
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp
index 12cbf6f28b..9b050be38d 100644
--- a/components/esm4/loadpgrd.cpp
+++ b/components/esm4/loadpgrd.cpp
@@ -44,10 +44,10 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_PGRP:
+            case ESM::fourCC("PGRP"):
             {
                 std::size_t numNodes = subHdr.dataSize / sizeof(PGRP);
                 if (numNodes != std::size_t(mData)) // keep gcc quiet
@@ -66,9 +66,9 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PGRR:
+            case ESM::fourCC("PGRR"):
             {
-                static PGRR link;
+                PGRR link;
 
                 for (std::size_t i = 0; i < std::size_t(mData); ++i) // keep gcc quiet
                 {
@@ -91,7 +91,7 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PGRI:
+            case ESM::fourCC("PGRI"):
             {
                 std::size_t numForeign = subHdr.dataSize / sizeof(PGRI);
                 mForeign.resize(numForeign);
@@ -103,9 +103,9 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PGRL:
+            case ESM::fourCC("PGRL"):
             {
-                static PGRL objLink;
+                PGRL objLink;
                 reader.getFormId(objLink.object);
                 //                                        object             linkedNode
                 std::size_t numNodes = (subHdr.dataSize - sizeof(int32_t)) / sizeof(int32_t);
@@ -118,7 +118,7 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PGAG:
+            case ESM::fourCC("PGAG"):
             {
 #if 0
                 std::vector<unsigned char> mDataBuf(subHdr.dataSize);
diff --git a/components/esm4/loadpgre.cpp b/components/esm4/loadpgre.cpp
index 4e473bd47a..123d2c967a 100644
--- a/components/esm4/loadpgre.cpp
+++ b/components/esm4/loadpgre.cpp
@@ -43,51 +43,51 @@ void ESM4::PlacedGrenade::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_NAME:
-            case ESM4::SUB_XEZN:
-            case ESM4::SUB_XRGD:
-            case ESM4::SUB_XRGB:
-            case ESM4::SUB_XPRD:
-            case ESM4::SUB_XPPA:
-            case ESM4::SUB_INAM:
-            case ESM4::SUB_TNAM:
-            case ESM4::SUB_XOWN:
-            case ESM4::SUB_XRNK:
-            case ESM4::SUB_XCNT:
-            case ESM4::SUB_XRDS:
-            case ESM4::SUB_XHLP:
-            case ESM4::SUB_XPWR:
-            case ESM4::SUB_XDCR:
-            case ESM4::SUB_XLKR:
-            case ESM4::SUB_XLKT: // FO4
-            case ESM4::SUB_XCLP:
-            case ESM4::SUB_XAPD:
-            case ESM4::SUB_XAPR:
-            case ESM4::SUB_XATO:
-            case ESM4::SUB_XESP:
-            case ESM4::SUB_XEMI:
-            case ESM4::SUB_XMBR:
-            case ESM4::SUB_XIBS:
-            case ESM4::SUB_XSCL:
-            case ESM4::SUB_DATA:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_MNAM: // FO4
-            case ESM4::SUB_XAMC: // FO4
-            case ESM4::SUB_XASP: // FO4
-            case ESM4::SUB_XATP: // FO4
-            case ESM4::SUB_XCVR: // FO4
-            case ESM4::SUB_XFVC: // FO4
-            case ESM4::SUB_XHTW: // FO4
-            case ESM4::SUB_XIS2: // FO4
-            case ESM4::SUB_XLOD: // FO4
-            case ESM4::SUB_XLRL: // FO4
-            case ESM4::SUB_XLRT: // FO4
-            case ESM4::SUB_XLYR: // FO4
-            case ESM4::SUB_XMSP: // FO4
-            case ESM4::SUB_XRFG: // FO4
+            case ESM::fourCC("NAME"):
+            case ESM::fourCC("XEZN"):
+            case ESM::fourCC("XRGD"):
+            case ESM::fourCC("XRGB"):
+            case ESM::fourCC("XPRD"):
+            case ESM::fourCC("XPPA"):
+            case ESM::fourCC("INAM"):
+            case ESM::fourCC("TNAM"):
+            case ESM::fourCC("XOWN"):
+            case ESM::fourCC("XRNK"):
+            case ESM::fourCC("XCNT"):
+            case ESM::fourCC("XRDS"):
+            case ESM::fourCC("XHLP"):
+            case ESM::fourCC("XPWR"):
+            case ESM::fourCC("XDCR"):
+            case ESM::fourCC("XLKR"):
+            case ESM::fourCC("XLKT"): // FO4
+            case ESM::fourCC("XCLP"):
+            case ESM::fourCC("XAPD"):
+            case ESM::fourCC("XAPR"):
+            case ESM::fourCC("XATO"):
+            case ESM::fourCC("XESP"):
+            case ESM::fourCC("XEMI"):
+            case ESM::fourCC("XMBR"):
+            case ESM::fourCC("XIBS"):
+            case ESM::fourCC("XSCL"):
+            case ESM::fourCC("DATA"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("MNAM"): // FO4
+            case ESM::fourCC("XAMC"): // FO4
+            case ESM::fourCC("XASP"): // FO4
+            case ESM::fourCC("XATP"): // FO4
+            case ESM::fourCC("XCVR"): // FO4
+            case ESM::fourCC("XFVC"): // FO4
+            case ESM::fourCC("XHTW"): // FO4
+            case ESM::fourCC("XIS2"): // FO4
+            case ESM::fourCC("XLOD"): // FO4
+            case ESM::fourCC("XLRL"): // FO4
+            case ESM::fourCC("XLRT"): // FO4
+            case ESM::fourCC("XLYR"): // FO4
+            case ESM::fourCC("XMSP"): // FO4
+            case ESM::fourCC("XRFG"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadpwat.cpp b/components/esm4/loadpwat.cpp
index 339ae63daf..33a2c86546 100644
--- a/components/esm4/loadpwat.cpp
+++ b/components/esm4/loadpwat.cpp
@@ -43,12 +43,12 @@ void ESM4::PlaceableWater::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_MODL:
-            case ESM4::SUB_DNAM:
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("MODL"):
+            case ESM::fourCC("DNAM"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadqust.cpp b/components/esm4/loadqust.cpp
index b7f9b33db9..27c23d92f1 100644
--- a/components/esm4/loadqust.cpp
+++ b/components/esm4/loadqust.cpp
@@ -42,16 +42,16 @@ void ESM4::Quest::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getZString(mQuestName);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mFileName);
                 break; // TES4 (none in FO3/FONV)
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 if (subHdr.dataSize == 2) // TES4
                 {
@@ -66,10 +66,10 @@ void ESM4::Quest::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mQuestScript);
                 break;
-            case ESM4::SUB_CTDA: // FIXME: how to detect if 1st/2nd param is a formid?
+            case ESM::fourCC("CTDA"): // FIXME: how to detect if 1st/2nd param is a formid?
             {
                 if (subHdr.dataSize == 24) // TES4
                 {
@@ -95,80 +95,80 @@ void ESM4::Quest::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_SCHR:
+            case ESM::fourCC("SCHR"):
                 reader.get(mScript.scriptHeader);
                 break;
-            case ESM4::SUB_SCDA:
+            case ESM::fourCC("SCDA"):
                 reader.skipSubRecordData();
                 break; // compiled script data
-            case ESM4::SUB_SCTX:
+            case ESM::fourCC("SCTX"):
                 reader.getString(mScript.scriptSource);
                 break;
-            case ESM4::SUB_SCRO:
+            case ESM::fourCC("SCRO"):
                 reader.getFormId(mScript.globReference);
                 break;
-            case ESM4::SUB_INDX:
-            case ESM4::SUB_QSDT:
-            case ESM4::SUB_CNAM:
-            case ESM4::SUB_QSTA:
-            case ESM4::SUB_NNAM: // FO3
-            case ESM4::SUB_QOBJ: // FO3
-            case ESM4::SUB_NAM0: // FO3
-            case ESM4::SUB_ANAM: // TES5
-            case ESM4::SUB_DNAM: // TES5
-            case ESM4::SUB_ENAM: // TES5
-            case ESM4::SUB_FNAM: // TES5
-            case ESM4::SUB_NEXT: // TES5
-            case ESM4::SUB_ALCA: // TES5
-            case ESM4::SUB_ALCL: // TES5
-            case ESM4::SUB_ALCO: // TES5
-            case ESM4::SUB_ALDN: // TES5
-            case ESM4::SUB_ALEA: // TES5
-            case ESM4::SUB_ALED: // TES5
-            case ESM4::SUB_ALEQ: // TES5
-            case ESM4::SUB_ALFA: // TES5
-            case ESM4::SUB_ALFC: // TES5
-            case ESM4::SUB_ALFD: // TES5
-            case ESM4::SUB_ALFE: // TES5
-            case ESM4::SUB_ALFI: // TES5
-            case ESM4::SUB_ALFL: // TES5
-            case ESM4::SUB_ALFR: // TES5
-            case ESM4::SUB_ALID: // TES5
-            case ESM4::SUB_ALLS: // TES5
-            case ESM4::SUB_ALNA: // TES5
-            case ESM4::SUB_ALNT: // TES5
-            case ESM4::SUB_ALPC: // TES5
-            case ESM4::SUB_ALRT: // TES5
-            case ESM4::SUB_ALSP: // TES5
-            case ESM4::SUB_ALST: // TES5
-            case ESM4::SUB_ALUA: // TES5
-            case ESM4::SUB_CIS1: // TES5
-            case ESM4::SUB_CIS2: // TES5
-            case ESM4::SUB_CNTO: // TES5
-            case ESM4::SUB_COCT: // TES5
-            case ESM4::SUB_ECOR: // TES5
-            case ESM4::SUB_FLTR: // TES5
-            case ESM4::SUB_KNAM: // TES5
-            case ESM4::SUB_KSIZ: // TES5
-            case ESM4::SUB_KWDA: // TES5
-            case ESM4::SUB_QNAM: // TES5
-            case ESM4::SUB_QTGL: // TES5
-            case ESM4::SUB_SPOR: // TES5
-            case ESM4::SUB_VMAD: // TES5
-            case ESM4::SUB_VTCK: // TES5
-            case ESM4::SUB_ALCC: // FO4
-            case ESM4::SUB_ALCS: // FO4
-            case ESM4::SUB_ALDI: // FO4
-            case ESM4::SUB_ALFV: // FO4
-            case ESM4::SUB_ALLA: // FO4
-            case ESM4::SUB_ALMI: // FO4
-            case ESM4::SUB_GNAM: // FO4
-            case ESM4::SUB_GWOR: // FO4
-            case ESM4::SUB_LNAM: // FO4
-            case ESM4::SUB_NAM2: // FO4
-            case ESM4::SUB_OCOR: // FO4
-            case ESM4::SUB_SNAM: // FO4
-            case ESM4::SUB_XNAM: // FO4
+            case ESM::fourCC("INDX"):
+            case ESM::fourCC("QSDT"):
+            case ESM::fourCC("CNAM"):
+            case ESM::fourCC("QSTA"):
+            case ESM::fourCC("NNAM"): // FO3
+            case ESM::fourCC("QOBJ"): // FO3
+            case ESM::fourCC("NAM0"): // FO3
+            case ESM::fourCC("ANAM"): // TES5
+            case ESM::fourCC("DNAM"): // TES5
+            case ESM::fourCC("ENAM"): // TES5
+            case ESM::fourCC("FNAM"): // TES5
+            case ESM::fourCC("NEXT"): // TES5
+            case ESM::fourCC("ALCA"): // TES5
+            case ESM::fourCC("ALCL"): // TES5
+            case ESM::fourCC("ALCO"): // TES5
+            case ESM::fourCC("ALDN"): // TES5
+            case ESM::fourCC("ALEA"): // TES5
+            case ESM::fourCC("ALED"): // TES5
+            case ESM::fourCC("ALEQ"): // TES5
+            case ESM::fourCC("ALFA"): // TES5
+            case ESM::fourCC("ALFC"): // TES5
+            case ESM::fourCC("ALFD"): // TES5
+            case ESM::fourCC("ALFE"): // TES5
+            case ESM::fourCC("ALFI"): // TES5
+            case ESM::fourCC("ALFL"): // TES5
+            case ESM::fourCC("ALFR"): // TES5
+            case ESM::fourCC("ALID"): // TES5
+            case ESM::fourCC("ALLS"): // TES5
+            case ESM::fourCC("ALNA"): // TES5
+            case ESM::fourCC("ALNT"): // TES5
+            case ESM::fourCC("ALPC"): // TES5
+            case ESM::fourCC("ALRT"): // TES5
+            case ESM::fourCC("ALSP"): // TES5
+            case ESM::fourCC("ALST"): // TES5
+            case ESM::fourCC("ALUA"): // TES5
+            case ESM::fourCC("CIS1"): // TES5
+            case ESM::fourCC("CIS2"): // TES5
+            case ESM::fourCC("CNTO"): // TES5
+            case ESM::fourCC("COCT"): // TES5
+            case ESM::fourCC("ECOR"): // TES5
+            case ESM::fourCC("FLTR"): // TES5
+            case ESM::fourCC("KNAM"): // TES5
+            case ESM::fourCC("KSIZ"): // TES5
+            case ESM::fourCC("KWDA"): // TES5
+            case ESM::fourCC("QNAM"): // TES5
+            case ESM::fourCC("QTGL"): // TES5
+            case ESM::fourCC("SPOR"): // TES5
+            case ESM::fourCC("VMAD"): // TES5
+            case ESM::fourCC("VTCK"): // TES5
+            case ESM::fourCC("ALCC"): // FO4
+            case ESM::fourCC("ALCS"): // FO4
+            case ESM::fourCC("ALDI"): // FO4
+            case ESM::fourCC("ALFV"): // FO4
+            case ESM::fourCC("ALLA"): // FO4
+            case ESM::fourCC("ALMI"): // FO4
+            case ESM::fourCC("GNAM"): // FO4
+            case ESM::fourCC("GWOR"): // FO4
+            case ESM::fourCC("LNAM"): // FO4
+            case ESM::fourCC("NAM2"): // FO4
+            case ESM::fourCC("OCOR"): // FO4
+            case ESM::fourCC("SNAM"): // FO4
+            case ESM::fourCC("XNAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp
index 28f91787e6..02f6f953b4 100644
--- a/components/esm4/loadrace.cpp
+++ b/components/esm4/loadrace.cpp
@@ -38,7 +38,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
     mFlags = reader.hdr().record.flags;
 
     std::uint32_t esmVer = reader.esmVersion();
-    bool isTES4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
+    bool isTES4 = (esmVer == ESM::VER_080 || esmVer == ESM::VER_100) && !reader.hasFormVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
     bool isFO3 = false;
 
@@ -52,7 +52,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
         // std::cout << "RACE " << ESM::printName(subHdr.typeId) << std::endl;
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
             {
                 reader.getZString(mEditorId);
                 // TES4
@@ -73,10 +73,10 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 // Imperial    0x00000907
                 break;
             }
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
             {
                 if (subHdr.dataSize == 1) // FO3?
                 {
@@ -87,10 +87,10 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 reader.getLocalizedString(mDesc);
                 break;
             }
-            case ESM4::SUB_SPLO: // bonus spell formid (TES5 may have SPCT and multiple SPLO)
+            case ESM::fourCC("SPLO"): // bonus spell formid (TES5 may have SPCT and multiple SPLO)
                 reader.getFormId(mBonusSpells.emplace_back());
                 break;
-            case ESM4::SUB_DATA: // ?? different length for TES5
+            case ESM::fourCC("DATA"): // ?? different length for TES5
             {
 // DATA:size 128
 // 0f 0f ff 00 ff 00 ff 00 ff 00 ff 00 ff 00 00 00
@@ -210,14 +210,14 @@ void ESM4::Race::load(ESM4::Reader& reader)
 #endif
                 break;
             }
-            case ESM4::SUB_DNAM:
+            case ESM::fourCC("DNAM"):
             {
                 reader.getFormId(mDefaultHair[0]); // male
                 reader.getFormId(mDefaultHair[1]); // female
 
                 break;
             }
-            case ESM4::SUB_CNAM:
+            case ESM::fourCC("CNAM"):
                 //              CNAM       SNAM                     VNAM
                 // Sheogorath   0x0  0000  98 2b  10011000 00101011
                 // Golden Saint 0x3  0011  26 46  00100110 01000110
@@ -238,13 +238,13 @@ void ESM4::Race::load(ESM4::Reader& reader)
                     reader.skipSubRecordData();
                     break;
                 }
-            case ESM4::SUB_PNAM:
+            case ESM::fourCC("PNAM"):
                 reader.get(mFaceGenMainClamp);
                 break; // 0x40A00000 = 5.f
-            case ESM4::SUB_UNAM:
+            case ESM::fourCC("UNAM"):
                 reader.get(mFaceGenFaceClamp);
                 break; // 0x40400000 = 3.f
-            case ESM4::SUB_ATTR: // Only in TES4?
+            case ESM::fourCC("ATTR"): // Only in TES4?
             {
                 if (subHdr.dataSize == 2) // FO3?
                 {
@@ -276,7 +276,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
             //          |             |
             //          +-------------+
             //
-            case ESM4::SUB_NAM0: // start marker head data /* 1 */
+            case ESM::fourCC("NAM0"): // start marker head data /* 1 */
             {
                 curr_part = 0; // head part
 
@@ -296,7 +296,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 currentIndex = 0xffffffff;
                 break;
             }
-            case ESM4::SUB_INDX:
+            case ESM::fourCC("INDX"):
             {
                 reader.get(currentIndex);
                 // FIXME: below check is rather useless
@@ -313,7 +313,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
             {
                 if (currentIndex == 0xffffffff)
                 {
@@ -350,10 +350,10 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.skipSubRecordData();
                 break; // always 0x0000?
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
             {
                 if (currentIndex == 0xffffffff)
                 {
@@ -379,7 +379,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 break;
             }
             //
-            case ESM4::SUB_NAM1: // start marker body data /* 4 */
+            case ESM::fourCC("NAM1"): // start marker body data /* 4 */
             {
 
                 if (isFO3 || isFONV)
@@ -406,14 +406,14 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_MNAM:
+            case ESM::fourCC("MNAM"):
                 isMale = true;
                 break; /* 2, 5, 7 */
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
                 isMale = false;
                 break; /* 3, 6, 8 */
             //
-            case ESM4::SUB_HNAM:
+            case ESM::fourCC("HNAM"):
             {
                 // FIXME: this is a texture name in FO4
                 if (subHdr.dataSize % sizeof(ESM::FormId32) != 0)
@@ -428,7 +428,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
             {
                 std::size_t numEyeChoices = subHdr.dataSize / sizeof(ESM::FormId32);
                 mEyeChoices.resize(numEyeChoices);
@@ -437,7 +437,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FGGS:
+            case ESM::fourCC("FGGS"):
             {
                 if (isMale || isTES4)
                 {
@@ -454,7 +454,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FGGA:
+            case ESM::fourCC("FGGA"):
             {
                 if (isMale || isTES4)
                 {
@@ -471,7 +471,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_FGTS:
+            case ESM::fourCC("FGTS"):
             {
                 if (isMale || isTES4)
                 {
@@ -489,12 +489,12 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 break;
             }
             //
-            case ESM4::SUB_SNAM: // skipping...2 // only in TES4?
+            case ESM::fourCC("SNAM"): // skipping...2 // only in TES4?
             {
                 reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_XNAM:
+            case ESM::fourCC("XNAM"):
             {
                 ESM::FormId race;
                 std::int32_t adjustment;
@@ -504,7 +504,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_VNAM:
+            case ESM::fourCC("VNAM"):
             {
                 if (subHdr.dataSize == 8) // TES4
                 {
@@ -528,7 +528,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 break;
             }
             //
-            case ESM4::SUB_ANAM: // TES5
+            case ESM::fourCC("ANAM"): // TES5
             {
                 if (isMale)
                     reader.getZString(mModelMale);
@@ -536,10 +536,10 @@ void ESM4::Race::load(ESM4::Reader& reader)
                     reader.getZString(mModelFemale);
                 break;
             }
-            case ESM4::SUB_KSIZ:
+            case ESM::fourCC("KSIZ"):
                 reader.get(mNumKeywords);
                 break;
-            case ESM4::SUB_KWDA:
+            case ESM::fourCC("KWDA"):
             {
                 ESM::FormId formid;
                 for (unsigned int i = 0; i < mNumKeywords; ++i)
@@ -547,13 +547,13 @@ void ESM4::Race::load(ESM4::Reader& reader)
                 break;
             }
             //
-            case ESM4::SUB_WNAM: // ARMO FormId
+            case ESM::fourCC("WNAM"): // ARMO FormId
             {
                 reader.getFormId(mSkin);
                 // std::cout << mEditorId << " skin " << formIdToString(mSkin) << std::endl; // FIXME
                 break;
             }
-            case ESM4::SUB_BODT: // body template
+            case ESM::fourCC("BODT"): // body template
             {
                 reader.get(mBodyTemplate.bodyPart);
                 reader.get(mBodyTemplate.flags);
@@ -564,7 +564,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_BOD2:
+            case ESM::fourCC("BOD2"):
             {
                 if (subHdr.dataSize == 8 || subHdr.dataSize == 4) // TES5, FO4
                 {
@@ -584,7 +584,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_HEAD: // TES5
+            case ESM::fourCC("HEAD"): // TES5
             {
                 ESM::FormId formId;
                 reader.getFormId(formId);
@@ -611,7 +611,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_NAM3: // start of hkx model
+            case ESM::fourCC("NAM3"): // start of hkx model
             {
                 curr_part = 3; // for TES5 NAM3 indicates the start of hkx model
 
@@ -651,7 +651,7 @@ void ESM4::Race::load(ESM4::Reader& reader)
             // ManakinRace
             // ManakinRace
             // ManakinRace FX0
-            case ESM4::SUB_NAME: // TES5 biped object names (x32)
+            case ESM::fourCC("NAME"): // TES5 biped object names (x32)
             {
                 std::string name;
                 reader.getZString(name);
@@ -659,112 +659,112 @@ void ESM4::Race::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_MTNM: // movement type
-            case ESM4::SUB_ATKD: // attack data
-            case ESM4::SUB_ATKE: // attach event
-            case ESM4::SUB_GNAM: // body part data
-            case ESM4::SUB_NAM4: // material type
-            case ESM4::SUB_NAM5: // unarmed impact?
-            case ESM4::SUB_LNAM: // close loot sound
-            case ESM4::SUB_QNAM: // equipment slot formid
-            case ESM4::SUB_HCLF: // default hair colour
-            case ESM4::SUB_UNES: // unarmed equipment slot formid
-            case ESM4::SUB_TINC:
-            case ESM4::SUB_TIND:
-            case ESM4::SUB_TINI:
-            case ESM4::SUB_TINL:
-            case ESM4::SUB_TINP:
-            case ESM4::SUB_TINT:
-            case ESM4::SUB_TINV:
-            case ESM4::SUB_TIRS:
-            case ESM4::SUB_PHWT:
-            case ESM4::SUB_AHCF:
-            case ESM4::SUB_AHCM:
-            case ESM4::SUB_MPAI:
-            case ESM4::SUB_MPAV:
-            case ESM4::SUB_DFTF:
-            case ESM4::SUB_DFTM:
-            case ESM4::SUB_FLMV:
-            case ESM4::SUB_FTSF:
-            case ESM4::SUB_FTSM:
-            case ESM4::SUB_MTYP:
-            case ESM4::SUB_NAM7:
-            case ESM4::SUB_NAM8:
-            case ESM4::SUB_PHTN:
-            case ESM4::SUB_RNAM:
-            case ESM4::SUB_RNMV:
-            case ESM4::SUB_RPRF:
-            case ESM4::SUB_RPRM:
-            case ESM4::SUB_SNMV:
-            case ESM4::SUB_SPCT:
-            case ESM4::SUB_SPED:
-            case ESM4::SUB_SWMV:
-            case ESM4::SUB_WKMV:
-            case ESM4::SUB_SPMV:
-            case ESM4::SUB_ATKR:
-            case ESM4::SUB_CTDA:
-            case ESM4::SUB_CIS1:
-            case ESM4::SUB_CIS2:
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
+            case ESM::fourCC("MTNM"): // movement type
+            case ESM::fourCC("ATKD"): // attack data
+            case ESM::fourCC("ATKE"): // attach event
+            case ESM::fourCC("GNAM"): // body part data
+            case ESM::fourCC("NAM4"): // material type
+            case ESM::fourCC("NAM5"): // unarmed impact?
+            case ESM::fourCC("LNAM"): // close loot sound
+            case ESM::fourCC("QNAM"): // equipment slot formid
+            case ESM::fourCC("HCLF"): // default hair colour
+            case ESM::fourCC("UNES"): // unarmed equipment slot formid
+            case ESM::fourCC("TINC"):
+            case ESM::fourCC("TIND"):
+            case ESM::fourCC("TINI"):
+            case ESM::fourCC("TINL"):
+            case ESM::fourCC("TINP"):
+            case ESM::fourCC("TINT"):
+            case ESM::fourCC("TINV"):
+            case ESM::fourCC("TIRS"):
+            case ESM::fourCC("PHWT"):
+            case ESM::fourCC("AHCF"):
+            case ESM::fourCC("AHCM"):
+            case ESM::fourCC("MPAI"):
+            case ESM::fourCC("MPAV"):
+            case ESM::fourCC("DFTF"):
+            case ESM::fourCC("DFTM"):
+            case ESM::fourCC("FLMV"):
+            case ESM::fourCC("FTSF"):
+            case ESM::fourCC("FTSM"):
+            case ESM::fourCC("MTYP"):
+            case ESM::fourCC("NAM7"):
+            case ESM::fourCC("NAM8"):
+            case ESM::fourCC("PHTN"):
+            case ESM::fourCC("RNAM"):
+            case ESM::fourCC("RNMV"):
+            case ESM::fourCC("RPRF"):
+            case ESM::fourCC("RPRM"):
+            case ESM::fourCC("SNMV"):
+            case ESM::fourCC("SPCT"):
+            case ESM::fourCC("SPED"):
+            case ESM::fourCC("SWMV"):
+            case ESM::fourCC("WKMV"):
+            case ESM::fourCC("SPMV"):
+            case ESM::fourCC("ATKR"):
+            case ESM::fourCC("CTDA"):
+            case ESM::fourCC("CIS1"):
+            case ESM::fourCC("CIS2"):
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
             //
-            case ESM4::SUB_YNAM: // FO3
-            case ESM4::SUB_NAM2: // FO3
-            case ESM4::SUB_VTCK: // FO3
-            case ESM4::SUB_MODD: // FO3
-            case ESM4::SUB_ONAM: // FO3
-            case ESM4::SUB_APPR: // FO4
-            case ESM4::SUB_ATKS: // FO4
-            case ESM4::SUB_ATKT: // FO4
-            case ESM4::SUB_ATKW: // FO4
-            case ESM4::SUB_BMMP: // FO4
-            case ESM4::SUB_BSMB: // FO4
-            case ESM4::SUB_BSMP: // FO4
-            case ESM4::SUB_BSMS: // FO4
+            case ESM::fourCC("YNAM"): // FO3
+            case ESM::fourCC("NAM2"): // FO3
+            case ESM::fourCC("VTCK"): // FO3
+            case ESM::fourCC("MODD"): // FO3
+            case ESM::fourCC("ONAM"): // FO3
+            case ESM::fourCC("APPR"): // FO4
+            case ESM::fourCC("ATKS"): // FO4
+            case ESM::fourCC("ATKT"): // FO4
+            case ESM::fourCC("ATKW"): // FO4
+            case ESM::fourCC("BMMP"): // FO4
+            case ESM::fourCC("BSMB"): // FO4
+            case ESM::fourCC("BSMP"): // FO4
+            case ESM::fourCC("BSMS"): // FO4
 
-            case ESM4::SUB_FMRI: // FO4
-            case ESM4::SUB_FMRN: // FO4
-            case ESM4::SUB_HLTX: // FO4
-            case ESM4::SUB_MLSI: // FO4
-            case ESM4::SUB_MPGN: // FO4
-            case ESM4::SUB_MPGS: // FO4
-            case ESM4::SUB_MPPC: // FO4
-            case ESM4::SUB_MPPF: // FO4
-            case ESM4::SUB_MPPI: // FO4
-            case ESM4::SUB_MPPK: // FO4
-            case ESM4::SUB_MPPM: // FO4
-            case ESM4::SUB_MPPN: // FO4
-            case ESM4::SUB_MPPT: // FO4
-            case ESM4::SUB_MSID: // FO4
-            case ESM4::SUB_MSM0: // FO4
-            case ESM4::SUB_MSM1: // FO4
-            case ESM4::SUB_NNAM: // FO4
-            case ESM4::SUB_NTOP: // FO4
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_PTOP: // FO4
-            case ESM4::SUB_QSTI: // FO4
-            case ESM4::SUB_RBPC: // FO4
-            case ESM4::SUB_SADD: // FO4
-            case ESM4::SUB_SAKD: // FO4
-            case ESM4::SUB_SAPT: // FO4
-            case ESM4::SUB_SGNM: // FO4
-            case ESM4::SUB_SRAC: // FO4
-            case ESM4::SUB_SRAF: // FO4
-            case ESM4::SUB_STCP: // FO4
-            case ESM4::SUB_STKD: // FO4
-            case ESM4::SUB_TETI: // FO4
-            case ESM4::SUB_TTEB: // FO4
-            case ESM4::SUB_TTEC: // FO4
-            case ESM4::SUB_TTED: // FO4
-            case ESM4::SUB_TTEF: // FO4
-            case ESM4::SUB_TTET: // FO4
-            case ESM4::SUB_TTGE: // FO4
-            case ESM4::SUB_TTGP: // FO4
-            case ESM4::SUB_UNWP: // FO4
-            case ESM4::SUB_WMAP: // FO4
-            case ESM4::SUB_ZNAM: // FO4
+            case ESM::fourCC("FMRI"): // FO4
+            case ESM::fourCC("FMRN"): // FO4
+            case ESM::fourCC("HLTX"): // FO4
+            case ESM::fourCC("MLSI"): // FO4
+            case ESM::fourCC("MPGN"): // FO4
+            case ESM::fourCC("MPGS"): // FO4
+            case ESM::fourCC("MPPC"): // FO4
+            case ESM::fourCC("MPPF"): // FO4
+            case ESM::fourCC("MPPI"): // FO4
+            case ESM::fourCC("MPPK"): // FO4
+            case ESM::fourCC("MPPM"): // FO4
+            case ESM::fourCC("MPPN"): // FO4
+            case ESM::fourCC("MPPT"): // FO4
+            case ESM::fourCC("MSID"): // FO4
+            case ESM::fourCC("MSM0"): // FO4
+            case ESM::fourCC("MSM1"): // FO4
+            case ESM::fourCC("NNAM"): // FO4
+            case ESM::fourCC("NTOP"): // FO4
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("PTOP"): // FO4
+            case ESM::fourCC("QSTI"): // FO4
+            case ESM::fourCC("RBPC"): // FO4
+            case ESM::fourCC("SADD"): // FO4
+            case ESM::fourCC("SAKD"): // FO4
+            case ESM::fourCC("SAPT"): // FO4
+            case ESM::fourCC("SGNM"): // FO4
+            case ESM::fourCC("SRAC"): // FO4
+            case ESM::fourCC("SRAF"): // FO4
+            case ESM::fourCC("STCP"): // FO4
+            case ESM::fourCC("STKD"): // FO4
+            case ESM::fourCC("TETI"): // FO4
+            case ESM::fourCC("TTEB"): // FO4
+            case ESM::fourCC("TTEC"): // FO4
+            case ESM::fourCC("TTED"): // FO4
+            case ESM::fourCC("TTEF"): // FO4
+            case ESM::fourCC("TTET"): // FO4
+            case ESM::fourCC("TTGE"): // FO4
+            case ESM::fourCC("TTGP"): // FO4
+            case ESM::fourCC("UNWP"): // FO4
+            case ESM::fourCC("WMAP"): // FO4
+            case ESM::fourCC("ZNAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadrace.hpp b/components/esm4/loadrace.hpp
index 9cd4d00891..125fefbd9f 100644
--- a/components/esm4/loadrace.hpp
+++ b/components/esm4/loadrace.hpp
@@ -110,7 +110,7 @@ namespace ESM4
         ESM::FormId mId; // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
-        bool mIsTES5;
+        bool mIsTES5 = false;
 
         std::string mEditorId;
         std::string mFullName;
diff --git a/components/esm4/loadrefr.cpp b/components/esm4/loadrefr.cpp
index a193907ac4..5ac3a5f077 100644
--- a/components/esm4/loadrefr.cpp
+++ b/components/esm4/loadrefr.cpp
@@ -46,26 +46,26 @@ void ESM4::Reference::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_NAME:
+            case ESM::fourCC("NAME"):
             {
                 ESM::FormId BaseId;
                 reader.getFormId(BaseId);
                 mBaseObj = BaseId;
                 break;
             }
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mPos);
                 break;
-            case ESM4::SUB_XSCL:
+            case ESM::fourCC("XSCL"):
                 reader.get(mScale);
                 break;
-            case ESM4::SUB_XOWN:
+            case ESM::fourCC("XOWN"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -86,13 +86,13 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XGLB:
+            case ESM::fourCC("XGLB"):
                 reader.getFormId(mGlobal);
                 break;
-            case ESM4::SUB_XRNK:
+            case ESM::fourCC("XRNK"):
                 reader.get(mFactionRank);
                 break;
-            case ESM4::SUB_XESP:
+            case ESM::fourCC("XESP"):
             {
                 reader.getFormId(mEsp.parent);
                 reader.get(mEsp.flags);
@@ -100,7 +100,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 // << ", 0x" << std::hex << (mEsp.flags & 0xff) << std::endl;// FIXME
                 break;
             }
-            case ESM4::SUB_XTEL:
+            case ESM::fourCC("XTEL"):
             {
                 switch (subHdr.dataSize)
                 {
@@ -125,7 +125,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_XSED:
+            case ESM::fourCC("XSED"):
             {
                 // 1 or 4 bytes
                 if (subHdr.dataSize == 1)
@@ -147,7 +147,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_XLOD:
+            case ESM::fourCC("XLOD"):
             {
                 // 12 bytes
                 if (subHdr.dataSize == 12)
@@ -168,7 +168,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_XACT:
+            case ESM::fourCC("XACT"):
             {
                 if (subHdr.dataSize == 4)
                 {
@@ -182,7 +182,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_XRTM: // formId
+            case ESM::fourCC("XRTM"): // formId
             {
                 // seems like another ref, e.g. 00064583 has base object 00000034 which is "XMarkerHeading"
                 // e.g. some are doors (prob. quest related)
@@ -199,7 +199,7 @@ void ESM4::Reference::load(ESM4::Reader& reader)
                 // std::cout << "REFR " << mEditorId << " XRTM : " << formIdToString(marker) << std::endl;// FIXME
                 break;
             }
-            case ESM4::SUB_TNAM: // reader.get(mMapMarker); break;
+            case ESM::fourCC("TNAM"): // reader.get(mMapMarker); break;
             {
                 if (subHdr.dataSize != sizeof(mMapMarker))
                     // reader.skipSubRecordData(); // FIXME: FO3
@@ -209,26 +209,26 @@ void ESM4::Reference::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_XMRK:
+            case ESM::fourCC("XMRK"):
                 mIsMapMarker = true;
                 break; // all have mBaseObj 0x00000010 "MapMarker"
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
             {
                 // std::cout << "REFR " << ESM::printName(subHdr.typeId) << " skipping..."
                 // << subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_XTRG: // formId
+            case ESM::fourCC("XTRG"): // formId
             {
                 reader.getFormId(mTargetRef);
                 // std::cout << "REFR XRTG : " << formIdToString(id) << std::endl;// FIXME
                 break;
             }
-            case ESM4::SUB_CNAM:
+            case ESM::fourCC("CNAM"):
                 reader.getFormId(mAudioLocation);
                 break; // FONV
-            case ESM4::SUB_XRDO: // FO3
+            case ESM::fourCC("XRDO"): // FO3
             {
                 // FIXME: completely different meaning in FO4
                 reader.get(mRadio.rangeRadius);
@@ -238,14 +238,14 @@ void ESM4::Reference::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_SCRO: // FO3
+            case ESM::fourCC("SCRO"): // FO3
             {
                 reader.getFormId(sid);
                 // if (mFormId == 0x0016b74B)
                 // std::cout << "REFR SCRO : " << formIdToString(sid) << std::endl;// FIXME
                 break;
             }
-            case ESM4::SUB_XLOC:
+            case ESM::fourCC("XLOC"):
             {
                 mIsLocked = true;
                 std::int8_t dummy; // FIXME: very poor code
@@ -268,93 +268,97 @@ void ESM4::Reference::load(ESM4::Reader& reader)
 
                 break;
             }
+            case ESM::fourCC("XCNT"):
+            {
+                reader.get(mCount);
+                break;
+            }
             // lighting
-            case ESM4::SUB_LNAM: // lighting template formId
-            case ESM4::SUB_XLIG: // struct, FOV, fade, etc
-            case ESM4::SUB_XEMI: // LIGH formId
-            case ESM4::SUB_XRDS: // Radius or Radiance
-            case ESM4::SUB_XRGB:
-            case ESM4::SUB_XRGD: // tangent data?
-            case ESM4::SUB_XALP: // alpha cutoff
+            case ESM::fourCC("LNAM"): // lighting template formId
+            case ESM::fourCC("XLIG"): // struct, FOV, fade, etc
+            case ESM::fourCC("XEMI"): // LIGH formId
+            case ESM::fourCC("XRDS"): // Radius or Radiance
+            case ESM::fourCC("XRGB"):
+            case ESM::fourCC("XRGD"): // tangent data?
+            case ESM::fourCC("XALP"): // alpha cutoff
             //
-            case ESM4::SUB_XPCI: // formId
-            case ESM4::SUB_XLCM:
-            case ESM4::SUB_XCNT:
-            case ESM4::SUB_ONAM:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_XPRM:
-            case ESM4::SUB_INAM:
-            case ESM4::SUB_PDTO:
-            case ESM4::SUB_SCHR:
-            case ESM4::SUB_SCTX:
-            case ESM4::SUB_XAPD:
-            case ESM4::SUB_XAPR:
-            case ESM4::SUB_XCVL:
-            case ESM4::SUB_XCZA:
-            case ESM4::SUB_XCZC:
-            case ESM4::SUB_XEZN:
-            case ESM4::SUB_XFVC:
-            case ESM4::SUB_XHTW:
-            case ESM4::SUB_XIS2:
-            case ESM4::SUB_XLCN:
-            case ESM4::SUB_XLIB:
-            case ESM4::SUB_XLKR:
-            case ESM4::SUB_XLRM:
-            case ESM4::SUB_XLRT:
-            case ESM4::SUB_XLTW:
-            case ESM4::SUB_XMBO:
-            case ESM4::SUB_XMBP:
-            case ESM4::SUB_XMBR:
-            case ESM4::SUB_XNDP:
-            case ESM4::SUB_XOCP:
-            case ESM4::SUB_XPOD:
-            case ESM4::SUB_XPTL:
-            case ESM4::SUB_XPPA:
-            case ESM4::SUB_XPRD:
-            case ESM4::SUB_XPWR:
-            case ESM4::SUB_XRMR:
-            case ESM4::SUB_XSPC:
-            case ESM4::SUB_XTNM:
-            case ESM4::SUB_XTRI:
-            case ESM4::SUB_XWCN:
-            case ESM4::SUB_XWCU:
-            case ESM4::SUB_XATR:
-            case ESM4::SUB_XHLT: // Unofficial Oblivion Patch
-            case ESM4::SUB_XCHG: // thievery.exp
-            case ESM4::SUB_XHLP: // FO3
-            case ESM4::SUB_XAMT: // FO3
-            case ESM4::SUB_XAMC: // FO3
-            case ESM4::SUB_XRAD: // FO3
-            case ESM4::SUB_XIBS: // FO3
-            case ESM4::SUB_XORD: // FO3
-            case ESM4::SUB_XCLP: // FO3
-            case ESM4::SUB_SCDA: // FO3
-            case ESM4::SUB_RCLR: // FO3
-            case ESM4::SUB_BNAM: // FONV
-            case ESM4::SUB_MMRK: // FONV
-            case ESM4::SUB_MNAM: // FONV
-            case ESM4::SUB_NNAM: // FONV
-            case ESM4::SUB_XATO: // FONV
-            case ESM4::SUB_SCRV: // FONV
-            case ESM4::SUB_SCVR: // FONV
-            case ESM4::SUB_SLSD: // FONV
-            case ESM4::SUB_XSRF: // FONV
-            case ESM4::SUB_XSRD: // FONV
-            case ESM4::SUB_WMI1: // FONV
-            case ESM4::SUB_XLRL: // Unofficial Skyrim Patch
-            case ESM4::SUB_XASP: // FO4
-            case ESM4::SUB_XATP: // FO4
-            case ESM4::SUB_XBSD: // FO4
-            case ESM4::SUB_XCVR: // FO4
-            case ESM4::SUB_XCZR: // FO4
-            case ESM4::SUB_XLKT: // FO4
-            case ESM4::SUB_XLYR: // FO4
-            case ESM4::SUB_XMSP: // FO4
-            case ESM4::SUB_XPDD: // FO4
-            case ESM4::SUB_XPLK: // FO4
-            case ESM4::SUB_XRFG: // FO4
-            case ESM4::SUB_XWPG: // FO4
-            case ESM4::SUB_XWPN: // FO4
+            case ESM::fourCC("XPCI"): // formId
+            case ESM::fourCC("XLCM"):
+            case ESM::fourCC("ONAM"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("XPRM"):
+            case ESM::fourCC("INAM"):
+            case ESM::fourCC("PDTO"):
+            case ESM::fourCC("SCHR"):
+            case ESM::fourCC("SCTX"):
+            case ESM::fourCC("XAPD"):
+            case ESM::fourCC("XAPR"):
+            case ESM::fourCC("XCVL"):
+            case ESM::fourCC("XCZA"):
+            case ESM::fourCC("XCZC"):
+            case ESM::fourCC("XEZN"):
+            case ESM::fourCC("XFVC"):
+            case ESM::fourCC("XHTW"):
+            case ESM::fourCC("XIS2"):
+            case ESM::fourCC("XLCN"):
+            case ESM::fourCC("XLIB"):
+            case ESM::fourCC("XLKR"):
+            case ESM::fourCC("XLRM"):
+            case ESM::fourCC("XLRT"):
+            case ESM::fourCC("XLTW"):
+            case ESM::fourCC("XMBO"):
+            case ESM::fourCC("XMBP"):
+            case ESM::fourCC("XMBR"):
+            case ESM::fourCC("XNDP"):
+            case ESM::fourCC("XOCP"):
+            case ESM::fourCC("XPOD"):
+            case ESM::fourCC("XPTL"):
+            case ESM::fourCC("XPPA"):
+            case ESM::fourCC("XPRD"):
+            case ESM::fourCC("XPWR"):
+            case ESM::fourCC("XRMR"):
+            case ESM::fourCC("XSPC"):
+            case ESM::fourCC("XTNM"):
+            case ESM::fourCC("XTRI"):
+            case ESM::fourCC("XWCN"):
+            case ESM::fourCC("XWCU"):
+            case ESM::fourCC("XATR"):
+            case ESM::fourCC("XHLT"): // Unofficial Oblivion Patch
+            case ESM::fourCC("XCHG"): // thievery.exp
+            case ESM::fourCC("XHLP"): // FO3
+            case ESM::fourCC("XAMT"): // FO3
+            case ESM::fourCC("XAMC"): // FO3
+            case ESM::fourCC("XRAD"): // FO3
+            case ESM::fourCC("XIBS"): // FO3
+            case ESM::fourCC("XORD"): // FO3
+            case ESM::fourCC("XCLP"): // FO3
+            case ESM::fourCC("SCDA"): // FO3
+            case ESM::fourCC("RCLR"): // FO3
+            case ESM::fourCC("BNAM"): // FONV
+            case ESM::fourCC("MMRK"): // FONV
+            case ESM::fourCC("MNAM"): // FONV
+            case ESM::fourCC("NNAM"): // FONV
+            case ESM::fourCC("XATO"): // FONV
+            case ESM::fourCC("SCRV"): // FONV
+            case ESM::fourCC("SCVR"): // FONV
+            case ESM::fourCC("SLSD"): // FONV
+            case ESM::fourCC("XSRF"): // FONV
+            case ESM::fourCC("XSRD"): // FONV
+            case ESM::fourCC("WMI1"): // FONV
+            case ESM::fourCC("XLRL"): // Unofficial Skyrim Patch
+            case ESM::fourCC("XASP"): // FO4
+            case ESM::fourCC("XATP"): // FO4
+            case ESM::fourCC("XBSD"): // FO4
+            case ESM::fourCC("XCVR"): // FO4
+            case ESM::fourCC("XCZR"): // FO4
+            case ESM::fourCC("XLKT"): // FO4
+            case ESM::fourCC("XLYR"): // FO4
+            case ESM::fourCC("XMSP"): // FO4
+            case ESM::fourCC("XPDD"): // FO4
+            case ESM::fourCC("XPLK"): // FO4
+            case ESM::fourCC("XRFG"): // FO4
+            case ESM::fourCC("XWPG"): // FO4
+            case ESM::fourCC("XWPN"): // FO4
                 // if (mFormId == 0x0007e90f) // XPRM XPOD
                 // if (mBaseObj == 0x17) //XPRM XOCP occlusion plane data XMBO bound half extents
                 reader.skipSubRecordData();
diff --git a/components/esm4/loadrefr.hpp b/components/esm4/loadrefr.hpp
index af04a791c8..99826200c9 100644
--- a/components/esm4/loadrefr.hpp
+++ b/components/esm4/loadrefr.hpp
@@ -32,6 +32,7 @@
 #include "reference.hpp" // EnableParent
 
 #include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 #include <components/esm/refid.hpp>
 
 namespace ESM4
@@ -97,7 +98,7 @@ namespace ESM4
 
         EnableParent mEsp;
 
-        std::uint32_t mCount = 1; // only if > 1
+        std::int32_t mCount = 1; // only if > 1
 
         ESM::FormId mAudioLocation;
 
diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp
index 2f10ea22d8..c8cc9663d9 100644
--- a/components/esm4/loadregn.cpp
+++ b/components/esm4/loadregn.cpp
@@ -41,22 +41,22 @@ void ESM4::Region::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_RCLR:
+            case ESM::fourCC("RCLR"):
                 reader.get(mColour);
                 break;
-            case ESM4::SUB_WNAM:
+            case ESM::fourCC("WNAM"):
                 reader.getFormId(mWorldId);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mShader);
                 break;
-            case ESM4::SUB_RPLI:
+            case ESM::fourCC("RPLI"):
                 reader.get(mEdgeFalloff);
                 break;
-            case ESM4::SUB_RPLD:
+            case ESM::fourCC("RPLD"):
             {
                 mRPLD.resize(subHdr.dataSize / sizeof(std::uint32_t));
                 for (std::vector<std::uint32_t>::iterator it = mRPLD.begin(); it != mRPLD.end(); ++it)
@@ -71,10 +71,10 @@ void ESM4::Region::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_RDAT:
+            case ESM::fourCC("RDAT"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_RDMP:
+            case ESM::fourCC("RDMP"):
             {
                 if (mData.type != RDAT_Map)
                     throw std::runtime_error("REGN unexpected data type");
@@ -83,7 +83,7 @@ void ESM4::Region::load(ESM4::Reader& reader)
             }
             // FO3 only 2: DemoMegatonSound and DC01 (both 0 RDMD)
             // FONV none
-            case ESM4::SUB_RDMD: // music type; 0 default, 1 public, 2 dungeon
+            case ESM::fourCC("RDMD"): // music type; 0 default, 1 public, 2 dungeon
             {
 #if 0
                 int dummy;
@@ -94,14 +94,14 @@ void ESM4::Region::load(ESM4::Reader& reader)
 #endif
                 break;
             }
-            case ESM4::SUB_RDMO: // not seen in FO3/FONV?
+            case ESM::fourCC("RDMO"): // not seen in FO3/FONV?
             {
                 // std::cout << "REGN " << ESM::printName(subHdr.typeId) << " skipping..."
                 // << subHdr.dataSize << std::endl;
                 reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_RDSD: // Possibly the same as RDSA
+            case ESM::fourCC("RDSD"): // Possibly the same as RDSA
             {
                 if (mData.type != RDAT_Sound)
                     throw std::runtime_error(
@@ -114,16 +114,16 @@ void ESM4::Region::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_RDGS: // Only in Oblivion? (ToddTestRegion1) // formId
-            case ESM4::SUB_RDSA:
-            case ESM4::SUB_RDWT: // formId
-            case ESM4::SUB_RDOT: // formId
-            case ESM4::SUB_RDID: // FONV
-            case ESM4::SUB_RDSB: // FONV
-            case ESM4::SUB_RDSI: // FONV
-            case ESM4::SUB_NVMI: // TES5
-            case ESM4::SUB_ANAM: // FO4
-            case ESM4::SUB_RLDM: // FO4
+            case ESM::fourCC("RDGS"): // Only in Oblivion? (ToddTestRegion1) // formId
+            case ESM::fourCC("RDSA"):
+            case ESM::fourCC("RDWT"): // formId
+            case ESM::fourCC("RDOT"): // formId
+            case ESM::fourCC("RDID"): // FONV
+            case ESM::fourCC("RDSB"): // FONV
+            case ESM::fourCC("RDSI"): // FONV
+            case ESM::fourCC("NVMI"): // TES5
+            case ESM::fourCC("ANAM"): // FO4
+            case ESM::fourCC("RLDM"): // FO4
                 // RDAT skipping... following is a map
                 // RDMP skipping... map name
                 //
diff --git a/components/esm4/loadroad.cpp b/components/esm4/loadroad.cpp
index 8a33ab1c1d..71a7b55196 100644
--- a/components/esm4/loadroad.cpp
+++ b/components/esm4/loadroad.cpp
@@ -45,7 +45,7 @@ void ESM4::Road::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_PGRP:
+            case ESM::fourCC("PGRP"):
             {
                 std::size_t numNodes = subHdr.dataSize / sizeof(PGRP);
 
@@ -57,10 +57,10 @@ void ESM4::Road::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_PGRR:
+            case ESM::fourCC("PGRR"):
             {
-                static PGRR link;
-                static RDRP linkPt;
+                PGRR link;
+                RDRP linkPt;
 
                 for (std::size_t i = 0; i < mNodes.size(); ++i)
                 {
diff --git a/components/esm4/loadsbsp.cpp b/components/esm4/loadsbsp.cpp
index a874331dab..c9450492b8 100644
--- a/components/esm4/loadsbsp.cpp
+++ b/components/esm4/loadsbsp.cpp
@@ -41,10 +41,10 @@ void ESM4::SubSpace::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_DNAM:
+            case ESM::fourCC("DNAM"):
             {
                 reader.get(mDimension.x);
                 reader.get(mDimension.y);
diff --git a/components/esm4/loadscol.cpp b/components/esm4/loadscol.cpp
index dea900fe17..8748f24f07 100644
--- a/components/esm4/loadscol.cpp
+++ b/components/esm4/loadscol.cpp
@@ -43,22 +43,24 @@ void ESM4::StaticCollection::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_MODL: // Model data start
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_ONAM:
-            case ESM4::SUB_DATA:
-            case ESM4::SUB_FLTR: // FO4
-            case ESM4::SUB_PTRN: // FO4
+            case ESM::fourCC("MODL"): // Model data start
+                reader.getZString(mModel);
+                break;
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("ONAM"):
+            case ESM::fourCC("DATA"):
+            case ESM::fourCC("FLTR"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadscol.hpp b/components/esm4/loadscol.hpp
index f3ae3a622e..88ceb6ed1e 100644
--- a/components/esm4/loadscol.hpp
+++ b/components/esm4/loadscol.hpp
@@ -47,6 +47,7 @@ namespace ESM4
 
         std::string mEditorId;
         std::string mFullName;
+        std::string mModel;
 
         void load(ESM4::Reader& reader);
         // void save(ESM4::Writer& writer) const;
diff --git a/components/esm4/loadscpt.cpp b/components/esm4/loadscpt.cpp
index b4071ed21d..dbc75b75d6 100644
--- a/components/esm4/loadscpt.cpp
+++ b/components/esm4/loadscpt.cpp
@@ -36,19 +36,17 @@ void ESM4::Script::load(ESM4::Reader& reader)
     mId = reader.getFormIdFromHeader();
     mFlags = reader.hdr().record.flags;
 
-    static ScriptLocalVariableData localVar;
-
     while (reader.getSubRecordHeader())
     {
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
             {
                 reader.getZString(mEditorId);
                 break;
             }
-            case ESM4::SUB_SCHR:
+            case ESM::fourCC("SCHR"):
             {
                 // For debugging only
 #if 0
@@ -73,12 +71,12 @@ void ESM4::Script::load(ESM4::Reader& reader)
 #endif
                 break;
             }
-            case ESM4::SUB_SCTX:
+            case ESM::fourCC("SCTX"):
                 reader.getString(mScript.scriptSource);
                 // if (mEditorId == "CTrapLogs01SCRIPT")
                 // std::cout << mScript.scriptSource << std::endl;
                 break;
-            case ESM4::SUB_SCDA: // compiled script data
+            case ESM::fourCC("SCDA"): // compiled script data
             {
                 // For debugging only
 #if 0
@@ -112,27 +110,31 @@ void ESM4::Script::load(ESM4::Reader& reader)
 #endif
                 break;
             }
-            case ESM4::SUB_SCRO:
+            case ESM::fourCC("SCRO"):
                 reader.getFormId(mScript.globReference);
                 break;
-            case ESM4::SUB_SLSD:
+            case ESM::fourCC("SLSD"):
             {
-                localVar.clear();
+                ScriptLocalVariableData localVar;
                 reader.get(localVar.index);
                 reader.get(localVar.unknown1);
                 reader.get(localVar.unknown2);
                 reader.get(localVar.unknown3);
                 reader.get(localVar.type);
                 reader.get(localVar.unknown4);
+                mScript.localVarData.push_back(std::move(localVar));
                 // WARN: assumes SCVR will follow immediately
 
                 break;
             }
-            case ESM4::SUB_SCVR: // assumed always pair with SLSD
-                reader.getZString(localVar.variableName);
-                mScript.localVarData.push_back(localVar);
+            case ESM::fourCC("SCVR"): // assumed always pair with SLSD
+                if (!mScript.localVarData.empty())
+                    reader.getZString(mScript.localVarData.back().variableName);
+                else
+                    reader.skipSubRecordData();
+
                 break;
-            case ESM4::SUB_SCRV:
+            case ESM::fourCC("SCRV"):
             {
                 std::uint32_t index;
                 reader.get(index);
diff --git a/components/esm4/loadscrl.cpp b/components/esm4/loadscrl.cpp
index 954ddf4e36..f88854f8db 100644
--- a/components/esm4/loadscrl.cpp
+++ b/components/esm4/loadscrl.cpp
@@ -41,40 +41,40 @@ void ESM4::Scroll::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mText);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData.value);
                 reader.get(mData.weight);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            // case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_CTDA:
-            case ESM4::SUB_EFID:
-            case ESM4::SUB_EFIT:
-            case ESM4::SUB_ETYP:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_MDOB:
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_SPIT:
-            case ESM4::SUB_CIS2:
+            // case ESM::fourCC("MODB"): reader.get(mBoundRadius);  break;
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("CTDA"):
+            case ESM::fourCC("EFID"):
+            case ESM::fourCC("EFIT"):
+            case ESM::fourCC("ETYP"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("MDOB"):
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("SPIT"):
+            case ESM::fourCC("CIS2"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadsgst.cpp b/components/esm4/loadsgst.cpp
index c4284eb9bc..d93709f537 100644
--- a/components/esm4/loadsgst.cpp
+++ b/components/esm4/loadsgst.cpp
@@ -42,10 +42,10 @@ void ESM4::SigilStone::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
             {
                 if (mFullName.empty())
                 {
@@ -62,34 +62,34 @@ void ESM4::SigilStone::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 reader.get(mData.uses);
                 reader.get(mData.value);
                 reader.get(mData.weight);
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_SCIT:
+            case ESM::fourCC("SCIT"):
             {
                 reader.get(mEffect);
                 reader.adjustFormId(mEffect.formId);
                 break;
             }
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_EFID:
-            case ESM4::SUB_EFIT:
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("EFID"):
+            case ESM::fourCC("EFIT"):
             {
                 reader.skipSubRecordData();
                 break;
diff --git a/components/esm4/loadslgm.cpp b/components/esm4/loadslgm.cpp
index 635b73312e..cb16f36857 100644
--- a/components/esm4/loadslgm.cpp
+++ b/components/esm4/loadslgm.cpp
@@ -41,38 +41,38 @@ void ESM4::SoulGem::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_SOUL:
+            case ESM::fourCC("SOUL"):
                 reader.get(mSoul);
                 break;
-            case ESM4::SUB_SLCP:
+            case ESM::fourCC("SLCP"):
                 reader.get(mSoulCapacity);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_NAM0:
-            case ESM4::SUB_OBND:
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("NAM0"):
+            case ESM::fourCC("OBND"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadsndr.cpp b/components/esm4/loadsndr.cpp
index 830cdfdc54..21ed9f93e4 100644
--- a/components/esm4/loadsndr.cpp
+++ b/components/esm4/loadsndr.cpp
@@ -41,10 +41,10 @@ void ESM4::SoundReference::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_CTDA:
+            case ESM::fourCC("CTDA"):
                 reader.get(&mTargetCondition, 20);
                 reader.get(mTargetCondition.runOn);
                 reader.get(mTargetCondition.reference);
@@ -52,22 +52,22 @@ void ESM4::SoundReference::load(ESM4::Reader& reader)
                     reader.adjustFormId(mTargetCondition.reference);
                 reader.skipSubRecordData(4); // unknown
                 break;
-            case ESM4::SUB_GNAM:
+            case ESM::fourCC("GNAM"):
                 reader.getFormId(mSoundCategory);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mSoundId);
                 break;
-            case ESM4::SUB_ONAM:
+            case ESM::fourCC("ONAM"):
                 reader.getFormId(mOutputModel);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.getZString(mSoundFile);
                 break;
-            case ESM4::SUB_LNAM:
+            case ESM::fourCC("LNAM"):
                 reader.get(mLoopInfo);
                 break;
-            case ESM4::SUB_BNAM:
+            case ESM::fourCC("BNAM"):
             {
                 if (subHdr.dataSize == 6)
                     reader.get(mData);
@@ -77,16 +77,16 @@ void ESM4::SoundReference::load(ESM4::Reader& reader)
                     reader.skipSubRecordData();
                 break;
             }
-            case ESM4::SUB_CIS1:
-            case ESM4::SUB_CIS2:
-            case ESM4::SUB_CNAM: // CRC32 hash
-            case ESM4::SUB_DNAM: // FO4
-            case ESM4::SUB_FNAM: // unknown
-            case ESM4::SUB_INTV: // FO4
-            case ESM4::SUB_ITMC: // FO4
-            case ESM4::SUB_ITME: // FO4
-            case ESM4::SUB_ITMS: // FO4
-            case ESM4::SUB_NNAM: // FO4
+            case ESM::fourCC("CIS1"):
+            case ESM::fourCC("CIS2"):
+            case ESM::fourCC("CNAM"): // CRC32 hash
+            case ESM::fourCC("DNAM"): // FO4
+            case ESM::fourCC("FNAM"): // unknown
+            case ESM::fourCC("INTV"): // FO4
+            case ESM::fourCC("ITMC"): // FO4
+            case ESM::fourCC("ITME"): // FO4
+            case ESM::fourCC("ITMS"): // FO4
+            case ESM::fourCC("NNAM"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadsoun.cpp b/components/esm4/loadsoun.cpp
index a5ae005fe2..4fc3b6609f 100644
--- a/components/esm4/loadsoun.cpp
+++ b/components/esm4/loadsoun.cpp
@@ -41,16 +41,16 @@ void ESM4::Sound::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FNAM:
+            case ESM::fourCC("FNAM"):
                 reader.getZString(mSoundFile);
                 break;
-            case ESM4::SUB_SNDX:
+            case ESM::fourCC("SNDX"):
                 reader.get(mData);
                 break;
-            case ESM4::SUB_SNDD:
+            case ESM::fourCC("SNDD"):
                 if (subHdr.dataSize == 8)
                     reader.get(&mData, 8);
                 else
@@ -59,13 +59,13 @@ void ESM4::Sound::load(ESM4::Reader& reader)
                     reader.get(mExtra);
                 }
                 break;
-            case ESM4::SUB_OBND: // TES5 only
-            case ESM4::SUB_SDSC: // TES5 only
-            case ESM4::SUB_ANAM: // FO3
-            case ESM4::SUB_GNAM: // FO3
-            case ESM4::SUB_HNAM: // FO3
-            case ESM4::SUB_RNAM: // FONV
-            case ESM4::SUB_REPT: // FO4
+            case ESM::fourCC("OBND"): // TES5 only
+            case ESM::fourCC("SDSC"): // TES5 only
+            case ESM::fourCC("ANAM"): // FO3
+            case ESM::fourCC("GNAM"): // FO3
+            case ESM::fourCC("HNAM"): // FO3
+            case ESM::fourCC("RNAM"): // FONV
+            case ESM::fourCC("REPT"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp
index e3b51633cf..9d85374ae4 100644
--- a/components/esm4/loadstat.cpp
+++ b/components/esm4/loadstat.cpp
@@ -41,19 +41,19 @@ void ESM4::Static::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT:
+            case ESM::fourCC("MODT"):
             {
                 // version is only availabe in TES5 (seems to be 27 or 28?)
                 // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
@@ -72,7 +72,7 @@ void ESM4::Static::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_MNAM:
+            case ESM::fourCC("MNAM"):
             {
                 for (std::string& level : mLOD)
                 {
@@ -84,18 +84,18 @@ void ESM4::Static::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_MODC: // More model data
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_DNAM:
-            case ESM4::SUB_BRUS: // FONV
-            case ESM4::SUB_RNAM: // FONV
-            case ESM4::SUB_FTYP: // FO4
-            case ESM4::SUB_NVNM: // FO4
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_VMAD: // FO4
+            case ESM::fourCC("MODC"): // More model data
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("DNAM"):
+            case ESM::fourCC("BRUS"): // FONV
+            case ESM::fourCC("RNAM"): // FONV
+            case ESM::fourCC("FTYP"): // FO4
+            case ESM::fourCC("NVNM"): // FO4
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("VMAD"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadtact.cpp b/components/esm4/loadtact.cpp
index ad5efb9fbf..453df85504 100644
--- a/components/esm4/loadtact.cpp
+++ b/components/esm4/loadtact.cpp
@@ -41,44 +41,44 @@ void ESM4::TalkingActivator::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_VNAM:
+            case ESM::fourCC("VNAM"):
                 reader.getFormId(mVoiceType);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getFormId(mLoopSound);
                 break;
-            case ESM4::SUB_INAM:
+            case ESM::fourCC("INAM"):
                 reader.getFormId(mRadioTemplate);
                 break; // FONV
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_FNAM:
-            case ESM4::SUB_PNAM:
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_VMAD:
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("FNAM"):
+            case ESM::fourCC("PNAM"):
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("VMAD"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadterm.cpp b/components/esm4/loadterm.cpp
index 39f26391e8..1fb8ef117d 100644
--- a/components/esm4/loadterm.cpp
+++ b/components/esm4/loadterm.cpp
@@ -41,73 +41,73 @@ void ESM4::Terminal::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mText);
                 break;
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_PNAM:
+            case ESM::fourCC("PNAM"):
                 reader.getFormId(mPasswordNote);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 if (subHdr.dataSize == 4)
                     reader.getFormId(mSound);
                 // FIXME: FO4 sound marker params
                 else
                     reader.skipSubRecordData();
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_RNAM:
+            case ESM::fourCC("RNAM"):
                 reader.getZString(mResultText);
                 break;
-            case ESM4::SUB_DNAM: // difficulty
-            case ESM4::SUB_ANAM: // flags
-            case ESM4::SUB_CTDA:
-            case ESM4::SUB_CIS1:
-            case ESM4::SUB_CIS2:
-            case ESM4::SUB_INAM:
-            case ESM4::SUB_ITXT: // Menu Item
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_SCDA:
-            case ESM4::SUB_SCHR:
-            case ESM4::SUB_SCRO:
-            case ESM4::SUB_SCRV:
-            case ESM4::SUB_SCTX:
-            case ESM4::SUB_SCVR:
-            case ESM4::SUB_SLSD:
-            case ESM4::SUB_TNAM:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_BSIZ: // FO4
-            case ESM4::SUB_BTXT: // FO4
-            case ESM4::SUB_COCT: // FO4
-            case ESM4::SUB_CNTO: // FO4
-            case ESM4::SUB_FNAM: // FO4
-            case ESM4::SUB_ISIZ: // FO4
-            case ESM4::SUB_ITID: // FO4
-            case ESM4::SUB_MNAM: // FO4
-            case ESM4::SUB_NAM0: // FO4
-            case ESM4::SUB_PRPS: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_UNAM: // FO4
-            case ESM4::SUB_VNAM: // FO4
-            case ESM4::SUB_WBDT: // FO4
-            case ESM4::SUB_WNAM: // FO4
-            case ESM4::SUB_XMRK: // FO4
+            case ESM::fourCC("DNAM"): // difficulty
+            case ESM::fourCC("ANAM"): // flags
+            case ESM::fourCC("CTDA"):
+            case ESM::fourCC("CIS1"):
+            case ESM::fourCC("CIS2"):
+            case ESM::fourCC("INAM"):
+            case ESM::fourCC("ITXT"): // Menu Item
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("SCDA"):
+            case ESM::fourCC("SCHR"):
+            case ESM::fourCC("SCRO"):
+            case ESM::fourCC("SCRV"):
+            case ESM::fourCC("SCTX"):
+            case ESM::fourCC("SCVR"):
+            case ESM::fourCC("SLSD"):
+            case ESM::fourCC("TNAM"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("BSIZ"): // FO4
+            case ESM::fourCC("BTXT"): // FO4
+            case ESM::fourCC("COCT"): // FO4
+            case ESM::fourCC("CNTO"): // FO4
+            case ESM::fourCC("FNAM"): // FO4
+            case ESM::fourCC("ISIZ"): // FO4
+            case ESM::fourCC("ITID"): // FO4
+            case ESM::fourCC("MNAM"): // FO4
+            case ESM::fourCC("NAM0"): // FO4
+            case ESM::fourCC("PRPS"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("UNAM"): // FO4
+            case ESM::fourCC("VNAM"): // FO4
+            case ESM::fourCC("WBDT"): // FO4
+            case ESM::fourCC("WNAM"): // FO4
+            case ESM::fourCC("XMRK"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp
index a2fbe8b139..19db9b9d09 100644
--- a/components/esm4/loadtes4.cpp
+++ b/components/esm4/loadtes4.cpp
@@ -41,7 +41,7 @@ void ESM4::Header::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_HEDR:
+            case ESM::fourCC("HEDR"):
             {
                 if (!reader.getExact(mData.version) || !reader.getExact(mData.records)
                     || !reader.getExact(mData.nextObjectId))
@@ -51,13 +51,13 @@ void ESM4::Header::load(ESM4::Reader& reader)
                     throw std::runtime_error("TES4 HEDR data size mismatch");
                 break;
             }
-            case ESM4::SUB_CNAM:
+            case ESM::fourCC("CNAM"):
                 reader.getZString(mAuthor);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.getZString(mDesc);
                 break;
-            case ESM4::SUB_MAST: // multiple
+            case ESM::fourCC("MAST"): // multiple
             {
                 ESM::MasterData m;
                 if (!reader.getZString(m.name))
@@ -68,7 +68,7 @@ void ESM4::Header::load(ESM4::Reader& reader)
                 mMaster.push_back(m);
                 break;
             }
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 if (mMaster.empty())
                     throw std::runtime_error(
@@ -78,7 +78,7 @@ void ESM4::Header::load(ESM4::Reader& reader)
                     throw std::runtime_error("TES4 DATA data read error");
                 break;
             }
-            case ESM4::SUB_ONAM:
+            case ESM::fourCC("ONAM"):
             {
                 mOverrides.resize(subHdr.dataSize / sizeof(ESM::FormId32));
                 for (ESM::FormId& mOverride : mOverrides)
@@ -95,11 +95,12 @@ void ESM4::Header::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_INTV:
-            case ESM4::SUB_INCC:
-            case ESM4::SUB_OFST: // Oblivion only?
-            case ESM4::SUB_DELE: // Oblivion only?
-            case ESM4::SUB_TNAM: // Fallout 4 (CK only)
+            case ESM::fourCC("INTV"):
+            case ESM::fourCC("INCC"):
+            case ESM::fourCC("OFST"): // Oblivion only?
+            case ESM::fourCC("DELE"): // Oblivion only?
+            case ESM::fourCC("TNAM"): // Fallout 4 (CK only)
+            case ESM::fourCC("MMSB"): // Fallout 76
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadtree.cpp b/components/esm4/loadtree.cpp
index 9290ae79c4..c433f11564 100644
--- a/components/esm4/loadtree.cpp
+++ b/components/esm4/loadtree.cpp
@@ -41,29 +41,29 @@ void ESM4::Tree::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mLeafTexture);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_CNAM:
-            case ESM4::SUB_BNAM:
-            case ESM4::SUB_SNAM:
-            case ESM4::SUB_FULL:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_PFIG:
-            case ESM4::SUB_PFPC:
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("CNAM"):
+            case ESM::fourCC("BNAM"):
+            case ESM::fourCC("SNAM"):
+            case ESM::fourCC("FULL"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("PFIG"):
+            case ESM::fourCC("PFPC"):
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadtxst.cpp b/components/esm4/loadtxst.cpp
index 3f1aebafb4..69d48cc049 100644
--- a/components/esm4/loadtxst.cpp
+++ b/components/esm4/loadtxst.cpp
@@ -41,39 +41,58 @@ void ESM4::TextureSet::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_TX00:
+            case ESM::fourCC("FLTR"): // FO76
+                reader.getZString(mFilter);
+                break;
+            case ESM::fourCC("TX00"):
                 reader.getZString(mDiffuse);
                 break;
-            case ESM4::SUB_TX01:
+            case ESM::fourCC("TX01"):
                 reader.getZString(mNormalMap);
                 break;
-            case ESM4::SUB_TX02:
+            case ESM::fourCC("TX02"):
+                // This is a "wrinkle map" in FO4/76
                 reader.getZString(mEnvMask);
                 break;
-            case ESM4::SUB_TX03:
+            case ESM::fourCC("TX03"):
+                // This is a glow map in FO4/76
                 reader.getZString(mToneMap);
                 break;
-            case ESM4::SUB_TX04:
+            case ESM::fourCC("TX04"):
+                // This is a height map in FO4/76
                 reader.getZString(mDetailMap);
                 break;
-            case ESM4::SUB_TX05:
+            case ESM::fourCC("TX05"):
                 reader.getZString(mEnvMap);
                 break;
-            case ESM4::SUB_TX06:
-                reader.getZString(mUnknown);
+            case ESM::fourCC("TX06"):
+                reader.getZString(mMultiLayer);
                 break;
-            case ESM4::SUB_TX07:
+            case ESM::fourCC("TX07"):
+                // This is a "smooth specular" map in FO4/76
                 reader.getZString(mSpecular);
                 break;
-            case ESM4::SUB_MNAM:
+            case ESM::fourCC("TX08"): // FO76
+                reader.getZString(mSpecular);
+                break;
+            case ESM::fourCC("TX09"): // FO76
+                reader.getZString(mLighting);
+                break;
+            case ESM::fourCC("TX10"): // FO76
+                reader.getZString(mFlow);
+                break;
+            case ESM::fourCC("DNAM"):
+                reader.get(mDataFlags);
+                break;
+            case ESM::fourCC("MNAM"):
                 reader.getZString(mMaterial);
                 break;
-            case ESM4::SUB_DNAM:
-            case ESM4::SUB_DODT:
-            case ESM4::SUB_OBND: // object bounds
+            case ESM::fourCC("DODT"): // Decal data
+            case ESM::fourCC("OBND"): // object bounds
+            case ESM::fourCC("OPDS"): // Object placement defaults, FO76
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadtxst.hpp b/components/esm4/loadtxst.hpp
index 0b55f37f8c..8e628df841 100644
--- a/components/esm4/loadtxst.hpp
+++ b/components/esm4/loadtxst.hpp
@@ -44,6 +44,7 @@ namespace ESM4
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
         std::string mEditorId;
+        std::string mFilter;
 
         std::string mDiffuse; // includes alpha info
         std::string mNormalMap; // includes specular info (alpha channel)
@@ -51,8 +52,12 @@ namespace ESM4
         std::string mToneMap;
         std::string mDetailMap;
         std::string mEnvMap;
-        std::string mUnknown;
+        std::string mMultiLayer;
         std::string mSpecular;
+        std::string mSmoothSpecular;
+        std::string mLighting;
+        std::string mFlow;
+        std::uint16_t mDataFlags;
         std::string mMaterial;
 
         void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadweap.cpp b/components/esm4/loadweap.cpp
index 2b80305690..81b0d4286a 100644
--- a/components/esm4/loadweap.cpp
+++ b/components/esm4/loadweap.cpp
@@ -43,13 +43,13 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
             {
                 // if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
                 if (subHdr.dataSize == 10) // FO3 has 15 bytes even though VER_094
@@ -79,126 +79,126 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
                 }
                 break;
             }
-            case ESM4::SUB_MODL:
+            case ESM::fourCC("MODL"):
                 reader.getZString(mModel);
                 break;
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mIcon);
                 break;
-            case ESM4::SUB_MICO:
+            case ESM::fourCC("MICO"):
                 reader.getZString(mMiniIcon);
                 break; // FO3
-            case ESM4::SUB_SCRI:
+            case ESM::fourCC("SCRI"):
                 reader.getFormId(mScriptId);
                 break;
-            case ESM4::SUB_ANAM:
+            case ESM::fourCC("ANAM"):
                 reader.get(mEnchantmentPoints);
                 break;
-            case ESM4::SUB_ENAM:
+            case ESM::fourCC("ENAM"):
                 reader.getFormId(mEnchantment);
                 break;
-            case ESM4::SUB_MODB:
+            case ESM::fourCC("MODB"):
                 reader.get(mBoundRadius);
                 break;
-            case ESM4::SUB_DESC:
+            case ESM::fourCC("DESC"):
                 reader.getLocalizedString(mText);
                 break;
-            case ESM4::SUB_YNAM:
+            case ESM::fourCC("YNAM"):
                 reader.getFormId(mPickUpSound);
                 break;
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mDropSound);
                 break;
-            case ESM4::SUB_MODT: // Model data
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_BAMT:
-            case ESM4::SUB_BIDS:
-            case ESM4::SUB_INAM:
-            case ESM4::SUB_CNAM:
-            case ESM4::SUB_CRDT:
-            case ESM4::SUB_DNAM:
-            case ESM4::SUB_EAMT:
-            case ESM4::SUB_EITM:
-            case ESM4::SUB_ETYP:
-            case ESM4::SUB_KSIZ:
-            case ESM4::SUB_KWDA:
-            case ESM4::SUB_NAM8:
-            case ESM4::SUB_NAM9:
-            case ESM4::SUB_OBND:
-            case ESM4::SUB_SNAM:
-            case ESM4::SUB_TNAM:
-            case ESM4::SUB_UNAM:
-            case ESM4::SUB_VMAD:
-            case ESM4::SUB_VNAM:
-            case ESM4::SUB_WNAM:
-            case ESM4::SUB_XNAM: // Dawnguard only?
-            case ESM4::SUB_NNAM:
-            case ESM4::SUB_NAM0: // FO3
-            case ESM4::SUB_REPL: // FO3
-            case ESM4::SUB_MOD2: // FO3
-            case ESM4::SUB_MO2T: // FO3
-            case ESM4::SUB_MO2S: // FO3
-            case ESM4::SUB_NAM6: // FO3
-            case ESM4::SUB_MOD4: // First person model data
-            case ESM4::SUB_MO4T:
-            case ESM4::SUB_MO4S:
-            case ESM4::SUB_MO4C:
-            case ESM4::SUB_MO4F: // First person model data end
-            case ESM4::SUB_BIPL: // FO3
-            case ESM4::SUB_NAM7: // FO3
-            case ESM4::SUB_MOD3: // FO3
-            case ESM4::SUB_MO3T: // FO3
-            case ESM4::SUB_MO3S: // FO3
-            case ESM4::SUB_MODD: // FO3
-                                 // case ESM4::SUB_MOSD: // FO3
-            case ESM4::SUB_DAMC: // Destructible
-            case ESM4::SUB_DEST:
-            case ESM4::SUB_DMDC:
-            case ESM4::SUB_DMDL:
-            case ESM4::SUB_DMDT:
-            case ESM4::SUB_DMDS:
-            case ESM4::SUB_DSTA:
-            case ESM4::SUB_DSTD:
-            case ESM4::SUB_DSTF: // Destructible end
-            case ESM4::SUB_VATS: // FONV
-            case ESM4::SUB_VANM: // FONV
-            case ESM4::SUB_MWD1: // FONV
-            case ESM4::SUB_MWD2: // FONV
-            case ESM4::SUB_MWD3: // FONV
-            case ESM4::SUB_MWD4: // FONV
-            case ESM4::SUB_MWD5: // FONV
-            case ESM4::SUB_MWD6: // FONV
-            case ESM4::SUB_MWD7: // FONV
-            case ESM4::SUB_WMI1: // FONV
-            case ESM4::SUB_WMI2: // FONV
-            case ESM4::SUB_WMI3: // FONV
-            case ESM4::SUB_WMS1: // FONV
-            case ESM4::SUB_WMS2: // FONV
-            case ESM4::SUB_WNM1: // FONV
-            case ESM4::SUB_WNM2: // FONV
-            case ESM4::SUB_WNM3: // FONV
-            case ESM4::SUB_WNM4: // FONV
-            case ESM4::SUB_WNM5: // FONV
-            case ESM4::SUB_WNM6: // FONV
-            case ESM4::SUB_WNM7: // FONV
-            case ESM4::SUB_EFSD: // FONV DeadMoney
-            case ESM4::SUB_APPR: // FO4
-            case ESM4::SUB_DAMA: // FO4
-            case ESM4::SUB_FLTR: // FO4
-            case ESM4::SUB_FNAM: // FO4
-            case ESM4::SUB_INRD: // FO4
-            case ESM4::SUB_LNAM: // FO4
-            case ESM4::SUB_MASE: // FO4
-            case ESM4::SUB_PTRN: // FO4
-            case ESM4::SUB_STCP: // FO4
-            case ESM4::SUB_WAMD: // FO4
-            case ESM4::SUB_WZMD: // FO4
-            case ESM4::SUB_OBTE: // FO4 object template start
-            case ESM4::SUB_OBTF:
-            case ESM4::SUB_OBTS:
-            case ESM4::SUB_STOP: // FO4 object template end
+            case ESM::fourCC("MODT"): // Model data
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("BAMT"):
+            case ESM::fourCC("BIDS"):
+            case ESM::fourCC("INAM"):
+            case ESM::fourCC("CNAM"):
+            case ESM::fourCC("CRDT"):
+            case ESM::fourCC("DNAM"):
+            case ESM::fourCC("EAMT"):
+            case ESM::fourCC("EITM"):
+            case ESM::fourCC("ETYP"):
+            case ESM::fourCC("KSIZ"):
+            case ESM::fourCC("KWDA"):
+            case ESM::fourCC("NAM8"):
+            case ESM::fourCC("NAM9"):
+            case ESM::fourCC("OBND"):
+            case ESM::fourCC("SNAM"):
+            case ESM::fourCC("TNAM"):
+            case ESM::fourCC("UNAM"):
+            case ESM::fourCC("VMAD"):
+            case ESM::fourCC("VNAM"):
+            case ESM::fourCC("WNAM"):
+            case ESM::fourCC("XNAM"): // Dawnguard only?
+            case ESM::fourCC("NNAM"):
+            case ESM::fourCC("NAM0"): // FO3
+            case ESM::fourCC("REPL"): // FO3
+            case ESM::fourCC("MOD2"): // FO3
+            case ESM::fourCC("MO2T"): // FO3
+            case ESM::fourCC("MO2S"): // FO3
+            case ESM::fourCC("NAM6"): // FO3
+            case ESM::fourCC("MOD4"): // First person model data
+            case ESM::fourCC("MO4T"):
+            case ESM::fourCC("MO4S"):
+            case ESM::fourCC("MO4C"):
+            case ESM::fourCC("MO4F"): // First person model data end
+            case ESM::fourCC("BIPL"): // FO3
+            case ESM::fourCC("NAM7"): // FO3
+            case ESM::fourCC("MOD3"): // FO3
+            case ESM::fourCC("MO3T"): // FO3
+            case ESM::fourCC("MO3S"): // FO3
+            case ESM::fourCC("MODD"): // FO3
+                                      // case ESM::fourCC("MOSD"): // FO3
+            case ESM::fourCC("DAMC"): // Destructible
+            case ESM::fourCC("DEST"):
+            case ESM::fourCC("DMDC"):
+            case ESM::fourCC("DMDL"):
+            case ESM::fourCC("DMDT"):
+            case ESM::fourCC("DMDS"):
+            case ESM::fourCC("DSTA"):
+            case ESM::fourCC("DSTD"):
+            case ESM::fourCC("DSTF"): // Destructible end
+            case ESM::fourCC("VATS"): // FONV
+            case ESM::fourCC("VANM"): // FONV
+            case ESM::fourCC("MWD1"): // FONV
+            case ESM::fourCC("MWD2"): // FONV
+            case ESM::fourCC("MWD3"): // FONV
+            case ESM::fourCC("MWD4"): // FONV
+            case ESM::fourCC("MWD5"): // FONV
+            case ESM::fourCC("MWD6"): // FONV
+            case ESM::fourCC("MWD7"): // FONV
+            case ESM::fourCC("WMI1"): // FONV
+            case ESM::fourCC("WMI2"): // FONV
+            case ESM::fourCC("WMI3"): // FONV
+            case ESM::fourCC("WMS1"): // FONV
+            case ESM::fourCC("WMS2"): // FONV
+            case ESM::fourCC("WNM1"): // FONV
+            case ESM::fourCC("WNM2"): // FONV
+            case ESM::fourCC("WNM3"): // FONV
+            case ESM::fourCC("WNM4"): // FONV
+            case ESM::fourCC("WNM5"): // FONV
+            case ESM::fourCC("WNM6"): // FONV
+            case ESM::fourCC("WNM7"): // FONV
+            case ESM::fourCC("EFSD"): // FONV DeadMoney
+            case ESM::fourCC("APPR"): // FO4
+            case ESM::fourCC("DAMA"): // FO4
+            case ESM::fourCC("FLTR"): // FO4
+            case ESM::fourCC("FNAM"): // FO4
+            case ESM::fourCC("INRD"): // FO4
+            case ESM::fourCC("LNAM"): // FO4
+            case ESM::fourCC("MASE"): // FO4
+            case ESM::fourCC("PTRN"): // FO4
+            case ESM::fourCC("STCP"): // FO4
+            case ESM::fourCC("WAMD"): // FO4
+            case ESM::fourCC("WZMD"): // FO4
+            case ESM::fourCC("OBTE"): // FO4 object template start
+            case ESM::fourCC("OBTF"):
+            case ESM::fourCC("OBTS"):
+            case ESM::fourCC("STOP"): // FO4 object template end
                 reader.skipSubRecordData();
                 break;
             default:
diff --git a/components/esm4/loadwrld.cpp b/components/esm4/loadwrld.cpp
index c0a3044437..d9bae15385 100644
--- a/components/esm4/loadwrld.cpp
+++ b/components/esm4/loadwrld.cpp
@@ -56,46 +56,46 @@ void ESM4::World::load(ESM4::Reader& reader)
         const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
         switch (subHdr.typeId)
         {
-            case ESM4::SUB_EDID:
+            case ESM::fourCC("EDID"):
                 reader.getZString(mEditorId);
                 break;
-            case ESM4::SUB_FULL:
+            case ESM::fourCC("FULL"):
                 reader.getLocalizedString(mFullName);
                 break;
-            case ESM4::SUB_WCTR: // TES5+
+            case ESM::fourCC("WCTR"): // TES5+
                 reader.get(mCenterCell);
                 break;
-            case ESM4::SUB_WNAM:
+            case ESM::fourCC("WNAM"):
                 reader.getFormId(mParent);
                 break;
-            case ESM4::SUB_SNAM:
+            case ESM::fourCC("SNAM"):
                 reader.get(mSound);
                 break; // sound, Oblivion only?
-            case ESM4::SUB_ICON:
+            case ESM::fourCC("ICON"):
                 reader.getZString(mMapFile);
                 break;
-            case ESM4::SUB_CNAM:
+            case ESM::fourCC("CNAM"):
                 reader.getFormId(mClimate);
                 break;
-            case ESM4::SUB_NAM2:
+            case ESM::fourCC("NAM2"):
                 reader.getFormId(mWater);
                 break;
-            case ESM4::SUB_NAM0:
+            case ESM::fourCC("NAM0"):
             {
                 reader.get(mMinX);
                 reader.get(mMinY);
                 break;
             }
-            case ESM4::SUB_NAM9:
+            case ESM::fourCC("NAM9"):
             {
                 reader.get(mMaxX);
                 reader.get(mMaxY);
                 break;
             }
-            case ESM4::SUB_DATA:
+            case ESM::fourCC("DATA"):
                 reader.get(mWorldFlags);
                 break;
-            case ESM4::SUB_MNAM:
+            case ESM::fourCC("MNAM"):
             {
                 reader.get(mMap.width);
                 reader.get(mMap.height);
@@ -113,7 +113,7 @@ void ESM4::World::load(ESM4::Reader& reader)
 
                 break;
             }
-            case ESM4::SUB_DNAM: // defaults
+            case ESM::fourCC("DNAM"): // defaults
             {
                 reader.get(mLandLevel); //  -2700.f for TES5
                 reader.get(mWaterLevel); // -14000.f for TES5
@@ -135,37 +135,37 @@ void ESM4::World::load(ESM4::Reader& reader)
             // 00119D2E freeside\freeside_01.mp3 0012D94D FreesideNorthWorld (Freeside)
             // 00119D2E freeside\freeside_01.mp3 0012D94E FreesideFortWorld (Old Mormon Fort)
             // NOTE: FONV DefaultObjectManager has 00090908 "explore" as the default music
-            case ESM4::SUB_ZNAM:
+            case ESM::fourCC("ZNAM"):
                 reader.getFormId(mMusic);
                 break;
-            case ESM4::SUB_PNAM:
+            case ESM::fourCC("PNAM"):
                 reader.get(mParentUseFlags);
                 break;
-            case ESM4::SUB_OFST:
-            case ESM4::SUB_RNAM: // multiple
-            case ESM4::SUB_MHDT:
-            case ESM4::SUB_LTMP:
-            case ESM4::SUB_XEZN:
-            case ESM4::SUB_XLCN:
-            case ESM4::SUB_NAM3:
-            case ESM4::SUB_NAM4:
-            case ESM4::SUB_NAMA:
-            case ESM4::SUB_ONAM:
-            case ESM4::SUB_TNAM:
-            case ESM4::SUB_UNAM:
-            case ESM4::SUB_XWEM:
-            case ESM4::SUB_MODL: // Model data start
-            case ESM4::SUB_MODT:
-            case ESM4::SUB_MODC:
-            case ESM4::SUB_MODS:
-            case ESM4::SUB_MODF: // Model data end
-            case ESM4::SUB_INAM: // FO3
-            case ESM4::SUB_NNAM: // FO3
-            case ESM4::SUB_XNAM: // FO3
-            case ESM4::SUB_IMPS: // FO3 Anchorage
-            case ESM4::SUB_IMPF: // FO3 Anchorage
-            case ESM4::SUB_CLSZ: // FO4
-            case ESM4::SUB_WLEV: // FO4
+            case ESM::fourCC("OFST"):
+            case ESM::fourCC("RNAM"): // multiple
+            case ESM::fourCC("MHDT"):
+            case ESM::fourCC("LTMP"):
+            case ESM::fourCC("XEZN"):
+            case ESM::fourCC("XLCN"):
+            case ESM::fourCC("NAM3"):
+            case ESM::fourCC("NAM4"):
+            case ESM::fourCC("NAMA"):
+            case ESM::fourCC("ONAM"):
+            case ESM::fourCC("TNAM"):
+            case ESM::fourCC("UNAM"):
+            case ESM::fourCC("XWEM"):
+            case ESM::fourCC("MODL"): // Model data start
+            case ESM::fourCC("MODT"):
+            case ESM::fourCC("MODC"):
+            case ESM::fourCC("MODS"):
+            case ESM::fourCC("MODF"): // Model data end
+            case ESM::fourCC("INAM"): // FO3
+            case ESM::fourCC("NNAM"): // FO3
+            case ESM::fourCC("XNAM"): // FO3
+            case ESM::fourCC("IMPS"): // FO3 Anchorage
+            case ESM::fourCC("IMPF"): // FO3 Anchorage
+            case ESM::fourCC("CLSZ"): // FO4
+            case ESM::fourCC("WLEV"): // FO4
                 reader.skipSubRecordData();
                 break;
             default:
@@ -185,6 +185,10 @@ void ESM4::World::load(ESM4::Reader& reader)
                 mWaterLevel = 0.f;
             }
         }
+
+        // TES4 doesn't define PNAM. Exact parent worldspace behavior needs research
+        if (!reader.hasFormVersion())
+            mParentUseFlags = 0xFFFF;
     }
 }
 
diff --git a/components/esm4/loadwrld.hpp b/components/esm4/loadwrld.hpp
index d8b0ba2177..f354fa3f08 100644
--- a/components/esm4/loadwrld.hpp
+++ b/components/esm4/loadwrld.hpp
@@ -55,6 +55,18 @@ namespace ESM4
             WLD_NoGrass = 0x80 //                      No Grass
         };
 
+        enum UseFlags
+        {
+            UseFlag_Land = 0x01,
+            UseFlag_LOD = 0x02,
+            UseFlag_Map = 0x04,
+            UseFlag_Water = 0x08,
+            UseFlag_Climate = 0x10,
+            UseFlag_Imagespace = 0x20, // Unused in TES5
+            UseFlag_SkyCell = 0x40,
+            // cc9cii: 0x80 == needs water adjustment? Set for WastelandNV
+        };
+
         struct REFRcoord
         {
             ESM::FormId formId;
@@ -69,7 +81,7 @@ namespace ESM4
             std::vector<REFRcoord> refrs;
         };
 
-        // Map size	struct	16 or 28 byte structure
+        // Map size struct, either 16 (old format) or 28 (new format) byte structure
         struct Map
         {
             std::uint32_t width; // usable width of the map
@@ -115,15 +127,7 @@ namespace ESM4
         // ----------------------
         ESM::FormId mMusic;
 
-        // 0x01 use Land data
-        // 0x02 use LOD data
-        // 0x04 use Map data
-        // 0x08 use Water data
-        // 0x10 use Climate data
-        // 0x20 use Image Space data (Climate for TES5)
-        // 0x40 use SkyCell (TES5)
-        // 0x80 needs water adjustment (this isn't for parent I think? FONV only set for wastelandnv)
-        std::uint16_t mParentUseFlags; // FO3/FONV
+        std::uint16_t mParentUseFlags{ 0 };
 
         // cache formId's of children (e.g. CELL, ROAD)
         std::vector<ESM::FormId> mCells;
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index 4a78fd21ea..505922601d 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -41,6 +41,7 @@
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/to_utf8/to_utf8.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "grouptype.hpp"
 
@@ -82,8 +83,8 @@ namespace ESM4
 
             stream.next_in = reinterpret_cast<Bytef*>(compressed.data());
             stream.next_out = reinterpret_cast<Bytef*>(decompressed.data());
-            stream.avail_in = compressed.size();
-            stream.avail_out = decompressed.size();
+            stream.avail_in = static_cast<uInt>(compressed.size());
+            stream.avail_out = static_cast<uInt>(decompressed.size());
 
             if (const int ec = inflateInit(&stream); ec != Z_OK)
                 return getError("inflateInit error", ec, stream.msg);
@@ -111,9 +112,9 @@ namespace ESM4
                 const auto prevTotalIn = stream.total_in;
                 const auto prevTotalOut = stream.total_out;
                 stream.next_in = reinterpret_cast<Bytef*>(compressed.data());
-                stream.avail_in = std::min(blockSize, compressed.size());
+                stream.avail_in = static_cast<uInt>(std::min(blockSize, compressed.size()));
                 stream.next_out = reinterpret_cast<Bytef*>(decompressed.data());
-                stream.avail_out = std::min(blockSize, decompressed.size());
+                stream.avail_out = static_cast<uInt>(std::min(blockSize, decompressed.size()));
                 const int ec = inflate(&stream, Z_NO_FLUSH);
                 if (ec == Z_STREAM_END)
                     break;
@@ -169,8 +170,8 @@ namespace ESM4
         , currCellGrid(FormId{ 0, 0 })
         , cellGridValid(false)
     {
-        subRecordHeader.typeId = 0;
-        subRecordHeader.dataSize = 0;
+        recordHeader = {};
+        subRecordHeader = {};
     }
 
     Reader::Reader(Files::IStreamPtr&& esmStream, const std::filesystem::path& filename, VFS::Manager const* vfs,
@@ -201,15 +202,6 @@ namespace ESM4
 
         // restart from the beginning (i.e. "TES4" record header)
         mStream->seekg(0, mStream->beg);
-#if 0
-    unsigned int esmVer = mHeader.mData.version.ui;
-    bool isTes4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
-    //bool isTes5 = esmVer == ESM::VER_094 || esmVer == ESM::VER_170;
-    //bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
-
-    // TES4 header size is 4 bytes smaller than TES5 header
-    mCtx.recHeaderSize = isTes4 ? sizeof(ESM4::RecordHeader) - 4 : sizeof(ESM4::RecordHeader);
-#endif
         getRecordHeader();
         if (mCtx.recordHeader.record.typeId == REC_TES4)
         {
@@ -328,16 +320,18 @@ namespace ESM4
         std::filesystem::path path = strings / (prefix + language + suffix);
         if (mVFS != nullptr)
         {
-            std::string vfsPath = Files::pathToUnicodeString(path);
-            if (!mVFS->exists(vfsPath))
+            VFS::Path::Normalized vfsPath(Files::pathToUnicodeString(path));
+            Files::IStreamPtr stream = mVFS->find(vfsPath);
+
+            if (stream == nullptr)
             {
                 path = strings / (prefix + altLanguage + suffix);
-                vfsPath = Files::pathToUnicodeString(path);
+                vfsPath = VFS::Path::Normalized(Files::pathToUnicodeString(path));
+                stream = mVFS->find(vfsPath);
             }
 
-            if (mVFS->exists(vfsPath))
+            if (stream != nullptr)
             {
-                const Files::IStreamPtr stream = mVFS->get(vfsPath);
                 buildLStringIndex(stringType, *stream);
                 return;
             }
@@ -596,7 +590,7 @@ namespace ESM4
 
         // Extended storage subrecord redefines the following subrecord's size.
         // Would need to redesign the loader to support that, so skip over both subrecords.
-        if (result && mCtx.subRecordHeader.typeId == ESM4::SUB_XXXX)
+        if (result && mCtx.subRecordHeader.typeId == ESM::fourCC("XXXX"))
         {
             std::uint32_t extDataSize;
             get(extDataSize);
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index a095c23e85..914fa4a647 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -36,13 +36,17 @@
 
 #include <components/esm/formid.hpp>
 #include <components/files/istreamptr.hpp>
-#include <components/vfs/manager.hpp>
 
 namespace ToUTF8
 {
     class StatelessUtf8Encoder;
 }
 
+namespace VFS
+{
+    class Manager;
+}
+
 namespace ESM4
 {
 #pragma pack(push, 1)
@@ -247,8 +251,12 @@ namespace ESM4
         void setRecHeaderSize(const std::size_t size);
 
         inline unsigned int esmVersion() const { return mHeader.mData.version.ui; }
+        inline float esmVersionF() const { return mHeader.mData.version.f; }
         inline unsigned int numRecords() const { return mHeader.mData.records; }
 
+        inline bool hasFormVersion() const { return mCtx.recHeaderSize == sizeof(RecordHeader); }
+        inline unsigned int formVersion() const { return mCtx.recordHeader.record.version; }
+
         void buildLStringIndex();
         void getLocalizedString(std::string& str);
 
@@ -327,7 +335,7 @@ namespace ESM4
 
         // Get a subrecord of a particular type and data type
         template <typename T>
-        bool getSubRecord(const ESM4::SubRecordTypes type, T& t)
+        bool getSubRecord(const std::uint32_t type, T& t)
         {
             ESM4::SubRecordHeader hdr;
             if (!getExact(hdr) || (hdr.typeId != type) || (hdr.dataSize != sizeof(T)))
diff --git a/components/esm4/reference.hpp b/components/esm4/reference.hpp
index debb39f839..33e8fa82f3 100644
--- a/components/esm4/reference.hpp
+++ b/components/esm4/reference.hpp
@@ -30,8 +30,8 @@
 #include <cstdint>
 #include <string>
 
-#include <components/esm/defs.hpp>
 #include <components/esm/formid.hpp>
+#include <components/esm/position.hpp>
 
 namespace ESM4
 {
@@ -39,7 +39,13 @@ namespace ESM4
     struct EnableParent
     {
         ESM::FormId parent;
-        std::uint32_t flags; // 0x0001 = Set Enable State Opposite Parent, 0x0002 = Pop In
+        std::uint32_t flags;
+
+        enum Flags
+        {
+            Flag_Inversed = 0x1, // Set enable state opposite to the parent
+            Flag_PopIn = 0x2,
+        };
     };
 
     struct LODReference
diff --git a/components/esm4/script.hpp b/components/esm4/script.hpp
index 57dd85367b..3715ea55d4 100644
--- a/components/esm4/script.hpp
+++ b/components/esm4/script.hpp
@@ -365,13 +365,6 @@ namespace ESM4
         std::uint32_t unknown4;
         // SCVR
         std::string variableName;
-
-        void clear()
-        {
-            index = 0;
-            type = 0;
-            variableName.clear();
-        }
     };
 
     struct ScriptDefinition
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index d8cf964f71..35ec814aa2 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -9,6 +9,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm/esmterrain.hpp>
+#include <components/esm/util.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/esm4/loadland.hpp>
 #include <components/misc/resourcehelpers.hpp>
@@ -102,8 +103,8 @@ namespace ESMTerrain
 
     const float defaultHeight = ESM::Land::DEFAULT_HEIGHT;
 
-    Storage::Storage(const VFS::Manager* vfs, const std::string& normalMapPattern,
-        const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern,
+    Storage::Storage(const VFS::Manager* vfs, std::string_view normalMapPattern,
+        std::string_view normalHeightMapPattern, bool autoUseNormalMaps, std::string_view specularMapPattern,
         bool autoUseSpecularMaps)
         : mVFS(vfs)
         , mNormalMapPattern(normalMapPattern)
@@ -367,23 +368,21 @@ namespace ESMTerrain
 
     std::string Storage::getTextureName(UniqueTextureId id)
     {
-        static constexpr char defaultTexture[] = "textures\\_land_default.dds";
-        if (id.first == 0)
-            return defaultTexture; // Not sure if the default texture really is hardcoded?
-
-        // NB: All vtex ids are +1 compared to the ltex ids
-        const ESM::LandTexture* ltex = getLandTexture(id.first - 1, id.second);
-        if (!ltex)
+        std::string_view texture = "_land_default.dds";
+        if (id.first != 0)
         {
-            Log(Debug::Warning) << "Warning: Unable to find land texture index " << id.first - 1 << " in plugin "
-                                << id.second << ", using default texture instead";
-            return defaultTexture;
+            // NB: All vtex ids are +1 compared to the ltex ids
+            const std::string* ltex = getLandTexture(id.first - 1, id.second);
+            if (ltex)
+                texture = *ltex;
+            else
+            {
+                Log(Debug::Warning) << "Warning: Unable to find land texture index " << id.first - 1 << " in plugin "
+                                    << id.second << ", using default texture instead";
+            }
         }
-
         // this is needed due to MWs messed up texture handling
-        std::string texture = Misc::ResourceHelpers::correctTexturePath(ltex->mTexture, mVFS);
-
-        return texture;
+        return Misc::ResourceHelpers::correctTexturePath(texture, mVFS);
     }
 
     void Storage::getBlendmaps(float chunkSize, const osg::Vec2f& chunkCenter, ImageVector& blendmaps,
@@ -416,21 +415,21 @@ namespace ESMTerrain
 
         sampleBlendmaps(chunkSize, origin.x(), origin.y(), ESM::Land::LAND_TEXTURE_SIZE, handleSample);
 
-        std::map<UniqueTextureId, unsigned int> textureIndicesMap;
+        std::map<UniqueTextureId, std::size_t> textureIndicesMap;
 
         for (std::size_t y = 0; y < blendmapSize; ++y)
         {
             for (std::size_t x = 0; x < blendmapSize; ++x)
             {
                 const UniqueTextureId id = textureIds[y * blendmapSize + x];
-                std::map<UniqueTextureId, unsigned int>::iterator found = textureIndicesMap.find(id);
+                auto found = textureIndicesMap.find(id);
                 if (found == textureIndicesMap.end())
                 {
-                    unsigned int layerIndex = layerList.size();
+                    std::size_t layerIndex = layerList.size();
                     Terrain::LayerInfo info = getLayerInfo(getTextureName(id));
 
                     // look for existing diffuse map, which may be present when several plugins use the same texture
-                    for (unsigned int i = 0; i < layerList.size(); ++i)
+                    for (std::size_t i = 0; i < layerList.size(); ++i)
                     {
                         if (layerList[i].mDiffuseMap == info.mDiffuseMap)
                         {
@@ -451,7 +450,7 @@ namespace ESMTerrain
                         layerList.push_back(std::move(info));
                     }
                 }
-                const unsigned int layerIndex = found->second;
+                const std::size_t layerIndex = found->second;
                 unsigned char* const data = blendmaps[layerIndex]->data();
                 const std::size_t realY = (blendmapSize - y - 1) * imageScaleFactor;
                 const std::size_t realX = x * imageScaleFactor;
@@ -586,7 +585,7 @@ namespace ESMTerrain
             Misc::StringUtils::replaceLast(texture_, ".", mNormalHeightMapPattern + ".");
             if (mVFS->exists(texture_))
             {
-                info.mNormalMap = texture_;
+                info.mNormalMap = std::move(texture_);
                 info.mParallax = true;
             }
             else
@@ -594,7 +593,7 @@ namespace ESMTerrain
                 texture_ = texture;
                 Misc::StringUtils::replaceLast(texture_, ".", mNormalMapPattern + ".");
                 if (mVFS->exists(texture_))
-                    info.mNormalMap = texture_;
+                    info.mNormalMap = std::move(texture_);
             }
         }
 
@@ -604,7 +603,7 @@ namespace ESMTerrain
             Misc::StringUtils::replaceLast(texture_, ".", mSpecularMapPattern + ".");
             if (mVFS->exists(texture_))
             {
-                info.mDiffuseMap = texture_;
+                info.mDiffuseMap = std::move(texture_);
                 info.mSpecular = true;
             }
         }
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 4858dfd544..402f2147ab 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -7,7 +7,7 @@
 #include <components/terrain/storage.hpp>
 
 #include <components/esm/esmterrain.hpp>
-#include <components/esm/util.hpp>
+#include <components/esm/exteriorcelllocation.hpp>
 #include <components/esm3/loadltex.hpp>
 
 namespace ESM4
@@ -67,13 +67,13 @@ namespace ESMTerrain
     class Storage : public Terrain::Storage
     {
     public:
-        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "",
-            const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false,
-            const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
+        Storage(const VFS::Manager* vfs, std::string_view normalMapPattern = {},
+            std::string_view normalHeightMapPattern = {}, bool autoUseNormalMaps = false,
+            std::string_view specularMapPattern = {}, bool autoUseSpecularMaps = false);
 
         // Not implemented in this class, because we need different Store implementations for game and editor
         virtual osg::ref_ptr<const LandObject> getLand(ESM::ExteriorCellLocation cellLocation) = 0;
-        virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0;
+        virtual const std::string* getLandTexture(std::uint16_t index, int plugin) = 0;
         /// Get bounds of the whole terrain in cell units
         void getBounds(float& minX, float& maxX, float& minY, float& maxY, ESM::RefId worldspace) override = 0;
 
diff --git a/components/fallback/validate.cpp b/components/fallback/validate.cpp
index ca9a218888..571f0f9b19 100644
--- a/components/fallback/validate.cpp
+++ b/components/fallback/validate.cpp
@@ -5,15 +5,16 @@
 #include <set>
 #include <string>
 
-static const std::set<std::string, std::less<>> allowedKeysInt = { "LightAttenuation_LinearMethod",
+static const std::set<std::string_view> allowedKeysInt = { "LightAttenuation_LinearMethod",
     "LightAttenuation_OutQuadInLin", "LightAttenuation_QuadraticMethod", "LightAttenuation_UseConstant",
-    "LightAttenuation_UseLinear", "LightAttenuation_UseQuadratic", "Water_NearWaterRadius", "Water_NearWaterPoints",
-    "Water_RippleFrameCount", "Water_SurfaceTileCount", "Water_SurfaceFrameCount", "Weather_Clear_Using_Precip",
-    "Weather_Cloudy_Using_Precip", "Weather_Foggy_Using_Precip", "Weather_Overcast_Using_Precip",
-    "Weather_Rain_Using_Precip", "Weather_Thunderstorm_Using_Precip", "Weather_Ashstorm_Using_Precip",
-    "Weather_Blight_Using_Precip", "Weather_Snow_Using_Precip", "Weather_Blizzard_Using_Precip" };
+    "LightAttenuation_UseLinear", "LightAttenuation_UseQuadratic", "Water_MaxNumberRipples", "Water_NearWaterRadius",
+    "Water_NearWaterPoints", "Water_RippleFrameCount", "Water_SurfaceTileCount", "Water_SurfaceFrameCount",
+    "Weather_Clear_Using_Precip", "Weather_Cloudy_Using_Precip", "Weather_Foggy_Using_Precip",
+    "Weather_Overcast_Using_Precip", "Weather_Rain_Using_Precip", "Weather_Thunderstorm_Using_Precip",
+    "Weather_Ashstorm_Using_Precip", "Weather_Blight_Using_Precip", "Weather_Snow_Using_Precip",
+    "Weather_Blizzard_Using_Precip", "Weather_Rain_Ripples", "Weather_Snow_Ripples", "Weather_Timescale_Clouds" };
 
-static const std::set<std::string, std::less<>> allowedKeysFloat = { "Inventory_DirectionalAmbientB",
+static const std::set<std::string_view> allowedKeysFloat = { "General_Werewolf_FOV", "Inventory_DirectionalAmbientB",
     "Inventory_DirectionalAmbientG", "Inventory_DirectionalAmbientR", "Inventory_DirectionalDiffuseB",
     "Inventory_DirectionalDiffuseG", "Inventory_DirectionalDiffuseR", "Inventory_DirectionalRotationX",
     "Inventory_DirectionalRotationY", "LightAttenuation_ConstantValue", "LightAttenuation_LinearValue",
@@ -94,91 +95,90 @@ static const std::set<std::string, std::less<>> allowedKeysFloat = { "Inventory_
     "Weather_Thunderstorm_Thunder_Frequency", "Weather_Thunderstorm_Thunder_Threshold",
     "Weather_Thunderstorm_Transition_Delta", "Weather_Thunderstorm_Wind_Speed" };
 
-static const std::set<std::string, std::less<>> allowedKeysNonNumeric = { "Blood_Model_0", "Blood_Model_1",
-    "Blood_Model_2", "FontColor_color_active", "FontColor_color_active_over", "FontColor_color_active_pressed",
-    "FontColor_color_answer", "FontColor_color_answer_over", "FontColor_color_answer_pressed",
-    "FontColor_color_background", "FontColor_color_big_answer", "FontColor_color_big_answer_over",
-    "FontColor_color_big_answer_pressed", "FontColor_color_big_header", "FontColor_color_big_link",
-    "FontColor_color_big_link_over", "FontColor_color_big_link_pressed", "FontColor_color_big_normal",
-    "FontColor_color_big_normal_over", "FontColor_color_big_normal_pressed", "FontColor_color_big_notify",
-    "FontColor_color_count", "FontColor_color_disabled", "FontColor_color_disabled_over",
-    "FontColor_color_disabled_pressed", "FontColor_color_fatigue", "FontColor_color_focus", "FontColor_color_header",
-    "FontColor_color_health", "FontColor_color_journal_link", "FontColor_color_journal_link_over",
-    "FontColor_color_journal_link_pressed", "FontColor_color_journal_topic", "FontColor_color_journal_topic_over",
-    "FontColor_color_journal_topic_pressed", "FontColor_color_link", "FontColor_color_link_over",
-    "FontColor_color_link_pressed", "FontColor_color_magic", "FontColor_color_magic_fill", "FontColor_color_misc",
-    "FontColor_color_negative", "FontColor_color_normal", "FontColor_color_normal_over",
-    "FontColor_color_normal_pressed", "FontColor_color_notify", "FontColor_color_positive",
-    "FontColor_color_weapon_fill", "Fonts_Font_0", "Fonts_Font_1", "Fonts_Font_2", "Level_Up_Default",
-    "Moons_Script_Color", "Movies_Company_Logo", "Movies_Morrowind_Logo", "Movies_New_Game", "Question_10_AnswerOne",
-    "Question_10_AnswerThree", "Question_10_AnswerTwo", "Question_10_Question", "Question_10_Sound",
-    "Question_1_AnswerOne", "Question_1_AnswerThree", "Question_1_AnswerTwo", "Question_1_Question", "Question_1_Sound",
-    "Question_2_AnswerOne", "Question_2_AnswerThree", "Question_2_AnswerTwo", "Question_2_Question", "Question_2_Sound",
-    "Question_3_AnswerOne", "Question_3_AnswerThree", "Question_3_AnswerTwo", "Question_3_Question", "Question_3_Sound",
-    "Question_4_AnswerOne", "Question_4_AnswerThree", "Question_4_AnswerTwo", "Question_4_Question", "Question_4_Sound",
-    "Question_5_AnswerOne", "Question_5_AnswerThree", "Question_5_AnswerTwo", "Question_5_Question", "Question_5_Sound",
-    "Question_6_AnswerOne", "Question_6_AnswerThree", "Question_6_AnswerTwo", "Question_6_Question", "Question_6_Sound",
-    "Question_7_AnswerOne", "Question_7_AnswerThree", "Question_7_AnswerTwo", "Question_7_Question", "Question_7_Sound",
-    "Question_8_AnswerOne", "Question_8_AnswerThree", "Question_8_AnswerTwo", "Question_8_Question", "Question_8_Sound",
-    "Question_9_AnswerOne", "Question_9_AnswerThree", "Question_9_AnswerTwo", "Question_9_Question", "Question_9_Sound",
-    "Water_NearWaterIndoorID", "Water_NearWaterOutdoorID", "Water_RippleTexture", "Water_SurfaceTexture",
-    "Water_UnderwaterColor", "Weather_Blizzard_Ambient_Day_Color", "Weather_Blizzard_Ambient_Loop_Sound_ID",
-    "Weather_Blizzard_Ambient_Night_Color", "Weather_Blizzard_Ambient_Sunrise_Color",
-    "Weather_Blizzard_Ambient_Sunset_Color", "Weather_Blizzard_Cloud_Texture", "Weather_Blizzard_Fog_Day_Color",
-    "Weather_Blizzard_Fog_Night_Color", "Weather_Blizzard_Fog_Sunrise_Color", "Weather_Blizzard_Fog_Sunset_Color",
-    "Weather_Blizzard_Sky_Day_Color", "Weather_Blizzard_Sky_Night_Color", "Weather_Blizzard_Sky_Sunrise_Color",
-    "Weather_Blizzard_Sky_Sunset_Color", "Weather_Blizzard_Storm_Threshold", "Weather_Blizzard_Sun_Day_Color",
-    "Weather_Blizzard_Sun_Disc_Sunset_Color", "Weather_Blizzard_Sun_Night_Color", "Weather_Blizzard_Sun_Sunrise_Color",
-    "Weather_Blizzard_Sun_Sunset_Color", "Weather_BumpFadeColor", "Weather_Clear_Ambient_Day_Color",
-    "Weather_Clear_Ambient_Loop_Sound_ID", "Weather_Clear_Ambient_Night_Color", "Weather_Clear_Ambient_Sunrise_Color",
-    "Weather_Clear_Ambient_Sunset_Color", "Weather_Clear_Cloud_Texture", "Weather_Clear_Fog_Day_Color",
-    "Weather_Clear_Fog_Night_Color", "Weather_Clear_Fog_Sunrise_Color", "Weather_Clear_Fog_Sunset_Color",
-    "Weather_Clear_Sky_Day_Color", "Weather_Clear_Sky_Night_Color", "Weather_Clear_Sky_Sunrise_Color",
-    "Weather_Clear_Sky_Sunset_Color", "Weather_Clear_Sun_Day_Color", "Weather_Clear_Sun_Disc_Sunset_Color",
-    "Weather_Clear_Sun_Night_Color", "Weather_Clear_Sun_Sunrise_Color", "Weather_Clear_Sun_Sunset_Color",
-    "Weather_Cloudy_Ambient_Day_Color", "Weather_Cloudy_Ambient_Loop_Sound_ID", "Weather_Cloudy_Ambient_Night_Color",
-    "Weather_Cloudy_Ambient_Sunrise_Color", "Weather_Cloudy_Ambient_Sunset_Color", "Weather_Cloudy_Cloud_Texture",
-    "Weather_Cloudy_Fog_Day_Color", "Weather_Cloudy_Fog_Night_Color", "Weather_Cloudy_Fog_Sunrise_Color",
-    "Weather_Cloudy_Fog_Sunset_Color", "Weather_Cloudy_Sky_Day_Color", "Weather_Cloudy_Sky_Night_Color",
-    "Weather_Cloudy_Sky_Sunrise_Color", "Weather_Cloudy_Sky_Sunset_Color", "Weather_Cloudy_Sun_Day_Color",
-    "Weather_Cloudy_Sun_Disc_Sunset_Color", "Weather_Cloudy_Sun_Night_Color", "Weather_Cloudy_Sun_Sunrise_Color",
-    "Weather_Cloudy_Sun_Sunset_Color", "Weather_EnvReduceColor", "Weather_Fog_Depth_Change_Speed",
-    "Weather_Foggy_Ambient_Day_Color", "Weather_Foggy_Ambient_Loop_Sound_ID", "Weather_Foggy_Ambient_Night_Color",
-    "Weather_Foggy_Ambient_Sunrise_Color", "Weather_Foggy_Ambient_Sunset_Color", "Weather_Foggy_Cloud_Texture",
-    "Weather_Foggy_Fog_Day_Color", "Weather_Foggy_Fog_Night_Color", "Weather_Foggy_Fog_Sunrise_Color",
-    "Weather_Foggy_Fog_Sunset_Color", "Weather_Foggy_Sky_Day_Color", "Weather_Foggy_Sky_Night_Color",
-    "Weather_Foggy_Sky_Sunrise_Color", "Weather_Foggy_Sky_Sunset_Color", "Weather_Foggy_Sun_Day_Color",
-    "Weather_Foggy_Sun_Disc_Sunset_Color", "Weather_Foggy_Sun_Night_Color", "Weather_Foggy_Sun_Sunrise_Color",
-    "Weather_Foggy_Sun_Sunset_Color", "Weather_LerpCloseColor", "Weather_Overcast_Ambient_Day_Color",
-    "Weather_Overcast_Ambient_Loop_Sound_ID", "Weather_Overcast_Ambient_Night_Color",
-    "Weather_Overcast_Ambient_Sunrise_Color", "Weather_Overcast_Ambient_Sunset_Color", "Weather_Overcast_Cloud_Texture",
-    "Weather_Overcast_Fog_Day_Color", "Weather_Overcast_Fog_Night_Color", "Weather_Overcast_Fog_Sunrise_Color",
-    "Weather_Overcast_Fog_Sunset_Color", "Weather_Overcast_Sky_Day_Color", "Weather_Overcast_Sky_Night_Color",
-    "Weather_Overcast_Sky_Sunrise_Color", "Weather_Overcast_Sky_Sunset_Color", "Weather_Overcast_Sun_Day_Color",
-    "Weather_Overcast_Sun_Disc_Sunset_Color", "Weather_Overcast_Sun_Night_Color", "Weather_Overcast_Sun_Sunrise_Color",
-    "Weather_Overcast_Sun_Sunset_Color", "Weather_Rain_Ambient_Day_Color", "Weather_Rain_Ambient_Loop_Sound_ID",
-    "Weather_Rain_Ambient_Night_Color", "Weather_Rain_Ambient_Sunrise_Color", "Weather_Rain_Ambient_Sunset_Color",
-    "Weather_Rain_Cloud_Texture", "Weather_Rain_Fog_Day_Color", "Weather_Rain_Fog_Night_Color",
-    "Weather_Rain_Fog_Sunrise_Color", "Weather_Rain_Fog_Sunset_Color", "Weather_Rain_Rain_Loop_Sound_ID",
-    "Weather_Rain_Ripple_Radius", "Weather_Rain_Ripples", "Weather_Rain_Ripple_Scale", "Weather_Rain_Ripple_Speed",
-    "Weather_Rain_Ripples_Per_Drop", "Weather_Rain_Sky_Day_Color", "Weather_Rain_Sky_Night_Color",
-    "Weather_Rain_Sky_Sunrise_Color", "Weather_Rain_Sky_Sunset_Color", "Weather_Rain_Sun_Day_Color",
-    "Weather_Rain_Sun_Disc_Sunset_Color", "Weather_Rain_Sun_Night_Color", "Weather_Rain_Sun_Sunrise_Color",
-    "Weather_Rain_Sun_Sunset_Color", "Weather_Snow_Ambient_Day_Color", "Weather_Snow_Ambient_Loop_Sound_ID",
-    "Weather_Snow_Ambient_Night_Color", "Weather_Snow_Ambient_Sunrise_Color", "Weather_Snow_Ambient_Sunset_Color",
-    "Weather_Snow_Cloud_Texture", "Weather_Snow_Fog_Day_Color", "Weather_Snow_Fog_Night_Color",
-    "Weather_Snow_Fog_Sunrise_Color", "Weather_Snow_Fog_Sunset_Color", "Weather_Snow_Gravity_Scale",
-    "Weather_Snow_High_Kill", "Weather_Snow_Low_Kill", "Weather_Snow_Max_Snowflakes", "Weather_Snow_Ripple_Radius",
-    "Weather_Snow_Ripples", "Weather_Snow_Ripple_Scale", "Weather_Snow_Ripple_Speed", "Weather_Snow_Ripples_Per_Flake",
-    "Weather_Snow_Sky_Day_Color", "Weather_Snow_Sky_Night_Color", "Weather_Snow_Sky_Sunrise_Color",
-    "Weather_Snow_Sky_Sunset_Color", "Weather_Snow_Snow_Diameter", "Weather_Snow_Snow_Entrance_Speed",
-    "Weather_Snow_Snow_Height_Max", "Weather_Snow_Snow_Height_Min", "Weather_Snow_Snow_Threshold",
-    "Weather_Snow_Sun_Day_Color", "Weather_Snow_Sun_Disc_Sunset_Color", "Weather_Snow_Sun_Night_Color",
-    "Weather_Snow_Sun_Sunrise_Color", "Weather_Snow_Sun_Sunset_Color", "Weather_Sun_Glare_Fader_Color",
-    "Weather_Thunderstorm_Ambient_Day_Color", "Weather_Thunderstorm_Ambient_Loop_Sound_ID",
-    "Weather_Thunderstorm_Ambient_Night_Color", "Weather_Thunderstorm_Ambient_Sunrise_Color",
-    "Weather_Thunderstorm_Ambient_Sunset_Color", "Weather_Thunderstorm_Cloud_Texture",
-    "Weather_Thunderstorm_Fog_Day_Color", "Weather_Thunderstorm_Fog_Night_Color",
+static const std::set<std::string_view> allowedKeysNonNumeric = { "Blood_Model_0", "Blood_Model_1", "Blood_Model_2",
+    "FontColor_color_active", "FontColor_color_active_over", "FontColor_color_active_pressed", "FontColor_color_answer",
+    "FontColor_color_answer_over", "FontColor_color_answer_pressed", "FontColor_color_background",
+    "FontColor_color_big_answer", "FontColor_color_big_answer_over", "FontColor_color_big_answer_pressed",
+    "FontColor_color_big_header", "FontColor_color_big_link", "FontColor_color_big_link_over",
+    "FontColor_color_big_link_pressed", "FontColor_color_big_normal", "FontColor_color_big_normal_over",
+    "FontColor_color_big_normal_pressed", "FontColor_color_big_notify", "FontColor_color_count",
+    "FontColor_color_disabled", "FontColor_color_disabled_over", "FontColor_color_disabled_pressed",
+    "FontColor_color_fatigue", "FontColor_color_focus", "FontColor_color_header", "FontColor_color_health",
+    "FontColor_color_journal_link", "FontColor_color_journal_link_over", "FontColor_color_journal_link_pressed",
+    "FontColor_color_journal_topic", "FontColor_color_journal_topic_over", "FontColor_color_journal_topic_pressed",
+    "FontColor_color_link", "FontColor_color_link_over", "FontColor_color_link_pressed", "FontColor_color_magic",
+    "FontColor_color_magic_fill", "FontColor_color_misc", "FontColor_color_negative", "FontColor_color_normal",
+    "FontColor_color_normal_over", "FontColor_color_normal_pressed", "FontColor_color_notify",
+    "FontColor_color_positive", "FontColor_color_weapon_fill", "Fonts_Font_0", "Fonts_Font_1", "Fonts_Font_2",
+    "Level_Up_Default", "Moons_Script_Color", "Movies_Company_Logo", "Movies_Morrowind_Logo", "Movies_New_Game",
+    "Question_10_AnswerOne", "Question_10_AnswerThree", "Question_10_AnswerTwo", "Question_10_Question",
+    "Question_10_Sound", "Question_1_AnswerOne", "Question_1_AnswerThree", "Question_1_AnswerTwo",
+    "Question_1_Question", "Question_1_Sound", "Question_2_AnswerOne", "Question_2_AnswerThree", "Question_2_AnswerTwo",
+    "Question_2_Question", "Question_2_Sound", "Question_3_AnswerOne", "Question_3_AnswerThree", "Question_3_AnswerTwo",
+    "Question_3_Question", "Question_3_Sound", "Question_4_AnswerOne", "Question_4_AnswerThree", "Question_4_AnswerTwo",
+    "Question_4_Question", "Question_4_Sound", "Question_5_AnswerOne", "Question_5_AnswerThree", "Question_5_AnswerTwo",
+    "Question_5_Question", "Question_5_Sound", "Question_6_AnswerOne", "Question_6_AnswerThree", "Question_6_AnswerTwo",
+    "Question_6_Question", "Question_6_Sound", "Question_7_AnswerOne", "Question_7_AnswerThree", "Question_7_AnswerTwo",
+    "Question_7_Question", "Question_7_Sound", "Question_8_AnswerOne", "Question_8_AnswerThree", "Question_8_AnswerTwo",
+    "Question_8_Question", "Question_8_Sound", "Question_9_AnswerOne", "Question_9_AnswerThree", "Question_9_AnswerTwo",
+    "Question_9_Question", "Question_9_Sound", "Water_NearWaterIndoorID", "Water_NearWaterOutdoorID",
+    "Water_RippleTexture", "Water_SurfaceTexture", "Water_UnderwaterColor", "Weather_Blizzard_Ambient_Day_Color",
+    "Weather_Blizzard_Ambient_Loop_Sound_ID", "Weather_Blizzard_Ambient_Night_Color",
+    "Weather_Blizzard_Ambient_Sunrise_Color", "Weather_Blizzard_Ambient_Sunset_Color", "Weather_Blizzard_Cloud_Texture",
+    "Weather_Blizzard_Fog_Day_Color", "Weather_Blizzard_Fog_Night_Color", "Weather_Blizzard_Fog_Sunrise_Color",
+    "Weather_Blizzard_Fog_Sunset_Color", "Weather_Blizzard_Sky_Day_Color", "Weather_Blizzard_Sky_Night_Color",
+    "Weather_Blizzard_Sky_Sunrise_Color", "Weather_Blizzard_Sky_Sunset_Color", "Weather_Blizzard_Storm_Threshold",
+    "Weather_Blizzard_Sun_Day_Color", "Weather_Blizzard_Sun_Disc_Sunset_Color", "Weather_Blizzard_Sun_Night_Color",
+    "Weather_Blizzard_Sun_Sunrise_Color", "Weather_Blizzard_Sun_Sunset_Color", "Weather_BumpFadeColor",
+    "Weather_Clear_Ambient_Day_Color", "Weather_Clear_Ambient_Loop_Sound_ID", "Weather_Clear_Ambient_Night_Color",
+    "Weather_Clear_Ambient_Sunrise_Color", "Weather_Clear_Ambient_Sunset_Color", "Weather_Clear_Cloud_Texture",
+    "Weather_Clear_Fog_Day_Color", "Weather_Clear_Fog_Night_Color", "Weather_Clear_Fog_Sunrise_Color",
+    "Weather_Clear_Fog_Sunset_Color", "Weather_Clear_Sky_Day_Color", "Weather_Clear_Sky_Night_Color",
+    "Weather_Clear_Sky_Sunrise_Color", "Weather_Clear_Sky_Sunset_Color", "Weather_Clear_Sun_Day_Color",
+    "Weather_Clear_Sun_Disc_Sunset_Color", "Weather_Clear_Sun_Night_Color", "Weather_Clear_Sun_Sunrise_Color",
+    "Weather_Clear_Sun_Sunset_Color", "Weather_Cloudy_Ambient_Day_Color", "Weather_Cloudy_Ambient_Loop_Sound_ID",
+    "Weather_Cloudy_Ambient_Night_Color", "Weather_Cloudy_Ambient_Sunrise_Color", "Weather_Cloudy_Ambient_Sunset_Color",
+    "Weather_Cloudy_Cloud_Texture", "Weather_Cloudy_Fog_Day_Color", "Weather_Cloudy_Fog_Night_Color",
+    "Weather_Cloudy_Fog_Sunrise_Color", "Weather_Cloudy_Fog_Sunset_Color", "Weather_Cloudy_Sky_Day_Color",
+    "Weather_Cloudy_Sky_Night_Color", "Weather_Cloudy_Sky_Sunrise_Color", "Weather_Cloudy_Sky_Sunset_Color",
+    "Weather_Cloudy_Sun_Day_Color", "Weather_Cloudy_Sun_Disc_Sunset_Color", "Weather_Cloudy_Sun_Night_Color",
+    "Weather_Cloudy_Sun_Sunrise_Color", "Weather_Cloudy_Sun_Sunset_Color", "Weather_EnvReduceColor",
+    "Weather_Fog_Depth_Change_Speed", "Weather_Foggy_Ambient_Day_Color", "Weather_Foggy_Ambient_Loop_Sound_ID",
+    "Weather_Foggy_Ambient_Night_Color", "Weather_Foggy_Ambient_Sunrise_Color", "Weather_Foggy_Ambient_Sunset_Color",
+    "Weather_Foggy_Cloud_Texture", "Weather_Foggy_Fog_Day_Color", "Weather_Foggy_Fog_Night_Color",
+    "Weather_Foggy_Fog_Sunrise_Color", "Weather_Foggy_Fog_Sunset_Color", "Weather_Foggy_Sky_Day_Color",
+    "Weather_Foggy_Sky_Night_Color", "Weather_Foggy_Sky_Sunrise_Color", "Weather_Foggy_Sky_Sunset_Color",
+    "Weather_Foggy_Sun_Day_Color", "Weather_Foggy_Sun_Disc_Sunset_Color", "Weather_Foggy_Sun_Night_Color",
+    "Weather_Foggy_Sun_Sunrise_Color", "Weather_Foggy_Sun_Sunset_Color", "Weather_LerpCloseColor",
+    "Weather_Overcast_Ambient_Day_Color", "Weather_Overcast_Ambient_Loop_Sound_ID",
+    "Weather_Overcast_Ambient_Night_Color", "Weather_Overcast_Ambient_Sunrise_Color",
+    "Weather_Overcast_Ambient_Sunset_Color", "Weather_Overcast_Cloud_Texture", "Weather_Overcast_Fog_Day_Color",
+    "Weather_Overcast_Fog_Night_Color", "Weather_Overcast_Fog_Sunrise_Color", "Weather_Overcast_Fog_Sunset_Color",
+    "Weather_Overcast_Sky_Day_Color", "Weather_Overcast_Sky_Night_Color", "Weather_Overcast_Sky_Sunrise_Color",
+    "Weather_Overcast_Sky_Sunset_Color", "Weather_Overcast_Sun_Day_Color", "Weather_Overcast_Sun_Disc_Sunset_Color",
+    "Weather_Overcast_Sun_Night_Color", "Weather_Overcast_Sun_Sunrise_Color", "Weather_Overcast_Sun_Sunset_Color",
+    "Weather_Rain_Ambient_Day_Color", "Weather_Rain_Ambient_Loop_Sound_ID", "Weather_Rain_Ambient_Night_Color",
+    "Weather_Rain_Ambient_Sunrise_Color", "Weather_Rain_Ambient_Sunset_Color", "Weather_Rain_Cloud_Texture",
+    "Weather_Rain_Fog_Day_Color", "Weather_Rain_Fog_Night_Color", "Weather_Rain_Fog_Sunrise_Color",
+    "Weather_Rain_Fog_Sunset_Color", "Weather_Rain_Rain_Loop_Sound_ID", "Weather_Rain_Ripple_Radius",
+    "Weather_Rain_Ripple_Scale", "Weather_Rain_Ripple_Speed", "Weather_Rain_Ripples_Per_Drop",
+    "Weather_Rain_Sky_Day_Color", "Weather_Rain_Sky_Night_Color", "Weather_Rain_Sky_Sunrise_Color",
+    "Weather_Rain_Sky_Sunset_Color", "Weather_Rain_Sun_Day_Color", "Weather_Rain_Sun_Disc_Sunset_Color",
+    "Weather_Rain_Sun_Night_Color", "Weather_Rain_Sun_Sunrise_Color", "Weather_Rain_Sun_Sunset_Color",
+    "Weather_Snow_Ambient_Day_Color", "Weather_Snow_Ambient_Loop_Sound_ID", "Weather_Snow_Ambient_Night_Color",
+    "Weather_Snow_Ambient_Sunrise_Color", "Weather_Snow_Ambient_Sunset_Color", "Weather_Snow_Cloud_Texture",
+    "Weather_Snow_Fog_Day_Color", "Weather_Snow_Fog_Night_Color", "Weather_Snow_Fog_Sunrise_Color",
+    "Weather_Snow_Fog_Sunset_Color", "Weather_Snow_Gravity_Scale", "Weather_Snow_High_Kill", "Weather_Snow_Low_Kill",
+    "Weather_Snow_Max_Snowflakes", "Weather_Snow_Ripple_Radius", "Weather_Snow_Ripple_Scale",
+    "Weather_Snow_Ripple_Speed", "Weather_Snow_Ripples_Per_Flake", "Weather_Snow_Sky_Day_Color",
+    "Weather_Snow_Sky_Night_Color", "Weather_Snow_Sky_Sunrise_Color", "Weather_Snow_Sky_Sunset_Color",
+    "Weather_Snow_Snow_Diameter", "Weather_Snow_Snow_Entrance_Speed", "Weather_Snow_Snow_Height_Max",
+    "Weather_Snow_Snow_Height_Min", "Weather_Snow_Snow_Threshold", "Weather_Snow_Sun_Day_Color",
+    "Weather_Snow_Sun_Disc_Sunset_Color", "Weather_Snow_Sun_Night_Color", "Weather_Snow_Sun_Sunrise_Color",
+    "Weather_Snow_Sun_Sunset_Color", "Weather_Sun_Glare_Fader_Color", "Weather_Thunderstorm_Ambient_Day_Color",
+    "Weather_Thunderstorm_Ambient_Loop_Sound_ID", "Weather_Thunderstorm_Ambient_Night_Color",
+    "Weather_Thunderstorm_Ambient_Sunrise_Color", "Weather_Thunderstorm_Ambient_Sunset_Color",
+    "Weather_Thunderstorm_Cloud_Texture", "Weather_Thunderstorm_Fog_Day_Color", "Weather_Thunderstorm_Fog_Night_Color",
     "Weather_Thunderstorm_Fog_Sunrise_Color", "Weather_Thunderstorm_Fog_Sunset_Color",
     "Weather_Thunderstorm_Rain_Loop_Sound_ID", "Weather_Thunderstorm_Sky_Day_Color",
     "Weather_Thunderstorm_Sky_Night_Color", "Weather_Thunderstorm_Sky_Sunrise_Color",
@@ -186,7 +186,7 @@ static const std::set<std::string, std::less<>> allowedKeysNonNumeric = { "Blood
     "Weather_Thunderstorm_Sun_Disc_Sunset_Color", "Weather_Thunderstorm_Sun_Night_Color",
     "Weather_Thunderstorm_Sun_Sunrise_Color", "Weather_Thunderstorm_Sun_Sunset_Color",
     "Weather_Thunderstorm_Thunder_Sound_ID_0", "Weather_Thunderstorm_Thunder_Sound_ID_1",
-    "Weather_Thunderstorm_Thunder_Sound_ID_2", "Weather_Thunderstorm_Thunder_Sound_ID_3", "Weather_Timescale_Clouds",
+    "Weather_Thunderstorm_Thunder_Sound_ID_2", "Weather_Thunderstorm_Thunder_Sound_ID_3",
     "Weather_Clear_Thunder_Sound_ID_0", "Weather_Clear_Thunder_Sound_ID_1", "Weather_Clear_Thunder_Sound_ID_2",
     "Weather_Clear_Thunder_Sound_ID_3", "Weather_Cloudy_Thunder_Sound_ID_0", "Weather_Cloudy_Thunder_Sound_ID_1",
     "Weather_Cloudy_Thunder_Sound_ID_2", "Weather_Cloudy_Thunder_Sound_ID_3", "Weather_Foggy_Thunder_Sound_ID_0",
@@ -214,14 +214,14 @@ static const std::set<std::string, std::less<>> allowedKeysNonNumeric = { "Blood
     "Weather_Blizzard_Thunder_Sound_ID_1", "Weather_Blizzard_Thunder_Sound_ID_2",
     "Weather_Blizzard_Thunder_Sound_ID_3" };
 
-static const std::set<std::string, std::less<>> allowedKeysUnused = { "General_Werewolf_FOV",
-    "Inventory_UniformScaling", "Map_Show_Travel_Lines", "Map_Travel_Boat_Blue", "Map_Travel_Boat_Green",
-    "Map_Travel_Boat_Red", "Map_Travel_Magic_Blue", "Map_Travel_Magic_Green", "Map_Travel_Magic_Red",
-    "Map_Travel_Siltstrider_Blue", "Map_Travel_Siltstrider_Green", "Map_Travel_Siltstrider_Red", "Movies_Game_Logo",
-    "PixelWater_Resolution", "PixelWater_SurfaceFPS", "PixelWater_TileCount", "Movies_Loading", "Movies_Options_Menu",
-    "Movies_Project_Logo", "Water_MaxNumberRipples", "Water_NearWaterUnderwaterFreq", "Water_NearWaterUnderwaterVolume",
-    "Water_PSWaterReflectTerrain", "Water_PSWaterReflectUpdate", "Water_RippleAlphas", "Water_RippleScale",
-    "Water_SurfaceTextureSize", "Water_TileTextureDivisor", "Weather_AlphaReduce", "Weather_Ashstorm_Storm_Threshold",
+static const std::set<std::string_view> allowedKeysUnused = { "Inventory_UniformScaling", "Map_Show_Travel_Lines",
+    "Map_Travel_Boat_Blue", "Map_Travel_Boat_Green", "Map_Travel_Boat_Red", "Map_Travel_Magic_Blue",
+    "Map_Travel_Magic_Green", "Map_Travel_Magic_Red", "Map_Travel_Siltstrider_Blue", "Map_Travel_Siltstrider_Green",
+    "Map_Travel_Siltstrider_Red", "Movies_Game_Logo", "PixelWater_Resolution", "PixelWater_SurfaceFPS",
+    "PixelWater_TileCount", "Movies_Loading", "Movies_Options_Menu", "Movies_Project_Logo",
+    "Water_NearWaterUnderwaterFreq", "Water_NearWaterUnderwaterVolume", "Water_PSWaterReflectTerrain",
+    "Water_PSWaterReflectUpdate", "Water_RippleAlphas", "Water_RippleScale", "Water_SurfaceTextureSize",
+    "Water_TileTextureDivisor", "Weather_AlphaReduce", "Weather_Ashstorm_Storm_Threshold",
     "Weather_Blight_Disease_Chance", "Weather_Blight_Storm_Threshold" };
 
 bool Fallback::isAllowedIntFallbackKey(std::string_view key)
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index ece30e5b3f..7b4cbac864 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -68,6 +68,9 @@ namespace Files
         bool silent = mSilent;
         mSilent = quiet;
 
+        // ensure defaults are present
+        bpo::store(bpo::parsed_options(&description), variables);
+
         std::optional<bpo::variables_map> config = loadConfig(mFixedPath.getLocalPath(), description);
         if (config)
             mActiveConfigPaths.push_back(mFixedPath.getLocalPath());
@@ -194,6 +197,10 @@ namespace Files
             "instead of being appended");
         addOption("user-data", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
             "set user data directory (used for saves, screenshots, etc)");
+        addOption("resources",
+            boost::program_options::value<Files::MaybeQuotedPath>()->default_value(
+                Files::MaybeQuotedPath(), "resources"),
+            "set resources directory");
     }
 
     bpo::variables_map separateComposingVariables(
@@ -309,7 +316,7 @@ namespace Files
                     tempPath /= str.substr(pos + 1, str.length() - pos);
                 }
 
-                path = tempPath;
+                path = std::move(tempPath);
             }
             else
             {
@@ -407,11 +414,6 @@ namespace Files
         return mFixedPath.getLocalPath();
     }
 
-    const std::filesystem::path& ConfigurationManager::getGlobalDataPath() const
-    {
-        return mFixedPath.getGlobalDataPath();
-    }
-
     const std::filesystem::path& ConfigurationManager::getCachePath() const
     {
         return mFixedPath.getCachePath();
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 8a5bca0869..306ea38fe1 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -45,10 +45,8 @@ namespace Files
         const std::filesystem::path& getGlobalPath() const;
         const std::filesystem::path& getLocalPath() const;
 
-        const std::filesystem::path& getGlobalDataPath() const;
         const std::filesystem::path& getUserConfigPath() const;
         const std::filesystem::path& getUserDataPath() const;
-        const std::filesystem::path& getLocalDataPath() const;
         const std::filesystem::path& getInstallPath() const;
         const std::vector<std::filesystem::path>& getActiveConfigPaths() const { return mActiveConfigPaths; }
 
diff --git a/components/files/hash.cpp b/components/files/hash.cpp
index afb59b2e9e..1f1839ed0c 100644
--- a/components/files/hash.cpp
+++ b/components/files/hash.cpp
@@ -1,5 +1,4 @@
 #include "hash.hpp"
-#include "conversion.hpp"
 
 #include <extern/smhasher/MurmurHash3.h>
 
@@ -10,7 +9,7 @@
 
 namespace Files
 {
-    std::array<std::uint64_t, 2> getHash(const std::filesystem::path& fileName, std::istream& stream)
+    std::array<std::uint64_t, 2> getHash(std::string_view fileName, std::istream& stream)
     {
         std::array<std::uint64_t, 2> hash{ 0, 0 };
         try
@@ -35,8 +34,11 @@ namespace Files
         }
         catch (const std::exception& e)
         {
-            throw std::runtime_error(
-                "Error while reading \"" + Files::pathToUnicodeString(fileName) + "\" to get hash: " + e.what());
+            std::string message = "Error while reading \"";
+            message += fileName;
+            message += "\" to get hash: ";
+            message += e.what();
+            throw std::runtime_error(message);
         }
         return hash;
     }
diff --git a/components/files/hash.hpp b/components/files/hash.hpp
index 0e6ce29ab5..48c373b971 100644
--- a/components/files/hash.hpp
+++ b/components/files/hash.hpp
@@ -3,12 +3,12 @@
 
 #include <array>
 #include <cstdint>
-#include <filesystem>
 #include <iosfwd>
+#include <string_view>
 
 namespace Files
 {
-    std::array<std::uint64_t, 2> getHash(const std::filesystem::path& fileName, std::istream& stream);
+    std::array<std::uint64_t, 2> getHash(std::string_view fileName, std::istream& stream);
 }
 
 #endif
diff --git a/components/files/macospath.cpp b/components/files/macospath.cpp
index 2d0a409782..4b37c2fb26 100644
--- a/components/files/macospath.cpp
+++ b/components/files/macospath.cpp
@@ -5,13 +5,41 @@
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
+#include <mach-o/dyld.h>
 #include <pwd.h>
 #include <unistd.h>
+#include <vector>
 
+#include <components/debug/debuglog.hpp>
 #include <components/misc/strings/lower.hpp>
 
 namespace
 {
+    std::filesystem::path getBinaryPath()
+    {
+        uint32_t bufsize = 0;
+        _NSGetExecutablePath(nullptr, &bufsize);
+
+        std::vector<char> buf(bufsize);
+
+        if (_NSGetExecutablePath(buf.data(), &bufsize) == 0)
+        {
+            std::filesystem::path path = std::filesystem::path(buf.begin(), buf.end());
+
+            if (std::filesystem::is_symlink(path))
+            {
+                return std::filesystem::read_symlink(path);
+            }
+
+            return path;
+        }
+        else
+        {
+            Log(Debug::Warning) << "Not enough buffer size to get executable path: " << bufsize;
+            throw std::runtime_error("Failed to get executable path");
+        }
+    }
+
     std::filesystem::path getUserHome()
     {
         const char* dir = getenv("HOME");
@@ -36,6 +64,11 @@ namespace Files
     MacOsPath::MacOsPath(const std::string& application_name)
         : mName(application_name)
     {
+        std::filesystem::path binary_path = getBinaryPath();
+        std::error_code ec;
+        std::filesystem::current_path(binary_path.parent_path(), ec);
+        if (ec.value() != 0)
+            Log(Debug::Warning) << "Error " << ec.message() << " when changing current directory";
     }
 
     std::filesystem::path MacOsPath::getUserConfigPath() const
diff --git a/components/files/qtconfigpath.hpp b/components/files/qtconfigpath.hpp
index e6d7b4202c..16e0499cd5 100644
--- a/components/files/qtconfigpath.hpp
+++ b/components/files/qtconfigpath.hpp
@@ -22,6 +22,16 @@ namespace Files
     {
         return Files::pathToQString(cfgMgr.getGlobalPath() / openmwCfgFile);
     }
+
+    inline QStringList getActiveConfigPathsQString(const Files::ConfigurationManager& cfgMgr)
+    {
+        const auto& activePaths = cfgMgr.getActiveConfigPaths();
+        QStringList result;
+        result.reserve(static_cast<int>(activePaths.size()));
+        for (const auto& path : activePaths)
+            result.append(Files::pathToQString(path / openmwCfgFile));
+        return result;
+    }
 }
 
 #endif // OPENMW_COMPONENTS_FILES_QTCONFIGPATH_H
diff --git a/components/files/windowspath.cpp b/components/files/windowspath.cpp
index 9be3d13a46..bbe0325b58 100644
--- a/components/files/windowspath.cpp
+++ b/components/files/windowspath.cpp
@@ -101,7 +101,7 @@ namespace Files
         {
             // Key existed, let's try to read the install dir
             std::array<wchar_t, 512> buf{};
-            DWORD len = buf.size() * sizeof(wchar_t);
+            DWORD len = static_cast<DWORD>(buf.size() * sizeof(wchar_t));
 
             if (RegQueryValueExW(hKey, L"Installed Path", nullptr, nullptr, reinterpret_cast<LPBYTE>(buf.data()), &len)
                 == ERROR_SUCCESS)
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 9434578220..c84392c421 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -58,7 +58,7 @@ namespace
                 MyGUI::xml::ElementPtr sizeProperty = getProperty(layersIterator.current(), "Size");
                 if (sizeProperty != nullptr)
                 {
-                    std::string sizeValue = sizeProperty->findAttribute("value");
+                    auto sizeValue = sizeProperty->findAttribute("value");
                     if (!sizeValue.empty())
                         return MyGUI::IntSize::parse(sizeValue);
                 }
@@ -448,6 +448,63 @@ namespace Gui
         source->addAttribute("value", bitmapFilename);
         MyGUI::xml::ElementPtr codes = root->createChild("Codes");
 
+        // Fall back from unavailable Windows-1252 encoding symbols to similar characters available in the game
+        // fonts
+        std::multimap<int, int> additional; // fallback glyph index, unicode
+        additional.emplace(156, 0x00A2); // cent sign
+        additional.emplace(89, 0x00A5); // yen sign
+        additional.emplace(221, 0x00A6); // broken bar
+        additional.emplace(99, 0x00A9); // copyright sign
+        additional.emplace(97, 0x00AA); // prima ordinal indicator
+        additional.emplace(60, 0x00AB); // double left-pointing angle quotation mark
+        additional.emplace(45, 0x00AD); // soft hyphen
+        additional.emplace(114, 0x00AE); // registered trademark symbol
+        additional.emplace(45, 0x00AF); // macron
+        additional.emplace(241, 0x00B1); // plus-minus sign
+        additional.emplace(50, 0x00B2); // superscript two
+        additional.emplace(51, 0x00B3); // superscript three
+        additional.emplace(44, 0x00B8); // cedilla
+        additional.emplace(49, 0x00B9); // superscript one
+        additional.emplace(111, 0x00BA); // primo ordinal indicator
+        additional.emplace(62, 0x00BB); // double right-pointing angle quotation mark
+        additional.emplace(63, 0x00BF); // inverted question mark
+        additional.emplace(65, 0x00C6); // latin capital ae ligature
+        additional.emplace(79, 0x00D8); // latin capital o with stroke
+        additional.emplace(97, 0x00E6); // latin small ae ligature
+        additional.emplace(111, 0x00F8); // latin small o with stroke
+        additional.emplace(79, 0x0152); // latin capital oe ligature
+        additional.emplace(111, 0x0153); // latin small oe ligature
+        additional.emplace(83, 0x015A); // latin capital s with caron
+        additional.emplace(115, 0x015B); // latin small s with caron
+        additional.emplace(89, 0x0178); // latin capital y with diaresis
+        additional.emplace(90, 0x017D); // latin capital z with caron
+        additional.emplace(122, 0x017E); // latin small z with caron
+        additional.emplace(102, 0x0192); // latin small f with hook
+        additional.emplace(94, 0x02C6); // circumflex modifier
+        additional.emplace(126, 0x02DC); // small tilde
+        additional.emplace(69, 0x0401); // cyrillic capital io (no diaeresis latin e is available)
+        additional.emplace(137, 0x0451); // cyrillic small io
+        additional.emplace(45, 0x2012); // figure dash
+        additional.emplace(45, 0x2013); // en dash
+        additional.emplace(45, 0x2014); // em dash
+        additional.emplace(39, 0x2018); // left single quotation mark
+        additional.emplace(39, 0x2019); // right single quotation mark
+        additional.emplace(44, 0x201A); // single low quotation mark
+        additional.emplace(39, 0x201B); // single high quotation mark (reversed)
+        additional.emplace(34, 0x201C); // left double quotation mark
+        additional.emplace(34, 0x201D); // right double quotation mark
+        additional.emplace(44, 0x201E); // double low quotation mark
+        additional.emplace(34, 0x201F); // double high quotation mark (reversed)
+        additional.emplace(43, 0x2020); // dagger
+        additional.emplace(216, 0x2021); // double dagger (note: this glyph is not available)
+        additional.emplace(46, 0x2026); // ellipsis
+        additional.emplace(37, 0x2030); // per mille sign
+        additional.emplace(60, 0x2039); // single left-pointing angle quotation mark
+        additional.emplace(62, 0x203A); // single right-pointing angle quotation mark
+        additional.emplace(101, 0x20AC); // euro sign
+        additional.emplace(84, 0x2122); // trademark sign
+        additional.emplace(45, 0x2212); // minus sign
+
         for (int i = 0; i < 256; i++)
         {
             float x1 = data[i].top_left.x * width;
@@ -470,69 +527,10 @@ namespace Gui
             code->addAttribute(
                 "size", MyGUI::IntSize(static_cast<int>(data[i].width), static_cast<int>(data[i].height)));
 
-            // Fall back from unavailable Windows-1252 encoding symbols to similar characters available in the game
-            // fonts
-            std::multimap<int, int> additional; // fallback glyph index, unicode
-            additional.insert(std::make_pair(156, 0x00A2)); // cent sign
-            additional.insert(std::make_pair(89, 0x00A5)); // yen sign
-            additional.insert(std::make_pair(221, 0x00A6)); // broken bar
-            additional.insert(std::make_pair(99, 0x00A9)); // copyright sign
-            additional.insert(std::make_pair(97, 0x00AA)); // prima ordinal indicator
-            additional.insert(std::make_pair(60, 0x00AB)); // double left-pointing angle quotation mark
-            additional.insert(std::make_pair(45, 0x00AD)); // soft hyphen
-            additional.insert(std::make_pair(114, 0x00AE)); // registered trademark symbol
-            additional.insert(std::make_pair(45, 0x00AF)); // macron
-            additional.insert(std::make_pair(241, 0x00B1)); // plus-minus sign
-            additional.insert(std::make_pair(50, 0x00B2)); // superscript two
-            additional.insert(std::make_pair(51, 0x00B3)); // superscript three
-            additional.insert(std::make_pair(44, 0x00B8)); // cedilla
-            additional.insert(std::make_pair(49, 0x00B9)); // superscript one
-            additional.insert(std::make_pair(111, 0x00BA)); // primo ordinal indicator
-            additional.insert(std::make_pair(62, 0x00BB)); // double right-pointing angle quotation mark
-            additional.insert(std::make_pair(63, 0x00BF)); // inverted question mark
-            additional.insert(std::make_pair(65, 0x00C6)); // latin capital ae ligature
-            additional.insert(std::make_pair(79, 0x00D8)); // latin capital o with stroke
-            additional.insert(std::make_pair(97, 0x00E6)); // latin small ae ligature
-            additional.insert(std::make_pair(111, 0x00F8)); // latin small o with stroke
-            additional.insert(std::make_pair(79, 0x0152)); // latin capital oe ligature
-            additional.insert(std::make_pair(111, 0x0153)); // latin small oe ligature
-            additional.insert(std::make_pair(83, 0x015A)); // latin capital s with caron
-            additional.insert(std::make_pair(115, 0x015B)); // latin small s with caron
-            additional.insert(std::make_pair(89, 0x0178)); // latin capital y with diaresis
-            additional.insert(std::make_pair(90, 0x017D)); // latin capital z with caron
-            additional.insert(std::make_pair(122, 0x017E)); // latin small z with caron
-            additional.insert(std::make_pair(102, 0x0192)); // latin small f with hook
-            additional.insert(std::make_pair(94, 0x02C6)); // circumflex modifier
-            additional.insert(std::make_pair(126, 0x02DC)); // small tilde
-            additional.insert(std::make_pair(69, 0x0401)); // cyrillic capital io (no diaeresis latin e is available)
-            additional.insert(std::make_pair(137, 0x0451)); // cyrillic small io
-            additional.insert(std::make_pair(45, 0x2012)); // figure dash
-            additional.insert(std::make_pair(45, 0x2013)); // en dash
-            additional.insert(std::make_pair(45, 0x2014)); // em dash
-            additional.insert(std::make_pair(39, 0x2018)); // left single quotation mark
-            additional.insert(std::make_pair(39, 0x2019)); // right single quotation mark
-            additional.insert(std::make_pair(44, 0x201A)); // single low quotation mark
-            additional.insert(std::make_pair(39, 0x201B)); // single high quotation mark (reversed)
-            additional.insert(std::make_pair(34, 0x201C)); // left double quotation mark
-            additional.insert(std::make_pair(34, 0x201D)); // right double quotation mark
-            additional.insert(std::make_pair(44, 0x201E)); // double low quotation mark
-            additional.insert(std::make_pair(34, 0x201F)); // double high quotation mark (reversed)
-            additional.insert(std::make_pair(43, 0x2020)); // dagger
-            additional.insert(std::make_pair(216, 0x2021)); // double dagger (note: this glyph is not available)
-            additional.insert(std::make_pair(46, 0x2026)); // ellipsis
-            additional.insert(std::make_pair(37, 0x2030)); // per mille sign
-            additional.insert(std::make_pair(60, 0x2039)); // single left-pointing angle quotation mark
-            additional.insert(std::make_pair(62, 0x203A)); // single right-pointing angle quotation mark
-            additional.insert(std::make_pair(101, 0x20AC)); // euro sign
-            additional.insert(std::make_pair(84, 0x2122)); // trademark sign
-            additional.insert(std::make_pair(45, 0x2212)); // minus sign
-
-            for (const auto& [key, value] : additional)
+            for (auto [it, end] = additional.equal_range(i); it != end; ++it)
             {
-                if (key != i)
-                    continue;
                 code = codes->createChild("Code");
-                code->addAttribute("index", value);
+                code->addAttribute("index", it->second);
                 code->addAttribute("coord",
                     MyGUI::utility::toString(x1) + " " + MyGUI::utility::toString(y1) + " "
                         + MyGUI::utility::toString(w) + " " + MyGUI::utility::toString(h));
@@ -608,13 +606,13 @@ namespace Gui
         MyGUI::ResourceManager::getInstance().addResource(bookFont);
     }
 
-    void FontLoader::overrideLineHeight(MyGUI::xml::ElementPtr _node, const std::string& _file, MyGUI::Version _version)
+    void FontLoader::overrideLineHeight(MyGUI::xml::ElementPtr _node, std::string_view _file, MyGUI::Version _version)
     {
         // We should adjust line height for MyGUI widgets depending on font size
         MyGUI::xml::ElementEnumerator resourceNode = _node->getElementEnumerator();
         while (resourceNode.next("Resource"))
         {
-            std::string type = resourceNode->findAttribute("type");
+            auto type = resourceNode->findAttribute("type");
 
             if (Misc::StringUtils::ciEqual(type, "ResourceLayout"))
             {
diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp
index 8c1312ff97..7e9220d58d 100644
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@@ -27,7 +27,7 @@ namespace Gui
     public:
         FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor);
 
-        void overrideLineHeight(MyGUI::xml::ElementPtr _node, const std::string& _file, MyGUI::Version _version);
+        void overrideLineHeight(MyGUI::xml::ElementPtr _node, std::string_view _file, MyGUI::Version _version);
 
         static std::string_view getFontForFace(std::string_view face);
 
diff --git a/components/fx/lexer.hpp b/components/fx/lexer.hpp
index 01b3a3a56a..fc7d4ec9d7 100644
--- a/components/fx/lexer.hpp
+++ b/components/fx/lexer.hpp
@@ -30,7 +30,7 @@ namespace fx
         public:
             struct Block
             {
-                int line;
+                std::size_t line;
                 std::string_view content;
             };
 
diff --git a/components/fx/parse_constants.hpp b/components/fx/parse_constants.hpp
index 9be54ed3a7..2057476f3e 100644
--- a/components/fx/parse_constants.hpp
+++ b/components/fx/parse_constants.hpp
@@ -35,7 +35,7 @@ namespace fx
             { "bgra", GL_BGRA },
         } };
 
-        constexpr std::array<std::pair<std::string_view, int>, 9> SourceType = { {
+        constexpr std::array<std::pair<std::string_view, int>, 10> SourceType = { {
             { "byte", GL_BYTE },
             { "unsigned_byte", GL_UNSIGNED_BYTE },
             { "short", GL_SHORT },
@@ -43,6 +43,7 @@ namespace fx
             { "int", GL_INT },
             { "unsigned_int", GL_UNSIGNED_INT },
             { "unsigned_int_24_8", GL_UNSIGNED_INT_24_8 },
+            { "half_float", GL_HALF_FLOAT },
             { "float", GL_FLOAT },
             { "double", GL_DOUBLE },
         } };
@@ -129,4 +130,4 @@ namespace fx
     }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index 7a7329d755..cf50d20fe2 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -12,10 +12,10 @@
 #include <osg/StateSet>
 
 #include <components/resource/scenemanager.hpp>
-#include <components/sceneutil/clearcolor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/settings/values.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/version/version.hpp>
 
 #include "stateupdater.hpp"
 #include "technique.hpp"
@@ -68,6 +68,7 @@ namespace fx
 
 @uboStruct
 
+#define OMW_API_VERSION @apiVersion
 #define OMW_REVERSE_Z @reverseZ
 #define OMW_RADIAL_FOG @radialFog
 #define OMW_EXPONENTIAL_FOG @exponentialFog
@@ -90,6 +91,7 @@ uniform @builtinSampler omw_SamplerLastShader;
 uniform @builtinSampler omw_SamplerLastPass;
 uniform @builtinSampler omw_SamplerDepth;
 uniform @builtinSampler omw_SamplerNormals;
+uniform @builtinSampler omw_SamplerDistortion;
 
 uniform vec4 omw_PointLights[@pointLightCount];
 uniform int omw_PointLightsCount;
@@ -190,6 +192,11 @@ mat4 omw_InvProjectionMatrix()
 #endif
     }
 
+    vec3 omw_GetNormalsWorldSpace(vec2 uv)
+    {
+        return (vec4(omw_GetNormals(uv), 0.0) * omw.viewMatrix).rgb;
+    }
+
     vec3 omw_GetWorldPosFromUV(vec2 uv)
     {
         float depth = omw_GetDepth(uv);
@@ -255,6 +262,7 @@ float omw_EstimateFogCoverageFromUV(vec2 uv)
 
         const std::vector<std::pair<std::string, std::string>> defines
             = { { "@pointLightCount", std::to_string(SceneUtil::PPLightBuffer::sMaxPPLightsArraySize) },
+                  { "@apiVersion", std::to_string(Version::getPostprocessingApiRevision()) },
                   { "@version", std::to_string(technique.getGLSLVersion()) },
                   { "@multiview", Stereo::getMultiview() ? "1" : "0" },
                   { "@builtinSampler", Stereo::getMultiview() ? "sampler2DArray" : "sampler2D" },
@@ -321,9 +329,6 @@ float omw_EstimateFogCoverageFromUV(vec2 uv)
 
         if (mBlendEq)
             stateSet->setAttributeAndModes(new osg::BlendEquation(mBlendEq.value()));
-
-        if (mClearColor)
-            stateSet->setAttributeAndModes(new SceneUtil::ClearColor(mClearColor.value(), GL_COLOR_BUFFER_BIT));
     }
 
     void Pass::dirty()
@@ -339,7 +344,7 @@ float omw_EstimateFogCoverageFromUV(vec2 uv)
         if (mCompiled)
             return;
 
-        mLegacyGLSL = technique.getGLSLVersion() != 330;
+        mLegacyGLSL = technique.getGLSLVersion() < 330;
 
         if (mType == Type::Pixel)
         {
diff --git a/components/fx/pass.hpp b/components/fx/pass.hpp
index 509127a163..e176afc699 100644
--- a/components/fx/pass.hpp
+++ b/components/fx/pass.hpp
@@ -72,7 +72,6 @@ namespace fx
         std::array<std::string, 3> mRenderTargets;
 
         std::string mTarget;
-        std::optional<osg::Vec4f> mClearColor;
 
         std::optional<osg::BlendFunc::BlendFuncMode> mBlendSource;
         std::optional<osg::BlendFunc::BlendFuncMode> mBlendDest;
diff --git a/components/fx/stateupdater.cpp b/components/fx/stateupdater.cpp
index 42f290eadf..9e86f25b9c 100644
--- a/components/fx/stateupdater.cpp
+++ b/components/fx/stateupdater.cpp
@@ -7,6 +7,8 @@
 
 namespace fx
 {
+    std::string StateUpdater::sDefinition = UniformData::getDefinition("_omw_data");
+
     StateUpdater::StateUpdater(bool useUBO)
         : mUseUBO(useUBO)
     {
diff --git a/components/fx/stateupdater.hpp b/components/fx/stateupdater.hpp
index c4bf71642c..33a7a09fe6 100644
--- a/components/fx/stateupdater.hpp
+++ b/components/fx/stateupdater.hpp
@@ -43,6 +43,7 @@ namespace fx
         void setSunPos(const osg::Vec4f& pos, bool night)
         {
             mData.get<SunPos>() = pos;
+            mData.get<SunPos>().normalize();
 
             if (night)
                 mData.get<SunPos>().z() *= -1.f;
@@ -88,6 +89,8 @@ namespace fx
 
         void setDeltaSimulationTime(float time) { mData.get<DeltaSimulationTime>() = time; }
 
+        void setFrameNumber(int frame) { mData.get<FrameNumber>() = frame; }
+
         void setWindSpeed(float speed) { mData.get<WindSpeed>() = speed; }
 
         void setWeatherTransition(float transition)
@@ -100,11 +103,7 @@ namespace fx
             mPointLightBuffer = std::move(buffer);
         }
 
-        static std::string getStructDefinition()
-        {
-            static std::string definition = UniformData::getDefinition("_omw_data");
-            return definition;
-        }
+        static const std::string& getStructDefinition() { return sDefinition; }
 
         void setDefaults(osg::StateSet* stateset) override;
 
@@ -236,6 +235,11 @@ namespace fx
             static constexpr std::string_view sName = "deltaSimulationTime";
         };
 
+        struct FrameNumber : std140::Int
+        {
+            static constexpr std::string_view sName = "frameNumber";
+        };
+
         struct WindSpeed : std140::Float
         {
             static constexpr std::string_view sName = "windSpeed";
@@ -270,11 +274,13 @@ namespace fx
             = std140::UBO<ProjectionMatrix, InvProjectionMatrix, ViewMatrix, PrevViewMatrix, InvViewMatrix, EyePos,
                 EyeVec, FogColor, AmbientColor, SkyColor, SunColor, SunPos, Resolution, RcpResolution, FogNear, FogFar,
                 Near, Far, Fov, GameHour, SunVis, WaterHeight, IsWaterEnabled, SimulationTime, DeltaSimulationTime,
-                WindSpeed, WeatherTransition, WeatherID, NextWeatherID, IsUnderwater, IsInterior>;
+                FrameNumber, WindSpeed, WeatherTransition, WeatherID, NextWeatherID, IsUnderwater, IsInterior>;
 
         UniformData mData;
         bool mUseUBO;
 
+        static std::string sDefinition;
+
         std::shared_ptr<SceneUtil::PPLightBuffer> mPointLightBuffer;
     };
 }
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index fd1556674f..c99d30a1de 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -37,11 +37,22 @@ namespace
 
 namespace fx
 {
+    namespace
+    {
+        VFS::Path::Normalized makeFilePath(std::string_view name)
+        {
+            std::string fileName(name);
+            fileName += Technique::sExt;
+            VFS::Path::Normalized result(Technique::sSubdir);
+            result /= fileName;
+            return result;
+        }
+    }
+
     Technique::Technique(const VFS::Manager& vfs, Resource::ImageManager& imageManager, std::string name, int width,
         int height, bool ubo, bool supportsNormals)
         : mName(std::move(name))
-        , mFileName(Files::pathToUnicodeString(
-              (Files::pathFromUnicodeString(Technique::sSubdir) / (mName + Technique::sExt))))
+        , mFilePath(makeFilePath(mName))
         , mLastModificationTime(std::filesystem::file_time_type::clock::now())
         , mWidth(width)
         , mHeight(height)
@@ -98,9 +109,9 @@ namespace fx
     {
         clear();
 
-        if (!mVFS.exists(mFileName))
+        if (!mVFS.exists(mFilePath))
         {
-            Log(Debug::Error) << "Could not load technique, file does not exist '" << mFileName << "'";
+            Log(Debug::Error) << "Could not load technique, file does not exist '" << mFilePath << "'";
 
             mStatus = Status::File_Not_exists;
             return false;
@@ -167,7 +178,7 @@ namespace fx
             mStatus = Status::Parse_Error;
 
             mLastError = "Failed parsing technique '" + getName() + "' " + e.what();
-            ;
+
             Log(Debug::Error) << mLastError;
         }
 
@@ -179,11 +190,6 @@ namespace fx
         return mName;
     }
 
-    std::string Technique::getFileName() const
-    {
-        return mFileName;
-    }
-
     bool Technique::setLastModificationTime(std::filesystem::file_time_type timeStamp)
     {
         const bool isDirty = timeStamp != mLastModificationTime;
@@ -279,6 +285,7 @@ namespace fx
         rt.mTarget->setSourceType(GL_UNSIGNED_BYTE);
         rt.mTarget->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         rt.mTarget->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        rt.mTarget->setName(std::string(mBlockName));
 
         while (!isNext<Lexer::Close_bracket>() && !isNext<Lexer::Eof>())
         {
@@ -312,6 +319,8 @@ namespace fx
                 rt.mTarget->setSourceFormat(parseSourceFormat());
             else if (key == "mipmaps")
                 rt.mMipMap = parseBool();
+            else if (key == "clear_color")
+                rt.mClearColor = parseVec<osg::Vec4f, Lexer::Vec4>();
             else
                 error(Misc::StringUtils::format("unexpected key '%s'", std::string(key)));
 
@@ -436,7 +445,8 @@ namespace fx
             else if (key == "source")
             {
                 expect<Lexer::String>();
-                auto image = mImageManager.getImage(std::string{ std::get<Lexer::String>(mToken).value }, is3D);
+                const osg::ref_ptr<osg::Image> image
+                    = mImageManager.getImage(VFS::Path::Normalized(std::get<Lexer::String>(mToken).value), is3D);
                 if constexpr (is1D)
                 {
                     type = Types::SamplerType::Texture_1D;
@@ -489,6 +499,37 @@ namespace fx
         mDefinedUniforms.emplace_back(std::move(uniform));
     }
 
+    template <class SrcT, class T>
+    SrcT Technique::getUniformValue()
+    {
+        constexpr bool isVec
+            = std::is_same_v<osg::Vec2f, SrcT> || std::is_same_v<osg::Vec3f, SrcT> || std::is_same_v<osg::Vec4f, SrcT>;
+        constexpr bool isFloat = std::is_same_v<float, SrcT>;
+        constexpr bool isInt = std::is_same_v<int, SrcT>;
+        constexpr bool isBool = std::is_same_v<bool, SrcT>;
+
+        static_assert(isVec || isFloat || isInt || isBool, "Unsupported type");
+
+        if constexpr (isVec)
+        {
+            return parseVec<SrcT, T>();
+        }
+        else if constexpr (isFloat)
+        {
+            return parseFloat();
+        }
+        else if constexpr (isInt)
+        {
+            return parseInteger();
+        }
+        else if constexpr (isBool)
+        {
+            return parseBool();
+        }
+
+        error(Misc::StringUtils::format("failed setting uniform type"));
+    }
+
     template <class SrcT, class T>
     void Technique::parseUniform()
     {
@@ -506,28 +547,13 @@ namespace fx
 
             expect<Lexer::Equal>("error parsing config for uniform block");
 
-            constexpr bool isVec = std::is_same_v<osg::Vec2f,
-                                       SrcT> || std::is_same_v<osg::Vec3f, SrcT> || std::is_same_v<osg::Vec4f, SrcT>;
-            constexpr bool isFloat = std::is_same_v<float, SrcT>;
-            constexpr bool isInt = std::is_same_v<int, SrcT>;
-            constexpr bool isBool = std::is_same_v<bool, SrcT>;
-
-            static_assert(isVec || isFloat || isInt || isBool, "Unsupported type");
-
             if (key == "default")
             {
-                if constexpr (isVec)
-                    data.mDefault = parseVec<SrcT, T>();
-                else if constexpr (isFloat)
-                    data.mDefault = parseFloat();
-                else if constexpr (isInt)
-                    data.mDefault = parseInteger();
-                else if constexpr (isBool)
-                    data.mDefault = parseBool();
+                data.mDefault = getUniformValue<SrcT, T>();
             }
             else if (key == "size")
             {
-                if constexpr (isBool)
+                if constexpr (std::is_same_v<bool, SrcT>)
                     error("bool arrays currently unsupported");
 
                 int size = parseInteger();
@@ -536,25 +562,11 @@ namespace fx
             }
             else if (key == "min")
             {
-                if constexpr (isVec)
-                    data.mMin = parseVec<SrcT, T>();
-                else if constexpr (isFloat)
-                    data.mMin = parseFloat();
-                else if constexpr (isInt)
-                    data.mMin = parseInteger();
-                else if constexpr (isBool)
-                    data.mMin = parseBool();
+                data.mMin = getUniformValue<SrcT, T>();
             }
             else if (key == "max")
             {
-                if constexpr (isVec)
-                    data.mMax = parseVec<SrcT, T>();
-                else if constexpr (isFloat)
-                    data.mMax = parseFloat();
-                else if constexpr (isInt)
-                    data.mMax = parseInteger();
-                else if constexpr (isBool)
-                    data.mMax = parseBool();
+                data.mMax = getUniformValue<SrcT, T>();
             }
             else if (key == "step")
                 uniform->mStep = parseFloat();
@@ -562,18 +574,19 @@ namespace fx
                 uniform->mStatic = parseBool();
             else if (key == "description")
             {
-                expect<Lexer::String>();
-                uniform->mDescription = std::get<Lexer::String>(mToken).value;
+                uniform->mDescription = parseString();
             }
             else if (key == "header")
             {
-                expect<Lexer::String>();
-                uniform->mHeader = std::get<Lexer::String>(mToken).value;
+                uniform->mHeader = parseString();
             }
             else if (key == "display_name")
             {
-                expect<Lexer::String>();
-                uniform->mDisplayName = std::get<Lexer::String>(mToken).value;
+                uniform->mDisplayName = parseString();
+            }
+            else if (key == "widget_type")
+            {
+                parseWidgetType<SrcT, T>(data);
             }
             else
                 error(Misc::StringUtils::format("unexpected key '%s'", std::string{ key }));
@@ -797,9 +810,6 @@ namespace fx
         if (!pass)
             pass = std::make_shared<fx::Pass>();
 
-        bool clear = true;
-        osg::Vec4f clearColor = { 1, 1, 1, 1 };
-
         while (!isNext<Lexer::Eof>())
         {
             expect<Lexer::Literal>("invalid key in block header");
@@ -843,10 +853,6 @@ namespace fx
                 if (blendEq != osg::BlendEquation::FUNC_ADD)
                     pass->mBlendEq = blendEq;
             }
-            else if (key == "clear")
-                clear = parseBool();
-            else if (key == "clear_color")
-                clearColor = parseVec<osg::Vec4f, Lexer::Vec4>();
             else
                 error(Misc::StringUtils::format("unrecognized key '%s' in block header", std::string(key)));
 
@@ -864,9 +870,6 @@ namespace fx
                 return;
         }
 
-        if (clear)
-            pass->mClearColor = clearColor;
-
         error("malformed block header");
     }
 
@@ -916,6 +919,11 @@ namespace fx
                 return mode;
         }
 
+        if (asLiteral() == "clamp")
+            error(
+                "unsupported wrap mode 'clamp'; 'clamp_to_edge' was likely intended, look for an updated shader or "
+                "contact author");
+
         error(Misc::StringUtils::format("unrecognized wrap mode '%s'", std::string{ asLiteral() }));
     }
 
@@ -997,6 +1005,60 @@ namespace fx
         error(Misc::StringUtils::format("unrecognized blend function '%s'", std::string{ asLiteral() }));
     }
 
+    template <class SrcT, class T>
+    void Technique::parseWidgetType(Types::Uniform<SrcT>& uniform)
+    {
+        expect<Lexer::Literal>();
+
+        if (asLiteral() == "choice")
+        {
+            /* Example usage
+
+               widget_type = choice(
+                "Option A": <T>,
+                "Option B": <T>,
+                "Option C": <T>
+               );
+
+            */
+            expect<Lexer::Open_Parenthesis>();
+
+            std::vector<fx::Types::Choice<SrcT>> choices;
+
+            while (!isNext<Lexer::Eof>())
+            {
+                fx::Types::Choice<SrcT> choice;
+                choice.mLabel = parseString();
+                expect<Lexer::Equal>();
+                choice.mValue = getUniformValue<SrcT, T>();
+                choices.push_back(choice);
+
+                if (isNext<Lexer::Comma>())
+                {
+                    mToken = mLexer->next();
+
+                    // Handle leading comma
+                    if (isNext<Lexer::Close_Parenthesis>())
+                    {
+                        break;
+                    }
+
+                    continue;
+                }
+
+                break;
+            }
+
+            uniform.mChoices = std::move(choices);
+
+            expect<Lexer::Close_Parenthesis>();
+        }
+        else
+        {
+            error(Misc::StringUtils::format("unrecognized widget type '%s'", std::string{ asLiteral() }));
+        }
+    }
+
     bool Technique::parseBool()
     {
         mToken = mLexer->next();
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index 844e4b552a..2778763a9a 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -13,6 +13,8 @@
 #include <osg/StateSet>
 #include <osg/Texture2D>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "lexer.hpp"
 #include "pass.hpp"
 #include "types.hpp"
@@ -54,10 +56,14 @@ namespace fx
             osg::ref_ptr<osg::FrameBufferObject> mRenderTarget;
             osg::ref_ptr<osg::Texture2D> mRenderTexture;
             bool mResolve = false;
+            Types::SizeProxy mSize;
+            bool mMipMap = false;
 
             SubPass(const SubPass& other, const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY)
                 : mStateSet(new osg::StateSet(*other.mStateSet, copyOp))
                 , mResolve(other.mResolve)
+                , mSize(other.mSize)
+                , mMipMap(other.mMipMap)
             {
                 if (other.mRenderTarget)
                     mRenderTarget = new osg::FrameBufferObject(*other.mRenderTarget, copyOp);
@@ -99,8 +105,8 @@ namespace fx
         using UniformMap = std::vector<std::shared_ptr<Types::UniformBase>>;
         using RenderTargetMap = std::unordered_map<std::string_view, Types::RenderTarget>;
 
-        inline static std::string sExt = ".omwfx";
-        inline static std::string sSubdir = "shaders";
+        static constexpr std::string_view sExt = ".omwfx";
+        static constexpr std::string_view sSubdir = "shaders";
 
         enum class Status
         {
@@ -124,7 +130,7 @@ namespace fx
 
         std::string getName() const;
 
-        std::string getFileName() const;
+        const VFS::Path::Normalized& getFileName() const { return mFilePath; }
 
         bool setLastModificationTime(std::filesystem::file_time_type timeStamp);
 
@@ -171,6 +177,9 @@ namespace fx
         void setLocked(bool locked) { mLocked = locked; }
         bool getLocked() const { return mLocked; }
 
+        void setInternal(bool internal) { mInternal = internal; }
+        bool getInternal() const { return mInternal; }
+
     private:
         [[noreturn]] void error(const std::string& msg);
 
@@ -219,6 +228,12 @@ namespace fx
 
         int parseSourceFormat();
 
+        template <class SrcT, class T>
+        void parseWidgetType(Types::Uniform<SrcT>& uniform);
+
+        template <class SrcT, class T>
+        SrcT getUniformValue();
+
         osg::BlendEquation::Equation parseBlendEquation();
 
         osg::BlendFunc::BlendFuncMode parseBlendFuncMode();
@@ -244,7 +259,7 @@ namespace fx
 
         std::string mShared;
         std::string mName;
-        std::string mFileName;
+        VFS::Path::Normalized mFilePath;
         std::string_view mBlockName;
         std::string_view mAuthor;
         std::string_view mDescription;
@@ -291,6 +306,7 @@ namespace fx
 
         bool mDynamic = false;
         bool mLocked = false;
+        bool mInternal = false;
     };
 
     template <>
diff --git a/components/fx/types.hpp b/components/fx/types.hpp
index 09f191c61c..596b54c217 100644
--- a/components/fx/types.hpp
+++ b/components/fx/types.hpp
@@ -4,15 +4,9 @@
 #include <optional>
 #include <variant>
 
-#include <osg/BlendEquation>
-#include <osg/BlendFunc>
-#include <osg/Camera>
-#include <osg/FrameBufferObject>
 #include <osg/Texture2D>
 #include <osg/Uniform>
 
-#include <MyGUI_Widget.h>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/format.hpp>
 #include <components/sceneutil/depth.hpp>
@@ -53,6 +47,14 @@ namespace fx
             osg::ref_ptr<osg::Texture2D> mTarget = new osg::Texture2D;
             SizeProxy mSize;
             bool mMipMap = false;
+            osg::Vec4f mClearColor = osg::Vec4f(0.0, 0.0, 0.0, 1.0);
+        };
+
+        template <class T>
+        struct Choice
+        {
+            std::string mLabel;
+            T mValue;
         };
 
         template <class T>
@@ -65,6 +67,8 @@ namespace fx
             T mMin = std::numeric_limits<T>::lowest();
             T mMax = std::numeric_limits<T>::max();
 
+            std::vector<Choice<T>> mChoices;
+
             using value_type = T;
 
             bool isArray() const { return mArray.has_value(); }
diff --git a/components/fx/widgets.cpp b/components/fx/widgets.cpp
index f8d12fdba3..8382ca2d56 100644
--- a/components/fx/widgets.cpp
+++ b/components/fx/widgets.cpp
@@ -28,35 +28,20 @@ namespace fx
     {
         void EditBool::setValue(bool value)
         {
-            auto uniform = mUniform.lock();
-
-            if (!uniform)
-                return;
-
             mCheckbutton->setCaptionWithReplacing(value ? "#{Interface:On}" : "#{Interface:Off}");
             mFill->setVisible(value);
 
-            uniform->setValue<bool>(value);
+            mUniform->setValue<bool>(value);
         }
 
         void EditBool::setValueFromUniform()
         {
-            auto uniform = mUniform.lock();
-
-            if (!uniform)
-                return;
-
-            setValue(uniform->template getValue<bool>());
+            setValue(mUniform->template getValue<bool>());
         }
 
         void EditBool::toDefault()
         {
-            auto uniform = mUniform.lock();
-
-            if (!uniform)
-                return;
-
-            setValue(uniform->getDefault<bool>());
+            setValue(mUniform->getDefault<bool>());
         }
 
         void EditBool::initialiseOverride()
@@ -71,12 +56,75 @@ namespace fx
 
         void EditBool::notifyMouseButtonClick(MyGUI::Widget* sender)
         {
-            auto uniform = mUniform.lock();
+            setValue(!mUniform->getValue<bool>());
+        }
 
-            if (!uniform)
-                return;
+        template <class T>
+        void EditChoice::setValue(const T& value)
+        {
+            // Update the combo view
+            for (size_t i = 0; i < this->mChoices->getItemCount(); i++)
+            {
+                if (*this->mChoices->getItemDataAt<T>(i) == value)
+                {
+                    this->mChoices->setIndexSelected(i);
+                    break;
+                }
+            }
 
-            setValue(!uniform->getValue<bool>());
+            mUniform->template setValue<T>(value);
+        }
+
+        void EditChoice::notifyComboBoxChanged(MyGUI::ComboBox* sender, size_t pos)
+        {
+            std::visit(
+                [this, sender, pos](auto&& data) {
+                    using T = typename std::decay_t<decltype(data)>::value_type;
+                    setValue<T>(*sender->getItemDataAt<T>(pos));
+                },
+                mUniform->mData);
+        }
+
+        void EditChoice::setValueFromUniform()
+        {
+            std::visit(
+                [this](auto&& data) {
+                    using T = typename std::decay_t<decltype(data)>::value_type;
+                    size_t index = 0;
+                    for (const auto& choice : data.mChoices)
+                    {
+                        this->mChoices->addItem(choice.mLabel, choice.mValue);
+
+                        if (choice.mValue == mUniform->template getValue<T>())
+                        {
+                            this->mChoices->setIndexSelected(index);
+                        }
+
+                        index++;
+                    }
+
+                    setValue(mUniform->template getValue<T>());
+                },
+                mUniform->mData);
+        }
+
+        void EditChoice::toDefault()
+        {
+            std::visit(
+                [this](auto&& data) {
+                    using T = typename std::decay_t<decltype(data)>::value_type;
+                    setValue(mUniform->template getDefault<T>());
+                },
+                mUniform->mData);
+        }
+
+        void EditChoice::initialiseOverride()
+        {
+            Base::initialiseOverride();
+
+            assignWidget(mChoices, "Choices");
+
+            mChoices->eventComboChangePosition += MyGUI::newDelegate(this, &EditChoice::notifyComboBoxChanged);
         }
 
         void UniformBase::init(const std::shared_ptr<fx::Types::UniformBase>& uniform)
@@ -101,38 +149,48 @@ namespace fx
                 [this, &uniform](auto&& arg) {
                     using T = typename std::decay_t<decltype(arg)>::value_type;
 
-                    if constexpr (std::is_same_v<osg::Vec4f, T>)
+                    if (arg.mChoices.size() > 0)
                     {
-                        createVectorWidget<T, EditNumberFloat4>(uniform, mClient, this);
-                    }
-                    else if constexpr (std::is_same_v<osg::Vec3f, T>)
-                    {
-                        createVectorWidget<T, EditNumberFloat3>(uniform, mClient, this);
-                    }
-                    else if constexpr (std::is_same_v<osg::Vec2f, T>)
-                    {
-                        createVectorWidget<T, EditNumberFloat2>(uniform, mClient, this);
-                    }
-                    else if constexpr (std::is_same_v<T, float>)
-                    {
-                        auto* widget = mClient->createWidget<EditNumberFloat>("MW_ValueEditNumber",
+                        auto* widget = mClient->createWidget<EditChoice>("MW_ValueEditChoice",
                             { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
                         widget->setData(uniform);
                         mBases.emplace_back(widget);
                     }
-                    else if constexpr (std::is_same_v<T, int>)
+                    else
                     {
-                        auto* widget = mClient->createWidget<EditNumberInt>("MW_ValueEditNumber",
-                            { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
-                        widget->setData(uniform);
-                        mBases.emplace_back(widget);
-                    }
-                    else if constexpr (std::is_same_v<T, bool>)
-                    {
-                        auto* widget = mClient->createWidget<EditBool>("MW_ValueEditBool",
-                            { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
-                        widget->setData(uniform);
-                        mBases.emplace_back(widget);
+                        if constexpr (std::is_same_v<osg::Vec4f, T>)
+                        {
+                            createVectorWidget<T, EditNumberFloat4>(uniform, mClient, this);
+                        }
+                        else if constexpr (std::is_same_v<osg::Vec3f, T>)
+                        {
+                            createVectorWidget<T, EditNumberFloat3>(uniform, mClient, this);
+                        }
+                        else if constexpr (std::is_same_v<osg::Vec2f, T>)
+                        {
+                            createVectorWidget<T, EditNumberFloat2>(uniform, mClient, this);
+                        }
+                        else if constexpr (std::is_same_v<T, float>)
+                        {
+                            auto* widget = mClient->createWidget<EditNumberFloat>("MW_ValueEditNumber",
+                                { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
+                            widget->setData(uniform);
+                            mBases.emplace_back(widget);
+                        }
+                        else if constexpr (std::is_same_v<T, int>)
+                        {
+                            auto* widget = mClient->createWidget<EditNumberInt>("MW_ValueEditNumber",
+                                { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
+                            widget->setData(uniform);
+                            mBases.emplace_back(widget);
+                        }
+                        else if constexpr (std::is_same_v<T, bool>)
+                        {
+                            auto* widget = mClient->createWidget<EditBool>("MW_ValueEditBool",
+                                { 0, 0, mClient->getWidth(), mClient->getHeight() }, MyGUI::Align::Stretch);
+                            widget->setData(uniform);
+                            mBases.emplace_back(widget);
+                        }
                     }
 
                     mReset->eventMouseButtonClick += MyGUI::newDelegate(this, &UniformBase::notifyResetClicked);
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index baee2d6df4..6217af7fee 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -57,7 +57,7 @@ namespace fx
             virtual void toDefault() = 0;
 
         protected:
-            std::weak_ptr<fx::Types::UniformBase> mUniform;
+            std::shared_ptr<fx::Types::UniformBase> mUniform;
             Index mIndex;
         };
 
@@ -95,22 +95,19 @@ namespace fx
                 float range = 0.f;
                 float min = 0.f;
 
-                if (auto uniform = mUniform.lock())
+                if constexpr (std::is_fundamental_v<UType>)
                 {
-                    if constexpr (std::is_fundamental_v<UType>)
-                    {
-                        uniform->template setValue<UType>(mValue);
-                        range = uniform->template getMax<UType>() - uniform->template getMin<UType>();
-                        min = uniform->template getMin<UType>();
-                    }
-                    else
-                    {
-                        UType uvalue = uniform->template getValue<UType>();
-                        uvalue[mIndex] = mValue;
-                        uniform->template setValue<UType>(uvalue);
-                        range = uniform->template getMax<UType>()[mIndex] - uniform->template getMin<UType>()[mIndex];
-                        min = uniform->template getMin<UType>()[mIndex];
-                    }
+                    mUniform->template setValue<UType>(mValue);
+                    range = mUniform->template getMax<UType>() - mUniform->template getMin<UType>();
+                    min = mUniform->template getMin<UType>();
+                }
+                else
+                {
+                    UType uvalue = mUniform->template getValue<UType>();
+                    uvalue[mIndex] = mValue;
+                    mUniform->template setValue<UType>(uvalue);
+                    range = mUniform->template getMax<UType>()[mIndex] - mUniform->template getMin<UType>()[mIndex];
+                    min = mUniform->template getMin<UType>()[mIndex];
                 }
 
                 float fill = (range == 0.f) ? 1.f : (mValue - min) / range;
@@ -119,28 +116,22 @@ namespace fx
 
             void setValueFromUniform() override
             {
-                if (auto uniform = mUniform.lock())
-                {
-                    T value;
+                T value;
 
-                    if constexpr (std::is_fundamental_v<UType>)
-                        value = uniform->template getValue<UType>();
-                    else
-                        value = uniform->template getValue<UType>()[mIndex];
+                if constexpr (std::is_fundamental_v<UType>)
+                    value = mUniform->template getValue<UType>();
+                else
+                    value = mUniform->template getValue<UType>()[mIndex];
 
-                    setValue(value);
-                }
+                setValue(value);
             }
 
             void toDefault() override
             {
-                if (auto uniform = mUniform.lock())
-                {
-                    if constexpr (std::is_fundamental_v<UType>)
-                        setValue(uniform->template getDefault<UType>());
-                    else
-                        setValue(uniform->template getDefault<UType>()[mIndex]);
-                }
+                if constexpr (std::is_fundamental_v<UType>)
+                    setValue(mUniform->template getDefault<UType>());
+                else
+                    setValue(mUniform->template getDefault<UType>()[mIndex]);
             }
 
         private:
@@ -164,15 +155,10 @@ namespace fx
 
             void notifyMouseWheel(MyGUI::Widget* sender, int rel)
             {
-                auto uniform = mUniform.lock();
-
-                if (!uniform)
-                    return;
-
                 if (rel > 0)
-                    increment(uniform->mStep);
+                    increment(mUniform->mStep);
                 else
-                    increment(-uniform->mStep);
+                    increment(-mUniform->mStep);
             }
 
             void notifyMouseButtonDragged(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
@@ -180,24 +166,19 @@ namespace fx
                 if (id != MyGUI::MouseButton::Left)
                     return;
 
-                auto uniform = mUniform.lock();
-
-                if (!uniform)
-                    return;
-
                 int delta = left - mLastPointerX;
 
                 // allow finer tuning when shift is pressed
                 constexpr double scaling = 20.0;
                 T step
-                    = MyGUI::InputManager::getInstance().isShiftPressed() ? uniform->mStep / scaling : uniform->mStep;
+                    = MyGUI::InputManager::getInstance().isShiftPressed() ? mUniform->mStep / scaling : mUniform->mStep;
 
                 if (step == 0)
                 {
                     if constexpr (std::is_integral_v<T>)
                         step = 1;
                     else
-                        step = uniform->mStep;
+                        step = mUniform->mStep;
                 }
 
                 if (delta > 0)
@@ -218,30 +199,20 @@ namespace fx
 
             void increment(T step)
             {
-                auto uniform = mUniform.lock();
-
-                if (!uniform)
-                    return;
-
                 if constexpr (std::is_fundamental_v<UType>)
-                    setValue(std::clamp<T>(uniform->template getValue<UType>() + step,
-                        uniform->template getMin<UType>(), uniform->template getMax<T>()));
+                    setValue(std::clamp<T>(mUniform->template getValue<UType>() + step,
+                        mUniform->template getMin<UType>(), mUniform->template getMax<T>()));
                 else
-                    setValue(std::clamp<T>(uniform->template getValue<UType>()[mIndex] + step,
-                        uniform->template getMin<UType>()[mIndex], uniform->template getMax<UType>()[mIndex]));
+                    setValue(std::clamp<T>(mUniform->template getValue<UType>()[mIndex] + step,
+                        mUniform->template getMin<UType>()[mIndex], mUniform->template getMax<UType>()[mIndex]));
             }
 
             void notifyButtonClicked(MyGUI::Widget* sender)
             {
-                auto uniform = mUniform.lock();
-
-                if (!uniform)
-                    return;
-
                 if (sender == mButtonDecrease)
-                    increment(-uniform->mStep);
+                    increment(-mUniform->mStep);
                 else if (sender == mButtonIncrease)
-                    increment(uniform->mStep);
+                    increment(mUniform->mStep);
             }
 
             MyGUI::Button* mButtonDecrease{ nullptr };
@@ -275,6 +246,23 @@ namespace fx
             MYGUI_RTTI_DERIVED(EditNumberInt)
         };
 
+        class EditChoice : public EditBase, public MyGUI::Widget
+        {
+            MYGUI_RTTI_DERIVED(EditChoice)
+
+        public:
+            template <class T>
+            void setValue(const T& value);
+            void setValueFromUniform() override;
+            void toDefault() override;
+
+        private:
+            void initialiseOverride() override;
+            void notifyComboBoxChanged(MyGUI::ComboBox* sender, size_t pos);
+
+            MyGUI::ComboBox* mChoices{ nullptr };
+        };
+
         class UniformBase final : public MyGUI::Widget
         {
             MYGUI_RTTI_DERIVED(UniformBase)
diff --git a/components/interpreter/interpreter.hpp b/components/interpreter/interpreter.hpp
index eae3e7b478..381cb5dd6b 100644
--- a/components/interpreter/interpreter.hpp
+++ b/components/interpreter/interpreter.hpp
@@ -1,14 +1,16 @@
 #ifndef INTERPRETER_INTERPRETER_H_INCLUDED
 #define INTERPRETER_INTERPRETER_H_INCLUDED
 
-#include <cassert>
 #include <map>
 #include <memory>
 #include <stack>
+#include <stdexcept>
 #include <utility>
 
-#include "components/interpreter/program.hpp"
+#include <components/misc/strings/format.hpp>
+
 #include "opcodes.hpp"
+#include "program.hpp"
 #include "runtime.hpp"
 #include "types.hpp"
 
@@ -32,11 +34,13 @@ namespace Interpreter
 
         void end();
 
-        template <typename TSeg, typename TOp>
-        void installSegment(TSeg& seg, int code, TOp&& op)
+        template <typename T, typename... Args>
+        void installSegment(auto& segment, std::string_view name, int code, Args&&... args)
         {
-            assert(seg.find(code) == seg.end());
-            seg.emplace(code, std::move(op));
+            if (segment.find(code) != segment.end())
+                throw std::invalid_argument(Misc::StringUtils::format(
+                    "Duplicated interpreter instruction code in segment %s: 0x%x", name, code));
+            segment.emplace(code, std::make_unique<T>(std::forward<Args>(args)...));
         }
 
     public:
@@ -48,25 +52,25 @@ namespace Interpreter
         template <typename T, typename... TArgs>
         void installSegment0(int code, TArgs&&... args)
         {
-            installSegment(mSegment0, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            installSegment<T>(mSegment0, "0", code, std::forward<TArgs>(args)...);
         }
 
         template <typename T, typename... TArgs>
         void installSegment2(int code, TArgs&&... args)
         {
-            installSegment(mSegment2, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            installSegment<T>(mSegment2, "2", code, std::forward<TArgs>(args)...);
         }
 
         template <typename T, typename... TArgs>
         void installSegment3(int code, TArgs&&... args)
         {
-            installSegment(mSegment3, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            installSegment<T>(mSegment3, "3", code, std::forward<TArgs>(args)...);
         }
 
         template <typename T, typename... TArgs>
         void installSegment5(int code, TArgs&&... args)
         {
-            installSegment(mSegment5, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            installSegment<T>(mSegment5, "5", code, std::forward<TArgs>(args)...);
         }
 
         void run(const Program& program, Context& context);
diff --git a/components/l10n/manager.cpp b/components/l10n/manager.cpp
index 10cad81587..f6f4bb4f05 100644
--- a/components/l10n/manager.cpp
+++ b/components/l10n/manager.cpp
@@ -36,15 +36,26 @@ namespace l10n
 
     void Manager::readLangData(const std::string& name, MessageBundles& ctx, const icu::Locale& lang)
     {
-        std::string path = "l10n/";
-        path.append(name);
-        path.append("/");
-        path.append(lang.getName());
-        path.append(".yaml");
-        if (!mVFS->exists(path))
+        std::string langName(lang.getName());
+        langName += ".yaml";
+
+        VFS::Path::Normalized path("l10n");
+        path /= name;
+        path /= langName;
+
+        const Files::IStreamPtr stream = mVFS->find(path);
+
+        if (stream == nullptr)
             return;
 
-        ctx.load(*mVFS->get(path), lang, path);
+        try
+        {
+            ctx.load(*stream, lang);
+        }
+        catch (const std::exception& e)
+        {
+            Log(Debug::Error) << "Cannot load message bundles from " << path << ": " << e.what();
+        }
     }
 
     void Manager::updateContext(const std::string& name, MessageBundles& ctx)
diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
index 4656116487..2948ff155e 100644
--- a/components/l10n/messagebundles.cpp
+++ b/components/l10n/messagebundles.cpp
@@ -66,32 +66,26 @@ namespace l10n
         return status.isSuccess();
     }
 
-    void MessageBundles::load(std::istream& input, const icu::Locale& lang, const std::string& path)
+    void MessageBundles::load(std::istream& input, const icu::Locale& lang)
     {
-        try
+        YAML::Node data = YAML::Load(input);
+        std::string localeName = lang.getName();
+        const icu::Locale& langOrEn = localeName == "gmst" ? icu::Locale::getEnglish() : lang;
+        for (const auto& it : data)
         {
-            YAML::Node data = YAML::Load(input);
-            std::string localeName = lang.getName();
-            const icu::Locale& langOrEn = localeName == "gmst" ? icu::Locale::getEnglish() : lang;
-            for (const auto& it : data)
+            const auto key = it.first.as<std::string>();
+            const auto value = it.second.as<std::string>();
+            icu::UnicodeString pattern
+                = icu::UnicodeString::fromUTF8(icu::StringPiece(value.data(), static_cast<std::int32_t>(value.size())));
+            icu::ErrorCode status;
+            UParseError parseError;
+            icu::MessageFormat message(pattern, langOrEn, parseError, status);
+            if (checkSuccess(status, std::string("Failed to create message ") + key + " for locale " + lang.getName(),
+                    parseError))
             {
-                const auto key = it.first.as<std::string>();
-                const auto value = it.second.as<std::string>();
-                icu::UnicodeString pattern = icu::UnicodeString::fromUTF8(icu::StringPiece(value.data(), value.size()));
-                icu::ErrorCode status;
-                UParseError parseError;
-                icu::MessageFormat message(pattern, langOrEn, parseError, status);
-                if (checkSuccess(status,
-                        std::string("Failed to create message ") + key + " for locale " + lang.getName(), parseError))
-                {
-                    mBundles[localeName].insert(std::make_pair(key, message));
-                }
+                mBundles[localeName].insert(std::make_pair(key, message));
             }
         }
-        catch (std::exception& e)
-        {
-            Log(Debug::Error) << "Can not load " << path << ": " << e.what();
-        }
     }
 
     const icu::MessageFormat* MessageBundles::findMessage(std::string_view key, const std::string& localeName) const
@@ -115,7 +109,8 @@ namespace l10n
         std::vector<icu::Formattable> argValues;
         for (auto& [k, v] : args)
         {
-            argNames.push_back(icu::UnicodeString::fromUTF8(icu::StringPiece(k.data(), k.size())));
+            argNames.push_back(
+                icu::UnicodeString::fromUTF8(icu::StringPiece(k.data(), static_cast<std::int32_t>(k.size()))));
             argValues.push_back(v);
         }
         return formatMessage(key, argNames, argValues);
@@ -160,9 +155,9 @@ namespace l10n
         if (message)
         {
             if (!args.empty() && !argNames.empty())
-                message->format(argNames.data(), args.data(), args.size(), result, success);
+                message->format(argNames.data(), args.data(), static_cast<std::int32_t>(args.size()), result, success);
             else
-                message->format(nullptr, nullptr, args.size(), result, success);
+                message->format(nullptr, nullptr, static_cast<std::int32_t>(args.size()), result, success);
             checkSuccess(success, std::string("Failed to format message ") + key.data());
             result.toUTF8String(resultString);
             return resultString;
@@ -174,15 +169,17 @@ namespace l10n
         }
         UParseError parseError;
         icu::MessageFormat defaultMessage(
-            icu::UnicodeString::fromUTF8(icu::StringPiece(key.data(), key.size())), defaultLocale, parseError, success);
+            icu::UnicodeString::fromUTF8(icu::StringPiece(key.data(), static_cast<std::int32_t>(key.size()))),
+            defaultLocale, parseError, success);
         if (!checkSuccess(success, std::string("Failed to create message ") + key.data(), parseError))
             // If we can't parse the key as a pattern, just return the key
             return std::string(key);
 
         if (!args.empty() && !argNames.empty())
-            defaultMessage.format(argNames.data(), args.data(), args.size(), result, success);
+            defaultMessage.format(
+                argNames.data(), args.data(), static_cast<std::int32_t>(args.size()), result, success);
         else
-            defaultMessage.format(nullptr, nullptr, args.size(), result, success);
+            defaultMessage.format(nullptr, nullptr, static_cast<std::int32_t>(args.size()), result, success);
         checkSuccess(success, std::string("Failed to format message ") + key.data());
         result.toUTF8String(resultString);
         return resultString;
diff --git a/components/l10n/messagebundles.hpp b/components/l10n/messagebundles.hpp
index f3e8f9db19..0ea92e93fe 100644
--- a/components/l10n/messagebundles.hpp
+++ b/components/l10n/messagebundles.hpp
@@ -40,7 +40,7 @@ namespace l10n
             const std::vector<icu::Formattable>& args) const;
         void setPreferredLocales(const std::vector<icu::Locale>& preferredLocales);
         const std::vector<icu::Locale>& getPreferredLocales() const { return mPreferredLocales; }
-        void load(std::istream& input, const icu::Locale& lang, const std::string& path);
+        void load(std::istream& input, const icu::Locale& lang);
         bool isLoaded(const icu::Locale& loc) const { return mBundles.find(loc.getName()) != mBundles.end(); }
         const icu::Locale& getFallbackLocale() const { return mFallbackLocale; }
         void setGmstLoader(std::function<std::string(std::string_view)> fn) { mGmstLoader = std::move(fn); }
diff --git a/components/l10n/qttranslations.cpp b/components/l10n/qttranslations.cpp
new file mode 100644
index 0000000000..9bc146699e
--- /dev/null
+++ b/components/l10n/qttranslations.cpp
@@ -0,0 +1,37 @@
+#include "qttranslations.hpp"
+
+#include <QLibraryInfo>
+#include <QLocale>
+
+namespace l10n
+{
+    QTranslator AppTranslator{};
+    QTranslator ComponentsTranslator{};
+    QTranslator QtBaseAppTranslator{};
+
+    void installQtTranslations(QApplication& app, const QString& appName, const QString& resourcesPath)
+    {
+        // Try to load OpenMW translations from resources folder first.
+        // If we loaded them, try to load Qt translations from both
+        // resources folder and default translations folder as well.
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        auto qtPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
+#else
+        auto qtPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+#endif
+        auto localPath = resourcesPath + "/translations";
+
+        if (AppTranslator.load(QLocale::system(), appName, "_", localPath)
+            && ComponentsTranslator.load(QLocale::system(), "components", "_", localPath))
+        {
+            app.installTranslator(&AppTranslator);
+            app.installTranslator(&ComponentsTranslator);
+
+            if (QtBaseAppTranslator.load(QLocale::system(), "qtbase", "_", localPath)
+                || QtBaseAppTranslator.load(QLocale::system(), "qt", "_", localPath)
+                || QtBaseAppTranslator.load(QLocale::system(), "qtbase", "_", qtPath)
+                || QtBaseAppTranslator.load(QLocale::system(), "qt", "_", qtPath))
+                app.installTranslator(&QtBaseAppTranslator);
+        }
+    }
+}
diff --git a/components/l10n/qttranslations.hpp b/components/l10n/qttranslations.hpp
new file mode 100644
index 0000000000..3ce87f0837
--- /dev/null
+++ b/components/l10n/qttranslations.hpp
@@ -0,0 +1,16 @@
+#ifndef COMPONENTS_L10N_QTTRANSLATIONS_H
+#define COMPONENTS_L10N_QTTRANSLATIONS_H
+
+#include <QApplication>
+#include <QTranslator>
+
+namespace l10n
+{
+    extern QTranslator AppTranslator;
+    extern QTranslator ComponentsTranslator;
+    extern QTranslator QtBaseAppTranslator;
+
+    void installQtTranslations(QApplication& app, const QString& appName, const QString& resourcesPath);
+}
+
+#endif // COMPONENTS_L10N_QTTRANSLATIONS_H
diff --git a/components/loadinglistener/loadinglistener.hpp b/components/loadinglistener/loadinglistener.hpp
index 423688ad1b..9ccfb25a5c 100644
--- a/components/loadinglistener/loadinglistener.hpp
+++ b/components/loadinglistener/loadinglistener.hpp
@@ -22,7 +22,7 @@ namespace Loading
         /// periodically.
         /// @note It is best to use the ScopedLoad object instead of using loadingOn()/loadingOff() directly,
         ///  so that the loading is exception safe.
-        virtual void loadingOn(bool visible = true) {}
+        virtual void loadingOn() {}
         virtual void loadingOff() {}
 
         /// Set the total range of progress (e.g. the number of objects to load).
diff --git a/components/lua/asyncpackage.cpp b/components/lua/asyncpackage.cpp
index b60238de13..5d563e6276 100644
--- a/components/lua/asyncpackage.cpp
+++ b/components/lua/asyncpackage.cpp
@@ -24,7 +24,30 @@ namespace LuaUtil
 
     Callback Callback::fromLua(const sol::table& t)
     {
-        return Callback{ t.raw_get<sol::main_protected_function>(1), t.raw_get<AsyncPackageId>(2).mHiddenData };
+        const sol::object& function = t.raw_get<sol::object>(1);
+        const sol::object& asyncPackageId = t.raw_get<sol::object>(2);
+        if (!function.is<sol::main_protected_function>() || !asyncPackageId.is<AsyncPackageId>())
+            throw std::domain_error("Expected an async:callback, received a table");
+        return Callback{ function.as<sol::main_protected_function>(), asyncPackageId.as<AsyncPackageId>().mHiddenData };
+    }
+
+    sol::table Callback::makeMetatable(lua_State* L)
+    {
+        sol::table callbackMeta = sol::table::create(L);
+        callbackMeta[sol::meta_function::call] = [](const sol::table& callback, sol::variadic_args va) {
+            return Callback::fromLua(callback).call(sol::as_args(va));
+        };
+        callbackMeta[sol::meta_function::to_string] = [] { return "Callback"; };
+        callbackMeta[sol::meta_function::metatable] = false;
+        callbackMeta["isCallback"] = true;
+        return callbackMeta;
+    }
+    sol::table Callback::make(const AsyncPackageId& asyncId, sol::main_protected_function fn, sol::table metatable)
+    {
+        sol::table c = sol::table::create(fn.lua_state(), 2);
+        c.raw_set(1, std::move(fn), 2, asyncId);
+        c[sol::metatable_key] = metatable;
+        return c;
     }
 
     bool Callback::isLuaCallback(const sol::object& t)
@@ -69,23 +92,14 @@ namespace LuaUtil
                       TimerType::GAME_TIME, gameTimeFn() + delay, asyncId.mScriptId, std::move(callback));
               };
 
-        sol::table callbackMeta = sol::table::create(L);
-        callbackMeta[sol::meta_function::call] = [](const sol::table& callback, sol::variadic_args va) {
-            return Callback::fromLua(callback).call(sol::as_args(va));
-        };
-        callbackMeta[sol::meta_function::to_string] = [] { return "Callback"; };
-        callbackMeta[sol::meta_function::metatable] = false;
-        callbackMeta["isCallback"] = true;
+        sol::table callbackMeta = Callback::makeMetatable(L);
         api["callback"] = [callbackMeta](const AsyncPackageId& asyncId, sol::main_protected_function fn) -> sol::table {
-            sol::table c = sol::table::create(fn.lua_state(), 2);
-            c.raw_set(1, std::move(fn), 2, asyncId);
-            c[sol::metatable_key] = callbackMeta;
-            return c;
+            return Callback::make(asyncId, std::move(fn), callbackMeta);
         };
 
         auto initializer = [](sol::table hiddenData) {
             ScriptId id = hiddenData[ScriptsContainer::sScriptIdKey];
-            return AsyncPackageId{ id.mContainer, id.mIndex, hiddenData };
+            return AsyncPackageId{ id.mContainer, id.mIndex, std::move(hiddenData) };
         };
         return sol::make_object(lua, initializer);
     }
diff --git a/components/lua/asyncpackage.hpp b/components/lua/asyncpackage.hpp
index e8d5f04271..7e9c36de09 100644
--- a/components/lua/asyncpackage.hpp
+++ b/components/lua/asyncpackage.hpp
@@ -24,6 +24,8 @@ namespace LuaUtil
 
         static bool isLuaCallback(const sol::object&);
         static Callback fromLua(const sol::table&);
+        static sol::table makeMetatable(lua_State* L);
+        static sol::table make(const AsyncPackageId& asyncId, sol::main_protected_function fn, sol::table metatable);
 
         bool isValid() const { return mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil; }
 
diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp
index 85c0cb6724..b327270fc1 100644
--- a/components/lua/configuration.cpp
+++ b/components/lua/configuration.cpp
@@ -18,6 +18,7 @@ namespace LuaUtil
             { "GLOBAL", ESM::LuaScriptCfg::sGlobal },
             { "CUSTOM", ESM::LuaScriptCfg::sCustom },
             { "PLAYER", ESM::LuaScriptCfg::sPlayer },
+            { "MENU", ESM::LuaScriptCfg::sMenu },
         };
 
         const std::map<std::string, ESM::RecNameInts, std::less<>> typeTagsByName{
@@ -59,16 +60,17 @@ namespace LuaUtil
             const ESM::LuaScriptCfg& script = cfg.mScripts[i];
             bool global = script.mFlags & ESM::LuaScriptCfg::sGlobal;
             if (global && (script.mFlags & ~ESM::LuaScriptCfg::sMerge) != ESM::LuaScriptCfg::sGlobal)
-                throw std::runtime_error(std::string("Global script can not have local flags: ") + script.mScriptPath);
+                throw std::runtime_error(
+                    std::string("Global script can not have local flags: ") + script.mScriptPath.value());
             if (global && (!script.mTypes.empty() || !script.mRecords.empty() || !script.mRefs.empty()))
                 throw std::runtime_error(std::string("Global script can not have per-type and per-object configuration")
-                    + script.mScriptPath);
-            auto [it, inserted] = mPathToIndex.emplace(Misc::StringUtils::lowerCase(script.mScriptPath), i);
+                    + script.mScriptPath.value());
+            auto [it, inserted] = mPathToIndex.emplace(script.mScriptPath, i);
             if (inserted)
                 continue;
             ESM::LuaScriptCfg& oldScript = cfg.mScripts[it->second];
             if (global != bool(oldScript.mFlags & ESM::LuaScriptCfg::sGlobal))
-                throw std::runtime_error(std::string("Flags mismatch for ") + script.mScriptPath);
+                throw std::runtime_error(std::string("Flags mismatch for ") + script.mScriptPath.value());
             if (script.mFlags & ESM::LuaScriptCfg::sMerge)
             {
                 oldScript.mFlags |= (script.mFlags & ~ESM::LuaScriptCfg::sMerge);
@@ -112,7 +114,7 @@ namespace LuaUtil
         }
     }
 
-    std::optional<int> ScriptsConfiguration::findId(std::string_view path) const
+    std::optional<int> ScriptsConfiguration::findId(VFS::Path::NormalizedView path) const
     {
         auto it = mPathToIndex.find(path);
         if (it != mPathToIndex.end())
@@ -198,7 +200,7 @@ namespace LuaUtil
                 scriptPath = scriptPath.substr(1);
 
             ESM::LuaScriptCfg& script = cfg.mScripts.emplace_back();
-            script.mScriptPath = std::string(scriptPath);
+            script.mScriptPath = VFS::Path::Normalized(scriptPath);
             script.mFlags = 0;
 
             // Parse tags
diff --git a/components/lua/configuration.hpp b/components/lua/configuration.hpp
index 3a2df8e43d..4a619019ba 100644
--- a/components/lua/configuration.hpp
+++ b/components/lua/configuration.hpp
@@ -4,8 +4,9 @@
 #include <map>
 #include <optional>
 
-#include "components/esm/luascripts.hpp"
-#include "components/esm3/cellref.hpp"
+#include <components/esm/luascripts.hpp>
+#include <components/esm3/refnum.hpp>
+#include <components/vfs/pathutil.hpp>
 
 namespace LuaUtil
 {
@@ -19,9 +20,11 @@ namespace LuaUtil
         size_t size() const { return mScripts.size(); }
         const ESM::LuaScriptCfg& operator[](int id) const { return mScripts[id]; }
 
-        std::optional<int> findId(std::string_view path) const;
+        std::optional<int> findId(VFS::Path::NormalizedView path) const;
+
         bool isCustomScript(int id) const { return mScripts[id].mFlags & ESM::LuaScriptCfg::sCustom; }
 
+        ScriptIdsWithInitializationData getMenuConf() const { return getConfByFlag(ESM::LuaScriptCfg::sMenu); }
         ScriptIdsWithInitializationData getGlobalConf() const { return getConfByFlag(ESM::LuaScriptCfg::sGlobal); }
         ScriptIdsWithInitializationData getPlayerConf() const { return getConfByFlag(ESM::LuaScriptCfg::sPlayer); }
         ScriptIdsWithInitializationData getLocalConf(
@@ -31,7 +34,7 @@ namespace LuaUtil
         ScriptIdsWithInitializationData getConfByFlag(ESM::LuaScriptCfg::Flags flag) const;
 
         std::vector<ESM::LuaScriptCfg> mScripts;
-        std::map<std::string, int, std::less<>> mPathToIndex;
+        std::map<VFS::Path::Normalized, int, std::less<>> mPathToIndex;
 
         struct DetailedConf
         {
diff --git a/components/lua/inputactions.cpp b/components/lua/inputactions.cpp
new file mode 100644
index 0000000000..7c7551ba60
--- /dev/null
+++ b/components/lua/inputactions.cpp
@@ -0,0 +1,296 @@
+#include "inputactions.hpp"
+
+#include <queue>
+#include <set>
+
+#include <components/debug/debuglog.hpp>
+#include <components/misc/strings/format.hpp>
+
+#include "luastate.hpp"
+
+namespace LuaUtil
+{
+    namespace InputAction
+    {
+        namespace
+        {
+            std::string_view typeName(Type actionType)
+            {
+                switch (actionType)
+                {
+                    case Type::Boolean:
+                        return "Boolean";
+                    case Type::Number:
+                        return "Number";
+                    case Type::Range:
+                        return "Range";
+                    default:
+                        throw std::logic_error("Unknown input action type");
+                }
+            }
+        }
+
+        MultiTree::Node MultiTree::insert()
+        {
+            size_t nextId = size();
+            mChildren.push_back({});
+            mParents.push_back({});
+            return nextId;
+        }
+
+        bool MultiTree::validateTree() const
+        {
+            std::vector<bool> complete(size(), false);
+            traverse([&complete](Node node) { complete[node] = true; });
+            return std::find(complete.begin(), complete.end(), false) == complete.end();
+        }
+
+        template <typename Function>
+        void MultiTree::traverse(Function callback) const
+        {
+            std::queue<Node> nodeQueue;
+            std::vector<bool> complete(size(), false);
+            for (Node root = 0; root < size(); ++root)
+            {
+                if (!complete[root])
+                    nodeQueue.push(root);
+                while (!nodeQueue.empty())
+                {
+                    Node node = nodeQueue.back();
+                    nodeQueue.pop();
+
+                    bool isComplete = true;
+                    for (Node parent : mParents[node])
+                        isComplete = isComplete && complete[parent];
+                    complete[node] = isComplete;
+                    if (isComplete)
+                    {
+                        callback(node);
+                        for (Node child : mChildren[node])
+                            nodeQueue.push(child);
+                    }
+                }
+            }
+        }
+
+        bool MultiTree::multiEdge(Node target, const std::vector<Node>& source)
+        {
+            mParents[target].reserve(mParents[target].size() + source.size());
+            for (Node s : source)
+            {
+                mParents[target].push_back(s);
+                mChildren[s].push_back(target);
+            }
+            bool validTree = validateTree();
+            if (!validTree)
+            {
+                for (Node s : source)
+                {
+                    mParents[target].pop_back();
+                    mChildren[s].pop_back();
+                }
+            }
+            return validTree;
+        }
+
+        namespace
+        {
+            bool validateActionValue(sol::object value, Type type)
+            {
+                switch (type)
+                {
+                    case Type::Boolean:
+                        return value.get_type() == sol::type::boolean;
+                    case Type::Number:
+                        return value.get_type() == sol::type::number;
+                    case Type::Range:
+                        if (value.get_type() != sol::type::number)
+                            return false;
+                        double d = value.as<double>();
+                        return 0.0 <= d && d <= 1.0;
+                }
+                throw std::invalid_argument("Unknown action type");
+            }
+        }
+
+        void Registry::insert(const Info& info)
+        {
+            if (mIds.find(info.mKey) != mIds.end())
+                throw std::domain_error(Misc::StringUtils::format("Action key \"%s\" is already in use", info.mKey));
+            if (info.mKey.empty())
+                throw std::domain_error("Action key can't be an empty string");
+            if (info.mL10n.empty())
+                throw std::domain_error("Localization context can't be empty");
+            if (!validateActionValue(info.mDefaultValue, info.mType))
+                throw std::logic_error(Misc::StringUtils::format(
+                    "Invalid value: \"%s\" for action \"%s\"", LuaUtil::toString(info.mDefaultValue), info.mKey));
+            Id id = mBindingTree.insert();
+            mKeys.push_back(info.mKey);
+            mIds[std::string(info.mKey)] = id;
+            mInfo.push_back(info);
+            mHandlers.push_back({});
+            mBindings.push_back({});
+            mValues.push_back(info.mDefaultValue);
+        }
+
+        std::optional<std::string> Registry::nextKey(std::string_view key) const
+        {
+            auto it = mIds.find(key);
+            if (it == mIds.end())
+                return std::nullopt;
+            auto nextId = it->second + 1;
+            if (nextId >= mKeys.size())
+                return std::nullopt;
+            return mKeys.at(nextId);
+        }
+
+        std::optional<Info> Registry::operator[](std::string_view actionKey)
+        {
+            auto iter = mIds.find(actionKey);
+            if (iter == mIds.end())
+                return std::nullopt;
+            return mInfo[iter->second];
+        }
+
+        Registry::Id Registry::safeIdByKey(std::string_view key)
+        {
+            auto iter = mIds.find(key);
+            if (iter == mIds.end())
+                throw std::logic_error(Misc::StringUtils::format("Unknown action key: \"%s\"", key));
+            return iter->second;
+        }
+
+        bool Registry::bind(
+            std::string_view key, const LuaUtil::Callback& callback, const std::vector<std::string_view>& dependencies)
+        {
+            Id id = safeIdByKey(key);
+            std::vector<Id> dependencyIds;
+            dependencyIds.reserve(dependencies.size());
+            for (std::string_view s : dependencies)
+                dependencyIds.push_back(safeIdByKey(s));
+            bool validEdge = mBindingTree.multiEdge(id, dependencyIds);
+            if (validEdge)
+                mBindings[id].push_back(Binding{
+                    callback,
+                    std::move(dependencyIds),
+                });
+            return validEdge;
+        }
+
+        sol::object Registry::valueOfType(std::string_view key, Type type)
+        {
+            Id id = safeIdByKey(key);
+            Info info = mInfo[id];
+            if (info.mType != type)
+                throw std::logic_error(
+                    Misc::StringUtils::format("Attempt to get value of type \"%s\" from action \"%s\" with type \"%s\"",
+                        typeName(type), key, typeName(info.mType)));
+            return mValues[id];
+        }
+
+        void Registry::update(double dt)
+        {
+            std::vector<sol::object> dependencyValues;
+            mBindingTree.traverse([this, &dependencyValues, dt](Id node) {
+                sol::main_object newValue = mValues[node];
+                std::vector<Binding>& bindings = mBindings[node];
+                bindings.erase(std::remove_if(bindings.begin(), bindings.end(),
+                                   [&](const Binding& binding) {
+                                       if (!binding.mCallback.isValid())
+                                           return true;
+
+                                       dependencyValues.clear();
+                                       for (Id parent : binding.mDependencies)
+                                           dependencyValues.push_back(mValues[parent]);
+                                       try
+                                       {
+                                           newValue = sol::main_object(
+                                               binding.mCallback.call(dt, newValue, sol::as_args(dependencyValues)));
+                                       }
+                                       catch (std::exception& e)
+                                       {
+                                           if (!validateActionValue(newValue, mInfo[node].mType))
+                                               Log(Debug::Error) << Misc::StringUtils::format(
+                                                   "Error due to invalid value of action \"%s\"(\"%s\"): ", mKeys[node],
+                                                   LuaUtil::toString(newValue))
+                                                                 << e.what();
+                                           else
+                                               Log(Debug::Error) << "Error in callback: " << e.what();
+                                       }
+                                       return false;
+                                   }),
+                    bindings.end());
+
+                if (!validateActionValue(newValue, mInfo[node].mType))
+                    Log(Debug::Error) << Misc::StringUtils::format(
+                        "Invalid value of action \"%s\": %s", mKeys[node], LuaUtil::toString(newValue));
+                if (mValues[node] != newValue)
+                {
+                    mValues[node] = sol::object(newValue);
+                    std::vector<LuaUtil::Callback>& handlers = mHandlers[node];
+                    handlers.erase(std::remove_if(handlers.begin(), handlers.end(),
+                                       [&](const LuaUtil::Callback& handler) {
+                                           if (!handler.isValid())
+                                               return true;
+                                           handler.tryCall(newValue);
+                                           return false;
+                                       }),
+                        handlers.end());
+                }
+            });
+        }
+    }
+
+    namespace InputTrigger
+    {
+        Registry::Id Registry::safeIdByKey(std::string_view key)
+        {
+            auto it = mIds.find(key);
+            if (it == mIds.end())
+                throw std::domain_error(Misc::StringUtils::format("Unknown trigger key \"%s\"", key));
+            return it->second;
+        }
+
+        void Registry::insert(const Info& info)
+        {
+            if (mIds.find(info.mKey) != mIds.end())
+                throw std::domain_error(Misc::StringUtils::format("Trigger key \"%s\" is already in use", info.mKey));
+            if (info.mKey.empty())
+                throw std::domain_error("Trigger key can't be an empty string");
+            if (info.mL10n.empty())
+                throw std::domain_error("Localization context can't be empty");
+            Id id = mIds.size();
+            mIds[info.mKey] = id;
+            mInfo.push_back(info);
+            mHandlers.push_back({});
+        }
+
+        std::optional<Info> Registry::operator[](std::string_view key)
+        {
+            auto iter = mIds.find(key);
+            if (iter == mIds.end())
+                return std::nullopt;
+            return mInfo[iter->second];
+        }
+
+        void Registry::registerHandler(std::string_view key, const LuaUtil::Callback& callback)
+        {
+            Id id = safeIdByKey(key);
+            mHandlers[id].push_back(callback);
+        }
+
+        void Registry::activate(std::string_view key)
+        {
+            Id id = safeIdByKey(key);
+            std::vector<LuaUtil::Callback>& handlers = mHandlers[id];
+            handlers.erase(std::remove_if(handlers.begin(), handlers.end(),
+                               [&](const LuaUtil::Callback& handler) {
+                                   if (!handler.isValid())
+                                       return true;
+                                   handler.tryCall();
+                                   return false;
+                               }),
+                handlers.end());
+        }
+    }
+}
diff --git a/components/lua/inputactions.hpp b/components/lua/inputactions.hpp
new file mode 100644
index 0000000000..d05bb71f2c
--- /dev/null
+++ b/components/lua/inputactions.hpp
@@ -0,0 +1,149 @@
+#ifndef COMPONENTS_LUA_INPUTACTIONS
+#define COMPONENTS_LUA_INPUTACTIONS
+
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <vector>
+
+#include <sol/sol.hpp>
+
+#include <components/lua/asyncpackage.hpp>
+#include <components/lua/scriptscontainer.hpp>
+#include <components/misc/algorithm.hpp>
+
+namespace LuaUtil::InputAction
+{
+    enum class Type
+    {
+        Boolean,
+        Number,
+        Range,
+    };
+
+    struct Info
+    {
+        std::string mKey;
+        Type mType;
+        std::string mL10n;
+        std::string mName;
+        std::string mDescription;
+        sol::main_object mDefaultValue;
+    };
+
+    class MultiTree
+    {
+    public:
+        using Node = size_t;
+
+        Node insert();
+        bool multiEdge(Node target, const std::vector<Node>& source);
+        size_t size() const { return mParents.size(); }
+
+        template <typename Function> // Function = void(Node)
+        void traverse(Function callback) const;
+
+        void clear()
+        {
+            mParents.clear();
+            mChildren.clear();
+        }
+
+    private:
+        std::vector<std::vector<Node>> mParents;
+        std::vector<std::vector<Node>> mChildren;
+
+        bool validateTree() const;
+    };
+
+    class Registry
+    {
+    public:
+        using ConstIterator = std::vector<Info>::const_iterator;
+        void insert(const Info& info);
+        size_t size() const { return mKeys.size(); }
+        std::optional<std::string> firstKey() const { return mKeys.empty() ? std::nullopt : std::optional(mKeys[0]); }
+        std::optional<std::string> nextKey(std::string_view key) const;
+        std::optional<Info> operator[](std::string_view actionKey);
+        bool bind(
+            std::string_view key, const LuaUtil::Callback& callback, const std::vector<std::string_view>& dependencies);
+        sol::object valueOfType(std::string_view key, Type type);
+        void update(double dt);
+        void registerHandler(std::string_view key, const LuaUtil::Callback& handler)
+        {
+            mHandlers[safeIdByKey(key)].push_back(handler);
+        }
+        void clear()
+        {
+            mKeys.clear();
+            mIds.clear();
+            mInfo.clear();
+            mHandlers.clear();
+            mBindings.clear();
+            mValues.clear();
+            mBindingTree.clear();
+        }
+
+    private:
+        using Id = MultiTree::Node;
+        Id safeIdByKey(std::string_view key);
+        struct Binding
+        {
+            LuaUtil::Callback mCallback;
+            std::vector<Id> mDependencies;
+        };
+        std::vector<std::string> mKeys;
+        std::unordered_map<std::string, Id, Misc::StringUtils::StringHash, std::equal_to<>> mIds;
+        std::vector<Info> mInfo;
+        std::vector<std::vector<LuaUtil::Callback>> mHandlers;
+        std::vector<std::vector<Binding>> mBindings;
+        std::vector<sol::object> mValues;
+        MultiTree mBindingTree;
+    };
+}
+
+namespace LuaUtil::InputTrigger
+{
+    struct Info
+    {
+        std::string mKey;
+        std::string mL10n;
+        std::string mName;
+        std::string mDescription;
+    };
+
+    class Registry
+    {
+    public:
+        std::optional<std::string> firstKey() const
+        {
+            return mIds.empty() ? std::nullopt : std::optional(mIds.begin()->first);
+        }
+        std::optional<std::string> nextKey(std::string_view key) const
+        {
+            auto it = mIds.find(key);
+            if (it == mIds.end() || ++it == mIds.end())
+                return std::nullopt;
+            return it->first;
+        }
+        std::optional<Info> operator[](std::string_view key);
+        void insert(const Info& info);
+        void registerHandler(std::string_view key, const LuaUtil::Callback& callback);
+        void activate(std::string_view key);
+        void clear()
+        {
+            mInfo.clear();
+            mHandlers.clear();
+            mIds.clear();
+        }
+
+    private:
+        using Id = size_t;
+        Id safeIdByKey(std::string_view key);
+        std::unordered_map<std::string, Id, Misc::StringUtils::StringHash, std::equal_to<>> mIds;
+        std::vector<Info> mInfo;
+        std::vector<std::vector<LuaUtil::Callback>> mHandlers;
+    };
+}
+
+#endif // COMPONENTS_LUA_INPUTACTIONS
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 2269a40c26..2f5800c521 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -12,19 +12,20 @@
 #include <components/vfs/manager.hpp>
 
 #include "scriptscontainer.hpp"
+#include "utf8.hpp"
 
 namespace LuaUtil
 {
-
-    static std::string packageNameToVfsPath(std::string_view packageName, const VFS::Manager* vfs)
+    static VFS::Path::Normalized packageNameToVfsPath(std::string_view packageName, const VFS::Manager& vfs)
     {
-        std::string path(packageName);
-        std::replace(path.begin(), path.end(), '.', '/');
-        std::string pathWithInit = path + "/init.lua";
-        path.append(".lua");
-        if (vfs->exists(path))
+        std::string pathValue(packageName);
+        std::replace(pathValue.begin(), pathValue.end(), '.', '/');
+        VFS::Path::Normalized pathWithInit(pathValue + "/init.lua");
+        pathValue.append(".lua");
+        VFS::Path::Normalized path(pathValue);
+        if (vfs.exists(path))
             return path;
-        else if (vfs->exists(pathWithInit))
+        else if (vfs.exists(pathWithInit))
             return pathWithInit;
         else
             throw std::runtime_error("module not found: " + std::string(packageName));
@@ -51,7 +52,7 @@ namespace LuaUtil
 
     static const std::string safeFunctions[] = { "assert", "error", "ipairs", "next", "pairs", "pcall", "select",
         "tonumber", "tostring", "type", "unpack", "xpcall", "rawequal", "rawget", "rawset", "setmetatable" };
-    static const std::string safePackages[] = { "coroutine", "math", "string", "table" };
+    static const std::string safePackages[] = { "coroutine", "math", "string", "table", "utf8" };
 
     static constexpr int64_t countHookStep = 1000;
 
@@ -100,14 +101,21 @@ namespace LuaUtil
                               << " is blocked because Lua memory limit (configurable in settings.cfg) is exceeded";
             return nullptr;
         }
-        self->mTotalMemoryUsage += smallAllocDelta + bigAllocDelta;
-        self->mSmallAllocMemoryUsage += smallAllocDelta;
 
         void* newPtr = nullptr;
         if (nsize == 0)
             free(ptr);
         else
+        {
             newPtr = realloc(ptr, nsize);
+            if (!newPtr)
+            {
+                Log(Debug::Error) << "Lua realloc " << osize << "->" << nsize << " failed";
+                return nullptr;
+            }
+        }
+        self->mTotalMemoryUsage += smallAllocDelta + bigAllocDelta;
+        self->mSmallAllocMemoryUsage += smallAllocDelta;
 
         if (bigAllocDelta != 0)
         {
@@ -175,115 +183,125 @@ namespace LuaUtil
         if (sProfilerEnabled)
             lua_sethook(mLuaHolder.get(), &countHook, LUA_MASKCOUNT, countHookStep);
 
-        mSol.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::bit32, sol::lib::string,
-            sol::lib::table, sol::lib::os, sol::lib::debug);
+        protectedCall([&](LuaView& view) {
+            auto& sol = view.sol();
+            sol.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::bit32, sol::lib::string,
+                sol::lib::table, sol::lib::os, sol::lib::debug);
 
-        mSol["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
-        mSol["math"]["randomseed"] = [] {};
+#ifndef NO_LUAJIT
+            sol.open_libraries(sol::lib::jit);
+#endif // NO_LUAJIT
 
-        mSol["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
+            sol["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
+            sol["math"]["randomseed"] = [] {};
 
-        mSol["setEnvironment"]
-            = [](const sol::environment& env, const sol::function& fn) { sol::set_environment(env, fn); };
-        mSol["loadFromVFS"] = [this](std::string_view packageName) {
-            return loadScriptAndCache(packageNameToVfsPath(packageName, mVFS));
-        };
-        mSol["loadInternalLib"] = [this](std::string_view packageName) { return loadInternalLib(packageName); };
+            sol["utf8"] = LuaUtf8::initUtf8Package(sol);
 
-        // Some fixes for compatibility between different Lua versions
-        if (mSol["unpack"] == sol::nil)
-            mSol["unpack"] = mSol["table"]["unpack"];
-        else if (mSol["table"]["unpack"] == sol::nil)
-            mSol["table"]["unpack"] = mSol["unpack"];
-        if (LUA_VERSION_NUM <= 501)
-        {
-            mSol.script(R"(
-                local _pairs = pairs
-                local _ipairs = ipairs
-                pairs = function(v) return (rawget(getmetatable(v) or {}, '__pairs') or _pairs)(v) end
-                ipairs = function(v) return (rawget(getmetatable(v) or {}, '__ipairs') or _ipairs)(v) end
+            sol["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
+
+            sol["setEnvironment"]
+                = [](const sol::environment& env, const sol::function& fn) { sol::set_environment(env, fn); };
+            sol["loadFromVFS"] = [this](std::string_view packageName) {
+                return loadScriptAndCache(packageNameToVfsPath(packageName, *mVFS));
+            };
+            sol["loadInternalLib"] = [this](std::string_view packageName) { return loadInternalLib(packageName); };
+
+            // Some fixes for compatibility between different Lua versions
+            if (sol["unpack"] == sol::nil)
+                sol["unpack"] = sol["table"]["unpack"];
+            else if (sol["table"]["unpack"] == sol::nil)
+                sol["table"]["unpack"] = sol["unpack"];
+            if (LUA_VERSION_NUM <= 501)
+            {
+                sol.script(R"(
+                    local _pairs = pairs
+                    local _ipairs = ipairs
+                    pairs = function(v) return (rawget(getmetatable(v) or {}, '__pairs') or _pairs)(v) end
+                    ipairs = function(v) return (rawget(getmetatable(v) or {}, '__ipairs') or _ipairs)(v) end
+                )");
+            }
+
+            sol.script(R"(
+                local printToLog = function(...)
+                    local strs = {}
+                    for i = 1, select('#', ...) do
+                        strs[i] = tostring(select(i, ...))
+                    end
+                    return writeToLog(table.concat(strs, '\t'))
+                end
+                printGen = function(name) return function(...) return printToLog(name, ...) end end
+
+                function requireGen(env, loaded, loadFn)
+                    return function(packageName)
+                        local p = loaded[packageName]
+                        if p == nil then
+                            local loader = loadFn(packageName)
+                            setEnvironment(env, loader)
+                            p = loader(packageName)
+                            loaded[packageName] = p
+                        end
+                        return p
+                    end
+                end
+
+                function createStrictIndexFn(tbl)
+                    return function(_, key)
+                        local res = tbl[key]
+                        if res ~= nil then
+                            return res
+                        else
+                            error('Key not found: '..tostring(key), 2)
+                        end
+                    end
+                end
+                function pairsForReadOnly(v)
+                    local nextFn, t, firstKey = pairs(getmetatable(v).t)
+                    return function(_, k) return nextFn(t, k) end, v, firstKey
+                end
+                function ipairsForReadOnly(v)
+                    local nextFn, t, firstKey = ipairs(getmetatable(v).t)
+                    return function(_, k) return nextFn(t, k) end, v, firstKey
+                end
+                function lenForReadOnly(v)
+                    return #getmetatable(v).t
+                end
+                local function nextForArray(array, index)
+                    index = (index or 0) + 1
+                    if index <= #array then
+                        return index, array[index]
+                    end
+                end
+                function ipairsForArray(array)
+                    return nextForArray, array, 0
+                end
+
+                getmetatable('').__metatable = false
+                getSafeMetatable = function(v)
+                    if type(v) ~= 'table' then error('getmetatable is allowed only for tables', 2) end
+                    return getmetatable(v)
+                end
             )");
-        }
 
-        mSol.script(R"(
-            local printToLog = function(...)
-                local strs = {}
-                for i = 1, select('#', ...) do
-                    strs[i] = tostring(select(i, ...))
-                end
-                return writeToLog(table.concat(strs, '\t'))
-            end
-            printGen = function(name) return function(...) return printToLog(name, ...) end end
-
-            function requireGen(env, loaded, loadFn)
-                return function(packageName)
-                    local p = loaded[packageName]
-                    if p == nil then
-                        local loader = loadFn(packageName)
-                        setEnvironment(env, loader)
-                        p = loader(packageName)
-                        loaded[packageName] = p
-                    end
-                    return p
-                end
-            end
-
-            function createStrictIndexFn(tbl)
-                return function(_, key)
-                    local res = tbl[key]
-                    if res ~= nil then
-                        return res
-                    else
-                        error('Key not found: '..tostring(key), 2)
-                    end
-                end
-            end
-            function pairsForReadOnly(v)
-                local nextFn, t, firstKey = pairs(getmetatable(v).t)
-                return function(_, k) return nextFn(t, k) end, v, firstKey
-            end
-            function ipairsForReadOnly(v)
-                local nextFn, t, firstKey = ipairs(getmetatable(v).t)
-                return function(_, k) return nextFn(t, k) end, v, firstKey
-            end
-            function lenForReadOnly(v)
-                return #getmetatable(v).t
-            end
-            local function nextForArray(array, index)
-                index = (index or 0) + 1
-                if index <= #array then
-                    return index, array[index]
-                end
-            end
-            function ipairsForArray(array)
-                return nextForArray, array, 0
-            end
-
-            getmetatable('').__metatable = false
-            getSafeMetatable = function(v)
-                if type(v) ~= 'table' then error('getmetatable is allowed only for tables', 2) end
-                return getmetatable(v)
-            end
-        )");
-
-        mSandboxEnv = sol::table(mSol, sol::create);
-        mSandboxEnv["_VERSION"] = mSol["_VERSION"];
-        for (const std::string& s : safeFunctions)
-        {
-            if (mSol[s] == sol::nil)
-                throw std::logic_error("Lua function not found: " + s);
-            mSandboxEnv[s] = mSol[s];
-        }
-        for (const std::string& s : safePackages)
-        {
-            if (mSol[s] == sol::nil)
-                throw std::logic_error("Lua package not found: " + s);
-            mCommonPackages[s] = mSandboxEnv[s] = makeReadOnly(mSol[s]);
-        }
-        mSandboxEnv["getmetatable"] = mSol["getSafeMetatable"];
-        mCommonPackages["os"] = mSandboxEnv["os"]
-            = makeReadOnly(tableFromPairs<std::string_view, sol::function>({ { "date", mSol["os"]["date"] },
-                { "difftime", mSol["os"]["difftime"] }, { "time", mSol["os"]["time"] } }));
+            mSandboxEnv = sol::table(sol, sol::create);
+            mSandboxEnv["_VERSION"] = sol["_VERSION"];
+            for (const std::string& s : safeFunctions)
+            {
+                if (sol[s] == sol::nil)
+                    throw std::logic_error("Lua function not found: " + s);
+                mSandboxEnv[s] = sol[s];
+            }
+            for (const std::string& s : safePackages)
+            {
+                if (sol[s] == sol::nil)
+                    throw std::logic_error("Lua package not found: " + s);
+                mCommonPackages[s] = mSandboxEnv[s] = makeReadOnly(sol[s]);
+            }
+            mSandboxEnv["getmetatable"] = sol["getSafeMetatable"];
+            mCommonPackages["os"] = mSandboxEnv["os"]
+                = makeReadOnly(tableFromPairs<std::string_view, sol::function>(sol,
+                    { { "date", sol["os"]["date"] }, { "difftime", sol["os"]["difftime"] },
+                        { "time", sol["os"]["time"] } }));
+        });
     }
 
     sol::table makeReadOnly(const sol::table& table, bool strictIndex)
@@ -298,12 +316,13 @@ namespace LuaUtil
         sol::table meta(lua, sol::create);
         meta["t"] = table;
         if (strictIndex)
-            meta["__index"] = lua["createStrictIndexFn"](table);
+            meta[sol::meta_method::index] = lua["createStrictIndexFn"](table);
         else
-            meta["__index"] = table;
-        meta["__pairs"] = lua["pairsForReadOnly"];
-        meta["__ipairs"] = lua["ipairsForReadOnly"];
-        meta["__len"] = lua["lenForReadOnly"];
+            meta[sol::meta_method::index] = table;
+        meta[sol::meta_method::pairs] = lua["pairsForReadOnly"];
+        meta[sol::meta_method::ipairs] = lua["ipairsForReadOnly"];
+        meta[sol::meta_method::length] = lua["lenForReadOnly"];
+        meta[sol::meta_method::type] = "ReadOnlyTable";
 
         lua_newuserdata(luaState, 0);
         sol::stack::push(luaState, meta);
@@ -323,14 +342,14 @@ namespace LuaUtil
         mCommonPackages.insert_or_assign(std::move(packageName), std::move(package));
     }
 
-    sol::protected_function_result LuaState::runInNewSandbox(const std::string& path, const std::string& namePrefix,
-        const std::map<std::string, sol::object>& packages, const sol::object& hiddenData)
+    sol::protected_function_result LuaState::runInNewSandbox(const VFS::Path::Normalized& path,
+        const std::string& envName, const std::map<std::string, sol::object>& packages, const sol::object& hiddenData)
     {
+        // TODO
         sol::protected_function script = loadScriptAndCache(path);
 
         sol::environment env(mSol, sol::create, mSandboxEnv);
-        std::string envName = namePrefix + "[" + path + "]:";
-        env["print"] = mSol["printGen"](envName);
+        env["print"] = mSol["printGen"](envName + ":");
         env["_G"] = env;
         env[sol::metatable_key]["__metatable"] = false;
 
@@ -359,6 +378,7 @@ namespace LuaUtil
 
     sol::environment LuaState::newInternalLibEnvironment()
     {
+        // TODO
         sol::environment env(mSol, sol::create, mSandboxEnv);
         sol::table loaded(mSol, sol::create);
         for (const std::string& s : safePackages)
@@ -369,28 +389,35 @@ namespace LuaUtil
 
     sol::protected_function_result LuaState::throwIfError(sol::protected_function_result&& res)
     {
-        if (!res.valid() && static_cast<int>(res.get_type()) == LUA_TSTRING)
-            throw std::runtime_error("Lua error: " + res.get<std::string>());
+        if (!res.valid())
+            throw std::runtime_error(std::string("Lua error: ") += res.get<sol::error>().what());
         else
             return std::move(res);
     }
 
-    sol::function LuaState::loadScriptAndCache(const std::string& path)
+    sol::function LuaState::loadScriptAndCache(const VFS::Path::Normalized& path)
     {
         auto iter = mCompiledScripts.find(path);
         if (iter != mCompiledScripts.end())
-            return mSol.load(iter->second.as_string_view(), path, sol::load_mode::binary);
+        {
+            sol::load_result res = mSol.load(iter->second.as_string_view(), path.value(), sol::load_mode::binary);
+            // Unless we have memory corruption issues, the bytecode is valid at this point, but loading might still
+            // fail because we've hit our Lua memory cap
+            if (!res.valid())
+                throw std::runtime_error("Lua error: " + res.get<std::string>());
+            return res;
+        }
         sol::function res = loadFromVFS(path);
         mCompiledScripts[path] = res.dump();
         return res;
     }
 
-    sol::function LuaState::loadFromVFS(const std::string& path)
+    sol::function LuaState::loadFromVFS(const VFS::Path::Normalized& path)
     {
         std::string fileContent(std::istreambuf_iterator<char>(*mVFS->get(path)), {});
-        sol::load_result res = mSol.load(fileContent, path, sol::load_mode::text);
+        sol::load_result res = mSol.load(fileContent, path.value(), sol::load_mode::text);
         if (!res.valid())
-            throw std::runtime_error("Lua error: " + res.get<std::string>());
+            throw std::runtime_error(std::string("Lua error: ") += res.get<sol::error>().what());
         return res;
     }
 
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index aea1e32590..32c3151c88 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -7,6 +7,8 @@
 
 #include <sol/sol.hpp>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "configuration.hpp"
 
 namespace VFS
@@ -34,6 +36,36 @@ namespace LuaUtil
         bool mLogMemoryUsage = false;
     };
 
+    class LuaState;
+    class LuaView
+    {
+        sol::state_view mSol;
+
+        LuaView(const LuaView&) = delete;
+
+        LuaView(lua_State* L)
+            : mSol(L)
+        {
+        }
+
+    public:
+        friend class LuaState;
+        // Returns underlying sol::state.
+        sol::state_view& sol() { return mSol; }
+
+        // A shortcut to create a new Lua table.
+        sol::table newTable() { return sol::table(mSol, sol::create); }
+    };
+
+    template <typename Key, typename Value>
+    sol::table tableFromPairs(lua_State* L, std::initializer_list<std::pair<Key, Value>> list)
+    {
+        sol::table res(L, sol::create);
+        for (const auto& [k, v] : list)
+            res[k] = v;
+        return res;
+    }
+
     // Holds Lua state.
     // Provides additional features:
     //   - Load scripts from the virtual filesystem;
@@ -54,26 +86,53 @@ namespace LuaUtil
         LuaState(const LuaState&) = delete;
         LuaState(LuaState&&) = delete;
 
-        // Returns underlying sol::state.
-        sol::state_view& sol() { return mSol; }
+        // Pushing to the stack from outside a Lua context crashes the engine if no memory can be allocated to grow the
+        // stack
+        template <class Lambda>
+        [[nodiscard]] int invokeProtectedCall(Lambda&& f) const
+        {
+            if (!lua_checkstack(mSol.lua_state(), 2))
+                return LUA_ERRMEM;
+            lua_pushcfunction(mSol.lua_state(), [](lua_State* L) {
+                void* f = lua_touserdata(L, 1);
+                LuaView view(L);
+                (*static_cast<Lambda*>(f))(view);
+                return 0;
+            });
+            lua_pushlightuserdata(mSol.lua_state(), &f);
+            return lua_pcall(mSol.lua_state(), 1, 0, 0);
+        }
+
+        template <class Lambda>
+        void protectedCall(Lambda&& f) const
+        {
+            int result = invokeProtectedCall(std::forward<Lambda>(f));
+            switch (result)
+            {
+                case LUA_OK:
+                    break;
+                case LUA_ERRMEM:
+                    throw std::runtime_error("Lua error: out of memory");
+                case LUA_ERRRUN:
+                {
+                    sol::optional<std::string> error = sol::stack::check_get<std::string>(mSol.lua_state());
+                    if (error)
+                        throw std::runtime_error(*error);
+                }
+                    [[fallthrough]];
+                default:
+                    throw std::runtime_error("Lua error: " + std::to_string(result));
+            }
+        }
+
+        // Note that constructing a sol::state_view is only safe from a Lua context. Use protectedCall to get one
+        lua_State* unsafeState() const { return mSol.lua_state(); }
 
         // Can be used by a C++ function that is called from Lua to get the Lua traceback.
         // Makes no sense if called not from Lua code.
         // Note: It is a slow function, should be used for debug purposes only.
         std::string debugTraceback() { return mSol["debug"]["traceback"]().get<std::string>(); }
 
-        // A shortcut to create a new Lua table.
-        sol::table newTable() { return sol::table(mSol, sol::create); }
-
-        template <typename Key, typename Value>
-        sol::table tableFromPairs(std::initializer_list<std::pair<Key, Value>> list)
-        {
-            sol::table res(mSol, sol::create);
-            for (const auto& [k, v] : list)
-                res[k] = v;
-            return res;
-        }
-
         // Registers a package that will be available from every sandbox via `require(name)`.
         // The package can be either a sol::table with an API or a sol::function. If it is a function,
         // it will be evaluated (once per sandbox) the first time when requested. If the package
@@ -84,13 +143,13 @@ namespace LuaUtil
         // (the result is expected to be an interface of the script).
         // Args:
         //     path: path to the script in the virtual filesystem;
-        //     namePrefix: sandbox name will be "<namePrefix>[<filePath>]". Sandbox name
-        //         will be added to every `print` output.
+        //     envName: sandbox name.
         //     packages: additional packages that should be available from the sandbox via `require`. Each package
         //         should be either a sol::table or a sol::function. If it is a function, it will be evaluated
         //         (once per sandbox) with the argument 'hiddenData' the first time when requested.
-        sol::protected_function_result runInNewSandbox(const std::string& path, const std::string& namePrefix = "",
-            const std::map<std::string, sol::object>& packages = {}, const sol::object& hiddenData = sol::nil);
+        sol::protected_function_result runInNewSandbox(const VFS::Path::Normalized& path,
+            const std::string& envName = "unnamed", const std::map<std::string, sol::object>& packages = {},
+            const sol::object& hiddenData = sol::nil);
 
         void dropScriptCache() { mCompiledScripts.clear(); }
 
@@ -100,7 +159,7 @@ namespace LuaUtil
         // directly.
         void addInternalLibSearchPath(const std::filesystem::path& path) { mLibSearchPaths.push_back(path); }
         sol::function loadInternalLib(std::string_view libName);
-        sol::function loadFromVFS(const std::string& path);
+        sol::function loadFromVFS(const VFS::Path::Normalized& path);
         sol::environment newInternalLibEnvironment();
 
         uint64_t getTotalMemoryUsage() const { return mSol.memory_used(); }
@@ -116,15 +175,16 @@ namespace LuaUtil
         static void disableProfiler() { sProfilerEnabled = false; }
         static bool isProfilerEnabled() { return sProfilerEnabled; }
 
-    private:
         static sol::protected_function_result throwIfError(sol::protected_function_result&&);
+
+    private:
         template <typename... Args>
         friend sol::protected_function_result call(const sol::protected_function& fn, Args&&... args);
         template <typename... Args>
         friend sol::protected_function_result call(
             ScriptId scriptId, const sol::protected_function& fn, Args&&... args);
 
-        sol::function loadScriptAndCache(const std::string& path);
+        sol::function loadScriptAndCache(const VFS::Path::Normalized& path);
         static void countHook(lua_State* L, lua_Debug* ar);
         static void* trackingAllocator(void* ud, void* ptr, size_t osize, size_t nsize);
 
@@ -169,7 +229,7 @@ namespace LuaUtil
         sol::state_view mSol;
         const ScriptsConfiguration* mConf;
         sol::table mSandboxEnv;
-        std::map<std::string, sol::bytecode> mCompiledScripts;
+        std::map<VFS::Path::Normalized, sol::bytecode> mCompiledScripts;
         std::map<std::string, sol::object> mCommonPackages;
         const VFS::Manager* mVFS;
         std::vector<std::filesystem::path> mLibSearchPaths;
@@ -232,16 +292,50 @@ namespace LuaUtil
         }
     }
 
+    // work around for a (likely) sol3 bug
+    // when the index meta method throws, simply calling table.get crashes instead of re-throwing the error
+    template <class Key>
+    sol::object safeGet(const sol::table& table, const Key& key)
+    {
+        auto index = table.traverse_raw_get<sol::optional<sol::main_protected_function>>(
+            sol::metatable_key, sol::meta_function::index);
+        if (index)
+        {
+            sol::protected_function_result result = index.value()(table, key);
+            if (result.valid())
+                return result.get<sol::object>();
+            else
+                throw result.get<sol::error>();
+        }
+        else
+            return table.raw_get<sol::object>(key);
+    }
+
     // getFieldOrNil(table, "a", "b", "c") returns table["a"]["b"]["c"] or nil if some of the fields doesn't exist.
     template <class... Str>
     sol::object getFieldOrNil(const sol::object& table, std::string_view first, const Str&... str)
     {
         if (!table.is<sol::table>())
             return sol::nil;
+        sol::object value = safeGet(table.as<sol::table>(), first);
         if constexpr (sizeof...(str) == 0)
-            return table.as<sol::table>()[first];
+            return value;
         else
-            return getFieldOrNil(table.as<sol::table>()[first], str...);
+            return getFieldOrNil(value, str...);
+    }
+
+    template <class... Str>
+    void setDeepField(sol::table& table, const sol::object& value, std::string_view first, const Str&... str)
+    {
+        if constexpr (sizeof...(str) == 0)
+            table[first] = value;
+        else
+        {
+            if (table[first] == sol::nil)
+                table[first] = sol::table(table.lua_state(), sol::create);
+            sol::table nextTable = table[first];
+            setDeepField(nextTable, value, str...);
+        }
     }
 
     // String representation of a Lua object. Should be used for debugging/logging purposes only.
@@ -278,6 +372,12 @@ namespace LuaUtil
     }
     sol::table getMutableFromReadOnly(const sol::userdata&);
 
+    template <class T>
+    void copyVectorToTable(const std::vector<T>& v, sol::table& out)
+    {
+        for (const T& t : v)
+            out.add(t);
+    }
 }
 
 #endif // COMPONENTS_LUA_LUASTATE_H
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index 2a1a755422..11d347dade 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -1,7 +1,18 @@
 #include "scriptscontainer.hpp"
 
+#include "scripttracker.hpp"
+
 #include <components/esm/luascripts.hpp>
 
+namespace
+{
+    struct ScriptInfo
+    {
+        std::string_view mInitData;
+        const ESM::LuaScript* mSavedData;
+    };
+}
+
 namespace LuaUtil
 {
     static constexpr std::string_view ENGINE_HANDLERS = "engineHandlers";
@@ -17,15 +28,23 @@ namespace LuaUtil
 
     int64_t ScriptsContainer::sInstanceCount = 0;
 
-    ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix)
+    ScriptsContainer::ScriptsContainer(
+        LuaUtil::LuaState* lua, std::string_view namePrefix, ScriptTracker* tracker, bool load)
         : mNamePrefix(namePrefix)
         , mLua(*lua)
         , mThis(std::make_shared<ScriptsContainer*>(this))
+        , mTracker(tracker)
     {
         sInstanceCount++;
         registerEngineHandlers({ &mUpdateHandlers });
-        mPublicInterfaces = sol::table(lua->sol(), sol::create);
-        addPackage("openmw.interfaces", mPublicInterfaces);
+        if (load)
+        {
+            LoadedData& data = mData.emplace<LoadedData>();
+            mLua.protectedCall([&](LuaView& view) {
+                data.mPublicInterfaces = sol::table(view.sol(), sol::create);
+                addPackage("openmw.interfaces", makeReadOnly(data.mPublicInterfaces));
+            });
+        }
     }
 
     void ScriptsContainer::printError(int scriptId, std::string_view msg, const std::exception& e)
@@ -35,45 +54,53 @@ namespace LuaUtil
 
     void ScriptsContainer::addPackage(std::string packageName, sol::object package)
     {
-        mAPI.insert_or_assign(std::move(packageName), makeReadOnly(std::move(package)));
+        if (!package.is<sol::userdata>())
+            throw std::logic_error("Expected package to be read-only: " + packageName);
+        mAPI.insert_or_assign(std::move(packageName), std::move(package));
     }
 
     bool ScriptsContainer::addCustomScript(int scriptId, std::string_view initData)
     {
         assert(mLua.getConfiguration().isCustomScript(scriptId));
-        std::optional<sol::function> onInit, onLoad;
-        bool ok = addScript(scriptId, onInit, onLoad);
-        if (ok && onInit)
-            callOnInit(scriptId, *onInit, initData);
+        bool ok = false;
+        mLua.protectedCall([&](LuaView& view) {
+            std::optional<sol::function> onInit, onLoad;
+            ok = addScript(view, scriptId, onInit, onLoad);
+            if (ok && onInit)
+                callOnInit(view, scriptId, *onInit, initData);
+        });
         return ok;
     }
 
     void ScriptsContainer::addAutoStartedScripts()
     {
-        for (const auto& [scriptId, data] : mAutoStartScripts)
-        {
-            std::optional<sol::function> onInit, onLoad;
-            bool ok = addScript(scriptId, onInit, onLoad);
-            if (ok && onInit)
-                callOnInit(scriptId, *onInit, data);
-        }
+        mLua.protectedCall([&](LuaView& view) {
+            for (const auto& [scriptId, data] : mAutoStartScripts)
+            {
+                std::optional<sol::function> onInit, onLoad;
+                bool ok = addScript(view, scriptId, onInit, onLoad);
+                if (ok && onInit)
+                    callOnInit(view, scriptId, *onInit, data);
+            }
+        });
     }
 
     bool ScriptsContainer::addScript(
-        int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad)
+        LuaView& view, int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad)
     {
         assert(scriptId >= 0 && scriptId < static_cast<int>(mLua.getConfiguration().size()));
-        if (mScripts.count(scriptId) != 0)
+        if (hasScript(scriptId))
             return false; // already present
 
-        const std::string& path = scriptPath(scriptId);
+        const VFS::Path::Normalized& path = scriptPath(scriptId);
         std::string debugName = mNamePrefix;
         debugName.push_back('[');
         debugName.append(path);
         debugName.push_back(']');
 
-        Script& script = mScripts[scriptId];
-        script.mHiddenData = mLua.newTable();
+        LoadedData& data = ensureLoaded();
+        Script& script = data.mScripts[scriptId];
+        script.mHiddenData = view.newTable();
         script.mHiddenData[sScriptIdKey] = ScriptId{ this, scriptId };
         script.mHiddenData[sScriptDebugNameKey] = debugName;
         script.mPath = path;
@@ -90,7 +117,7 @@ namespace LuaUtil
 
         try
         {
-            sol::object scriptOutput = mLua.runInNewSandbox(path, mNamePrefix, mAPI, script.mHiddenData);
+            sol::object scriptOutput = mLua.runInNewSandbox(path, debugName, mAPI, script.mHiddenData);
             if (scriptOutput == sol::nil)
                 return true;
             sol::object engineHandlers = sol::nil, eventHandlers = sol::nil;
@@ -115,20 +142,20 @@ namespace LuaUtil
                     std::string_view handlerName = cast<std::string_view>(key);
                     sol::function fn = cast<sol::function>(handler);
                     if (handlerName == HANDLER_INIT)
-                        onInit = fn;
+                        onInit = std::move(fn);
                     else if (handlerName == HANDLER_LOAD)
-                        onLoad = fn;
+                        onLoad = std::move(fn);
                     else if (handlerName == HANDLER_SAVE)
-                        script.mOnSave = fn;
+                        script.mOnSave = std::move(fn);
                     else if (handlerName == HANDLER_INTERFACE_OVERRIDE)
-                        script.mOnOverride = fn;
+                        script.mOnOverride = std::move(fn);
                     else
                     {
                         auto it = mEngineHandlers.find(handlerName);
                         if (it == mEngineHandlers.end())
                             Log(Debug::Error) << "Not supported handler '" << handlerName << "' in " << debugName;
                         else
-                            insertHandler(it->second->mList, scriptId, fn);
+                            insertHandler(it->second->mList, scriptId, std::move(fn));
                     }
                 }
             }
@@ -137,9 +164,9 @@ namespace LuaUtil
                 for (const auto& [key, fn] : cast<sol::table>(eventHandlers))
                 {
                     std::string_view eventName = cast<std::string_view>(key);
-                    auto it = mEventHandlers.find(eventName);
-                    if (it == mEventHandlers.end())
-                        it = mEventHandlers.emplace(std::string(eventName), EventHandlerList()).first;
+                    auto it = data.mEventHandlers.find(eventName);
+                    if (it == data.mEventHandlers.end())
+                        it = data.mEventHandlers.emplace(std::string(eventName), EventHandlerList()).first;
                     insertHandler(it->second, scriptId, cast<sol::function>(fn));
                 }
             }
@@ -160,29 +187,55 @@ namespace LuaUtil
         }
         catch (std::exception& e)
         {
-            auto iter = mScripts.find(scriptId);
-            iter->second.mHiddenData[sScriptIdKey] = sol::nil;
+            auto iter = data.mScripts.find(scriptId);
             mRemovedScriptsMemoryUsage[scriptId] = iter->second.mStats.mMemoryUsage;
-            mScripts.erase(iter);
+            data.mScripts.erase(iter);
             Log(Debug::Error) << "Can't start " << debugName << "; " << e.what();
             return false;
         }
     }
 
+    bool ScriptsContainer::hasScript(int scriptId) const
+    {
+        return std::visit(
+            [&](auto&& variant) {
+                using T = std::decay_t<decltype(variant)>;
+                if constexpr (std::is_same_v<T, UnloadedData>)
+                {
+                    const auto& conf = mLua.getConfiguration();
+                    if (scriptId >= 0 && static_cast<size_t>(scriptId) < conf.size())
+                    {
+                        const auto& path = conf[scriptId].mScriptPath;
+                        for (const ESM::LuaScript& script : variant.mScripts)
+                        {
+                            if (script.mScriptPath == path)
+                                return true;
+                        }
+                    }
+                }
+                else if constexpr (std::is_same_v<T, LoadedData>)
+                {
+                    return variant.mScripts.count(scriptId) != 0;
+                }
+                return false;
+            },
+            mData);
+    }
+
     void ScriptsContainer::removeScript(int scriptId)
     {
-        auto scriptIter = mScripts.find(scriptId);
-        if (scriptIter == mScripts.end())
+        LoadedData& data = ensureLoaded();
+        auto scriptIter = data.mScripts.find(scriptId);
+        if (scriptIter == data.mScripts.end())
             return; // no such script
         Script& script = scriptIter->second;
         if (script.mInterface)
             removeInterface(scriptId, script);
-        script.mHiddenData[sScriptIdKey] = sol::nil;
         mRemovedScriptsMemoryUsage[scriptId] = script.mStats.mMemoryUsage;
-        mScripts.erase(scriptIter);
+        data.mScripts.erase(scriptIter);
         for (auto& [_, handlers] : mEngineHandlers)
             removeHandler(handlers->mList, scriptId);
-        for (auto& [_, handlers] : mEventHandlers)
+        for (auto& [_, handlers] : data.mEventHandlers)
             removeHandler(handlers, scriptId);
     }
 
@@ -192,7 +245,8 @@ namespace LuaUtil
         const Script* prev = nullptr;
         const Script* next = nullptr;
         int nextId = 0;
-        for (const auto& [otherId, otherScript] : mScripts)
+        LoadedData& data = ensureLoaded();
+        for (const auto& [otherId, otherScript] : data.mScripts)
         {
             if (scriptId == otherId || script.mInterfaceName != otherScript.mInterfaceName)
                 continue;
@@ -228,7 +282,7 @@ namespace LuaUtil
             }
         }
         if (next == nullptr)
-            mPublicInterfaces[script.mInterfaceName] = *script.mInterface;
+            data.mPublicInterfaces[script.mInterfaceName] = *script.mInterface;
     }
 
     void ScriptsContainer::removeInterface(int scriptId, const Script& script)
@@ -237,7 +291,8 @@ namespace LuaUtil
         const Script* prev = nullptr;
         const Script* next = nullptr;
         int nextId = 0;
-        for (const auto& [otherId, otherScript] : mScripts)
+        LoadedData& data = ensureLoaded();
+        for (const auto& [otherId, otherScript] : data.mScripts)
         {
             if (scriptId == otherId || script.mInterfaceName != otherScript.mInterfaceName)
                 continue;
@@ -268,9 +323,9 @@ namespace LuaUtil
             }
         }
         else if (prev)
-            mPublicInterfaces[script.mInterfaceName] = *prev->mInterface;
+            data.mPublicInterfaces[script.mInterfaceName] = *prev->mInterface;
         else
-            mPublicInterfaces[script.mInterfaceName] = sol::nil;
+            data.mPublicInterfaces[script.mInterfaceName] = sol::nil;
     }
 
     void ScriptsContainer::insertHandler(std::vector<Handler>& list, int scriptId, sol::function fn)
@@ -295,35 +350,38 @@ namespace LuaUtil
 
     void ScriptsContainer::receiveEvent(std::string_view eventName, std::string_view eventData)
     {
-        auto it = mEventHandlers.find(eventName);
-        if (it == mEventHandlers.end())
+        LoadedData& data = ensureLoaded();
+        auto it = data.mEventHandlers.find(eventName);
+        if (it == data.mEventHandlers.end())
             return;
-        sol::object data;
-        try
-        {
-            data = LuaUtil::deserialize(mLua.sol(), eventData, mSerializer);
-        }
-        catch (std::exception& e)
-        {
-            Log(Debug::Error) << mNamePrefix << " can not parse eventData for '" << eventName << "': " << e.what();
-            return;
-        }
-        EventHandlerList& list = it->second;
-        for (int i = list.size() - 1; i >= 0; --i)
-        {
-            const Handler& h = list[i];
+        mLua.protectedCall([&](LuaView& view) {
+            sol::object data;
             try
             {
-                sol::object res = LuaUtil::call({ this, h.mScriptId }, h.mFn, data);
-                if (res.is<bool>() && !res.as<bool>())
-                    break; // Skip other handlers if 'false' was returned.
+                data = LuaUtil::deserialize(view.sol(), eventData, mSerializer);
             }
             catch (std::exception& e)
             {
-                Log(Debug::Error) << mNamePrefix << "[" << scriptPath(h.mScriptId) << "] eventHandler[" << eventName
-                                  << "] failed. " << e.what();
+                Log(Debug::Error) << mNamePrefix << " can not parse eventData for '" << eventName << "': " << e.what();
+                return;
             }
-        }
+            EventHandlerList& list = it->second;
+            for (int i = list.size() - 1; i >= 0; --i)
+            {
+                const Handler& h = list[i];
+                try
+                {
+                    sol::object res = LuaUtil::call({ this, h.mScriptId }, h.mFn, data);
+                    if (res.is<bool>() && !res.as<bool>())
+                        break; // Skip other handlers if 'false' was returned.
+                }
+                catch (std::exception& e)
+                {
+                    Log(Debug::Error) << mNamePrefix << "[" << scriptPath(h.mScriptId) << "] eventHandler[" << eventName
+                                      << "] failed. " << e.what();
+                }
+            }
+        });
     }
 
     void ScriptsContainer::registerEngineHandlers(std::initializer_list<EngineHandlerList*> handlers)
@@ -332,11 +390,11 @@ namespace LuaUtil
             mEngineHandlers[h->mName] = h;
     }
 
-    void ScriptsContainer::callOnInit(int scriptId, const sol::function& onInit, std::string_view data)
+    void ScriptsContainer::callOnInit(LuaView& view, int scriptId, const sol::function& onInit, std::string_view data)
     {
         try
         {
-            LuaUtil::call({ this, scriptId }, onInit, deserialize(mLua.sol(), data, mSerializer));
+            LuaUtil::call({ this, scriptId }, onInit, deserialize(view.sol(), data, mSerializer));
         }
         catch (std::exception& e)
         {
@@ -346,6 +404,12 @@ namespace LuaUtil
 
     void ScriptsContainer::save(ESM::LuaScripts& data)
     {
+        if (UnloadedData* unloadedData = std::get_if<UnloadedData>(&mData))
+        {
+            data.mScripts = unloadedData->mScripts;
+            return;
+        }
+        const auto& loadedData = std::get<LoadedData>(mData);
         std::map<int, std::vector<ESM::LuaTimer>> timers;
         auto saveTimerFn = [&](const Timer& timer, TimerType timerType) {
             if (!timer.mSerializable)
@@ -357,12 +421,12 @@ namespace LuaUtil
             savedTimer.mCallbackArgument = timer.mSerializedArg;
             timers[timer.mScriptId].push_back(std::move(savedTimer));
         };
-        for (const Timer& timer : mSimulationTimersQueue)
+        for (const Timer& timer : loadedData.mSimulationTimersQueue)
             saveTimerFn(timer, TimerType::SIMULATION_TIME);
-        for (const Timer& timer : mGameTimersQueue)
+        for (const Timer& timer : loadedData.mGameTimersQueue)
             saveTimerFn(timer, TimerType::GAME_TIME);
         data.mScripts.clear();
-        for (auto& [scriptId, script] : mScripts)
+        for (auto& [scriptId, script] : loadedData.mScripts)
         {
             ESM::LuaScript savedScript;
             // Note: We can not use `scriptPath(scriptId)` here because `save` can be called during
@@ -392,11 +456,6 @@ namespace LuaUtil
         removeAllScripts();
         const ScriptsConfiguration& cfg = mLua.getConfiguration();
 
-        struct ScriptInfo
-        {
-            std::string_view mInitData;
-            const ESM::LuaScript* mSavedData;
-        };
         std::map<int, ScriptInfo> scripts;
         for (const auto& [scriptId, initData] : mAutoStartScripts)
             scripts[scriptId] = { initData, nullptr };
@@ -418,67 +477,156 @@ namespace LuaUtil
                                     << "]; this script is not allowed here";
         }
 
-        for (const auto& [scriptId, scriptInfo] : scripts)
+        mLua.protectedCall([&](LuaView& view) {
+            UnloadedData& container = ensureUnloaded(view);
+
+            for (const auto& [scriptId, scriptInfo] : scripts)
+            {
+                if (scriptInfo.mSavedData == nullptr)
+                    continue;
+                ESM::LuaScript& script = container.mScripts.emplace_back(*scriptInfo.mSavedData);
+                if (!script.mData.empty())
+                {
+                    try
+                    {
+                        sol::object state = deserialize(view.sol(), script.mData, mSavedDataDeserializer);
+                        script.mData = serialize(state, mSerializer);
+                    }
+                    catch (std::exception& e)
+                    {
+                        printError(scriptId, "onLoad failed", e);
+                        script.mData.clear();
+                    }
+                }
+                for (auto it = script.mTimers.begin(); it != script.mTimers.end();)
+                {
+                    try
+                    {
+                        sol::object arg = deserialize(view.sol(), it->mCallbackArgument, mSavedDataDeserializer);
+                        // It is important if the order of content files was changed. The deserialize-serialize
+                        // procedure updates refnums, so timer.mSerializedArg may be not equal to
+                        // savedTimer.mCallbackArgument.
+                        it->mCallbackArgument = serialize(arg, mSerializer);
+                        ++it;
+                    }
+                    catch (std::exception& e)
+                    {
+                        printError(scriptId, "can not load timer", e);
+                        it = script.mTimers.erase(it);
+                    }
+                }
+            }
+        });
+    }
+
+    ScriptsContainer::LoadedData& ScriptsContainer::ensureLoaded()
+    {
+        mRequiredLoading = true;
+        if (LoadedData* data = std::get_if<LoadedData>(&mData))
+            return *data;
+        UnloadedData& unloadedData = std::get<UnloadedData>(mData);
+        std::vector<ESM::LuaScript> savedScripts = std::move(unloadedData.mScripts);
+        LoadedData& data = mData.emplace<LoadedData>();
+
+        const ScriptsConfiguration& cfg = mLua.getConfiguration();
+
+        std::map<int, ScriptInfo> scripts;
+        for (const auto& [scriptId, initData] : mAutoStartScripts)
+            scripts[scriptId] = { initData, nullptr };
+        for (const ESM::LuaScript& s : savedScripts)
         {
-            std::optional<sol::function> onInit, onLoad;
-            if (!addScript(scriptId, onInit, onLoad))
-                continue;
-            if (scriptInfo.mSavedData == nullptr)
-            {
-                if (onInit)
-                    callOnInit(scriptId, *onInit, scriptInfo.mInitData);
-                continue;
-            }
-            if (onLoad)
-            {
-                try
-                {
-                    sol::object state = deserialize(mLua.sol(), scriptInfo.mSavedData->mData, mSavedDataDeserializer);
-                    sol::object initializationData = deserialize(mLua.sol(), scriptInfo.mInitData, mSerializer);
-                    LuaUtil::call({ this, scriptId }, *onLoad, state, initializationData);
-                }
-                catch (std::exception& e)
-                {
-                    printError(scriptId, "onLoad failed", e);
-                }
-            }
-            for (const ESM::LuaTimer& savedTimer : scriptInfo.mSavedData->mTimers)
-            {
-                Timer timer;
-                timer.mCallback = savedTimer.mCallbackName;
-                timer.mSerializable = true;
-                timer.mScriptId = scriptId;
-                timer.mTime = savedTimer.mTime;
-
-                try
-                {
-                    timer.mArg = sol::main_object(
-                        deserialize(mLua.sol(), savedTimer.mCallbackArgument, mSavedDataDeserializer));
-                    // It is important if the order of content files was changed. The deserialize-serialize procedure
-                    // updates refnums, so timer.mSerializedArg may be not equal to savedTimer.mCallbackArgument.
-                    timer.mSerializedArg = serialize(timer.mArg, mSerializer);
-
-                    if (savedTimer.mType == TimerType::GAME_TIME)
-                        mGameTimersQueue.push_back(std::move(timer));
-                    else
-                        mSimulationTimersQueue.push_back(std::move(timer));
-                }
-                catch (std::exception& e)
-                {
-                    printError(scriptId, "can not load timer", e);
-                }
-            }
+            std::optional<int> scriptId = cfg.findId(s.mScriptPath);
+            auto it = scripts.find(*scriptId);
+            if (it != scripts.end())
+                it->second.mSavedData = &s;
+            else if (cfg.isCustomScript(*scriptId))
+                scripts[*scriptId] = { cfg[*scriptId].mInitializationData, &s };
         }
 
-        std::make_heap(mSimulationTimersQueue.begin(), mSimulationTimersQueue.end());
-        std::make_heap(mGameTimersQueue.begin(), mGameTimersQueue.end());
+        mLua.protectedCall([&](LuaView& view) {
+            data.mPublicInterfaces = sol::table(view.sol(), sol::create);
+            addPackage("openmw.interfaces", makeReadOnly(data.mPublicInterfaces));
+
+            for (const auto& [scriptId, scriptInfo] : scripts)
+            {
+                std::optional<sol::function> onInit, onLoad;
+                if (!addScript(view, scriptId, onInit, onLoad))
+                    continue;
+                if (scriptInfo.mSavedData == nullptr)
+                {
+                    if (onInit)
+                        callOnInit(view, scriptId, *onInit, scriptInfo.mInitData);
+                    continue;
+                }
+                if (onLoad)
+                {
+                    try
+                    {
+                        sol::object state = deserialize(view.sol(), scriptInfo.mSavedData->mData, mSerializer);
+                        sol::object initializationData = deserialize(view.sol(), scriptInfo.mInitData, mSerializer);
+                        LuaUtil::call({ this, scriptId }, *onLoad, state, initializationData);
+                    }
+                    catch (std::exception& e)
+                    {
+                        printError(scriptId, "onLoad failed", e);
+                    }
+                }
+                for (const ESM::LuaTimer& savedTimer : scriptInfo.mSavedData->mTimers)
+                {
+                    Timer timer;
+                    timer.mCallback = savedTimer.mCallbackName;
+                    timer.mSerializable = true;
+                    timer.mScriptId = scriptId;
+                    timer.mTime = savedTimer.mTime;
+
+                    try
+                    {
+                        timer.mArg
+                            = sol::main_object(deserialize(view.sol(), savedTimer.mCallbackArgument, mSerializer));
+                        // It is important if the order of content files was changed. The deserialize-serialize
+                        // procedure updates refnums, so timer.mSerializedArg may be not equal to
+                        // savedTimer.mCallbackArgument.
+                        timer.mSerializedArg = serialize(timer.mArg, mSerializer);
+
+                        if (savedTimer.mType == TimerType::GAME_TIME)
+                            data.mGameTimersQueue.push_back(std::move(timer));
+                        else
+                            data.mSimulationTimersQueue.push_back(std::move(timer));
+                    }
+                    catch (std::exception& e)
+                    {
+                        printError(scriptId, "can not load timer", e);
+                    }
+                }
+            }
+        });
+
+        std::make_heap(data.mSimulationTimersQueue.begin(), data.mSimulationTimersQueue.end());
+        std::make_heap(data.mGameTimersQueue.begin(), data.mGameTimersQueue.end());
+
+        if (mTracker)
+            mTracker->onLoad(*this);
+
+        return data;
+    }
+
+    ScriptsContainer::UnloadedData& ScriptsContainer::ensureUnloaded(LuaView&)
+    {
+        if (UnloadedData* data = std::get_if<UnloadedData>(&mData))
+            return *data;
+        UnloadedData data;
+        save(data);
+        mAPI.erase("openmw.interfaces");
+        UnloadedData& out = mData.emplace<UnloadedData>(std::move(data));
+        for (auto& [_, handlers] : mEngineHandlers)
+            handlers->mList.clear();
+        mRequiredLoading = false;
+        return out;
     }
 
     ScriptsContainer::~ScriptsContainer()
     {
         sInstanceCount--;
-        for (auto& [_, script] : mScripts)
-            script.mHiddenData[sScriptIdKey] = sol::nil;
         *mThis = nullptr;
     }
 
@@ -486,24 +634,36 @@ namespace LuaUtil
     // external objects that are already removed during child class destruction.
     void ScriptsContainer::removeAllScripts()
     {
-        for (auto& [id, script] : mScripts)
-        {
-            script.mHiddenData[sScriptIdKey] = sol::nil;
-            mRemovedScriptsMemoryUsage[id] = script.mStats.mMemoryUsage;
-        }
-        mScripts.clear();
-        for (auto& [_, handlers] : mEngineHandlers)
-            handlers->mList.clear();
-        mEventHandlers.clear();
-        mSimulationTimersQueue.clear();
-        mGameTimersQueue.clear();
-        mPublicInterfaces.clear();
+        std::visit(
+            [&](auto&& variant) {
+                using T = std::decay_t<decltype(variant)>;
+                if constexpr (std::is_same_v<T, UnloadedData>)
+                {
+                    variant.mScripts.clear();
+                }
+                else if constexpr (std::is_same_v<T, LoadedData>)
+                {
+                    for (auto& [id, script] : variant.mScripts)
+                    {
+                        mRemovedScriptsMemoryUsage[id] = script.mStats.mMemoryUsage;
+                    }
+                    variant.mScripts.clear();
+                    for (auto& [_, handlers] : mEngineHandlers)
+                        handlers->mList.clear();
+                    variant.mEventHandlers.clear();
+                    variant.mSimulationTimersQueue.clear();
+                    variant.mGameTimersQueue.clear();
+                    variant.mPublicInterfaces.clear();
+                }
+            },
+            mData);
     }
 
     ScriptsContainer::Script& ScriptsContainer::getScript(int scriptId)
     {
-        auto it = mScripts.find(scriptId);
-        if (it == mScripts.end())
+        LoadedData& data = ensureLoaded();
+        auto it = data.mScripts.find(scriptId);
+        if (it == data.mScripts.end())
             throw std::logic_error("Script doesn't exist");
         return it->second;
     }
@@ -530,7 +690,8 @@ namespace LuaUtil
         t.mTime = time;
         t.mArg = std::move(callbackArg);
         t.mSerializedArg = serialize(t.mArg, mSerializer);
-        insertTimer(type == TimerType::GAME_TIME ? mGameTimersQueue : mSimulationTimersQueue, std::move(t));
+        LoadedData& data = ensureLoaded();
+        insertTimer(type == TimerType::GAME_TIME ? data.mGameTimersQueue : data.mSimulationTimersQueue, std::move(t));
     }
 
     void ScriptsContainer::setupUnsavableTimer(
@@ -544,8 +705,8 @@ namespace LuaUtil
         t.mCallback = mTemporaryCallbackCounter;
         getScript(t.mScriptId).mTemporaryCallbacks.emplace(mTemporaryCallbackCounter, std::move(callback));
         mTemporaryCallbackCounter++;
-
-        insertTimer(type == TimerType::GAME_TIME ? mGameTimersQueue : mSimulationTimersQueue, std::move(t));
+        LoadedData& data = ensureLoaded();
+        insertTimer(type == TimerType::GAME_TIME ? data.mGameTimersQueue : data.mSimulationTimersQueue, std::move(t));
     }
 
     void ScriptsContainer::callTimer(const Timer& t)
@@ -586,41 +747,52 @@ namespace LuaUtil
 
     void ScriptsContainer::processTimers(double simulationTime, double gameTime)
     {
-        updateTimerQueue(mSimulationTimersQueue, simulationTime);
-        updateTimerQueue(mGameTimersQueue, gameTime);
+        LoadedData& data = ensureLoaded();
+        updateTimerQueue(data.mSimulationTimersQueue, simulationTime);
+        updateTimerQueue(data.mGameTimersQueue, gameTime);
     }
 
-    static constexpr float instructionCountAvgCoef = 1.0 / 30; // averaging over approximately 30 frames
+    static constexpr float instructionCountAvgCoef = 1.0f / 30; // averaging over approximately 30 frames
 
     void ScriptsContainer::statsNextFrame()
     {
-        for (auto& [scriptId, script] : mScripts)
+        if (LoadedData* data = std::get_if<LoadedData>(&mData))
         {
-            // The averaging formula is: averageValue = averageValue * (1-c) + newValue * c
-            script.mStats.mAvgInstructionCount *= 1 - instructionCountAvgCoef;
-            if (script.mStats.mAvgInstructionCount < 5)
-                script.mStats.mAvgInstructionCount = 0; // speeding up converge to zero if newValue is zero
+            for (auto& [scriptId, script] : data->mScripts)
+            {
+                // The averaging formula is: averageValue = averageValue * (1-c) + newValue * c
+                script.mStats.mAvgInstructionCount *= 1 - instructionCountAvgCoef;
+                if (script.mStats.mAvgInstructionCount < 5)
+                    script.mStats.mAvgInstructionCount = 0; // speeding up converge to zero if newValue is zero
+            }
         }
     }
 
     void ScriptsContainer::addInstructionCount(int scriptId, int64_t instructionCount)
     {
-        auto it = mScripts.find(scriptId);
-        if (it != mScripts.end())
-            it->second.mStats.mAvgInstructionCount += instructionCount * instructionCountAvgCoef;
+        if (LoadedData* data = std::get_if<LoadedData>(&mData))
+        {
+            auto it = data->mScripts.find(scriptId);
+            if (it != data->mScripts.end())
+                it->second.mStats.mAvgInstructionCount += instructionCount * instructionCountAvgCoef;
+        }
     }
 
     void ScriptsContainer::addMemoryUsage(int scriptId, int64_t memoryDelta)
     {
-        int64_t* usage;
-        auto it = mScripts.find(scriptId);
-        if (it != mScripts.end())
-            usage = &it->second.mStats.mMemoryUsage;
-        else
-        {
-            auto [rIt, _] = mRemovedScriptsMemoryUsage.emplace(scriptId, 0);
-            usage = &rIt->second;
-        }
+        int64_t* usage = std::visit(
+            [&](auto&& variant) {
+                using T = std::decay_t<decltype(variant)>;
+                if constexpr (std::is_same_v<T, LoadedData>)
+                {
+                    auto it = variant.mScripts.find(scriptId);
+                    if (it != variant.mScripts.end())
+                        return &it->second.mStats.mMemoryUsage;
+                }
+                auto [rIt, _] = mRemovedScriptsMemoryUsage.emplace(scriptId, 0);
+                return &rIt->second;
+            },
+            mData);
         *usage += memoryDelta;
 
         if (mLua.getSettings().mLogMemoryUsage)
@@ -638,12 +810,21 @@ namespace LuaUtil
     void ScriptsContainer::collectStats(std::vector<ScriptStats>& stats) const
     {
         stats.resize(mLua.getConfiguration().size());
-        for (auto& [id, script] : mScripts)
+        if (const LoadedData* data = std::get_if<LoadedData>(&mData))
         {
-            stats[id].mAvgInstructionCount += script.mStats.mAvgInstructionCount;
-            stats[id].mMemoryUsage += script.mStats.mMemoryUsage;
+            for (auto& [id, script] : data->mScripts)
+            {
+                stats[id].mAvgInstructionCount += script.mStats.mAvgInstructionCount;
+                stats[id].mMemoryUsage += script.mStats.mMemoryUsage;
+            }
         }
         for (auto& [id, mem] : mRemovedScriptsMemoryUsage)
             stats[id].mMemoryUsage += mem;
     }
+
+    ScriptsContainer::Script::~Script()
+    {
+        if (mHiddenData != sol::nil)
+            mHiddenData[sScriptIdKey] = sol::nil;
+    }
 }
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index 631b1e58a8..2059983c1f 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -4,6 +4,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <variant>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm/luascripts.hpp>
@@ -13,6 +14,7 @@
 
 namespace LuaUtil
 {
+    class ScriptTracker;
 
     // ScriptsContainer is a base class for all scripts containers (LocalScripts,
     // GlobalScripts, PlayerScripts, etc). Each script runs in a separate sandbox.
@@ -72,14 +74,17 @@ namespace LuaUtil
         using TimerType = ESM::LuaTimer::Type;
 
         // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print`
-        // output. `autoStartScripts` specifies the list of scripts that should be autostarted in this container;
-        //     the script names themselves are stored in ScriptsConfiguration.
-        ScriptsContainer(LuaState* lua, std::string_view namePrefix);
+        // output. `tracker` is a tracker for managing the container's state. `load` specifies whether the container
+        // should be constructed in a loaded state.
+        ScriptsContainer(
+            LuaState* lua, std::string_view namePrefix, ScriptTracker* tracker = nullptr, bool load = true);
 
         ScriptsContainer(const ScriptsContainer&) = delete;
         ScriptsContainer(ScriptsContainer&&) = delete;
         virtual ~ScriptsContainer();
 
+        // `conf` specifies the list of scripts that should be autostarted in this container; the script
+        // names themselves are stored in ScriptsConfiguration.
         void setAutoStartConf(ScriptIdsWithInitializationData conf) { mAutoStartScripts = std::move(conf); }
         const ScriptIdsWithInitializationData& getAutoStartConf() const { return mAutoStartScripts; }
 
@@ -91,9 +96,9 @@ namespace LuaUtil
         // new script, adds it to the container, and calls onInit for this script. Returns `true` if the script was
         // successfully added. The script should have CUSTOM flag. If the flag is not set, or file not found, or has
         // syntax errors, returns false. If such script already exists in the container, then also returns false.
-        bool addCustomScript(int scriptId, std::string_view initData = "");
+        bool addCustomScript(int scriptId, std::string_view initData = {});
 
-        bool hasScript(int scriptId) const { return mScripts.count(scriptId) != 0; }
+        bool hasScript(int scriptId) const;
         void removeScript(int scriptId);
 
         void processTimers(double simulationTime, double gameTime);
@@ -157,6 +162,8 @@ namespace LuaUtil
         void collectStats(std::vector<ScriptStats>& stats) const;
         static int64_t getInstanceCount() { return sInstanceCount; }
 
+        virtual bool isActive() const { return false; }
+
     protected:
         struct Handler
         {
@@ -180,6 +187,7 @@ namespace LuaUtil
         template <typename... Args>
         void callEngineHandlers(EngineHandlerList& handlers, const Args&... args)
         {
+            ensureLoaded();
             for (Handler& handler : handlers.mList)
             {
                 try
@@ -211,8 +219,10 @@ namespace LuaUtil
             sol::table mHiddenData;
             std::map<std::string, sol::main_protected_function> mRegisteredCallbacks;
             std::map<int64_t, sol::main_protected_function> mTemporaryCallbacks;
-            std::string mPath;
+            VFS::Path::Normalized mPath;
             ScriptStats mStats;
+
+            ~Script();
         };
         struct Timer
         {
@@ -232,14 +242,20 @@ namespace LuaUtil
         void addMemoryUsage(int scriptId, int64_t memoryDelta);
 
         // Add to container without calling onInit/onLoad.
-        bool addScript(int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad);
+        bool addScript(
+            LuaView& view, int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad);
 
         // Returns script by id (throws an exception if doesn't exist)
         Script& getScript(int scriptId);
 
         void printError(int scriptId, std::string_view msg, const std::exception& e);
-        const std::string& scriptPath(int scriptId) const { return mLua.getConfiguration()[scriptId].mScriptPath; }
-        void callOnInit(int scriptId, const sol::function& onInit, std::string_view data);
+
+        const VFS::Path::Normalized& scriptPath(int scriptId) const
+        {
+            return mLua.getConfiguration()[scriptId].mScriptPath;
+        }
+
+        void callOnInit(LuaView& view, int scriptId, const sol::function& onInit, std::string_view data);
         void callTimer(const Timer& t);
         void updateTimerQueue(std::vector<Timer>& timerQueue, double time);
         static void insertTimer(std::vector<Timer>& timerQueue, Timer&& t);
@@ -251,21 +267,39 @@ namespace LuaUtil
         ScriptIdsWithInitializationData mAutoStartScripts;
         const UserdataSerializer* mSerializer = nullptr;
         const UserdataSerializer* mSavedDataDeserializer = nullptr;
-        std::map<std::string, sol::object> mAPI;
 
-        std::map<int, Script> mScripts;
-        sol::table mPublicInterfaces;
+        std::map<std::string, sol::object> mAPI;
+        struct LoadedData
+        {
+            std::map<int, Script> mScripts;
+            sol::table mPublicInterfaces;
+
+            std::map<std::string, EventHandlerList, std::less<>> mEventHandlers;
+
+            std::vector<Timer> mSimulationTimersQueue;
+            std::vector<Timer> mGameTimersQueue;
+        };
+        using UnloadedData = ESM::LuaScripts;
+
+        // Unloads the container to free resources held by the shared Lua state. This method serializes the container's
+        // state. The serialized data is automatically restored to the Lua state as required. Unloading and reloading
+        // the container is functionally equivalent to saving and loading the game, meaning the appropriate engine
+        // handlers are invoked.
+        UnloadedData& ensureUnloaded(LuaView& lua);
+        LoadedData& ensureLoaded();
 
         EngineHandlerList mUpdateHandlers{ "onUpdate" };
         std::map<std::string_view, EngineHandlerList*> mEngineHandlers;
-        std::map<std::string, EventHandlerList, std::less<>> mEventHandlers;
-
-        std::vector<Timer> mSimulationTimersQueue;
-        std::vector<Timer> mGameTimersQueue;
+        std::variant<UnloadedData, LoadedData> mData;
         int64_t mTemporaryCallbackCounter = 0;
 
         std::map<int, int64_t> mRemovedScriptsMemoryUsage;
-        std::shared_ptr<ScriptsContainer*> mThis; // used by LuaState to track ownership of memory allocations
+        using WeakPtr = std::shared_ptr<ScriptsContainer*>;
+        WeakPtr mThis; // used by LuaState to track ownership of memory allocations
+
+        ScriptTracker* mTracker;
+        bool mRequiredLoading = false;
+        friend class ScriptTracker;
 
         static int64_t sInstanceCount; // debug information, shown in Lua profiler
     };
diff --git a/components/lua/scripttracker.cpp b/components/lua/scripttracker.cpp
new file mode 100644
index 0000000000..bf28c6cbac
--- /dev/null
+++ b/components/lua/scripttracker.cpp
@@ -0,0 +1,53 @@
+#include "scripttracker.hpp"
+
+namespace LuaUtil
+{
+    namespace
+    {
+        constexpr unsigned sMinLoadedFrames = 50;
+        constexpr unsigned sMaxLoadedFrames = 600;
+        constexpr unsigned sUsageFrameGrowth = 10;
+        constexpr std::size_t sMinToProcess = 1;
+        constexpr std::size_t sToProcessDiv = 20; // 5%
+    }
+
+    void ScriptTracker::onLoad(ScriptsContainer& container)
+    {
+        mLoadedScripts.emplace(container.mThis, sMinLoadedFrames + mFrame);
+    }
+
+    void ScriptTracker::unloadInactiveScripts(LuaView& lua)
+    {
+        // This code is technically incorrect if mFrame overflows... but at 300fps that takes about half a year
+        std::size_t toProcess = std::max(mLoadedScripts.size() / sToProcessDiv, sMinToProcess);
+        while (toProcess && !mLoadedScripts.empty())
+        {
+            --toProcess;
+            auto [ptr, ttl] = std::move(mLoadedScripts.front());
+            mLoadedScripts.pop();
+            ScriptsContainer* container = *ptr.get();
+            // Object no longer exists, cease tracking
+            if (!container)
+                continue;
+            // Ignore activity of local scripts in the active grid
+            if (container->isActive())
+                ttl = std::max(ttl, mFrame + sMinLoadedFrames);
+            else
+            {
+                bool activeSinceLastPop = container->mRequiredLoading;
+                if (activeSinceLastPop)
+                {
+                    container->mRequiredLoading = false;
+                    ttl = std::min(ttl + sUsageFrameGrowth, mFrame + sMaxLoadedFrames);
+                }
+                else if (ttl < mFrame)
+                {
+                    container->ensureUnloaded(lua);
+                    continue;
+                }
+            }
+            mLoadedScripts.emplace(std::move(ptr), ttl);
+        }
+        ++mFrame;
+    }
+}
diff --git a/components/lua/scripttracker.hpp b/components/lua/scripttracker.hpp
new file mode 100644
index 0000000000..1834e4da4c
--- /dev/null
+++ b/components/lua/scripttracker.hpp
@@ -0,0 +1,28 @@
+#ifndef COMPONENTS_LUA_SCRIPTTRACKER_H
+#define COMPONENTS_LUA_SCRIPTTRACKER_H
+
+#include <memory>
+#include <queue>
+#include <utility>
+
+#include "scriptscontainer.hpp"
+
+namespace LuaUtil
+{
+    class ScriptTracker
+    {
+        using Frame = unsigned int;
+        using TrackedScriptContainer = std::pair<ScriptsContainer::WeakPtr, Frame>;
+        std::queue<TrackedScriptContainer> mLoadedScripts;
+        Frame mFrame = 0;
+
+    public:
+        void unloadInactiveScripts(LuaView& lua);
+
+        void onLoad(ScriptsContainer& container);
+
+        std::size_t size() const { return mLoadedScripts.size(); }
+    };
+}
+
+#endif // COMPONENTS_LUA_SCRIPTTRACKER_H
diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp
index b96da916be..9f3a159b3a 100644
--- a/components/lua/storage.cpp
+++ b/components/lua/storage.cpp
@@ -5,6 +5,8 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include "luastate.hpp"
+
 namespace sol
 {
     template <>
@@ -17,6 +19,16 @@ namespace LuaUtil
 {
     LuaStorage::Value LuaStorage::Section::sEmpty;
 
+    void LuaStorage::registerLifeTime(LuaUtil::LuaView& view, sol::table& res)
+    {
+        res["LIFE_TIME"] = LuaUtil::makeStrictReadOnly(tableFromPairs<std::string_view, Section::LifeTime>(view.sol(),
+            {
+                { "Persistent", Section::LifeTime::Persistent },
+                { "GameSession", Section::LifeTime::GameSession },
+                { "Temporary", Section::LifeTime::Temporary },
+            }));
+    }
+
     sol::object LuaStorage::Value::getCopy(lua_State* L) const
     {
         return deserialize(L, mSerializedValue);
@@ -31,6 +43,7 @@ namespace LuaUtil
 
     const LuaStorage::Value& LuaStorage::Section::get(std::string_view key) const
     {
+        checkIfActive();
         auto it = mValues.find(key);
         if (it != mValues.end())
             return it->second;
@@ -49,6 +62,14 @@ namespace LuaUtil
                                  return !valid;
                              }),
             mCallbacks.end());
+        mMenuScriptsCallbacks.erase(std::remove_if(mMenuScriptsCallbacks.begin(), mMenuScriptsCallbacks.end(),
+                                        [&](const Callback& callback) {
+                                            bool valid = callback.isValid();
+                                            if (valid)
+                                                callback.tryCall(mSectionName, changedKey);
+                                            return !valid;
+                                        }),
+            mMenuScriptsCallbacks.end());
         mStorage->mRunningCallbacks.erase(this);
     }
 
@@ -64,6 +85,7 @@ namespace LuaUtil
 
     void LuaStorage::Section::set(std::string_view key, const sol::object& value)
     {
+        checkIfActive();
         throwIfCallbackRecursionIsTooDeep();
         if (value != sol::nil)
             mValues[std::string(key)] = Value(value);
@@ -80,6 +102,7 @@ namespace LuaUtil
 
     void LuaStorage::Section::setAll(const sol::optional<sol::table>& values)
     {
+        checkIfActive();
         throwIfCallbackRecursionIsTooDeep();
         mValues.clear();
         if (values)
@@ -92,27 +115,29 @@ namespace LuaUtil
         runCallbacks(sol::nullopt);
     }
 
-    sol::table LuaStorage::Section::asTable()
+    sol::table LuaStorage::Section::asTable(lua_State* L)
     {
-        sol::table res(mStorage->mLua, sol::create);
+        checkIfActive();
+        sol::table res(L, sol::create);
         for (const auto& [k, v] : mValues)
-            res[k] = v.getCopy(mStorage->mLua);
+            res[k] = v.getCopy(L);
         return res;
     }
 
-    void LuaStorage::initLuaBindings(lua_State* L)
+    void LuaStorage::initLuaBindings(LuaUtil::LuaView& view)
     {
-        sol::state_view lua(L);
-        sol::usertype<SectionView> sview = lua.new_usertype<SectionView>("Section");
+        sol::usertype<SectionView> sview = view.sol().new_usertype<SectionView>("Section");
         sview["get"] = [](sol::this_state s, const SectionView& section, std::string_view key) {
             return section.mSection->get(key).getReadOnly(s);
         };
         sview["getCopy"] = [](sol::this_state s, const SectionView& section, std::string_view key) {
             return section.mSection->get(key).getCopy(s);
         };
-        sview["asTable"] = [](const SectionView& section) { return section.mSection->asTable(); };
+        sview["asTable"]
+            = [](sol::this_state lua, const SectionView& section) { return section.mSection->asTable(lua); };
         sview["subscribe"] = [](const SectionView& section, const sol::table& callback) {
-            std::vector<Callback>& callbacks = section.mSection->mCallbacks;
+            std::vector<Callback>& callbacks
+                = section.mForMenuScripts ? section.mSection->mMenuScriptsCallbacks : section.mSection->mCallbacks;
             if (!callbacks.empty() && callbacks.size() == callbacks.capacity())
             {
                 callbacks.erase(
@@ -129,7 +154,12 @@ namespace LuaUtil
         sview["removeOnExit"] = [](const SectionView& section) {
             if (section.mReadOnly)
                 throw std::runtime_error("Access to storage is read only");
-            section.mSection->mPermanent = false;
+            section.mSection->mLifeTime = Section::Temporary;
+        };
+        sview["setLifeTime"] = [](const SectionView& section, Section::LifeTime lifeTime) {
+            if (section.mReadOnly)
+                throw std::runtime_error("Access to storage is read only");
+            section.mSection->mLifeTime = lifeTime;
         };
         sview["set"] = [](const SectionView& section, std::string_view key, const sol::object& value) {
             if (section.mReadOnly)
@@ -138,31 +168,57 @@ namespace LuaUtil
         };
     }
 
-    sol::table LuaStorage::initGlobalPackage(lua_State* lua, LuaStorage* globalStorage)
+    sol::table LuaStorage::initGlobalPackage(LuaUtil::LuaView& view, LuaStorage* globalStorage)
     {
-        sol::table res(lua, sol::create);
-        res["globalSection"]
-            = [globalStorage](std::string_view section) { return globalStorage->getMutableSection(section); };
-        res["allGlobalSections"] = [globalStorage]() { return globalStorage->getAllSections(); };
+        sol::table res(view.sol(), sol::create);
+        registerLifeTime(view, res);
+
+        res["globalSection"] = [globalStorage](sol::this_state lua, std::string_view section) {
+            return globalStorage->getMutableSection(lua, section);
+        };
+        res["allGlobalSections"] = [globalStorage](sol::this_state lua) { return globalStorage->getAllSections(lua); };
         return LuaUtil::makeReadOnly(res);
     }
 
-    sol::table LuaStorage::initLocalPackage(lua_State* lua, LuaStorage* globalStorage)
+    sol::table LuaStorage::initLocalPackage(LuaUtil::LuaView& view, LuaStorage* globalStorage)
     {
-        sol::table res(lua, sol::create);
-        res["globalSection"]
-            = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
+        sol::table res(view.sol(), sol::create);
+        registerLifeTime(view, res);
+
+        res["globalSection"] = [globalStorage](sol::this_state lua, std::string_view section) {
+            return globalStorage->getReadOnlySection(lua, section);
+        };
         return LuaUtil::makeReadOnly(res);
     }
 
-    sol::table LuaStorage::initPlayerPackage(lua_State* lua, LuaStorage* globalStorage, LuaStorage* playerStorage)
+    sol::table LuaStorage::initPlayerPackage(
+        LuaUtil::LuaView& view, LuaStorage* globalStorage, LuaStorage* playerStorage)
     {
-        sol::table res(lua, sol::create);
-        res["globalSection"]
-            = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
-        res["playerSection"]
-            = [playerStorage](std::string_view section) { return playerStorage->getMutableSection(section); };
-        res["allPlayerSections"] = [playerStorage]() { return playerStorage->getAllSections(); };
+        sol::table res(view.sol(), sol::create);
+        registerLifeTime(view, res);
+
+        res["globalSection"] = [globalStorage](sol::this_state lua, std::string_view section) {
+            return globalStorage->getReadOnlySection(lua, section);
+        };
+        res["playerSection"] = [playerStorage](sol::this_state lua, std::string_view section) {
+            return playerStorage->getMutableSection(lua, section);
+        };
+        res["allPlayerSections"] = [playerStorage](sol::this_state lua) { return playerStorage->getAllSections(lua); };
+        return LuaUtil::makeReadOnly(res);
+    }
+
+    sol::table LuaStorage::initMenuPackage(LuaUtil::LuaView& view, LuaStorage* globalStorage, LuaStorage* playerStorage)
+    {
+        sol::table res(view.sol(), sol::create);
+        registerLifeTime(view, res);
+
+        res["playerSection"] = [playerStorage](sol::this_state lua, std::string_view section) {
+            return playerStorage->getMutableSection(lua, section, /*forMenuScripts=*/true);
+        };
+        res["globalSection"] = [globalStorage](sol::this_state lua, std::string_view section) {
+            return globalStorage->getReadOnlySection(lua, section);
+        };
+        res["allPlayerSections"] = [playerStorage](sol::this_state lua) { return playerStorage->getAllSections(lua); };
         return LuaUtil::makeReadOnly(res);
     }
 
@@ -172,8 +228,11 @@ namespace LuaUtil
         while (it != mData.end())
         {
             it->second->mCallbacks.clear();
-            if (!it->second->mPermanent)
+            // Note that we don't clear menu callbacks for permanent sections
+            // because starting/loading a game doesn't reset menu scripts.
+            if (it->second->mLifeTime == Section::Temporary)
             {
+                it->second->mMenuScriptsCallbacks.clear();
                 it->second->mValues.clear();
                 it = mData.erase(it);
             }
@@ -182,16 +241,19 @@ namespace LuaUtil
         }
     }
 
-    void LuaStorage::load(const std::filesystem::path& path)
+    void LuaStorage::load(lua_State* L, const std::filesystem::path& path)
     {
         assert(mData.empty()); // Shouldn't be used before loading
         try
         {
-            Log(Debug::Info) << "Loading Lua storage \"" << path << "\" (" << std::filesystem::file_size(path)
-                             << " bytes)";
+            std::uintmax_t fileSize = std::filesystem::file_size(path);
+            Log(Debug::Info) << "Loading Lua storage \"" << path << "\" (" << fileSize << " bytes)";
+            if (fileSize == 0)
+                throw std::runtime_error("Storage file has zero length");
+
             std::ifstream fin(path, std::fstream::binary);
             std::string serializedData((std::istreambuf_iterator<char>(fin)), std::istreambuf_iterator<char>());
-            sol::table data = deserialize(mLua, serializedData);
+            sol::table data = deserialize(L, serializedData);
             for (const auto& [sectionName, sectionTable] : data)
             {
                 const std::shared_ptr<Section>& section = getSection(cast<std::string_view>(sectionName));
@@ -201,17 +263,17 @@ namespace LuaUtil
         }
         catch (std::exception& e)
         {
-            Log(Debug::Error) << "Can not read \"" << path << "\": " << e.what();
+            Log(Debug::Error) << "Cannot read \"" << path << "\": " << e.what();
         }
     }
 
-    void LuaStorage::save(const std::filesystem::path& path) const
+    void LuaStorage::save(lua_State* L, const std::filesystem::path& path) const
     {
-        sol::table data(mLua, sol::create);
+        sol::table data(L, sol::create);
         for (const auto& [sectionName, section] : mData)
         {
-            if (section->mPermanent && !section->mValues.empty())
-                data[sectionName] = section->asTable();
+            if (section->mLifeTime == Section::Persistent && !section->mValues.empty())
+                data[sectionName] = section->asTable(L);
         }
         std::string serializedData = serialize(data);
         Log(Debug::Info) << "Saving Lua storage \"" << path << "\" (" << serializedData.size() << " bytes)";
@@ -222,6 +284,7 @@ namespace LuaUtil
 
     const std::shared_ptr<LuaStorage::Section>& LuaStorage::getSection(std::string_view sectionName)
     {
+        checkIfActive();
         auto it = mData.find(sectionName);
         if (it != mData.end())
             return it->second;
@@ -231,17 +294,19 @@ namespace LuaUtil
         return newIt->second;
     }
 
-    sol::object LuaStorage::getSection(std::string_view sectionName, bool readOnly)
+    sol::object LuaStorage::getSection(lua_State* L, std::string_view sectionName, bool readOnly, bool forMenuScripts)
     {
+        checkIfActive();
         const std::shared_ptr<Section>& section = getSection(sectionName);
-        return sol::make_object<SectionView>(mLua, SectionView{ section, readOnly });
+        return sol::make_object<SectionView>(L, SectionView{ section, readOnly, forMenuScripts });
     }
 
-    sol::table LuaStorage::getAllSections(bool readOnly)
+    sol::table LuaStorage::getAllSections(lua_State* L, bool readOnly)
     {
-        sol::table res(mLua, sol::create);
+        checkIfActive();
+        sol::table res(L, sol::create);
         for (const auto& [sectionName, _] : mData)
-            res[sectionName] = getSection(sectionName, readOnly);
+            res[sectionName] = getSection(L, sectionName, readOnly);
         return res;
     }
 
diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp
index 9998af9430..5ca151c30d 100644
--- a/components/lua/storage.hpp
+++ b/components/lua/storage.hpp
@@ -3,34 +3,41 @@
 
 #include <map>
 #include <sol/sol.hpp>
+#include <stdexcept>
 
 #include "asyncpackage.hpp"
 #include "serialization.hpp"
 
 namespace LuaUtil
 {
+    class LuaView;
 
     class LuaStorage
     {
     public:
-        static void initLuaBindings(lua_State*);
-        static sol::table initGlobalPackage(lua_State* lua, LuaStorage* globalStorage);
-        static sol::table initLocalPackage(lua_State* lua, LuaStorage* globalStorage);
-        static sol::table initPlayerPackage(lua_State* lua, LuaStorage* globalStorage, LuaStorage* playerStorage);
+        static void initLuaBindings(LuaUtil::LuaView& view);
+        static sol::table initGlobalPackage(LuaUtil::LuaView& view, LuaStorage* globalStorage);
+        static sol::table initLocalPackage(LuaUtil::LuaView& view, LuaStorage* globalStorage);
+        static sol::table initPlayerPackage(
+            LuaUtil::LuaView& view, LuaStorage* globalStorage, LuaStorage* playerStorage);
+        static sol::table initMenuPackage(LuaUtil::LuaView& view, LuaStorage* globalStorage, LuaStorage* playerStorage);
 
-        explicit LuaStorage(lua_State* lua)
-            : mLua(lua)
-        {
-        }
+        explicit LuaStorage() {}
 
         void clearTemporaryAndRemoveCallbacks();
-        void load(const std::filesystem::path& path);
-        void save(const std::filesystem::path& path) const;
+        void load(lua_State* L, const std::filesystem::path& path);
+        void save(lua_State* L, const std::filesystem::path& path) const;
 
-        sol::object getSection(std::string_view sectionName, bool readOnly);
-        sol::object getMutableSection(std::string_view sectionName) { return getSection(sectionName, false); }
-        sol::object getReadOnlySection(std::string_view sectionName) { return getSection(sectionName, true); }
-        sol::table getAllSections(bool readOnly = false);
+        sol::object getSection(lua_State* L, std::string_view sectionName, bool readOnly, bool forMenuScripts = false);
+        sol::object getMutableSection(lua_State* L, std::string_view sectionName, bool forMenuScripts = false)
+        {
+            return getSection(L, sectionName, false, forMenuScripts);
+        }
+        sol::object getReadOnlySection(lua_State* L, std::string_view sectionName)
+        {
+            return getSection(L, sectionName, true);
+        }
+        sol::table getAllSections(lua_State* L, bool readOnly = false);
 
         void setSingleValue(std::string_view section, std::string_view key, const sol::object& value)
         {
@@ -51,6 +58,7 @@ namespace LuaUtil
             virtual void sectionReplaced(std::string_view section, const sol::optional<sol::table>& values) const = 0;
         };
         void setListener(const Listener* listener) { mListener = listener; }
+        void setActive(bool active) { mActive = active; }
 
     private:
         class Value
@@ -71,6 +79,13 @@ namespace LuaUtil
 
         struct Section
         {
+            enum LifeTime
+            {
+                Persistent,
+                GameSession,
+                Temporary
+            };
+
             explicit Section(LuaStorage* storage, std::string name)
                 : mStorage(storage)
                 , mSectionName(std::move(name))
@@ -79,7 +94,7 @@ namespace LuaUtil
             const Value& get(std::string_view key) const;
             void set(std::string_view key, const sol::object& value);
             void setAll(const sol::optional<sol::table>& values);
-            sol::table asTable();
+            sol::table asTable(lua_State* L);
             void runCallbacks(sol::optional<std::string_view> changedKey);
             void throwIfCallbackRecursionIsTooDeep();
 
@@ -87,21 +102,32 @@ namespace LuaUtil
             std::string mSectionName;
             std::map<std::string, Value, std::less<>> mValues;
             std::vector<Callback> mCallbacks;
-            bool mPermanent = true;
+            std::vector<Callback> mMenuScriptsCallbacks; // menu callbacks are in a separate vector because we don't
+                                                         // remove them in clear()
+            LifeTime mLifeTime = Persistent;
             static Value sEmpty;
+
+            void checkIfActive() const { mStorage->checkIfActive(); }
         };
         struct SectionView
         {
             std::shared_ptr<Section> mSection;
             bool mReadOnly;
+            bool mForMenuScripts = false;
         };
 
         const std::shared_ptr<Section>& getSection(std::string_view sectionName);
 
-        lua_State* mLua;
         std::map<std::string_view, std::shared_ptr<Section>> mData;
         const Listener* mListener = nullptr;
         std::set<const Section*> mRunningCallbacks;
+        bool mActive = false;
+        void checkIfActive() const
+        {
+            if (!mActive)
+                throw std::logic_error("Trying to access inactive storage");
+        }
+        static void registerLifeTime(LuaUtil::LuaView& view, sol::table& res);
     };
 
 }
diff --git a/components/lua/utf8.cpp b/components/lua/utf8.cpp
new file mode 100644
index 0000000000..e4188d6926
--- /dev/null
+++ b/components/lua/utf8.cpp
@@ -0,0 +1,260 @@
+#include <components/misc/strings/format.hpp>
+
+#include "utf8.hpp"
+
+namespace
+{
+    constexpr std::string_view UTF8PATT = "[%z\x01-\x7F\xC2-\xF4][\x80-\xBF]*"; // %z is deprecated in Lua5.2
+    // constexpr uint32_t MAXUTF = 0x7FFFFFFFu;
+    constexpr uint32_t MAXUNICODE = 0x10FFFFu;
+
+    inline bool isNilOrNone(const sol::stack_proxy arg)
+    {
+        return (arg.get_type() == sol::type::lua_nil || arg.get_type() == sol::type::none);
+    }
+
+    inline std::int64_t getInteger(const sol::stack_proxy arg, const size_t n, std::string_view name)
+    {
+        double integer;
+        if (!arg.is<double>())
+            throw std::runtime_error(Misc::StringUtils::format("bad argument #%i to '%s' (number expected, got %s)", n,
+                name, sol::type_name(arg.lua_state(), arg.get_type())));
+
+        if (std::modf(arg, &integer) != 0)
+            throw std::runtime_error(
+                Misc::StringUtils::format("bad argument #%i to '%s' (number has no integer representation)", n, name));
+
+        return static_cast<std::int64_t>(integer);
+    }
+
+    // If the input 'pos' is negative, it is treated as counting from the end of the string,
+    // where -1 represents the last character position, -2 represents the second-to-last position,
+    // and so on. If 'pos' is non-negative, it is used as-is.
+    inline void relativePosition(int64_t& pos, const size_t len)
+    {
+        if (pos < 0)
+            pos = std::max<int64_t>(0, pos + len + 1);
+    }
+
+    inline void codepointToUTF8(char32_t codepoint, std::string& str)
+    {
+        if (codepoint <= 0x7Fu)
+        {
+            str.push_back(static_cast<char>(codepoint));
+        }
+        else if (codepoint <= 0x7FFu)
+        {
+            str.push_back(static_cast<char>(0xC0 | ((codepoint & 0x7C0) >> 6)));
+            str.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
+        }
+        else if (codepoint <= 0xFFFFu)
+        {
+            str.push_back(static_cast<char>(0xE0 | ((codepoint & 0xF000) >> 12)));
+            str.push_back(static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)));
+            str.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
+        }
+        else if (codepoint <= MAXUNICODE)
+        {
+            str.push_back(static_cast<char>(0xF0 | ((codepoint & 0x1C0000) >> 18)));
+            str.push_back(static_cast<char>(0x80 | ((codepoint & 0x3F000) >> 12)));
+            str.push_back(static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)));
+            str.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
+        }
+        else
+            throw std::runtime_error("Invalid codepoint");
+    }
+
+    // returns: first - character pos in bytes, second - character codepoint
+    std::pair<int64_t, int64_t> decodeNextUTF8Character(std::string_view s, std::vector<int64_t>& pos_byte)
+    {
+        const int64_t pos = pos_byte.back() - 1;
+        const unsigned char ch = static_cast<unsigned char>(s[pos]);
+        int64_t codepoint = -1;
+        size_t byteSize = 0;
+
+        if ((ch & 0b10000000) == 0)
+        {
+            codepoint = ch;
+            byteSize = 1;
+        }
+        else if ((ch & 0b11100000) == 0b11000000)
+        {
+            codepoint = ch & 0b00011111;
+            byteSize = 2;
+        }
+        else if ((ch & 0b11110000) == 0b11100000)
+        {
+            codepoint = ch & 0b00001111;
+            byteSize = 3;
+        }
+        else if ((ch & 0b11111000) == 0b11110000)
+        {
+            codepoint = ch & 0b00000111;
+            byteSize = 4;
+        }
+
+        // construct codepoint for non-ascii
+        for (size_t i = 1; i < byteSize; ++i)
+        {
+            // if not a continuation byte
+            if ((pos + i) >= s.size() || (static_cast<unsigned char>(s[pos + i]) & 0b11000000) != 0b10000000)
+            {
+                return std::make_pair(0, -1);
+            }
+            codepoint = (codepoint << 6) | (static_cast<unsigned char>(s[pos + i]) & 0b00111111);
+        }
+
+        std::pair<size_t, int64_t> res = std::make_pair(pos_byte.back(), codepoint);
+
+        pos_byte.push_back(pos_byte.back() + byteSize); /* the next character (if exists) starts at this byte */
+
+        return res;
+    }
+
+}
+
+namespace LuaUtf8
+{
+    sol::table initUtf8Package(sol::state_view& lua)
+    {
+        sol::table utf8(lua, sol::create);
+
+        utf8["charpattern"] = UTF8PATT;
+
+        utf8["char"] = [](const sol::variadic_args args) -> std::string {
+            std::string result{};
+            for (size_t i = 0; i < args.size(); ++i)
+            {
+                int64_t codepoint = getInteger(args[i], (i + 1), "char");
+                if (codepoint < 0 || codepoint > MAXUNICODE)
+                    throw std::runtime_error(
+                        "bad argument #" + std::to_string(i + 1) + " to 'char' (value out of range)");
+
+                codepointToUTF8(static_cast<char32_t>(codepoint), result);
+            }
+            return result;
+        };
+
+        utf8["codes"] = [](std::string_view s) {
+            return sol::as_function(
+                [s, pos_byte = std::vector<int64_t>{ 1 }]() mutable -> sol::optional<std::pair<int64_t, int64_t>> {
+                    if (pos_byte.back() <= static_cast<int64_t>(s.size()))
+                    {
+                        const auto pair = decodeNextUTF8Character(s, pos_byte);
+                        if (pair.second == -1)
+                            throw std::runtime_error(
+                                "Invalid UTF-8 code at position " + std::to_string(pos_byte.size()));
+
+                        return pair;
+                    }
+                    return sol::nullopt;
+                });
+        };
+
+        utf8["len"] = [](std::string_view s,
+                          const sol::variadic_args args) -> std::variant<size_t, std::pair<sol::object, int64_t>> {
+            const size_t len = s.size();
+            int64_t iv = isNilOrNone(args[0]) ? 1 : getInteger(args[0], 2, "len");
+            int64_t fv = isNilOrNone(args[1]) ? -1 : getInteger(args[1], 3, "len");
+
+            relativePosition(iv, len);
+            relativePosition(fv, len);
+
+            if (iv <= 0)
+                throw std::runtime_error("bad argument #2 to 'len' (initial position out of bounds)");
+            if (fv > static_cast<int64_t>(len))
+                throw std::runtime_error("bad argument #3 to 'len' (final position out of bounds)");
+
+            if (len == 0)
+                return len;
+
+            std::vector<int64_t> pos_byte = { iv };
+
+            while (pos_byte.back() <= fv)
+            {
+                if (decodeNextUTF8Character(s, pos_byte).second == -1)
+                    return std::pair(sol::lua_nil, pos_byte.back());
+            }
+            return pos_byte.size() - 1;
+        };
+
+        utf8["codepoint"]
+            = [](std::string_view s, const sol::variadic_args args) -> sol::as_returns_t<std::vector<int64_t>> {
+            size_t len = s.size();
+            int64_t iv = isNilOrNone(args[0]) ? 1 : getInteger(args[0], 2, "codepoint");
+            int64_t fv = isNilOrNone(args[1]) ? iv : getInteger(args[1], 3, "codepoint");
+
+            relativePosition(iv, len);
+            relativePosition(fv, len);
+
+            if (iv <= 0)
+                throw std::runtime_error("bad argument #2 to 'codepoint' (initial position out of bounds)");
+            if (fv > static_cast<int64_t>(len))
+                throw std::runtime_error("bad argument #3 to 'codepoint' (final position out of bounds)");
+
+            if (iv > fv)
+                return sol::as_returns(std::vector<int64_t>{}); /* empty interval; return nothing */
+
+            std::vector<int64_t> pos_byte = { iv };
+            std::vector<int64_t> codepoints;
+
+            while (pos_byte.back() <= fv)
+            {
+                codepoints.push_back(decodeNextUTF8Character(s, pos_byte).second);
+                if (codepoints.back() == -1)
+                    throw std::runtime_error("Invalid UTF-8 code at position " + std::to_string(pos_byte.size()));
+            }
+
+            return sol::as_returns(std::move(codepoints));
+        };
+
+        utf8["offset"]
+            = [](std::string_view s, const int64_t n, const sol::variadic_args args) -> sol::optional<int64_t> {
+            size_t len = s.size();
+            int64_t iv;
+
+            if (isNilOrNone(args[0]))
+            {
+                if (n >= 0)
+                    iv = 1;
+                else
+                    iv = s.size() + 1;
+            }
+            else
+                iv = getInteger(args[0], 3, "offset");
+
+            std::vector<int64_t> pos_byte = { 1 };
+
+            relativePosition(iv, len);
+
+            if (iv > static_cast<int64_t>(len) + 1)
+                throw std::runtime_error("bad argument #3 to 'offset' (position out of bounds)");
+
+            while (pos_byte.back() <= static_cast<int64_t>(len))
+                decodeNextUTF8Character(s, pos_byte);
+
+            for (auto it = pos_byte.begin(); it != pos_byte.end(); ++it)
+            {
+                if (*it == iv)
+                {
+                    if (n <= 0 && it + n >= pos_byte.begin())
+                        return *(it + n);
+                    if (n > 0 && it + n - 1 < pos_byte.end())
+                        return *(it + n - 1);
+                    break;
+                }
+                else if (*it > iv) /* a continuation byte */
+                {
+                    if (n == 0)
+                        return *(it - 1); /* special case */
+                    else
+                        throw std::runtime_error("initial position is a continuation byte");
+                }
+            }
+
+            return sol::nullopt;
+        };
+
+        return utf8;
+    }
+}
diff --git a/components/lua/utf8.hpp b/components/lua/utf8.hpp
new file mode 100644
index 0000000000..dd936b3b5e
--- /dev/null
+++ b/components/lua/utf8.hpp
@@ -0,0 +1,11 @@
+#ifndef COMPONENTS_LUA_UTF8_H
+#define COMPONENTS_LUA_UTF8_H
+
+#include <sol/sol.hpp>
+
+namespace LuaUtf8
+{
+    sol::table initUtf8Package(sol::state_view&);
+}
+
+#endif
diff --git a/components/lua/util.hpp b/components/lua/util.hpp
new file mode 100644
index 0000000000..2b84d9d60c
--- /dev/null
+++ b/components/lua/util.hpp
@@ -0,0 +1,32 @@
+#ifndef COMPONENTS_LUA_UTIL_H
+#define COMPONENTS_LUA_UTIL_H
+
+#include <cstdint>
+#include <string>
+
+#include <sol/sol.hpp>
+
+#include <components/esm/refid.hpp>
+
+namespace LuaUtil
+{
+    // Lua arrays index from 1
+    constexpr inline std::int64_t fromLuaIndex(std::int64_t i)
+    {
+        return i - 1;
+    }
+
+    constexpr inline std::int64_t toLuaIndex(std::int64_t i)
+    {
+        return i + 1;
+    }
+
+    inline sol::optional<std::string> serializeRefId(ESM::RefId id)
+    {
+        if (id.empty())
+            return sol::nullopt;
+        return id.serializeText();
+    }
+}
+
+#endif
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index 85c5dcdbc1..c135b66092 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -10,6 +10,7 @@
 #include <components/misc/mathutil.hpp>
 
 #include "luastate.hpp"
+#include "util.hpp"
 
 #include "shapes/box.hpp"
 
@@ -55,6 +56,83 @@ namespace LuaUtil
 {
     namespace
     {
+        template <typename T>
+        float zero(const T& v)
+        {
+            return 0.f;
+        }
+
+        template <typename T>
+        float one(const T& v)
+        {
+            return 1.f;
+        }
+
+        template <typename T, std::size_t I>
+        float get(const T& v)
+        {
+            return v[I];
+        }
+
+        // Creates bindings for all possible permutations (repetition allowed) of x,y,z,w fields
+        template <typename T>
+        void addSwizzleFields(sol::usertype<T>& type)
+        {
+            // Generate mapping of swizzle characters to their getter functions
+            constexpr auto components = []() {
+                std::array<std::pair<char, float (*)(const T&)>, T::num_components + 2> arr;
+
+                // 0/1 Components
+                arr[T::num_components] = { '0', zero<T> };
+                arr[T::num_components + 1] = { '1', one<T> };
+
+                // x,y,z,w components
+                if constexpr (T::num_components > 1)
+                {
+                    arr[0] = { 'x', get<T, 0> };
+                    arr[1] = { 'y', get<T, 1> };
+                }
+
+                if constexpr (T::num_components > 2)
+                    arr[2] = { 'z', get<T, 2> };
+
+                if constexpr (T::num_components > 3)
+                    arr[3] = { 'w', get<T, 3> };
+
+                return arr;
+            }();
+
+            // Iterate over the permutations
+            for (const auto& comp1 : components)
+            {
+                // Single component swizzle
+                type[std::string{ comp1.first }] = sol::readonly_property([=](const T& v) { return comp1.second(v); });
+
+                for (const auto& comp2 : components)
+                {
+                    // Two component swizzles
+                    type[std::string{ comp1.first, comp2.first }]
+                        = sol::readonly_property([=](const T& v) { return Vec2(comp1.second(v), comp2.second(v)); });
+
+                    for (const auto& comp3 : components)
+                    {
+                        // Three component swizzles
+                        type[std::string{ comp1.first, comp2.first, comp3.first }] = sol::readonly_property(
+                            [=](const T& v) { return Vec3(comp1.second(v), comp2.second(v), comp3.second(v)); });
+
+                        for (const auto& comp4 : components)
+                        {
+                            // Four component swizzles
+                            type[std::string{ comp1.first, comp2.first, comp3.first, comp4.first }]
+                                = sol::readonly_property([=](const T& v) {
+                                      return Vec4(comp1.second(v), comp2.second(v), comp3.second(v), comp4.second(v));
+                                  });
+                        }
+                    }
+                }
+            }
+        }
+
         template <typename T>
         void addVectorMethods(sol::usertype<T>& vectorType)
         {
@@ -96,6 +174,8 @@ namespace LuaUtil
                 ss << ")";
                 return ss.str();
             };
+
+            addSwizzleFields(vectorType);
         }
     }
 
@@ -107,17 +187,12 @@ namespace LuaUtil
         // Lua bindings for Vec2
         util["vector2"] = [](float x, float y) { return Vec2(x, y); };
         sol::usertype<Vec2> vec2Type = lua.new_usertype<Vec2>("Vec2");
-        vec2Type["x"] = sol::readonly_property([](const Vec2& v) -> float { return v.x(); });
-        vec2Type["y"] = sol::readonly_property([](const Vec2& v) -> float { return v.y(); });
         addVectorMethods<Vec2>(vec2Type);
         vec2Type["rotate"] = &Misc::rotateVec2f;
 
         // Lua bindings for Vec3
         util["vector3"] = [](float x, float y, float z) { return Vec3(x, y, z); };
         sol::usertype<Vec3> vec3Type = lua.new_usertype<Vec3>("Vec3");
-        vec3Type["x"] = sol::readonly_property([](const Vec3& v) -> float { return v.x(); });
-        vec3Type["y"] = sol::readonly_property([](const Vec3& v) -> float { return v.y(); });
-        vec3Type["z"] = sol::readonly_property([](const Vec3& v) -> float { return v.z(); });
         addVectorMethods<Vec3>(vec3Type);
         vec3Type[sol::meta_function::involution] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
         vec3Type["cross"] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
@@ -125,15 +200,12 @@ namespace LuaUtil
         // Lua bindings for Vec4
         util["vector4"] = [](float x, float y, float z, float w) { return Vec4(x, y, z, w); };
         sol::usertype<Vec4> vec4Type = lua.new_usertype<Vec4>("Vec4");
-        vec4Type["x"] = sol::readonly_property([](const Vec4& v) -> float { return v.x(); });
-        vec4Type["y"] = sol::readonly_property([](const Vec4& v) -> float { return v.y(); });
-        vec4Type["z"] = sol::readonly_property([](const Vec4& v) -> float { return v.z(); });
-        vec4Type["w"] = sol::readonly_property([](const Vec4& v) -> float { return v.w(); });
         addVectorMethods<Vec4>(vec4Type);
 
         // Lua bindings for Box
         util["box"] = sol::overload([](const Vec3& center, const Vec3& halfSize) { return Box(center, halfSize); },
-            [](const TransformM& transform) { return Box(transform.mM); });
+            [](const TransformM& transform) { return Box(transform.mM); },
+            [](const TransformQ& transform) { return Box(Vec3(), Vec3(1, 1, 1), transform.mQ); });
         sol::usertype<Box> boxType = lua.new_usertype<Box>("Box");
         boxType["center"] = sol::readonly_property([](const Box& b) { return b.mCenter; });
         boxType["halfSize"] = sol::readonly_property([](const Box& b) { return b.mHalfSize; });
@@ -142,7 +214,7 @@ namespace LuaUtil
             sol::table table(lua, sol::create);
             const auto vertices = b.vertices();
             for (size_t i = 0; i < vertices.size(); ++i)
-                table[i + 1] = vertices[i];
+                table[toLuaIndex(i)] = vertices[i];
             return table;
         });
         boxType[sol::meta_function::equal_to] = [](const Box& a, const Box& b) { return a == b; };
@@ -239,7 +311,7 @@ namespace LuaUtil
             return std::make_tuple(angles.x(), angles.z());
         };
         transMType["getAnglesZYX"] = [](const TransformM& m) {
-            osg::Vec3f angles = Misc::toEulerAnglesXZ(m.mM);
+            osg::Vec3f angles = Misc::toEulerAnglesZYX(m.mM);
             return std::make_tuple(angles.z(), angles.y(), angles.x());
         };
 
@@ -275,7 +347,7 @@ namespace LuaUtil
             return std::make_tuple(angles.x(), angles.z());
         };
         transQType["getAnglesZYX"] = [](const TransformQ& q) {
-            osg::Vec3f angles = Misc::toEulerAnglesXZ(q.mQ);
+            osg::Vec3f angles = Misc::toEulerAnglesZYX(q.mQ);
             return std::make_tuple(angles.z(), angles.y(), angles.x());
         };
 
@@ -332,5 +404,4 @@ namespace LuaUtil
 
         return util;
     }
-
 }
diff --git a/components/lua/yamlloader.cpp b/components/lua/yamlloader.cpp
new file mode 100644
index 0000000000..df83af6253
--- /dev/null
+++ b/components/lua/yamlloader.cpp
@@ -0,0 +1,280 @@
+#include "yamlloader.hpp"
+
+#include <charconv>
+#include <cmath>
+#include <limits>
+#include <regex>
+#include <stdexcept>
+#include <system_error>
+#include <vector>
+
+#include <sol/object.hpp>
+#include <sol/state_view.hpp>
+
+#include <yaml-cpp/yaml.h>
+
+#include <components/misc/strings/format.hpp>
+#include <components/misc/strings/lower.hpp>
+
+namespace LuaUtil
+{
+    namespace
+    {
+        constexpr uint64_t maxDepth = 250;
+
+        enum class ScalarType
+        {
+            Boolean,
+            Decimal,
+            Float,
+            Hexadecimal,
+            Infinity,
+            NotNumber,
+            Null,
+            Octal,
+            String
+        };
+
+        sol::object loadAll(const std::vector<YAML::Node>& rootNodes, const sol::state_view& lua);
+
+        sol::object getNode(const YAML::Node& node, const sol::state_view& lua, uint64_t depth);
+
+        sol::table getMap(const YAML::Node& node, const sol::state_view& lua, uint64_t depth);
+
+        sol::table getArray(const YAML::Node& node, const sol::state_view& lua, uint64_t depth);
+
+        ScalarType getScalarType(const YAML::Node& node);
+
+        sol::object getScalar(const YAML::Node& node, const sol::state_view& lua);
+
+        [[noreturn]] void nodeError(const YAML::Node& node, const std::string& message);
+    }
+
+    sol::object loadYaml(const std::string& input, const sol::state_view& lua)
+    {
+        std::vector<YAML::Node> rootNodes = YAML::LoadAll(input);
+        return loadAll(rootNodes, lua);
+    }
+
+    sol::object loadYaml(std::istream& input, const sol::state_view& lua)
+    {
+        std::vector<YAML::Node> rootNodes = YAML::LoadAll(input);
+        return loadAll(rootNodes, lua);
+    }
+
+    namespace
+    {
+        sol::object loadAll(const std::vector<YAML::Node>& rootNodes, const sol::state_view& lua)
+        {
+            if (rootNodes.empty())
+                return sol::nil;
+
+            if (rootNodes.size() == 1)
+                return getNode(rootNodes[0], lua, 0);
+
+            sol::table documentsTable(lua, sol::create);
+            for (const auto& root : rootNodes)
+            {
+                documentsTable.add(getNode(root, lua, 1));
+            }
+
+            return documentsTable;
+        }
+
+        sol::object getNode(const YAML::Node& node, const sol::state_view& lua, uint64_t depth)
+        {
+            if (depth >= maxDepth)
+                throw std::runtime_error("Maximum layers depth exceeded, probably caused by a circular reference");
+
+            ++depth;
+
+            if (node.IsMap())
+                return getMap(node, lua, depth);
+            else if (node.IsSequence())
+                return getArray(node, lua, depth);
+            else if (node.IsScalar())
+                return getScalar(node, lua);
+            else if (node.IsNull())
+                return sol::nil;
+
+            nodeError(node, "An unknown YAML node encountered");
+        }
+
+        sol::table getMap(const YAML::Node& node, const sol::state_view& lua, uint64_t depth)
+        {
+            sol::table childTable(lua, sol::create);
+
+            for (const auto& pair : node)
+            {
+                if (pair.first.IsMap())
+                    nodeError(pair.first, "Only scalar nodes can be used as keys, encountered map instead");
+                if (pair.first.IsSequence())
+                    nodeError(pair.first, "Only scalar nodes can be used as keys, encountered array instead");
+                if (pair.first.IsNull())
+                    nodeError(pair.first, "Only scalar nodes can be used as keys, encountered null instead");
+
+                auto key = getNode(pair.first, lua, depth);
+                if (key.get_type() == sol::type::number && std::isnan(key.as<double>()))
+                    nodeError(pair.first, "Only scalar nodes can be used as keys, encountered nan instead");
+
+                childTable[key] = getNode(pair.second, lua, depth);
+            }
+
+            return childTable;
+        }
+
+        sol::table getArray(const YAML::Node& node, const sol::state_view& lua, uint64_t depth)
+        {
+            sol::table childTable(lua, sol::create);
+
+            for (const auto& child : node)
+            {
+                childTable.add(getNode(child, lua, depth));
+            }
+
+            return childTable;
+        }
+
+        ScalarType getScalarType(const YAML::Node& node)
+        {
+            const auto& tag = node.Tag();
+            const auto& value = node.Scalar();
+            if (tag == "!")
+                return ScalarType::String;
+
+            // Note that YAML allows to explicitely specify a scalar type via tag (e.g. "!!bool"), but it makes no
+            // sense in Lua:
+            // 1. Both integers and floats use the "number" type prior to Lua 5.3
+            // 2. Strings can be quoted, which is more readable than "!!str"
+            // 3. Most of possible conversions are invalid or their result is unclear
+            // So ignore this feature for now.
+            if (tag != "?")
+                nodeError(node, "An invalid tag '" + tag + "' encountered");
+
+            if (value.empty())
+                return ScalarType::Null;
+
+            // Resolve type according to YAML 1.2 Core Schema (see https://yaml.org/spec/1.2.2/#103-core-schema)
+            static const std::regex boolRegex("true|True|TRUE|false|False|FALSE", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), boolRegex))
+                return ScalarType::Boolean;
+
+            static const std::regex decimalRegex("[-+]?[0-9]+", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), decimalRegex))
+                return ScalarType::Decimal;
+
+            static const std::regex floatRegex(
+                "[-+]?([.][0-9]+|[0-9]+([.][0-9]*)?)([eE][-+]?[0-9]+)?", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), floatRegex))
+                return ScalarType::Float;
+
+            static const std::regex octalRegex("0o[0-7]+", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), octalRegex))
+                return ScalarType::Octal;
+
+            static const std::regex hexdecimalRegex("0x[0-9a-fA-F]+", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), hexdecimalRegex))
+                return ScalarType::Hexadecimal;
+
+            static const std::regex infinityRegex("[-+]?([.]inf|[.]Inf|[.]INF)", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), infinityRegex))
+                return ScalarType::Infinity;
+
+            static const std::regex nanRegex("[.]nan|[.]NaN|[.]NAN", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), nanRegex))
+                return ScalarType::NotNumber;
+
+            static const std::regex nullRegex("null|Null|NULL|~", std::regex_constants::extended);
+            if (std::regex_match(node.Scalar(), nullRegex))
+                return ScalarType::Null;
+
+            return ScalarType::String;
+        }
+
+        sol::object getScalar(const YAML::Node& node, const sol::state_view& lua)
+        {
+            auto type = getScalarType(node);
+            const auto& value = node.Scalar();
+
+            switch (type)
+            {
+                case ScalarType::Null:
+                    return sol::nil;
+                case ScalarType::String:
+                    return sol::make_object<std::string>(lua, value);
+                case ScalarType::NotNumber:
+                    return sol::make_object<double>(lua, std::nan(""));
+                case ScalarType::Infinity:
+                {
+                    if (!value.empty() && value[0] == '-')
+                        return sol::make_object<double>(lua, -std::numeric_limits<double>::infinity());
+
+                    return sol::make_object<double>(lua, std::numeric_limits<double>::infinity());
+                }
+                case ScalarType::Boolean:
+                {
+                    if (Misc::StringUtils::lowerCase(value) == "true")
+                        return sol::make_object<bool>(lua, true);
+
+                    if (Misc::StringUtils::lowerCase(value) == "false")
+                        return sol::make_object<bool>(lua, false);
+
+                    nodeError(node, "Can not read a boolean value '" + value + "'");
+                }
+                case ScalarType::Decimal:
+                {
+                    int offset = 0;
+
+                    // std::from_chars does not support "+" sign
+                    if (!value.empty() && value[0] == '+')
+                        ++offset;
+
+                    int result = 0;
+                    const auto status = std::from_chars(value.data() + offset, value.data() + value.size(), result);
+                    if (status.ec == std::errc())
+                        return sol::make_object<int>(lua, result);
+
+                    nodeError(node, "Can not read a decimal value '" + value + "'");
+                }
+                case ScalarType::Float:
+                {
+                    // Not all compilers support std::from_chars for floats
+                    double result = 0.0;
+                    bool success = YAML::convert<double>::decode(node, result);
+                    if (success)
+                        return sol::make_object<double>(lua, result);
+
+                    nodeError(node, "Can not read a float value '" + value + "'");
+                }
+                case ScalarType::Hexadecimal:
+                {
+                    int result = 0;
+                    const auto status = std::from_chars(value.data() + 2, value.data() + value.size(), result, 16);
+                    if (status.ec == std::errc())
+                        return sol::make_object<int>(lua, result);
+
+                    nodeError(node, "Can not read a hexadecimal value '" + value + "'");
+                }
+                case ScalarType::Octal:
+                {
+                    int result = 0;
+                    const auto status = std::from_chars(value.data() + 2, value.data() + value.size(), result, 8);
+                    if (status.ec == std::errc())
+                        return sol::make_object<int>(lua, result);
+
+                    nodeError(node, "Can not read an octal value '" + value + "'");
+                }
+                default:
+                    nodeError(node, "An unknown scalar '" + value + "' encountered");
+            }
+        }
+
+        [[noreturn]] void nodeError(const YAML::Node& node, const std::string& message)
+        {
+            const auto& mark = node.Mark();
+            std::string error = Misc::StringUtils::format(
+                " at line=%d column=%d position=%d", mark.line + 1, mark.column + 1, mark.pos + 1);
+            throw std::runtime_error(message + error);
+        }
+    }
+}
diff --git a/components/lua/yamlloader.hpp b/components/lua/yamlloader.hpp
new file mode 100644
index 0000000000..6f28da66ce
--- /dev/null
+++ b/components/lua/yamlloader.hpp
@@ -0,0 +1,16 @@
+#ifndef COMPONENTS_LUA_YAMLLOADER_H
+#define COMPONENTS_LUA_YAMLLOADER_H
+
+#include <iosfwd>
+#include <string>
+
+#include <sol/forward.hpp>
+
+namespace LuaUtil
+{
+    sol::object loadYaml(const std::string& input, const sol::state_view& lua);
+
+    sol::object loadYaml(std::istream& input, const sol::state_view& lua);
+}
+
+#endif // COMPONENTS_LUA_YAMLLOADER_H
diff --git a/components/lua_ui/adapter.cpp b/components/lua_ui/adapter.cpp
index 2fd6365977..44493f6f46 100644
--- a/components/lua_ui/adapter.cpp
+++ b/components/lua_ui/adapter.cpp
@@ -18,11 +18,16 @@ namespace LuaUi
     {
         mContainer = MyGUI::Gui::getInstancePtr()->createWidget<LuaContainer>(
             "", MyGUI::IntCoord(), MyGUI::Align::Default, "", "");
-        mContainer->initialize(luaState, mContainer);
-        mContainer->onCoordChange([this](WidgetExtension* ext, MyGUI::IntCoord coord) { setSize(coord.size()); });
+        mContainer->initialize(luaState, mContainer, false);
+        mContainer->widget()->eventChangeCoord += MyGUI::newDelegate(this, &LuaAdapter::containerChangedCoord);
         mContainer->widget()->attachToWidget(this);
     }
 
+    void LuaAdapter::containerChangedCoord(MyGUI::Widget*)
+    {
+        setSize(mContainer->getSize());
+    }
+
     void LuaAdapter::attach(const std::shared_ptr<Element>& element)
     {
         detachElement();
@@ -44,14 +49,20 @@ namespace LuaUi
 
     void LuaAdapter::attachElement()
     {
-        if (mElement.get())
-            mElement->attachToWidget(mContainer);
+        if (!mElement.get())
+            return;
+        if (!mElement->mRoot)
+            throw std::logic_error("Attempting to use a destroyed UI Element");
+        mContainer->setChildren({ mElement->mRoot });
+        mElement->mRoot->updateCoord();
+        mContainer->updateCoord();
     }
 
     void LuaAdapter::detachElement()
     {
-        if (mElement.get())
-            mElement->detachFromWidget();
+        mContainer->setChildren({});
+        if (mElement && mElement->mRoot)
+            mElement->mRoot->widget()->detachFromWidget();
         mElement = nullptr;
     }
 }
diff --git a/components/lua_ui/adapter.hpp b/components/lua_ui/adapter.hpp
index d699e4992f..1524a55425 100644
--- a/components/lua_ui/adapter.hpp
+++ b/components/lua_ui/adapter.hpp
@@ -25,6 +25,8 @@ namespace LuaUi
 
         void attachElement();
         void detachElement();
+
+        void containerChangedCoord(MyGUI::Widget*);
     };
 }
 
diff --git a/components/lua_ui/container.cpp b/components/lua_ui/container.cpp
index 52fea684d7..1999be8169 100644
--- a/components/lua_ui/container.cpp
+++ b/components/lua_ui/container.cpp
@@ -10,12 +10,12 @@ namespace LuaUi
         updateSizeToFit();
     }
 
-    MyGUI::IntSize LuaContainer::childScalingSize()
+    MyGUI::IntSize LuaContainer::childScalingSize() const
     {
         return MyGUI::IntSize();
     }
 
-    MyGUI::IntSize LuaContainer::templateScalingSize()
+    MyGUI::IntSize LuaContainer::templateScalingSize() const
     {
         return mInnerSize;
     }
@@ -23,14 +23,14 @@ namespace LuaUi
     void LuaContainer::updateSizeToFit()
     {
         MyGUI::IntSize innerSize = MyGUI::IntSize();
-        for (auto w : children())
+        for (const auto w : children())
         {
             MyGUI::IntCoord coord = w->calculateCoord();
             innerSize.width = std::max(innerSize.width, coord.left + coord.width);
             innerSize.height = std::max(innerSize.height, coord.top + coord.height);
         }
         MyGUI::IntSize outerSize = innerSize;
-        for (auto w : templateChildren())
+        for (const auto w : templateChildren())
         {
             MyGUI::IntCoord coord = w->calculateCoord();
             outerSize.width = std::max(outerSize.width, coord.left + coord.width);
@@ -40,7 +40,7 @@ namespace LuaUi
         mOuterSize = outerSize;
     }
 
-    MyGUI::IntSize LuaContainer::calculateSize()
+    MyGUI::IntSize LuaContainer::calculateSize() const
     {
         return mOuterSize;
     }
diff --git a/components/lua_ui/container.hpp b/components/lua_ui/container.hpp
index 79d3cd8fa8..ef13dd0638 100644
--- a/components/lua_ui/container.hpp
+++ b/components/lua_ui/container.hpp
@@ -9,13 +9,14 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaContainer)
 
-        MyGUI::IntSize calculateSize() override;
+    public:
+        MyGUI::IntSize calculateSize() const override;
         void updateCoord() override;
 
     protected:
         void updateChildren() override;
-        MyGUI::IntSize childScalingSize() override;
-        MyGUI::IntSize templateScalingSize() override;
+        MyGUI::IntSize childScalingSize() const override;
+        MyGUI::IntSize templateScalingSize() const override;
 
     private:
         void updateSizeToFit();
diff --git a/components/lua_ui/content.cpp b/components/lua_ui/content.cpp
index 2e1d4ca0c4..101cfc75d1 100644
--- a/components/lua_ui/content.cpp
+++ b/components/lua_ui/content.cpp
@@ -1,12 +1,13 @@
 #include "content.hpp"
+#include "element.hpp"
 
 namespace LuaUi
 {
     sol::protected_function loadContentConstructor(LuaUtil::LuaState* state)
     {
-        sol::function loader = state->loadInternalLib("content");
+        sol::protected_function loader = state->loadInternalLib("content");
         sol::set_environment(state->newInternalLibEnvironment(), loader);
-        sol::table metatable = loader().get<sol::table>();
+        sol::table metatable = LuaUtil::LuaState::throwIfError(loader()).get<sol::table>();
         if (metatable["new"].get_type() != sol::type::function)
             throw std::logic_error("Expected function");
         return metatable["new"].get<sol::protected_function>();
@@ -14,6 +15,8 @@ namespace LuaUi
 
     bool isValidContent(const sol::object& object)
     {
+        if (object.is<Element>())
+            return true;
         if (object.get_type() != sol::type::table)
             return false;
         sol::table table = object;
diff --git a/components/lua_ui/content.hpp b/components/lua_ui/content.hpp
index c8bb82ecf3..1a0379b817 100644
--- a/components/lua_ui/content.hpp
+++ b/components/lua_ui/content.hpp
@@ -22,7 +22,7 @@ namespace LuaUi
             : mTable(std::move(table))
         {
             if (!isValidContent(mTable))
-                throw std::domain_error("Expected a Content table");
+                throw std::domain_error("Invalid UI Content");
         }
 
         size_t size() const { return mTable.size(); }
@@ -43,17 +43,17 @@ namespace LuaUi
         }
         void insert(size_t index, const sol::table& table) { callMethod("insert", toLua(index), table); }
 
-        sol::table at(size_t index) const
+        sol::object at(size_t index) const
         {
             if (index < size())
-                return mTable.get<sol::table>(toLua(index));
+                return mTable.get<sol::object>(toLua(index));
             else
                 throw std::range_error("Invalid Content index");
         }
-        sol::table at(std::string_view name) const
+        sol::object at(std::string_view name) const
         {
             if (indexOf(name).has_value())
-                return mTable.get<sol::table>(name);
+                return mTable.get<sol::object>(name);
             else
                 throw std::range_error("Invalid Content key");
         }
diff --git a/components/lua_ui/content.lua b/components/lua_ui/content.lua
index fbd39d5f68..99fdb86b70 100644
--- a/components/lua_ui/content.lua
+++ b/components/lua_ui/content.lua
@@ -1,12 +1,17 @@
 local M = {}
 M.__Content = true
+
+function validateContentChild(v)
+    if not (type(v) == 'table' or v.__type and v.__type.name == 'LuaUi::Element') then
+        error('Content can only contain tables and Elements')
+    end
+end
+
 M.new = function(source)
     local result = {}
     result.__nameIndex = {}
     for i, v in ipairs(source) do
-        if type(v) ~= 'table' then
-            error('Content can only contain tables')
-        end
+        validateContentChild(v)
         result[i] = v
         if type(v.name) == 'string' then
             result.__nameIndex[v.name] = i
@@ -38,9 +43,7 @@ end
 local methods = {
     insert = function(self, index, value)
         validateIndex(self, index)
-        if type(value) ~= 'table' then
-            error('Content can only contain tables')
-        end
+        validateContentChild(value)
         for i = #self, index, -1 do
             rawset(self, i + 1, rawget(self, i))
             local name = rawget(self, i + 1)
@@ -56,7 +59,7 @@ local methods = {
     indexOf = function(self, value)
         if type(value) == 'string' then
             return self.__nameIndex[value]
-        elseif type(value) == 'table' then
+        else
             for i = 1, #self do
                 if rawget(self, i) == value then
                     return i
@@ -113,10 +116,9 @@ M.__newindex = function(self, key, value)
     local index = getIndexFromKey(self, key)
     if value == nil then
         remove(self, index)
-    elseif type(value) == 'table' then
-        assign(self, index, value)
     else
-        error('Content can only contain tables')
+        validateContentChild(value)
+        assign(self, index, value)
     end
 end
 M.__tostring = function(self)
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 4fe9349b9e..2d8462e273 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -38,18 +38,65 @@ namespace LuaUi
                 if (typeField != sol::nil && templateType != type)
                     throw std::logic_error(std::string("Template layout type ") + type
                         + std::string(" doesn't match template type ") + templateType);
-                type = templateType;
+                type = std::move(templateType);
             }
             return type;
         }
 
-        void destroyWidget(LuaUi::WidgetExtension* ext)
+        void destroyWidget(WidgetExtension* ext)
         {
             ext->deinitialize();
             MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
         }
 
-        WidgetExtension* createWidget(const sol::table& layout, uint64_t depth);
+        void destroyChild(WidgetExtension* ext)
+        {
+            if (!ext->isRoot())
+                destroyWidget(ext);
+            else
+                ext->detachFromParent();
+        }
+
+        void detachElements(WidgetExtension* ext)
+        {
+            auto predicate = [](WidgetExtension* child) {
+                if (child->isRoot())
+                    return true;
+                detachElements(child);
+                return false;
+            };
+            ext->detachChildrenIf(predicate);
+            ext->detachTemplateChildrenIf(predicate);
+        }
+
+        void destroyRoot(WidgetExtension* ext)
+        {
+            detachElements(ext);
+            destroyWidget(ext);
+        }
+
+        void updateRootCoord(WidgetExtension* ext)
+        {
+            WidgetExtension* root = ext;
+            while (root->getParent())
+                root = root->getParent();
+            root->updateCoord();
+        }
+
+        WidgetExtension* pluckElementRoot(const sol::object& child, uint64_t depth)
+        {
+            std::shared_ptr<Element> element = child.as<std::shared_ptr<Element>>();
+            if (element->mState == Element::Destroyed || element->mState == Element::Destroy)
+                throw std::logic_error("Using a destroyed element as a layout child");
+            // child Element was created in the same frame and its action hasn't been processed yet
+            if (element->mState == Element::New)
+                element->create(depth + 1);
+            WidgetExtension* root = element->mRoot;
+            assert(root);
+            return root;
+        }
+
+        WidgetExtension* createWidget(const sol::table& layout, bool isRoot, uint64_t depth);
         void updateWidget(WidgetExtension* ext, const sol::table& layout, uint64_t depth);
 
         std::vector<WidgetExtension*> updateContent(
@@ -60,31 +107,52 @@ namespace LuaUi
             if (contentObj == sol::nil)
             {
                 for (WidgetExtension* w : children)
-                    destroyWidget(w);
+                    destroyChild(w);
                 return result;
             }
             ContentView content(LuaUtil::cast<sol::table>(contentObj));
             result.resize(content.size());
             size_t minSize = std::min(children.size(), content.size());
+            std::vector<WidgetExtension*> toDestroy;
             for (size_t i = 0; i < minSize; i++)
             {
                 WidgetExtension* ext = children[i];
-                sol::table newLayout = content.at(i);
-                if (ext->widget()->getTypeName() == widgetType(newLayout))
+                sol::object child = content.at(i);
+                if (child.is<Element>())
                 {
-                    updateWidget(ext, newLayout, depth);
+                    WidgetExtension* root = pluckElementRoot(child, depth);
+                    if (ext != root)
+                        toDestroy.emplace_back(ext);
+                    result[i] = root;
                 }
                 else
                 {
-                    destroyWidget(ext);
-                    ext = createWidget(newLayout, depth);
+                    sol::table newLayout = child.as<sol::table>();
+                    if (ext->widget()->getTypeName() == widgetType(newLayout))
+                    {
+                        updateWidget(ext, newLayout, depth);
+                    }
+                    else
+                    {
+                        toDestroy.emplace_back(ext);
+                        ext = createWidget(newLayout, false, depth);
+                    }
+                    result[i] = ext;
                 }
-                result[i] = ext;
             }
-            for (size_t i = minSize; i < children.size(); i++)
-                destroyWidget(children[i]);
             for (size_t i = minSize; i < content.size(); i++)
-                result[i] = createWidget(content.at(i), depth);
+            {
+                sol::object child = content.at(i);
+                if (child.is<Element>())
+                    result[i] = pluckElementRoot(child, depth);
+                else
+                    result[i] = createWidget(child.as<sol::table>(), false, depth);
+            }
+            // Don't destroy anything until element creation has had a chance to throw
+            for (size_t i = minSize; i < children.size(); i++)
+                destroyChild(children[i]);
+            for (WidgetExtension* ext : toDestroy)
+                destroyChild(ext);
             return result;
         }
 
@@ -97,7 +165,7 @@ namespace LuaUi
             ext->setTemplateChildren(updateContent(ext->templateChildren(), content, depth));
         }
 
-        void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::object& eventsObj)
+        void setEventCallbacks(WidgetExtension* ext, const sol::object& eventsObj)
         {
             ext->clearCallbacks();
             if (eventsObj == sol::nil)
@@ -116,7 +184,7 @@ namespace LuaUi
             });
         }
 
-        WidgetExtension* createWidget(const sol::table& layout, uint64_t depth)
+        WidgetExtension* createWidget(const sol::table& layout, bool isRoot, uint64_t depth)
         {
             static auto widgetTypeMap = widgetTypeToName();
             std::string type = widgetType(layout);
@@ -124,13 +192,13 @@ namespace LuaUi
                 throw std::logic_error(std::string("Invalid widget type ") += type);
 
             std::string name = layout.get_or(LayoutKeys::name, std::string());
-            MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
-                type, "", MyGUI::IntCoord(), MyGUI::Align::Default, std::string(), name);
+            MyGUI::Widget* widget
+                = MyGUI::Gui::getInstancePtr()->createWidgetT(type, {}, {}, MyGUI::Align::Default, {}, name);
 
             WidgetExtension* ext = dynamic_cast<WidgetExtension*>(widget);
             if (!ext)
                 throw std::runtime_error("Invalid widget!");
-            ext->initialize(layout.lua_state(), widget);
+            ext->initialize(layout.lua_state(), widget, isRoot);
 
             updateWidget(ext, layout, depth);
             return ext;
@@ -153,7 +221,9 @@ namespace LuaUi
         std::string setLayer(WidgetExtension* ext, const sol::table& layout)
         {
             MyGUI::ILayer* layerNode = ext->widget()->getLayer();
-            std::string currentLayer = layerNode ? layerNode->getName() : std::string();
+            std::string_view currentLayer;
+            if (layerNode)
+                currentLayer = layerNode->getName();
             std::string newLayer = layout.get_or(LayoutKeys::layer, std::string());
             if (!newLayer.empty() && !MyGUI::LayerManager::getInstance().isExist(newLayer))
                 throw std::logic_error(std::string("Layer ") + newLayer + " doesn't exist");
@@ -165,93 +235,97 @@ namespace LuaUi
         }
     }
 
-    std::map<Element*, std::shared_ptr<Element>> Element::sAllElements;
+    std::map<Element*, std::shared_ptr<Element>> Element::sMenuElements;
+    std::map<Element*, std::shared_ptr<Element>> Element::sGameElements;
 
     Element::Element(sol::table layout)
         : mRoot(nullptr)
-        , mAttachedTo(nullptr)
         , mLayout(std::move(layout))
         , mLayer()
-        , mUpdate(false)
-        , mDestroy(false)
+        , mState(Element::New)
     {
     }
 
-    std::shared_ptr<Element> Element::make(sol::table layout)
+    std::shared_ptr<Element> Element::make(sol::table layout, bool menu)
     {
         std::shared_ptr<Element> ptr(new Element(std::move(layout)));
-        sAllElements[ptr.get()] = ptr;
+        auto& container = menu ? sMenuElements : sGameElements;
+        container[ptr.get()] = ptr;
         return ptr;
     }
 
-    void Element::create()
+    void Element::erase(Element* element)
     {
-        assert(!mRoot);
-        if (!mRoot)
+        element->destroy();
+        sMenuElements.erase(element);
+        sGameElements.erase(element);
+    }
+
+    void Element::create(uint64_t depth)
+    {
+        if (mState == New)
         {
-            mRoot = createWidget(layout(), 0);
+            assert(!mRoot);
+            mRoot = createWidget(layout(), true, depth);
             mLayer = setLayer(mRoot, layout());
-            updateAttachment();
+            updateRootCoord(mRoot);
+            mState = Created;
         }
     }
 
     void Element::update()
     {
-        if (mRoot && mUpdate)
+        if (mState == Update)
         {
+            assert(mRoot);
             if (mRoot->widget()->getTypeName() != widgetType(layout()))
             {
-                destroyWidget(mRoot);
-                mRoot = createWidget(layout(), 0);
+                destroyRoot(mRoot);
+                WidgetExtension* parent = mRoot->getParent();
+                auto children = parent->children();
+                auto it = std::find(children.begin(), children.end(), mRoot);
+                assert(it != children.end());
+                try
+                {
+                    mRoot = createWidget(layout(), true, 0);
+                    *it = mRoot;
+                }
+                catch (...)
+                {
+                    // Remove mRoot from its parent's children even if we couldn't replace it
+                    children.erase(it);
+                    parent->setChildren(children);
+                    mRoot = nullptr;
+                    throw;
+                }
+                parent->setChildren(children);
+                mRoot->updateCoord();
             }
             else
             {
                 updateWidget(mRoot, layout(), 0);
             }
             mLayer = setLayer(mRoot, layout());
-            updateAttachment();
+            updateRootCoord(mRoot);
+            mState = Created;
         }
-        mUpdate = false;
     }
 
     void Element::destroy()
     {
-        if (mRoot)
+        if (mState != Destroyed)
         {
-            destroyWidget(mRoot);
-            mRoot = nullptr;
+            if (mRoot != nullptr)
+            {
+                // If someone decided to destroy an element used as another element's content, we need to detach it
+                // first so the parent doesn't end up holding a stale pointer
+                if (WidgetExtension* parent = mRoot->getParent())
+                    parent->detachChildrenIf([&](WidgetExtension* child) { return child == mRoot; });
+                destroyRoot(mRoot);
+                mRoot = nullptr;
+            }
             mLayout = sol::make_object(mLayout.lua_state(), sol::nil);
         }
-        sAllElements.erase(this);
-    }
-
-    void Element::attachToWidget(WidgetExtension* w)
-    {
-        if (mAttachedTo)
-            throw std::logic_error("A UI element can't be attached to two widgets at once");
-        mAttachedTo = w;
-        updateAttachment();
-    }
-
-    void Element::detachFromWidget()
-    {
-        if (mRoot)
-            mRoot->widget()->detachFromWidget();
-        if (mAttachedTo)
-            mAttachedTo->setChildren({});
-        mAttachedTo = nullptr;
-    }
-
-    void Element::updateAttachment()
-    {
-        if (!mRoot)
-            return;
-        if (mAttachedTo)
-        {
-            if (!mLayer.empty())
-                Log(Debug::Warning) << "Ignoring element's layer " << mLayer << " because it's attached to a widget";
-            mAttachedTo->setChildren({ mRoot });
-            mAttachedTo->updateCoord();
-        }
+        mState = Destroyed;
     }
 }
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
index b57af92fee..39a1fdd769 100644
--- a/components/lua_ui/element.hpp
+++ b/components/lua_ui/element.hpp
@@ -7,38 +7,45 @@ namespace LuaUi
 {
     struct Element
     {
-        static std::shared_ptr<Element> make(sol::table layout);
+        static std::shared_ptr<Element> make(sol::table layout, bool menu);
+        static void erase(Element* element);
 
         template <class Callback>
-        static void forEach(Callback callback)
+        static void forEach(bool menu, Callback callback)
         {
-            for (auto& [e, _] : sAllElements)
-                callback(e);
+            auto& container = menu ? sMenuElements : sGameElements;
+            for (auto& [_, element] : container)
+                callback(element.get());
         }
 
         WidgetExtension* mRoot;
-        WidgetExtension* mAttachedTo;
         sol::object mLayout;
         std::string mLayer;
-        bool mUpdate;
-        bool mDestroy;
 
-        void create();
+        enum State
+        {
+            New,
+            Created,
+            Update,
+            Destroy,
+            Destroyed,
+        };
+        State mState;
+
+        void create(uint64_t dept = 0);
 
         void update();
 
         void destroy();
 
-        friend void clearUserInterface();
-
-        void attachToWidget(WidgetExtension* w);
-        void detachFromWidget();
+        friend void clearGameInterface();
+        friend void clearMenuInterface();
 
     private:
         Element(sol::table layout);
         sol::table layout() { return LuaUtil::cast<sol::table>(mLayout); }
-        static std::map<Element*, std::shared_ptr<Element>> sAllElements;
-        void updateAttachment();
+        static std::map<Element*, std::shared_ptr<Element>> sGameElements;
+        static std::map<Element*, std::shared_ptr<Element>> sMenuElements;
     };
 }
 
diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
index c55b48ddb7..1a3293d406 100644
--- a/components/lua_ui/flex.cpp
+++ b/components/lua_ui/flex.cpp
@@ -79,7 +79,7 @@ namespace LuaUi
         WidgetExtension::updateChildren();
     }
 
-    MyGUI::IntSize LuaFlex::childScalingSize()
+    MyGUI::IntSize LuaFlex::childScalingSize() const
     {
         // Call the base method to prevent relativeSize feedback loop
         MyGUI::IntSize size = WidgetExtension::calculateSize();
@@ -88,7 +88,7 @@ namespace LuaUi
         return size;
     }
 
-    MyGUI::IntSize LuaFlex::calculateSize()
+    MyGUI::IntSize LuaFlex::calculateSize() const
     {
         MyGUI::IntSize size = WidgetExtension::calculateSize();
         if (mAutoSized)
diff --git a/components/lua_ui/flex.hpp b/components/lua_ui/flex.hpp
index 944daaec77..c91ffd00a2 100644
--- a/components/lua_ui/flex.hpp
+++ b/components/lua_ui/flex.hpp
@@ -11,10 +11,10 @@ namespace LuaUi
         MYGUI_RTTI_DERIVED(LuaFlex)
 
     protected:
-        MyGUI::IntSize calculateSize() override;
+        MyGUI::IntSize calculateSize() const override;
         void updateProperties() override;
         void updateChildren() override;
-        MyGUI::IntSize childScalingSize() override;
+        MyGUI::IntSize childScalingSize() const override;
 
         void updateCoord() override;
 
@@ -26,25 +26,37 @@ namespace LuaUi
         Alignment mArrange;
 
         template <typename T>
-        T& primary(MyGUI::types::TPoint<T>& point)
+        T& primary(MyGUI::types::TPoint<T>& point) const
         {
             return mHorizontal ? point.left : point.top;
         }
 
         template <typename T>
-        T& secondary(MyGUI::types::TPoint<T>& point)
+        T& secondary(MyGUI::types::TPoint<T>& point) const
         {
             return mHorizontal ? point.top : point.left;
         }
 
         template <typename T>
-        T& primary(MyGUI::types::TSize<T>& size)
+        T& primary(MyGUI::types::TSize<T>& size) const
         {
             return mHorizontal ? size.width : size.height;
         }
 
         template <typename T>
-        T& secondary(MyGUI::types::TSize<T>& size)
+        T& secondary(MyGUI::types::TSize<T>& size) const
+        {
+            return mHorizontal ? size.height : size.width;
+        }
+
+        template <typename T>
+        T primary(const MyGUI::types::TSize<T>& size) const
+        {
+            return mHorizontal ? size.width : size.height;
+        }
+
+        template <typename T>
+        T secondary(const MyGUI::types::TSize<T>& size) const
         {
             return mHorizontal ? size.height : size.width;
         }
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index 0454dd19b4..ffe93a8d2d 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -8,9 +8,7 @@ namespace LuaUi
 {
     void LuaTileRect::_setAlign(const MyGUI::IntSize& _oldsize)
     {
-        mCurrentCoord.set(0, 0, mCroppedParent->getWidth(), mCroppedParent->getHeight());
-        mAlign = MyGUI::Align::Stretch;
-        MyGUI::TileRect::_setAlign(_oldsize);
+        mCoord.set(0, 0, mCroppedParent->getWidth(), mCroppedParent->getHeight());
         mTileSize = mSetTileSize;
 
         // zero tilesize stands for not tiling
@@ -25,6 +23,8 @@ namespace LuaUi
             mTileSize.width = 1e7;
         if (mTileSize.height <= 0)
             mTileSize.height = 1e7;
+
+        MyGUI::TileRect::_updateView();
     }
 
     void LuaImage::initialize()
@@ -55,13 +55,13 @@ namespace LuaUi
         if (texture != nullptr)
             textureSize = MyGUI::IntSize(texture->getWidth(), texture->getHeight());
 
-        mTileRect->updateSize(MyGUI::IntSize(tileH ? textureSize.width : 0, tileV ? textureSize.height : 0));
-        setImageTile(textureSize);
-
         if (atlasCoord.width == 0)
             atlasCoord.width = textureSize.width;
         if (atlasCoord.height == 0)
             atlasCoord.height = textureSize.height;
+
+        mTileRect->updateSize(MyGUI::IntSize(tileH ? atlasCoord.width : 0, tileV ? atlasCoord.height : 0));
+        setImageTile(atlasCoord.size());
         setImageCoord(atlasCoord);
 
         setColour(propertyValue("color", MyGUI::Colour(1, 1, 1, 1)));
diff --git a/components/lua_ui/registerscriptsettings.hpp b/components/lua_ui/registerscriptsettings.hpp
index fb794468da..58b033fc59 100644
--- a/components/lua_ui/registerscriptsettings.hpp
+++ b/components/lua_ui/registerscriptsettings.hpp
@@ -8,6 +8,7 @@ namespace LuaUi
     // implemented in scriptsettings.cpp
     void registerSettingsPage(const sol::table& options);
     void clearSettings();
+    void removeSettingsPage(const sol::table& options);
 }
 
 #endif // !OPENMW_LUAUI_REGISTERSCRIPTSETTINGS
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index e92d1d8958..69a5ee88e5 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -21,7 +21,7 @@ namespace LuaUi
                 Log(Debug::Warning) << "A script settings page has an empty name";
             if (!element.get())
                 Log(Debug::Warning) << "A script settings page has no UI element assigned";
-            return { std::move(name), std::move(searchHints), element };
+            return { std::move(name), std::move(searchHints), std::move(element) };
         }
     }
 
@@ -40,6 +40,11 @@ namespace LuaUi
         allPages.push_back(options);
     }
 
+    void removeSettingsPage(const sol::table& options)
+    {
+        std::erase_if(allPages, [options](const sol::table& it) { return it == options; });
+    }
+
     void clearSettings()
     {
         allPages.clear();
@@ -47,10 +52,10 @@ namespace LuaUi
 
     void attachPageAt(size_t index, LuaAdapter* adapter)
     {
+        adapter->detach();
         if (index < allPages.size())
         {
             ScriptSettingsPage page = parse(allPages[index]);
-            adapter->detach();
             if (page.mElement.get())
                 adapter->attach(page.mElement);
         }
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index ab68bde839..94ed065bbc 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -3,7 +3,6 @@
 
 #include <memory>
 #include <string>
-#include <string_view>
 
 namespace LuaUi
 {
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index e55f1750b9..35aa9402bf 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -46,7 +46,7 @@ namespace LuaUi
             updateCoord();
     }
 
-    MyGUI::IntSize LuaText::calculateSize()
+    MyGUI::IntSize LuaText::calculateSize() const
     {
         if (mAutoSized)
             return getTextSize();
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
index fffe34a3ba..87c01a37e8 100644
--- a/components/lua_ui/text.hpp
+++ b/components/lua_ui/text.hpp
@@ -21,7 +21,7 @@ namespace LuaUi
         bool mAutoSized;
 
     protected:
-        MyGUI::IntSize calculateSize() override;
+        MyGUI::IntSize calculateSize() const override;
     };
 }
 
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index a8c19fa8fd..9bd241884a 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -8,6 +8,7 @@ namespace LuaUi
     {
         mEditBox = createWidget<MyGUI::EditBox>("LuaTextEdit", MyGUI::IntCoord(0, 0, 0, 0), MyGUI::Align::Default);
         mEditBox->eventEditTextChange += MyGUI::newDelegate(this, &LuaTextEdit::textChange);
+        mEditBox->setMaxTextLength(std::numeric_limits<std::size_t>::max());
         registerEvents(mEditBox);
         WidgetExtension::initialize();
     }
@@ -62,7 +63,7 @@ namespace LuaUi
         mEditBox->attachToWidget(this);
     }
 
-    MyGUI::IntSize LuaTextEdit::calculateSize()
+    MyGUI::IntSize LuaTextEdit::calculateSize() const
     {
         MyGUI::IntSize normalSize = WidgetExtension::calculateSize();
         if (mAutoSize)
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index 3492a315bc..57e1209aff 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -11,13 +11,16 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaTextEdit)
 
+    public:
+        bool isTextInput() override { return mEditBox->getEditStatic(); }
+
     protected:
         void initialize() override;
         void deinitialize() override;
         void updateProperties() override;
         void updateCoord() override;
         void updateChildren() override;
-        MyGUI::IntSize calculateSize() override;
+        MyGUI::IntSize calculateSize() const override;
 
     private:
         void textChange(MyGUI::EditBox*);
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index 78237c54ea..8dfda3d4cb 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -44,10 +44,15 @@ namespace LuaUi
         return types;
     }
 
-    void clearUserInterface()
+    void clearGameInterface()
     {
-        clearSettings();
-        while (!Element::sAllElements.empty())
-            Element::sAllElements.begin()->second->destroy();
+        while (!Element::sGameElements.empty())
+            Element::erase(Element::sGameElements.begin()->second.get());
+    }
+
+    void clearMenuInterface()
+    {
+        while (!Element::sMenuElements.empty())
+            Element::erase(Element::sMenuElements.begin()->second.get());
     }
 }
diff --git a/components/lua_ui/util.hpp b/components/lua_ui/util.hpp
index 78daf6669c..2b5c4ff13c 100644
--- a/components/lua_ui/util.hpp
+++ b/components/lua_ui/util.hpp
@@ -10,7 +10,8 @@ namespace LuaUi
 
     const std::unordered_map<std::string, std::string>& widgetTypeToName();
 
-    void clearUserInterface();
+    void clearGameInterface();
+    void clearMenuInterface();
 }
 
 #endif // OPENMW_LUAUI_WIDGETLIST
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index ff9f4d90a2..71416be8c8 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -9,6 +9,7 @@ namespace LuaUi
         : mForcePosition(false)
         , mForceSize(false)
         , mPropagateEvents(true)
+        , mVisible(true)
         , mLua(nullptr)
         , mWidget(nullptr)
         , mSlot(this)
@@ -18,13 +19,15 @@ namespace LuaUi
         , mExternal(sol::nil)
         , mParent(nullptr)
         , mTemplateChild(false)
+        , mElementRoot(false)
     {
     }
 
-    void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self)
+    void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self, bool isRoot)
     {
         mLua = lua;
         mWidget = self;
+        mElementRoot = isRoot;
         initialize();
         updateTemplate();
     }
@@ -40,8 +43,6 @@ namespace LuaUi
         clearCallbacks();
         clearEvents(mWidget);
 
-        mOnCoordChange.reset();
-
         for (WidgetExtension* w : mChildren)
             w->deinitialize();
         for (WidgetExtension* w : mTemplateChildren)
@@ -73,11 +74,7 @@ namespace LuaUi
         w->eventMouseButtonPressed.clear();
         w->eventMouseButtonReleased.clear();
         w->eventMouseMove.clear();
-#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 2)
-        w->eventMouseDrag.m_event.clear();
-#else
         w->eventMouseDrag.clear();
-#endif
 
         w->eventMouseSetFocus.clear();
         w->eventMouseLostFocus.clear();
@@ -92,15 +89,30 @@ namespace LuaUi
             w->widget()->detachFromWidget();
     }
 
+    void WidgetExtension::updateVisible()
+    {
+        // workaround for MyGUI bug
+        // parent visibility doesn't affect added children
+        MyGUI::Widget* parent = widget()->getParent();
+        bool inheritedVisible = mVisible && (parent == nullptr || parent->getInheritedVisible());
+        widget()->setVisible(inheritedVisible);
+    }
+
     void WidgetExtension::attach(WidgetExtension* ext)
     {
+        if (ext->mParent != this)
+        {
+            if (ext->mParent)
+            {
+                auto children = ext->mParent->children();
+                std::erase(children, this);
+                ext->mParent->setChildren(children);
+            }
+            ext->detachFromParent();
+        }
         ext->mParent = this;
         ext->mTemplateChild = false;
         ext->widget()->attachToWidget(mSlot->widget());
-        // workaround for MyGUI bug
-        // parent visibility doesn't affect added children
-        ext->widget()->setVisible(!ext->widget()->getVisible());
-        ext->widget()->setVisible(!ext->widget()->getVisible());
     }
 
     void WidgetExtension::attachTemplate(WidgetExtension* ext)
@@ -108,10 +120,13 @@ namespace LuaUi
         ext->mParent = this;
         ext->mTemplateChild = true;
         ext->widget()->attachToWidget(widget());
-        // workaround for MyGUI bug
-        // parent visibility doesn't affect added children
-        ext->widget()->setVisible(!ext->widget()->getVisible());
-        ext->widget()->setVisible(!ext->widget()->getVisible());
+    }
+
+    void WidgetExtension::detachFromParent()
+    {
+        mParent = nullptr;
+        widget()->detachFromWidget();
+        widget()->detachFromLayer();
     }
 
     WidgetExtension* WidgetExtension::findDeep(std::string_view flagName)
@@ -256,14 +271,14 @@ namespace LuaUi
 
     void WidgetExtension::updateCoord()
     {
+        updateVisible();
+
         MyGUI::IntCoord oldCoord = mWidget->getCoord();
         MyGUI::IntCoord newCoord = calculateCoord();
 
         if (oldCoord != newCoord)
             mWidget->setCoord(newCoord);
         updateChildrenCoord();
-        if (oldCoord != newCoord && mOnCoordChange.has_value())
-            mOnCoordChange.value()(this, newCoord);
     }
 
     void WidgetExtension::setProperties(const sol::object& props)
@@ -280,7 +295,8 @@ namespace LuaUi
         mRelativeCoord = propertyValue("relativePosition", MyGUI::FloatPoint());
         mRelativeCoord = propertyValue("relativeSize", MyGUI::FloatSize());
         mAnchor = propertyValue("anchor", MyGUI::FloatSize());
-        mWidget->setVisible(propertyValue("visible", true));
+        mVisible = propertyValue("visible", true);
+        mWidget->setVisible(mVisible);
         mWidget->setPointer(propertyValue("pointer", std::string("arrow")));
         mWidget->setAlpha(propertyValue("alpha", 1.f));
         mWidget->setInheritsAlpha(propertyValue("inheritAlpha", true));
@@ -294,7 +310,7 @@ namespace LuaUi
             w->updateCoord();
     }
 
-    MyGUI::IntSize WidgetExtension::parentSize()
+    MyGUI::IntSize WidgetExtension::parentSize() const
     {
         if (!mParent)
             return widget()->getParentSize(); // size of the layer
@@ -304,7 +320,7 @@ namespace LuaUi
             return mParent->childScalingSize();
     }
 
-    MyGUI::IntSize WidgetExtension::calculateSize()
+    MyGUI::IntSize WidgetExtension::calculateSize() const
     {
         if (mForceSize)
             return mForcedCoord.size();
@@ -317,7 +333,7 @@ namespace LuaUi
         return newSize;
     }
 
-    MyGUI::IntPoint WidgetExtension::calculatePosition(const MyGUI::IntSize& size)
+    MyGUI::IntPoint WidgetExtension::calculatePosition(const MyGUI::IntSize& size) const
     {
         if (mForcePosition)
             return mForcedCoord.point();
@@ -329,7 +345,7 @@ namespace LuaUi
         return newPosition;
     }
 
-    MyGUI::IntCoord WidgetExtension::calculateCoord()
+    MyGUI::IntCoord WidgetExtension::calculateCoord() const
     {
         MyGUI::IntCoord newCoord;
         newCoord = calculateSize();
@@ -337,12 +353,12 @@ namespace LuaUi
         return newCoord;
     }
 
-    MyGUI::IntSize WidgetExtension::childScalingSize()
+    MyGUI::IntSize WidgetExtension::childScalingSize() const
     {
         return mSlot->widget()->getSize();
     }
 
-    MyGUI::IntSize WidgetExtension::templateScalingSize()
+    MyGUI::IntSize WidgetExtension::templateScalingSize() const
     {
         return widget()->getSize();
     }
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 3dbc14b6c3..0ec688d3bb 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -26,12 +26,18 @@ namespace LuaUi
         virtual ~WidgetExtension() = default;
 
         // must be called after creating the underlying MyGUI::Widget
-        void initialize(lua_State* lua, MyGUI::Widget* self);
+        void initialize(lua_State* lua, MyGUI::Widget* self, bool isRoot);
         // must be called after before destroying the underlying MyGUI::Widget
         virtual void deinitialize();
 
         MyGUI::Widget* widget() const { return mWidget; }
-        WidgetExtension* slot() const { return mSlot; }
+
+        bool isRoot() const { return mElementRoot; }
+        WidgetExtension* getParent() const { return mParent; }
+        void detachFromParent();
+
+        void detachChildrenIf(auto&& predicate) { detachChildrenIf(predicate, mChildren); }
+        void detachTemplateChildrenIf(auto&& predicate) { detachChildrenIf(predicate, mTemplateChildren); }
 
         void reset();
 
@@ -61,19 +67,16 @@ namespace LuaUi
         void setLayout(const sol::table& layout) { mLayout = layout; }
 
         template <typename T>
-        T externalValue(std::string_view name, const T& defaultValue)
+        T externalValue(std::string_view name, const T& defaultValue) const
         {
             return parseExternal(mExternal, name, defaultValue);
         }
 
-        void onCoordChange(const std::optional<std::function<void(WidgetExtension*, MyGUI::IntCoord)>>& callback)
-        {
-            mOnCoordChange = callback;
-        }
+        virtual MyGUI::IntSize calculateSize() const;
+        virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size) const;
+        MyGUI::IntCoord calculateCoord() const;
 
-        virtual MyGUI::IntSize calculateSize();
-        virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
-        MyGUI::IntCoord calculateCoord();
+        virtual bool isTextInput() { return false; }
 
     protected:
         virtual void initialize();
@@ -84,9 +87,9 @@ namespace LuaUi
         sol::object keyEvent(MyGUI::KeyCode) const;
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
 
-        MyGUI::IntSize parentSize();
-        virtual MyGUI::IntSize childScalingSize();
-        virtual MyGUI::IntSize templateScalingSize();
+        MyGUI::IntSize parentSize() const;
+        virtual MyGUI::IntSize childScalingSize() const;
+        virtual MyGUI::IntSize templateScalingSize() const;
 
         template <typename T>
         T propertyValue(std::string_view name, const T& defaultValue)
@@ -137,6 +140,7 @@ namespace LuaUi
         MyGUI::FloatSize mAnchor;
 
         bool mPropagateEvents;
+        bool mVisible; // used to implement updateVisible
 
     private:
         // use lua_State* instead of sol::state_view because MyGUI requires a default constructor
@@ -152,6 +156,7 @@ namespace LuaUi
         sol::object mExternal;
         WidgetExtension* mParent;
         bool mTemplateChild;
+        bool mElementRoot;
 
         void attach(WidgetExtension* ext);
         void attachTemplate(WidgetExtension* ext);
@@ -172,7 +177,21 @@ namespace LuaUi
         void focusGain(MyGUI::Widget*, MyGUI::Widget*);
         void focusLoss(MyGUI::Widget*, MyGUI::Widget*);
 
-        std::optional<std::function<void(WidgetExtension*, MyGUI::IntCoord)>> mOnCoordChange;
+        void updateVisible();
+
+        void detachChildrenIf(auto&& predicate, std::vector<WidgetExtension*>& children)
+        {
+            for (auto it = children.begin(); it != children.end();)
+            {
+                if (predicate(*it))
+                {
+                    (*it)->detachFromParent();
+                    it = children.erase(it);
+                }
+                else
+                    ++it;
+            }
+        }
     };
 
     class LuaWidget : public MyGUI::Widget, public WidgetExtension
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index 3ee7336a78..5da2ae4ca4 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -16,11 +16,7 @@ namespace LuaUi
         for (auto& [w, _] : mActionWidgets)
         {
             w->eventMouseButtonPressed.clear();
-#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 2)
-            w->eventMouseDrag.m_event.clear();
-#else
             w->eventMouseDrag.clear();
-#endif
         }
         mActionWidgets.clear();
 
diff --git a/components/misc/concepts.hpp b/components/misc/concepts.hpp
new file mode 100644
index 0000000000..d8573e94ab
--- /dev/null
+++ b/components/misc/concepts.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_COMPONENTS_MISC_CONCEPTS_H
+#define OPENMW_COMPONENTS_MISC_CONCEPTS_H
+
+#include <concepts>
+#include <type_traits>
+
+namespace Misc
+{
+    template <class T, class U>
+    concept SameAsWithoutCvref = std::same_as<std::remove_cvref_t<T>, std::remove_cvref_t<U>>;
+}
+
+#endif
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index a66fac9125..5d936b5d5f 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_MISC_CONVERT_H
 #define OPENMW_COMPONENTS_MISC_CONVERT_H
 
-#include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 #include <components/esm3/loadpgrd.hpp>
 
 #include <LinearMath/btQuaternion.h>
diff --git a/components/misc/display.cpp b/components/misc/display.cpp
new file mode 100644
index 0000000000..ee78b2a0c9
--- /dev/null
+++ b/components/misc/display.cpp
@@ -0,0 +1,82 @@
+#include "display.hpp"
+
+#include <numeric>
+#include <string>
+
+#include <components/misc/strings/format.hpp>
+
+namespace Misc
+{
+    std::string getResolutionText(int x, int y, const std::string& format)
+    {
+        int gcd = std::gcd(x, y);
+        if (gcd == 0)
+            return std::string();
+
+        int xaspect = x / gcd;
+        int yaspect = y / gcd;
+
+        // It is unclear how to handle 90-degree screen rotation properly.
+        // So far only swap aspects, apply custom formatting logic and then swap back.
+        // As result, 1920 x 1200 is displayed as "1200 x 1920 (10:16)"
+        bool flipped = false;
+        if (yaspect > xaspect)
+        {
+            flipped = true;
+            std::swap(xaspect, yaspect);
+        }
+
+        // 683:384 (used in 1366 x 768) is usually referred as 16:9
+        if (xaspect == 683 && yaspect == 384)
+        {
+            xaspect = 16;
+            yaspect = 9;
+        }
+        // 85:48 (used in 1360 x 768) is usually referred as 16:9
+        else if (xaspect == 85 && yaspect == 48)
+        {
+            xaspect = 16;
+            yaspect = 9;
+        }
+        // 49:36 (used in 1176 x 864) is usually referred as 4:3
+        else if (xaspect == 49 && yaspect == 36)
+        {
+            xaspect = 4;
+            yaspect = 3;
+        }
+        // 39:29 (used in 624 x 484) is usually referred as 4:3
+        else if (xaspect == 39 && yaspect == 29)
+        {
+            xaspect = 4;
+            yaspect = 3;
+        }
+        // 8:5 (used in 1440 x 900) is usually referred as 16:10
+        else if (xaspect == 8 && yaspect == 5)
+        {
+            xaspect = 16;
+            yaspect = 10;
+        }
+        // 5:3 (used in 1280 x 768) is usually referred as 15:9
+        else if (xaspect == 5 && yaspect == 3)
+        {
+            xaspect = 15;
+            yaspect = 9;
+        }
+        else
+        {
+            // everything between 21:9 and 22:9
+            // is usually referred as 21:9
+            float ratio = static_cast<float>(xaspect) / yaspect;
+            if (ratio >= 21 / 9.f && ratio < 22 / 9.f)
+            {
+                xaspect = 21;
+                yaspect = 9;
+            }
+        }
+
+        if (flipped)
+            std::swap(xaspect, yaspect);
+
+        return Misc::StringUtils::format(format, x, y, xaspect, yaspect);
+    }
+}
diff --git a/components/misc/display.hpp b/components/misc/display.hpp
new file mode 100644
index 0000000000..82037661c8
--- /dev/null
+++ b/components/misc/display.hpp
@@ -0,0 +1,11 @@
+#ifndef OPENMW_COMPONENTS_MISC_DISPLAY_H
+#define OPENMW_COMPONENTS_MISC_DISPLAY_H
+
+#include <string>
+
+namespace Misc
+{
+    std::string getResolutionText(int x, int y, const std::string& format);
+}
+
+#endif
diff --git a/components/misc/helpviewer.cpp b/components/misc/helpviewer.cpp
index 0ff4abb9d3..ebfca9ad14 100644
--- a/components/misc/helpviewer.cpp
+++ b/components/misc/helpviewer.cpp
@@ -4,9 +4,12 @@
 #include <QString>
 #include <QUrl>
 
+#include <components/version/version.hpp>
+
 void Misc::HelpViewer::openHelp(const char* url)
 {
-    QString link{ OPENMW_DOC_BASEURL };
+    std::string_view docsUrl = Version::getDocumentationUrl();
+    QString link = QString::fromUtf8(docsUrl.data(), docsUrl.size());
     link.append(url);
     QDesktopServices::openUrl(QUrl(link));
 }
diff --git a/components/misc/mathutil.hpp b/components/misc/mathutil.hpp
index f93f38e6e8..e0c52eaf0c 100644
--- a/components/misc/mathutil.hpp
+++ b/components/misc/mathutil.hpp
@@ -7,11 +7,11 @@
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 
+#include <cmath>
 #include <type_traits>
 
 namespace Misc
 {
-
     /// Normalizes given angle to the range [-PI, PI]. E.g. PI*3/2 -> -PI/2.
     inline double normalizeAngle(double angle)
     {
@@ -29,15 +29,19 @@ namespace Misc
 
     inline osg::Vec3f toEulerAnglesXZ(osg::Vec3f forward)
     {
-        float x = -asin(forward.z());
-        float z = atan2(forward.x(), forward.y());
+        float x = -std::asin(forward.z());
+        float z = std::atan2(forward.x(), forward.y());
         return osg::Vec3f(x, 0, z);
     }
-    inline osg::Vec3f toEulerAnglesXZ(osg::Quat quat)
+
+    inline osg::Vec3f toEulerAnglesXZ(const osg::Quat& quat)
     {
-        return toEulerAnglesXZ(quat * osg::Vec3f(0, 1, 0));
+        osg::Vec3f forward = quat * osg::Vec3f(0, 1, 0);
+        forward.normalize();
+        return toEulerAnglesXZ(forward);
     }
-    inline osg::Vec3f toEulerAnglesXZ(osg::Matrixf m)
+
+    inline osg::Vec3f toEulerAnglesXZ(const osg::Matrixf& m)
     {
         osg::Vec3f forward(m(1, 0), m(1, 1), m(1, 2));
         forward.normalize();
@@ -46,17 +50,23 @@ namespace Misc
 
     inline osg::Vec3f toEulerAnglesZYX(osg::Vec3f forward, osg::Vec3f up)
     {
-        float y = -asin(up.x());
-        float x = atan2(up.y(), up.z());
+        float y = -std::asin(up.x());
+        float x = std::atan2(up.y(), up.z());
         osg::Vec3f forwardZ = (osg::Quat(x, osg::Vec3f(1, 0, 0)) * osg::Quat(y, osg::Vec3f(0, 1, 0))) * forward;
-        float z = atan2(forwardZ.x(), forwardZ.y());
+        float z = std::atan2(forwardZ.x(), forwardZ.y());
         return osg::Vec3f(x, y, z);
     }
-    inline osg::Vec3f toEulerAnglesZYX(osg::Quat quat)
+
+    inline osg::Vec3f toEulerAnglesZYX(const osg::Quat& quat)
     {
-        return toEulerAnglesZYX(quat * osg::Vec3f(0, 1, 0), quat * osg::Vec3f(0, 0, 1));
+        osg::Vec3f forward = quat * osg::Vec3f(0, 1, 0);
+        forward.normalize();
+        osg::Vec3f up = quat * osg::Vec3f(0, 0, 1);
+        up.normalize();
+        return toEulerAnglesZYX(forward, up);
     }
-    inline osg::Vec3f toEulerAnglesZYX(osg::Matrixf m)
+
+    inline osg::Vec3f toEulerAnglesZYX(const osg::Matrixf& m)
     {
         osg::Vec3f forward(m(1, 0), m(1, 1), m(1, 2));
         osg::Vec3f up(m(2, 0), m(2, 1), m(2, 2));
diff --git a/components/misc/osgpluginchecker.cpp.in b/components/misc/osgpluginchecker.cpp.in
new file mode 100644
index 0000000000..8e57d9a5ce
--- /dev/null
+++ b/components/misc/osgpluginchecker.cpp.in
@@ -0,0 +1,53 @@
+#include "components/misc/osgpluginchecker.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/misc/strings/conversion.hpp>
+
+#include <osg/Config>
+#include <osg/Version>
+#include <osgDB/FileUtils>
+#include <osgDB/PluginQuery>
+
+#include <algorithm>
+#include <array>
+#include <filesystem>
+#include <string_view>
+
+namespace Misc
+{
+#if defined(OSG_LIBRARY_STATIC) || defined(__APPLE__)
+
+    bool checkRequiredOSGPluginsArePresent()
+    {
+        // assume they were linked in at build time and CMake would have failed if they were missing
+        // true-ish for MacOS - they're copied into the package and that'd fail if they were missing,
+        // but if you don't actually make a MacOS package and run a local build, this won't notice.
+        // the workaround in the real implementation isn't powerful enough to make MacOS work, though.
+        return true;
+    }
+
+#else
+
+    namespace
+    {
+        constexpr auto USED_OSG_PLUGIN_NAMES = std::to_array<std::string_view>({${USED_OSG_PLUGIN_NAMES_FORMATTED}});
+    }
+
+    bool checkRequiredOSGPluginsArePresent()
+    {
+        // osgDB::listAllAvailablePlugins() lies, so don't use it
+        bool haveAllPlugins = true;
+        for (std::string_view plugin : USED_OSG_PLUGIN_NAMES)
+        {
+            std::string libraryName = osgDB::Registry::instance()->createLibraryNameForExtension(std::string{ plugin });
+            if (osgDB::findLibraryFile(libraryName).empty())
+            {
+                Log(Debug::Error) << "Missing OSG plugin: " << libraryName;
+                haveAllPlugins = false;
+            }
+        }
+        return haveAllPlugins;
+    }
+
+#endif
+}
diff --git a/components/misc/osgpluginchecker.hpp b/components/misc/osgpluginchecker.hpp
new file mode 100644
index 0000000000..2f5ea09700
--- /dev/null
+++ b/components/misc/osgpluginchecker.hpp
@@ -0,0 +1,9 @@
+#ifndef OPENMW_COMPONENTS_MISC_OSGPLUGINCHECKER_HPP
+#define OPENMW_COMPONENTS_MISC_OSGPLUGINCHECKER_HPP
+
+namespace Misc
+{
+    bool checkRequiredOSGPluginsArePresent();
+}
+
+#endif
diff --git a/components/misc/pathhelpers.hpp b/components/misc/pathhelpers.hpp
index 5a6d3feb55..5dc814e20d 100644
--- a/components/misc/pathhelpers.hpp
+++ b/components/misc/pathhelpers.hpp
@@ -1,18 +1,18 @@
 #ifndef OPENMW_COMPONENTS_MISC_PATHHELPERS_H
 #define OPENMW_COMPONENTS_MISC_PATHHELPERS_H
 
-#include <string>
+#include <string_view>
 
 namespace Misc
 {
-    inline size_t findExtension(std::string_view file)
+    inline constexpr std::size_t findExtension(std::string_view file) noexcept
     {
         return file.find_last_of('.');
     }
 
-    inline std::string_view getFileExtension(std::string_view file)
+    inline constexpr std::string_view getFileExtension(std::string_view file) noexcept
     {
-        if (auto extPos = findExtension(file); extPos != std::string::npos)
+        if (auto extPos = findExtension(file); extPos != std::string_view::npos)
         {
             file.remove_prefix(extPos + 1);
             return file;
@@ -20,9 +20,9 @@ namespace Misc
         return {};
     }
 
-    inline std::string_view getFileName(std::string_view path)
+    inline constexpr std::string_view getFileName(std::string_view path) noexcept
     {
-        if (auto namePos = path.find_last_of("/\\"); namePos != std::string::npos)
+        if (auto namePos = path.find_last_of("/\\"); namePos != std::string_view::npos)
         {
             path.remove_prefix(namePos + 1);
         }
@@ -30,11 +30,11 @@ namespace Misc
         return path;
     }
 
-    inline std::string_view stemFile(std::string_view path)
+    inline constexpr std::string_view stemFile(std::string_view path) noexcept
     {
         path = getFileName(path);
 
-        if (auto extPos = path.find_last_of("."); extPos != std::string::npos)
+        if (auto extPos = path.find_last_of('.'); extPos != std::string_view::npos)
         {
             path.remove_suffix(path.size() - extPos);
         }
diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
index 55fef5cdbd..5279e2ad23 100644
--- a/components/misc/resourcehelpers.cpp
+++ b/components/misc/resourcehelpers.cpp
@@ -16,29 +16,16 @@
 
 namespace
 {
-
-    struct MatchPathSeparator
+    bool changeExtension(std::string& path, std::string_view ext)
     {
-        bool operator()(char ch) const { return ch == '\\' || ch == '/'; }
-    };
-
-    std::string getBasename(std::string const& pathname)
-    {
-        return std::string(
-            std::find_if(pathname.rbegin(), pathname.rend(), MatchPathSeparator()).base(), pathname.end());
+        std::string::size_type pos = path.rfind('.');
+        if (pos != std::string::npos && path.compare(pos, path.length() - pos, ext) != 0)
+        {
+            path.replace(pos, path.length(), ext);
+            return true;
+        }
+        return false;
     }
-
-}
-
-bool changeExtension(std::string& path, std::string_view ext)
-{
-    std::string::size_type pos = path.rfind('.');
-    if (pos != std::string::npos && path.compare(pos, path.length() - pos, ext) != 0)
-    {
-        path.replace(pos, path.length(), ext);
-        return true;
-    }
-    return false;
 }
 
 bool Misc::ResourceHelpers::changeExtensionToDds(std::string& path)
@@ -47,7 +34,7 @@ bool Misc::ResourceHelpers::changeExtensionToDds(std::string& path)
 }
 
 std::string Misc::ResourceHelpers::correctResourcePath(
-    std::string_view topLevelDirectory, std::string_view resPath, const VFS::Manager* vfs)
+    std::span<const std::string_view> topLevelDirectories, std::string_view resPath, const VFS::Manager* vfs)
 {
     /* Bethesda at some point converted all their BSA
      * textures from tga to dds for increased load speed, but all
@@ -56,13 +43,40 @@ std::string Misc::ResourceHelpers::correctResourcePath(
 
     std::string correctedPath = Misc::StringUtils::lowerCase(resPath);
 
-    // Apparently, leading separators are allowed
-    while (correctedPath.size() && (correctedPath[0] == '/' || correctedPath[0] == '\\'))
+    // Flatten slashes
+    std::replace(correctedPath.begin(), correctedPath.end(), '/', '\\');
+    auto bothSeparators = [](char a, char b) { return a == '\\' && b == '\\'; };
+    correctedPath.erase(std::unique(correctedPath.begin(), correctedPath.end(), bothSeparators), correctedPath.end());
+
+    // Remove leading separator
+    if (!correctedPath.empty() && correctedPath[0] == '\\')
         correctedPath.erase(0, 1);
 
-    if (!correctedPath.starts_with(topLevelDirectory) || correctedPath.size() <= topLevelDirectory.size()
-        || (correctedPath[topLevelDirectory.size()] != '/' && correctedPath[topLevelDirectory.size()] != '\\'))
-        correctedPath = std::string{ topLevelDirectory } + '\\' + correctedPath;
+    // Handle top level directory
+    bool needsPrefix = true;
+    for (std::string_view potentialTopLevelDirectory : topLevelDirectories)
+    {
+        if (correctedPath.starts_with(potentialTopLevelDirectory)
+            && correctedPath.size() > potentialTopLevelDirectory.size()
+            && correctedPath[potentialTopLevelDirectory.size()] == '\\')
+        {
+            needsPrefix = false;
+            break;
+        }
+        else
+        {
+            std::string topLevelPrefix = std::string{ potentialTopLevelDirectory } + '\\';
+            size_t topLevelPos = correctedPath.find('\\' + topLevelPrefix);
+            if (topLevelPos != std::string::npos)
+            {
+                correctedPath.erase(0, topLevelPos + 1);
+                needsPrefix = false;
+                break;
+            }
+        }
+    }
+    if (needsPrefix)
+        correctedPath = std::string{ topLevelDirectories.front() } + '\\' + correctedPath;
 
     std::string origExt = correctedPath;
 
@@ -77,17 +91,18 @@ std::string Misc::ResourceHelpers::correctResourcePath(
         return origExt;
 
     // fall back to a resource in the top level directory if it exists
-    std::string fallback{ topLevelDirectory };
+    std::string fallback{ topLevelDirectories.front() };
     fallback += '\\';
-    fallback += getBasename(correctedPath);
+    fallback += Misc::getFileName(correctedPath);
+
     if (vfs->exists(fallback))
         return fallback;
 
     if (changedToDds)
     {
-        fallback = topLevelDirectory;
+        fallback = topLevelDirectories.front();
         fallback += '\\';
-        fallback += getBasename(origExt);
+        fallback += Misc::getFileName(origExt);
         if (vfs->exists(fallback))
             return fallback;
     }
@@ -97,17 +112,17 @@ std::string Misc::ResourceHelpers::correctResourcePath(
 
 std::string Misc::ResourceHelpers::correctTexturePath(std::string_view resPath, const VFS::Manager* vfs)
 {
-    return correctResourcePath("textures", resPath, vfs);
+    return correctResourcePath({ { "textures", "bookart" } }, resPath, vfs);
 }
 
 std::string Misc::ResourceHelpers::correctIconPath(std::string_view resPath, const VFS::Manager* vfs)
 {
-    return correctResourcePath("icons", resPath, vfs);
+    return correctResourcePath({ { "icons" } }, resPath, vfs);
 }
 
 std::string Misc::ResourceHelpers::correctBookartPath(std::string_view resPath, const VFS::Manager* vfs)
 {
-    return correctResourcePath("bookart", resPath, vfs);
+    return correctResourcePath({ { "bookart", "textures" } }, resPath, vfs);
 }
 
 std::string Misc::ResourceHelpers::correctBookartPath(
@@ -127,33 +142,47 @@ std::string Misc::ResourceHelpers::correctBookartPath(
     return image;
 }
 
-std::string Misc::ResourceHelpers::correctActorModelPath(const std::string& resPath, const VFS::Manager* vfs)
+VFS::Path::Normalized Misc::ResourceHelpers::correctActorModelPath(
+    VFS::Path::NormalizedView resPath, const VFS::Manager* vfs)
 {
-    std::string mdlname = resPath;
-    std::string::size_type p = mdlname.find_last_of("/\\");
+    std::string mdlname(resPath.value());
+    std::string::size_type p = mdlname.find_last_of('/');
     if (p != std::string::npos)
-        mdlname.insert(mdlname.begin() + p + 1, 'x');
+        mdlname.insert(mdlname.begin() + static_cast<std::string::difference_type>(p) + 1, 'x');
     else
         mdlname.insert(mdlname.begin(), 'x');
-    std::string kfname = mdlname;
-    if (Misc::StringUtils::ciEndsWith(kfname, ".nif"))
-        kfname.replace(kfname.size() - 4, 4, ".kf");
+
+    VFS::Path::Normalized kfname(mdlname);
+    if (Misc::getFileExtension(mdlname) == "nif")
+        kfname.changeExtension("kf");
 
     if (!vfs->exists(kfname))
-    {
-        return resPath;
-    }
+        return VFS::Path::Normalized(resPath);
+
     return mdlname;
 }
 
-std::string Misc::ResourceHelpers::correctMeshPath(const std::string& resPath, const VFS::Manager* vfs)
+std::string Misc::ResourceHelpers::correctMaterialPath(std::string_view resPath, const VFS::Manager* vfs)
 {
-    return "meshes\\" + resPath;
+    return correctResourcePath({ { "materials" } }, resPath, vfs);
 }
 
-std::string Misc::ResourceHelpers::correctSoundPath(const std::string& resPath)
+VFS::Path::Normalized Misc::ResourceHelpers::correctMeshPath(VFS::Path::NormalizedView resPath)
 {
-    return "sound\\" + resPath;
+    static constexpr VFS::Path::NormalizedView prefix("meshes");
+    return prefix / resPath;
+}
+
+VFS::Path::Normalized Misc::ResourceHelpers::correctSoundPath(VFS::Path::NormalizedView resPath)
+{
+    static constexpr VFS::Path::NormalizedView prefix("sound");
+    return prefix / resPath;
+}
+
+VFS::Path::Normalized Misc::ResourceHelpers::correctMusicPath(VFS::Path::NormalizedView resPath)
+{
+    static constexpr VFS::Path::NormalizedView prefix("music");
+    return prefix / resPath;
 }
 
 std::string_view Misc::ResourceHelpers::meshPathForESM3(std::string_view resPath)
@@ -167,17 +196,17 @@ std::string_view Misc::ResourceHelpers::meshPathForESM3(std::string_view resPath
     return resPath.substr(prefix.size() + 1);
 }
 
-std::string Misc::ResourceHelpers::correctSoundPath(std::string_view resPath, const VFS::Manager* vfs)
+VFS::Path::Normalized Misc::ResourceHelpers::correctSoundPath(
+    VFS::Path::NormalizedView resPath, const VFS::Manager& vfs)
 {
     // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
-    if (!vfs->exists(resPath))
+    if (!vfs.exists(resPath))
     {
-        std::string sound{ resPath };
-        changeExtension(sound, ".mp3");
-        VFS::Path::normalizeFilenameInPlace(sound);
+        VFS::Path::Normalized sound(resPath);
+        sound.changeExtension("mp3");
         return sound;
     }
-    return VFS::Path::normalizeFilename(resPath);
+    return VFS::Path::Normalized(resPath);
 }
 
 bool Misc::ResourceHelpers::isHiddenMarker(const ESM::RefId& id)
@@ -187,45 +216,56 @@ bool Misc::ResourceHelpers::isHiddenMarker(const ESM::RefId& id)
 
 namespace
 {
-    std::string getLODMeshNameImpl(std::string resPath, const VFS::Manager* vfs, std::string_view pattern)
+    VFS::Path::Normalized getLODMeshNameImpl(VFS::Path::NormalizedView resPath, std::string_view pattern)
     {
-        if (auto w = Misc::findExtension(resPath); w != std::string::npos)
-            resPath.insert(w, pattern);
-        return VFS::Path::normalizeFilename(resPath);
+        const std::string_view::size_type position = Misc::findExtension(resPath.value());
+        if (position == std::string::npos)
+            return VFS::Path::Normalized(resPath);
+        std::string withPattern(resPath.value());
+        withPattern.insert(position, pattern);
+        return VFS::Path::Normalized(std::move(withPattern));
     }
 
-    std::string getBestLODMeshName(std::string const& resPath, const VFS::Manager* vfs, std::string_view pattern)
+    VFS::Path::Normalized getBestLODMeshName(
+        VFS::Path::NormalizedView resPath, const VFS::Manager& vfs, std::string_view pattern)
     {
-        if (const auto& result = getLODMeshNameImpl(resPath, vfs, pattern); vfs->exists(result))
+        if (VFS::Path::Normalized result = getLODMeshNameImpl(resPath, pattern); vfs.exists(result))
             return result;
-        return resPath;
+        return VFS::Path::Normalized(resPath);
     }
-}
 
-std::string Misc::ResourceHelpers::getLODMeshName(
-    int esmVersion, std::string resPath, const VFS::Manager* vfs, unsigned char lod)
-{
-    const std::string distantMeshPattern = [&esmVersion] {
+    std::string_view getDistantMeshPattern(int esmVersion)
+    {
+        static constexpr std::string_view dist = "_dist";
+        static constexpr std::string_view far = "_far";
+        static constexpr std::string_view lod = "_lod";
+
         switch (esmVersion)
         {
             case ESM::VER_120:
             case ESM::VER_130:
-                return "_dist";
+                return dist;
             case ESM::VER_080:
             case ESM::VER_100:
-                return "_far";
+                return far;
             case ESM::VER_094:
             case ESM::VER_170:
-                return "_lod";
+                return lod;
             default:
-                return "";
+                return std::string_view();
         }
-    }();
+    }
+}
+
+VFS::Path::Normalized Misc::ResourceHelpers::getLODMeshName(
+    int esmVersion, VFS::Path::NormalizedView resPath, const VFS::Manager& vfs, unsigned char lod)
+{
+    const std::string_view distantMeshPattern = getDistantMeshPattern(esmVersion);
     for (int l = lod; l >= 0; --l)
     {
         std::stringstream patern;
         patern << distantMeshPattern << "_" << l;
-        std::string const meshName = getBestLODMeshName(resPath, vfs, patern.str());
+        const VFS::Path::Normalized meshName = getBestLODMeshName(resPath, vfs, patern.view());
         if (meshName != resPath)
             return meshName;
     }
diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp
index 0597c7bc16..9aaa89a861 100644
--- a/components/misc/resourcehelpers.hpp
+++ b/components/misc/resourcehelpers.hpp
@@ -1,6 +1,9 @@
 #ifndef MISC_RESOURCEHELPERS_H
 #define MISC_RESOURCEHELPERS_H
 
+#include <components/vfs/pathutil.hpp>
+
+#include <span>
 #include <string>
 #include <string_view>
 
@@ -23,29 +26,35 @@ namespace Misc
     {
         bool changeExtensionToDds(std::string& path);
         std::string correctResourcePath(
-            std::string_view topLevelDirectory, std::string_view resPath, const VFS::Manager* vfs);
+            std::span<const std::string_view> topLevelDirectories, std::string_view resPath, const VFS::Manager* vfs);
         std::string correctTexturePath(std::string_view resPath, const VFS::Manager* vfs);
         std::string correctIconPath(std::string_view resPath, const VFS::Manager* vfs);
         std::string correctBookartPath(std::string_view resPath, const VFS::Manager* vfs);
         std::string correctBookartPath(std::string_view resPath, int width, int height, const VFS::Manager* vfs);
         /// Use "xfoo.nif" instead of "foo.nif" if "xfoo.kf" is available
         /// Note that if "xfoo.nif" is actually unavailable, we can't fall back to "foo.nif". :(
-        std::string correctActorModelPath(const std::string& resPath, const VFS::Manager* vfs);
+        VFS::Path::Normalized correctActorModelPath(VFS::Path::NormalizedView resPath, const VFS::Manager* vfs);
+        std::string correctMaterialPath(std::string_view resPath, const VFS::Manager* vfs);
 
-        // Adds "meshes\\".
-        std::string correctMeshPath(const std::string& resPath, const VFS::Manager* vfs);
+        // Prepends "meshes/".
+        VFS::Path::Normalized correctMeshPath(VFS::Path::NormalizedView resPath);
 
-        // Adds "sound\\".
-        std::string correctSoundPath(const std::string& resPath);
+        // Prepends "sound/".
+        VFS::Path::Normalized correctSoundPath(VFS::Path::NormalizedView resPath);
+
+        // Prepends "music/".
+        VFS::Path::Normalized correctMusicPath(VFS::Path::NormalizedView resPath);
 
         // Removes "meshes\\".
         std::string_view meshPathForESM3(std::string_view resPath);
 
-        std::string correctSoundPath(std::string_view resPath, const VFS::Manager* vfs);
+        VFS::Path::Normalized correctSoundPath(VFS::Path::NormalizedView resPath, const VFS::Manager& vfs);
 
         /// marker objects that have a hardcoded function in the game logic, should be hidden from the player
         bool isHiddenMarker(const ESM::RefId& id);
-        std::string getLODMeshName(int esmVersion, std::string resPath, const VFS::Manager* vfs, unsigned char lod = 0);
+
+        VFS::Path::Normalized getLODMeshName(
+            int esmVersion, VFS::Path::NormalizedView resPath, const VFS::Manager& vfs, unsigned char lod = 0);
     }
 }
 
diff --git a/components/misc/scalableicon.cpp b/components/misc/scalableicon.cpp
new file mode 100644
index 0000000000..b3f4304557
--- /dev/null
+++ b/components/misc/scalableicon.cpp
@@ -0,0 +1,110 @@
+#include "scalableicon.hpp"
+
+#include <QApplication>
+#include <QDataStream>
+#include <QDebug>
+#include <QDir>
+#include <QFont>
+#include <QIODevice>
+#include <QIconEngine>
+#include <QPainter>
+#include <QPalette>
+#include <QtSvg/QSvgRenderer>
+
+namespace Misc
+{
+    Q_GLOBAL_STATIC(QSet<ScalableIcon*>, ScalableIconInstances)
+
+    ScalableIcon::ScalableIcon(const QByteArray& svgContent)
+        : mTemplate(svgContent)
+    {
+        update();
+        ScalableIconInstances->insert(this);
+    }
+
+    ScalableIcon::~ScalableIcon()
+    {
+        if (!ScalableIconInstances.isDestroyed())
+        {
+            ScalableIconInstances->remove(this);
+        }
+    }
+
+    QIcon Misc::ScalableIcon::load(const QString& fileName)
+    {
+        if (fileName.isEmpty())
+            return QIcon();
+
+        QFile iconFile(fileName);
+        if (!iconFile.open(QIODevice::ReadOnly))
+        {
+            qDebug() << "Failed to open icon file:" << fileName;
+            return QIcon();
+        }
+
+        auto content = iconFile.readAll();
+        if (!content.startsWith("<?xml"))
+            return QIcon(fileName);
+
+        return QIcon(new ScalableIcon(content));
+    }
+
+    void ScalableIcon::update()
+    {
+        constexpr const char* templateColor = "#4d4d4d";
+        mContent = mTemplate;
+
+        auto themeColor = QApplication::palette().text().color().name().toLower().toLatin1();
+        mContent.replace(templateColor, themeColor);
+    }
+
+    void ScalableIcon::updateAllIcons()
+    {
+        for (auto engine : *ScalableIconInstances)
+        {
+            engine->update();
+        }
+    }
+
+    void ScalableIcon::paint(QPainter* painter, const QRect& rect, QIcon::Mode mode, QIcon::State state)
+    {
+        Q_UNUSED(mode);
+        Q_UNUSED(state);
+
+        QSvgRenderer renderer(mContent);
+        renderer.render(painter, rect);
+    }
+
+    QIconEngine* ScalableIcon::clone() const
+    {
+        return new ScalableIcon(*this);
+    }
+
+    QPixmap ScalableIcon::pixmap(const QSize& size, QIcon::Mode mode, QIcon::State state)
+    {
+        QPixmap pix = QPixmap(size);
+        pix.fill(Qt::transparent);
+
+        QPainter painter(&pix);
+        QRect r(QPoint(0.0, 0.0), size);
+        this->paint(&painter, r, mode, state);
+
+        if (mode != QIcon::Disabled)
+            return pix;
+
+        // For disabled icons use grayscale icons with 50% transparency
+        QImage img = pix.toImage();
+
+        for (int x = 0; x < img.width(); x++)
+        {
+            for (int y = 0; y < img.height(); y++)
+            {
+                QColor n = img.pixelColor(x, y);
+                int gray = qGray(n.red(), n.green(), n.blue());
+                img.setPixelColor(x, y, QColor(gray, gray, gray, n.alpha() / 2));
+            }
+        }
+
+        return QPixmap::fromImage(img, Qt::NoFormatConversion);
+    }
+}
diff --git a/components/misc/scalableicon.hpp b/components/misc/scalableicon.hpp
new file mode 100644
index 0000000000..06cac9e39d
--- /dev/null
+++ b/components/misc/scalableicon.hpp
@@ -0,0 +1,36 @@
+#ifndef SCALABLEICON_HPP
+#define SCALABLEICON_HPP
+
+#include <QIconEngine>
+#include <QProcess>
+#include <QString>
+#include <QStringList>
+
+namespace Misc
+{
+    class ScalableIcon : public QIconEngine
+    {
+    public:
+        QIconEngine* clone() const override;
+
+        QPixmap pixmap(const QSize& size, QIcon::Mode mode, QIcon::State state) override;
+
+        void paint(QPainter* painter, const QRect& rect, QIcon::Mode mode, QIcon::State state) override;
+
+        static void updateAllIcons();
+
+        virtual ~ScalableIcon();
+
+        static QIcon load(const QString& fileName);
+
+    private:
+        explicit ScalableIcon(const QByteArray& svgContent);
+
+        void update();
+
+        QByteArray mTemplate;
+        QByteArray mContent;
+    };
+}
+
+#endif // SCALABLEICON_HPP
diff --git a/components/misc/strings/algorithm.hpp b/components/misc/strings/algorithm.hpp
index f34801b8d3..18f72104bd 100644
--- a/components/misc/strings/algorithm.hpp
+++ b/components/misc/strings/algorithm.hpp
@@ -15,6 +15,13 @@ namespace Misc::StringUtils
         bool operator()(char x, char y) const { return toLower(x) < toLower(y); }
     };
 
+    inline std::string underscoresToSpaces(const std::string_view oldName)
+    {
+        std::string newName(oldName);
+        std::replace(newName.begin(), newName.end(), '_', ' ');
+        return newName;
+    }
+
     inline bool ciLess(std::string_view x, std::string_view y)
     {
         return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), CiCharLess());
@@ -99,6 +106,13 @@ namespace Misc::StringUtils
         bool operator()(std::string_view left, std::string_view right) const { return ciLess(left, right); }
     };
 
+    struct StringHash
+    {
+        using is_transparent = void;
+        [[nodiscard]] size_t operator()(std::string_view sv) const { return std::hash<std::string_view>{}(sv); }
+        [[nodiscard]] size_t operator()(const std::string& s) const { return std::hash<std::string>{}(s); }
+    };
+
     /** @brief Replaces all occurrences of a string in another string.
      *
      * @param str The string to operate on.
diff --git a/components/misc/thread.cpp b/components/misc/thread.cpp
index 7ac17d46d2..cece5ccbea 100644
--- a/components/misc/thread.cpp
+++ b/components/misc/thread.cpp
@@ -26,7 +26,7 @@ namespace Misc
 
 #elif defined(WIN32)
 
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 
 namespace Misc
 {
diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp
index 271376834d..5eb5f99b84 100644
--- a/components/misc/utf8stream.hpp
+++ b/components/misc/utf8stream.hpp
@@ -75,7 +75,7 @@ public:
             return std::make_pair(chr, cur);
         }
 
-        int octets;
+        std::size_t octets;
         UnicodeChar chr;
 
         std::tie(octets, chr) = getOctetCount(*cur++);
diff --git a/components/windows.hpp b/components/misc/windows.hpp
similarity index 100%
rename from components/windows.hpp
rename to components/misc/windows.hpp
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 8e34e0c2fe..49dba3634b 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -58,22 +58,17 @@ namespace osgMyGUI
         throw std::runtime_error("DataManager::getDataListNames is not implemented - VFS is used");
     }
 
-    const std::string& DataManager::getDataPath(const std::string& name) const
+    std::string DataManager::getDataPath(const std::string& name) const
     {
-        static std::string result;
-        result.clear();
-
         if (name.empty())
         {
-            result = Files::pathToUnicodeString(mResourcePath);
-            return result;
+            return Files::pathToUnicodeString(mResourcePath);
         }
 
         if (!isDataExist(name))
-            return result;
+            return {};
 
-        result = Files::pathToUnicodeString(mResourcePath / name);
-        return result;
+        return Files::pathToUnicodeString(mResourcePath / name);
     }
 
 }
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index 40dc6c3705..5b392177b7 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -45,7 +45,7 @@ namespace osgMyGUI
             @param _name Resource name.
             @return Return full path to specified data.
         */
-        const std::string& getDataPath(const std::string& _name) const override;
+        std::string getDataPath(const std::string& _name) const override;
 
     private:
         std::filesystem::path mResourcePath;
diff --git a/components/myguiplatform/myguiloglistener.cpp b/components/myguiplatform/myguiloglistener.cpp
index 42dc9c0415..3e52e75ad2 100644
--- a/components/myguiplatform/myguiloglistener.cpp
+++ b/components/myguiplatform/myguiloglistener.cpp
@@ -25,12 +25,12 @@ namespace osgMyGUI
             mStream.flush();
     }
 
-    void CustomLogListener::log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time,
-        const std::string& _message, const char* _file, int _line)
+    void CustomLogListener::log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time,
+        std::string_view _message, std::string_view _file, int _line)
     {
         if (mStream.is_open())
         {
-            const char* separator = "  |  ";
+            std::string_view separator = "  |  ";
             mStream << std::setw(2) << std::setfill('0') << _time->tm_hour << ":" << std::setw(2) << std::setfill('0')
                     << _time->tm_min << ":" << std::setw(2) << std::setfill('0') << _time->tm_sec << separator
                     << _section << separator << _level.print() << separator << _message << separator << _file
@@ -40,7 +40,7 @@ namespace osgMyGUI
 
     MyGUI::LogLevel LogFacility::getCurrentLogLevel() const
     {
-        switch (Debug::CurrentDebugLevel)
+        switch (Log::sMinDebugLevel)
         {
             case Debug::Error:
                 return MyGUI::LogLevel::Error;
diff --git a/components/myguiplatform/myguiloglistener.hpp b/components/myguiplatform/myguiloglistener.hpp
index 1af63a397f..15cea0effd 100644
--- a/components/myguiplatform/myguiloglistener.hpp
+++ b/components/myguiplatform/myguiloglistener.hpp
@@ -30,8 +30,8 @@ namespace osgMyGUI
         void close() override;
         void flush() override;
 
-        void log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time,
-            const std::string& _message, const char* _file, int _line) override;
+        void log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message,
+            std::string_view _file, int _line) override;
 
     private:
         std::ofstream mStream;
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index 9a53b06c06..7f1582203a 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -66,31 +66,19 @@ namespace osgMyGUI
 
         void enableShaders(Shader::ShaderManager& shaderManager);
 
-        void setScalingFactor(float factor);
-
         static RenderManager& getInstance() { return *getInstancePtr(); }
         static RenderManager* getInstancePtr()
         {
             return static_cast<RenderManager*>(MyGUI::RenderManager::getInstancePtr());
         }
 
-        bool checkTexture(MyGUI::ITexture* _texture)
-#if MYGUI_DEBUG_MODE == 1 /* needed workaround for MyGUI 3.4.2 */
-            override
-#endif
-            ;
+        bool checkTexture(MyGUI::ITexture* _texture) override;
 
         /** @see RenderManager::getViewSize */
-        const MyGUI::IntSize& getViewSize() const override
-        {
-            return mViewSize;
-        }
+        const MyGUI::IntSize& getViewSize() const override { return mViewSize; }
 
         /** @see RenderManager::getVertexFormat */
-        MyGUI::VertexColourType getVertexFormat() const override
-        {
-            return mVertexFormat;
-        }
+        MyGUI::VertexColourType getVertexFormat() const override { return mVertexFormat; }
 
         /** @see RenderManager::isFormatSupported */
         bool isFormatSupported(MyGUI::PixelFormat format, MyGUI::TextureUsage usage) override;
@@ -123,10 +111,7 @@ namespace osgMyGUI
         void setInjectState(osg::StateSet* stateSet);
 
         /** @see IRenderTarget::getInfo */
-        const MyGUI::RenderTargetInfo& getInfo() const override
-        {
-            return mInfo;
-        }
+        const MyGUI::RenderTargetInfo& getInfo() const override { return mInfo; }
 
         void setViewSize(int width, int height) override;
 
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 26127cf39a..9d865e1296 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -95,7 +95,7 @@ namespace osgMyGUI
         if (!mImageManager)
             throw std::runtime_error("No imagemanager set");
 
-        osg::ref_ptr<osg::Image> image(mImageManager->getImage(fname));
+        osg::ref_ptr<osg::Image> image(mImageManager->getImage(VFS::Path::Normalized(fname)));
         mTexture = new osg::Texture2D(image);
         mTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
diff --git a/components/myguiplatform/scalinglayer.cpp b/components/myguiplatform/scalinglayer.cpp
index fbd2f594c7..c04134bfad 100644
--- a/components/myguiplatform/scalinglayer.cpp
+++ b/components/myguiplatform/scalinglayer.cpp
@@ -123,8 +123,8 @@ namespace osgMyGUI
         {
             if (info->getName() == "Property")
             {
-                const std::string& key = info->findAttribute("key");
-                const std::string& value = info->findAttribute("value");
+                auto key = info->findAttribute("key");
+                auto value = info->findAttribute("value");
 
                 if (key == "Size")
                 {
diff --git a/components/nif/base.cpp b/components/nif/base.cpp
index ed440cd96d..ee5851bda6 100644
--- a/components/nif/base.cpp
+++ b/components/nif/base.cpp
@@ -5,28 +5,36 @@ namespace Nif
     void Extra::read(NIFStream* nif)
     {
         if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
-            name = nif->getString();
+            nif->read(mName);
         else if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
         {
-            next.read(nif);
-            recordSize = nif->getUInt();
+            mNext.read(nif);
+            nif->read(mRecordSize);
         }
     }
 
-    void Named::read(NIFStream* nif)
+    void NiObjectNET::read(NIFStream* nif)
     {
-        name = nif->getString();
+        nif->read(mName);
         if (nif->getVersion() < NIFStream::generateVersion(10, 0, 1, 0))
-            extra.read(nif);
+            mExtra.read(nif);
         else
-            readRecordList(nif, extralist);
-        controller.read(nif);
+            readRecordList(nif, mExtraList);
+        mController.read(nif);
     }
 
-    void Named::post(Reader& nif)
+    void NiObjectNET::post(Reader& nif)
     {
-        extra.post(nif);
-        postRecordList(nif, extralist);
-        controller.post(nif);
+        mExtra.post(nif);
+        postRecordList(nif, mExtraList);
+        mController.post(nif);
+    }
+
+    ExtraList NiObjectNET::getExtraList() const
+    {
+        ExtraList list = mExtraList;
+        for (ExtraPtr extra = mExtra; !extra.empty(); extra = extra->mNext)
+            list.emplace_back(extra);
+        return list;
     }
 }
diff --git a/components/nif/base.hpp b/components/nif/base.hpp
index 2cdbdec77f..ae4bda7753 100644
--- a/components/nif/base.hpp
+++ b/components/nif/base.hpp
@@ -13,15 +13,15 @@ namespace Nif
     // An extra data record. All the extra data connected to an object form a linked list.
     struct Extra : public Record
     {
-        std::string name;
-        ExtraPtr next; // Next extra data record in the list
-        unsigned int recordSize{ 0u };
+        std::string mName;
+        ExtraPtr mNext; // Next extra data record in the list
+        uint32_t mRecordSize{ 0u };
 
         void read(NIFStream* nif) override;
-        void post(Reader& nif) override { next.post(nif); }
+        void post(Reader& nif) override { mNext.post(nif); }
     };
 
-    struct Controller : public Record
+    struct NiTimeController : public Record
     {
         enum Flags
         {
@@ -36,31 +36,33 @@ namespace Nif
             Mask = 6
         };
 
-        ControllerPtr next;
-        int flags;
-        float frequency, phase;
-        float timeStart, timeStop;
-        NamedPtr target;
+        NiTimeControllerPtr mNext;
+        uint16_t mFlags;
+        float mFrequency, mPhase;
+        float mTimeStart, mTimeStop;
+        NiObjectNETPtr mTarget;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
 
-        bool isActive() const { return flags & Flag_Active; }
-        ExtrapolationMode extrapolationMode() const { return static_cast<ExtrapolationMode>(flags & Mask); }
+        bool isActive() const { return mFlags & Flag_Active; }
+        ExtrapolationMode extrapolationMode() const { return static_cast<ExtrapolationMode>(mFlags & Mask); }
     };
 
-    /// Has name, extra-data and controller
-    struct Named : public Record
+    /// Abstract object that has a name, extra data and controllers
+    struct NiObjectNET : public Record
     {
-        std::string name;
-        ExtraPtr extra;
-        ExtraList extralist;
-        ControllerPtr controller;
+        std::string mName;
+        ExtraPtr mExtra;
+        ExtraList mExtraList;
+        NiTimeControllerPtr mController;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
-    };
-    using NiSequenceStreamHelper = Named;
 
-} // Namespace
+        // Collect extra records attached to the object
+        ExtraList getExtraList() const;
+    };
+
+}
 #endif
diff --git a/components/nif/controlled.cpp b/components/nif/controlled.cpp
deleted file mode 100644
index bacba07d5f..0000000000
--- a/components/nif/controlled.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#include "controlled.hpp"
-
-#include "data.hpp"
-
-namespace Nif
-{
-
-    void NiSourceTexture::read(NIFStream* nif)
-    {
-        Named::read(nif);
-
-        external = nif->getChar() != 0;
-        bool internal = false;
-        if (external)
-            filename = nif->getString();
-        else
-        {
-            if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 3))
-                internal = nif->getChar();
-            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-                filename = nif->getString(); // Original file path of the internal texture
-        }
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 3))
-        {
-            if (!external && internal)
-                data.read(nif);
-        }
-        else
-        {
-            data.read(nif);
-        }
-
-        pixel = nif->getUInt();
-        mipmap = nif->getUInt();
-        alpha = nif->getUInt();
-
-        // Renderer hints, typically of no use for us
-        /* bool mIsStatic = */ nif->getChar();
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 103))
-            /* bool mDirectRendering = */ nif->getBoolean();
-        if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 4))
-            /* bool mPersistRenderData = */ nif->getBoolean();
-    }
-
-    void NiSourceTexture::post(Reader& nif)
-    {
-        Named::post(nif);
-        data.post(nif);
-    }
-
-    void BSShaderTextureSet::read(NIFStream* nif)
-    {
-        nif->getSizedStrings(textures, nif->getUInt());
-    }
-
-    void NiParticleModifier::read(NIFStream* nif)
-    {
-        next.read(nif);
-        controller.read(nif);
-    }
-
-    void NiParticleModifier::post(Reader& nif)
-    {
-        next.post(nif);
-        controller.post(nif);
-    }
-
-    void NiParticleGrowFade::read(NIFStream* nif)
-    {
-        NiParticleModifier::read(nif);
-        growTime = nif->getFloat();
-        fadeTime = nif->getFloat();
-    }
-
-    void NiParticleColorModifier::read(NIFStream* nif)
-    {
-        NiParticleModifier::read(nif);
-        data.read(nif);
-    }
-
-    void NiParticleColorModifier::post(Reader& nif)
-    {
-        NiParticleModifier::post(nif);
-        data.post(nif);
-    }
-
-    void NiGravity::read(NIFStream* nif)
-    {
-        NiParticleModifier::read(nif);
-
-        mDecay = nif->getFloat();
-        mForce = nif->getFloat();
-        mType = nif->getUInt();
-        mPosition = nif->getVector3();
-        mDirection = nif->getVector3();
-    }
-
-    void NiParticleCollider::read(NIFStream* nif)
-    {
-        NiParticleModifier::read(nif);
-
-        mBounceFactor = nif->getFloat();
-        if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 0, 2))
-        {
-            // Unused in NifSkope. Need to figure out what these do.
-            /*bool mSpawnOnCollision = */ nif->getBoolean();
-            /*bool mDieOnCollision = */ nif->getBoolean();
-        }
-    }
-
-    void NiPlanarCollider::read(NIFStream* nif)
-    {
-        NiParticleCollider::read(nif);
-
-        mExtents = nif->getVector2();
-        mPosition = nif->getVector3();
-        mXVector = nif->getVector3();
-        mYVector = nif->getVector3();
-        mPlaneNormal = nif->getVector3();
-        mPlaneDistance = nif->getFloat();
-    }
-
-    void NiParticleRotation::read(NIFStream* nif)
-    {
-        NiParticleModifier::read(nif);
-
-        /* bool mRandomInitialAxis = */ nif->getChar();
-        /* osg::Vec3f mInitialAxis = */ nif->getVector3();
-        /* float mRotationSpeed = */ nif->getFloat();
-    }
-
-    void NiSphericalCollider::read(NIFStream* nif)
-    {
-        NiParticleCollider::read(nif);
-
-        mRadius = nif->getFloat();
-        mCenter = nif->getVector3();
-    }
-
-}
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
deleted file mode 100644
index 09bab3cbfd..0000000000
--- a/components/nif/controlled.hpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-  OpenMW - The completely unofficial reimplementation of Morrowind
-  Copyright (C) 2008-2010  Nicolay Korslund
-  Email: < korslund@gmail.com >
-  WWW: https://openmw.org/
-
-  This file (controlled.h) is part of the OpenMW package.
-
-  OpenMW is distributed as free software: you can redistribute it
-  and/or modify it under the terms of the GNU General Public License
-  version 3, as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  version 3 along with this program. If not, see
-  https://www.gnu.org/licenses/ .
-
- */
-
-#ifndef OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
-#define OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
-
-#include "base.hpp"
-
-namespace Nif
-{
-
-    struct NiSourceTexture : public Named
-    {
-        // Is this an external (references a separate texture file) or
-        // internal (data is inside the nif itself) texture?
-        bool external;
-
-        std::string filename; // In case of external textures
-        NiPixelDataPtr data; // In case of internal textures
-
-        /* Pixel layout
-            0 - Palettised
-            1 - High color 16
-            2 - True color 32
-            3 - Compressed
-            4 - Bumpmap
-            5 - Default */
-        unsigned int pixel;
-
-        /* Mipmap format
-            0 - no
-            1 - yes
-            2 - default */
-        unsigned int mipmap;
-
-        /* Alpha
-            0 - none
-            1 - binary
-            2 - smooth
-            3 - default (use material alpha, or multiply material with texture if present)
-        */
-        unsigned int alpha;
-
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
-    };
-
-    struct BSShaderTextureSet : public Record
-    {
-        enum TextureType
-        {
-            TextureType_Base = 0,
-            TextureType_Normal = 1,
-            TextureType_Glow = 2,
-            TextureType_Parallax = 3,
-            TextureType_Env = 4,
-            TextureType_EnvMask = 5,
-            TextureType_Subsurface = 6,
-            TextureType_BackLighting = 7
-        };
-        std::vector<std::string> textures;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiParticleModifier : public Record
-    {
-        NiParticleModifierPtr next;
-        ControllerPtr controller;
-
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
-    };
-
-    struct NiParticleGrowFade : public NiParticleModifier
-    {
-        float growTime;
-        float fadeTime;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiParticleColorModifier : public NiParticleModifier
-    {
-        NiColorDataPtr data;
-
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
-    };
-
-    struct NiGravity : public NiParticleModifier
-    {
-        float mForce;
-        /* 0 - Wind (fixed direction)
-         * 1 - Point (fixed origin)
-         */
-        int mType;
-        float mDecay;
-        osg::Vec3f mPosition;
-        osg::Vec3f mDirection;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiParticleCollider : public NiParticleModifier
-    {
-        float mBounceFactor;
-        void read(NIFStream* nif) override;
-    };
-
-    // NiPinaColada
-    struct NiPlanarCollider : public NiParticleCollider
-    {
-        osg::Vec2f mExtents;
-        osg::Vec3f mPosition;
-        osg::Vec3f mXVector, mYVector;
-        osg::Vec3f mPlaneNormal;
-        float mPlaneDistance;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiSphericalCollider : public NiParticleCollider
-    {
-        float mRadius;
-        osg::Vec3f mCenter;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiParticleRotation : public NiParticleModifier
-    {
-        void read(NIFStream* nif) override;
-    };
-
-} // Namespace
-#endif
diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
index 9e93b31162..7e9b6b917e 100644
--- a/components/nif/controller.cpp
+++ b/components/nif/controller.cpp
@@ -1,32 +1,30 @@
 #include "controller.hpp"
 
-#include "controlled.hpp"
 #include "data.hpp"
+#include "exception.hpp"
 #include "node.hpp"
-#include "recordptr.hpp"
+#include "particle.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
 
-    void Controller::read(NIFStream* nif)
+    void NiTimeController::read(NIFStream* nif)
     {
-        next.read(nif);
-
-        flags = nif->getUShort();
-
-        frequency = nif->getFloat();
-        phase = nif->getFloat();
-        timeStart = nif->getFloat();
-        timeStop = nif->getFloat();
-
-        target.read(nif);
+        mNext.read(nif);
+        nif->read(mFlags);
+        nif->read(mFrequency);
+        nif->read(mPhase);
+        nif->read(mTimeStart);
+        nif->read(mTimeStop);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+            mTarget.read(nif);
     }
 
-    void Controller::post(Reader& nif)
+    void NiTimeController::post(Reader& nif)
     {
-        Record::post(nif);
-        next.post(nif);
-        target.post(nif);
+        mNext.post(nif);
+        mTarget.post(nif);
     }
 
     void ControlledBlock::read(NIFStream* nif)
@@ -44,28 +42,28 @@ namespace Nif
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 110))
         {
             mBlendInterpolator.read(nif);
-            mBlendIndex = nif->getUShort();
+            nif->read(mBlendIndex);
         }
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106) && nif->getBethVersion() > 0)
-            mPriority = nif->getChar();
+            nif->read(mPriority);
 
         if (nif->getVersion() >= NIFStream::generateVersion(10, 2, 0, 0)
             && nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 0))
         {
             mStringPalette.read(nif);
-            mNodeNameOffset = nif->getUInt();
-            mPropertyTypeOffset = nif->getUInt();
-            mControllerTypeOffset = nif->getUInt();
-            mControllerIdOffset = nif->getUInt();
-            mInterpolatorIdOffset = nif->getUInt();
+            nif->read(mNodeNameOffset);
+            nif->read(mPropertyTypeOffset);
+            nif->read(mControllerTypeOffset);
+            nif->read(mControllerIdOffset);
+            nif->read(mInterpolatorIdOffset);
         }
         else
         {
-            mNodeName = nif->getString();
-            mPropertyType = nif->getString();
-            mControllerType = nif->getString();
-            mControllerId = nif->getString();
-            mInterpolatorId = nif->getString();
+            nif->read(mNodeName);
+            nif->read(mPropertyType);
+            nif->read(mControllerType);
+            nif->read(mControllerId);
+            nif->read(mInterpolatorId);
         }
     }
 
@@ -80,16 +78,15 @@ namespace Nif
 
     void NiSequence::read(NIFStream* nif)
     {
-        mName = nif->getString();
+        nif->read(mName);
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
         {
-            mAccumRootName = nif->getString();
+            nif->read(mAccumRootName);
             mTextKeys.read(nif);
         }
-        size_t numControlledBlocks = nif->getUInt();
+        mControlledBlocks.resize(nif->get<uint32_t>());
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106))
-            mArrayGrowBy = nif->getUInt();
-        mControlledBlocks.resize(numControlledBlocks);
+            nif->read(mArrayGrowBy);
         for (ControlledBlock& block : mControlledBlocks)
             block.read(nif);
     }
@@ -104,51 +101,58 @@ namespace Nif
     void NiControllerSequence::read(NIFStream* nif)
     {
         NiSequence::read(nif);
+
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             return;
 
-        mWeight = nif->getFloat();
+        nif->read(mWeight);
         mTextKeys.read(nif);
-        mExtrapolationMode = static_cast<Controller::ExtrapolationMode>(nif->getUInt());
-        mFrequency = nif->getFloat();
+        mExtrapolationMode = static_cast<NiTimeController::ExtrapolationMode>(nif->get<uint32_t>());
+        nif->read(mFrequency);
         if (nif->getVersion() <= NIFStream::generateVersion(10, 4, 0, 1))
-            mPhase = nif->getFloat();
-        mStartTime = nif->getFloat();
-        mStopTime = nif->getFloat();
-        mPlayBackwards = nif->getVersion() == NIFStream::generateVersion(10, 1, 0, 106) && nif->getBoolean();
+            nif->read(mPhase);
+        nif->read(mStartTime);
+        nif->read(mStopTime);
+        if (nif->getVersion() == NIFStream::generateVersion(10, 1, 0, 106))
+            nif->read(mPlayBackwards);
         mManager.read(nif);
-        mAccumRootName = nif->getString();
+        nif->read(mAccumRootName);
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 113)
             && nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 0))
             mStringPalette.read(nif);
         else if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() >= 24)
         {
-            size_t numAnimNotes = 1;
             if (nif->getBethVersion() >= 29)
-                numAnimNotes = nif->getUShort();
+                mAnimNotesList.resize(nif->get<uint16_t>());
+            else
+                mAnimNotesList.resize(1);
 
-            nif->skip(4 * numAnimNotes); // BSAnimNotes links
+            for (auto& notes : mAnimNotesList)
+                notes.read(nif);
         }
     }
 
     void NiControllerSequence::post(Reader& nif)
     {
         NiSequence::post(nif);
+
         mManager.post(nif);
         mStringPalette.post(nif);
     }
 
     void NiInterpController::read(NIFStream* nif)
     {
-        Controller::read(nif);
+        NiTimeController::read(nif);
+
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104)
             && nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 108))
-            mManagerControlled = nif->getBoolean();
+            nif->read(mManagerControlled);
     }
 
     void NiSingleInterpController::read(NIFStream* nif)
     {
         NiInterpController::read(nif);
+
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104))
             mInterpolator.read(nif);
     }
@@ -156,83 +160,106 @@ namespace Nif
     void NiSingleInterpController::post(Reader& nif)
     {
         NiInterpController::post(nif);
+
         mInterpolator.post(nif);
     }
 
+    void NiParticleInfo::read(NIFStream* nif)
+    {
+        nif->read(mVelocity);
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 4, 0, 1))
+            nif->read(mRotationAxis);
+        nif->read(mAge);
+        nif->read(mLifespan);
+        nif->read(mLastUpdate);
+        nif->read(mSpawnGeneration);
+        nif->read(mCode);
+    }
+
     void NiParticleSystemController::read(NIFStream* nif)
     {
-        Controller::read(nif);
+        NiTimeController::read(nif);
 
-        velocity = nif->getFloat();
-        velocityRandom = nif->getFloat();
-        verticalDir = nif->getFloat();
-        verticalAngle = nif->getFloat();
-        horizontalDir = nif->getFloat();
-        horizontalAngle = nif->getFloat();
-        /*normal?*/ nif->getVector3();
-        color = nif->getVector4();
-        size = nif->getFloat();
-        startTime = nif->getFloat();
-        stopTime = nif->getFloat();
-        nif->getChar();
-        emitRate = nif->getFloat();
-        lifetime = nif->getFloat();
-        lifetimeRandom = nif->getFloat();
-
-        emitFlags = nif->getUShort();
-        offsetRandom = nif->getVector3();
-
-        emitter.read(nif);
-
-        /* Unknown Short, 0?
-         * Unknown Float, 1.0?
-         * Unknown Int, 1?
-         * Unknown Int, 0?
-         * Unknown Short, 0?
-         */
-        nif->skip(16);
-
-        numParticles = nif->getUShort();
-        activeCount = nif->getUShort();
-
-        particles.resize(numParticles);
-        for (size_t i = 0; i < particles.size(); i++)
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+            nif->read(mSpeed);
+        nif->read(mSpeedVariation);
+        nif->read(mDeclination);
+        nif->read(mDeclinationVariation);
+        nif->read(mPlanarAngle);
+        nif->read(mPlanarAngleVariation);
+        nif->read(mInitialNormal);
+        nif->read(mInitialColor);
+        nif->read(mInitialSize);
+        nif->read(mEmitStartTime);
+        nif->read(mEmitStopTime);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
         {
-            particles[i].velocity = nif->getVector3();
-            nif->getVector3(); /* unknown */
-            particles[i].lifetime = nif->getFloat();
-            particles[i].lifespan = nif->getFloat();
-            particles[i].timestamp = nif->getFloat();
-            nif->getUShort(); /* unknown */
-            particles[i].vertex = nif->getUShort();
+            mResetParticleSystem = nif->get<uint8_t>() != 0;
+            nif->read(mBirthRate);
         }
-
-        nif->getUInt(); /* -1? */
-        affectors.read(nif);
-        colliders.read(nif);
-        nif->getChar();
+        nif->read(mLifetime);
+        nif->read(mLifetimeVariation);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+            nif->read(mEmitFlags);
+        nif->read(mEmitterDimensions);
+        mEmitter.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+        {
+            nif->read(mNumSpawnGenerations);
+            nif->read(mPercentageSpawned);
+            nif->read(mSpawnMultiplier);
+            nif->read(mSpawnSpeedChaos);
+            nif->read(mSpawnDirChaos);
+            mParticles.resize(nif->get<uint16_t>());
+            nif->read(mNumValid);
+            for (NiParticleInfo& particle : mParticles)
+                particle.read(nif);
+            nif->skip(4); // NiEmitterModifier link
+        }
+        mModifier.read(nif);
+        mCollider.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 15))
+            nif->read(mStaticTargetBound);
     }
 
     void NiParticleSystemController::post(Reader& nif)
     {
-        Controller::post(nif);
-        emitter.post(nif);
-        affectors.post(nif);
-        colliders.post(nif);
+        NiTimeController::post(nif);
+
+        mEmitter.post(nif);
+        mModifier.post(nif);
+        mCollider.post(nif);
+    }
+
+    void NiLightColorController::read(NIFStream* nif)
+    {
+        NiPoint3InterpController::read(nif);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            mMode = static_cast<Mode>(nif->get<uint16_t>());
+        else
+            mMode = static_cast<Mode>((mFlags >> 4) & 1);
+
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
+            mData.read(nif);
+    }
+
+    void NiLightColorController::post(Reader& nif)
+    {
+        NiPoint3InterpController::post(nif);
+
+        mData.post(nif);
     }
 
     void NiMaterialColorController::read(NIFStream* nif)
     {
         NiPoint3InterpController::read(nif);
-        // Two bits that correspond to the controlled material color.
-        // 00: Ambient
-        // 01: Diffuse
-        // 10: Specular
-        // 11: Emissive
+
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            mTargetColor = nif->getUShort() & 3;
+            mTargetColor = static_cast<TargetColor>(nif->get<uint16_t>());
         else
-            mTargetColor = (flags >> 4) & 3;
+            mTargetColor = static_cast<TargetColor>((mFlags >> 4) & 3);
+
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
@@ -240,60 +267,70 @@ namespace Nif
     void NiMaterialColorController::post(Reader& nif)
     {
         NiPoint3InterpController::post(nif);
+
         mData.post(nif);
     }
 
     void NiLookAtController::read(NIFStream* nif)
     {
-        Controller::read(nif);
+        NiTimeController::read(nif);
+
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            lookAtFlags = nif->getUShort();
-        target.read(nif);
+            nif->read(mLookAtFlags);
+        mLookAt.read(nif);
     }
 
     void NiLookAtController::post(Reader& nif)
     {
-        Controller::post(nif);
-        target.post(nif);
+        NiTimeController::post(nif);
+
+        mLookAt.post(nif);
     }
 
     void NiPathController::read(NIFStream* nif)
     {
-        Controller::read(nif);
+        NiTimeController::read(nif);
 
-        bankDir = nif->getInt();
-        maxBankAngle = nif->getFloat();
-        smoothing = nif->getFloat();
-        followAxis = nif->getShort();
-        posData.read(nif);
-        floatData.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            nif->read(mPathFlags);
+        else
+            mPathFlags = (mFlags >> 4);
+
+        nif->read(mBankDirection);
+        nif->read(mMaxBankAngle);
+        nif->read(mSmoothing);
+        nif->read(mFollowAxis);
+        mPathData.read(nif);
+        mPercentData.read(nif);
     }
 
     void NiPathController::post(Reader& nif)
     {
-        Controller::post(nif);
+        NiTimeController::post(nif);
 
-        posData.post(nif);
-        floatData.post(nif);
+        mPathData.post(nif);
+        mPercentData.post(nif);
     }
 
     void NiUVController::read(NIFStream* nif)
     {
-        Controller::read(nif);
+        NiTimeController::read(nif);
 
-        uvSet = nif->getUShort();
-        data.read(nif);
+        nif->read(mUvSet);
+        mData.read(nif);
     }
 
     void NiUVController::post(Reader& nif)
     {
-        Controller::post(nif);
-        data.post(nif);
+        NiTimeController::post(nif);
+
+        mData.post(nif);
     }
 
     void NiKeyframeController::read(NIFStream* nif)
     {
         NiSingleInterpController::read(nif);
+
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
@@ -301,29 +338,30 @@ namespace Nif
     void NiKeyframeController::post(Reader& nif)
     {
         NiSingleInterpController::post(nif);
+
         mData.post(nif);
     }
 
     void NiMultiTargetTransformController::read(NIFStream* nif)
     {
         NiInterpController::read(nif);
-        size_t numTargets = nif->getUShort();
-        std::vector<NodePtr> targets;
-        targets.resize(numTargets);
-        for (size_t i = 0; i < targets.size(); i++)
-            targets[i].read(nif);
-        mExtraTargets = targets;
+
+        mExtraTargets.resize(nif->get<uint16_t>());
+        for (NiAVObjectPtr& extraTarget : mExtraTargets)
+            extraTarget.read(nif);
     }
 
     void NiMultiTargetTransformController::post(Reader& nif)
     {
         NiInterpController::post(nif);
+
         postRecordList(nif, mExtraTargets);
     }
 
     void NiAlphaController::read(NIFStream* nif)
     {
         NiFloatInterpController::read(nif);
+
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
@@ -331,12 +369,14 @@ namespace Nif
     void NiAlphaController::post(Reader& nif)
     {
         NiFloatInterpController::post(nif);
+
         mData.post(nif);
     }
 
     void NiRollController::read(NIFStream* nif)
     {
         NiSingleInterpController::read(nif);
+
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
@@ -344,49 +384,47 @@ namespace Nif
     void NiRollController::post(Reader& nif)
     {
         NiSingleInterpController::post(nif);
+
         mData.post(nif);
     }
 
     void NiGeomMorpherController::read(NIFStream* nif)
     {
         NiInterpController::read(nif);
+
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_OB_OLD)
-            mUpdateNormals = nif->getUShort() & 1;
+            mUpdateNormals = nif->get<uint16_t>() & 1;
         mData.read(nif);
-        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW)
+
+        if (nif->getVersion() < NIFFile::NIFVersion::VER_MW)
+            return;
+
+        mAlwaysActive = nif->get<uint8_t>() != 0;
+
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 105))
+            return;
+
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
         {
-            mAlwaysActive = nif->getChar();
-            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106))
-            {
-                if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-                {
-                    readRecordList(nif, mInterpolators);
-                    if (nif->getVersion() >= NIFStream::generateVersion(10, 2, 0, 0) && nif->getBethVersion() > 9)
-                    {
-                        unsigned int numUnknown = nif->getUInt();
-                        nif->skip(4 * numUnknown);
-                    }
-                }
-                else
-                {
-                    std::vector<NiInterpolatorPtr> interpolators;
-                    size_t numInterps = nif->getUInt();
-                    interpolators.resize(numInterps);
-                    mWeights.resize(numInterps);
-                    for (size_t i = 0; i < numInterps; i++)
-                    {
-                        interpolators[i].read(nif);
-                        mWeights[i] = nif->getFloat();
-                    }
-                    mInterpolators = interpolators;
-                }
-            }
+            readRecordList(nif, mInterpolators);
+            if (nif->getVersion() >= NIFStream::generateVersion(10, 2, 0, 0) && nif->getBethVersion() >= 10)
+                nif->skip(4 * nif->get<uint32_t>()); // Unknown
+            return;
+        }
+
+        mInterpolators.resize(nif->get<uint32_t>());
+        mWeights.resize(mInterpolators.size());
+        for (size_t i = 0; i < mInterpolators.size(); i++)
+        {
+            mInterpolators[i].read(nif);
+            nif->read(mWeights[i]);
         }
     }
 
     void NiGeomMorpherController::post(Reader& nif)
     {
         NiInterpController::post(nif);
+
         mData.post(nif);
         postRecordList(nif, mInterpolators);
     }
@@ -394,6 +432,7 @@ namespace Nif
     void NiVisController::read(NIFStream* nif)
     {
         NiBoolInterpController::read(nif);
+
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
     }
@@ -401,17 +440,19 @@ namespace Nif
     void NiVisController::post(Reader& nif)
     {
         NiBoolInterpController::post(nif);
+
         mData.post(nif);
     }
 
     void NiFlipController::read(NIFStream* nif)
     {
         NiFloatInterpController::read(nif);
-        mTexSlot = nif->getUInt();
+
+        mTexSlot = static_cast<NiTexturingProperty::TextureType>(nif->get<uint32_t>());
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
         {
-            timeStart = nif->getFloat();
-            mDelta = nif->getFloat();
+            nif->read(mTimeStart);
+            nif->read(mDelta);
         }
         readRecordList(nif, mSources);
     }
@@ -419,14 +460,16 @@ namespace Nif
     void NiFlipController::post(Reader& nif)
     {
         NiFloatInterpController::post(nif);
+
         postRecordList(nif, mSources);
     }
 
     void NiTextureTransformController::read(NIFStream* nif)
     {
         NiFloatInterpController::read(nif);
-        mShaderMap = nif->getBoolean();
-        nif->read(mTexSlot);
+
+        nif->read(mShaderMap);
+        mTexSlot = static_cast<NiTexturingProperty::TextureType>(nif->get<uint32_t>());
         nif->read(mTransformMember);
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
             mData.read(nif);
@@ -435,176 +478,317 @@ namespace Nif
     void NiTextureTransformController::post(Reader& nif)
     {
         NiFloatInterpController::post(nif);
+
         mData.post(nif);
     }
 
+    void NiBoneLODController::read(NIFStream* nif)
+    {
+        NiTimeController::read(nif);
+
+        nif->read(mLOD);
+        mNodeGroups.resize(nif->get<uint32_t>());
+        nif->read(mNumNodeGroups);
+        for (NiAVObjectList& group : mNodeGroups)
+            readRecordList(nif, group);
+
+        if (nif->getBethVersion() != 0 || nif->getVersion() < NIFStream::generateVersion(4, 2, 2, 0))
+            return;
+
+        mSkinnedShapeGroups.resize(nif->get<uint32_t>());
+        for (std::vector<SkinInfo>& group : mSkinnedShapeGroups)
+        {
+            group.resize(nif->get<uint32_t>());
+            for (SkinInfo& info : group)
+            {
+                info.mShape.read(nif);
+                info.mSkin.read(nif);
+            }
+        }
+        readRecordList(nif, mShapeGroups);
+    }
+
+    void NiBoneLODController::post(Reader& nif)
+    {
+        NiTimeController::post(nif);
+
+        for (NiAVObjectList& group : mNodeGroups)
+            postRecordList(nif, group);
+
+        for (std::vector<SkinInfo>& group : mSkinnedShapeGroups)
+        {
+            for (SkinInfo& info : group)
+            {
+                info.mShape.post(nif);
+                info.mSkin.post(nif);
+            }
+        }
+        postRecordList(nif, mShapeGroups);
+    }
+
     void bhkBlendController::read(NIFStream* nif)
     {
-        Controller::read(nif);
-        nif->getUInt(); // Zero
+        NiTimeController::read(nif);
+
+        uint32_t numKeys;
+        nif->read(numKeys);
+        // Is this possible?
+        if (numKeys != 0)
+            throw Nif::Exception(
+                "Unsupported keys in bhkBlendController " + std::to_string(recIndex), nif->getFile().getFilename());
     }
 
     void BSEffectShaderPropertyFloatController::read(NIFStream* nif)
     {
         NiFloatInterpController::read(nif);
+
         nif->read(mControlledVariable);
     }
 
     void BSEffectShaderPropertyColorController::read(NIFStream* nif)
     {
         NiPoint3InterpController::read(nif);
+
         nif->read(mControlledColor);
     }
 
+    void BSKeyframeController::read(NIFStream* nif)
+    {
+        NiKeyframeController::read(nif);
+
+        mData2.read(nif);
+    }
+
+    void BSKeyframeController::post(Reader& nif)
+    {
+        NiKeyframeController::post(nif);
+
+        mData2.post(nif);
+    }
+
+    void BSLagBoneController::read(NIFStream* nif)
+    {
+        NiTimeController::read(nif);
+
+        nif->read(mLinearVelocity);
+        nif->read(mLinearRotation);
+        nif->read(mMaximumDistance);
+    }
+
+    void BSProceduralLightningController::read(NIFStream* nif)
+    {
+        NiTimeController::read(nif);
+
+        mGenerationInterp.read(nif);
+        mMutationInterp.read(nif);
+        mSubdivisionInterp.read(nif);
+        mNumBranchesInterp.read(nif);
+        mNumBranchesVarInterp.read(nif);
+        mLengthInterp.read(nif);
+        mLengthVarInterp.read(nif);
+        mWidthInterp.read(nif);
+        mArcOffsetInterp.read(nif);
+        nif->read(mSubdivisions);
+        nif->read(mNumBranches);
+        nif->read(mNumBranchesVar);
+        nif->read(mLength);
+        nif->read(mLengthVar);
+        nif->read(mWidth);
+        nif->read(mChildWidthMult);
+        nif->read(mArcOffset);
+        nif->read(mFadeMainBolt);
+        nif->read(mFadeChildBolts);
+        nif->read(mAnimateArcOffset);
+        mShaderProperty.read(nif);
+    }
+
+    void BSProceduralLightningController::post(Reader& nif)
+    {
+        NiTimeController::post(nif);
+
+        mGenerationInterp.post(nif);
+        mMutationInterp.post(nif);
+        mSubdivisionInterp.post(nif);
+        mNumBranchesInterp.post(nif);
+        mNumBranchesVarInterp.post(nif);
+        mLengthInterp.post(nif);
+        mLengthVarInterp.post(nif);
+        mWidthInterp.post(nif);
+        mArcOffsetInterp.post(nif);
+        mShaderProperty.post(nif);
+    }
+
     void NiControllerManager::read(NIFStream* nif)
     {
-        Controller::read(nif);
-        mCumulative = nif->getBoolean();
+        NiTimeController::read(nif);
+
+        nif->read(mCumulative);
         readRecordList(nif, mSequences);
         mObjectPalette.read(nif);
     }
 
     void NiControllerManager::post(Reader& nif)
     {
-        Controller::post(nif);
+        NiTimeController::post(nif);
+
         postRecordList(nif, mSequences);
         mObjectPalette.post(nif);
     }
 
-    void NiPoint3Interpolator::read(NIFStream* nif)
+    void NiExtraDataController::read(NIFStream* nif)
     {
-        defaultVal = nif->getVector3();
-        data.read(nif);
+        NiSingleInterpController::read(nif);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 2, 0, 0))
+            nif->read(mExtraDataName);
     }
 
-    void NiPoint3Interpolator::post(Reader& nif)
+    void NiFloatExtraDataController::read(NIFStream* nif)
     {
-        data.post(nif);
-    }
+        NiExtraDataController::read(nif);
 
-    void NiBoolInterpolator::read(NIFStream* nif)
-    {
-        defaultVal = nif->getBoolean();
-        data.read(nif);
-    }
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104))
+            return;
 
-    void NiBoolInterpolator::post(Reader& nif)
-    {
-        data.post(nif);
-    }
-
-    void NiFloatInterpolator::read(NIFStream* nif)
-    {
-        defaultVal = nif->getFloat();
-        data.read(nif);
-    }
-
-    void NiFloatInterpolator::post(Reader& nif)
-    {
-        data.post(nif);
-    }
-
-    void NiTransformInterpolator::read(NIFStream* nif)
-    {
-        defaultPos = nif->getVector3();
-        defaultRot = nif->getQuaternion();
-        defaultScale = nif->getFloat();
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
+        // Unknown
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 0))
         {
-            if (!nif->getBoolean())
-                defaultPos = osg::Vec3f();
-            if (!nif->getBoolean())
-                defaultRot = osg::Quat();
-            if (!nif->getBoolean())
-                defaultScale = 1.f;
+            uint8_t numExtraBytes;
+            nif->read(numExtraBytes);
+            nif->skip(7);
+            nif->skip(numExtraBytes);
         }
-        data.read(nif);
+
+        mData.read(nif);
     }
 
-    void NiTransformInterpolator::post(Reader& nif)
+    void NiFloatExtraDataController::post(Reader& nif)
     {
-        data.post(nif);
+        NiExtraDataController::post(nif);
+
+        mData.post(nif);
     }
 
-    void NiColorInterpolator::read(NIFStream* nif)
+    void NiFloatsExtraDataController::read(NIFStream* nif)
     {
-        defaultVal = nif->getVector4();
-        data.read(nif);
+        NiExtraDataController::read(nif);
+
+        nif->read(mFloatsExtraDataIndex);
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
+            mData.read(nif);
     }
 
-    void NiColorInterpolator::post(Reader& nif)
+    void NiFloatsExtraDataController::post(Reader& nif)
     {
-        data.post(nif);
+        NiExtraDataController::post(nif);
+
+        mData.post(nif);
+    }
+
+    void NiFloatsExtraDataPoint3Controller::read(NIFStream* nif)
+    {
+        NiExtraDataController::read(nif);
+
+        nif->read(mFloatsExtraDataIndex);
+    }
+
+    void NiPathInterpolator::read(NIFStream* nif)
+    {
+        nif->read(mFlags);
+        nif->read(mBankDirection);
+        nif->read(mMaxBankAngle);
+        nif->read(mSmoothing);
+        nif->read(mFollowAxis);
+        mPathData.read(nif);
+        mPercentData.read(nif);
+    }
+
+    void NiPathInterpolator::post(Reader& nif)
+    {
+        mPathData.post(nif);
+        mPercentData.post(nif);
+    }
+
+    void NiLookAtInterpolator::read(NIFStream* nif)
+    {
+        nif->read(mLookAtFlags);
+        mLookAt.read(nif);
+        nif->read(mLookAtName);
+        if (nif->getVersion() <= NIFStream::generateVersion(20, 4, 0, 12))
+            nif->read(mTransform);
+        mTranslation.read(nif);
+        mRoll.read(nif);
+        mScale.read(nif);
+    }
+
+    void NiLookAtInterpolator::post(Reader& nif)
+    {
+        mLookAt.post(nif);
+        mTranslation.post(nif);
+        mRoll.post(nif);
+        mScale.post(nif);
     }
 
     void NiBlendInterpolator::read(NIFStream* nif)
     {
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 112))
-            mManagerControlled = nif->getChar() & 1;
-        size_t numInterps = 0;
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
         {
-            numInterps = nif->getUShort();
-            mArrayGrowBy = nif->getUShort();
-        }
-        else
-        {
-            numInterps = nif->getChar();
-            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 112))
+            nif->read(mFlags);
+            mItems.resize(nif->get<uint8_t>());
+            nif->read(mWeightThreshold);
+            if (!(mFlags & Flag_ManagerControlled))
             {
-                mWeightThreshold = nif->getFloat();
-                if (!mManagerControlled)
-                {
-                    mInterpCount = nif->getChar();
-                    mSingleIndex = nif->getChar();
-                    mHighPriority = nif->getChar();
-                    mNextHighPriority = nif->getChar();
-                    mSingleTime = nif->getFloat();
-                    mHighWeightsSum = nif->getFloat();
-                    mNextHighWeightsSum = nif->getFloat();
-                    mHighEaseSpinner = nif->getFloat();
-                }
+                mInterpCount = nif->get<uint8_t>();
+                mSingleIndex = nif->get<uint8_t>();
+                mHighPriority = nif->get<int8_t>();
+                mNextHighPriority = nif->get<int8_t>();
+                nif->read(mSingleTime);
+                nif->read(mHighWeightsSum);
+                nif->read(mNextHighWeightsSum);
+                nif->read(mHighEaseSpinner);
+                for (Item& item : mItems)
+                    item.read(nif);
             }
+            return;
         }
 
-        if (!mManagerControlled)
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 110))
         {
-            mItems.resize(numInterps);
+            mItems.resize(nif->get<uint8_t>());
             for (Item& item : mItems)
                 item.read(nif);
+            if (nif->get<bool>())
+                mFlags |= Flag_ManagerControlled;
+            nif->read(mWeightThreshold);
+            if (nif->get<bool>())
+                mFlags |= Flag_OnlyUseHighestWeight;
+            mInterpCount = nif->get<uint8_t>();
+            mSingleIndex = nif->get<uint8_t>();
+            mSingleInterpolator.read(nif);
+            nif->read(mSingleTime);
+            mHighPriority = nif->get<int8_t>();
+            mNextHighPriority = nif->get<int8_t>();
+            return;
         }
 
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 111))
+        mItems.resize(nif->get<uint16_t>());
+        nif->read(mArrayGrowBy);
+        for (Item& item : mItems)
+            item.read(nif);
+        if (nif->get<bool>())
+            mFlags |= Flag_ManagerControlled;
+        nif->read(mWeightThreshold);
+        if (nif->get<bool>())
+            mFlags |= Flag_OnlyUseHighestWeight;
+        nif->read(mInterpCount);
+        nif->read(mSingleIndex);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 108))
         {
-            mManagerControlled = nif->getBoolean();
-            mWeightThreshold = nif->getFloat();
-            mOnlyUseHighestWeight = nif->getBoolean();
-            if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
-            {
-                mInterpCount = nif->getUShort();
-                mSingleIndex = nif->getUShort();
-            }
-            else
-            {
-                mInterpCount = nif->getChar();
-                mSingleIndex = nif->getChar();
-            }
-            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 108))
-            {
-                mSingleInterpolator.read(nif);
-                mSingleTime = nif->getFloat();
-            }
-            if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
-            {
-                mHighPriority = nif->getInt();
-                mNextHighPriority = nif->getInt();
-            }
-            else
-            {
-                mHighPriority = nif->getChar();
-                mNextHighPriority = nif->getChar();
-            }
+            mSingleInterpolator.read(nif);
+            nif->read(mSingleTime);
         }
+        nif->read(mHighPriority);
+        nif->read(mNextHighPriority);
     }
 
     void NiBlendInterpolator::post(Reader& nif)
@@ -617,13 +801,13 @@ namespace Nif
     void NiBlendInterpolator::Item::read(NIFStream* nif)
     {
         mInterpolator.read(nif);
-        mWeight = nif->getFloat();
-        mNormalizedWeight = nif->getFloat();
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
-            mPriority = nif->getInt();
+        nif->read(mWeight);
+        nif->read(mNormalizedWeight);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 110))
+            mPriority = nif->get<int8_t>();
         else
-            mPriority = nif->getChar();
-        mEaseSpinner = nif->getFloat();
+            nif->read(mPriority);
+        nif->read(mEaseSpinner);
     }
 
     void NiBlendInterpolator::Item::post(Reader& nif)
@@ -631,38 +815,92 @@ namespace Nif
         mInterpolator.post(nif);
     }
 
-    void NiBlendBoolInterpolator::read(NIFStream* nif)
+    void NiBSplineInterpolator::read(NIFStream* nif)
     {
-        NiBlendInterpolator::read(nif);
-        mValue = nif->getChar() != 0;
+        nif->read(mStartTime);
+        nif->read(mStopTime);
+        mSplineData.read(nif);
+        mBasisData.read(nif);
     }
 
-    void NiBlendFloatInterpolator::read(NIFStream* nif)
+    void NiBSplineInterpolator::post(Reader& nif)
     {
-        NiBlendInterpolator::read(nif);
-        mValue = nif->getFloat();
+        mSplineData.post(nif);
+        mBasisData.post(nif);
     }
 
-    void NiBlendPoint3Interpolator::read(NIFStream* nif)
+    void NiBSplineFloatInterpolator::read(NIFStream* nif)
     {
-        NiBlendInterpolator::read(nif);
-        mValue = nif->getVector3();
+        NiBSplineInterpolator::read(nif);
+
+        nif->read(mValue);
+        nif->read(mHandle);
     }
 
-    void NiBlendTransformInterpolator::read(NIFStream* nif)
+    void NiBSplineCompFloatInterpolator::read(NIFStream* nif)
     {
-        NiBlendInterpolator::read(nif);
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
-        {
-            mPosValue = nif->getVector3();
-            mRotValue = nif->getQuaternion();
-            mScaleValue = nif->getFloat();
-            if (!nif->getBoolean())
-                mPosValue = osg::Vec3f();
-            if (!nif->getBoolean())
-                mRotValue = osg::Quat();
-            if (!nif->getBoolean())
-                mScaleValue = 1.f;
-        }
+        NiBSplineFloatInterpolator::read(nif);
+
+        nif->read(mOffset);
+        nif->read(mHalfRange);
     }
+
+    void NiBSplinePoint3Interpolator::read(NIFStream* nif)
+    {
+        NiBSplineInterpolator::read(nif);
+
+        nif->read(mValue);
+        nif->read(mHandle);
+    }
+
+    void NiBSplineCompPoint3Interpolator::read(NIFStream* nif)
+    {
+        NiBSplinePoint3Interpolator::read(nif);
+
+        nif->read(mOffset);
+        nif->read(mHalfRange);
+    }
+
+    void NiBSplineTransformInterpolator::read(NIFStream* nif)
+    {
+        NiBSplineInterpolator::read(nif);
+
+        nif->read(mValue);
+        nif->read(mTranslationHandle);
+        nif->read(mRotationHandle);
+        nif->read(mScaleHandle);
+    }
+
+    void NiBSplineCompTransformInterpolator::read(NIFStream* nif)
+    {
+        NiBSplineTransformInterpolator::read(nif);
+
+        nif->read(mTranslationOffset);
+        nif->read(mTranslationHalfRange);
+        nif->read(mRotationOffset);
+        nif->read(mRotationHalfRange);
+        nif->read(mScaleOffset);
+        nif->read(mScaleHalfRange);
+    }
+
+    void BSTreadTransform::read(NIFStream* nif)
+    {
+        nif->read(mName);
+        nif->read(mTransform1);
+        nif->read(mTransform2);
+    }
+
+    void BSTreadTransfInterpolator::read(NIFStream* nif)
+    {
+        mTransforms.resize(nif->get<uint32_t>());
+        for (BSTreadTransform& transform : mTransforms)
+            transform.read(nif);
+        mData.read(nif);
+    }
+
+    void BSTreadTransfInterpolator::post(Reader& nif)
+    {
+        mData.post(nif);
+    }
+
 }
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index d194ea3060..2226a6e9df 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -1,30 +1,8 @@
-/*
-  OpenMW - The completely unofficial reimplementation of Morrowind
-  Copyright (C) 2008-2010  Nicolay Korslund
-  Email: < korslund@gmail.com >
-  WWW: https://openmw.org/
-
-  This file (controller.h) is part of the OpenMW package.
-
-  OpenMW is distributed as free software: you can redistribute it
-  and/or modify it under the terms of the GNU General Public License
-  version 3, as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  version 3 along with this program. If not, see
-  https://www.gnu.org/licenses/ .
-
- */
-
 #ifndef OPENMW_COMPONENTS_NIF_CONTROLLER_HPP
 #define OPENMW_COMPONENTS_NIF_CONTROLLER_HPP
 
 #include "base.hpp"
+#include "niftypes.hpp"
 #include "property.hpp"
 
 namespace Nif
@@ -34,16 +12,16 @@ namespace Nif
     {
         std::string mTargetName;
         NiInterpolatorPtr mInterpolator;
-        ControllerPtr mController;
+        NiTimeControllerPtr mController;
         NiBlendInterpolatorPtr mBlendInterpolator;
-        unsigned short mBlendIndex;
-        unsigned char mPriority;
+        uint16_t mBlendIndex;
+        uint8_t mPriority;
         NiStringPalettePtr mStringPalette;
-        size_t mNodeNameOffset;
-        size_t mPropertyTypeOffset;
-        size_t mControllerTypeOffset;
-        size_t mControllerIdOffset;
-        size_t mInterpolatorIdOffset;
+        uint32_t mNodeNameOffset;
+        uint32_t mPropertyTypeOffset;
+        uint32_t mControllerTypeOffset;
+        uint32_t mControllerIdOffset;
+        uint32_t mInterpolatorIdOffset;
         std::string mNodeName;
         std::string mPropertyType;
         std::string mControllerType;
@@ -60,7 +38,7 @@ namespace Nif
         std::string mName;
         std::string mAccumRootName;
         ExtraPtr mTextKeys;
-        unsigned int mArrayGrowBy;
+        uint32_t mArrayGrowBy;
         std::vector<ControlledBlock> mControlledBlocks;
 
         void read(NIFStream* nif) override;
@@ -71,20 +49,21 @@ namespace Nif
     struct NiControllerSequence : public NiSequence
     {
         float mWeight{ 1.f };
-        Controller::ExtrapolationMode mExtrapolationMode{ Controller::ExtrapolationMode::Constant };
+        NiTimeController::ExtrapolationMode mExtrapolationMode{ NiTimeController::ExtrapolationMode::Constant };
         float mFrequency{ 1.f };
         float mPhase{ 1.f };
         float mStartTime, mStopTime;
         bool mPlayBackwards{ false };
         NiControllerManagerPtr mManager;
         NiStringPalettePtr mStringPalette;
+        BSAnimNotesList mAnimNotesList;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
     // Base class for controllers that use NiInterpolators to animate objects.
-    struct NiInterpController : public Controller
+    struct NiInterpController : public NiTimeController
     {
         // Usually one of the flags.
         bool mManagerControlled{ false };
@@ -116,7 +95,20 @@ namespace Nif
     {
     };
 
-    struct NiParticleSystemController : public Controller
+    struct NiParticleInfo
+    {
+        osg::Vec3f mVelocity;
+        osg::Vec3f mRotationAxis;
+        float mAge;
+        float mLifespan;
+        float mLastUpdate;
+        uint16_t mSpawnGeneration;
+        uint16_t mCode;
+
+        void read(NIFStream* nif);
+    };
+
+    struct NiParticleSystemController : public NiTimeController
     {
         enum BSPArrayController
         {
@@ -124,104 +116,128 @@ namespace Nif
             BSPArrayController_AtVertex = 0x10
         };
 
-        struct Particle
-        {
-            osg::Vec3f velocity;
-            float lifetime;
-            float lifespan;
-            float timestamp;
-            unsigned short vertex;
-        };
-
-        float velocity;
-        float velocityRandom;
-
-        float verticalDir; // 0=up, pi/2=horizontal, pi=down
-        float verticalAngle;
-        float horizontalDir;
-        float horizontalAngle;
-
-        osg::Vec4f color;
-        float size;
-        float startTime;
-        float stopTime;
-
-        float emitRate;
-        float lifetime;
-        float lifetimeRandom;
-
         enum EmitFlags
         {
             EmitFlag_NoAutoAdjust = 0x1 // If this flag is set, we use the emitRate value. Otherwise,
                                         // we calculate an emit rate so that the maximum number of particles
                                         // in the system (numParticles) is never exceeded.
         };
-        int emitFlags;
 
-        osg::Vec3f offsetRandom;
-
-        NodePtr emitter;
-
-        int numParticles;
-        int activeCount;
-        std::vector<Particle> particles;
-
-        NiParticleModifierPtr affectors;
-        NiParticleModifierPtr colliders;
+        float mSpeed;
+        float mSpeedVariation;
+        float mDeclination;
+        float mDeclinationVariation;
+        float mPlanarAngle;
+        float mPlanarAngleVariation;
+        osg::Vec3f mInitialNormal;
+        osg::Vec4f mInitialColor;
+        float mInitialSize;
+        float mEmitStartTime;
+        float mEmitStopTime;
+        bool mResetParticleSystem{ false };
+        float mBirthRate;
+        float mLifetime;
+        float mLifetimeVariation;
+        uint16_t mEmitFlags{ 0 };
+        osg::Vec3f mEmitterDimensions;
+        NiAVObjectPtr mEmitter;
+        uint16_t mNumSpawnGenerations;
+        float mPercentageSpawned;
+        uint16_t mSpawnMultiplier;
+        float mSpawnSpeedChaos;
+        float mSpawnDirChaos;
+        uint16_t mNumParticles;
+        uint16_t mNumValid;
+        std::vector<NiParticleInfo> mParticles;
+        NiParticleModifierPtr mModifier;
+        NiParticleModifierPtr mCollider;
+        uint8_t mStaticTargetBound;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
 
-        bool noAutoAdjust() const { return emitFlags & EmitFlag_NoAutoAdjust; }
-        bool emitAtVertex() const { return flags & BSPArrayController_AtVertex; }
+        bool noAutoAdjust() const { return mEmitFlags & EmitFlag_NoAutoAdjust; }
+        bool emitAtVertex() const { return mFlags & BSPArrayController_AtVertex; }
     };
     using NiBSPArrayController = NiParticleSystemController;
 
-    struct NiMaterialColorController : public NiPoint3InterpController
+    struct NiLightColorController : public NiPoint3InterpController
     {
-        NiPosDataPtr mData;
-        unsigned int mTargetColor;
-
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
-    };
-
-    struct NiPathController : public Controller
-    {
-        NiPosDataPtr posData;
-        NiFloatDataPtr floatData;
-
-        enum Flags
+        enum class Mode
         {
-            Flag_OpenCurve = 0x020,
-            Flag_AllowFlip = 0x040,
-            Flag_Bank = 0x080,
-            Flag_ConstVelocity = 0x100,
-            Flag_Follow = 0x200,
-            Flag_FlipFollowAxis = 0x400
+            DiffuseSpecular = 0,
+            Ambient = 1,
         };
 
-        int bankDir;
-        float maxBankAngle, smoothing;
-        short followAxis;
+        NiPosDataPtr mData;
+        Mode mMode = Mode::DiffuseSpecular;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct NiLookAtController : public Controller
+    struct NiMaterialColorController : public NiPoint3InterpController
     {
-        NodePtr target;
-        unsigned short lookAtFlags{ 0 };
+        enum class TargetColor
+        {
+            Ambient = 0,
+            Diffuse = 1,
+            Specular = 2,
+            Emissive = 3,
+        };
+
+        NiPosDataPtr mData;
+        TargetColor mTargetColor = TargetColor::Ambient;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct NiUVController : public Controller
+    struct NiPathController : public NiTimeController
     {
-        NiUVDataPtr data;
-        unsigned int uvSet;
+        enum Flags
+        {
+            Flag_CVDataNeedsUpdate = 0x01,
+            Flag_OpenCurve = 0x02,
+            Flag_AllowFlip = 0x04,
+            Flag_Bank = 0x08,
+            Flag_ConstVelocity = 0x10,
+            Flag_Follow = 0x20,
+            Flag_FlipFollowAxis = 0x40,
+        };
+
+        uint16_t mPathFlags;
+        int32_t mBankDirection;
+        float mMaxBankAngle;
+        float mSmoothing;
+        uint16_t mFollowAxis;
+        NiPosDataPtr mPathData;
+        NiFloatDataPtr mPercentData;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiLookAtController : public NiTimeController
+    {
+        enum Flags
+        {
+            Flag_Flip = 0x1,
+            Flag_LookYAxis = 0x2,
+            Flag_LookZAxis = 0x4,
+        };
+
+        uint16_t mLookAtFlags{ 0 };
+        NiAVObjectPtr mLookAt;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiUVController : public NiTimeController
+    {
+        NiUVDataPtr mData;
+        uint16_t mUvSet;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
@@ -237,7 +253,7 @@ namespace Nif
 
     struct NiMultiTargetTransformController : public NiInterpController
     {
-        NodeList mExtraTargets;
+        NiAVObjectList mExtraTargets;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
@@ -281,7 +297,7 @@ namespace Nif
 
     struct NiFlipController : public NiFloatInterpController
     {
-        int mTexSlot; // NiTexturingProperty::TextureType
+        NiTexturingProperty::TextureType mTexSlot;
         float mDelta; // Time between two flips. delta = (start_time - stop_time) / num_sources
         NiSourceTextureList mSources;
 
@@ -292,85 +308,190 @@ namespace Nif
     struct NiTextureTransformController : public NiFloatInterpController
     {
         bool mShaderMap;
-        int mTexSlot; // NiTexturingProperty::TextureType
-        unsigned int mTransformMember;
+        NiTexturingProperty::TextureType mTexSlot;
+        uint32_t mTransformMember;
         NiFloatDataPtr mData;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct bhkBlendController : public Controller
+    struct NiBoneLODController : NiTimeController
+    {
+        struct SkinInfo
+        {
+            NiTriBasedGeomPtr mShape;
+            NiSkinInstancePtr mSkin;
+        };
+
+        uint32_t mLOD;
+        uint32_t mNumNodeGroups;
+        std::vector<NiAVObjectList> mNodeGroups;
+        std::vector<std::vector<SkinInfo>> mSkinnedShapeGroups;
+        NiTriBasedGeomList mShapeGroups;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct bhkBlendController : public NiTimeController
     {
         void read(NIFStream* nif) override;
     };
 
     struct BSEffectShaderPropertyFloatController : public NiFloatInterpController
     {
-        unsigned int mControlledVariable;
+        uint32_t mControlledVariable;
 
         void read(NIFStream* nif) override;
     };
 
     struct BSEffectShaderPropertyColorController : public NiPoint3InterpController
     {
-        unsigned int mControlledColor;
+        uint32_t mControlledColor;
 
         void read(NIFStream* nif) override;
     };
 
-    struct NiControllerManager : public Controller
+    struct BSKeyframeController : NiKeyframeController
+    {
+        NiKeyframeDataPtr mData2;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct BSLagBoneController : NiTimeController
+    {
+        float mLinearVelocity;
+        float mLinearRotation;
+        float mMaximumDistance;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSProceduralLightningController : NiTimeController
+    {
+        NiInterpolatorPtr mGenerationInterp;
+        NiInterpolatorPtr mMutationInterp;
+        NiInterpolatorPtr mSubdivisionInterp;
+        NiInterpolatorPtr mNumBranchesInterp;
+        NiInterpolatorPtr mNumBranchesVarInterp;
+        NiInterpolatorPtr mLengthInterp;
+        NiInterpolatorPtr mLengthVarInterp;
+        NiInterpolatorPtr mWidthInterp;
+        NiInterpolatorPtr mArcOffsetInterp;
+        uint16_t mSubdivisions;
+        uint16_t mNumBranches;
+        uint16_t mNumBranchesVar;
+        float mLength;
+        float mLengthVar;
+        float mWidth;
+        float mChildWidthMult;
+        float mArcOffset;
+        bool mFadeMainBolt;
+        bool mFadeChildBolts;
+        bool mAnimateArcOffset;
+        BSShaderPropertyPtr mShaderProperty;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiControllerManager : public NiTimeController
     {
         bool mCumulative;
         NiControllerSequenceList mSequences;
         NiDefaultAVObjectPalettePtr mObjectPalette;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
+    // Abstract
+    struct NiExtraDataController : NiSingleInterpController
+    {
+        std::string mExtraDataName;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiFloatExtraDataController : NiExtraDataController
+    {
+        NiFloatDataPtr mData;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiFloatsExtraDataController : NiExtraDataController
+    {
+        int32_t mFloatsExtraDataIndex;
+        NiFloatDataPtr mData;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiFloatsExtraDataPoint3Controller : NiExtraDataController
+    {
+        int32_t mFloatsExtraDataIndex;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract
     struct NiInterpolator : public Record
     {
     };
 
-    struct NiPoint3Interpolator : public NiInterpolator
+    template <class T, class DataPtr>
+    struct TypedNiInterpolator : public NiInterpolator
     {
-        osg::Vec3f defaultVal;
-        NiPosDataPtr data;
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
+        T mDefaultValue;
+        DataPtr mData;
+
+        void read(NIFStream* nif) override
+        {
+            nif->read(mDefaultValue);
+            mData.read(nif);
+        }
+
+        void post(Reader& nif) override { mData.post(nif); }
     };
 
-    struct NiBoolInterpolator : public NiInterpolator
-    {
-        char defaultVal;
-        NiBoolDataPtr data;
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
-    };
+    using NiPoint3Interpolator = TypedNiInterpolator<osg::Vec3f, NiPosDataPtr>;
+    using NiBoolInterpolator = TypedNiInterpolator<bool, NiBoolDataPtr>;
+    using NiFloatInterpolator = TypedNiInterpolator<float, NiFloatDataPtr>;
+    using NiTransformInterpolator = TypedNiInterpolator<NiQuatTransform, NiKeyframeDataPtr>;
+    using NiColorInterpolator = TypedNiInterpolator<osg::Vec4f, NiColorDataPtr>;
 
-    struct NiFloatInterpolator : public NiInterpolator
+    struct NiPathInterpolator : public NiInterpolator
     {
-        float defaultVal;
-        NiFloatDataPtr data;
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
-    };
-
-    struct NiTransformInterpolator : public NiInterpolator
-    {
-        osg::Vec3f defaultPos;
-        osg::Quat defaultRot;
-        float defaultScale;
-        NiKeyframeDataPtr data;
+        // Uses the same flags as NiPathController
+        uint16_t mFlags;
+        int32_t mBankDirection;
+        float mMaxBankAngle;
+        float mSmoothing;
+        uint16_t mFollowAxis;
+        NiPosDataPtr mPathData;
+        NiFloatDataPtr mPercentData;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct NiColorInterpolator : public NiInterpolator
+    struct NiLookAtInterpolator : NiInterpolator
     {
-        osg::Vec4f defaultVal;
-        NiColorDataPtr data;
+        // Uses the same flags as NiLookAtController
+        uint16_t mLookAtFlags{ 0 };
+        NiAVObjectPtr mLookAt;
+        std::string mLookAtName;
+        NiQuatTransform mTransform;
+        NiInterpolatorPtr mTranslation;
+        NiInterpolatorPtr mRoll;
+        NiInterpolatorPtr mScale;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
@@ -378,24 +499,29 @@ namespace Nif
     // Abstract
     struct NiBlendInterpolator : public NiInterpolator
     {
+        enum Flags
+        {
+            Flag_ManagerControlled = 0x1,
+            Flag_OnlyUseHighestWeight = 0x2,
+        };
+
         struct Item
         {
             NiInterpolatorPtr mInterpolator;
             float mWeight, mNormalizedWeight;
-            int mPriority;
+            int32_t mPriority;
             float mEaseSpinner;
 
             void read(NIFStream* nif);
             void post(Reader& nif);
         };
 
-        bool mManagerControlled{ false };
-        bool mOnlyUseHighestWeight{ false };
-        unsigned short mArrayGrowBy{ 0 };
+        uint8_t mFlags{ 0 };
+        uint16_t mArrayGrowBy{ 0 };
         float mWeightThreshold;
-        unsigned short mInterpCount;
-        unsigned short mSingleIndex;
-        int mHighPriority, mNextHighPriority;
+        uint16_t mInterpCount;
+        uint16_t mSingleIndex;
+        int32_t mHighPriority, mNextHighPriority;
         float mSingleTime;
         float mHighWeightsSum, mNextHighWeightsSum;
         float mHighEaseSpinner;
@@ -406,31 +532,123 @@ namespace Nif
         void post(Reader& nif) override;
     };
 
-    struct NiBlendBoolInterpolator : public NiBlendInterpolator
+    template <typename T>
+    struct TypedNiBlendInterpolator : public NiBlendInterpolator
     {
-        char mValue;
-        void read(NIFStream* nif) override;
+        T mValue;
+
+        void read(NIFStream* nif) override
+        {
+            NiBlendInterpolator::read(nif);
+
+            nif->read(mValue);
+        }
     };
 
-    struct NiBlendFloatInterpolator : public NiBlendInterpolator
+    template <>
+    struct TypedNiBlendInterpolator<NiQuatTransform> : public NiBlendInterpolator
+    {
+        NiQuatTransform mValue;
+
+        void read(NIFStream* nif) override
+        {
+            NiBlendInterpolator::read(nif);
+
+            if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
+                nif->read(mValue);
+        }
+    };
+
+    using NiBlendBoolInterpolator = TypedNiBlendInterpolator<uint8_t>;
+    using NiBlendFloatInterpolator = TypedNiBlendInterpolator<float>;
+    using NiBlendPoint3Interpolator = TypedNiBlendInterpolator<osg::Vec3f>;
+    using NiBlendTransformInterpolator = TypedNiBlendInterpolator<NiQuatTransform>;
+
+    // Abstract
+    struct NiBSplineInterpolator : public NiInterpolator
+    {
+        float mStartTime;
+        float mStopTime;
+        NiBSplineDataPtr mSplineData;
+        NiBSplineBasisDataPtr mBasisData;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    // Abstract
+    struct NiBSplineFloatInterpolator : public NiBSplineInterpolator
     {
         float mValue;
+        uint32_t mHandle;
+
         void read(NIFStream* nif) override;
     };
 
-    struct NiBlendPoint3Interpolator : public NiBlendInterpolator
+    struct NiBSplineCompFloatInterpolator : public NiBSplineFloatInterpolator
+    {
+        float mOffset;
+        float mHalfRange;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract
+    struct NiBSplinePoint3Interpolator : public NiBSplineInterpolator
     {
         osg::Vec3f mValue;
+        uint32_t mHandle;
+
         void read(NIFStream* nif) override;
     };
 
-    struct NiBlendTransformInterpolator : public NiBlendInterpolator
+    struct NiBSplineCompPoint3Interpolator : public NiBSplinePoint3Interpolator
     {
-        osg::Vec3f mPosValue;
-        osg::Quat mRotValue;
-        float mScaleValue;
+        float mOffset;
+        float mHalfRange;
+
         void read(NIFStream* nif) override;
     };
 
-} // Namespace
+    struct NiBSplineTransformInterpolator : public NiBSplineInterpolator
+    {
+        NiQuatTransform mValue;
+        uint32_t mTranslationHandle;
+        uint32_t mRotationHandle;
+        uint32_t mScaleHandle;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiBSplineCompTransformInterpolator : public NiBSplineTransformInterpolator
+    {
+        float mTranslationOffset;
+        float mTranslationHalfRange;
+        float mRotationOffset;
+        float mRotationHalfRange;
+        float mScaleOffset;
+        float mScaleHalfRange;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSTreadTransform
+    {
+        std::string mName;
+        NiQuatTransform mTransform1;
+        NiQuatTransform mTransform2;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSTreadTransfInterpolator : public NiInterpolator
+    {
+        std::vector<BSTreadTransform> mTransforms;
+        NiFloatDataPtr mData;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+}
 #endif
diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 1574462892..29b11bd806 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -1,237 +1,164 @@
 #include "data.hpp"
+
+#include <components/debug/debuglog.hpp>
+
 #include "exception.hpp"
 #include "nifkey.hpp"
 #include "node.hpp"
 
-#include <components/debug/debuglog.hpp>
-
 namespace Nif
 {
-    void NiSkinInstance::read(NIFStream* nif)
-    {
-        data.read(nif);
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 101))
-            partitions.read(nif);
-        root.read(nif);
-        readRecordList(nif, bones);
-    }
-
-    void NiSkinInstance::post(Reader& nif)
-    {
-        data.post(nif);
-        partitions.post(nif);
-        root.post(nif);
-        postRecordList(nif, bones);
-
-        if (data.empty() || root.empty())
-            throw Nif::Exception("NiSkinInstance missing root or data", nif.getFilename());
-
-        if (bones.size() != data->bones.size())
-            throw Nif::Exception("Mismatch in NiSkinData bone count", nif.getFilename());
-
-        for (auto& bone : bones)
-        {
-            if (bone.empty())
-                throw Nif::Exception("Oops: Missing bone! Don't know how to handle this.", nif.getFilename());
-            bone->setBone();
-        }
-    }
-
-    void BSDismemberSkinInstance::read(NIFStream* nif)
-    {
-        NiSkinInstance::read(nif);
-        unsigned int numPartitions = nif->getUInt();
-        nif->skip(4 * numPartitions); // Body part information
-    }
-
     void NiGeometryData::read(NIFStream* nif)
     {
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 114))
-            nif->getInt(); // Group ID. (Almost?) always 0.
+            nif->read(mGroupId);
 
-        int verts = nif->getUShort();
+        nif->read(mNumVertices);
+
+        bool isPSysData = false;
+        switch (recType)
+        {
+            case RC_NiPSysData:
+            case RC_NiMeshPSysData:
+            case RC_BSStripPSysData:
+                isPSysData = true;
+                break;
+            default:
+                break;
+        }
+        bool hasData = !isPSysData || nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO3;
 
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            nif->skip(2); // Keep flags and compress flags
-
-        if (nif->getBoolean())
-            nif->readVector(vertices, verts);
-
-        unsigned int dataFlags = 0;
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
-            dataFlags = nif->getUShort();
-
-        if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS
-            && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
-            nif->getUInt(); // Material CRC
-
-        if (nif->getBoolean())
         {
-            nif->readVector(normals, verts);
-            if (dataFlags & 0x1000)
+            nif->read(mKeepFlags);
+            nif->read(mCompressFlags);
+        }
+
+        if (nif->get<bool>() && hasData)
+            nif->readVector(mVertices, mNumVertices);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
+        {
+            nif->read(mDataFlags);
+
+            if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS
+                && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+                nif->read(mMaterialHash);
+        }
+
+        if (nif->get<bool>() && hasData)
+        {
+            nif->readVector(mNormals, mNumVertices);
+            if (mDataFlags & DataFlag_HasTangents)
             {
-                nif->readVector(tangents, verts);
-                nif->readVector(bitangents, verts);
+                nif->readVector(mTangents, mNumVertices);
+                nif->readVector(mBitangents, mNumVertices);
             }
         }
 
-        center = nif->getVector3();
-        radius = nif->getFloat();
+        nif->read(mBoundingSphere);
 
-        if (nif->getBoolean())
-            nif->readVector(colors, verts);
+        if (nif->get<bool>() && hasData)
+            nif->readVector(mColors, mNumVertices);
 
-        unsigned int numUVs = dataFlags;
         if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
-            numUVs = nif->getUShort();
+            nif->read(mDataFlags);
 
-        // In Morrowind this field only corresponds to the number of UV sets.
-        // In later games only the first 6 bits are used as a count and the rest are flags.
+        // In 4.0.0.2 the flags field corresponds to the number of UV sets.
+        // In later revisions the part that corresponds to the number is narrower.
+        uint16_t numUVs = mDataFlags;
         if (nif->getVersion() > NIFFile::NIFVersion::VER_MW)
         {
-            numUVs &= 0x3f;
+            numUVs &= DataFlag_NumUVsMask;
             if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > 0)
-                numUVs &= 0x1;
+                numUVs &= DataFlag_HasUV;
         }
+        else if (!nif->get<bool>())
+            numUVs = 0;
 
-        bool hasUVs = true;
-        if (nif->getVersion() <= NIFFile::NIFVersion::VER_MW)
-            hasUVs = nif->getBoolean();
-        if (hasUVs)
+        if (hasData)
         {
-            uvlist.resize(numUVs);
-            for (unsigned int i = 0; i < numUVs; i++)
+            mUVList.resize(numUVs);
+            for (std::vector<osg::Vec2f>& list : mUVList)
             {
-                nif->readVector(uvlist[i], verts);
+                nif->readVector(list, mNumVertices);
                 // flip the texture coordinates to convert them to the OpenGL convention of bottom-left image origin
-                for (unsigned int uv = 0; uv < uvlist[i].size(); ++uv)
-                {
-                    uvlist[i][uv] = osg::Vec2f(uvlist[i][uv].x(), 1.f - uvlist[i][uv].y());
-                }
+                for (osg::Vec2f& uv : list)
+                    uv.y() = 1.f - uv.y();
             }
         }
 
         if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
-            nif->getUShort(); // Consistency flags
-
-        if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 4))
-            nif->skip(4); // Additional data
+        {
+            nif->read(mConsistencyType);
+            if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 4))
+                nif->skip(4); // Additional data
+        }
     }
 
     void NiTriBasedGeomData::read(NIFStream* nif)
     {
         NiGeometryData::read(nif);
-        mNumTriangles = nif->getUShort();
+
+        nif->read(mNumTriangles);
     }
 
     void NiTriShapeData::read(NIFStream* nif)
     {
         NiTriBasedGeomData::read(nif);
 
-        // We have three times as many vertices as triangles, so this
-        // is always equal to mNumTriangles * 3.
-        int cnt = nif->getInt();
-        bool hasTriangles = true;
-        if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
-            hasTriangles = nif->getBoolean();
-        if (hasTriangles)
-            nif->readVector(triangles, cnt);
-
-        // Read the match list, which lists the vertices that are equal to
-        // vertices. We don't actually need need this for anything, so
-        // just skip it.
-        unsigned short verts = nif->getUShort();
-        for (unsigned short i = 0; i < verts; i++)
-        {
-            // Number of vertices matching vertex 'i'
-            int num = nif->getUShort();
-            nif->skip(num * sizeof(short));
-        }
+        uint32_t numIndices;
+        nif->read(numIndices);
+        if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD && !nif->get<bool>())
+            numIndices = 0;
+        nif->readVector(mTriangles, numIndices);
+        mMatchGroups.resize(nif->get<uint16_t>());
+        for (auto& group : mMatchGroups)
+            nif->readVector(group, nif->get<uint16_t>());
     }
 
     void NiTriStripsData::read(NIFStream* nif)
     {
         NiTriBasedGeomData::read(nif);
 
-        // Number of triangle strips
-        int numStrips = nif->getUShort();
-
-        std::vector<unsigned short> lengths;
+        uint16_t numStrips;
+        nif->read(numStrips);
+        std::vector<uint16_t> lengths;
         nif->readVector(lengths, numStrips);
-
-        // "Has Strips" flag. Exceptionally useful.
-        bool hasStrips = true;
-        if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
-            hasStrips = nif->getBoolean();
-        if (!hasStrips || !numStrips)
-            return;
-
-        strips.resize(numStrips);
+        if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD && !nif->get<bool>())
+            numStrips = 0;
+        mStrips.resize(numStrips);
         for (int i = 0; i < numStrips; i++)
-            nif->readVector(strips[i], lengths[i]);
+            nif->readVector(mStrips[i], lengths[i]);
     }
 
     void NiLinesData::read(NIFStream* nif)
     {
         NiGeometryData::read(nif);
-        size_t num = vertices.size();
+
         std::vector<uint8_t> flags;
-        nif->readVector(flags, num);
+        nif->readVector(flags, mNumVertices);
         // Can't construct a line from a single vertex.
-        if (num < 2)
+        if (mNumVertices < 2)
             return;
+        // There can't be more than 2 indices for each vertex
+        mLines.reserve(mNumVertices * 2);
         // Convert connectivity flags into usable geometry. The last element needs special handling.
-        for (size_t i = 0; i < num - 1; ++i)
+        for (uint16_t i = 0; i < mNumVertices - 1; ++i)
         {
             if (flags[i] & 1)
             {
-                lines.emplace_back(i);
-                lines.emplace_back(i + 1);
+                mLines.emplace_back(i);
+                mLines.emplace_back(i + 1);
             }
         }
         // If there are just two vertices, they can be connected twice. Probably isn't critical.
-        if (flags[num - 1] & 1)
+        if (flags[mNumVertices - 1] & 1)
         {
-            lines.emplace_back(num - 1);
-            lines.emplace_back(0);
+            mLines.emplace_back(mNumVertices - 1);
+            mLines.emplace_back(0);
         }
-    }
-
-    void NiParticlesData::read(NIFStream* nif)
-    {
-        NiGeometryData::read(nif);
-
-        // Should always match the number of vertices
-        if (nif->getVersion() <= NIFFile::NIFVersion::VER_MW)
-            numParticles = nif->getUShort();
-
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 0))
-            std::fill(particleRadii.begin(), particleRadii.end(), nif->getFloat());
-        else if (nif->getBoolean())
-            nif->readVector(particleRadii, vertices.size());
-        activeCount = nif->getUShort();
-
-        // Particle sizes
-        if (nif->getBoolean())
-            nif->readVector(sizes, vertices.size());
-
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0) && nif->getBoolean())
-            nif->readVector(rotations, vertices.size());
-        if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 4))
-        {
-            if (nif->getBoolean())
-                nif->readVector(rotationAngles, vertices.size());
-            if (nif->getBoolean())
-                nif->readVector(rotationAxes, vertices.size());
-        }
-    }
-
-    void NiRotatingParticlesData::read(NIFStream* nif)
-    {
-        NiParticlesData::read(nif);
-
-        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0) && nif->getBoolean())
-            nif->readVector(rotations, vertices.size());
+        mLines.shrink_to_fit();
     }
 
     void NiPosData::read(NIFStream* nif)
@@ -242,10 +169,10 @@ namespace Nif
 
     void NiUVData::read(NIFStream* nif)
     {
-        for (int i = 0; i < 4; i++)
+        for (FloatKeyMapPtr& keys : mKeyList)
         {
-            mKeyList[i] = std::make_shared<FloatKeyMap>();
-            mKeyList[i]->read(nif);
+            keys = std::make_shared<FloatKeyMap>();
+            keys->read(nif);
         }
     }
 
@@ -255,58 +182,61 @@ namespace Nif
         mKeyList->read(nif);
     }
 
+    void NiPixelFormat::read(NIFStream* nif)
+    {
+        mFormat = static_cast<Format>(nif->get<uint32_t>());
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 4, 0, 1))
+        {
+            nif->readArray(mColorMasks);
+            nif->read(mBitsPerPixel);
+            nif->readArray(mCompareBits);
+            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+                nif->read(mPixelTiling);
+        }
+        else
+        {
+            mBitsPerPixel = nif->get<uint8_t>();
+            nif->read(mRendererHint);
+            nif->read(mExtraData);
+            nif->read(mFlags);
+            nif->read(mPixelTiling);
+            if (nif->getVersion() >= NIFStream::generateVersion(20, 3, 0, 4))
+                nif->read(mUseSrgb);
+            for (int i = 0; i < 4; i++)
+                mChannels[i].read(nif);
+        }
+    }
+
+    void NiPixelFormat::ChannelData::read(NIFStream* nif)
+    {
+        mType = static_cast<Type>(nif->get<uint32_t>());
+        mConvention = static_cast<Convention>(nif->get<uint32_t>());
+        nif->read(mBitsPerChannel);
+        nif->read(mSigned);
+    }
+
     void NiPixelData::read(NIFStream* nif)
     {
-        fmt = (Format)nif->getUInt();
-
-        if (nif->getVersion() < NIFStream::generateVersion(10, 4, 0, 2))
+        mPixelFormat.read(nif);
+        mPalette.read(nif);
+        mMipmaps.resize(nif->get<uint32_t>());
+        nif->read(mBytesPerPixel);
+        for (Mipmap& mip : mMipmaps)
         {
-            for (unsigned int i = 0; i < 4; ++i)
-                colorMask[i] = nif->getUInt();
-            bpp = nif->getUInt();
-            nif->skip(8); // "Old Fast Compare". Whatever that means.
-            if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-                pixelTiling = nif->getUInt();
+            nif->read(mip.mWidth);
+            nif->read(mip.mHeight);
+            nif->read(mip.mOffset);
         }
-        else // TODO: see if anything from here needs to be implemented
-        {
-            bpp = nif->getChar();
-            nif->skip(4); // Renderer hint
-            nif->skip(4); // Extra data
-            nif->skip(4); // Flags
-            pixelTiling = nif->getUInt();
-            if (nif->getVersion() >= NIFStream::generateVersion(20, 3, 0, 4))
-                sRGB = nif->getBoolean();
-            nif->skip(4 * 10); // Channel data
-        }
-
-        palette.read(nif);
-
-        numberOfMipmaps = nif->getUInt();
-
-        // Bytes per pixel, should be bpp / 8
-        /* int bytes = */ nif->getUInt();
-
-        for (unsigned int i = 0; i < numberOfMipmaps; i++)
-        {
-            // Image size and offset in the following data field
-            Mipmap m;
-            m.width = nif->getUInt();
-            m.height = nif->getUInt();
-            m.dataOffset = nif->getUInt();
-            mipmaps.push_back(m);
-        }
-
-        // Read the data
-        unsigned int numPixels = nif->getUInt();
-        bool hasFaces = nif->getVersion() >= NIFStream::generateVersion(10, 4, 0, 2);
-        unsigned int numFaces = hasFaces ? nif->getUInt() : 1;
-        nif->readVector(data, numPixels * numFaces);
+        uint32_t numPixels;
+        nif->read(numPixels);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 4, 0, 2))
+            nif->read(mNumFaces);
+        nif->readVector(mData, numPixels * mNumFaces);
     }
 
     void NiPixelData::post(Reader& nif)
     {
-        palette.post(nif);
+        mPalette.post(nif);
     }
 
     void NiColorData::read(NIFStream* nif)
@@ -317,62 +247,154 @@ namespace Nif
 
     void NiVisData::read(NIFStream* nif)
     {
-        int count = nif->getInt();
-        mVis.resize(count);
-        for (size_t i = 0; i < mVis.size(); i++)
+        mKeys = std::make_shared<std::map<float, bool>>();
+        uint32_t numKeys;
+        nif->read(numKeys);
+        for (size_t i = 0; i < numKeys; i++)
         {
-            mVis[i].time = nif->getFloat();
-            mVis[i].isSet = (nif->getChar() != 0);
+            float time;
+            char value;
+            nif->read(time);
+            nif->read(value);
+            (*mKeys)[time] = (value != 0);
+        }
+    }
+
+    void NiSkinInstance::read(NIFStream* nif)
+    {
+        mData.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 101))
+            mPartitions.read(nif);
+        mRoot.read(nif);
+        readRecordList(nif, mBones);
+    }
+
+    void NiSkinInstance::post(Reader& nif)
+    {
+        mData.post(nif);
+        mPartitions.post(nif);
+        mRoot.post(nif);
+        postRecordList(nif, mBones);
+
+        if (mData.empty() || mRoot.empty())
+            throw Nif::Exception("NiSkinInstance missing root or data", nif.getFilename());
+
+        if (mBones.size() != mData->mBones.size())
+            throw Nif::Exception("Mismatch in NiSkinData bone count", nif.getFilename());
+
+        for (auto& bone : mBones)
+        {
+            if (bone.empty())
+                throw Nif::Exception("Oops: Missing bone! Don't know how to handle this.", nif.getFilename());
+            bone->setBone();
+        }
+    }
+
+    const Nif::NiSkinPartition* NiSkinInstance::getPartitions() const
+    {
+        const Nif::NiSkinPartition* partitions = nullptr;
+        if (!mPartitions.empty())
+            partitions = mPartitions.getPtr();
+        else if (!mData.empty() && !mData->mPartitions.empty())
+            partitions = mData->mPartitions.getPtr();
+
+        return partitions;
+    }
+
+    void BSDismemberSkinInstance::read(NIFStream* nif)
+    {
+        NiSkinInstance::read(nif);
+
+        mParts.resize(nif->get<uint32_t>());
+        for (BodyPart& part : mParts)
+        {
+            nif->read(part.mFlags);
+            nif->read(part.mType);
+        }
+    }
+
+    void BSSkinInstance::read(NIFStream* nif)
+    {
+        mRoot.read(nif);
+        mData.read(nif);
+        readRecordList(nif, mBones);
+        nif->readVector(mScales, nif->get<uint32_t>());
+    }
+
+    void BSSkinInstance::post(Reader& nif)
+    {
+        mRoot.post(nif);
+        mData.post(nif);
+        postRecordList(nif, mBones);
+        if (mData.empty() || mRoot.empty())
+            throw Nif::Exception("BSSkin::Instance missing root or data", nif.getFilename());
+
+        if (mBones.size() != mData->mBones.size())
+            throw Nif::Exception("Mismatch in BSSkin::BoneData bone count", nif.getFilename());
+
+        for (auto& bone : mBones)
+        {
+            if (bone.empty())
+                throw Nif::Exception("Oops: Missing bone! Don't know how to handle this.", nif.getFilename());
+            bone->setBone();
         }
     }
 
     void NiSkinData::read(NIFStream* nif)
     {
-        trafo.rotation = nif->getMatrix3();
-        trafo.pos = nif->getVector3();
-        trafo.scale = nif->getFloat();
-
-        int boneNum = nif->getInt();
-        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW
-            && nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 0))
-            partitions.read(nif);
+        nif->read(mTransform);
 
+        uint32_t numBones;
+        nif->read(numBones);
         bool hasVertexWeights = true;
-        if (nif->getVersion() > NIFStream::generateVersion(4, 2, 1, 0))
-            hasVertexWeights = nif->getBoolean();
-
-        bones.resize(boneNum);
-        for (BoneInfo& bi : bones)
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW)
         {
-            bi.trafo.rotation = nif->getMatrix3();
-            bi.trafo.pos = nif->getVector3();
-            bi.trafo.scale = nif->getFloat();
-            bi.boundSphereCenter = nif->getVector3();
-            bi.boundSphereRadius = nif->getFloat();
+            if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 0))
+                mPartitions.read(nif);
 
-            size_t numVertices = nif->getUShort();
+            if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 1, 0))
+                nif->read(hasVertexWeights);
+        }
+
+        mBones.resize(numBones);
+        for (BoneInfo& bi : mBones)
+        {
+            nif->read(bi.mTransform);
+            nif->read(bi.mBoundSphere);
+
+            uint16_t numVertices;
+            nif->read(numVertices);
 
             if (!hasVertexWeights)
                 continue;
 
-            bi.weights.resize(numVertices);
-            for (size_t j = 0; j < bi.weights.size(); j++)
+            bi.mWeights.resize(numVertices);
+            for (auto& [vertex, weight] : bi.mWeights)
             {
-                bi.weights[j].vertex = nif->getUShort();
-                bi.weights[j].weight = nif->getFloat();
+                nif->read(vertex);
+                nif->read(weight);
             }
         }
     }
 
     void NiSkinData::post(Reader& nif)
     {
-        partitions.post(nif);
+        mPartitions.post(nif);
+    }
+
+    void BSSkinBoneData::read(NIFStream* nif)
+    {
+        mBones.resize(nif->get<uint32_t>());
+        for (BoneInfo& bone : mBones)
+        {
+            nif->read(bone.mBoundSphere);
+            nif->read(bone.mTransform);
+        }
     }
 
     void NiSkinPartition::read(NIFStream* nif)
     {
-        nif->read(mPartitionNum);
-        mPartitions.resize(mPartitionNum);
+        mPartitions.resize(nif->get<uint32_t>());
 
         if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_SSE)
         {
@@ -391,103 +413,76 @@ namespace Nif
 
     void NiSkinPartition::Partition::read(NIFStream* nif)
     {
-        size_t numVertices = nif->getUShort();
-        size_t numTriangles = nif->getUShort();
-        size_t numBones = nif->getUShort();
-        size_t numStrips = nif->getUShort();
-        size_t bonesPerVertex = nif->getUShort();
-        nif->readVector(bones, numBones);
-
-        bool hasVertexMap = true;
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            hasVertexMap = nif->getBoolean();
-        if (hasVertexMap)
-            nif->readVector(vertexMap, numVertices);
-
-        bool hasVertexWeights = true;
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            hasVertexWeights = nif->getBoolean();
-        if (hasVertexWeights)
-            nif->readVector(weights, numVertices * bonesPerVertex);
-
+        uint16_t numVertices, numTriangles, numBones, numStrips, bonesPerVertex;
+        nif->read(numVertices);
+        nif->read(numTriangles);
+        nif->read(numBones);
+        nif->read(numStrips);
+        nif->read(bonesPerVertex);
+        nif->readVector(mBones, numBones);
+        bool hasPresenceFlags = nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0);
+        if (!hasPresenceFlags || nif->get<bool>())
+            nif->readVector(mVertexMap, numVertices);
+        if (!hasPresenceFlags || nif->get<bool>())
+            nif->readVector(mWeights, static_cast<size_t>(numVertices) * bonesPerVertex);
         std::vector<unsigned short> stripLengths;
         nif->readVector(stripLengths, numStrips);
-
-        bool hasFaces = true;
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            hasFaces = nif->getBoolean();
-        if (hasFaces)
+        if (!hasPresenceFlags || nif->get<bool>())
         {
             if (numStrips)
             {
-                strips.resize(numStrips);
+                mStrips.resize(numStrips);
                 for (size_t i = 0; i < numStrips; i++)
-                    nif->readVector(strips[i], stripLengths[i]);
+                    nif->readVector(mStrips[i], stripLengths[i]);
             }
             else
-                nif->readVector(triangles, numTriangles * 3);
+                nif->readVector(mTriangles, numTriangles * 3);
         }
-        bool hasBoneIndices = nif->getChar() != 0;
-        if (hasBoneIndices)
-            nif->readVector(boneIndices, numVertices * bonesPerVertex);
+        if (nif->get<uint8_t>() != 0)
+            nif->readVector(mBoneIndices, static_cast<size_t>(numVertices) * bonesPerVertex);
         if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
         {
-            nif->getChar(); // LOD level
-            nif->getBoolean(); // Global VB
+            nif->read(mLODLevel);
+            nif->read(mGlobalVB);
+            if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_SSE)
+            {
+                mVertexDesc.read(nif);
+                nif->readVector(mTrueTriangles, numTriangles * 3);
+            }
         }
 
-        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_SSE)
+        // Not technically a part of the loading process
+        if (mTrueTriangles.empty() && !mVertexMap.empty())
         {
-            mVertexDesc.read(nif);
-            nif->readVector(trueTriangles, numTriangles * 3);
+            if (!mStrips.empty())
+            {
+                mTrueStrips = mStrips;
+                for (auto& strip : mTrueStrips)
+                    for (auto& index : strip)
+                        index = mVertexMap[index];
+            }
+            else if (!mTriangles.empty())
+            {
+                mTrueTriangles = mTriangles;
+                for (unsigned short& index : mTrueTriangles)
+                    index = mVertexMap[index];
+            }
         }
     }
 
-    std::vector<unsigned short> NiSkinPartition::Partition::getTrueTriangles() const
-    {
-        if (!trueTriangles.empty())
-            return trueTriangles;
-
-        std::vector<unsigned short> remappedTriangles;
-        if (vertexMap.empty() || triangles.empty())
-            return remappedTriangles;
-
-        remappedTriangles = triangles;
-
-        for (unsigned short& index : remappedTriangles)
-            index = vertexMap[index];
-        return remappedTriangles;
-    }
-
-    std::vector<std::vector<unsigned short>> NiSkinPartition::Partition::getTrueStrips() const
-    {
-        if (!trueTriangles.empty())
-            return {};
-
-        std::vector<std::vector<unsigned short>> remappedStrips;
-        if (vertexMap.empty() || strips.empty())
-            return remappedStrips;
-
-        remappedStrips = strips;
-        for (auto& strip : remappedStrips)
-            for (auto& index : strip)
-                index = vertexMap[index];
-
-        return remappedStrips;
-    }
-
     void NiMorphData::read(NIFStream* nif)
     {
-        int morphCount = nif->getInt();
-        int vertCount = nif->getInt();
-        nif->getChar(); // Relative targets, always 1
+        uint32_t numMorphs, numVerts;
+        nif->read(numMorphs);
+        nif->read(numVerts);
+        nif->read(mRelativeTargets);
 
-        mMorphs.resize(morphCount);
-        for (int i = 0; i < morphCount; i++)
+        mMorphs.resize(numMorphs);
+        for (MorphData& morph : mMorphs)
         {
-            mMorphs[i].mKeyFrames = std::make_shared<FloatKeyMap>();
-            mMorphs[i].mKeyFrames->read(nif, /*morph*/ true);
-            nif->readVector(mMorphs[i].mVertices, vertCount);
+            morph.mKeyFrames = std::make_shared<FloatKeyMap>();
+            morph.mKeyFrames->read(nif, /*morph*/ true);
+            nif->readVector(morph.mVertices, numVerts);
         }
     }
 
@@ -498,7 +493,7 @@ namespace Nif
         if (mRotations->mInterpolationType == InterpolationType_XYZ)
         {
             if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 0))
-                mAxisOrder = static_cast<AxisOrder>(nif->getInt());
+                mAxisOrder = static_cast<AxisOrder>(nif->get<uint32_t>());
             mXRotations = std::make_shared<FloatKeyMap>();
             mYRotations = std::make_shared<FloatKeyMap>();
             mZRotations = std::make_shared<FloatKeyMap>();
@@ -514,28 +509,83 @@ namespace Nif
 
     void NiPalette::read(NIFStream* nif)
     {
-        unsigned int alphaMask = !nif->getChar() ? 0xFF000000 : 0;
+        bool useAlpha = nif->get<uint8_t>() != 0;
+        uint32_t alphaMask = useAlpha ? 0 : 0xFF000000;
+
+        uint32_t numEntries;
+        nif->read(numEntries);
         // Fill the entire palette with black even if there isn't enough entries.
-        colors.resize(256);
-        unsigned int numEntries = nif->getUInt();
-        for (unsigned int i = 0; i < numEntries; i++)
-            colors[i] = nif->getUInt() | alphaMask;
+        mColors.resize(numEntries > 256 ? numEntries : 256);
+        for (uint32_t i = 0; i < numEntries; i++)
+        {
+            nif->read(mColors[i]);
+            mColors[i] |= alphaMask;
+        }
     }
 
     void NiStringPalette::read(NIFStream* nif)
     {
-        palette = nif->getStringPalette();
-        if (nif->getUInt() != palette.size())
+        mPalette = nif->getStringPalette();
+        if (nif->get<uint32_t>() != mPalette.size())
             Log(Debug::Warning) << "NIFFile Warning: Failed size check in NiStringPalette. File: "
                                 << nif->getFile().getFilename();
     }
 
     void NiBoolData::read(NIFStream* nif)
     {
-        mKeyList = std::make_shared<ByteKeyMap>();
+        mKeyList = std::make_shared<BoolKeyMap>();
         mKeyList->read(nif);
     }
 
+    void NiBSplineData::read(NIFStream* nif)
+    {
+        nif->readVector(mFloatControlPoints, nif->get<uint32_t>());
+        nif->readVector(mCompactControlPoints, nif->get<uint32_t>());
+    }
+
+    void NiBSplineBasisData::read(NIFStream* nif)
+    {
+        nif->read(mNumControlPoints);
+    }
+
+    void NiAdditionalGeometryData::read(NIFStream* nif)
+    {
+        nif->read(mNumVertices);
+        mBlockInfos.resize(nif->get<uint32_t>());
+        for (DataStream& info : mBlockInfos)
+            info.read(nif);
+        mBlocks.resize(nif->get<uint32_t>());
+        for (DataBlock& block : mBlocks)
+            block.read(nif, recType == RC_BSPackedAdditionalGeometryData);
+    }
+
+    void NiAdditionalGeometryData::DataStream::read(NIFStream* nif)
+    {
+        nif->read(mType);
+        nif->read(mUnitSize);
+        nif->read(mTotalSize);
+        nif->read(mStride);
+        nif->read(mBlockIndex);
+        nif->read(mBlockOffset);
+        nif->read(mFlags);
+    }
+
+    void NiAdditionalGeometryData::DataBlock::read(NIFStream* nif, bool bsPacked)
+    {
+        nif->read(mValid);
+        if (!mValid)
+            return;
+        nif->read(mBlockSize);
+        nif->readVector(mBlockOffsets, nif->get<uint32_t>());
+        nif->readVector(mDataSizes, nif->get<uint32_t>());
+        nif->readVector(mData, mDataSizes.size() * mBlockSize);
+        if (bsPacked)
+        {
+            nif->read(mShaderIndex);
+            nif->read(mTotalSize);
+        }
+    }
+
     void BSMultiBound::read(NIFStream* nif)
     {
         mData.read(nif);
@@ -546,17 +596,49 @@ namespace Nif
         mData.post(nif);
     }
 
+    void BSMultiBoundAABB::read(NIFStream* nif)
+    {
+        nif->read(mPosition);
+        nif->read(mExtents);
+    }
+
     void BSMultiBoundOBB::read(NIFStream* nif)
     {
-        mCenter = nif->getVector3();
-        mSize = nif->getVector3();
-        mRotation = nif->getMatrix3();
+        nif->read(mCenter);
+        nif->read(mSize);
+        nif->read(mRotation);
     }
 
     void BSMultiBoundSphere::read(NIFStream* nif)
     {
-        mCenter = nif->getVector3();
-        mRadius = nif->getFloat();
+        nif->read(mSphere);
+    }
+
+    void BSAnimNote::read(NIFStream* nif)
+    {
+        mType = static_cast<Type>(nif->get<uint32_t>());
+        nif->read(mTime);
+        if (mType == Type::GrabIK)
+        {
+            nif->read(mArm);
+        }
+        else if (mType == Type::LookIK)
+        {
+            nif->read(mGain);
+            nif->read(mState);
+        }
+    }
+
+    void BSAnimNotes::read(NIFStream* nif)
+    {
+        mList.resize(nif->get<uint16_t>());
+        for (auto& note : mList)
+            note.read(nif);
+    }
+
+    void BSAnimNotes::post(Reader& nif)
+    {
+        postRecordList(nif, mList);
     }
 
 } // Namespace
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 6f0ca25237..1ccd2919b7 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -1,33 +1,10 @@
-/*
-  OpenMW - The completely unofficial reimplementation of Morrowind
-  Copyright (C) 2008-2010  Nicolay Korslund
-  Email: < korslund@gmail.com >
-  WWW: https://openmw.org/
-
-  This file (data.h) is part of the OpenMW package.
-
-  OpenMW is distributed as free software: you can redistribute it
-  and/or modify it under the terms of the GNU General Public License
-  version 3, as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  version 3 along with this program. If not, see
-  https://www.gnu.org/licenses/ .
-
- */
-
 #ifndef OPENMW_COMPONENTS_NIF_DATA_HPP
 #define OPENMW_COMPONENTS_NIF_DATA_HPP
 
 #include "nifkey.hpp"
-#include "niftypes.hpp" // Transformation
+#include "niftypes.hpp" // NiTransform
+#include "node.hpp"
 #include "recordptr.hpp"
-#include <components/nif/node.hpp>
 
 namespace Nif
 {
@@ -35,11 +12,26 @@ namespace Nif
     // Common ancestor for several data classes
     struct NiGeometryData : public Record
     {
-        std::vector<osg::Vec3f> vertices, normals, tangents, bitangents;
-        std::vector<osg::Vec4f> colors;
-        std::vector<std::vector<osg::Vec2f>> uvlist;
-        osg::Vec3f center;
-        float radius;
+        // Interpretation of Flags field differs depending on the version
+        enum DataFlags
+        {
+            DataFlag_HasUV = 0x0001,
+            DataFlag_NumUVsMask = 0x003F,
+            DataFlag_HasTangents = 0x1000,
+        };
+
+        int32_t mGroupId{ 0 };
+        uint16_t mNumVertices;
+        uint8_t mKeepFlags{ 0 };
+        uint8_t mCompressFlags{ 0 };
+        std::vector<osg::Vec3f> mVertices;
+        uint16_t mDataFlags{ 0 };
+        uint32_t mMaterialHash;
+        std::vector<osg::Vec3f> mNormals, mTangents, mBitangents;
+        osg::BoundingSpheref mBoundingSphere;
+        std::vector<osg::Vec4f> mColors;
+        std::vector<std::vector<osg::Vec2f>> mUVList;
+        uint16_t mConsistencyType;
 
         void read(NIFStream* nif) override;
     };
@@ -47,7 +39,7 @@ namespace Nif
     // Abstract
     struct NiTriBasedGeomData : public NiGeometryData
     {
-        size_t mNumTriangles;
+        uint16_t mNumTriangles;
 
         void read(NIFStream* nif) override;
     };
@@ -55,7 +47,8 @@ namespace Nif
     struct NiTriShapeData : public NiTriBasedGeomData
     {
         // Triangles, three vertex indices per triangle
-        std::vector<unsigned short> triangles;
+        std::vector<unsigned short> mTriangles;
+        std::vector<std::vector<unsigned short>> mMatchGroups;
 
         void read(NIFStream* nif) override;
     };
@@ -63,7 +56,7 @@ namespace Nif
     struct NiTriStripsData : public NiTriBasedGeomData
     {
         // Triangle strips, series of vertex indices.
-        std::vector<std::vector<unsigned short>> strips;
+        std::vector<std::vector<unsigned short>> mStrips;
 
         void read(NIFStream* nif) override;
     };
@@ -71,29 +64,12 @@ namespace Nif
     struct NiLinesData : public NiGeometryData
     {
         // Lines, series of indices that correspond to connected vertices.
-        std::vector<unsigned short> lines;
+        // NB: assumes <=65536 number of vertices
+        std::vector<uint16_t> mLines;
 
         void read(NIFStream* nif) override;
     };
 
-    struct NiParticlesData : public NiGeometryData
-    {
-        int numParticles{ 0 };
-
-        int activeCount{ 0 };
-
-        std::vector<float> particleRadii, sizes, rotationAngles;
-        std::vector<osg::Quat> rotations;
-        std::vector<osg::Vec3f> rotationAxes;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiRotatingParticlesData : public NiParticlesData
-    {
-        void read(NIFStream* nif) override;
-    };
-
     struct NiPosData : public Record
     {
         Vector3KeyMapPtr mKeyList;
@@ -103,7 +79,7 @@ namespace Nif
 
     struct NiUVData : public Record
     {
-        FloatKeyMapPtr mKeyList[4];
+        std::array<FloatKeyMapPtr, 4> mKeyList;
 
         void read(NIFStream* nif) override;
     };
@@ -115,37 +91,94 @@ namespace Nif
         void read(NIFStream* nif) override;
     };
 
+    struct NiPixelFormat
+    {
+        enum class Format : uint32_t
+        {
+            RGB = 0,
+            RGBA = 1,
+            Palette = 2,
+            PaletteAlpha = 3,
+            BGR = 4,
+            BGRA = 5,
+            DXT1 = 6,
+            DXT3 = 7,
+            DXT5 = 8,
+        };
+
+        struct ChannelData
+        {
+            enum class Type : uint32_t
+            {
+                Red = 0,
+                Green = 1,
+                Blue = 2,
+                Alpha = 3,
+                Compressed = 4,
+                OffsetU = 5,
+                OffsetV = 6,
+                OffsetW = 7,
+                OffsetQ = 8,
+                Luma = 9,
+                Height = 10,
+                VectorX = 11,
+                VectorY = 12,
+                VectorZ = 13,
+                Padding = 14,
+                Intensity = 15,
+                Index = 16,
+                Depth = 17,
+                Stencil = 18,
+                Empty = 19,
+            };
+
+            enum class Convention : uint32_t
+            {
+                NormInt = 0,
+                Half = 1,
+                Float = 2,
+                Index = 3,
+                Compressed = 4,
+                Unknown = 5,
+                Int = 6,
+            };
+
+            Type mType;
+            Convention mConvention;
+            uint8_t mBitsPerChannel;
+            bool mSigned;
+
+            void read(NIFStream* nif);
+        };
+
+        Format mFormat{ Format::RGB };
+        std::array<uint32_t, 4> mColorMasks;
+        uint32_t mBitsPerPixel{ 0 };
+        uint32_t mPixelTiling{ 0 };
+        std::array<uint32_t, 2> mCompareBits;
+        uint32_t mRendererHint{ 0 };
+        uint32_t mExtraData{ 0 };
+        uint8_t mFlags{ 0 };
+        bool mUseSrgb{ false };
+        std::array<ChannelData, 4> mChannels;
+
+        void read(NIFStream* nif);
+    };
+
     struct NiPixelData : public Record
     {
-        enum Format
-        {
-            NIPXFMT_RGB8,
-            NIPXFMT_RGBA8,
-            NIPXFMT_PAL8,
-            NIPXFMT_PALA8,
-            NIPXFMT_BGR8,
-            NIPXFMT_BGRA8,
-            NIPXFMT_DXT1,
-            NIPXFMT_DXT3,
-            NIPXFMT_DXT5
-        };
-        Format fmt{ NIPXFMT_RGB8 };
-
-        unsigned int colorMask[4]{ 0 };
-        unsigned int bpp{ 0 }, pixelTiling{ 0 };
-        bool sRGB{ false };
-
-        NiPalettePtr palette;
-        unsigned int numberOfMipmaps{ 0 };
-
         struct Mipmap
         {
-            int width, height;
-            int dataOffset;
+            uint32_t mWidth, mHeight;
+            uint32_t mOffset;
         };
-        std::vector<Mipmap> mipmaps;
 
-        std::vector<unsigned char> data;
+        NiPixelFormat mPixelFormat;
+        NiPalettePtr mPalette;
+        uint32_t mBytesPerPixel;
+        std::vector<Mipmap> mMipmaps;
+        uint32_t mNumFaces{ 1 };
+        std::vector<uint8_t> mData;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
@@ -160,74 +193,99 @@ namespace Nif
 
     struct NiVisData : public Record
     {
-        struct VisData
-        {
-            float time;
-            bool isSet;
-        };
-        std::vector<VisData> mVis;
+        // TODO: investigate possible use of BoolKeyMap
+        std::shared_ptr<std::map<float, bool>> mKeys;
 
         void read(NIFStream* nif) override;
     };
 
     struct NiSkinInstance : public Record
     {
-        NiSkinDataPtr data;
-        NiSkinPartitionPtr partitions;
-        NodePtr root;
-        NodeList bones;
+        NiSkinDataPtr mData;
+        NiSkinPartitionPtr mPartitions;
+        NiAVObjectPtr mRoot;
+        NiAVObjectList mBones;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
+
+        const Nif::NiSkinPartition* getPartitions() const;
     };
 
     struct BSDismemberSkinInstance : public NiSkinInstance
     {
+        struct BodyPart
+        {
+            uint16_t mFlags;
+            uint16_t mType;
+        };
+
+        std::vector<BodyPart> mParts;
+
         void read(NIFStream* nif) override;
     };
 
+    struct BSSkinInstance : Record
+    {
+        NiAVObjectPtr mRoot;
+        BSSkinBoneDataPtr mData;
+        NiAVObjectList mBones;
+        std::vector<osg::Vec3f> mScales;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
     struct NiSkinData : public Record
     {
-        struct VertWeight
-        {
-            unsigned short vertex;
-            float weight;
-        };
+        using VertWeight = std::pair<unsigned short, float>;
 
         struct BoneInfo
         {
-            Transformation trafo;
-            osg::Vec3f boundSphereCenter;
-            float boundSphereRadius;
-            std::vector<VertWeight> weights;
+            NiTransform mTransform;
+            osg::BoundingSpheref mBoundSphere;
+            std::vector<VertWeight> mWeights;
         };
 
-        Transformation trafo;
-        std::vector<BoneInfo> bones;
-        NiSkinPartitionPtr partitions;
+        NiTransform mTransform;
+        std::vector<BoneInfo> mBones;
+        NiSkinPartitionPtr mPartitions;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
+    struct BSSkinBoneData : Record
+    {
+        struct BoneInfo
+        {
+            osg::BoundingSpheref mBoundSphere;
+            NiTransform mTransform;
+        };
+
+        std::vector<BoneInfo> mBones;
+
+        void read(NIFStream* nif) override;
+    };
+
     struct NiSkinPartition : public Record
     {
         struct Partition
         {
-            std::vector<unsigned short> bones;
-            std::vector<unsigned short> vertexMap;
-            std::vector<float> weights;
-            std::vector<std::vector<unsigned short>> strips;
-            std::vector<unsigned short> triangles;
-            std::vector<unsigned short> trueTriangles;
-            std::vector<char> boneIndices;
+            std::vector<unsigned short> mBones;
+            std::vector<unsigned short> mVertexMap;
+            std::vector<float> mWeights;
+            std::vector<std::vector<unsigned short>> mStrips;
+            std::vector<unsigned short> mTriangles;
+            std::vector<char> mBoneIndices;
             BSVertexDesc mVertexDesc;
+            std::vector<unsigned short> mTrueTriangles;
+            std::vector<std::vector<unsigned short>> mTrueStrips;
+            uint8_t mLODLevel;
+            bool mGlobalVB;
 
             void read(NIFStream* nif);
-            std::vector<unsigned short> getTrueTriangles() const;
-            std::vector<std::vector<unsigned short>> getTrueStrips() const;
         };
-        unsigned int mPartitionNum;
         std::vector<Partition> mPartitions;
 
         unsigned int mDataSize;
@@ -245,6 +303,8 @@ namespace Nif
             FloatKeyMapPtr mKeyFrames;
             std::vector<osg::Vec3f> mVertices;
         };
+
+        uint8_t mRelativeTargets;
         std::vector<MorphData> mMorphs;
 
         void read(NIFStream* nif) override;
@@ -262,7 +322,7 @@ namespace Nif
         Vector3KeyMapPtr mTranslations;
         FloatKeyMapPtr mScales;
 
-        enum class AxisOrder
+        enum class AxisOrder : uint32_t
         {
             Order_XYZ = 0,
             Order_XZY = 1,
@@ -283,23 +343,75 @@ namespace Nif
     struct NiPalette : public Record
     {
         // 32-bit RGBA colors that correspond to 8-bit indices
-        std::vector<unsigned int> colors;
+        std::vector<uint32_t> mColors;
 
         void read(NIFStream* nif) override;
     };
 
     struct NiStringPalette : public Record
     {
-        std::string palette;
+        std::string mPalette;
+
         void read(NIFStream* nif) override;
     };
 
     struct NiBoolData : public Record
     {
-        ByteKeyMapPtr mKeyList;
+        BoolKeyMapPtr mKeyList;
+
         void read(NIFStream* nif) override;
     };
 
+    struct NiBSplineData : public Record
+    {
+        std::vector<float> mFloatControlPoints;
+        std::vector<int16_t> mCompactControlPoints;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiBSplineBasisData : public Record
+    {
+        uint32_t mNumControlPoints;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiAdditionalGeometryData : public Record
+    {
+        struct DataStream
+        {
+            uint32_t mType;
+            uint32_t mUnitSize;
+            uint32_t mTotalSize;
+            uint32_t mStride;
+            uint32_t mBlockIndex;
+            uint32_t mBlockOffset;
+            uint8_t mFlags;
+
+            void read(NIFStream* nif);
+        };
+
+        struct DataBlock
+        {
+            bool mValid;
+            uint32_t mBlockSize;
+            std::vector<uint32_t> mBlockOffsets;
+            std::vector<uint32_t> mDataSizes;
+            std::vector<char> mData;
+            uint32_t mShaderIndex;
+            uint32_t mTotalSize;
+
+            void read(NIFStream* nif, bool bsPacked);
+        };
+
+        uint16_t mNumVertices;
+        std::vector<DataStream> mBlockInfos;
+        std::vector<DataBlock> mBlocks;
+
+        void read(NIFStream* nif);
+    };
+
     struct BSMultiBound : public Record
     {
         BSMultiBoundDataPtr mData;
@@ -313,6 +425,14 @@ namespace Nif
     {
     };
 
+    struct BSMultiBoundAABB : public BSMultiBoundData
+    {
+        osg::Vec3f mPosition;
+        osg::Vec3f mExtents;
+
+        void read(NIFStream* nif) override;
+    };
+
     struct BSMultiBoundOBB : public BSMultiBoundData
     {
         osg::Vec3f mCenter;
@@ -324,11 +444,36 @@ namespace Nif
 
     struct BSMultiBoundSphere : public BSMultiBoundData
     {
-        osg::Vec3f mCenter;
-        float mRadius;
+        osg::BoundingSpheref mSphere;
 
         void read(NIFStream* nif) override;
     };
 
-} // Namespace
+    struct BSAnimNote : public Record
+    {
+        enum class Type : uint32_t
+        {
+            Invalid = 0,
+            GrabIK = 1,
+            LookIK = 2,
+        };
+
+        Type mType;
+        float mTime;
+        uint32_t mArm;
+        float mGain;
+        uint32_t mState;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSAnimNotes : public Record
+    {
+        BSAnimNoteList mList;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+}
 #endif
diff --git a/components/nif/effect.cpp b/components/nif/effect.cpp
index 3b90d50564..47d1863352 100644
--- a/components/nif/effect.cpp
+++ b/components/nif/effect.cpp
@@ -1,63 +1,71 @@
 #include "effect.hpp"
 
-#include "controlled.hpp"
 #include "node.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
 
     void NiDynamicEffect::read(NIFStream* nif)
     {
-        Node::read(nif);
-        if (nif->getVersion() >= nif->generateVersion(10, 1, 0, 106)
-            && nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4)
-            nif->getBoolean(); // Switch state
-        if (nif->getVersion() <= NIFFile::VER_MW
-            || (nif->getVersion() >= nif->generateVersion(10, 1, 0, 0)
-                && nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4))
-        {
-            size_t numAffectedNodes = nif->get<uint32_t>();
-            nif->skip(numAffectedNodes * 4);
-        }
+        NiAVObject::read(nif);
+
+        if (nif->getVersion() > NIFFile::VER_MW && nif->getVersion() < nif->generateVersion(10, 1, 0, 0))
+            return;
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
+            return;
+
+        if (nif->getVersion() >= nif->generateVersion(10, 1, 0, 106))
+            nif->read(mSwitchState);
+        size_t numAffectedNodes = nif->get<uint32_t>();
+        nif->skip(numAffectedNodes * 4);
     }
 
     void NiLight::read(NIFStream* nif)
     {
         NiDynamicEffect::read(nif);
 
-        dimmer = nif->getFloat();
-        ambient = nif->getVector3();
-        diffuse = nif->getVector3();
-        specular = nif->getVector3();
+        nif->read(mDimmer);
+        nif->read(mAmbient);
+        nif->read(mDiffuse);
+        nif->read(mSpecular);
+    }
+
+    void NiPointLight::read(NIFStream* nif)
+    {
+        NiLight::read(nif);
+
+        nif->read(mConstantAttenuation);
+        nif->read(mLinearAttenuation);
+        nif->read(mQuadraticAttenuation);
+    }
+
+    void NiSpotLight::read(NIFStream* nif)
+    {
+        NiPointLight::read(nif);
+
+        nif->read(mOuterSpotAngle);
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
+            nif->read(mInnerSpotAngle);
+        nif->read(mExponent);
     }
 
     void NiTextureEffect::read(NIFStream* nif)
     {
         NiDynamicEffect::read(nif);
 
-        // Model Projection Matrix
-        nif->skip(3 * 3 * sizeof(float));
-
-        // Model Projection Transform
-        nif->skip(3 * sizeof(float));
-
-        // Texture Filtering
-        nif->skip(4);
-
-        // Max anisotropy samples
+        nif->read(mProjectionRotation);
+        nif->read(mProjectionPosition);
+        nif->read(mFilterMode);
         if (nif->getVersion() >= NIFStream::generateVersion(20, 5, 0, 4))
-            nif->skip(2);
-
-        clamp = nif->getUInt();
-
-        textureType = (TextureType)nif->getUInt();
-
-        coordGenType = (CoordGenType)nif->getUInt();
-
-        texture.read(nif);
-
-        nif->skip(1); // Use clipping plane
-        nif->skip(16); // Clipping plane dimensions vector
+            nif->read(mMaxAnisotropy);
+        nif->read(mClampMode);
+        mTextureType = static_cast<TextureType>(nif->get<uint32_t>());
+        mCoordGenType = static_cast<CoordGenType>(nif->get<uint32_t>());
+        mTexture.read(nif);
+        nif->read(mEnableClipPlane);
+        mClipPlane = osg::Plane(nif->get<osg::Vec4f>());
         if (nif->getVersion() <= NIFStream::generateVersion(10, 2, 0, 0))
             nif->skip(4); // PS2-specific shorts
         if (nif->getVersion() <= NIFStream::generateVersion(4, 1, 0, 12))
@@ -67,24 +75,8 @@ namespace Nif
     void NiTextureEffect::post(Reader& nif)
     {
         NiDynamicEffect::post(nif);
-        texture.post(nif);
-    }
 
-    void NiPointLight::read(NIFStream* nif)
-    {
-        NiLight::read(nif);
-
-        constantAttenuation = nif->getFloat();
-        linearAttenuation = nif->getFloat();
-        quadraticAttenuation = nif->getFloat();
-    }
-
-    void NiSpotLight::read(NIFStream* nif)
-    {
-        NiPointLight::read(nif);
-
-        cutoff = nif->getFloat();
-        exponent = nif->getFloat();
+        mTexture.post(nif);
     }
 
 }
diff --git a/components/nif/effect.hpp b/components/nif/effect.hpp
index ea9e21f003..2dd18d5304 100644
--- a/components/nif/effect.hpp
+++ b/components/nif/effect.hpp
@@ -29,67 +29,76 @@
 namespace Nif
 {
 
-    struct NiDynamicEffect : public Node
+    // Abstract
+    struct NiDynamicEffect : public NiAVObject
     {
+        bool mSwitchState{ true };
         void read(NIFStream* nif) override;
     };
 
-    // Used as base for NiAmbientLight, NiDirectionalLight, NiPointLight and NiSpotLight.
+    // Abstract light source
     struct NiLight : NiDynamicEffect
     {
-        float dimmer;
-        osg::Vec3f ambient;
-        osg::Vec3f diffuse;
-        osg::Vec3f specular;
+        float mDimmer;
+        osg::Vec3f mAmbient;
+        osg::Vec3f mDiffuse;
+        osg::Vec3f mSpecular;
 
         void read(NIFStream* nif) override;
     };
 
     struct NiPointLight : public NiLight
     {
-        float constantAttenuation;
-        float linearAttenuation;
-        float quadraticAttenuation;
+        float mConstantAttenuation;
+        float mLinearAttenuation;
+        float mQuadraticAttenuation;
 
         void read(NIFStream* nif) override;
     };
 
     struct NiSpotLight : public NiPointLight
     {
-        float cutoff;
-        float exponent;
+        float mOuterSpotAngle;
+        float mInnerSpotAngle{ 0.f };
+        float mExponent;
         void read(NIFStream* nif) override;
     };
 
     struct NiTextureEffect : NiDynamicEffect
     {
-        NiSourceTexturePtr texture;
-        unsigned int clamp;
-
-        enum TextureType
+        enum class TextureType : uint32_t
         {
-            Projected_Light = 0,
-            Projected_Shadow = 1,
-            Environment_Map = 2,
-            Fog_Map = 3
+            ProjectedLight = 0,
+            ProjectedShadow = 1,
+            EnvironmentMap = 2,
+            FogMap = 3,
         };
-        TextureType textureType;
 
-        enum CoordGenType
+        enum class CoordGenType : uint32_t
         {
-            World_Parallel = 0,
-            World_Perspective,
-            Sphere_Map,
-            Specular_Cube_Map,
-            Diffuse_Cube_Map
+            WorldParallel = 0,
+            WorldPerspective = 1,
+            SphereMap = 2,
+            SpecularCubeMap = 3,
+            DiffuseCubeMap = 4,
         };
-        CoordGenType coordGenType;
+
+        Matrix3 mProjectionRotation;
+        osg::Vec3f mProjectionPosition;
+        uint32_t mFilterMode;
+        NiSourceTexturePtr mTexture;
+        uint16_t mMaxAnisotropy{ 0 };
+        uint32_t mClampMode;
+        TextureType mTextureType;
+        CoordGenType mCoordGenType;
+        uint8_t mEnableClipPlane;
+        osg::Plane mClipPlane;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
 
-        bool wrapT() const { return clamp & 1; }
-        bool wrapS() const { return (clamp >> 1) & 1; }
+        bool wrapT() const { return mClampMode & 1; }
+        bool wrapS() const { return mClampMode & 2; }
     };
 
 } // Namespace
diff --git a/components/nif/exception.hpp b/components/nif/exception.hpp
index 15f0e76d70..b123d6dc4f 100644
--- a/components/nif/exception.hpp
+++ b/components/nif/exception.hpp
@@ -1,18 +1,21 @@
 #ifndef OPENMW_COMPONENTS_NIF_EXCEPTION_HPP
 #define OPENMW_COMPONENTS_NIF_EXCEPTION_HPP
 
-#include <filesystem>
 #include <stdexcept>
 #include <string>
 
-#include <components/files/conversion.hpp>
-
 namespace Nif
 {
     struct Exception : std::runtime_error
     {
-        explicit Exception(const std::string& message, const std::filesystem::path& path)
-            : std::runtime_error("NIFFile Error: " + message + " when reading " + Files::pathToUnicodeString(path))
+        explicit Exception(std::string_view message, std::string_view path)
+            : std::runtime_error([&] {
+                std::string result = "NIFFile Error: ";
+                result += message;
+                result += " when reading ";
+                result += path;
+                return result;
+            }())
         {
         }
     };
diff --git a/components/nif/extra.cpp b/components/nif/extra.cpp
index 4384289f9e..4ebd0bf517 100644
--- a/components/nif/extra.cpp
+++ b/components/nif/extra.cpp
@@ -6,25 +6,28 @@ namespace Nif
     void NiExtraData::read(NIFStream* nif)
     {
         Extra::read(nif);
-        nif->readVector(data, recordSize);
+
+        nif->readVector(mData, mRecordSize);
     }
 
-    void NiStringExtraData::read(NIFStream* nif)
+    void NiStringsExtraData::read(NIFStream* nif)
     {
         Extra::read(nif);
-        string = nif->getString();
+
+        nif->getSizedStrings(mData, nif->get<uint32_t>());
     }
 
     void NiTextKeyExtraData::read(NIFStream* nif)
     {
         Extra::read(nif);
 
-        int keynum = nif->getInt();
-        list.resize(keynum);
-        for (int i = 0; i < keynum; i++)
+        uint32_t numKeys;
+        nif->read(numKeys);
+        mList.resize(numKeys);
+        for (TextKey& key : mList)
         {
-            list[i].time = nif->getFloat();
-            list[i].text = nif->getString();
+            nif->read(key.mTime);
+            nif->read(key.mText);
         }
     }
 
@@ -32,81 +35,39 @@ namespace Nif
     {
         Extra::read(nif);
 
-        nif->skip(nif->getUShort() * sizeof(float)); // vertex weights I guess
-    }
-
-    void NiIntegerExtraData::read(NIFStream* nif)
-    {
-        Extra::read(nif);
-
-        data = nif->getUInt();
-    }
-
-    void NiIntegersExtraData::read(NIFStream* nif)
-    {
-        Extra::read(nif);
-
-        nif->readVector(data, nif->getUInt());
-    }
-
-    void NiBinaryExtraData::read(NIFStream* nif)
-    {
-        Extra::read(nif);
-        nif->readVector(data, nif->getUInt());
-    }
-
-    void NiBooleanExtraData::read(NIFStream* nif)
-    {
-        Extra::read(nif);
-        data = nif->getBoolean();
-    }
-
-    void NiVectorExtraData::read(NIFStream* nif)
-    {
-        Extra::read(nif);
-        data = nif->getVector4();
-    }
-
-    void NiFloatExtraData::read(NIFStream* nif)
-    {
-        Extra::read(nif);
-
-        data = nif->getFloat();
-    }
-
-    void NiFloatsExtraData::read(NIFStream* nif)
-    {
-        Extra::read(nif);
-        nif->readVector(data, nif->getUInt());
+        nif->skip(nif->get<uint16_t>() * sizeof(float)); // vertex weights I guess
     }
 
     void BSBound::read(NIFStream* nif)
     {
         Extra::read(nif);
-        center = nif->getVector3();
-        halfExtents = nif->getVector3();
+
+        nif->read(mCenter);
+        nif->read(mExtents);
     }
 
     void BSFurnitureMarker::LegacyFurniturePosition::read(NIFStream* nif)
     {
-        mOffset = nif->getVector3();
-        mOrientation = nif->getUShort();
-        mPositionRef = nif->getChar();
+        nif->read(mOffset);
+        nif->read(mOrientation);
+        nif->read(mPositionRef);
         nif->skip(1); // Position ref 2
     }
 
     void BSFurnitureMarker::FurniturePosition::read(NIFStream* nif)
     {
-        mOffset = nif->getVector3();
-        mHeading = nif->getFloat();
-        mType = nif->getUShort();
-        mEntryPoint = nif->getUShort();
+        nif->read(mOffset);
+        nif->read(mHeading);
+        nif->read(mType);
+        nif->read(mEntryPoint);
     }
 
     void BSFurnitureMarker::read(NIFStream* nif)
     {
         Extra::read(nif);
-        unsigned int num = nif->getUInt();
+
+        uint32_t num;
+        nif->read(num);
         if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
         {
             mLegacyMarkers.resize(num);
@@ -124,19 +85,132 @@ namespace Nif
     void BSInvMarker::read(NIFStream* nif)
     {
         Extra::read(nif);
-        float rotX = nif->getUShort() / 1000.0;
-        float rotY = nif->getUShort() / 1000.0;
-        float rotZ = nif->getUShort() / 1000.0;
-        mScale = nif->getFloat();
 
+        float rotX = nif->get<uint16_t>() / 1000.f;
+        float rotY = nif->get<uint16_t>() / 1000.f;
+        float rotZ = nif->get<uint16_t>() / 1000.f;
         mRotation = osg::Quat(rotX, osg::X_AXIS, rotY, osg::Y_AXIS, rotZ, osg::Z_AXIS);
+        nif->read(mScale);
     }
 
     void BSBehaviorGraphExtraData::read(NIFStream* nif)
     {
         Extra::read(nif);
-        mFile = nif->getString();
-        mControlsBaseSkeleton = nif->getBoolean();
+
+        nif->read(mFile);
+        nif->read(mControlsBaseSkeleton);
+    }
+
+    void BSBoneLODExtraData::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+
+        mData.resize(nif->get<uint32_t>());
+        for (BoneLOD& lod : mData)
+            lod.read(nif);
+    }
+
+    void BSBoneLODExtraData::BoneLOD::read(NIFStream* nif)
+    {
+        nif->read(mDistance);
+        nif->read(mBone);
+    }
+
+    void BSDecalPlacementVectorExtraData::read(NIFStream* nif)
+    {
+        NiFloatExtraData::read(nif);
+
+        mBlocks.resize(nif->get<uint16_t>());
+        for (Block& block : mBlocks)
+            block.read(nif);
+    }
+
+    void BSDecalPlacementVectorExtraData::Block::read(NIFStream* nif)
+    {
+        nif->readVector(mPoints, nif->get<uint16_t>());
+        nif->readVector(mNormals, mPoints.size());
+    }
+
+    void BSClothExtraData::read(NIFStream* nif)
+    {
+        nif->readVector(mData, nif->get<uint32_t>());
+    }
+
+    void BSCollisionQueryProxyExtraData::read(NIFStream* nif)
+    {
+        nif->readVector(mData, nif->get<uint32_t>());
+    }
+
+    void BSConnectPoint::Point::read(NIFStream* nif)
+    {
+        mParent = nif->getSizedString();
+        mName = nif->getSizedString();
+        nif->read(mTransform.mRotation);
+        nif->read(mTransform.mTranslation);
+        nif->read(mTransform.mScale);
+    }
+
+    void BSConnectPoint::Parents::read(NIFStream* nif)
+    {
+        NiExtraData::read(nif);
+
+        mPoints.resize(nif->get<uint32_t>());
+        for (Point& point : mPoints)
+            point.read(nif);
+    }
+
+    void BSConnectPoint::Children::read(NIFStream* nif)
+    {
+        NiExtraData::read(nif);
+
+        nif->read(mSkinned);
+        nif->getSizedStrings(mPointNames, nif->get<uint32_t>());
+    }
+
+    void BSPackedGeomDataCombined::read(NIFStream* nif)
+    {
+        nif->read(mGrayscaleToPaletteScale);
+        nif->read(mTransform);
+        nif->read(mBoundingSphere);
+    }
+
+    void BSPackedGeomObject::read(NIFStream* nif)
+    {
+        nif->read(mFileHash);
+        nif->read(mDataOffset);
+    }
+
+    void BSPackedSharedGeomData::read(NIFStream* nif)
+    {
+        nif->read(mNumVertices);
+        nif->read(mLODLevels);
+        nif->read(mLOD0TriCount);
+        nif->read(mLOD0TriOffset);
+        nif->read(mLOD1TriCount);
+        nif->read(mLOD1TriOffset);
+        nif->read(mLOD2TriCount);
+        nif->read(mLOD2TriOffset);
+        mCombined.resize(nif->get<uint32_t>());
+        for (BSPackedGeomDataCombined& data : mCombined)
+            data.read(nif);
+        mVertexDesc.read(nif);
+    }
+
+    void BSPackedCombinedSharedGeomDataExtra::read(NIFStream* nif)
+    {
+        NiExtraData::read(nif);
+
+        mVertexDesc.read(nif);
+        nif->read(mNumVertices);
+        nif->read(mNumTriangles);
+        nif->read(mFlags1);
+        nif->read(mFlags2);
+        mObjects.resize(nif->get<uint32_t>());
+        for (BSPackedGeomObject& object : mObjects)
+            object.read(nif);
+        mObjectData.resize(mObjects.size());
+        for (BSPackedSharedGeomData& objectData : mObjectData)
+            objectData.read(nif);
     }
 
 }
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index b59fb2f76a..2b46c81e26 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -1,37 +1,67 @@
-/*
-  OpenMW - The completely unofficial reimplementation of Morrowind
-  Copyright (C) 2008-2010  Nicolay Korslund
-  Email: < korslund@gmail.com >
-  WWW: https://openmw.org/
-
-  This file (extra.h) is part of the OpenMW package.
-
-  OpenMW is distributed as free software: you can redistribute it
-  and/or modify it under the terms of the GNU General Public License
-  version 3, as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  version 3 along with this program. If not, see
-  https://www.gnu.org/licenses/ .
-
- */
-
 #ifndef OPENMW_COMPONENTS_NIF_EXTRA_HPP
 #define OPENMW_COMPONENTS_NIF_EXTRA_HPP
 
 #include "base.hpp"
+#include "node.hpp"
 
 namespace Nif
 {
 
+    template <typename T>
+    struct TypedExtra : public Extra
+    {
+        T mData;
+
+        void read(NIFStream* nif) override
+        {
+            Extra::read(nif);
+
+            nif->read(mData);
+        }
+    };
+
+    template <typename T>
+    struct TypedVectorExtra : public Extra
+    {
+        std::vector<T> mData;
+
+        void read(NIFStream* nif) override
+        {
+            Extra::read(nif);
+
+            nif->readVector(mData, nif->get<uint32_t>());
+        }
+    };
+
+    using NiBooleanExtraData = TypedExtra<bool>;
+    using NiFloatExtraData = TypedExtra<float>;
+    using NiIntegerExtraData = TypedExtra<uint32_t>;
+    using NiStringExtraData = TypedExtra<std::string>;
+    using NiVectorExtraData = TypedExtra<osg::Vec4f>;
+
+    using BSDistantObjectExtraData = TypedExtra<uint32_t>;
+    using BSDistantObjectLargeRefExtraData = TypedExtra<bool>;
+
+    using NiBinaryExtraData = TypedVectorExtra<uint8_t>;
+    using NiFloatsExtraData = TypedVectorExtra<float>;
+    using NiIntegersExtraData = TypedVectorExtra<uint32_t>;
+
+    using BSEyeCenterExtraData = TypedVectorExtra<float>;
+    using BSPositionData = TypedVectorExtra<Misc::float16_t>;
+    using BSWArray = TypedVectorExtra<int32_t>;
+
+    // Distinct from NiBinaryExtraData, uses mRecordSize as its size
     struct NiExtraData : public Extra
     {
-        std::vector<char> data;
+        std::vector<uint8_t> mData;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // != TypedVectorExtra<std::string>, doesn't use the string table
+    struct NiStringsExtraData : public Extra
+    {
+        std::vector<std::string> mData;
 
         void read(NIFStream* nif) override;
     };
@@ -45,78 +75,17 @@ namespace Nif
     {
         struct TextKey
         {
-            float time;
-            std::string text;
+            float mTime;
+            std::string mText;
         };
-        std::vector<TextKey> list;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiStringExtraData : public Extra
-    {
-        /* Known meanings:
-           "MRK" - marker, only visible in the editor, not rendered in-game
-           "NCC" - no collision except with the camera
-           Anything else starting with "NC" - no collision
-        */
-        std::string string;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiIntegerExtraData : public Extra
-    {
-        unsigned int data;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiIntegersExtraData : public Extra
-    {
-        std::vector<unsigned int> data;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiBinaryExtraData : public Extra
-    {
-        std::vector<char> data;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiBooleanExtraData : public Extra
-    {
-        bool data;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiVectorExtraData : public Extra
-    {
-        osg::Vec4f data;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiFloatExtraData : public Extra
-    {
-        float data;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct NiFloatsExtraData : public Extra
-    {
-        std::vector<float> data;
+        std::vector<TextKey> mList;
 
         void read(NIFStream* nif) override;
     };
 
     struct BSBound : public Extra
     {
-        osg::Vec3f center, halfExtents;
+        osg::Vec3f mCenter, mExtents;
 
         void read(NIFStream* nif) override;
     };
@@ -149,7 +118,7 @@ namespace Nif
     struct BSInvMarker : public Extra
     {
         osg::Quat mRotation;
-        float mScale = 1.0f;
+        float mScale;
 
         void read(NIFStream* nif) override;
     };
@@ -162,5 +131,127 @@ namespace Nif
         void read(NIFStream* nif) override;
     };
 
-} // Namespace
+    struct BSBoneLODExtraData : public Extra
+    {
+        struct BoneLOD
+        {
+            uint32_t mDistance;
+            std::string mBone;
+
+            void read(NIFStream* nif);
+        };
+
+        std::vector<BoneLOD> mData;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSDecalPlacementVectorExtraData : public NiFloatExtraData
+    {
+        struct Block
+        {
+            std::vector<osg::Vec3f> mPoints;
+            std::vector<osg::Vec3f> mNormals;
+
+            void read(NIFStream* nif);
+        };
+
+        std::vector<Block> mBlocks;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSExtraData : NiExtraData
+    {
+        void read(NIFStream* nif) override {}
+    };
+
+    struct BSClothExtraData : BSExtraData
+    {
+        std::vector<uint8_t> mData;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSCollisionQueryProxyExtraData : BSExtraData
+    {
+        std::vector<uint8_t> mData;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSConnectPoint
+    {
+        struct Point
+        {
+            std::string mParent;
+            std::string mName;
+            NiQuatTransform mTransform;
+
+            void read(NIFStream* nif);
+        };
+
+        struct Parents : NiExtraData
+        {
+            std::vector<Point> mPoints;
+
+            void read(NIFStream* nif) override;
+        };
+
+        struct Children : NiExtraData
+        {
+            bool mSkinned;
+            std::vector<std::string> mPointNames;
+
+            void read(NIFStream* nif) override;
+        };
+    };
+
+    struct BSPackedGeomDataCombined
+    {
+        float mGrayscaleToPaletteScale;
+        NiTransform mTransform;
+        osg::BoundingSpheref mBoundingSphere;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSPackedGeomObject
+    {
+        uint32_t mFileHash;
+        uint32_t mDataOffset;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSPackedSharedGeomData
+    {
+        uint32_t mNumVertices;
+        uint32_t mLODLevels;
+        uint32_t mLOD0TriCount;
+        uint32_t mLOD0TriOffset;
+        uint32_t mLOD1TriCount;
+        uint32_t mLOD1TriOffset;
+        uint32_t mLOD2TriCount;
+        uint32_t mLOD2TriOffset;
+        std::vector<BSPackedGeomDataCombined> mCombined;
+        BSVertexDesc mVertexDesc;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSPackedCombinedSharedGeomDataExtra : NiExtraData
+    {
+        BSVertexDesc mVertexDesc;
+        uint32_t mNumVertices;
+        uint32_t mNumTriangles;
+        uint32_t mFlags1;
+        uint32_t mFlags2;
+        std::vector<BSPackedGeomObject> mObjects;
+        std::vector<BSPackedSharedGeomData> mObjectData;
+
+        void read(NIFStream* nif) override;
+    };
+
+}
 #endif
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 0edabdd7a7..02b110a5a6 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -10,28 +10,30 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "controlled.hpp"
 #include "controller.hpp"
 #include "data.hpp"
 #include "effect.hpp"
 #include "exception.hpp"
 #include "extra.hpp"
 #include "node.hpp"
+#include "particle.hpp"
 #include "physics.hpp"
 #include "property.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
 
-    Reader::Reader(NIFFile& file)
-        : ver(file.mVersion)
-        , userVer(file.mUserVersion)
-        , bethVer(file.mBethVersion)
-        , filename(file.mPath)
-        , hash(file.mHash)
-        , records(file.mRecords)
-        , roots(file.mRoots)
+    Reader::Reader(NIFFile& file, const ToUTF8::StatelessUtf8Encoder* encoder)
+        : mVersion(file.mVersion)
+        , mUserVersion(file.mUserVersion)
+        , mBethVersion(file.mBethVersion)
+        , mFilename(file.mPath)
+        , mHash(file.mHash)
+        , mRecords(file.mRecords)
+        , mRoots(file.mRoots)
         , mUseSkinning(file.mUseSkinning)
+        , mEncoder(encoder)
     {
     }
 
@@ -49,187 +51,480 @@ namespace Nif
     static std::map<std::string, CreateRecord> makeFactory()
     {
         return {
+            // 4.0.0.2 refers to Bethesda variant of NetImmerse 4.0.0.2 file format
+            // Gamebryo refers to files newer than 4.0.0.2
+            // Bethesda refers to custom records Bethesda introduced post-4.0.0.2
+
+            // NODES
+
+            // NiNode-like nodes, 4.0.0.2
             { "NiNode", &construct<NiNode, RC_NiNode> },
-            { "NiSwitchNode", &construct<NiSwitchNode, RC_NiSwitchNode> },
-            { "NiLODNode", &construct<NiLODNode, RC_NiLODNode> },
-            { "NiFltAnimationNode", &construct<NiFltAnimationNode, RC_NiFltAnimationNode> },
             { "AvoidNode", &construct<NiNode, RC_AvoidNode> },
-            { "NiCollisionSwitch", &construct<NiNode, RC_NiCollisionSwitch> },
-            { "NiBSParticleNode", &construct<NiNode, RC_NiBSParticleNode> },
-            { "NiBSAnimationNode", &construct<NiNode, RC_NiBSAnimationNode> },
             { "NiBillboardNode", &construct<NiBillboardNode, RC_NiBillboardNode> },
-            { "NiTriShape", &construct<NiTriShape, RC_NiTriShape> },
-            { "NiTriStrips", &construct<NiTriStrips, RC_NiTriStrips> },
-            { "NiLines", &construct<NiLines, RC_NiLines> },
-            { "NiParticles", &construct<NiParticles, RC_NiParticles> },
-            { "NiRotatingParticles", &construct<NiParticles, RC_NiParticles> },
-            { "NiAutoNormalParticles", &construct<NiParticles, RC_NiParticles> },
-            { "NiCamera", &construct<NiCamera, RC_NiCamera> },
+            { "NiBSAnimationNode", &construct<NiNode, RC_NiBSAnimationNode> },
+            { "NiBSParticleNode", &construct<NiNode, RC_NiBSParticleNode> },
+            { "NiCollisionSwitch", &construct<NiNode, RC_NiCollisionSwitch> },
+            { "NiSortAdjustNode", &construct<NiSortAdjustNode, RC_NiSortAdjustNode> },
             { "RootCollisionNode", &construct<NiNode, RC_RootCollisionNode> },
-            { "NiTexturingProperty", &construct<NiTexturingProperty, RC_NiTexturingProperty> },
-            { "NiFogProperty", &construct<NiFogProperty, RC_NiFogProperty> },
-            { "NiMaterialProperty", &construct<NiMaterialProperty, RC_NiMaterialProperty> },
-            { "NiZBufferProperty", &construct<NiZBufferProperty, RC_NiZBufferProperty> },
-            { "NiAlphaProperty", &construct<NiAlphaProperty, RC_NiAlphaProperty> },
-            { "NiVertexColorProperty", &construct<NiVertexColorProperty, RC_NiVertexColorProperty> },
-            { "NiShadeProperty", &construct<NiShadeProperty, RC_NiShadeProperty> },
-            { "NiDitherProperty", &construct<NiDitherProperty, RC_NiDitherProperty> },
-            { "NiWireframeProperty", &construct<NiWireframeProperty, RC_NiWireframeProperty> },
-            { "NiSpecularProperty", &construct<NiSpecularProperty, RC_NiSpecularProperty> },
-            { "NiStencilProperty", &construct<NiStencilProperty, RC_NiStencilProperty> },
-            { "NiVisController", &construct<NiVisController, RC_NiVisController> },
-            { "NiGeomMorpherController", &construct<NiGeomMorpherController, RC_NiGeomMorpherController> },
-            { "NiKeyframeController", &construct<NiKeyframeController, RC_NiKeyframeController> },
-            { "NiAlphaController", &construct<NiAlphaController, RC_NiAlphaController> },
-            { "NiRollController", &construct<NiRollController, RC_NiRollController> },
-            { "NiUVController", &construct<NiUVController, RC_NiUVController> },
-            { "NiPathController", &construct<NiPathController, RC_NiPathController> },
-            { "NiMaterialColorController", &construct<NiMaterialColorController, RC_NiMaterialColorController> },
-            { "NiBSPArrayController", &construct<NiBSPArrayController, RC_NiBSPArrayController> },
-            { "NiParticleSystemController", &construct<NiParticleSystemController, RC_NiParticleSystemController> },
-            { "NiFlipController", &construct<NiFlipController, RC_NiFlipController> },
-            { "NiTextureTransformController",
-                &construct<NiTextureTransformController, RC_NiTextureTransformController> },
-            { "NiAmbientLight", &construct<NiLight, RC_NiLight> },
-            { "NiDirectionalLight", &construct<NiLight, RC_NiLight> },
-            { "NiPointLight", &construct<NiPointLight, RC_NiLight> },
-            { "NiSpotLight", &construct<NiSpotLight, RC_NiLight> },
-            { "NiTextureEffect", &construct<NiTextureEffect, RC_NiTextureEffect> },
-            { "NiExtraData", &construct<NiExtraData, RC_NiExtraData> },
-            { "NiVertWeightsExtraData", &construct<NiVertWeightsExtraData, RC_NiVertWeightsExtraData> },
-            { "NiTextKeyExtraData", &construct<NiTextKeyExtraData, RC_NiTextKeyExtraData> },
-            { "NiStringExtraData", &construct<NiStringExtraData, RC_NiStringExtraData> },
-            { "NiGravity", &construct<NiGravity, RC_NiGravity> },
-            { "NiPlanarCollider", &construct<NiPlanarCollider, RC_NiPlanarCollider> },
-            { "NiSphericalCollider", &construct<NiSphericalCollider, RC_NiSphericalCollider> },
-            { "NiParticleGrowFade", &construct<NiParticleGrowFade, RC_NiParticleGrowFade> },
-            { "NiParticleColorModifier", &construct<NiParticleColorModifier, RC_NiParticleColorModifier> },
-            { "NiParticleRotation", &construct<NiParticleRotation, RC_NiParticleRotation> },
-            { "NiFloatData", &construct<NiFloatData, RC_NiFloatData> },
-            { "NiTriShapeData", &construct<NiTriShapeData, RC_NiTriShapeData> },
-            { "NiTriStripsData", &construct<NiTriStripsData, RC_NiTriStripsData> },
-            { "NiLinesData", &construct<NiLinesData, RC_NiLinesData> },
-            { "NiVisData", &construct<NiVisData, RC_NiVisData> },
-            { "NiColorData", &construct<NiColorData, RC_NiColorData> },
-            { "NiPixelData", &construct<NiPixelData, RC_NiPixelData> },
-            { "NiMorphData", &construct<NiMorphData, RC_NiMorphData> },
-            { "NiKeyframeData", &construct<NiKeyframeData, RC_NiKeyframeData> },
-            { "NiSkinData", &construct<NiSkinData, RC_NiSkinData> },
-            { "NiUVData", &construct<NiUVData, RC_NiUVData> },
-            { "NiPosData", &construct<NiPosData, RC_NiPosData> },
-            { "NiParticlesData", &construct<NiParticlesData, RC_NiParticlesData> },
-            { "NiRotatingParticlesData", &construct<NiRotatingParticlesData, RC_NiParticlesData> },
-            { "NiAutoNormalParticlesData", &construct<NiParticlesData, RC_NiParticlesData> },
-            { "NiSequenceStreamHelper", &construct<NiSequenceStreamHelper, RC_NiSequenceStreamHelper> },
-            { "NiSourceTexture", &construct<NiSourceTexture, RC_NiSourceTexture> },
-            { "NiSkinInstance", &construct<NiSkinInstance, RC_NiSkinInstance> },
-            { "NiLookAtController", &construct<NiLookAtController, RC_NiLookAtController> },
-            { "NiPalette", &construct<NiPalette, RC_NiPalette> },
-            { "NiIntegerExtraData", &construct<NiIntegerExtraData, RC_NiIntegerExtraData> },
-            { "NiIntegersExtraData", &construct<NiIntegersExtraData, RC_NiIntegersExtraData> },
-            { "NiBinaryExtraData", &construct<NiBinaryExtraData, RC_NiBinaryExtraData> },
-            { "NiBooleanExtraData", &construct<NiBooleanExtraData, RC_NiBooleanExtraData> },
-            { "NiVectorExtraData", &construct<NiVectorExtraData, RC_NiVectorExtraData> },
-            { "NiColorExtraData", &construct<NiVectorExtraData, RC_NiColorExtraData> },
-            { "NiFloatExtraData", &construct<NiFloatExtraData, RC_NiFloatExtraData> },
-            { "NiFloatsExtraData", &construct<NiFloatsExtraData, RC_NiFloatsExtraData> },
-            { "NiStringPalette", &construct<NiStringPalette, RC_NiStringPalette> },
-            { "NiBoolData", &construct<NiBoolData, RC_NiBoolData> },
-            { "NiSkinPartition", &construct<NiSkinPartition, RC_NiSkinPartition> },
-            { "BSXFlags", &construct<NiIntegerExtraData, RC_BSXFlags> },
-            { "BSBound", &construct<BSBound, RC_BSBound> },
-            { "NiTransformData", &construct<NiKeyframeData, RC_NiKeyframeData> },
-            { "BSFadeNode", &construct<NiNode, RC_NiNode> },
-            { "BSLeafAnimNode", &construct<NiNode, RC_NiNode> },
-            { "BSTreeNode", &construct<BSTreeNode, RC_NiNode> },
-            { "BSValueNode", &construct<BSValueNode, RC_NiNode> },
-            { "BSOrderedNode", &construct<BSOrderedNode, RC_NiNode> },
-            { "BSMultiBoundNode", &construct<BSMultiBoundNode, RC_NiNode> },
-            { "BSRangeNode", &construct<BSRangeNode, RC_NiNode> },
+
+            // NiNode-like nodes, Bethesda
             { "BSBlastNode", &construct<BSRangeNode, RC_NiNode> },
             { "BSDamageStage", &construct<BSRangeNode, RC_NiNode> },
-            { "bhkBlendController", &construct<bhkBlendController, RC_bhkBlendController> },
+            { "BSDebrisNode", &construct<BSRangeNode, RC_NiNode> },
+            { "BSDistantObjectInstancedNode",
+                &construct<BSDistantObjectInstancedNode, RC_BSDistantObjectInstancedNode> },
+            { "BSFadeNode", &construct<NiNode, RC_NiNode> },
+            { "BSLeafAnimNode", &construct<NiNode, RC_NiNode> },
+            { "BSMasterParticleSystem", &construct<BSMasterParticleSystem, RC_NiNode> },
+            { "BSMultiBoundNode", &construct<BSMultiBoundNode, RC_NiNode> },
+            { "BSOrderedNode", &construct<BSOrderedNode, RC_NiNode> },
+            { "BSRangeNode", &construct<BSRangeNode, RC_NiNode> },
+            { "BSTreeNode", &construct<BSTreeNode, RC_NiNode> },
+            { "BSValueNode", &construct<BSValueNode, RC_NiNode> },
+
+            // Switch nodes, 4.0.0.2
+            { "NiSwitchNode", &construct<NiSwitchNode, RC_NiSwitchNode> },
+            { "NiFltAnimationNode", &construct<NiFltAnimationNode, RC_NiFltAnimationNode> },
+            { "NiLODNode", &construct<NiLODNode, RC_NiLODNode> },
+
+            // NiSequence nodes, 4.0.0.2
+            { "NiSequenceStreamHelper", &construct<NiSequenceStreamHelper, RC_NiSequenceStreamHelper> },
+
+            // NiSequence nodes, Gamebryo
+            { "NiSequence", &construct<NiSequence, RC_NiSequence> },
+            { "NiControllerSequence", &construct<NiControllerSequence, RC_NiControllerSequence> },
+
+            // Other nodes, 4.0.0.2
+            { "NiCamera", &construct<NiCamera, RC_NiCamera> },
+
+            // ACCUMULATORS
+
+            // 4.0.0.2
+            { "NiAlphaAccumulator", &construct<NiAlphaAccumulator, RC_NiAlphaAccumulator> },
+            { "NiClusterAccumulator", &construct<NiClusterAccumulator, RC_NiClusterAccumulator> },
+
+            // CONTROLLERS
+
+            // 4.0.0.2
+            { "NiAlphaController", &construct<NiAlphaController, RC_NiAlphaController> },
+            { "NiBSPArrayController", &construct<NiBSPArrayController, RC_NiBSPArrayController> },
+            { "NiFlipController", &construct<NiFlipController, RC_NiFlipController> },
+            { "NiGeomMorpherController", &construct<NiGeomMorpherController, RC_NiGeomMorpherController> },
+            { "NiKeyframeController", &construct<NiKeyframeController, RC_NiKeyframeController> },
+            { "NiLookAtController", &construct<NiLookAtController, RC_NiLookAtController> },
+            { "NiLightColorController", &construct<NiLightColorController, RC_NiLightColorController> },
+            { "NiMaterialColorController", &construct<NiMaterialColorController, RC_NiMaterialColorController> },
+            { "NiPathController", &construct<NiPathController, RC_NiPathController> },
+            { "NiRollController", &construct<NiRollController, RC_NiRollController> },
+            { "NiUVController", &construct<NiUVController, RC_NiUVController> },
+            { "NiVisController", &construct<NiVisController, RC_NiVisController> },
+
+            // Gamebryo
+            { "NiBoneLODController", &construct<NiBoneLODController, RC_NiBoneLODController> },
+            { "NiControllerManager", &construct<NiControllerManager, RC_NiControllerManager> },
+            { "NiLightDimmerController", &construct<NiFloatInterpController, RC_NiLightDimmerController> },
+            { "NiTransformController", &construct<NiKeyframeController, RC_NiKeyframeController> },
+            { "NiTextureTransformController",
+                &construct<NiTextureTransformController, RC_NiTextureTransformController> },
+            { "NiMultiTargetTransformController",
+                &construct<NiMultiTargetTransformController, RC_NiMultiTargetTransformController> },
+
+            // Extra data controllers, Gamebryo
+            { "NiColorExtraDataController", &construct<NiExtraDataController, RC_NiColorExtraDataController> },
+            { "NiFloatExtraDataController", &construct<NiFloatExtraDataController, RC_NiFloatExtraDataController> },
+            { "NiFloatsExtraDataController", &construct<NiFloatsExtraDataController, RC_NiFloatsExtraDataController> },
+            { "NiFloatsExtraDataPoint3Controller",
+                &construct<NiFloatsExtraDataPoint3Controller, RC_NiFloatsExtraDataPoint3Controller> },
+
+            // Bethesda
+            { "BSFrustumFOVController", &construct<NiFloatInterpController, RC_BSFrustumFOVController> },
+            { "BSKeyframeController", &construct<BSKeyframeController, RC_BSKeyframeController> },
+            { "BSLagBoneController", &construct<BSLagBoneController, RC_BSLagBoneController> },
+            { "BSProceduralLightningController",
+                &construct<BSProceduralLightningController, RC_BSProceduralLightningController> },
             { "BSMaterialEmittanceMultController",
                 &construct<NiFloatInterpController, RC_BSMaterialEmittanceMultController> },
+            { "BSNiAlphaPropertyTestRefController",
+                &construct<NiFloatInterpController, RC_BSNiAlphaPropertyTestRefController> },
             { "BSRefractionFirePeriodController",
                 &construct<NiSingleInterpController, RC_BSRefractionFirePeriodController> },
             { "BSRefractionStrengthController",
                 &construct<NiFloatInterpController, RC_BSRefractionStrengthController> },
-            { "NiFloatInterpolator", &construct<NiFloatInterpolator, RC_NiFloatInterpolator> },
-            { "NiBoolInterpolator", &construct<NiBoolInterpolator, RC_NiBoolInterpolator> },
-            { "NiBoolTimelineInterpolator", &construct<NiBoolInterpolator, RC_NiBoolTimelineInterpolator> },
-            { "NiPoint3Interpolator", &construct<NiPoint3Interpolator, RC_NiPoint3Interpolator> },
-            { "NiTransformController", &construct<NiKeyframeController, RC_NiKeyframeController> },
-            { "NiMultiTargetTransformController",
-                &construct<NiMultiTargetTransformController, RC_NiMultiTargetTransformController> },
-            { "NiTransformInterpolator", &construct<NiTransformInterpolator, RC_NiTransformInterpolator> },
-            { "NiColorInterpolator", &construct<NiColorInterpolator, RC_NiColorInterpolator> },
-            { "BSShaderTextureSet", &construct<BSShaderTextureSet, RC_BSShaderTextureSet> },
-            { "BSLODTriShape", &construct<BSLODTriShape, RC_BSLODTriShape> },
-            { "BSShaderProperty", &construct<BSShaderProperty, RC_BSShaderProperty> },
-            { "BSShaderPPLightingProperty", &construct<BSShaderPPLightingProperty, RC_BSShaderPPLightingProperty> },
-            { "BSShaderNoLightingProperty", &construct<BSShaderNoLightingProperty, RC_BSShaderNoLightingProperty> },
-            { "BSFurnitureMarker", &construct<BSFurnitureMarker, RC_BSFurnitureMarker> },
-            { "BSFurnitureMarkerNode", &construct<BSFurnitureMarker, RC_BSFurnitureMarker> },
-            { "NiCollisionObject", &construct<NiCollisionObject, RC_NiCollisionObject> },
-            { "bhkCollisionObject", &construct<bhkCollisionObject, RC_bhkCollisionObject> },
-            { "bhkSPCollisionObject", &construct<bhkCollisionObject, RC_bhkCollisionObject> },
-            { "bhkPCollisionObject", &construct<bhkCollisionObject, RC_bhkCollisionObject> },
-            { "BSDismemberSkinInstance", &construct<BSDismemberSkinInstance, RC_BSDismemberSkinInstance> },
-            { "NiControllerManager", &construct<NiControllerManager, RC_NiControllerManager> },
-            { "bhkMoppBvTreeShape", &construct<bhkMoppBvTreeShape, RC_bhkMoppBvTreeShape> },
-            { "bhkNiTriStripsShape", &construct<bhkNiTriStripsShape, RC_bhkNiTriStripsShape> },
-            { "bhkPackedNiTriStripsShape", &construct<bhkPackedNiTriStripsShape, RC_bhkPackedNiTriStripsShape> },
-            { "hkPackedNiTriStripsData", &construct<hkPackedNiTriStripsData, RC_hkPackedNiTriStripsData> },
-            { "bhkConvexVerticesShape", &construct<bhkConvexVerticesShape, RC_bhkConvexVerticesShape> },
-            { "bhkConvexTransformShape", &construct<bhkConvexTransformShape, RC_bhkConvexTransformShape> },
-            { "bhkTransformShape", &construct<bhkConvexTransformShape, RC_bhkConvexTransformShape> },
-            { "bhkSimpleShapePhantom", &construct<bhkSimpleShapePhantom, RC_bhkSimpleShapePhantom> },
-            { "bhkBoxShape", &construct<bhkBoxShape, RC_bhkBoxShape> },
-            { "bhkCapsuleShape", &construct<bhkCapsuleShape, RC_bhkCapsuleShape> },
-            { "bhkSphereShape", &construct<bhkSphereShape, RC_bhkSphereShape> },
-            { "bhkListShape", &construct<bhkListShape, RC_bhkListShape> },
-            { "bhkRigidBody", &construct<bhkRigidBody, RC_bhkRigidBody> },
-            { "bhkRigidBodyT", &construct<bhkRigidBody, RC_bhkRigidBodyT> },
-            { "bhkRagdollConstraint", &construct<bhkRagdollConstraint, RC_bhkRagdollConstraint> },
-            { "bhkHingeConstraint", &construct<bhkHingeConstraint, RC_bhkHingeConstraint> },
-            { "bhkLimitedHingeConstraint", &construct<bhkLimitedHingeConstraint, RC_bhkLimitedHingeConstraint> },
-            { "BSLightingShaderProperty", &construct<BSLightingShaderProperty, RC_BSLightingShaderProperty> },
-            { "BSEffectShaderProperty", &construct<BSEffectShaderProperty, RC_BSEffectShaderProperty> },
-            { "NiSortAdjustNode", &construct<NiSortAdjustNode, RC_NiSortAdjustNode> },
-            { "NiClusterAccumulator", &construct<NiClusterAccumulator, RC_NiClusterAccumulator> },
-            { "NiAlphaAccumulator", &construct<NiAlphaAccumulator, RC_NiAlphaAccumulator> },
-            { "NiSequence", &construct<NiSequence, RC_NiSequence> },
-            { "NiControllerSequence", &construct<NiControllerSequence, RC_NiControllerSequence> },
-            { "NiDefaultAVObjectPalette", &construct<NiDefaultAVObjectPalette, RC_NiDefaultAVObjectPalette> },
+            { "BSEffectShaderPropertyColorController",
+                &construct<BSEffectShaderPropertyColorController, RC_BSEffectShaderPropertyColorController> },
+            { "BSEffectShaderPropertyFloatController",
+                &construct<BSEffectShaderPropertyFloatController, RC_BSEffectShaderPropertyFloatController> },
+            { "BSLightingShaderPropertyColorController",
+                &construct<BSEffectShaderPropertyColorController, RC_BSLightingShaderPropertyColorController> },
+            { "BSLightingShaderPropertyFloatController",
+                &construct<BSEffectShaderPropertyFloatController, RC_BSLightingShaderPropertyFloatController> },
+            { "BSLightingShaderPropertyUShortController",
+                &construct<BSEffectShaderPropertyFloatController, RC_BSLightingShaderPropertyUShortController> },
+            { "bhkBlendController", &construct<bhkBlendController, RC_bhkBlendController> },
+            { "NiBSBoneLODController", &construct<NiBoneLODController, RC_NiBoneLODController> },
+            { "NiLightRadiusController", &construct<NiFloatInterpController, RC_NiLightRadiusController> },
+
+            // Interpolators, Gamebryo
+            { "NiBSplineCompFloatInterpolator",
+                &construct<NiBSplineCompFloatInterpolator, RC_NiBSplineCompFloatInterpolator> },
+            { "NiBSplineCompPoint3Interpolator",
+                &construct<NiBSplineCompPoint3Interpolator, RC_NiBSplineCompPoint3Interpolator> },
+            { "NiBSplineCompTransformInterpolator",
+                &construct<NiBSplineCompTransformInterpolator, RC_NiBSplineCompTransformInterpolator> },
+            { "NiBSplineTransformInterpolator",
+                &construct<NiBSplineTransformInterpolator, RC_NiBSplineTransformInterpolator> },
             { "NiBlendBoolInterpolator", &construct<NiBlendBoolInterpolator, RC_NiBlendBoolInterpolator> },
             { "NiBlendFloatInterpolator", &construct<NiBlendFloatInterpolator, RC_NiBlendFloatInterpolator> },
             { "NiBlendPoint3Interpolator", &construct<NiBlendPoint3Interpolator, RC_NiBlendPoint3Interpolator> },
             { "NiBlendTransformInterpolator",
                 &construct<NiBlendTransformInterpolator, RC_NiBlendTransformInterpolator> },
-            { "bhkCompressedMeshShape", &construct<bhkCompressedMeshShape, RC_bhkCompressedMeshShape> },
-            { "bhkCompressedMeshShapeData", &construct<bhkCompressedMeshShapeData, RC_bhkCompressedMeshShapeData> },
+            { "NiBoolInterpolator", &construct<NiBoolInterpolator, RC_NiBoolInterpolator> },
+            { "NiBoolTimelineInterpolator", &construct<NiBoolInterpolator, RC_NiBoolTimelineInterpolator> },
+            { "NiColorInterpolator", &construct<NiColorInterpolator, RC_NiColorInterpolator> },
+            { "NiFloatInterpolator", &construct<NiFloatInterpolator, RC_NiFloatInterpolator> },
+            { "NiLookAtInterpolator", &construct<NiLookAtInterpolator, RC_NiLookAtInterpolator> },
+            { "NiPathInterpolator", &construct<NiPathInterpolator, RC_NiPathInterpolator> },
+            { "NiPoint3Interpolator", &construct<NiPoint3Interpolator, RC_NiPoint3Interpolator> },
+            { "NiTransformInterpolator", &construct<NiTransformInterpolator, RC_NiTransformInterpolator> },
+
+            // Interpolators, Bethesda
+            { "BSRotAccumTransfInterpolator", &construct<NiTransformInterpolator, RC_BSRotAccumTransfInterpolator> },
+            { "BSTreadTransfInterpolator", &construct<BSTreadTransfInterpolator, RC_BSTreadTransfInterpolator> },
+
+            // DATA
+
+            // 4.0.0.2
+            { "NiColorData", &construct<NiColorData, RC_NiColorData> },
+            { "NiFloatData", &construct<NiFloatData, RC_NiFloatData> },
+            { "NiKeyframeData", &construct<NiKeyframeData, RC_NiKeyframeData> },
+            { "NiMorphData", &construct<NiMorphData, RC_NiMorphData> },
+            { "NiPalette", &construct<NiPalette, RC_NiPalette> },
+            { "NiPixelData", &construct<NiPixelData, RC_NiPixelData> },
+            { "NiPosData", &construct<NiPosData, RC_NiPosData> },
+            { "NiSourceTexture", &construct<NiSourceTexture, RC_NiSourceTexture> },
+            { "NiUVData", &construct<NiUVData, RC_NiUVData> },
+            { "NiVisData", &construct<NiVisData, RC_NiVisData> },
+
+            // Gamebryo
+            { "NiAdditionalGeometryData", &construct<NiAdditionalGeometryData, RC_NiAdditionalGeometryData> },
+            { "NiBoolData", &construct<NiBoolData, RC_NiBoolData> },
+            { "NiBSplineData", &construct<NiBSplineData, RC_NiBSplineData> },
+            { "NiBSplineBasisData", &construct<NiBSplineBasisData, RC_NiBSplineBasisData> },
+            { "NiDefaultAVObjectPalette", &construct<NiDefaultAVObjectPalette, RC_NiDefaultAVObjectPalette> },
+            { "NiTransformData", &construct<NiKeyframeData, RC_NiKeyframeData> },
+
+            // Bethesda
+            { "BSAnimNote", &construct<BSAnimNote, RC_BSAnimNote> },
+            { "BSAnimNotes", &construct<BSAnimNotes, RC_BSAnimNotes> },
+            { "BSPackedAdditionalGeometryData",
+                &construct<NiAdditionalGeometryData, RC_BSPackedAdditionalGeometryData> },
+            { "BSShaderTextureSet", &construct<BSShaderTextureSet, RC_BSShaderTextureSet> },
+
+            // DYNAMIC EFFECTS
+
+            // 4.0.0.2
+            { "NiAmbientLight", &construct<NiLight, RC_NiLight> },
+            { "NiDirectionalLight", &construct<NiLight, RC_NiLight> },
+            { "NiPointLight", &construct<NiPointLight, RC_NiLight> },
+            { "NiSpotLight", &construct<NiSpotLight, RC_NiLight> },
+            { "NiTextureEffect", &construct<NiTextureEffect, RC_NiTextureEffect> },
+
+            // EXTRA DATA
+
+            // 4.0.0.2
+            { "NiExtraData", &construct<NiExtraData, RC_NiExtraData> },
+            { "NiStringExtraData", &construct<NiStringExtraData, RC_NiStringExtraData> },
+            { "NiTextKeyExtraData", &construct<NiTextKeyExtraData, RC_NiTextKeyExtraData> },
+            { "NiVertWeightsExtraData", &construct<NiVertWeightsExtraData, RC_NiVertWeightsExtraData> },
+
+            // Gamebryo
+            { "NiBinaryExtraData", &construct<NiBinaryExtraData, RC_NiBinaryExtraData> },
+            { "NiBooleanExtraData", &construct<NiBooleanExtraData, RC_NiBooleanExtraData> },
+            { "NiColorExtraData", &construct<NiVectorExtraData, RC_NiColorExtraData> },
+            { "NiFloatExtraData", &construct<NiFloatExtraData, RC_NiFloatExtraData> },
+            { "NiFloatsExtraData", &construct<NiFloatsExtraData, RC_NiFloatsExtraData> },
+            { "NiIntegerExtraData", &construct<NiIntegerExtraData, RC_NiIntegerExtraData> },
+            { "NiIntegersExtraData", &construct<NiIntegersExtraData, RC_NiIntegersExtraData> },
+            { "NiVectorExtraData", &construct<NiVectorExtraData, RC_NiVectorExtraData> },
+            { "NiStringsExtraData", &construct<NiStringsExtraData, RC_NiStringsExtraData> },
+            { "NiStringPalette", &construct<NiStringPalette, RC_NiStringPalette> },
+
+            // Bethesda bounds
+            { "BSBound", &construct<BSBound, RC_BSBound> },
             { "BSMultiBound", &construct<BSMultiBound, RC_BSMultiBound> },
+            { "BSMultiBoundAABB", &construct<BSMultiBoundAABB, RC_BSMultiBoundAABB> },
             { "BSMultiBoundOBB", &construct<BSMultiBoundOBB, RC_BSMultiBoundOBB> },
             { "BSMultiBoundSphere", &construct<BSMultiBoundSphere, RC_BSMultiBoundSphere> },
+
+            // Bethesda markers
+            { "BSFurnitureMarker", &construct<BSFurnitureMarker, RC_BSFurnitureMarker> },
+            { "BSFurnitureMarkerNode", &construct<BSFurnitureMarker, RC_BSFurnitureMarker> },
             { "BSInvMarker", &construct<BSInvMarker, RC_BSInvMarker> },
-            { "BSTriShape", &construct<BSTriShape, RC_BSTriShape> },
-            { "BSEffectShaderPropertyFloatController",
-                &construct<BSEffectShaderPropertyFloatController, RC_BSEffectShaderPropertyFloatController> },
-            { "BSLightingShaderPropertyFloatController",
-                &construct<BSEffectShaderPropertyFloatController, RC_BSLightingShaderPropertyFloatController> },
-            { "BSEffectShaderPropertyColorController",
-                &construct<BSEffectShaderPropertyColorController, RC_BSEffectShaderPropertyColorController> },
-            { "BSLightingShaderPropertyColorController",
-                &construct<BSEffectShaderPropertyColorController, RC_BSLightingShaderPropertyColorController> },
+
+            // Other Bethesda records
+            { "BSExtraData", &construct<BSExtraData, RC_BSExtraData> },
             { "BSBehaviorGraphExtraData", &construct<BSBehaviorGraphExtraData, RC_BSBehaviorGraphExtraData> },
+            { "BSBoneLODExtraData", &construct<BSBoneLODExtraData, RC_BSBoneLODExtraData> },
+            { "BSClothExtraData", &construct<BSClothExtraData, RC_BSClothExtraData> },
+            { "BSCollisionQueryProxyExtraData",
+                &construct<BSCollisionQueryProxyExtraData, RC_BSCollisionQueryProxyExtraData> },
+            { "BSConnectPoint::Children", &construct<BSConnectPoint::Children, RC_BSConnectPointChildren> },
+            { "BSConnectPoint::Parents", &construct<BSConnectPoint::Parents, RC_BSConnectPointParents> },
+            { "BSDecalPlacementVectorExtraData",
+                &construct<BSDecalPlacementVectorExtraData, RC_BSDecalPlacementVectorExtraData> },
+            { "BSDistantObjectExtraData", &construct<BSDistantObjectExtraData, RC_BSDistantObjectExtraData> },
+            { "BSDistantObjectLargeRefExtraData",
+                &construct<BSDistantObjectLargeRefExtraData, RC_BSDistantObjectLargeRefExtraData> },
+            { "BSEyeCenterExtraData", &construct<BSEyeCenterExtraData, RC_BSEyeCenterExtraData> },
+            { "BSPackedCombinedSharedGeomDataExtra",
+                &construct<BSPackedCombinedSharedGeomDataExtra, RC_BSPackedCombinedSharedGeomDataExtra> },
+            { "BSPositionData", &construct<BSPositionData, RC_BSPositionData> },
+            { "BSWArray", &construct<BSWArray, RC_BSWArray> },
+            { "BSXFlags", &construct<NiIntegerExtraData, RC_BSXFlags> },
+
+            // GEOMETRY
+
+            // 4.0.0.2
+            { "NiLines", &construct<NiLines, RC_NiLines> },
+            { "NiLinesData", &construct<NiLinesData, RC_NiLinesData> },
+            { "NiSkinData", &construct<NiSkinData, RC_NiSkinData> },
+            { "NiSkinInstance", &construct<NiSkinInstance, RC_NiSkinInstance> },
+            { "NiSkinPartition", &construct<NiSkinPartition, RC_NiSkinPartition> },
+            { "NiTriShape", &construct<NiTriShape, RC_NiTriShape> },
+            { "NiTriShapeData", &construct<NiTriShapeData, RC_NiTriShapeData> },
+            { "NiTriStrips", &construct<NiTriStrips, RC_NiTriStrips> },
+            { "NiTriStripsData", &construct<NiTriStripsData, RC_NiTriStripsData> },
+
+            // Bethesda
+            { "BSDismemberSkinInstance", &construct<BSDismemberSkinInstance, RC_BSDismemberSkinInstance> },
+            { "BSSkin::Instance", &construct<BSSkinInstance, RC_BSSkinInstance> },
+            { "BSSkin::BoneData", &construct<BSSkinBoneData, RC_BSSkinBoneData> },
+            { "BSTriShape", &construct<BSTriShape, RC_BSTriShape> },
+            { "BSDynamicTriShape", &construct<BSDynamicTriShape, RC_BSDynamicTriShape> },
+            { "BSLODTriShape", &construct<BSLODTriShape, RC_BSLODTriShape> },
+            { "BSMeshLODTriShape", &construct<BSMeshLODTriShape, RC_BSMeshLODTriShape> },
+            { "BSSegmentedTriShape", &construct<BSSegmentedTriShape, RC_BSSegmentedTriShape> },
+            { "BSSubIndexTriShape", &construct<BSSubIndexTriShape, RC_BSSubIndexTriShape> },
+
+            // PARTICLES
+
+            // Geometry, 4.0.0.2
+            { "NiAutoNormalParticles", &construct<NiParticles, RC_NiParticles> },
+            { "NiAutoNormalParticlesData", &construct<NiParticlesData, RC_NiParticlesData> },
+            { "NiParticles", &construct<NiParticles, RC_NiParticles> },
+            { "NiParticlesData", &construct<NiParticlesData, RC_NiParticlesData> },
+            { "NiRotatingParticles", &construct<NiParticles, RC_NiParticles> },
+            { "NiRotatingParticlesData", &construct<NiRotatingParticlesData, RC_NiParticlesData> },
+
+            // Geometry, Gamebryo
+            { "NiParticleSystem", &construct<NiParticleSystem, RC_NiParticleSystem> },
+            { "NiMeshParticleSystem", &construct<NiParticleSystem, RC_NiParticleSystem> },
+            { "NiPSysData", &construct<NiPSysData, RC_NiPSysData> },
+            { "NiMeshPSysData", &construct<NiMeshPSysData, RC_NiMeshPSysData> },
+
+            // Geometry, Bethesda
+            { "BSStripParticleSystem", &construct<NiParticleSystem, RC_BSStripParticleSystem> },
+            { "BSStripPSysData", &construct<BSStripPSysData, RC_BSStripPSysData> },
+
+            // Modifiers, 4.0.0.2
+            { "NiGravity", &construct<NiGravity, RC_NiGravity> },
+            { "NiParticleBomb", &construct<NiParticleBomb, RC_NiParticleBomb> },
+            { "NiParticleColorModifier", &construct<NiParticleColorModifier, RC_NiParticleColorModifier> },
+            { "NiParticleGrowFade", &construct<NiParticleGrowFade, RC_NiParticleGrowFade> },
+            { "NiParticleRotation", &construct<NiParticleRotation, RC_NiParticleRotation> },
+
+            // Modifiers, Gamebryo
+            { "NiPSysAgeDeathModifier", &construct<NiPSysAgeDeathModifier, RC_NiPSysAgeDeathModifier> },
+            { "NiPSysBombModifier", &construct<NiPSysBombModifier, RC_NiPSysBombModifier> },
+            { "NiPSysBoundUpdateModifier", &construct<NiPSysBoundUpdateModifier, RC_NiPSysBoundUpdateModifier> },
+            { "NiPSysColorModifier", &construct<NiPSysColorModifier, RC_NiPSysColorModifier> },
+            { "NiPSysDragModifier", &construct<NiPSysDragModifier, RC_NiPSysDragModifier> },
+            { "NiPSysGravityModifier", &construct<NiPSysGravityModifier, RC_NiPSysGravityModifier> },
+            { "NiPSysGrowFadeModifier", &construct<NiPSysGrowFadeModifier, RC_NiPSysGrowFadeModifier> },
+            { "NiPSysPositionModifier", &construct<NiPSysModifier, RC_NiPSysPositionModifier> },
+            { "NiPSysRotationModifier", &construct<NiPSysRotationModifier, RC_NiPSysRotationModifier> },
+            { "NiPSysSpawnModifier", &construct<NiPSysSpawnModifier, RC_NiPSysSpawnModifier> },
+            { "NiPSysMeshUpdateModifier", &construct<NiPSysMeshUpdateModifier, RC_NiPSysMeshUpdateModifier> },
+
+            // Modifiers, Bethesda
+            { "BSParentVelocityModifier", &construct<BSParentVelocityModifier, RC_BSParentVelocityModifier> },
+            { "BSPSysHavokUpdateModifier", &construct<BSPSysHavokUpdateModifier, RC_BSPSysHavokUpdateModifier> },
+            { "BSPSysInheritVelocityModifier",
+                &construct<BSPSysInheritVelocityModifier, RC_BSPSysInheritVelocityModifier> },
+            { "BSPSysLODModifier", &construct<BSPSysLODModifier, RC_BSPSysLODModifier> },
+            { "BSPSysRecycleBoundModifier", &construct<BSPSysRecycleBoundModifier, RC_BSPSysRecycleBoundModifier> },
+            { "BSPSysScaleModifier", &construct<BSPSysScaleModifier, RC_BSPSysScaleModifier> },
+            { "BSPSysSimpleColorModifier", &construct<BSPSysSimpleColorModifier, RC_BSPSysSimpleColorModifier> },
+            { "BSPSysStripUpdateModifier", &construct<BSPSysStripUpdateModifier, RC_BSPSysStripUpdateModifier> },
+            { "BSPSysSubTexModifier", &construct<BSPSysSubTexModifier, RC_BSPSysSubTexModifier> },
+            { "BSWindModifier", &construct<BSWindModifier, RC_BSWindModifier> },
+
+            // Emitters, Gamebryo
+            { "NiPSysBoxEmitter", &construct<NiPSysBoxEmitter, RC_NiPSysBoxEmitter> },
+            { "NiPSysCylinderEmitter", &construct<NiPSysCylinderEmitter, RC_NiPSysCylinderEmitter> },
+            { "NiPSysMeshEmitter", &construct<NiPSysMeshEmitter, RC_NiPSysMeshEmitter> },
+            { "NiPSysSphereEmitter", &construct<NiPSysSphereEmitter, RC_NiPSysSphereEmitter> },
+
+            // Emitters, Bethesda
+            { "BSPSysArrayEmitter", &construct<NiPSysVolumeEmitter, RC_BSPSysArrayEmitter> },
+
+            // Modifier controllers, Gamebryo
+            { "NiPSysAirFieldAirFrictionCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysAirFieldAirFrictionCtlr> },
+            { "NiPSysAirFieldInheritVelocityCtlr",
+                &construct<NiPSysModifierFloatCtlr, RC_NiPSysAirFieldInheritVelocityCtlr> },
+            { "NiPSysAirFieldSpreadCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysAirFieldSpreadCtlr> },
+            { "NiPSysEmitterCtlr", &construct<NiPSysEmitterCtlr, RC_NiPSysEmitterCtlr> },
+            { "NiPSysEmitterDeclinationCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysEmitterDeclinationCtlr> },
+            { "NiPSysEmitterDeclinationVarCtlr",
+                &construct<NiPSysModifierFloatCtlr, RC_NiPSysEmitterDeclinationVarCtlr> },
+            { "NiPSysEmitterInitialRadiusCtlr",
+                &construct<NiPSysModifierFloatCtlr, RC_NiPSysEmitterInitialRadiusCtlr> },
+            { "NiPSysEmitterLifeSpanCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysEmitterLifeSpanCtlr> },
+            { "NiPSysEmitterPlanarAngleCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysEmitterPlanarAngleCtlr> },
+            { "NiPSysEmitterPlanarAngleVarCtlr",
+                &construct<NiPSysModifierFloatCtlr, RC_NiPSysEmitterPlanarAngleVarCtlr> },
+            { "NiPSysEmitterSpeedCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysEmitterSpeedCtlr> },
+            { "NiPSysFieldAttenuationCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysFieldAttenuationCtlr> },
+            { "NiPSysFieldMagnitudeCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysFieldMagnitudeCtlr> },
+            { "NiPSysFieldMaxDistanceCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysFieldMaxDistanceCtlr> },
+            { "NiPSysGravityStrengthCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysGravityStrengthCtlr> },
+            { "NiPSysInitialRotSpeedCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysInitialRotSpeedCtlr> },
+            { "NiPSysInitialRotSpeedVarCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysInitialRotSpeedVarCtlr> },
+            { "NiPSysInitialRotAngleCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysInitialRotAngleCtlr> },
+            { "NiPSysInitialRotAngleVarCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysInitialRotAngleVarCtlr> },
+            { "NiPSysModifierActiveCtlr", &construct<NiPSysModifierBoolCtlr, RC_NiPSysModifierActiveCtlr> },
+            { "NiPSysRotDampeningCtlr", &construct<NiPSysModifierFloatCtlr, RC_NiPSysRotDampeningCtlr> },
+
+            // Modifier controllers, Bethesda
+            { "BSPSysMultiTargetEmitterCtlr",
+                &construct<BSPSysMultiTargetEmitterCtlr, RC_BSPSysMultiTargetEmitterCtlr> },
+
+            // Modifier controller data, Gamebryo
+            { "NiPSysEmitterCtlrData", &construct<NiPSysEmitterCtlrData, RC_NiPSysEmitterCtlrData> },
+
+            // Colliders, 4.0.0.2
+            { "NiPlanarCollider", &construct<NiPlanarCollider, RC_NiPlanarCollider> },
+            { "NiSphericalCollider", &construct<NiSphericalCollider, RC_NiSphericalCollider> },
+
+            // Colliders, Gamebryo
+            { "NiPSysColliderManager", &construct<NiPSysColliderManager, RC_NiPSysColliderManager> },
+            { "NiPSysPlanarCollider", &construct<NiPSysPlanarCollider, RC_NiPSysPlanarCollider> },
+            { "NiPSysSphericalCollider", &construct<NiPSysSphericalCollider, RC_NiPSysSphericalCollider> },
+
+            // Particle system controllers, 4.0.0.2
+            { "NiParticleSystemController", &construct<NiParticleSystemController, RC_NiParticleSystemController> },
+
+            // Particle system controllers, Gamebryo
+            { "NiPSysResetOnLoopCtlr", &construct<NiTimeController, RC_NiPSysResetOnLoopCtlr> },
+            { "NiPSysUpdateCtlr", &construct<NiTimeController, RC_NiPSysUpdateCtlr> },
+
+            // PHYSICS
+
+            // Collision objects, Gamebryo
+            { "NiCollisionObject", &construct<NiCollisionObject, RC_NiCollisionObject> },
+
+            // Collision objects, Bethesda
+            { "bhkCollisionObject", &construct<bhkCollisionObject, RC_bhkCollisionObject> },
+            { "bhkPCollisionObject", &construct<bhkCollisionObject, RC_bhkCollisionObject> },
+            { "bhkSPCollisionObject", &construct<bhkCollisionObject, RC_bhkCollisionObject> },
+            { "bhkNPCollisionObject", &construct<bhkNPCollisionObject, RC_bhkCollisionObject> },
+            { "bhkBlendCollisionObject", &construct<bhkBlendCollisionObject, RC_bhkBlendCollisionObject> },
+
+            // Constraint records, Bethesda
+            { "bhkBallAndSocketConstraint", &construct<bhkBallAndSocketConstraint, RC_bhkBallAndSocketConstraint> },
+            { "bhkBallSocketConstraintChain",
+                &construct<bhkBallSocketConstraintChain, RC_bhkBallSocketConstraintChain> },
+            { "bhkHingeConstraint", &construct<bhkHingeConstraint, RC_bhkHingeConstraint> },
+            { "bhkLimitedHingeConstraint", &construct<bhkLimitedHingeConstraint, RC_bhkLimitedHingeConstraint> },
+            { "bhkRagdollConstraint", &construct<bhkRagdollConstraint, RC_bhkRagdollConstraint> },
+            { "bhkStiffSpringConstraint", &construct<bhkStiffSpringConstraint, RC_bhkStiffSpringConstraint> },
+            { "bhkPrismaticConstraint", &construct<bhkPrismaticConstraint, RC_bhkPrismaticConstraint> },
+            { "bhkMalleableConstraint", &construct<bhkMalleableConstraint, RC_bhkMalleableConstraint> },
+            { "bhkBreakableConstraint", &construct<bhkBreakableConstraint, RC_bhkBreakableConstraint> },
+
+            // Physics body records, Bethesda
+            { "bhkRigidBody", &construct<bhkRigidBody, RC_bhkRigidBody> },
+            { "bhkRigidBodyT", &construct<bhkRigidBody, RC_bhkRigidBodyT> },
+
+            // Physics geometry records, Bethesda
+            { "bhkBoxShape", &construct<bhkBoxShape, RC_bhkBoxShape> },
+            { "bhkCapsuleShape", &construct<bhkCapsuleShape, RC_bhkCapsuleShape> },
+            { "bhkCylinderShape", &construct<bhkCylinderShape, RC_bhkCylinderShape> },
+            { "bhkCompressedMeshShape", &construct<bhkCompressedMeshShape, RC_bhkCompressedMeshShape> },
+            { "bhkCompressedMeshShapeData", &construct<bhkCompressedMeshShapeData, RC_bhkCompressedMeshShapeData> },
+            { "bhkConvexListShape", &construct<bhkConvexListShape, RC_bhkConvexListShape> },
+            { "bhkConvexSweepShape", &construct<bhkConvexSweepShape, RC_bhkConvexSweepShape> },
+            { "bhkConvexTransformShape", &construct<bhkConvexTransformShape, RC_bhkConvexTransformShape> },
+            { "bhkConvexVerticesShape", &construct<bhkConvexVerticesShape, RC_bhkConvexVerticesShape> },
+            { "bhkListShape", &construct<bhkListShape, RC_bhkListShape> },
+            { "bhkMoppBvTreeShape", &construct<bhkMoppBvTreeShape, RC_bhkMoppBvTreeShape> },
+            { "bhkMeshShape", &construct<bhkMeshShape, RC_bhkMeshShape> },
+            { "bhkMultiSphereShape", &construct<bhkMultiSphereShape, RC_bhkMultiSphereShape> },
+            { "bhkNiTriStripsShape", &construct<bhkNiTriStripsShape, RC_bhkNiTriStripsShape> },
+            { "bhkPackedNiTriStripsShape", &construct<bhkPackedNiTriStripsShape, RC_bhkPackedNiTriStripsShape> },
+            { "hkPackedNiTriStripsData", &construct<hkPackedNiTriStripsData, RC_hkPackedNiTriStripsData> },
+            { "bhkPlaneShape", &construct<bhkPlaneShape, RC_bhkPlaneShape> },
+            { "bhkSphereShape", &construct<bhkSphereShape, RC_bhkSphereShape> },
+            { "bhkTransformShape", &construct<bhkConvexTransformShape, RC_bhkConvexTransformShape> },
+
+            // Phantom records, Bethesda
+            { "bhkAabbPhantom", &construct<bhkAabbPhantom, RC_bhkAabbPhantom> },
+            { "bhkSimpleShapePhantom", &construct<bhkSimpleShapePhantom, RC_bhkSimpleShapePhantom> },
+
+            // Physics system records, Bethesda
+            { "bhkPhysicsSystem", &construct<bhkPhysicsSystem, RC_bhkPhysicsSystem> },
+            { "bhkRagdollSystem", &construct<bhkRagdollSystem, RC_bhkRagdollSystem> },
+
+            // Action records
+            { "bhkLiquidAction", &construct<bhkLiquidAction, RC_bhkLiquidAction> },
+            { "bhkOrientHingedBodyAction", &construct<bhkOrientHingedBodyAction, RC_bhkOrientHingedBodyAction> },
+
+            // Ragdoll template records
+            { "bhkRagdollTemplate", &construct<bhkRagdollTemplate, RC_bhkRagdollTemplate> },
+            { "bhkRagdollTemplateData", &construct<bhkRagdollTemplateData, RC_bhkRagdollTemplateData> },
+
+            // Other records
+            { "bhkPoseArray", &construct<bhkPoseArray, RC_bhkPoseArray> },
+
+            // PROPERTIES
+
+            // 4.0.0.2
+            { "NiAlphaProperty", &construct<NiAlphaProperty, RC_NiAlphaProperty> },
+            { "NiDitherProperty", &construct<NiDitherProperty, RC_NiDitherProperty> },
+            { "NiFogProperty", &construct<NiFogProperty, RC_NiFogProperty> },
+            { "NiMaterialProperty", &construct<NiMaterialProperty, RC_NiMaterialProperty> },
+            { "NiShadeProperty", &construct<NiShadeProperty, RC_NiShadeProperty> },
+            { "NiSpecularProperty", &construct<NiSpecularProperty, RC_NiSpecularProperty> },
+            { "NiStencilProperty", &construct<NiStencilProperty, RC_NiStencilProperty> },
+            { "NiTexturingProperty", &construct<NiTexturingProperty, RC_NiTexturingProperty> },
+            { "NiVertexColorProperty", &construct<NiVertexColorProperty, RC_NiVertexColorProperty> },
+            { "NiWireframeProperty", &construct<NiWireframeProperty, RC_NiWireframeProperty> },
+            { "NiZBufferProperty", &construct<NiZBufferProperty, RC_NiZBufferProperty> },
+
+            // Shader properties, Bethesda
+            { "BSShaderProperty", &construct<BSShaderProperty, RC_BSShaderProperty> },
+            { "BSShaderPPLightingProperty", &construct<BSShaderPPLightingProperty, RC_BSShaderPPLightingProperty> },
+            { "BSShaderNoLightingProperty", &construct<BSShaderNoLightingProperty, RC_BSShaderNoLightingProperty> },
+            { "BSDistantTreeShaderProperty", &construct<BSShaderProperty, RC_BSDistantTreeShaderProperty> },
+            { "BSLightingShaderProperty", &construct<BSLightingShaderProperty, RC_BSLightingShaderProperty> },
+            { "BSEffectShaderProperty", &construct<BSEffectShaderProperty, RC_BSEffectShaderProperty> },
+            { "BSSkyShaderProperty", &construct<BSSkyShaderProperty, RC_BSSkyShaderProperty> },
+            { "BSWaterShaderProperty", &construct<BSWaterShaderProperty, RC_BSWaterShaderProperty> },
+            { "DistantLODShaderProperty", &construct<BSShaderProperty, RC_DistantLODShaderProperty> },
+            { "HairShaderProperty", &construct<BSShaderProperty, RC_HairShaderProperty> },
+            { "Lighting30ShaderProperty", &construct<BSShaderPPLightingProperty, RC_BSShaderPPLightingProperty> },
+            { "SkyShaderProperty", &construct<SkyShaderProperty, RC_SkyShaderProperty> },
+            { "TallGrassShaderProperty", &construct<TallGrassShaderProperty, RC_TallGrassShaderProperty> },
+            { "TileShaderProperty", &construct<TileShaderProperty, RC_TileShaderProperty> },
+            { "VolumetricFogShaderProperty", &construct<BSShaderProperty, RC_VolumetricFogShaderProperty> },
+            { "WaterShaderProperty", &construct<BSShaderProperty, RC_WaterShaderProperty> },
         };
     }
 
     /// Make the factory map used for parsing the file
     static const std::map<std::string, CreateRecord> factories = makeFactory();
 
-    std::string Reader::printVersion(unsigned int version)
+    std::string Reader::versionToString(std::uint32_t version)
     {
         int major = (version >> 24) & 0xFF;
         int minor = (version >> 16) & 0xFF;
@@ -243,10 +538,14 @@ namespace Nif
 
     void Reader::parse(Files::IStreamPtr&& stream)
     {
-        const std::array<std::uint64_t, 2> fileHash = Files::getHash(filename, *stream);
-        hash.append(reinterpret_cast<const char*>(fileHash.data()), fileHash.size() * sizeof(std::uint64_t));
+        const bool writeDebug = sWriteNifDebugLog;
+        if (writeDebug)
+            Log(Debug::Verbose) << "NIF Debug: Reading file: '" << mFilename << "'";
 
-        NIFStream nif(*this, std::move(stream));
+        const std::array<std::uint64_t, 2> fileHash = Files::getHash(mFilename, *stream);
+        mHash.append(reinterpret_cast<const char*>(fileHash.data()), fileHash.size() * sizeof(std::uint64_t));
+
+        NIFStream nif(*this, std::move(stream), mEncoder);
 
         // Check the header string
         std::string head = nif.getVersionString();
@@ -257,151 +556,174 @@ namespace Nif
         const bool supportedHeader = std::any_of(verStrings.begin(), verStrings.end(),
             [&](const std::string& verString) { return head.starts_with(verString); });
         if (!supportedHeader)
-            throw Nif::Exception("Invalid NIF header: " + head, filename);
+            throw Nif::Exception("Invalid NIF header: " + head, mFilename);
 
         // Get BCD version
-        ver = nif.getUInt();
+        nif.read(mVersion);
         // 4.0.0.0 is an older, practically identical version of the format.
         // It's not used by Morrowind assets but Morrowind supports it.
         static const std::array<uint32_t, 2> supportedVers = {
             NIFStream::generateVersion(4, 0, 0, 0),
             NIFFile::VER_MW,
         };
-        const bool supportedVersion = std::find(supportedVers.begin(), supportedVers.end(), ver) != supportedVers.end();
-        const bool writeDebugLog = sWriteNifDebugLog;
-        if (!supportedVersion)
-        {
-            if (!sLoadUnsupportedFiles)
-                throw Nif::Exception("Unsupported NIF version: " + printVersion(ver), filename);
-            if (writeDebugLog)
-                Log(Debug::Warning) << " NIFFile Warning: Unsupported NIF version: " << printVersion(ver)
-                                    << ". Proceed with caution! File: " << filename;
-        }
+        const bool supportedVersion
+            = std::find(supportedVers.begin(), supportedVers.end(), mVersion) != supportedVers.end();
+
+        if (!supportedVersion && !sLoadUnsupportedFiles)
+            throw Nif::Exception("Unsupported NIF version: " + versionToString(mVersion), mFilename);
+
+        const bool hasEndianness = mVersion >= NIFStream::generateVersion(20, 0, 0, 4);
+        const bool hasUserVersion = mVersion >= NIFStream::generateVersion(10, 0, 1, 8);
+        const bool hasRecTypeListings = mVersion >= NIFStream::generateVersion(5, 0, 0, 1);
+        const bool hasRecTypeHashes = mVersion == NIFStream::generateVersion(20, 3, 1, 2);
+        const bool hasRecordSizes = mVersion >= NIFStream::generateVersion(20, 2, 0, 5);
+        const bool hasGroups = mVersion >= NIFStream::generateVersion(5, 0, 0, 6);
+        const bool hasStringTable = mVersion >= NIFStream::generateVersion(20, 1, 0, 1);
+        const bool hasRecordSeparators
+            = mVersion >= NIFStream::generateVersion(10, 0, 0, 0) && mVersion < NIFStream::generateVersion(10, 2, 0, 0);
+
+        // Record type list
+        std::vector<std::string> recTypes;
+        // Record type mapping for each record
+        std::vector<std::uint16_t> recTypeIndices;
 
-        // NIF data endianness
-        if (ver >= NIFStream::generateVersion(20, 0, 0, 4))
         {
-            unsigned char endianness = nif.getChar();
+            std::uint8_t endianness = 1;
+            if (hasEndianness)
+                nif.read(endianness);
+
+            // TODO: find some big-endian files and investigate the difference
             if (endianness == 0)
-                throw Nif::Exception("Big endian NIF files are unsupported", filename);
+                throw Nif::Exception("Big endian NIF files are unsupported", mFilename);
         }
 
-        // User version
-        if (ver > NIFStream::generateVersion(10, 0, 1, 8))
-            userVer = nif.getUInt();
+        if (hasUserVersion)
+            nif.read(mUserVersion);
 
-        // Number of records
-        const std::size_t recNum = nif.getUInt();
-        records.resize(recNum);
+        mRecords.resize(nif.get<std::uint32_t>());
 
         // Bethesda stream header
-        // It contains Bethesda format version and (useless) export information
-        if (ver == NIFFile::VER_OB_OLD
-            || (userVer >= 3
-                && ((ver == NIFFile::VER_OB || ver == NIFFile::VER_BGS)
-                    || (ver >= NIFStream::generateVersion(10, 1, 0, 0) && ver <= NIFStream::generateVersion(20, 0, 0, 4)
-                        && userVer <= 11))))
         {
-            bethVer = nif.getUInt();
-            nif.getExportString(); // Author
-            if (bethVer > NIFFile::BETHVER_FO4)
-                nif.getUInt(); // Unknown
-            nif.getExportString(); // Process script
-            nif.getExportString(); // Export script
-            if (bethVer == NIFFile::BETHVER_FO4)
-                nif.getExportString(); // Max file path
-        }
-
-        std::vector<std::string> recTypes;
-        std::vector<unsigned short> recTypeIndices;
-
-        const bool hasRecTypeListings = ver >= NIFStream::generateVersion(5, 0, 0, 1);
-        if (hasRecTypeListings)
-        {
-            unsigned short recTypeNum = nif.getUShort();
-            // Record type list
-            nif.getSizedStrings(recTypes, recTypeNum);
-            // Record type mapping for each record
-            nif.readVector(recTypeIndices, recNum);
-            if (ver >= NIFStream::generateVersion(5, 0, 0, 6)) // Groups
+            bool hasBSStreamHeader = false;
+            if (mVersion == NIFFile::VER_OB_OLD)
+                hasBSStreamHeader = true;
+            else if (mUserVersion >= 3 && mVersion >= NIFStream::generateVersion(10, 1, 0, 0))
             {
-                if (ver >= NIFStream::generateVersion(20, 1, 0, 1)) // String table
-                {
-                    if (ver >= NIFStream::generateVersion(20, 2, 0, 5)) // Record sizes
-                    {
-                        std::vector<unsigned int> recSizes; // Currently unused
-                        nif.readVector(recSizes, recNum);
-                    }
-                    const std::size_t stringNum = nif.getUInt();
-                    nif.getUInt(); // Max string length
-                    nif.getSizedStrings(strings, stringNum);
-                }
-                std::vector<unsigned int> groups; // Currently unused
-                unsigned int groupNum = nif.getUInt();
-                nif.readVector(groups, groupNum);
+                if (mVersion <= NIFFile::VER_OB || mVersion == NIFFile::VER_BGS)
+                    hasBSStreamHeader = mUserVersion <= 11 || mVersion >= NIFFile::VER_OB;
+            }
+
+            if (hasBSStreamHeader)
+            {
+                nif.read(mBethVersion);
+                nif.getExportString(); // Author
+                if (mBethVersion >= 131)
+                    nif.get<std::uint32_t>(); // Unknown
+                else
+                    nif.getExportString(); // Process script
+                nif.getExportString(); // Export script
+                if (mBethVersion >= 103)
+                    nif.getExportString(); // Max file path
             }
         }
 
-        const bool hasRecordSeparators
-            = ver >= NIFStream::generateVersion(10, 0, 0, 0) && ver < NIFStream::generateVersion(10, 2, 0, 0);
-        for (std::size_t i = 0; i < recNum; i++)
+        if (writeDebug)
+        {
+            std::stringstream versionInfo;
+            versionInfo << "NIF Debug: Version: " << versionToString(mVersion);
+            if (mUserVersion)
+                versionInfo << "\nUser version: " << mUserVersion;
+            if (mBethVersion)
+                versionInfo << "\nBSStream version: " << mBethVersion;
+            Log(Debug::Verbose) << versionInfo.str();
+        }
+
+        if (hasRecTypeListings)
+        {
+            // TODO: 20.3.1.2 uses DJB hashes instead of strings
+            if (hasRecTypeHashes)
+                throw Nif::Exception("Hashed record types are unsupported", mFilename);
+            else
+            {
+                nif.getSizedStrings(recTypes, nif.get<std::uint16_t>());
+                nif.readVector(recTypeIndices, mRecords.size());
+            }
+        }
+
+        if (hasRecordSizes) // Record sizes
+        {
+            std::vector<std::uint32_t> recSizes; // Currently unused
+            nif.readVector(recSizes, mRecords.size());
+        }
+
+        if (hasStringTable)
+        {
+            std::uint32_t stringNum, maxStringLength;
+            nif.read(stringNum);
+            nif.read(maxStringLength);
+            nif.getSizedStrings(mStrings, stringNum);
+        }
+
+        if (hasGroups)
+        {
+            std::vector<std::uint32_t> groups; // Currently unused
+            nif.readVector(groups, nif.get<std::uint32_t>());
+        }
+
+        for (std::size_t i = 0; i < mRecords.size(); i++)
         {
             std::unique_ptr<Record> r;
 
-            std::string rec = hasRecTypeListings ? recTypes[recTypeIndices[i]] : nif.getString();
+            std::string rec = hasRecTypeListings ? recTypes[recTypeIndices[i]] : nif.get<std::string>();
             if (rec.empty())
             {
                 std::stringstream error;
                 error << "Record type is blank (index " << i << ")";
-                throw Nif::Exception(error.str(), filename);
+                throw Nif::Exception(error.str(), mFilename);
             }
 
             // Record separator. Some Havok records in Oblivion do not have it.
-            if (hasRecordSeparators && !rec.starts_with("bhk"))
-                if (nif.getInt())
-                    Log(Debug::Warning) << "NIFFile Warning: Record of type " << rec << ", index " << i
-                                        << " is preceded by a non-zero separator. File: " << filename;
+            if (hasRecordSeparators && !rec.starts_with("bhk") && nif.get<int32_t>())
+                throw Nif::Exception("Non-zero separator precedes " + rec + ", index " + std::to_string(i), mFilename);
 
             const auto entry = factories.find(rec);
 
             if (entry == factories.end())
-                throw Nif::Exception("Unknown record type " + rec, filename);
+                throw Nif::Exception("Unknown record type " + rec, mFilename);
 
             r = entry->second();
 
-            if (!supportedVersion && writeDebugLog)
-                Log(Debug::Verbose) << "NIF Debug: Reading record of type " << rec << ", index " << i << " ("
-                                    << filename << ")";
+            if (writeDebug)
+                Log(Debug::Verbose) << "NIF Debug: Reading record of type " << rec << ", index " << i;
 
             assert(r != nullptr);
             assert(r->recType != RC_MISSING);
-            r->recName = rec;
+            r->recName = std::move(rec);
             r->recIndex = i;
             r->read(&nif);
-            records[i] = std::move(r);
+            mRecords[i] = std::move(r);
         }
 
-        const std::size_t rootNum = nif.getUInt();
-        roots.resize(rootNum);
-
         // Determine which records are roots
-        for (std::size_t i = 0; i < rootNum; i++)
+        mRoots.resize(nif.get<uint32_t>());
+        for (std::size_t i = 0; i < mRoots.size(); i++)
         {
-            int idx = nif.getInt();
-            if (idx >= 0 && static_cast<std::size_t>(idx) < records.size())
+            std::int32_t idx;
+            nif.read(idx);
+            if (idx >= 0 && static_cast<std::size_t>(idx) < mRecords.size())
             {
-                roots[i] = records[idx].get();
+                mRoots[i] = mRecords[idx].get();
             }
             else
             {
-                roots[i] = nullptr;
+                mRoots[i] = nullptr;
                 Log(Debug::Warning) << "NIFFile Warning: Root " << i + 1 << " does not point to a record: index " << idx
-                                    << ". File: " << filename;
+                                    << ". File: " << mFilename;
             }
         }
 
         // Once parsing is done, do post-processing.
-        for (const auto& record : records)
+        for (const auto& record : mRecords)
             record->post(*this);
     }
 
@@ -427,7 +749,7 @@ namespace Nif
     {
         if (index == std::numeric_limits<std::uint32_t>::max())
             return std::string();
-        return strings.at(index);
+        return mStrings.at(index);
     }
 
 }
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index 154ab6b140..106a896c30 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -4,13 +4,19 @@
 #define OPENMW_COMPONENTS_NIF_NIFFILE_HPP
 
 #include <atomic>
-#include <filesystem>
+#include <cstdint>
 #include <vector>
 
 #include <components/files/istreamptr.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include "record.hpp"
 
+namespace ToUTF8
+{
+    class StatelessUtf8Encoder;
+}
+
 namespace Nif
 {
 
@@ -30,16 +36,17 @@ namespace Nif
             BETHVER_SKY = 83, // Skyrim
             BETHVER_SSE = 100, // Skyrim SE
             BETHVER_FO4 = 130, // Fallout 4
-            BETHVER_F76 = 155 // Fallout 76
+            BETHVER_F76 = 155, // Fallout 76
+            BETHVER_STF = 172, // Starfield
         };
 
         /// File version, user version, Bethesda version
-        unsigned int mVersion = 0;
-        unsigned int mUserVersion = 0;
-        unsigned int mBethVersion = 0;
+        std::uint32_t mVersion = 0;
+        std::uint32_t mUserVersion = 0;
+        std::uint32_t mBethVersion = 0;
 
         /// File name, used for error messages and opening the file
-        std::filesystem::path mPath;
+        VFS::Path::Normalized mPath;
         std::string mHash;
 
         /// Record list
@@ -50,7 +57,7 @@ namespace Nif
 
         bool mUseSkinning = false;
 
-        explicit NIFFile(const std::filesystem::path& path)
+        explicit NIFFile(VFS::Path::NormalizedView path)
             : mPath(path)
         {
         }
@@ -71,18 +78,18 @@ namespace Nif
         std::size_t numRoots() const { return mFile->mRoots.size(); }
 
         /// Get the name of the file
-        const std::filesystem::path& getFilename() const { return mFile->mPath; }
+        const std::string& getFilename() const { return mFile->mPath; }
 
         const std::string& getHash() const { return mFile->mHash; }
 
         /// Get the version of the NIF format used
-        unsigned int getVersion() const { return mFile->mVersion; }
+        std::uint32_t getVersion() const { return mFile->mVersion; }
 
         /// Get the user version of the NIF format used
-        unsigned int getUserVersion() const { return mFile->mUserVersion; }
+        std::uint32_t getUserVersion() const { return mFile->mUserVersion; }
 
         /// Get the Bethesda version of the NIF format used
-        unsigned int getBethVersion() const { return mFile->mBethVersion; }
+        std::uint32_t getBethVersion() const { return mFile->mBethVersion; }
 
         bool getUseSkinning() const { return mFile->mUseSkinning; }
 
@@ -93,60 +100,61 @@ namespace Nif
     class Reader
     {
         /// File version, user version, Bethesda version
-        unsigned int& ver;
-        unsigned int& userVer;
-        unsigned int& bethVer;
+        std::uint32_t& mVersion;
+        std::uint32_t& mUserVersion;
+        std::uint32_t& mBethVersion;
 
         /// File name, used for error messages and opening the file
-        std::filesystem::path& filename;
-        std::string& hash;
+        std::string_view mFilename;
+        std::string& mHash;
 
         /// Record list
-        std::vector<std::unique_ptr<Record>>& records;
+        std::vector<std::unique_ptr<Record>>& mRecords;
 
         /// Root list.  This is a select portion of the pointers from records
-        std::vector<Record*>& roots;
+        std::vector<Record*>& mRoots;
 
         /// String table
-        std::vector<std::string> strings;
+        std::vector<std::string> mStrings;
 
         bool& mUseSkinning;
+        const ToUTF8::StatelessUtf8Encoder* mEncoder;
 
         static std::atomic_bool sLoadUnsupportedFiles;
         static std::atomic_bool sWriteNifDebugLog;
 
         /// Get the file's version in a human readable form
         ///\returns A string containing a human readable NIF version number
-        std::string printVersion(unsigned int version);
+        std::string versionToString(std::uint32_t version);
 
     public:
         /// Open a NIF stream. The name is used for error messages.
-        explicit Reader(NIFFile& file);
+        explicit Reader(NIFFile& file, const ToUTF8::StatelessUtf8Encoder* encoder);
 
         /// Parse the file
         void parse(Files::IStreamPtr&& stream);
 
         /// Get a given record
-        Record* getRecord(size_t index) const { return records.at(index).get(); }
+        Record* getRecord(size_t index) const { return mRecords.at(index).get(); }
 
         /// Get a given string from the file's string table
-        std::string getString(uint32_t index) const;
+        std::string getString(std::uint32_t index) const;
 
         /// Set whether there is skinning contained in this NIF file.
         /// @note This is just a hint for users of the NIF file and has no effect on the loading procedure.
         void setUseSkinning(bool skinning);
 
         /// Get the name of the file
-        std::filesystem::path getFilename() const { return filename; }
+        std::string_view getFilename() const { return mFilename; }
 
         /// Get the version of the NIF format used
-        unsigned int getVersion() const { return ver; }
+        std::uint32_t getVersion() const { return mVersion; }
 
         /// Get the user version of the NIF format used
-        unsigned int getUserVersion() const { return userVer; }
+        std::uint32_t getUserVersion() const { return mUserVersion; }
 
         /// Get the Bethesda version of the NIF format used
-        unsigned int getBethVersion() const { return bethVer; }
+        std::uint32_t getBethVersion() const { return mBethVersion; }
 
         static void setLoadUnsupportedFiles(bool load);
 
diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index 8f0e54de0d..604cf92c33 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -49,7 +49,9 @@ namespace Nif
         using ValueType = T;
         using KeyType = KeyT<T>;
 
-        unsigned int mInterpolationType = InterpolationType_Unknown;
+        std::string mFrameName;
+        float mLegacyWeight;
+        uint32_t mInterpolationType = InterpolationType_Unknown;
         MapType mKeys;
 
         // Read in a KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html)
@@ -57,21 +59,25 @@ namespace Nif
         {
             assert(nif);
 
-            if (morph && nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106))
-                nif->getString(); // Frame name
-
-            if (morph && nif->getVersion() > NIFStream::generateVersion(10, 1, 0, 0))
+            if (morph)
             {
-                if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104)
-                    && nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 2) && nif->getBethVersion() < 10)
-                    nif->getFloat(); // Legacy weight
-                return;
+                if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106))
+                    nif->read(mFrameName);
+
+                if (nif->getVersion() > NIFStream::generateVersion(10, 1, 0, 0))
+                {
+                    if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104)
+                        && nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 2) && nif->getBethVersion() < 10)
+                        nif->read(mLegacyWeight);
+                    return;
+                }
             }
 
-            size_t count = nif->getUInt();
+            uint32_t count;
+            nif->read(count);
 
             if (count != 0 || morph)
-                mInterpolationType = nif->getUInt();
+                nif->read(mInterpolationType);
 
             KeyType key = {};
 
@@ -79,7 +85,8 @@ namespace Nif
             {
                 for (size_t i = 0; i < count; i++)
                 {
-                    float time = nif->getFloat();
+                    float time;
+                    nif->read(time);
                     readValue(*nif, key);
                     mKeys[time] = key;
                 }
@@ -88,7 +95,8 @@ namespace Nif
             {
                 for (size_t i = 0; i < count; i++)
                 {
-                    float time = nif->getFloat();
+                    float time;
+                    nif->read(time);
                     readQuadratic(*nif, key);
                     mKeys[time] = key;
                 }
@@ -97,7 +105,8 @@ namespace Nif
             {
                 for (size_t i = 0; i < count; i++)
                 {
-                    float time = nif->getFloat();
+                    float time;
+                    nif->read(time);
                     readTBC(*nif, key);
                     mKeys[time] = key;
                 }
@@ -134,22 +143,22 @@ namespace Nif
         static void readTBC(NIFStream& nif, KeyT<T>& key)
         {
             readValue(nif, key);
-            /*key.mTension = */ nif.getFloat();
-            /*key.mBias = */ nif.getFloat();
-            /*key.mContinuity = */ nif.getFloat();
+            /*key.mTension = */ nif.get<float>();
+            /*key.mBias = */ nif.get<float>();
+            /*key.mContinuity = */ nif.get<float>();
         }
     };
-    using FloatKeyMap = KeyMapT<float, &NIFStream::getFloat>;
-    using Vector3KeyMap = KeyMapT<osg::Vec3f, &NIFStream::getVector3>;
-    using Vector4KeyMap = KeyMapT<osg::Vec4f, &NIFStream::getVector4>;
-    using QuaternionKeyMap = KeyMapT<osg::Quat, &NIFStream::getQuaternion>;
-    using ByteKeyMap = KeyMapT<char, &NIFStream::getChar>;
+    using FloatKeyMap = KeyMapT<float, &NIFStream::get<float>>;
+    using Vector3KeyMap = KeyMapT<osg::Vec3f, &NIFStream::get<osg::Vec3f>>;
+    using Vector4KeyMap = KeyMapT<osg::Vec4f, &NIFStream::get<osg::Vec4f>>;
+    using QuaternionKeyMap = KeyMapT<osg::Quat, &NIFStream::get<osg::Quat>>;
+    using BoolKeyMap = KeyMapT<bool, &NIFStream::get<bool>>;
 
     using FloatKeyMapPtr = std::shared_ptr<FloatKeyMap>;
     using Vector3KeyMapPtr = std::shared_ptr<Vector3KeyMap>;
     using Vector4KeyMapPtr = std::shared_ptr<Vector4KeyMap>;
     using QuaternionKeyMapPtr = std::shared_ptr<QuaternionKeyMap>;
-    using ByteKeyMapPtr = std::shared_ptr<ByteKeyMap>;
+    using BoolKeyMapPtr = std::shared_ptr<BoolKeyMap>;
 
 } // Namespace
 #endif //#ifndef OPENMW_COMPONENTS_NIF_NIFKEY_HPP
diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index db7528b2d0..f960e8d972 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -4,6 +4,8 @@
 
 #include "niffile.hpp"
 
+#include "../to_utf8/to_utf8.hpp"
+
 namespace
 {
 
@@ -58,6 +60,8 @@ namespace Nif
         size_t end = str.find('\0');
         if (end != std::string::npos)
             str.erase(end);
+        if (mEncoder)
+            str = mEncoder->getUtf8(str, ToUTF8::BufferAllocationPolicy::UseGrowFactor, mBuffer);
         return str;
     }
 
@@ -123,11 +127,34 @@ namespace Nif
     }
 
     template <>
-    void NIFStream::read<Transformation>(Transformation& t)
+    void NIFStream::read<osg::BoundingSpheref>(osg::BoundingSpheref& sphere)
     {
-        read(t.pos);
-        read(t.rotation);
-        read(t.scale);
+        read(sphere.center());
+        read(sphere.radius());
+    }
+
+    template <>
+    void NIFStream::read<NiTransform>(NiTransform& transform)
+    {
+        read(transform.mRotation);
+        read(transform.mTranslation);
+        read(transform.mScale);
+    }
+
+    template <>
+    void NIFStream::read<NiQuatTransform>(NiQuatTransform& transform)
+    {
+        read(transform.mTranslation);
+        read(transform.mRotation);
+        read(transform.mScale);
+        if (getVersion() >= generateVersion(10, 1, 0, 110))
+            return;
+        if (!get<bool>())
+            transform.mTranslation = osg::Vec3f();
+        if (!get<bool>())
+            transform.mRotation = osg::Quat();
+        if (!get<bool>())
+            transform.mScale = 1.f;
     }
 
     template <>
@@ -179,7 +206,19 @@ namespace Nif
     }
 
     template <>
-    void NIFStream::read<Transformation>(Transformation* dest, size_t size)
+    void NIFStream::read<osg::BoundingSpheref>(osg::BoundingSpheref* dest, size_t size)
+    {
+        readRange(*this, dest, size);
+    }
+
+    template <>
+    void NIFStream::read<NiTransform>(NiTransform* dest, size_t size)
+    {
+        readRange(*this, dest, size);
+    }
+
+    template <>
+    void NIFStream::read<NiQuatTransform>(NiQuatTransform* dest, size_t size)
     {
         readRange(*this, dest, size);
     }
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 58b160fcca..062f7c6512 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -8,6 +8,7 @@
 #include <istream>
 #include <stdexcept>
 #include <stdint.h>
+#include <string>
 #include <type_traits>
 #include <vector>
 
@@ -15,12 +16,18 @@
 #include <components/misc/endianness.hpp>
 #include <components/misc/float16.hpp>
 
+#include <osg/BoundingSphere>
 #include <osg/Quat>
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 
 #include "niftypes.hpp"
 
+namespace ToUTF8
+{
+    class StatelessUtf8Encoder;
+}
+
 namespace Nif
 {
 
@@ -66,11 +73,15 @@ namespace Nif
     {
         const Reader& mReader;
         Files::IStreamPtr mStream;
+        const ToUTF8::StatelessUtf8Encoder* mEncoder;
+        std::string mBuffer;
 
     public:
-        explicit NIFStream(const Reader& reader, Files::IStreamPtr&& stream)
+        explicit NIFStream(
+            const Reader& reader, Files::IStreamPtr&& stream, const ToUTF8::StatelessUtf8Encoder* encoder)
             : mReader(reader)
             , mStream(std::move(stream))
+            , mEncoder(encoder)
         {
         }
 
@@ -145,22 +156,6 @@ namespace Nif
 
         /// Read a sequence of null-terminated strings
         std::string getStringPalette();
-
-        /// DEPRECATED: Use read() or get()
-        char getChar() { return get<char>(); }
-        short getShort() { return get<short>(); }
-        unsigned short getUShort() { return get<unsigned short>(); }
-        int getInt() { return get<int>(); }
-        unsigned int getUInt() { return get<unsigned int>(); }
-        float getFloat() { return get<float>(); }
-        osg::Vec2f getVector2() { return get<osg::Vec2f>(); }
-        osg::Vec3f getVector3() { return get<osg::Vec3f>(); }
-        osg::Vec4f getVector4() { return get<osg::Vec4f>(); }
-        Matrix3 getMatrix3() { return get<Matrix3>(); }
-        osg::Quat getQuaternion() { return get<osg::Quat>(); }
-        Transformation getTrafo() { return get<Transformation>(); }
-        bool getBoolean() { return get<bool>(); }
-        std::string getString() { return get<std::string>(); }
     };
 
     template <>
@@ -174,7 +169,11 @@ namespace Nif
     template <>
     void NIFStream::read<osg::Quat>(osg::Quat& quat);
     template <>
-    void NIFStream::read<Transformation>(Transformation& t);
+    void NIFStream::read<osg::BoundingSpheref>(osg::BoundingSpheref& sphere);
+    template <>
+    void NIFStream::read<NiTransform>(NiTransform& transform);
+    template <>
+    void NIFStream::read<NiQuatTransform>(NiQuatTransform& transform);
     template <>
     void NIFStream::read<bool>(bool& data);
     template <>
@@ -191,7 +190,11 @@ namespace Nif
     template <>
     void NIFStream::read<osg::Quat>(osg::Quat* dest, size_t size);
     template <>
-    void NIFStream::read<Transformation>(Transformation* dest, size_t size);
+    void NIFStream::read<osg::BoundingSpheref>(osg::BoundingSpheref* dest, size_t size);
+    template <>
+    void NIFStream::read<NiTransform>(NiTransform* dest, size_t size);
+    template <>
+    void NIFStream::read<NiQuatTransform>(NiQuatTransform* dest, size_t size);
     template <>
     void NIFStream::read<bool>(bool* dest, size_t size);
     template <>
diff --git a/components/nif/niftypes.hpp b/components/nif/niftypes.hpp
index b6a97b6ecb..f1a131743d 100644
--- a/components/nif/niftypes.hpp
+++ b/components/nif/niftypes.hpp
@@ -25,6 +25,7 @@
 #define OPENMW_COMPONENTS_NIF_NIFTYPES_HPP
 
 #include <osg/Matrixf>
+#include <osg/Quat>
 #include <osg/Vec3f>
 
 // Common types used in NIF files
@@ -51,31 +52,67 @@ namespace Nif
                         return false;
             return true;
         }
+
+        osg::Matrixf toOsgMatrix() const
+        {
+            osg::Matrixf osgMat;
+
+            for (int i = 0; i < 3; ++i)
+                for (int j = 0; j < 3; ++j)
+                    osgMat(i, j) = mValues[j][i]; // NB: column/row major difference
+
+            return osgMat;
+        }
     };
 
-    struct Transformation
+    struct NiTransform
     {
-        osg::Vec3f pos;
-        Matrix3 rotation; // this can contain scale components too, including negative and nonuniform scales
-        float scale;
+        Matrix3 mRotation; // this can contain scale components too, including negative and nonuniform scales
+        osg::Vec3f mTranslation;
+        float mScale;
 
         osg::Matrixf toMatrix() const
         {
             osg::Matrixf transform;
-            transform.setTrans(pos);
+            transform.setTrans(mTranslation);
 
             for (int i = 0; i < 3; ++i)
                 for (int j = 0; j < 3; ++j)
-                    transform(j, i) = rotation.mValues[i][j] * scale; // NB column/row major difference
+                    transform(j, i) = mRotation.mValues[i][j] * mScale; // NB column/row major difference
 
             return transform;
         }
 
-        bool isIdentity() const { return pos == osg::Vec3f(0, 0, 0) && rotation.isIdentity() && scale == 1.f; }
+        bool isIdentity() const { return mRotation.isIdentity() && mTranslation == osg::Vec3f() && mScale == 1.f; }
 
-        static const Transformation& getIdentity()
+        static const NiTransform& getIdentity()
         {
-            static const Transformation identity = { osg::Vec3f(), Matrix3(), 1.0f };
+            static const NiTransform identity = { Matrix3(), osg::Vec3f(), 1.0f };
+            return identity;
+        }
+    };
+
+    struct NiQuatTransform
+    {
+        osg::Vec3f mTranslation;
+        osg::Quat mRotation;
+        float mScale;
+
+        osg::Matrixf toMatrix() const
+        {
+            osg::Matrixf transform(mRotation);
+            transform.setTrans(mTranslation);
+            for (int i = 0; i < 3; i++)
+                transform(i, i) *= mScale;
+
+            return transform;
+        }
+
+        bool isIdentity() const { return mTranslation == osg::Vec3f() && mRotation == osg::Quat() && mScale == 1.f; }
+
+        static const NiQuatTransform& getIdentity()
+        {
+            static const NiQuatTransform identity = { osg::Vec3f(), osg::Quat(), 1.f };
             return identity;
         }
     };
diff --git a/components/nif/node.cpp b/components/nif/node.cpp
index a2ae77830a..c2655a3e9c 100644
--- a/components/nif/node.cpp
+++ b/components/nif/node.cpp
@@ -1,122 +1,171 @@
 #include "node.hpp"
 
-#include <components/misc/strings/algorithm.hpp>
 #include <cstdint>
 
+#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
+
+#include <components/misc/convert.hpp>
+#include <components/misc/strings/algorithm.hpp>
+#include <components/resource/bulletshape.hpp>
+
 #include "data.hpp"
 #include "exception.hpp"
 #include "physics.hpp"
 #include "property.hpp"
 
+namespace
+{
+
+    void triBasedGeomToBtTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriBasedGeomData& data)
+    {
+        // FIXME: copying vertices/indices individually is unreasonable
+        const std::vector<osg::Vec3f>& vertices = data.mVertices;
+        mesh.preallocateVertices(static_cast<int>(vertices.size()));
+        for (const osg::Vec3f& vertex : vertices)
+            mesh.findOrAddVertex(Misc::Convert::toBullet(vertex), false);
+
+        mesh.preallocateIndices(static_cast<int>(data.mNumTriangles) * 3);
+    }
+
+    void trianglesToBtTriangleMesh(btTriangleMesh& mesh, const std::vector<unsigned short>& triangles)
+    {
+        for (std::size_t i = 0; i < triangles.size(); i += 3)
+            mesh.addTriangleIndices(triangles[i + 0], triangles[i + 1], triangles[i + 2]);
+    }
+
+    void stripsToBtTriangleMesh(btTriangleMesh& mesh, const std::vector<std::vector<unsigned short>>& strips)
+    {
+        for (const auto& strip : strips)
+        {
+            if (strip.size() < 3)
+                continue;
+
+            unsigned short a;
+            unsigned short b = strip[0];
+            unsigned short c = strip[1];
+            for (size_t i = 2; i < strip.size(); i++)
+            {
+                a = b;
+                b = c;
+                c = strip[i];
+                if (a == b || b == c || a == c)
+                    continue;
+                if (i % 2 == 0)
+                    mesh.addTriangleIndices(a, b, c);
+                else
+                    mesh.addTriangleIndices(a, c, b);
+            }
+        }
+    }
+
+}
+
 namespace Nif
 {
-    void NiBoundingVolume::read(NIFStream* nif)
+
+    void BoundingVolume::read(NIFStream* nif)
     {
-        type = nif->getUInt();
-        switch (type)
+        nif->read(mType);
+        switch (mType)
         {
             case BASE_BV:
                 break;
             case SPHERE_BV:
             {
-                sphere.read(nif);
+                nif->read(mSphere);
                 break;
             }
             case BOX_BV:
             {
-                box.center = nif->getVector3();
-                box.axes = nif->getMatrix3();
-                box.extents = nif->getVector3();
+                nif->read(mBox.mCenter);
+                nif->read(mBox.mAxes);
+                nif->read(mBox.mExtents);
                 break;
             }
             case CAPSULE_BV:
             {
-                capsule.center = nif->getVector3();
-                capsule.axis = nif->getVector3();
-                capsule.extent = nif->getFloat();
-                capsule.radius = nif->getFloat();
+                nif->read(mCapsule.mCenter);
+                nif->read(mCapsule.mAxis);
+                nif->read(mCapsule.mExtent);
+                nif->read(mCapsule.mRadius);
                 break;
             }
             case LOZENGE_BV:
             {
-                lozenge.radius = nif->getFloat();
+                nif->read(mLozenge.mRadius);
                 if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 1, 0))
                 {
-                    lozenge.extent0 = nif->getFloat();
-                    lozenge.extent1 = nif->getFloat();
+                    nif->read(mLozenge.mExtent0);
+                    nif->read(mLozenge.mExtent1);
                 }
-                lozenge.center = nif->getVector3();
-                lozenge.axis0 = nif->getVector3();
-                lozenge.axis1 = nif->getVector3();
+                nif->read(mLozenge.mCenter);
+                nif->read(mLozenge.mAxis0);
+                nif->read(mLozenge.mAxis1);
                 break;
             }
             case UNION_BV:
             {
-                unsigned int numChildren = nif->getUInt();
-                if (numChildren == 0)
-                    break;
-                children.resize(numChildren);
-                for (NiBoundingVolume& child : children)
+                mChildren.resize(nif->get<uint32_t>());
+                for (BoundingVolume& child : mChildren)
                     child.read(nif);
                 break;
             }
             case HALFSPACE_BV:
             {
-                halfSpace.plane = osg::Plane(nif->getVector4());
+                mHalfSpace.mPlane = osg::Plane(nif->get<osg::Vec4f>());
                 if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 1, 0))
-                    halfSpace.origin = nif->getVector3();
+                    nif->read(mHalfSpace.mOrigin);
                 break;
             }
             default:
             {
                 throw Nif::Exception(
-                    "Unhandled NiBoundingVolume type: " + std::to_string(type), nif->getFile().getFilename());
+                    "Unhandled BoundingVolume type: " + std::to_string(mType), nif->getFile().getFilename());
             }
         }
     }
 
-    void Node::read(NIFStream* nif)
+    void NiAVObject::read(NIFStream* nif)
     {
-        Named::read(nif);
+        NiObjectNET::read(nif);
 
-        flags = nif->getBethVersion() <= 26 ? nif->getUShort() : nif->getUInt();
-        trafo = nif->getTrafo();
+        if (nif->getBethVersion() <= 26)
+            mFlags = nif->get<uint16_t>();
+        else
+            nif->read(mFlags);
+        nif->read(mTransform.mTranslation);
+        nif->read(mTransform.mRotation);
+        nif->read(mTransform.mScale);
         if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
-            velocity = nif->getVector3();
+            nif->read(mVelocity);
         if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
-            readRecordList(nif, props);
-
-        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0))
-            hasBounds = nif->getBoolean();
-        if (hasBounds)
-            bounds.read(nif);
-        // Reference to the collision object in Gamebryo files.
+            readRecordList(nif, mProperties);
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0) && nif->get<bool>())
+            mBounds.read(nif);
         if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
-            collision.read(nif);
-
-        parents.clear();
-
-        isBone = false;
+            mCollision.read(nif);
     }
 
-    void Node::post(Reader& nif)
+    void NiAVObject::post(Reader& nif)
     {
-        Named::post(nif);
-        postRecordList(nif, props);
-        collision.post(nif);
+        NiObjectNET::post(nif);
+
+        postRecordList(nif, mProperties);
+        mCollision.post(nif);
     }
 
-    void Node::setBone()
+    void NiAVObject::setBone()
     {
-        isBone = true;
+        mIsBone = true;
     }
 
     void NiNode::read(NIFStream* nif)
     {
-        Node::read(nif);
-        readRecordList(nif, children);
+        NiAVObject::read(nif);
+
+        readRecordList(nif, mChildren);
         if (nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4)
-            readRecordList(nif, effects);
+            readRecordList(nif, mEffects);
 
         // FIXME: stopgap solution until we figure out what Oblivion does if it does anything
         if (nif->getVersion() > NIFFile::NIFVersion::VER_MW && nif->getVersion() < NIFFile::NIFVersion::VER_BGS)
@@ -128,23 +177,24 @@ namespace Nif
         // FIXME: if node 0 is *not* the only root node, this must not happen.
         // FIXME: doing this here is awful.
         // We want to do this on world scene graph level rather than local scene graph level.
-        if (0 == recIndex && !Misc::StringUtils::ciEqual(name, "bip01"))
+        if (recIndex == 0 && !Misc::StringUtils::ciEqual(mName, "bip01"))
         {
-            trafo = Nif::Transformation::getIdentity();
+            mTransform = Nif::NiTransform::getIdentity();
         }
     }
 
     void NiNode::post(Reader& nif)
     {
-        Node::post(nif);
-        postRecordList(nif, children);
-        postRecordList(nif, effects);
+        NiAVObject::post(nif);
 
-        for (auto& child : children)
+        postRecordList(nif, mChildren);
+        postRecordList(nif, mEffects);
+
+        for (auto& child : mChildren)
         {
             // Why would a unique list of children contain empty refs?
             if (!child.empty())
-                child->parents.push_back(this);
+                child->mParents.push_back(this);
         }
     }
 
@@ -152,125 +202,263 @@ namespace Nif
     {
         if (nif->getVersion() < NIFStream::generateVersion(10, 0, 1, 0))
             return;
-        unsigned int num = 0;
-        if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 3))
-            num = nif->getBoolean(); // Has Shader
-        else if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
-            num = nif->getUInt();
-
-        nif->readVector(names, num);
-        nif->readVector(extra, num);
         if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
-            active = nif->getUInt();
+            mNames.resize(nif->get<uint32_t>());
+        else if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 3))
+            mNames.resize(nif->get<bool>());
+        nif->readVector(mNames, mNames.size());
+        nif->readVector(mExtra, mNames.size());
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
+            nif->read(mActive);
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
-            needsUpdate = nif->getBoolean();
+            nif->read(mNeedsUpdate);
     }
 
     void NiGeometry::read(NIFStream* nif)
     {
-        Node::read(nif);
-        data.read(nif);
-        skin.read(nif);
-        material.read(nif);
+        NiAVObject::read(nif);
+
+        mData.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+            mSkin.read(nif);
+        mMaterial.read(nif);
         if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS
             && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
         {
-            shaderprop.read(nif);
-            alphaprop.read(nif);
+            mShaderProperty.read(nif);
+            mAlphaProperty.read(nif);
         }
     }
 
     void NiGeometry::post(Reader& nif)
     {
-        Node::post(nif);
-        data.post(nif);
-        skin.post(nif);
-        shaderprop.post(nif);
-        alphaprop.post(nif);
-        if (recType != RC_NiParticles && !skin.empty())
+        NiAVObject::post(nif);
+
+        mData.post(nif);
+        mSkin.post(nif);
+        mShaderProperty.post(nif);
+        mAlphaProperty.post(nif);
+        if (recType != RC_NiParticles && !mSkin.empty())
             nif.setUseSkinning(true);
+
+        if (!mData.empty())
+        {
+            switch (recType)
+            {
+                case RC_NiTriShape:
+                case RC_BSLODTriShape:
+                case RC_BSSegmentedTriShape:
+                    if (mData->recType != RC_NiTriShapeData)
+                        mData = NiGeometryDataPtr(nullptr);
+                    break;
+                case RC_NiTriStrips:
+                    if (mData->recType != RC_NiTriStripsData)
+                        mData = NiGeometryDataPtr(nullptr);
+                    break;
+                case RC_NiParticles:
+                    if (mData->recType != RC_NiParticlesData)
+                        mData = NiGeometryDataPtr(nullptr);
+                    break;
+                case RC_NiLines:
+                    if (mData->recType != RC_NiLinesData)
+                        mData = NiGeometryDataPtr(nullptr);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    std::unique_ptr<btCollisionShape> NiTriShape::getCollisionShape() const
+    {
+        if (mData.empty() || mData->mVertices.empty())
+            return nullptr;
+
+        std::vector<const std::vector<unsigned short>*> triangleLists;
+        std::vector<const std::vector<std::vector<unsigned short>>*> stripsLists;
+        auto data = static_cast<const NiTriShapeData*>(mData.getPtr());
+        const Nif::NiSkinPartition* partitions = nullptr;
+        if (!mSkin.empty())
+            partitions = mSkin->getPartitions();
+
+        if (partitions)
+        {
+            triangleLists.reserve(partitions->mPartitions.size());
+            stripsLists.reserve(partitions->mPartitions.size());
+            for (auto& partition : partitions->mPartitions)
+            {
+                triangleLists.push_back(&partition.mTrueTriangles);
+                stripsLists.push_back(&partition.mTrueStrips);
+            }
+        }
+        else if (data->mNumTriangles != 0)
+            triangleLists.push_back(&data->mTriangles);
+
+        // This makes a perhaps dangerous assumption that NiSkinPartition will never have more than 65536 triangles.
+        auto mesh = std::make_unique<btTriangleMesh>();
+        triBasedGeomToBtTriangleMesh(*mesh, *data);
+        for (const auto triangles : triangleLists)
+            trianglesToBtTriangleMesh(*mesh, *triangles);
+        for (const auto strips : stripsLists)
+            stripsToBtTriangleMesh(*mesh, *strips);
+
+        if (mesh->getNumTriangles() == 0)
+            return nullptr;
+
+        auto shape = std::make_unique<Resource::TriangleMeshShape>(mesh.get(), true);
+        std::ignore = mesh.release();
+
+        return shape;
+    }
+
+    std::unique_ptr<btCollisionShape> NiTriStrips::getCollisionShape() const
+    {
+        if (mData.empty() || mData->mVertices.empty())
+            return nullptr;
+
+        std::vector<const std::vector<unsigned short>*> triangleLists;
+        std::vector<const std::vector<std::vector<unsigned short>>*> stripsLists;
+        auto data = static_cast<const NiTriStripsData*>(mData.getPtr());
+        const Nif::NiSkinPartition* partitions = nullptr;
+        if (!mSkin.empty())
+            partitions = mSkin->getPartitions();
+
+        if (partitions)
+        {
+            triangleLists.reserve(partitions->mPartitions.size());
+            stripsLists.reserve(partitions->mPartitions.size());
+            for (auto& partition : partitions->mPartitions)
+            {
+                triangleLists.push_back(&partition.mTrueTriangles);
+                stripsLists.push_back(&partition.mTrueStrips);
+            }
+        }
+        else if (data->mNumTriangles != 0)
+            stripsLists.push_back(&data->mStrips);
+
+        auto mesh = std::make_unique<btTriangleMesh>();
+        triBasedGeomToBtTriangleMesh(*mesh, *data);
+        for (const auto triangles : triangleLists)
+            trianglesToBtTriangleMesh(*mesh, *triangles);
+        for (const auto strips : stripsLists)
+            stripsToBtTriangleMesh(*mesh, *strips);
+
+        if (mesh->getNumTriangles() == 0)
+            return nullptr;
+
+        auto shape = std::make_unique<Resource::TriangleMeshShape>(mesh.get(), true);
+        std::ignore = mesh.release();
+
+        return shape;
+    }
+
+    std::unique_ptr<btCollisionShape> NiLines::getCollisionShape() const
+    {
+        return nullptr;
+    }
+
+    std::unique_ptr<btCollisionShape> NiParticles::getCollisionShape() const
+    {
+        return nullptr;
+    }
+
+    void BSSegmentedTriShape::SegmentData::read(NIFStream* nif)
+    {
+        nif->read(mFlags);
+        nif->read(mStartIndex);
+        nif->read(mNumTriangles);
+    }
+
+    void BSSegmentedTriShape::read(NIFStream* nif)
+    {
+        NiTriShape::read(nif);
+
+        mSegments.resize(nif->get<uint32_t>());
+        for (SegmentData& segment : mSegments)
+            segment.read(nif);
     }
 
     void BSLODTriShape::read(NIFStream* nif)
     {
-        NiTriShape::read(nif);
-        lod0 = nif->getUInt();
-        lod1 = nif->getUInt();
-        lod2 = nif->getUInt();
-    }
+        NiTriBasedGeom::read(nif);
 
-    void NiCamera::Camera::read(NIFStream* nif)
-    {
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            cameraFlags = nif->getUShort();
-        left = nif->getFloat();
-        right = nif->getFloat();
-        top = nif->getFloat();
-        bottom = nif->getFloat();
-        nearDist = nif->getFloat();
-        farDist = nif->getFloat();
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            orthographic = nif->getBoolean();
-        vleft = nif->getFloat();
-        vright = nif->getFloat();
-        vtop = nif->getFloat();
-        vbottom = nif->getFloat();
-
-        LOD = nif->getFloat();
+        nif->readArray(mLOD);
     }
 
     void NiCamera::read(NIFStream* nif)
     {
-        Node::read(nif);
+        NiAVObject::read(nif);
 
-        cam.read(nif);
-
-        nif->getInt(); // -1
-        nif->getInt(); // 0
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            nif->read(mCameraFlags);
+        nif->read(mLeft);
+        nif->read(mRight);
+        nif->read(mTop);
+        nif->read(mBottom);
+        nif->read(mNearDist);
+        nif->read(mFarDist);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            nif->read(mOrthographic);
+        nif->read(mVLeft);
+        nif->read(mVRight);
+        nif->read(mVTop);
+        nif->read(mVBottom);
+        nif->read(mLODAdjust);
+        mScene.read(nif);
+        nif->skip(4); // Unused
         if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 1, 0))
-            nif->getInt(); // 0
+            nif->skip(4); // Unused
+    }
+
+    void NiCamera::post(Reader& nif)
+    {
+        NiAVObject::post(nif);
+
+        mScene.post(nif);
     }
 
     void NiSwitchNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
+
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            switchFlags = nif->getUShort();
-        initialIndex = nif->getUInt();
+            nif->read(mSwitchFlags);
+        nif->read(mInitialIndex);
     }
 
     void NiLODNode::read(NIFStream* nif)
     {
         NiSwitchNode::read(nif);
-        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW
-            && nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 0))
-            lodCenter = nif->getVector3();
-        else if (nif->getVersion() > NIFStream::generateVersion(10, 0, 1, 0))
+
+        if (nif->getVersion() > NIFStream::generateVersion(10, 0, 1, 0))
         {
             nif->skip(4); // NiLODData, unsupported at the moment
             return;
         }
 
-        unsigned int numLodLevels = nif->getUInt();
-        for (unsigned int i = 0; i < numLodLevels; ++i)
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW)
+            nif->read(mLODCenter);
+
+        mLODLevels.resize(nif->get<uint32_t>());
+        for (LODRange& level : mLODLevels)
         {
-            LODRange r;
-            r.minRange = nif->getFloat();
-            r.maxRange = nif->getFloat();
-            lodLevels.push_back(r);
+            nif->read(level.mMinRange);
+            nif->read(level.mMaxRange);
         }
     }
 
     void NiFltAnimationNode::read(NIFStream* nif)
     {
         NiSwitchNode::read(nif);
-        mDuration = nif->getFloat();
+
+        nif->read(mDuration);
     }
 
     void NiSortAdjustNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
-        mMode = nif->getInt();
+
+        mMode = static_cast<SortingMode>(nif->get<uint32_t>());
         if (nif->getVersion() <= NIFStream::generateVersion(20, 0, 0, 3))
             mSubSorter.read(nif);
     }
@@ -278,23 +466,26 @@ namespace Nif
     void NiSortAdjustNode::post(Reader& nif)
     {
         NiNode::post(nif);
+
         mSubSorter.post(nif);
     }
 
     void NiBillboardNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
+
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            mMode = nif->getUShort() & 0x7;
+            mMode = nif->get<uint16_t>() & 0x7;
         else
-            mMode = (flags >> 5) & 0x3;
+            mMode = (mFlags >> 5) & 0x3;
     }
 
     void NiDefaultAVObjectPalette::read(NIFStream* nif)
     {
         mScene.read(nif);
-        size_t numObjects = nif->getUInt();
-        for (size_t i = 0; i < numObjects; i++)
+        uint32_t numObjects;
+        nif->read(numObjects);
+        for (uint32_t i = 0; i < numObjects; i++)
             mObjects[nif->getSizedString()].read(nif);
     }
 
@@ -308,6 +499,7 @@ namespace Nif
     void BSTreeNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
+
         readRecordList(nif, mBones1);
         readRecordList(nif, mBones2);
     }
@@ -315,6 +507,7 @@ namespace Nif
     void BSTreeNode::post(Reader& nif)
     {
         NiNode::post(nif);
+
         postRecordList(nif, mBones1);
         postRecordList(nif, mBones2);
     }
@@ -322,77 +515,145 @@ namespace Nif
     void BSMultiBoundNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
+
         mMultiBound.read(nif);
         if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_SKY)
-            mType = nif->getUInt();
+            mCullingType = static_cast<BSCPCullingType>(nif->get<uint32_t>());
     }
 
     void BSMultiBoundNode::post(Reader& nif)
     {
         NiNode::post(nif);
+
         mMultiBound.post(nif);
     }
 
     void BSTriShape::read(NIFStream* nif)
     {
-        Node::read(nif);
-        mBoundingSphere.read(nif);
+        NiAVObject::read(nif);
 
-        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_F76)
-        {
+        nif->read(mBoundingSphere);
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
             nif->readArray(mBoundMinMax);
-        }
 
         mSkin.read(nif);
         mShaderProperty.read(nif);
         mAlphaProperty.read(nif);
-
         mVertDesc.read(nif);
 
-        unsigned int triNum;
-        if (nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4)
-        {
-            triNum = nif->get<unsigned short>();
-        }
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
+            mTriangles.resize(nif->get<uint32_t>() * 3);
         else
-        {
-            nif->read(triNum);
-        }
-
-        unsigned short vertNum;
-        nif->read(vertNum);
+            mTriangles.resize(nif->get<uint16_t>() * 3);
+        mVertData.resize(nif->get<uint16_t>());
         nif->read(mDataSize);
-
-        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_SSE)
+        if (mDataSize > 0)
         {
-            mVertData.resize(vertNum);
             for (auto& vertex : mVertData)
                 vertex.read(nif, mVertDesc.mFlags);
+            nif->readVector(mTriangles, mTriangles.size());
         }
-        else if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
-        {
-            throw Nif::Exception("FO4 BSTriShape is not supported yet: ", nif->getFile().getFilename());
-        }
-
-        if (mDataSize > 0)
-            nif->readVector(mTriangles, triNum * 3);
 
         if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_SSE)
         {
             nif->read(mParticleDataSize);
             if (mParticleDataSize > 0)
             {
-                throw Nif::Exception("Unhandled Particle Data in BSTriShape: ", nif->getFile().getFilename());
+                nif->readVector(mParticleVerts, mVertData.size() * 3);
+                nif->readVector(mParticleNormals, mVertData.size() * 3);
+                nif->readVector(mParticleTriangles, mTriangles.size());
             }
         }
     }
 
     void BSTriShape::post(Reader& nif)
     {
-        Node::post(nif);
+        NiAVObject::post(nif);
+
         mSkin.post(nif);
         mShaderProperty.post(nif);
         mAlphaProperty.post(nif);
+        if (!mSkin.empty())
+            nif.setUseSkinning(true);
+    }
+
+    void BSDynamicTriShape::read(NIFStream* nif)
+    {
+        BSTriShape::read(nif);
+
+        nif->read(mDynamicDataSize);
+        // nifly style.
+        // Consider complaining if mDynamicDataSize * 16 != mVertData.size()?
+        nif->readVector(mDynamicData, mVertData.size());
+    }
+
+    void BSMeshLODTriShape::read(NIFStream* nif)
+    {
+        BSTriShape::read(nif);
+
+        nif->readArray(mLOD);
+    }
+
+    void BSSubIndexTriShape::SubSegment::read(NIFStream* nif)
+    {
+        nif->read(mStartIndex);
+        nif->read(mNumPrimitives);
+        nif->read(mArrayIndex);
+        nif->skip(4); // Unknown
+    }
+
+    void BSSubIndexTriShape::Segment::read(NIFStream* nif)
+    {
+        nif->read(mStartIndex);
+        nif->read(mNumPrimitives);
+        nif->read(mParentArrayIndex);
+        mSubSegments.resize(nif->get<uint32_t>());
+        for (SubSegment& subsegment : mSubSegments)
+            subsegment.read(nif);
+    }
+
+    void BSSubIndexTriShape::SubSegmentDataRecord::read(NIFStream* nif)
+    {
+        nif->read(mUserSlotID);
+        nif->read(mMaterial);
+        nif->readVector(mExtraData, nif->get<uint32_t>());
+    }
+
+    void BSSubIndexTriShape::SubSegmentData::read(NIFStream* nif)
+    {
+        uint32_t numArrayIndices;
+        nif->read(numArrayIndices);
+        mDataRecords.resize(nif->get<uint32_t>());
+        nif->readVector(mArrayIndices, numArrayIndices);
+        for (SubSegmentDataRecord& dataRecord : mDataRecords)
+            dataRecord.read(nif);
+        mSSFFile = nif->getSizedString(nif->get<uint16_t>());
+    }
+
+    void BSSubIndexTriShape::Segmentation::read(NIFStream* nif)
+    {
+        nif->read(mNumPrimitives);
+        mSegments.resize(nif->get<uint32_t>());
+        nif->read(mNumTotalSegments);
+        for (Segment& segment : mSegments)
+            segment.read(nif);
+
+        if (mSegments.size() < mNumTotalSegments)
+            mSubSegmentData.read(nif);
+    }
+
+    void BSSubIndexTriShape::read(NIFStream* nif)
+    {
+        BSTriShape::read(nif);
+
+        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_SSE)
+        {
+            mSegments.resize(nif->get<uint32_t>());
+            for (BSSegmentedTriShape::SegmentData& segment : mSegments)
+                segment.read(nif);
+        }
+        else if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4 && mDataSize > 0)
+            mSegmentation.read(nif);
     }
 
     void BSVertexDesc::read(NIFStream* nif)
@@ -410,78 +671,56 @@ namespace Nif
         mLandscapeDataOffset = (data & 0xF00000000) >> 0x20;
         mEyeDataOffset = (data & 0xF000000000) >> 0x24;
         mFlags = (data & 0xFFF00000000000) >> 0x2C;
-    }
-
-    void NiBoundingVolume::NiSphereBV::read(NIFStream* nif)
-    {
-        nif->read(center);
-        nif->read(radius);
+        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_SSE)
+            mFlags |= BSVertexDesc::VertexAttribute::Full_Precision;
     }
 
     void BSVertexData::read(NIFStream* nif, uint16_t flags)
     {
-        uint16_t vertexFlag = flags & BSVertexDesc::VertexAttribute::Vertex;
-        uint16_t tangentsFlag = flags & BSVertexDesc::VertexAttribute::Tangents;
-        uint16_t UVsFlag = flags & BSVertexDesc::VertexAttribute::UVs;
-        uint16_t normalsFlag = flags & BSVertexDesc::VertexAttribute::Normals;
+        bool fullPrecision = flags & BSVertexDesc::VertexAttribute::Full_Precision;
+        bool hasVertex = flags & BSVertexDesc::VertexAttribute::Vertex;
+        bool hasTangent = flags & BSVertexDesc::VertexAttribute::Tangents;
+        bool hasUV = flags & BSVertexDesc::VertexAttribute::UVs;
+        bool hasNormal = flags & BSVertexDesc::VertexAttribute::Normals;
+        bool hasVertexColor = flags & BSVertexDesc::VertexAttribute::Vertex_Colors;
+        bool hasSkinData = flags & BSVertexDesc::VertexAttribute::Skinned;
+        bool hasEyeData = flags & BSVertexDesc::VertexAttribute::Eye_Data;
 
-        if (vertexFlag == BSVertexDesc::VertexAttribute::Vertex)
+        if (hasVertex)
         {
-            nif->read(mVertex);
+            if (fullPrecision)
+                nif->read(mVertex);
+            else
+                nif->readArray(mHalfVertex);
         }
 
-        if ((vertexFlag | tangentsFlag)
-            == (BSVertexDesc::VertexAttribute::Vertex | BSVertexDesc::VertexAttribute::Tangents))
-        {
-            nif->read(mBitangentX);
-        }
-
-        if ((vertexFlag | tangentsFlag) == BSVertexDesc::VertexAttribute::Vertex)
-        {
-            nif->read(mUnusedW);
-        }
-
-        if (UVsFlag == BSVertexDesc::VertexAttribute::UVs)
-        {
+        if (hasUV)
             nif->readArray(mUV);
-        }
 
-        if (normalsFlag)
+        if (hasNormal)
         {
             nif->readArray(mNormal);
-
-            nif->read(mBitangentY);
+            if (hasTangent)
+                nif->readArray(mTangent);
         }
 
-        if ((normalsFlag | tangentsFlag)
-            == (BSVertexDesc::VertexAttribute::Normals | BSVertexDesc::VertexAttribute::Tangents))
-        {
-            nif->readArray(mTangent);
+        if (hasVertexColor)
+            nif->readArray(mVertColor);
 
-            nif->read(mBitangentZ);
-        }
-
-        if (flags & BSVertexDesc::VertexAttribute::Vertex_Colors)
-        {
-            nif->readArray(mVertColors);
-        }
-
-        if (flags & BSVertexDesc::VertexAttribute::Skinned)
+        if (hasSkinData)
         {
             nif->readArray(mBoneWeights);
             nif->readArray(mBoneIndices);
         }
 
-        if (flags & BSVertexDesc::VertexAttribute::Eye_Data)
-        {
-            throw Nif::Exception("Unhandled Eye Data in BSTriShape: ", nif->getFile().getFilename());
-            // nif->read(mEyeData);
-        }
+        if (hasEyeData)
+            nif->read(mEyeData);
     }
 
     void BSValueNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
+
         nif->read(mValue);
         nif->read(mValueFlags);
     }
@@ -489,6 +728,7 @@ namespace Nif
     void BSOrderedNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
+
         nif->read(mAlphaSortBound);
         nif->read(mStaticBound);
     }
@@ -496,8 +736,49 @@ namespace Nif
     void BSRangeNode::read(NIFStream* nif)
     {
         NiNode::read(nif);
+
         nif->read(mMin);
         nif->read(mMax);
         nif->read(mCurrent);
     }
+
+    void BSResourceID::read(NIFStream* nif)
+    {
+        nif->read(mFileHash);
+        nif->readArray(mExtension);
+        nif->read(mDirectoryHash);
+    }
+
+    void BSDistantObjectInstance::read(NIFStream* nif)
+    {
+        mResourceID.read(nif);
+        nif->skip(12 * nif->get<uint32_t>()); // Unknown data
+        mTransforms.resize(nif->get<uint32_t>());
+        for (osg::Matrixf& transform : mTransforms)
+        {
+            std::array<float, 16> mat;
+            nif->readArray(mat);
+            transform.set(mat.data());
+        }
+    }
+
+    void BSShaderTextureArray::read(NIFStream* nif)
+    {
+        nif->skip(1); // Unknown
+        mTextureArrays.resize(nif->get<uint32_t>());
+        for (std::vector<std::string>& textureArray : mTextureArrays)
+            nif->getSizedStrings(textureArray, nif->get<uint32_t>());
+    }
+
+    void BSDistantObjectInstancedNode::read(NIFStream* nif)
+    {
+        BSMultiBoundNode::read(nif);
+
+        mInstances.resize(nif->get<uint32_t>());
+        for (BSDistantObjectInstance& instance : mInstances)
+            instance.read(nif);
+        for (BSShaderTextureArray& textureArray : mShaderTextureArrays)
+            textureArray.read(nif);
+    }
+
 }
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index dacaa1e823..e9306fa83f 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -8,14 +8,16 @@
 
 #include "base.hpp"
 
+class btCollisionShape;
+
 namespace Nif
 {
 
     struct NiNode;
 
-    struct NiBoundingVolume
+    struct BoundingVolume
     {
-        enum Type
+        enum Type : uint32_t
         {
             BASE_BV = 0xFFFFFFFF,
             SPHERE_BV = 0,
@@ -26,54 +28,49 @@ namespace Nif
             HALFSPACE_BV = 5
         };
 
-        struct NiSphereBV
-        {
-            osg::Vec3f center;
-            float radius{ 0.f };
-            void read(NIFStream* nif);
-        };
-
         struct NiBoxBV
         {
-            osg::Vec3f center;
-            Matrix3 axes;
-            osg::Vec3f extents;
+            osg::Vec3f mCenter;
+            Matrix3 mAxes;
+            osg::Vec3f mExtents;
         };
 
         struct NiCapsuleBV
         {
-            osg::Vec3f center, axis;
-            float extent{ 0.f }, radius{ 0.f };
+            osg::Vec3f mCenter, mAxis;
+            float mExtent{ 0.f }, mRadius{ 0.f };
         };
 
         struct NiLozengeBV
         {
-            float radius{ 0.f }, extent0{ 0.f }, extent1{ 0.f };
-            osg::Vec3f center, axis0, axis1;
+            float mRadius{ 0.f }, mExtent0{ 0.f }, mExtent1{ 0.f };
+            osg::Vec3f mCenter, mAxis0, mAxis1;
         };
 
         struct NiHalfSpaceBV
         {
-            osg::Plane plane;
-            osg::Vec3f origin;
+            osg::Plane mPlane;
+            osg::Vec3f mOrigin;
         };
 
-        unsigned int type;
-        NiSphereBV sphere;
-        NiBoxBV box;
-        NiCapsuleBV capsule;
-        NiLozengeBV lozenge;
-        std::vector<NiBoundingVolume> children;
-        NiHalfSpaceBV halfSpace;
+        uint32_t mType{ BASE_BV };
+        osg::BoundingSpheref mSphere;
+        NiBoxBV mBox;
+        NiCapsuleBV mCapsule;
+        NiLozengeBV mLozenge;
+        std::vector<BoundingVolume> mChildren;
+        NiHalfSpaceBV mHalfSpace;
 
         void read(NIFStream* nif);
     };
 
-    /** A Node is an object that's part of the main NIF tree. It has
-        parent node (unless it's the root), and transformation (location
-        and rotation) relative to it's parent.
-     */
-    struct Node : public Named
+    struct NiSequenceStreamHelper : NiObjectNET
+    {
+    };
+
+    // NiAVObject is an object that is a part of the main NIF tree. It has
+    // a parent node (unless it's the root) and transformation relative to its parent.
+    struct NiAVObject : NiObjectNET
     {
         enum Flags
         {
@@ -83,57 +80,48 @@ namespace Nif
             Flag_ActiveCollision = 0x0020
         };
 
-        // Node flags. Interpretation depends somewhat on the type of node.
-        unsigned int flags;
-
-        Transformation trafo;
-        osg::Vec3f velocity; // Unused? Might be a run-time game state
-        PropertyList props;
-
-        // Bounding box info
-        bool hasBounds{ false };
-        NiBoundingVolume bounds;
-
-        // Collision object info
-        NiCollisionObjectPtr collision;
+        // Node flags. Interpretation depends on the record type.
+        uint32_t mFlags;
+        NiTransform mTransform;
+        osg::Vec3f mVelocity;
+        NiPropertyList mProperties;
+        BoundingVolume mBounds;
+        NiCollisionObjectPtr mCollision;
+        // Parent nodes for the node. Only types derived from NiNode can be parents.
+        std::vector<NiNode*> mParents;
+        bool mIsBone{ false };
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
 
-        // Parent node, or nullptr for the root node. As far as I'm aware, only
-        // NiNodes (or types derived from NiNodes) can be parents.
-        std::vector<NiNode*> parents;
-
-        bool isBone{ false };
-
         void setBone();
-
-        bool isHidden() const { return flags & Flag_Hidden; }
-        bool hasMeshCollision() const { return flags & Flag_MeshCollision; }
-        bool hasBBoxCollision() const { return flags & Flag_BBoxCollision; }
-        bool collisionActive() const { return flags & Flag_ActiveCollision; }
+        bool isHidden() const { return mFlags & Flag_Hidden; }
+        bool hasMeshCollision() const { return mFlags & Flag_MeshCollision; }
+        bool hasBBoxCollision() const { return mFlags & Flag_BBoxCollision; }
+        bool collisionActive() const { return mFlags & Flag_ActiveCollision; }
     };
 
-    struct NiNode : Node
+    struct NiNode : NiAVObject
     {
-        NodeList children;
-        NodeList effects;
-
         enum BSAnimFlags
         {
             AnimFlag_AutoPlay = 0x0020
         };
+
         enum BSParticleFlags
         {
             ParticleFlag_AutoPlay = 0x0020,
             ParticleFlag_LocalSpace = 0x0080
         };
 
+        NiAVObjectList mChildren;
+        NiAVObjectList mEffects;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct NiGeometry : Node
+    struct NiGeometry : NiAVObject
     {
         /* Possible flags:
             0x40 - mesh has no vertex normals ?
@@ -144,100 +132,126 @@ namespace Nif
 
         struct MaterialData
         {
-            std::vector<std::string> names;
-            std::vector<int> extra;
-            unsigned int active{ 0 };
-            bool needsUpdate{ false };
+            std::vector<std::string> mNames;
+            std::vector<int> mExtra;
+            int32_t mActive{ -1 };
+            bool mNeedsUpdate{ false };
+
             void read(NIFStream* nif);
         };
 
-        NiGeometryDataPtr data;
-        NiSkinInstancePtr skin;
-        MaterialData material;
-        BSShaderPropertyPtr shaderprop;
-        NiAlphaPropertyPtr alphaprop;
+        NiGeometryDataPtr mData;
+        NiSkinInstancePtr mSkin;
+        MaterialData mMaterial;
+        BSShaderPropertyPtr mShaderProperty;
+        NiAlphaPropertyPtr mAlphaProperty;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+
+        virtual std::unique_ptr<btCollisionShape> getCollisionShape() const
+        {
+            throw std::runtime_error("NiGeometry::getCollisionShape() called on base class");
+        }
+    };
+
+    // Abstract triangle-based geometry
+    struct NiTriBasedGeom : NiGeometry
+    {
+    };
+
+    struct NiTriShape : NiTriBasedGeom
+    {
+        std::unique_ptr<btCollisionShape> getCollisionShape() const override;
+    };
+
+    struct BSSegmentedTriShape : NiTriShape
+    {
+        struct SegmentData
+        {
+            uint8_t mFlags;
+            uint32_t mStartIndex;
+            uint32_t mNumTriangles;
+
+            void read(NIFStream* nif);
+        };
+
+        std::vector<SegmentData> mSegments;
+
+        void read(NIFStream* nif);
+    };
+
+    struct NiTriStrips : NiTriBasedGeom
+    {
+        std::unique_ptr<btCollisionShape> getCollisionShape() const override;
+    };
+
+    struct NiLines : NiTriBasedGeom
+    {
+        std::unique_ptr<btCollisionShape> getCollisionShape() const override;
+    };
+
+    struct NiParticles : NiGeometry
+    {
+        std::unique_ptr<btCollisionShape> getCollisionShape() const override;
+    };
+
+    struct BSLODTriShape : NiTriShape
+    {
+        std::array<uint32_t, 3> mLOD;
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiCamera : NiAVObject
+    {
+        uint16_t mCameraFlags{ 0 };
+        // Camera frustum
+        float mLeft, mRight, mTop, mBottom, mNearDist, mFarDist;
+        bool mOrthographic{ false };
+        // Viewport
+        float mVLeft, mVRight, mVTop, mVBottom;
+        float mLODAdjust;
+        NiAVObjectPtr mScene;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct NiTriShape : NiGeometry
-    {
-    };
-    struct BSLODTriShape : NiTriShape
-    {
-        unsigned int lod0, lod1, lod2;
-        void read(NIFStream* nif) override;
-    };
-    struct NiTriStrips : NiGeometry
-    {
-    };
-    struct NiLines : NiGeometry
-    {
-    };
-    struct NiParticles : NiGeometry
-    {
-    };
-
-    struct NiCamera : Node
-    {
-        struct Camera
-        {
-            unsigned short cameraFlags{ 0 };
-
-            // Camera frustrum
-            float left, right, top, bottom, nearDist, farDist;
-
-            // Viewport
-            float vleft, vright, vtop, vbottom;
-
-            // Level of detail modifier
-            float LOD;
-
-            // Orthographic projection usage flag
-            bool orthographic{ false };
-
-            void read(NIFStream* nif);
-        };
-        Camera cam;
-
-        void read(NIFStream* nif) override;
-    };
-
     // A node used as the base to switch between child nodes, such as for LOD levels.
-    struct NiSwitchNode : public NiNode
+    struct NiSwitchNode : NiNode
     {
-        unsigned int switchFlags{ 0 };
-        unsigned int initialIndex{ 0 };
+        uint16_t mSwitchFlags;
+        uint32_t mInitialIndex;
 
         void read(NIFStream* nif) override;
     };
 
-    struct NiLODNode : public NiSwitchNode
+    struct NiLODNode : NiSwitchNode
     {
-        osg::Vec3f lodCenter;
-
         struct LODRange
         {
-            float minRange;
-            float maxRange;
+            float mMinRange;
+            float mMaxRange;
         };
-        std::vector<LODRange> lodLevels;
+
+        osg::Vec3f mLODCenter;
+        std::vector<LODRange> mLODLevels;
 
         void read(NIFStream* nif) override;
     };
 
-    struct NiFltAnimationNode : public NiSwitchNode
+    struct NiFltAnimationNode : NiSwitchNode
     {
-        float mDuration;
         enum Flags
         {
             Flag_Swing = 0x40
         };
 
+        float mDuration;
+
         void read(NIFStream* nif) override;
 
-        bool swing() const { return flags & Flag_Swing; }
+        bool swing() const { return mFlags & Flag_Swing; }
     };
 
     // Abstract
@@ -250,20 +264,21 @@ namespace Nif
     struct NiClusterAccumulator : NiAccumulator
     {
     };
+
     struct NiAlphaAccumulator : NiClusterAccumulator
     {
     };
 
     struct NiSortAdjustNode : NiNode
     {
-        enum SortingMode
+        enum class SortingMode : uint32_t
         {
-            SortingMode_Inherit,
-            SortingMode_Off,
-            SortingMode_Subsort
+            Inherit,
+            Off,
+            Subsort,
         };
 
-        int mMode;
+        SortingMode mMode;
         NiAccumulatorPtr mSubSorter;
 
         void read(NIFStream* nif) override;
@@ -272,15 +287,15 @@ namespace Nif
 
     struct NiBillboardNode : NiNode
     {
-        int mMode{ 0 };
+        int mMode;
 
         void read(NIFStream* nif) override;
     };
 
     struct NiDefaultAVObjectPalette : Record
     {
-        NodePtr mScene;
-        std::unordered_map<std::string, NodePtr> mObjects;
+        NiAVObjectPtr mScene;
+        std::unordered_map<std::string, NiAVObjectPtr> mObjects;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
@@ -288,15 +303,25 @@ namespace Nif
 
     struct BSTreeNode : NiNode
     {
-        NodeList mBones1, mBones2;
+        NiAVObjectList mBones1, mBones2;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
     struct BSMultiBoundNode : NiNode
     {
+        enum class BSCPCullingType : uint32_t
+        {
+            Normal,
+            AllPass,
+            AllFail,
+            IgnoreMultiBounds,
+            ForceMultiBoundsNoUpdate,
+        };
+
         BSMultiBoundPtr mMultiBound;
-        unsigned int mType{ 0 };
+        BSCPCullingType mCullingType;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
@@ -304,17 +329,17 @@ namespace Nif
 
     struct BSVertexDesc
     {
-        unsigned char mVertexDataSize;
-        unsigned char mDynamicVertexSize;
-        unsigned char mUV1Offset;
-        unsigned char mUV2Offset;
-        unsigned char mNormalOffset;
-        unsigned char mTangentOffset;
-        unsigned char mColorOffset;
-        unsigned char mSkinningDataOffset;
-        unsigned char mLandscapeDataOffset;
-        unsigned char mEyeDataOffset;
-        unsigned short mFlags;
+        uint8_t mVertexDataSize;
+        uint8_t mDynamicVertexSize;
+        uint8_t mUV1Offset;
+        uint8_t mUV2Offset;
+        uint8_t mNormalOffset;
+        uint8_t mTangentOffset;
+        uint8_t mColorOffset;
+        uint8_t mSkinningDataOffset;
+        uint8_t mLandscapeDataOffset;
+        uint8_t mEyeDataOffset;
+        uint16_t mFlags;
 
         enum VertexAttribute
         {
@@ -336,16 +361,12 @@ namespace Nif
 
     struct BSVertexData
     {
-        osg::Vec3f mVertex;
-        float mBitangentX;
-        unsigned int mUnusedW;
+        osg::Vec4f mVertex; // Bitangent X is stored in the fourth component
+        std::array<Misc::float16_t, 4> mHalfVertex; // Ditto
         std::array<Misc::float16_t, 2> mUV;
-
-        std::array<char, 3> mNormal;
-        char mBitangentY;
-        std::array<char, 3> mTangent;
-        char mBitangentZ;
-        std::array<char, 4> mVertColors;
+        std::array<char, 4> mNormal; // Bitangent Y is stored in the fourth component
+        std::array<char, 4> mTangent; // Bitangent Z is stored in the fourth component
+        std::array<char, 4> mVertColor;
         std::array<Misc::float16_t, 4> mBoneWeights;
         std::array<char, 4> mBoneIndices;
         float mEyeData;
@@ -353,34 +374,106 @@ namespace Nif
         void read(NIFStream* nif, uint16_t flags);
     };
 
-    struct BSTriShape : Node
+    struct BSTriShape : NiAVObject
     {
-        NiBoundingVolume::NiSphereBV mBoundingSphere;
+        osg::BoundingSpheref mBoundingSphere;
         std::array<float, 6> mBoundMinMax;
-
-        NiSkinInstancePtr mSkin;
+        RecordPtrT<Record> mSkin;
         BSShaderPropertyPtr mShaderProperty;
         NiAlphaPropertyPtr mAlphaProperty;
-
         BSVertexDesc mVertDesc;
-
-        unsigned int mDataSize;
-        unsigned int mParticleDataSize;
-
+        uint32_t mDataSize;
         std::vector<BSVertexData> mVertData;
         std::vector<unsigned short> mTriangles;
+        uint32_t mParticleDataSize;
+        std::vector<Misc::float16_t> mParticleVerts;
+        std::vector<Misc::float16_t> mParticleNormals;
         std::vector<unsigned short> mParticleTriangles;
-        std::vector<osg::Vec3f> mParticleVerts;
-        std::vector<osg::Vec3f> mParticleNormals;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
+    struct BSDynamicTriShape : BSTriShape
+    {
+        uint32_t mDynamicDataSize;
+        std::vector<osg::Vec4f> mDynamicData;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSMeshLODTriShape : BSTriShape
+    {
+        std::array<uint32_t, 3> mLOD;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSSubIndexTriShape : BSTriShape
+    {
+        struct SubSegment
+        {
+            uint32_t mStartIndex;
+            uint32_t mNumPrimitives;
+            uint32_t mArrayIndex;
+
+            void read(NIFStream* nif);
+        };
+
+        struct Segment
+        {
+            uint32_t mStartIndex;
+            uint32_t mNumPrimitives;
+            uint32_t mParentArrayIndex;
+            std::vector<SubSegment> mSubSegments;
+
+            void read(NIFStream* nif);
+        };
+
+        struct SubSegmentDataRecord
+        {
+            uint32_t mUserSlotID;
+            uint32_t mMaterial;
+            std::vector<float> mExtraData;
+
+            void read(NIFStream* nif);
+        };
+
+        struct SubSegmentData
+        {
+            std::vector<uint32_t> mArrayIndices;
+            std::vector<SubSegmentDataRecord> mDataRecords;
+            std::string mSSFFile;
+
+            void read(NIFStream* nif);
+        };
+
+        struct Segmentation
+        {
+            uint32_t mNumPrimitives;
+            uint32_t mNumTotalSegments;
+            std::vector<Segment> mSegments;
+            SubSegmentData mSubSegmentData;
+
+            void read(NIFStream* nif);
+        };
+
+        std::vector<BSSegmentedTriShape::SegmentData> mSegments; // SSE
+        Segmentation mSegmentation; // FO4
+
+        void read(NIFStream* nif) override;
+    };
+
     struct BSValueNode : NiNode
     {
-        unsigned int mValue;
-        char mValueFlags;
+        enum Flags
+        {
+            Flag_BillboardWorldZ = 0x1,
+            Flag_UsePlayerAdjust = 0x2,
+        };
+
+        uint32_t mValue;
+        uint8_t mValueFlags;
 
         void read(NIFStream* nif) override;
     };
@@ -388,7 +481,7 @@ namespace Nif
     struct BSOrderedNode : NiNode
     {
         osg::Vec4f mAlphaSortBound;
-        char mStaticBound;
+        bool mStaticBound;
 
         void read(NIFStream* nif) override;
     };
@@ -400,5 +493,38 @@ namespace Nif
 
         void read(NIFStream* nif) override;
     };
-} // Namespace
+
+    struct BSResourceID
+    {
+        uint32_t mFileHash;
+        std::array<char, 4> mExtension;
+        uint32_t mDirectoryHash;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSDistantObjectInstance
+    {
+        BSResourceID mResourceID;
+        std::vector<osg::Matrixf> mTransforms;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSShaderTextureArray
+    {
+        std::vector<std::vector<std::string>> mTextureArrays;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSDistantObjectInstancedNode : BSMultiBoundNode
+    {
+        std::vector<BSDistantObjectInstance> mInstances;
+        std::array<BSShaderTextureArray, 3> mShaderTextureArrays;
+
+        void read(NIFStream* nif) override;
+    };
+
+}
 #endif
diff --git a/components/nif/particle.cpp b/components/nif/particle.cpp
new file mode 100644
index 0000000000..d81d423fb6
--- /dev/null
+++ b/components/nif/particle.cpp
@@ -0,0 +1,737 @@
+#include "particle.hpp"
+
+#include "data.hpp"
+
+namespace Nif
+{
+
+    void NiParticleModifier::read(NIFStream* nif)
+    {
+        mNext.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+            mController.read(nif);
+    }
+
+    void NiParticleModifier::post(Reader& nif)
+    {
+        mNext.post(nif);
+        mController.post(nif);
+    }
+
+    void NiParticleGrowFade::read(NIFStream* nif)
+    {
+        NiParticleModifier::read(nif);
+        nif->read(mGrowTime);
+        nif->read(mFadeTime);
+    }
+
+    void NiParticleColorModifier::read(NIFStream* nif)
+    {
+        NiParticleModifier::read(nif);
+
+        mData.read(nif);
+    }
+
+    void NiParticleColorModifier::post(Reader& nif)
+    {
+        NiParticleModifier::post(nif);
+
+        mData.post(nif);
+    }
+
+    void NiGravity::read(NIFStream* nif)
+    {
+        NiParticleModifier::read(nif);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+            nif->read(mDecay);
+        nif->read(mForce);
+        mType = static_cast<ForceType>(nif->get<uint32_t>());
+        nif->read(mPosition);
+        nif->read(mDirection);
+    }
+
+    void NiParticleBomb::read(NIFStream* nif)
+    {
+        NiParticleModifier::read(nif);
+
+        nif->read(mRange);
+        nif->read(mDuration);
+        nif->read(mStrength);
+        nif->read(mStartTime);
+        mDecayType = static_cast<DecayType>(nif->get<uint32_t>());
+        mSymmetryType = static_cast<SymmetryType>(nif->get<uint32_t>());
+        nif->read(mPosition);
+        nif->read(mDirection);
+    }
+
+    void NiParticleCollider::read(NIFStream* nif)
+    {
+        NiParticleModifier::read(nif);
+
+        nif->read(mBounceFactor);
+        if (nif->getVersion() >= NIFStream::generateVersion(4, 2, 0, 2))
+        {
+            nif->read(mSpawnOnCollision);
+            nif->read(mDieOnCollision);
+        }
+    }
+
+    void NiPlanarCollider::read(NIFStream* nif)
+    {
+        NiParticleCollider::read(nif);
+
+        nif->read(mExtents);
+        nif->read(mPosition);
+        nif->read(mXVector);
+        nif->read(mYVector);
+        nif->read(mPlaneNormal);
+        nif->read(mPlaneDistance);
+    }
+
+    void NiSphericalCollider::read(NIFStream* nif)
+    {
+        NiParticleCollider::read(nif);
+
+        nif->read(mRadius);
+        nif->read(mCenter);
+    }
+
+    void NiParticleRotation::read(NIFStream* nif)
+    {
+        NiParticleModifier::read(nif);
+
+        nif->read(mRandomInitialAxis);
+        nif->read(mInitialAxis);
+        nif->read(mRotationSpeed);
+    }
+
+    void NiParticlesData::read(NIFStream* nif)
+    {
+        NiGeometryData::read(nif);
+
+        // Should always match the number of vertices in theory, but doesn't:
+        // see mist.nif in Mistify mod (https://www.nexusmods.com/morrowind/mods/48112).
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_MW)
+            nif->read(mNumParticles);
+        bool isBs202 = nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() != 0;
+
+        uint16_t numRadii = 1;
+        if (nif->getVersion() > NIFStream::generateVersion(10, 0, 1, 0))
+            numRadii = (nif->get<bool>() && !isBs202) ? mNumVertices : 0;
+        nif->readVector(mRadii, numRadii);
+        nif->read(mActiveCount);
+        if (nif->get<bool>() && !isBs202)
+            nif->readVector(mSizes, mNumVertices);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
+        {
+            if (nif->get<bool>() && !isBs202)
+                nif->readVector(mRotations, mNumVertices);
+            if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 4))
+            {
+                if (nif->get<bool>() && !isBs202)
+                    nif->readVector(mRotationAngles, mNumVertices);
+                if (nif->get<bool>() && !isBs202)
+                    nif->readVector(mRotationAxes, mNumVertices);
+                if (isBs202)
+                {
+                    nif->read(mHasTextureIndices);
+                    uint32_t numSubtextureOffsets;
+                    if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+                        numSubtextureOffsets = nif->get<uint8_t>();
+                    else
+                        nif->read(numSubtextureOffsets);
+                    nif->readVector(mSubtextureOffsets, numSubtextureOffsets);
+                    if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+                    {
+                        nif->read(mAspectRatio);
+                        nif->read(mAspectFlags);
+                        nif->read(mAspectRatio2);
+                        nif->read(mAspectSpeed);
+                        nif->read(mAspectSpeed2);
+                    }
+                }
+            }
+        }
+    }
+
+    void NiRotatingParticlesData::read(NIFStream* nif)
+    {
+        NiParticlesData::read(nif);
+
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 2, 2, 0) && nif->get<bool>())
+            nif->readVector(mRotations, mNumVertices);
+    }
+
+    void BSMasterParticleSystem::read(NIFStream* nif)
+    {
+        NiNode::read(nif);
+
+        nif->read(mMaxEmitters);
+        readRecordList(nif, mParticleSystems);
+    }
+
+    void BSMasterParticleSystem::post(Reader& nif)
+    {
+        NiNode::post(nif);
+
+        postRecordList(nif, mParticleSystems);
+    }
+
+    void NiParticleSystem::read(NIFStream* nif)
+    {
+        // Weird loading to account for inheritance differences starting from SSE
+        if (nif->getBethVersion() < NIFFile::BethVersion::BETHVER_SSE)
+            NiParticles::read(nif);
+        else
+        {
+            NiAVObject::read(nif);
+
+            nif->read(mBoundingSphere);
+            if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+                nif->readArray(mBoundMinMax);
+
+            mSkin.read(nif);
+            mShaderProperty.read(nif);
+            mAlphaProperty.read(nif);
+            mVertDesc.read(nif);
+        }
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_SKY)
+        {
+            nif->readArray(mNearFar);
+            if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_SSE)
+                mData.read(nif);
+        }
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+        {
+            nif->read(mWorldSpace);
+            readRecordList(nif, mModifiers);
+        }
+    }
+
+    void NiParticleSystem::post(Reader& nif)
+    {
+        NiParticles::post(nif);
+
+        postRecordList(nif, mModifiers);
+    }
+
+    void NiPSysData::read(NIFStream* nif)
+    {
+        NiParticlesData::read(nif);
+
+        bool hasData = nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO3;
+        if (hasData)
+        {
+            mParticles.resize(mNumVertices);
+            for (NiParticleInfo& info : mParticles)
+                info.read(nif);
+        }
+
+        if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO4)
+            nif->skip(12); // Unknown
+
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 2) && nif->get<bool>() && hasData)
+            nif->readVector(mRotationSpeeds, mNumVertices);
+
+        if (nif->getVersion() != NIFStream::generateVersion(20, 2, 0, 7) || nif->getBethVersion() == 0)
+        {
+            nif->read(mNumAddedParticles);
+            nif->read(mAddedParticlesBase);
+        }
+    }
+
+    void NiMeshPSysData::read(NIFStream* nif)
+    {
+        NiPSysData::read(nif);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 2, 0, 0))
+        {
+            nif->read(mDefaultPoolSize);
+            nif->read(mFillPoolsOnLoad);
+            nif->readVector(mGenerations, nif->get<uint32_t>());
+        }
+        mParticleMeshes.read(nif);
+    }
+
+    void NiMeshPSysData::post(Reader& nif)
+    {
+        NiPSysData::post(nif);
+
+        mParticleMeshes.post(nif);
+    }
+
+    void BSStripPSysData::read(NIFStream* nif)
+    {
+        NiPSysData::read(nif);
+
+        nif->read(mMaxPointCount);
+        nif->read(mStartCapSize);
+        nif->read(mEndCapSize);
+        nif->read(mDoZPrepass);
+    }
+
+    void NiPSysModifier::read(NIFStream* nif)
+    {
+        nif->read(mName);
+        mOrder = static_cast<NiPSysModifierOrder>(nif->get<uint32_t>());
+        mTarget.read(nif);
+        nif->read(mActive);
+    }
+
+    void NiPSysModifier::post(Reader& nif)
+    {
+        mTarget.post(nif);
+    }
+
+    void NiPSysAgeDeathModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mSpawnOnDeath);
+        mSpawnModifier.read(nif);
+    }
+
+    void NiPSysAgeDeathModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mSpawnModifier.post(nif);
+    }
+
+    void NiPSysBombModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        mBombObject.read(nif);
+        nif->read(mBombAxis);
+        nif->read(mRange);
+        nif->read(mStrength);
+        mDecayType = static_cast<DecayType>(nif->get<uint32_t>());
+        mSymmetryType = static_cast<SymmetryType>(nif->get<uint32_t>());
+    }
+
+    void NiPSysBombModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mBombObject.post(nif);
+    }
+
+    void NiPSysBoundUpdateModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mUpdateSkip);
+    }
+
+    void NiPSysColorModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        mData.read(nif);
+    }
+
+    void NiPSysColorModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mData.post(nif);
+    }
+
+    void NiPSysDragModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        mDragObject.read(nif);
+        nif->read(mDragAxis);
+        nif->read(mPercentage);
+        nif->read(mRange);
+        nif->read(mRangeFalloff);
+    }
+
+    void NiPSysDragModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mDragObject.post(nif);
+    }
+
+    void NiPSysGravityModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        mGravityObject.read(nif);
+        nif->read(mGravityAxis);
+        nif->read(mDecay);
+        nif->read(mStrength);
+        mForceType = static_cast<ForceType>(nif->get<uint32_t>());
+        nif->read(mTurbulence);
+        nif->read(mTurbulenceScale);
+
+        if (nif->getBethVersion() >= 17)
+            nif->read(mWorldAligned);
+    }
+
+    void NiPSysGravityModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mGravityObject.post(nif);
+    }
+
+    void NiPSysGrowFadeModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mGrowTime);
+        nif->read(mGrowGeneration);
+        nif->read(mFadeTime);
+        nif->read(mFadeGeneration);
+        if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS
+            && nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO3)
+            nif->read(mBaseScale);
+    }
+
+    void NiPSysMeshUpdateModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        readRecordList(nif, mMeshes);
+    }
+
+    void NiPSysMeshUpdateModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        postRecordList(nif, mMeshes);
+    }
+
+    void NiPSysRotationModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mRotationSpeed);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(20, 0, 0, 2))
+        {
+            nif->read(mRotationSpeedVariation);
+
+            if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO4)
+                nif->skip(17); // Unknown
+
+            nif->read(mRotationAngle);
+            nif->read(mRotationAngleVariation);
+            nif->read(mRandomRotSpeedSign);
+        }
+
+        nif->read(mRandomAxis);
+        nif->read(mAxis);
+    }
+
+    void NiPSysSpawnModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mNumSpawnGenerations);
+        nif->read(mPercentageSpawned);
+        nif->read(mMinNumToSpawn);
+        nif->read(mMaxNumToSpawn);
+        nif->read(mSpawnSpeedVariation);
+        nif->read(mSpawnDirVariation);
+        nif->read(mLifespan);
+        nif->read(mLifespanVariation);
+    }
+
+    void BSParentVelocityModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mDamping);
+    }
+
+    void BSPSysHavokUpdateModifier::read(NIFStream* nif)
+    {
+        NiPSysMeshUpdateModifier::read(nif);
+
+        mModifier.read(nif);
+    }
+
+    void BSPSysHavokUpdateModifier::post(Reader& nif)
+    {
+        NiPSysMeshUpdateModifier::post(nif);
+
+        mModifier.post(nif);
+    }
+
+    void BSPSysInheritVelocityModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        mInheritObject.read(nif);
+        nif->read(mInheritChance);
+        nif->read(mVelocityMult);
+        nif->read(mVelcoityVariation);
+    }
+
+    void BSPSysInheritVelocityModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mInheritObject.post(nif);
+    }
+
+    void BSPSysLODModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mLODStartDistance);
+        nif->read(mLODEndDistance);
+        nif->read(mEndEmitScale);
+        nif->read(mEndSize);
+    }
+
+    void BSPSysRecycleBoundModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mBoundOffset);
+        nif->read(mBoundExtents);
+        mBoundObject.read(nif);
+    }
+
+    void BSPSysRecycleBoundModifier::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mBoundObject.post(nif);
+    }
+
+    void BSPSysScaleModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->readVector(mScales, nif->get<uint32_t>());
+    }
+
+    void BSPSysSimpleColorModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mFadeInPercent);
+        nif->read(mFadeOutPercent);
+        nif->read(mColor1EndPercent);
+        nif->read(mColor1StartPercent);
+        nif->read(mColor2EndPercent);
+        nif->read(mColor2StartPercent);
+        nif->readVector(mColors, 3);
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+            nif->skip(52); // Unknown
+    }
+
+    void BSPSysStripUpdateModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mUpdateDeltaTime);
+    }
+
+    void BSPSysSubTexModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mStartFrame);
+        nif->read(mStartFrameFudge);
+        nif->read(mEndFrame);
+        nif->read(mLoopStartFrame);
+        nif->read(mLoopStartFrameFudge);
+        nif->read(mFrameCount);
+        nif->read(mFrameCountFudge);
+    }
+
+    void BSWindModifier::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mStrength);
+    }
+
+    void NiPSysEmitter::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        nif->read(mSpeed);
+        nif->read(mSpeedVariation);
+        nif->read(mDeclination);
+        nif->read(mDeclinationVariation);
+        nif->read(mPlanarAngle);
+        nif->read(mPlanarAngleVariation);
+        nif->read(mInitialColor);
+        nif->read(mInitialRadius);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 4, 0, 1))
+            nif->read(mRadiusVariation);
+        nif->read(mLifespan);
+        nif->read(mLifespanVariation);
+    }
+
+    void NiPSysVolumeEmitter::read(NIFStream* nif)
+    {
+        NiPSysEmitter::read(nif);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            mEmitterObject.read(nif);
+    }
+
+    void NiPSysVolumeEmitter::post(Reader& nif)
+    {
+        NiPSysEmitter::post(nif);
+
+        mEmitterObject.post(nif);
+    }
+
+    void NiPSysBoxEmitter::read(NIFStream* nif)
+    {
+        NiPSysVolumeEmitter::read(nif);
+
+        nif->read(mWidth);
+        nif->read(mHeight);
+        nif->read(mDepth);
+    }
+
+    void NiPSysCylinderEmitter::read(NIFStream* nif)
+    {
+        NiPSysVolumeEmitter::read(nif);
+
+        nif->read(mRadius);
+        nif->read(mHeight);
+    }
+
+    void NiPSysMeshEmitter::read(NIFStream* nif)
+    {
+        NiPSysEmitter::read(nif);
+
+        readRecordList(nif, mEmitterMeshes);
+
+        nif->read(mInitialVelocityType);
+        nif->read(mEmissionType);
+        nif->read(mEmissionAxis);
+    }
+
+    void NiPSysMeshEmitter::post(Reader& nif)
+    {
+        NiPSysEmitter::post(nif);
+
+        postRecordList(nif, mEmitterMeshes);
+    }
+
+    void NiPSysSphereEmitter::read(NIFStream* nif)
+    {
+        NiPSysVolumeEmitter::read(nif);
+
+        nif->read(mRadius);
+    }
+
+    void NiPSysModifierCtlr::read(NIFStream* nif)
+    {
+        NiSingleInterpController::read(nif);
+
+        nif->read(mModifierName);
+    }
+
+    void NiPSysEmitterCtlr::read(NIFStream* nif)
+    {
+        NiPSysModifierCtlr::read(nif);
+
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
+            mData.read(nif);
+        else
+            mVisInterpolator.read(nif);
+    }
+
+    void NiPSysEmitterCtlr::post(Reader& nif)
+    {
+        NiPSysModifierCtlr::post(nif);
+
+        mData.post(nif);
+        mVisInterpolator.post(nif);
+    }
+
+    void BSPSysMultiTargetEmitterCtlr::read(NIFStream* nif)
+    {
+        NiPSysEmitterCtlr::read(nif);
+
+        nif->read(mMaxEmitters);
+        mMasterPSys.read(nif);
+    }
+
+    void BSPSysMultiTargetEmitterCtlr::post(Reader& nif)
+    {
+        NiPSysEmitterCtlr::post(nif);
+
+        mMasterPSys.post(nif);
+    }
+
+    void NiPSysEmitterCtlrData::read(NIFStream* nif)
+    {
+        mFloatKeyList = std::make_shared<FloatKeyMap>();
+        mVisKeyList = std::make_shared<BoolKeyMap>();
+        uint32_t numVisKeys;
+        nif->read(numVisKeys);
+        for (size_t i = 0; i < numVisKeys; i++)
+            mVisKeyList->mKeys[nif->get<float>()].mValue = nif->get<uint8_t>() != 0;
+    }
+
+    void NiPSysCollider::read(NIFStream* nif)
+    {
+        nif->read(mBounce);
+        nif->read(mCollideSpawn);
+        nif->read(mCollideDie);
+        mSpawnModifier.read(nif);
+        mParent.read(nif);
+        mNextCollider.read(nif);
+        mColliderObject.read(nif);
+    }
+
+    void NiPSysCollider::post(Reader& nif)
+    {
+        mSpawnModifier.post(nif);
+        mParent.post(nif);
+        mNextCollider.post(nif);
+        mColliderObject.post(nif);
+    }
+
+    void NiPSysColliderManager::read(NIFStream* nif)
+    {
+        NiPSysModifier::read(nif);
+
+        mCollider.read(nif);
+    }
+
+    void NiPSysColliderManager::post(Reader& nif)
+    {
+        NiPSysModifier::post(nif);
+
+        mCollider.post(nif);
+    }
+
+    void NiPSysSphericalCollider::read(NIFStream* nif)
+    {
+        NiPSysCollider::read(nif);
+
+        nif->read(mRadius);
+    }
+
+    void NiPSysPlanarCollider::read(NIFStream* nif)
+    {
+        NiPSysCollider::read(nif);
+
+        nif->read(mWidth);
+        nif->read(mHeight);
+        nif->read(mXAxis);
+        nif->read(mYAxis);
+    }
+
+}
diff --git a/components/nif/particle.hpp b/components/nif/particle.hpp
new file mode 100644
index 0000000000..1bdbd3a94a
--- /dev/null
+++ b/components/nif/particle.hpp
@@ -0,0 +1,591 @@
+#ifndef OPENMW_COMPONENTS_NIF_PARTICLE_HPP
+#define OPENMW_COMPONENTS_NIF_PARTICLE_HPP
+
+#include "base.hpp"
+#include "controller.hpp"
+#include "data.hpp"
+#include "node.hpp"
+
+namespace Nif
+{
+
+    struct NiParticleModifier : Record
+    {
+        NiParticleModifierPtr mNext;
+        NiTimeControllerPtr mController;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiParticleGrowFade : NiParticleModifier
+    {
+        float mGrowTime;
+        float mFadeTime;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiParticleColorModifier : NiParticleModifier
+    {
+        NiColorDataPtr mData;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    enum class ForceType : uint32_t
+    {
+        Wind = 0, // Fixed direction
+        Point = 1, // Fixed origin
+    };
+
+    enum class DecayType : uint32_t
+    {
+        None = 0, // f(Distance) = 1.0
+        Linear = 1, // f(Distance) = (Range - Distance) / Range
+        Exponential = 2, // f(Distance) = exp(-Distance / Range)
+    };
+
+    enum class SymmetryType : uint32_t
+    {
+        Spherical = 0,
+        Cylindrical = 1, // Perpendicular to direction axis
+        Planar = 2, // Parallel to direction axis
+    };
+
+    struct NiGravity : NiParticleModifier
+    {
+        float mDecay{ 0.f };
+        float mForce;
+        ForceType mType;
+        osg::Vec3f mPosition;
+        osg::Vec3f mDirection;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiParticleBomb : NiParticleModifier
+    {
+        float mRange;
+        float mDuration;
+        float mStrength;
+        float mStartTime;
+        DecayType mDecayType;
+        SymmetryType mSymmetryType;
+        osg::Vec3f mPosition;
+        osg::Vec3f mDirection;
+
+        void read(NIFStream* nif);
+    };
+
+    struct NiParticleCollider : NiParticleModifier
+    {
+        float mBounceFactor;
+        bool mSpawnOnCollision{ false };
+        bool mDieOnCollision{ false };
+
+        void read(NIFStream* nif) override;
+    };
+
+    // NiPinaColada
+    struct NiPlanarCollider : NiParticleCollider
+    {
+        osg::Vec2f mExtents;
+        osg::Vec3f mPosition;
+        osg::Vec3f mXVector, mYVector;
+        osg::Vec3f mPlaneNormal;
+        float mPlaneDistance;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiSphericalCollider : NiParticleCollider
+    {
+        float mRadius;
+        osg::Vec3f mCenter;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiParticleRotation : NiParticleModifier
+    {
+        uint8_t mRandomInitialAxis;
+        osg::Vec3f mInitialAxis;
+        float mRotationSpeed;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiParticlesData : NiGeometryData
+    {
+        uint16_t mNumParticles{ 0 };
+        uint16_t mActiveCount;
+
+        std::vector<float> mRadii;
+        std::vector<float> mSizes;
+        std::vector<osg::Quat> mRotations;
+        std::vector<float> mRotationAngles;
+        std::vector<osg::Vec3f> mRotationAxes;
+
+        bool mHasTextureIndices{ false };
+        std::vector<osg::Vec4f> mSubtextureOffsets;
+        float mAspectRatio{ 1.f };
+        uint16_t mAspectFlags{ 0 };
+        float mAspectRatio2;
+        float mAspectSpeed, mAspectSpeed2;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiRotatingParticlesData : NiParticlesData
+    {
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSMasterParticleSystem : NiNode
+    {
+        uint16_t mMaxEmitters;
+        NiAVObjectList mParticleSystems;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiParticleSystem : NiParticles
+    {
+        osg::BoundingSpheref mBoundingSphere;
+        std::array<float, 6> mBoundMinMax;
+        BSVertexDesc mVertDesc;
+        std::array<uint16_t, 4> mNearFar;
+        bool mWorldSpace{ true };
+        NiPSysModifierList mModifiers;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysData : NiParticlesData
+    {
+        std::vector<NiParticleInfo> mParticles;
+        std::vector<float> mRotationSpeeds;
+        uint16_t mNumAddedParticles;
+        uint16_t mAddedParticlesBase;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiMeshPSysData : NiPSysData
+    {
+        uint32_t mDefaultPoolSize;
+        bool mFillPoolsOnLoad;
+        std::vector<uint32_t> mGenerations;
+        NiAVObjectPtr mParticleMeshes;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct BSStripPSysData : NiPSysData
+    {
+        uint16_t mMaxPointCount;
+        float mStartCapSize;
+        float mEndCapSize;
+        bool mDoZPrepass;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract
+    struct NiPSysModifier : Record
+    {
+        enum class NiPSysModifierOrder : uint32_t
+        {
+            KillOldParticles = 0,
+            BSLOD = 1,
+            Emitter = 1000,
+            Spawn = 2000,
+            BSStripUpdateFO3 = 2500,
+            General = 3000,
+            Force = 4000,
+            Collider = 5000,
+            PosUpdate = 6000,
+            PostPosUpdate = 6500,
+            WorldshiftPartspawn = 6600,
+            BoundUpdate = 7000,
+            BSStripUpdateSK = 8000,
+        };
+
+        std::string mName;
+        NiPSysModifierOrder mOrder;
+        NiParticleSystemPtr mTarget;
+        bool mActive;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysAgeDeathModifier : NiPSysModifier
+    {
+        bool mSpawnOnDeath;
+        NiPSysSpawnModifierPtr mSpawnModifier;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysBombModifier : NiPSysModifier
+    {
+        NiAVObjectPtr mBombObject;
+        osg::Vec3f mBombAxis;
+        float mRange;
+        float mStrength;
+        DecayType mDecayType;
+        SymmetryType mSymmetryType;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysBoundUpdateModifier : NiPSysModifier
+    {
+        uint16_t mUpdateSkip;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiPSysColorModifier : NiPSysModifier
+    {
+        NiColorDataPtr mData;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysDragModifier : NiPSysModifier
+    {
+        NiAVObjectPtr mDragObject;
+        osg::Vec3f mDragAxis;
+        float mPercentage;
+        float mRange;
+        float mRangeFalloff;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysGravityModifier : NiPSysModifier
+    {
+        NiAVObjectPtr mGravityObject;
+        osg::Vec3f mGravityAxis;
+        float mDecay;
+        float mStrength;
+        ForceType mForceType;
+        float mTurbulence;
+        float mTurbulenceScale;
+        bool mWorldAligned;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysGrowFadeModifier : NiPSysModifier
+    {
+        float mGrowTime;
+        uint16_t mGrowGeneration;
+        float mFadeTime;
+        uint16_t mFadeGeneration;
+        float mBaseScale;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiPSysMeshUpdateModifier : NiPSysModifier
+    {
+        NiAVObjectList mMeshes;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysRotationModifier : NiPSysModifier
+    {
+        float mRotationSpeed;
+        float mRotationSpeedVariation;
+        float mRotationAngle;
+        float mRotationAngleVariation;
+        bool mRandomRotSpeedSign;
+        bool mRandomAxis;
+        osg::Vec3f mAxis;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiPSysSpawnModifier : NiPSysModifier
+    {
+        uint16_t mNumSpawnGenerations;
+        float mPercentageSpawned;
+        uint16_t mMinNumToSpawn;
+        uint16_t mMaxNumToSpawn;
+        float mSpawnSpeedVariation;
+        float mSpawnDirVariation;
+        float mLifespan;
+        float mLifespanVariation;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSParentVelocityModifier : NiPSysModifier
+    {
+        float mDamping;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSPSysHavokUpdateModifier : NiPSysMeshUpdateModifier
+    {
+        NiPSysModifierPtr mModifier;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct BSPSysInheritVelocityModifier : NiPSysModifier
+    {
+        NiAVObjectPtr mInheritObject;
+        float mInheritChance;
+        float mVelocityMult;
+        float mVelcoityVariation;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct BSPSysLODModifier : NiPSysModifier
+    {
+        float mLODStartDistance;
+        float mLODEndDistance;
+        float mEndEmitScale;
+        float mEndSize;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSPSysRecycleBoundModifier : NiPSysModifier
+    {
+        osg::Vec3f mBoundOffset;
+        osg::Vec3f mBoundExtents;
+        NiAVObjectPtr mBoundObject;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct BSPSysScaleModifier : NiPSysModifier
+    {
+        std::vector<float> mScales;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSPSysSimpleColorModifier : NiPSysModifier
+    {
+        float mFadeInPercent;
+        float mFadeOutPercent;
+        float mColor1EndPercent;
+        float mColor1StartPercent;
+        float mColor2EndPercent;
+        float mColor2StartPercent;
+        std::vector<osg::Vec4f> mColors;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSPSysStripUpdateModifier : NiPSysModifier
+    {
+        float mUpdateDeltaTime;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSPSysSubTexModifier : NiPSysModifier
+    {
+        float mStartFrame;
+        float mStartFrameFudge;
+        float mEndFrame;
+        float mLoopStartFrame;
+        float mLoopStartFrameFudge;
+        float mFrameCount;
+        float mFrameCountFudge;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSWindModifier : NiPSysModifier
+    {
+        float mStrength;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract
+    struct NiPSysEmitter : NiPSysModifier
+    {
+        float mSpeed;
+        float mSpeedVariation;
+        float mDeclination;
+        float mDeclinationVariation;
+        float mPlanarAngle;
+        float mPlanarAngleVariation;
+        osg::Vec4f mInitialColor;
+        float mInitialRadius;
+        float mRadiusVariation;
+        float mLifespan;
+        float mLifespanVariation;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract
+    struct NiPSysVolumeEmitter : NiPSysEmitter
+    {
+        NiAVObjectPtr mEmitterObject;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysBoxEmitter : NiPSysVolumeEmitter
+    {
+        float mWidth;
+        float mHeight;
+        float mDepth;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiPSysCylinderEmitter : NiPSysVolumeEmitter
+    {
+        float mRadius;
+        float mHeight;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiPSysMeshEmitter : NiPSysEmitter
+    {
+        NiAVObjectList mEmitterMeshes;
+        uint32_t mInitialVelocityType;
+        uint32_t mEmissionType;
+        osg::Vec3f mEmissionAxis;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysSphereEmitter : NiPSysVolumeEmitter
+    {
+        float mRadius;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract
+    struct NiPSysModifierCtlr : NiSingleInterpController
+    {
+        std::string mModifierName;
+
+        void read(NIFStream* nif) override;
+    };
+
+    template <class DataPtr>
+    struct TypedNiPSysModifierCtlr : NiPSysModifierCtlr
+    {
+        DataPtr mData;
+
+        void read(NIFStream* nif) override
+        {
+            NiPSysModifierCtlr::read(nif);
+
+            if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
+                mData.read(nif);
+        }
+
+        void post(Reader& nif) override
+        {
+            NiPSysModifierCtlr::post(nif);
+
+            mData.post(nif);
+        }
+    };
+
+    using NiPSysModifierBoolCtlr = TypedNiPSysModifierCtlr<NiVisDataPtr>;
+    using NiPSysModifierFloatCtlr = TypedNiPSysModifierCtlr<NiFloatDataPtr>;
+
+    struct NiPSysEmitterCtlr : NiPSysModifierCtlr
+    {
+        NiPSysEmitterCtlrDataPtr mData;
+        NiInterpolatorPtr mVisInterpolator;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct BSPSysMultiTargetEmitterCtlr : NiPSysEmitterCtlr
+    {
+        uint16_t mMaxEmitters;
+        BSMasterParticleSystemPtr mMasterPSys;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysEmitterCtlrData : Record
+    {
+        FloatKeyMapPtr mFloatKeyList;
+        BoolKeyMapPtr mVisKeyList;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiPSysCollider : Record
+    {
+        float mBounce;
+        bool mCollideSpawn;
+        bool mCollideDie;
+        NiPSysSpawnModifierPtr mSpawnModifier;
+        NiPSysColliderManagerPtr mParent;
+        NiPSysColliderPtr mNextCollider;
+        NiAVObjectPtr mColliderObject;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysColliderManager : NiPSysModifier
+    {
+        NiPSysColliderPtr mCollider;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct NiPSysPlanarCollider : NiPSysCollider
+    {
+        float mWidth;
+        float mHeight;
+        osg::Vec3f mXAxis;
+        osg::Vec3f mYAxis;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiPSysSphericalCollider : NiPSysCollider
+    {
+        float mRadius;
+
+        void read(NIFStream* nif) override;
+    };
+
+}
+#endif
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index daa4f90c2a..6368537e60 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -12,15 +12,15 @@ namespace Nif
 
     void bhkWorldObjCInfoProperty::read(NIFStream* nif)
     {
-        mData = nif->getUInt();
-        mSize = nif->getUInt();
-        mCapacityAndFlags = nif->getUInt();
+        nif->read(mData);
+        nif->read(mSize);
+        nif->read(mCapacityAndFlags);
     }
 
     void bhkWorldObjectCInfo::read(NIFStream* nif)
     {
         nif->skip(4); // Unused
-        mPhaseType = static_cast<BroadPhaseType>(nif->getChar());
+        mPhaseType = static_cast<BroadPhaseType>(nif->get<uint8_t>());
         nif->skip(3); // Unused
         mProperty.read(nif);
     }
@@ -29,47 +29,47 @@ namespace Nif
     {
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
             nif->skip(4); // Unknown
-        mMaterial = nif->getUInt();
+        nif->read(mMaterial);
     }
 
     void HavokFilter::read(NIFStream* nif)
     {
-        mLayer = nif->getChar();
-        mFlags = nif->getChar();
-        mGroup = nif->getUShort();
+        nif->read(mLayer);
+        nif->read(mFlags);
+        nif->read(mGroup);
     }
 
     void hkSubPartData::read(NIFStream* nif)
     {
         mHavokFilter.read(nif);
-        mNumVertices = nif->getUInt();
+        nif->read(mNumVertices);
         mHavokMaterial.read(nif);
     }
 
-    void hkpMoppCode::read(NIFStream* nif)
-    {
-        unsigned int size = nif->getUInt();
-        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            mOffset = nif->getVector4();
-        if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
-            nif->getChar(); // MOPP data build type
-        nif->readVector(mData, size);
-    }
-
     void bhkEntityCInfo::read(NIFStream* nif)
     {
-        mResponseType = static_cast<hkResponseType>(nif->getChar());
+        mResponseType = static_cast<hkResponseType>(nif->get<uint8_t>());
         nif->skip(1); // Unused
-        mProcessContactDelay = nif->getUShort();
+        nif->read(mProcessContactDelay);
+    }
+
+    void hkpMoppCode::read(NIFStream* nif)
+    {
+        uint32_t dataSize;
+        nif->read(dataSize);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            nif->read(mOffset);
+        if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+            nif->read(mBuildType);
+        nif->readVector(mData, dataSize);
     }
 
     void TriangleData::read(NIFStream* nif)
     {
-        for (int i = 0; i < 3; i++)
-            mTriangle[i] = nif->getUShort();
-        mWeldingInfo = nif->getUShort();
+        nif->readArray(mTriangle);
+        nif->read(mWeldingInfo);
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-            mNormal = nif->getVector3();
+            nif->read(mNormal);
     }
 
     void bhkMeshMaterial::read(NIFStream* nif)
@@ -80,28 +80,27 @@ namespace Nif
 
     void bhkQsTransform::read(NIFStream* nif)
     {
-        mTranslation = nif->getVector4();
-        mRotation = nif->getQuaternion();
+        nif->read(mTranslation);
+        nif->read(mRotation);
     }
 
     void bhkCMSBigTri::read(NIFStream* nif)
     {
-        for (int i = 0; i < 3; i++)
-            mTriangle[i] = nif->getUShort();
-        mMaterial = nif->getUInt();
-        mWeldingInfo = nif->getUShort();
+        nif->readArray(mTriangle);
+        nif->read(mMaterial);
+        nif->read(mWeldingInfo);
     }
 
     void bhkCMSChunk::read(NIFStream* nif)
     {
-        mTranslation = nif->getVector4();
-        mMaterialIndex = nif->getUInt();
-        mReference = nif->getUShort();
-        mTransformIndex = nif->getUShort();
-        nif->readVector(mVertices, nif->getUInt());
-        nif->readVector(mIndices, nif->getUInt());
-        nif->readVector(mStrips, nif->getUInt());
-        nif->readVector(mWeldingInfos, nif->getUInt());
+        nif->read(mTranslation);
+        nif->read(mMaterialIndex);
+        nif->read(mReference);
+        nif->read(mTransformIndex);
+        nif->readVector(mVertices, nif->get<uint32_t>());
+        nif->readVector(mIndices, nif->get<uint32_t>());
+        nif->readVector(mStrips, nif->get<uint32_t>());
+        nif->readVector(mWeldingInfos, nif->get<uint32_t>());
     }
 
     void bhkRigidBodyCInfo::read(NIFStream* nif)
@@ -115,64 +114,67 @@ namespace Nif
             {
                 if (nif->getBethVersion() >= 83)
                     nif->skip(4); // Unused
-                mResponseType = static_cast<hkResponseType>(nif->getChar());
+                mResponseType = static_cast<hkResponseType>(nif->get<uint8_t>());
                 nif->skip(1); // Unused
-                mProcessContactDelay = nif->getUShort();
+                nif->read(mProcessContactDelay);
             }
         }
         if (nif->getBethVersion() < 83)
             nif->skip(4); // Unused
-        mTranslation = nif->getVector4();
-        mRotation = nif->getQuaternion();
-        mLinearVelocity = nif->getVector4();
-        mAngularVelocity = nif->getVector4();
+        nif->read(mTranslation);
+        nif->read(mRotation);
+        nif->read(mLinearVelocity);
+        nif->read(mAngularVelocity);
+        // A bit hacky, but this is the only instance where a 3x3 matrix has padding.
         for (int i = 0; i < 3; i++)
-            for (int j = 0; j < 4; j++)
-                mInertiaTensor[i][j] = nif->getFloat();
-        mCenter = nif->getVector4();
-        mMass = nif->getFloat();
-        mLinearDamping = nif->getFloat();
-        mAngularDamping = nif->getFloat();
+        {
+            nif->read(mInertiaTensor.mValues[i], 3);
+            nif->skip(4); // Padding
+        }
+        nif->read(mCenter);
+        nif->read(mMass);
+        nif->read(mLinearDamping);
+        nif->read(mAngularDamping);
         if (nif->getBethVersion() >= 83)
         {
             if (nif->getBethVersion() != NIFFile::BethVersion::BETHVER_FO4)
-                mTimeFactor = nif->getFloat();
-            mGravityFactor = nif->getFloat();
+                nif->read(mTimeFactor);
+            nif->read(mGravityFactor);
         }
-        mFriction = nif->getFloat();
+        nif->read(mFriction);
         if (nif->getBethVersion() >= 83)
-            mRollingFrictionMult = nif->getFloat();
-        mRestitution = nif->getFloat();
+            nif->read(mRollingFrictionMult);
+        nif->read(mRestitution);
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
         {
-            mMaxLinearVelocity = nif->getFloat();
-            mMaxAngularVelocity = nif->getFloat();
+            nif->read(mMaxLinearVelocity);
+            nif->read(mMaxAngularVelocity);
             if (nif->getBethVersion() != NIFFile::BethVersion::BETHVER_FO4)
-                mPenetrationDepth = nif->getFloat();
+                nif->read(mPenetrationDepth);
         }
-        mMotionType = static_cast<hkMotionType>(nif->getChar());
+        mMotionType = static_cast<hkMotionType>(nif->get<uint8_t>());
         if (nif->getBethVersion() < 83)
-            mDeactivatorType = static_cast<hkDeactivatorType>(nif->getChar());
+            mDeactivatorType = static_cast<hkDeactivatorType>(nif->get<uint8_t>());
         else
-            mEnableDeactivation = nif->getBoolean();
-        mSolverDeactivation = static_cast<hkSolverDeactivation>(nif->getChar());
+            nif->read(mEnableDeactivation);
+        mSolverDeactivation = static_cast<hkSolverDeactivation>(nif->get<uint8_t>());
         if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_FO4)
         {
             nif->skip(1);
-            mPenetrationDepth = nif->getFloat();
-            mTimeFactor = nif->getFloat();
+            nif->read(mPenetrationDepth);
+            nif->read(mTimeFactor);
             nif->skip(4);
-            mResponseType = static_cast<hkResponseType>(nif->getChar());
+            mResponseType = static_cast<hkResponseType>(nif->get<uint8_t>());
             nif->skip(1); // Unused
-            mProcessContactDelay = nif->getUShort();
+            nif->read(mProcessContactDelay);
         }
-        mQualityType = static_cast<hkQualityType>(nif->getChar());
+        mQualityType = static_cast<hkQualityType>(nif->get<uint8_t>());
         if (nif->getBethVersion() >= 83)
         {
-            mAutoRemoveLevel = nif->getChar();
-            mResponseModifierFlags = nif->getChar();
-            mNumContactPointShapeKeys = nif->getChar();
-            mForceCollidedOntoPPU = nif->getBoolean();
+            nif->read(mAutoRemoveLevel);
+            nif->read(mResponseModifierFlags);
+            nif->read(mNumContactPointShapeKeys);
+            nif->read(mForceCollidedOntoPPU);
         }
         if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_FO4)
             nif->skip(3); // Unused
@@ -182,7 +184,7 @@ namespace Nif
 
     void bhkConstraintCInfo::read(NIFStream* nif)
     {
-        nif->get<unsigned int>(); // Number of entities, unused
+        nif->get<uint32_t>(); // Number of entities, unused
         mEntityA.read(nif);
         mEntityB.read(nif);
 
@@ -203,7 +205,7 @@ namespace Nif
         nif->read(mDamping);
         nif->read(mProportionalRecoveryVelocity);
         nif->read(mConstantRecoveryVelocity);
-        mEnabled = nif->getBoolean();
+        nif->read(mEnabled);
     }
 
     void bhkVelocityConstraintMotor::read(NIFStream* nif)
@@ -212,8 +214,8 @@ namespace Nif
         nif->read(mMaxForce);
         nif->read(mTau);
         nif->read(mTargetVelocity);
-        mUseVelocityTarget = nif->getBoolean();
-        mEnabled = nif->getBoolean();
+        nif->read(mUseVelocityTarget);
+        nif->read(mEnabled);
     }
 
     void bhkSpringDamperConstraintMotor::read(NIFStream* nif)
@@ -222,7 +224,7 @@ namespace Nif
         nif->read(mMaxForce);
         nif->read(mSpringConstant);
         nif->read(mSpringDamping);
-        mEnabled = nif->getBoolean();
+        nif->read(mEnabled);
     }
 
     void bhkConstraintMotorCInfo::read(NIFStream* nif)
@@ -330,15 +332,180 @@ namespace Nif
             mMotor.read(nif);
     }
 
+    void bhkBallAndSocketConstraintCInfo::read(NIFStream* nif)
+    {
+        nif->read(mPivotA);
+        nif->read(mPivotB);
+    }
+
+    void bhkStiffSpringConstraintCInfo::read(NIFStream* nif)
+    {
+        nif->read(mPivotA);
+        nif->read(mPivotB);
+        nif->read(mLength);
+    }
+
+    void bhkPrismaticConstraintCInfo::read(NIFStream* nif)
+    {
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+        {
+            nif->read(mDataA.mPivot);
+            nif->read(mDataA.mRotation);
+            nif->read(mDataA.mPlane);
+            nif->read(mDataA.mSliding);
+            nif->read(mDataB.mSliding);
+            nif->read(mDataB.mPivot);
+            nif->read(mDataB.mRotation);
+            nif->read(mDataB.mPlane);
+        }
+        else
+        {
+            nif->read(mDataA.mSliding);
+            nif->read(mDataA.mRotation);
+            nif->read(mDataA.mPlane);
+            nif->read(mDataA.mPivot);
+            nif->read(mDataB.mSliding);
+            nif->read(mDataB.mRotation);
+            nif->read(mDataB.mPlane);
+            nif->read(mDataB.mPivot);
+        }
+        nif->read(mMinDistance);
+        nif->read(mMaxDistance);
+        nif->read(mFriction);
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() >= 17)
+            mMotor.read(nif);
+    }
+
+    void bhkMalleableConstraintCInfo::read(NIFStream* nif)
+    {
+        mType = static_cast<hkConstraintType>(nif->get<uint32_t>());
+        mInfo.read(nif);
+        switch (mType)
+        {
+            case hkConstraintType::BallAndSocket:
+                mBallAndSocketInfo.read(nif);
+                break;
+            case hkConstraintType::Hinge:
+                mHingeInfo.read(nif);
+                break;
+            case hkConstraintType::LimitedHinge:
+                mLimitedHingeInfo.read(nif);
+                break;
+            case hkConstraintType::Prismatic:
+                mPrismaticInfo.read(nif);
+                break;
+            case hkConstraintType::Ragdoll:
+                mRagdollInfo.read(nif);
+                break;
+            case hkConstraintType::StiffSpring:
+                mStiffSpringInfo.read(nif);
+                break;
+            default:
+                throw Nif::Exception(
+                    "Unrecognized constraint type in bhkMalleableConstraint", nif->getFile().getFilename());
+        }
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+        {
+            nif->read(mTau);
+            nif->read(mDamping);
+        }
+        else
+        {
+            nif->read(mStrength);
+        }
+    }
+
+    void bhkWrappedConstraintData::read(NIFStream* nif)
+    {
+        mType = static_cast<hkConstraintType>(nif->get<uint32_t>());
+        mInfo.read(nif);
+        switch (mType)
+        {
+            case hkConstraintType::BallAndSocket:
+                mBallAndSocketInfo.read(nif);
+                break;
+            case hkConstraintType::Hinge:
+                mHingeInfo.read(nif);
+                break;
+            case hkConstraintType::LimitedHinge:
+                mLimitedHingeInfo.read(nif);
+                break;
+            case hkConstraintType::Prismatic:
+                mPrismaticInfo.read(nif);
+                break;
+            case hkConstraintType::Ragdoll:
+                mRagdollInfo.read(nif);
+                break;
+            case hkConstraintType::StiffSpring:
+                mStiffSpringInfo.read(nif);
+                break;
+            case hkConstraintType::Malleable:
+                mMalleableInfo.read(nif);
+                break;
+            default:
+                throw Nif::Exception(
+                    "Unrecognized constraint type in bhkWrappedConstraintData", nif->getFile().getFilename());
+        }
+    }
+
+    void bhkConstraintChainCInfo::read(NIFStream* nif)
+    {
+        readRecordList(nif, mEntities);
+        mInfo.read(nif);
+    }
+
+    void bhkConstraintChainCInfo::post(Reader& nif)
+    {
+        postRecordList(nif, mEntities);
+    }
+
     /// Record types
 
     void bhkCollisionObject::read(NIFStream* nif)
     {
         NiCollisionObject::read(nif);
-        mFlags = nif->getUShort();
+
+        nif->read(mFlags);
         mBody.read(nif);
     }
 
+    void bhkNPCollisionObject::read(NIFStream* nif)
+    {
+        NiCollisionObject::read(nif);
+
+        nif->read(mFlags);
+        mData.read(nif);
+        nif->read(mBodyID);
+    }
+
+    void bhkNPCollisionObject::post(Reader& nif)
+    {
+        NiCollisionObject::post(nif);
+
+        mData.post(nif);
+    }
+
+    void bhkBlendCollisionObject::read(NIFStream* nif)
+    {
+        bhkCollisionObject::read(nif);
+
+        nif->read(mHeirGain);
+        nif->read(mVelGain);
+
+        if (nif->getBethVersion() <= 8)
+            nif->skip(8); // Unknown
+    }
+
+    void bhkPhysicsSystem::read(NIFStream* nif)
+    {
+        nif->readVector(mData, nif->get<uint32_t>());
+    }
+
+    void bhkRagdollSystem::read(NIFStream* nif)
+    {
+        nif->readVector(mData, nif->get<uint32_t>());
+    }
+
     void bhkWorldObject::read(NIFStream* nif)
     {
         mShape.read(nif);
@@ -356,6 +523,7 @@ namespace Nif
     void bhkEntity::read(NIFStream* nif)
     {
         bhkWorldObject::read(nif);
+
         mInfo.read(nif);
     }
 
@@ -372,21 +540,26 @@ namespace Nif
     void bhkMoppBvTreeShape::read(NIFStream* nif)
     {
         bhkBvTreeShape::read(nif);
+
         nif->skip(12); // Unused
-        mScale = nif->getFloat();
+        nif->read(mScale);
         mMopp.read(nif);
     }
 
     void bhkNiTriStripsShape::read(NIFStream* nif)
     {
         mHavokMaterial.read(nif);
-        mRadius = nif->getFloat();
+        nif->read(mRadius);
         nif->skip(20); // Unused
-        mGrowBy = nif->getUInt();
+        nif->read(mGrowBy);
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            mScale = nif->getVector4();
+            nif->read(mScale);
         readRecordList(nif, mData);
-        nif->readVector(mFilters, nif->getUInt());
+        uint32_t numFilters;
+        nif->read(numFilters);
+        mHavokFilters.resize(numFilters);
+        for (HavokFilter& filter : mHavokFilters)
+            filter.read(nif);
     }
 
     void bhkNiTriStripsShape::post(Reader& nif)
@@ -398,15 +571,17 @@ namespace Nif
     {
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
         {
-            mSubshapes.resize(nif->getUShort());
+            uint16_t numSubshapes;
+            nif->read(numSubshapes);
+            mSubshapes.resize(numSubshapes);
             for (hkSubPartData& subshape : mSubshapes)
                 subshape.read(nif);
         }
-        mUserData = nif->getUInt();
+        nif->read(mUserData);
         nif->skip(4); // Unused
-        mRadius = nif->getFloat();
+        nif->read(mRadius);
         nif->skip(4); // Unused
-        mScale = nif->getVector4();
+        nif->read(mScale);
         nif->skip(20); // Duplicates of the two previous fields
         mData.read(nif);
     }
@@ -418,22 +593,26 @@ namespace Nif
 
     void hkPackedNiTriStripsData::read(NIFStream* nif)
     {
-        unsigned int numTriangles = nif->getUInt();
+        uint32_t numTriangles;
+        nif->read(numTriangles);
         mTriangles.resize(numTriangles);
-        for (unsigned int i = 0; i < numTriangles; i++)
+        for (uint32_t i = 0; i < numTriangles; i++)
             mTriangles[i].read(nif);
 
-        unsigned int numVertices = nif->getUInt();
+        uint32_t numVertices;
+        nif->read(numVertices);
         bool compressed = false;
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
-            compressed = nif->getBoolean();
+            nif->read(compressed);
         if (!compressed)
             nif->readVector(mVertices, numVertices);
         else
             nif->skip(6 * numVertices); // Half-precision vectors are not currently supported
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
         {
-            mSubshapes.resize(nif->getUShort());
+            uint16_t numSubshapes;
+            nif->read(numSubshapes);
+            mSubshapes.resize(numSubshapes);
             for (hkSubPartData& subshape : mSubshapes)
                 subshape.read(nif);
         }
@@ -447,23 +626,54 @@ namespace Nif
     void bhkConvexShape::read(NIFStream* nif)
     {
         bhkSphereRepShape::read(nif);
-        mRadius = nif->getFloat();
+
+        nif->read(mRadius);
+    }
+
+    void bhkConvexListShape::read(NIFStream* nif)
+    {
+        readRecordList(nif, mSubShapes);
+        mMaterial.read(nif);
+        nif->read(mRadius);
+        nif->skip(8); // Unknown
+        mChildShapeProperty.read(nif);
+        nif->read(mUseCachedAABB);
+        nif->read(mClosestPointMinDistance);
+    }
+
+    void bhkConvexListShape::post(Reader& nif)
+    {
+        postRecordList(nif, mSubShapes);
+    }
+
+    void bhkConvexSweepShape::read(NIFStream* nif)
+    {
+        mShape.read(nif);
+        mMaterial.read(nif);
+        nif->read(mRadius);
+        nif->skip(12); // Unknown
+    }
+
+    void bhkConvexSweepShape::post(Reader& nif)
+    {
+        mShape.post(nif);
     }
 
     void bhkConvexVerticesShape::read(NIFStream* nif)
     {
         bhkConvexShape::read(nif);
+
         mVerticesProperty.read(nif);
         mNormalsProperty.read(nif);
-        nif->readVector(mVertices, nif->getUInt());
-        nif->readVector(mNormals, nif->getUInt());
+        nif->readVector(mVertices, nif->get<uint32_t>());
+        nif->readVector(mNormals, nif->get<uint32_t>());
     }
 
     void bhkConvexTransformShape::read(NIFStream* nif)
     {
         mShape.read(nif);
         mHavokMaterial.read(nif);
-        mRadius = nif->getFloat();
+        nif->read(mRadius);
         nif->skip(8); // Unused
         std::array<float, 16> mat;
         nif->readArray(mat);
@@ -478,19 +688,73 @@ namespace Nif
     void bhkBoxShape::read(NIFStream* nif)
     {
         bhkConvexShape::read(nif);
+
         nif->skip(8); // Unused
-        mExtents = nif->getVector3();
+        nif->read(mExtents);
         nif->skip(4); // Unused
     }
 
     void bhkCapsuleShape::read(NIFStream* nif)
     {
         bhkConvexShape::read(nif);
+
         nif->skip(8); // Unused
-        mPoint1 = nif->getVector3();
-        mRadius1 = nif->getFloat();
-        mPoint2 = nif->getVector3();
-        mRadius2 = nif->getFloat();
+        nif->read(mPoint1);
+        nif->read(mRadius1);
+        nif->read(mPoint2);
+        nif->read(mRadius2);
+    }
+
+    void bhkCylinderShape::read(NIFStream* nif)
+    {
+        bhkConvexShape::read(nif);
+
+        nif->skip(8); // Unused
+        nif->read(mVertexA);
+        nif->read(mVertexB);
+        nif->read(mCylinderRadius);
+        nif->skip(12); // Unused
+    }
+
+    void bhkHeightfieldShape::read(NIFStream* nif)
+    {
+        mHavokMaterial.read(nif);
+    }
+
+    void bhkPlaneShape::read(NIFStream* nif)
+    {
+        bhkHeightfieldShape::read(nif);
+
+        nif->skip(12); // Unused
+        mPlane = osg::Plane(nif->get<osg::Vec4f>());
+        nif->read(mExtents);
+        nif->read(mCenter);
+    }
+
+    void bhkMeshShape::read(NIFStream* nif)
+    {
+        nif->skip(8); // Unknown
+        nif->read(mRadius);
+        nif->skip(8); // Unknown
+        nif->read(mScale);
+        mShapeProperties.resize(nif->get<uint32_t>());
+        for (bhkWorldObjCInfoProperty& property : mShapeProperties)
+            property.read(nif);
+        nif->skip(12); // Unknown
+        readRecordList(nif, mDataList);
+    }
+
+    void bhkMeshShape::post(Reader& nif)
+    {
+        postRecordList(nif, mDataList);
+    }
+
+    void bhkMultiSphereShape::read(NIFStream* nif)
+    {
+        bhkSphereRepShape::read(nif);
+
+        mShapeProperty.read(nif);
+        nif->readVector(mSpheres, nif->get<uint32_t>());
     }
 
     void bhkListShape::read(NIFStream* nif)
@@ -499,7 +763,8 @@ namespace Nif
         mHavokMaterial.read(nif);
         mChildShapeProperty.read(nif);
         mChildFilterProperty.read(nif);
-        unsigned int numFilters = nif->getUInt();
+        uint32_t numFilters;
+        nif->read(numFilters);
         mHavokFilters.resize(numFilters);
         for (HavokFilter& filter : mHavokFilters)
             filter.read(nif);
@@ -508,12 +773,12 @@ namespace Nif
     void bhkCompressedMeshShape::read(NIFStream* nif)
     {
         mTarget.read(nif);
-        mUserData = nif->getUInt();
-        mRadius = nif->getFloat();
-        nif->getFloat(); // Unknown
-        mScale = nif->getVector4();
-        nif->getFloat(); // Radius
-        nif->getVector4(); // Scale
+        nif->read(mUserData);
+        nif->read(mRadius);
+        nif->skip(4); // Unknown
+        nif->read(mScale);
+        nif->skip(4); // Radius
+        nif->skip(16); // Scale
         mData.read(nif);
     }
 
@@ -525,60 +790,75 @@ namespace Nif
 
     void bhkCompressedMeshShapeData::read(NIFStream* nif)
     {
-        mBitsPerIndex = nif->getUInt();
-        mBitsPerWIndex = nif->getUInt();
-        mMaskWIndex = nif->getUInt();
-        mMaskIndex = nif->getUInt();
-        mError = nif->getFloat();
-        mAabbMin = nif->getVector4();
-        mAabbMax = nif->getVector4();
-        mWeldingType = nif->getChar();
-        mMaterialType = nif->getChar();
-        nif->skip(nif->getUInt() * 4); // Unused
-        nif->skip(nif->getUInt() * 4); // Unused
-        nif->skip(nif->getUInt() * 4); // Unused
+        nif->read(mBitsPerIndex);
+        nif->read(mBitsPerWIndex);
+        nif->read(mMaskWIndex);
+        nif->read(mMaskIndex);
+        nif->read(mError);
+        nif->read(mAabbMin);
+        nif->read(mAabbMax);
+        nif->read(mWeldingType);
+        nif->read(mMaterialType);
+        nif->skip(nif->get<uint32_t>() * 4); // Unused
+        nif->skip(nif->get<uint32_t>() * 4); // Unused
+        nif->skip(nif->get<uint32_t>() * 4); // Unused
 
-        size_t numMaterials = nif->getUInt();
+        uint32_t numMaterials;
+        nif->read(numMaterials);
         mMaterials.resize(numMaterials);
         for (bhkMeshMaterial& material : mMaterials)
             material.read(nif);
 
-        nif->getUInt(); // Unused
-        size_t numTransforms = nif->getUInt();
+        nif->skip(4); // Unused
 
+        uint32_t numTransforms;
+        nif->read(numTransforms);
         mChunkTransforms.resize(numTransforms);
         for (bhkQsTransform& transform : mChunkTransforms)
             transform.read(nif);
 
-        nif->readVector(mBigVerts, nif->getUInt());
+        nif->readVector(mBigVerts, nif->get<uint32_t>());
 
-        size_t numBigTriangles = nif->getUInt();
+        uint32_t numBigTriangles;
+        nif->read(numBigTriangles);
         mBigTris.resize(numBigTriangles);
         for (bhkCMSBigTri& tri : mBigTris)
             tri.read(nif);
 
-        size_t numChunks = nif->getUInt();
+        uint32_t numChunks;
+        nif->read(numChunks);
         mChunks.resize(numChunks);
         for (bhkCMSChunk& chunk : mChunks)
             chunk.read(nif);
 
-        nif->getUInt(); // Unused
+        nif->skip(4); // Unused
     }
 
     void bhkRigidBody::read(NIFStream* nif)
     {
         bhkEntity::read(nif);
+
         mInfo.read(nif);
         readRecordList(nif, mConstraints);
         if (nif->getBethVersion() < 76)
-            mBodyFlags = nif->getUInt();
+            nif->read(mBodyFlags);
         else
-            mBodyFlags = nif->getUShort();
+            mBodyFlags = nif->get<uint16_t>();
+    }
+
+    void bhkAabbPhantom::read(NIFStream* nif)
+    {
+        bhkPhantom::read(nif);
+
+        nif->skip(8); // Unused
+        nif->read(mAabbMin);
+        nif->read(mAabbMax);
     }
 
     void bhkSimpleShapePhantom::read(NIFStream* nif)
     {
-        bhkWorldObject::read(nif);
+        bhkShapePhantom::read(nif);
+
         nif->skip(8); // Unused
         std::array<float, 16> mat;
         nif->readArray(mat);
@@ -598,19 +878,158 @@ namespace Nif
     void bhkRagdollConstraint::read(NIFStream* nif)
     {
         bhkConstraint::read(nif);
+
         mConstraint.read(nif);
     }
 
     void bhkHingeConstraint::read(NIFStream* nif)
     {
         bhkConstraint::read(nif);
+
         mConstraint.read(nif);
     }
 
     void bhkLimitedHingeConstraint::read(NIFStream* nif)
     {
         bhkConstraint::read(nif);
+
         mConstraint.read(nif);
     }
 
+    void bhkBallAndSocketConstraint::read(NIFStream* nif)
+    {
+        bhkConstraint::read(nif);
+
+        mConstraint.read(nif);
+    }
+
+    void bhkBallSocketConstraintChain::read(NIFStream* nif)
+    {
+        uint32_t numPivots = nif->get<uint32_t>();
+        if (numPivots % 2 != 0)
+            throw Nif::Exception(
+                "Invalid number of constraints in bhkBallSocketConstraintChain", nif->getFile().getFilename());
+        mConstraints.resize(numPivots / 2);
+        for (bhkBallAndSocketConstraintCInfo& info : mConstraints)
+            info.read(nif);
+        nif->read(mTau);
+        nif->read(mDamping);
+        nif->read(mConstraintForceMixing);
+        nif->read(mMaxErrorDistance);
+        mConstraintChainInfo.read(nif);
+    }
+
+    void bhkBallSocketConstraintChain::post(Reader& nif)
+    {
+        mConstraintChainInfo.post(nif);
+    }
+
+    void bhkStiffSpringConstraint::read(NIFStream* nif)
+    {
+        bhkConstraint::read(nif);
+
+        mConstraint.read(nif);
+    }
+
+    void bhkPrismaticConstraint::read(NIFStream* nif)
+    {
+        bhkConstraint::read(nif);
+
+        mConstraint.read(nif);
+    }
+
+    void bhkMalleableConstraint::read(NIFStream* nif)
+    {
+        bhkConstraint::read(nif);
+
+        mConstraint.read(nif);
+    }
+
+    void bhkBreakableConstraint::read(NIFStream* nif)
+    {
+        bhkConstraint::read(nif);
+
+        mConstraint.read(nif);
+        nif->read(mThreshold);
+        nif->read(mRemoveWhenBroken);
+    }
+
+    void bhkUnaryAction::read(NIFStream* nif)
+    {
+        mEntity.read(nif);
+        nif->skip(8); // Unused
+    }
+
+    void bhkUnaryAction::post(Reader& nif)
+    {
+        mEntity.post(nif);
+    }
+
+    void bhkLiquidAction::read(NIFStream* nif)
+    {
+        nif->skip(12); // Unused
+        nif->read(mInitialStickForce);
+        nif->read(mStickStrength);
+        nif->read(mNeighborDistance);
+        nif->read(mNeighborStrength);
+    }
+
+    void bhkOrientHingedBodyAction::read(NIFStream* nif)
+    {
+        bhkUnaryAction::read(nif);
+
+        nif->skip(8); // Unused
+        nif->read(mHingeAxisLS);
+        nif->read(mForwardLS);
+        nif->read(mStrength);
+        nif->read(mDamping);
+        nif->skip(8); // Unused
+    }
+
+    void bhkRagdollTemplate::read(NIFStream* nif)
+    {
+        Extra::read(nif);
+
+        readRecordList(nif, mBones);
+    }
+
+    void bhkRagdollTemplate::post(Reader& nif)
+    {
+        Extra::post(nif);
+
+        postRecordList(nif, mBones);
+    }
+
+    void bhkRagdollTemplateData::read(NIFStream* nif)
+    {
+        nif->read(mName);
+        nif->read(mMass);
+        nif->read(mRestitution);
+        nif->read(mFriction);
+        nif->read(mRadius);
+        mHavokMaterial.read(nif);
+        mConstraints.resize(nif->get<uint32_t>());
+        for (bhkWrappedConstraintData& constraint : mConstraints)
+            constraint.read(nif);
+    }
+
+    void bhkPoseArray::BoneTransform::read(NIFStream* nif)
+    {
+        nif->read(mTranslation);
+        nif->read(mRotation);
+        nif->read(mScale);
+    }
+
+    void bhkPoseArray::read(NIFStream* nif)
+    {
+        nif->readVector(mBones, nif->get<uint32_t>());
+        mPoses.resize(nif->get<uint32_t>());
+        for (std::vector<BoneTransform>& pose : mPoses)
+        {
+            pose.resize(nif->get<uint32_t>());
+            for (BoneTransform& transform : pose)
+                transform.read(nif);
+        }
+    }
+
 } // Namespace
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index cc1a3ba755..286c8cc353 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -1,9 +1,12 @@
 #ifndef OPENMW_COMPONENTS_NIF_PHYSICS_HPP
 #define OPENMW_COMPONENTS_NIF_PHYSICS_HPP
 
+#include "extra.hpp"
+#include "niftypes.hpp"
 #include "record.hpp"
 #include "recordptr.hpp"
 
+#include <osg/Plane>
 #include <osg/Quat>
 #include <osg/Vec3f>
 #include <osg/Vec4f>
@@ -23,9 +26,10 @@ namespace Nif
 
     struct bhkWorldObjCInfoProperty
     {
-        unsigned int mData;
-        unsigned int mSize;
-        unsigned int mCapacityAndFlags;
+        uint32_t mData;
+        uint32_t mSize;
+        uint32_t mCapacityAndFlags;
+
         void read(NIFStream* nif);
     };
 
@@ -41,28 +45,32 @@ namespace Nif
     {
         BroadPhaseType mPhaseType;
         bhkWorldObjCInfoProperty mProperty;
+
         void read(NIFStream* nif);
     };
 
     struct HavokMaterial
     {
-        unsigned int mMaterial;
+        uint32_t mMaterial;
+
         void read(NIFStream* nif);
     };
 
     struct HavokFilter
     {
-        unsigned char mLayer;
-        unsigned char mFlags;
-        unsigned short mGroup;
+        uint8_t mLayer;
+        uint8_t mFlags;
+        uint16_t mGroup;
+
         void read(NIFStream* nif);
     };
 
     struct hkSubPartData
     {
         HavokMaterial mHavokMaterial;
-        unsigned int mNumVertices;
+        uint32_t mNumVertices;
         HavokFilter mHavokFilter;
+
         void read(NIFStream* nif);
     };
 
@@ -77,22 +85,26 @@ namespace Nif
     struct bhkEntityCInfo
     {
         hkResponseType mResponseType;
-        unsigned short mProcessContactDelay;
+        uint16_t mProcessContactDelay;
+
         void read(NIFStream* nif);
     };
 
     struct hkpMoppCode
     {
         osg::Vec4f mOffset;
-        std::vector<char> mData;
+        uint8_t mBuildType;
+        std::vector<uint8_t> mData;
+
         void read(NIFStream* nif);
     };
 
     struct TriangleData
     {
-        unsigned short mTriangle[3];
-        unsigned short mWeldingInfo;
+        std::array<uint16_t, 3> mTriangle;
+        uint16_t mWeldingInfo;
         osg::Vec3f mNormal;
+
         void read(NIFStream* nif);
     };
 
@@ -100,6 +112,7 @@ namespace Nif
     {
         HavokMaterial mHavokMaterial;
         HavokFilter mHavokFilter;
+
         void read(NIFStream* nif);
     };
 
@@ -107,27 +120,30 @@ namespace Nif
     {
         osg::Vec4f mTranslation;
         osg::Quat mRotation;
+
         void read(NIFStream* nif);
     };
 
     struct bhkCMSBigTri
     {
-        unsigned short mTriangle[3];
-        unsigned int mMaterial;
-        unsigned short mWeldingInfo;
+        std::array<uint16_t, 3> mTriangle;
+        uint32_t mMaterial;
+        uint16_t mWeldingInfo;
+
         void read(NIFStream* nif);
     };
 
     struct bhkCMSChunk
     {
         osg::Vec4f mTranslation;
-        unsigned int mMaterialIndex;
-        unsigned short mReference;
-        unsigned short mTransformIndex;
-        std::vector<unsigned short> mVertices;
-        std::vector<unsigned short> mIndices;
-        std::vector<unsigned short> mStrips;
-        std::vector<unsigned short> mWeldingInfos;
+        uint32_t mMaterialIndex;
+        uint16_t mReference;
+        uint16_t mTransformIndex;
+        std::vector<uint16_t> mVertices;
+        std::vector<uint16_t> mIndices;
+        std::vector<uint16_t> mStrips;
+        std::vector<uint16_t> mWeldingInfos;
+
         void read(NIFStream* nif);
     };
 
@@ -180,12 +196,12 @@ namespace Nif
     {
         HavokFilter mHavokFilter;
         hkResponseType mResponseType;
-        unsigned short mProcessContactDelay;
+        uint16_t mProcessContactDelay;
         osg::Vec4f mTranslation;
         osg::Quat mRotation;
         osg::Vec4f mLinearVelocity;
         osg::Vec4f mAngularVelocity;
-        float mInertiaTensor[3][4];
+        Matrix3 mInertiaTensor;
         osg::Vec4f mCenter;
         float mMass;
         float mLinearDamping;
@@ -203,10 +219,11 @@ namespace Nif
         bool mEnableDeactivation{ true };
         hkSolverDeactivation mSolverDeactivation;
         hkQualityType mQualityType;
-        unsigned char mAutoRemoveLevel;
-        unsigned char mResponseModifierFlags;
-        unsigned char mNumContactPointShapeKeys;
+        uint8_t mAutoRemoveLevel;
+        uint8_t mResponseModifierFlags;
+        uint8_t mNumContactPointShapeKeys;
         bool mForceCollidedOntoPPU;
+
         void read(NIFStream* nif);
     };
 
@@ -222,6 +239,7 @@ namespace Nif
         bhkEntityPtr mEntityA;
         bhkEntityPtr mEntityB;
         ConstraintPriority mPriority;
+
         void read(NIFStream* nif);
         void post(Reader& nif);
     };
@@ -242,6 +260,7 @@ namespace Nif
         float mProportionalRecoveryVelocity;
         float mConstantRecoveryVelocity;
         bool mEnabled;
+
         void read(NIFStream* nif);
     };
 
@@ -252,6 +271,7 @@ namespace Nif
         float mTargetVelocity;
         bool mUseVelocityTarget;
         bool mEnabled;
+
         void read(NIFStream* nif);
     };
 
@@ -261,6 +281,7 @@ namespace Nif
         float mSpringConstant;
         float mSpringDamping;
         bool mEnabled;
+
         void read(NIFStream* nif);
     };
 
@@ -270,6 +291,7 @@ namespace Nif
         bhkPositionConstraintMotor mPositionMotor;
         bhkVelocityConstraintMotor mVelocityMotor;
         bhkSpringDamperConstraintMotor mSpringDamperMotor;
+
         void read(NIFStream* nif);
     };
 
@@ -289,6 +311,7 @@ namespace Nif
         float mTwistMinAngle, mTwistMaxAngle;
         float mMaxFriction;
         bhkConstraintMotorCInfo mMotor;
+
         void read(NIFStream* nif);
     };
 
@@ -301,8 +324,10 @@ namespace Nif
             osg::Vec4f mPerpAxis1;
             osg::Vec4f mPerpAxis2;
         };
+
         HingeData mDataA;
         HingeData mDataB;
+
         void read(NIFStream* nif);
     };
 
@@ -315,14 +340,98 @@ namespace Nif
             osg::Vec4f mPerpAxis1;
             osg::Vec4f mPerpAxis2;
         };
+
         HingeData mDataA;
         HingeData mDataB;
         float mMinAngle, mMaxAngle;
         float mMaxFriction;
         bhkConstraintMotorCInfo mMotor;
+
         void read(NIFStream* nif);
     };
 
+    struct bhkBallAndSocketConstraintCInfo
+    {
+        osg::Vec4f mPivotA, mPivotB;
+
+        void read(NIFStream* nif);
+    };
+
+    struct bhkStiffSpringConstraintCInfo
+    {
+        osg::Vec4f mPivotA, mPivotB;
+        float mLength;
+
+        void read(NIFStream* nif);
+    };
+
+    struct bhkPrismaticConstraintCInfo
+    {
+        struct Data
+        {
+            osg::Vec4f mSliding;
+            osg::Vec4f mRotation;
+            osg::Vec4f mPlane;
+            osg::Vec4f mPivot;
+        };
+
+        Data mDataA;
+        Data mDataB;
+        float mMinDistance, mMaxDistance;
+        float mFriction;
+        bhkConstraintMotorCInfo mMotor;
+
+        void read(NIFStream* nif);
+    };
+
+    enum class hkConstraintType : uint32_t
+    {
+        BallAndSocket = 0,
+        Hinge = 1,
+        LimitedHinge = 2,
+        Prismatic = 6,
+        Ragdoll = 7,
+        StiffSpring = 8,
+        Malleable = 13,
+    };
+
+    struct bhkWrappedConstraintDataBase
+    {
+        hkConstraintType mType;
+        bhkConstraintCInfo mInfo;
+        bhkBallAndSocketConstraintCInfo mBallAndSocketInfo;
+        bhkHingeConstraintCInfo mHingeInfo;
+        bhkLimitedHingeConstraintCInfo mLimitedHingeInfo;
+        bhkPrismaticConstraintCInfo mPrismaticInfo;
+        bhkRagdollConstraintCInfo mRagdollInfo;
+        bhkStiffSpringConstraintCInfo mStiffSpringInfo;
+    };
+
+    struct bhkMalleableConstraintCInfo : bhkWrappedConstraintDataBase
+    {
+        float mTau;
+        float mDamping;
+        float mStrength;
+
+        void read(NIFStream* nif);
+    };
+
+    struct bhkWrappedConstraintData : bhkWrappedConstraintDataBase
+    {
+        bhkMalleableConstraintCInfo mMalleableInfo;
+
+        void read(NIFStream* nif);
+    };
+
+    struct bhkConstraintChainCInfo
+    {
+        bhkRigidBodyList mEntities;
+        bhkConstraintCInfo mInfo;
+
+        void read(NIFStream* nif);
+        void post(Reader& nif);
+    };
+
     /// Record types
 
     // Abstract Bethesda Havok object
@@ -345,11 +454,16 @@ namespace Nif
     {
     };
 
+    // Abstract physics system
+    struct bhkSystem : public Record
+    {
+    };
+
     // Generic collision object
     struct NiCollisionObject : public Record
     {
         // The node that references this object
-        NodePtr mTarget;
+        NiAVObjectPtr mTarget;
 
         void read(NIFStream* nif) override { mTarget.read(nif); }
         void post(Reader& nif) override { mTarget.post(nif); }
@@ -358,7 +472,7 @@ namespace Nif
     // Bethesda Havok-specific collision object
     struct bhkCollisionObject : public NiCollisionObject
     {
-        unsigned short mFlags;
+        uint16_t mFlags;
         bhkWorldObjectPtr mBody;
 
         void read(NIFStream* nif) override;
@@ -369,12 +483,45 @@ namespace Nif
         }
     };
 
+    struct bhkNPCollisionObject : NiCollisionObject
+    {
+        uint16_t mFlags;
+        bhkSystemPtr mData;
+        uint32_t mBodyID;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct bhkBlendCollisionObject : bhkCollisionObject
+    {
+        float mHeirGain;
+        float mVelGain;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkPhysicsSystem : public bhkSystem
+    {
+        std::vector<uint8_t> mData;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkRagdollSystem : public bhkSystem
+    {
+        std::vector<uint8_t> mData;
+
+        void read(NIFStream* nif) override;
+    };
+
     // Abstract Havok shape info record
     struct bhkWorldObject : public bhkSerializable
     {
         bhkShapePtr mShape;
         HavokFilter mHavokFilter;
         bhkWorldObjectCInfo mWorldObjectInfo;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
@@ -383,6 +530,7 @@ namespace Nif
     struct bhkEntity : public bhkWorldObject
     {
         bhkEntityCInfo mInfo;
+
         void read(NIFStream* nif) override;
     };
 
@@ -391,6 +539,7 @@ namespace Nif
     struct bhkBvTreeShape : public bhkShape
     {
         bhkShapePtr mShape;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
@@ -400,6 +549,7 @@ namespace Nif
     {
         float mScale;
         hkpMoppCode mMopp;
+
         void read(NIFStream* nif) override;
     };
 
@@ -408,10 +558,11 @@ namespace Nif
     {
         HavokMaterial mHavokMaterial;
         float mRadius;
-        unsigned int mGrowBy;
+        uint32_t mGrowBy;
         osg::Vec4f mScale{ 1.f, 1.f, 1.f, 0.f };
         NiTriStripsDataList mData;
-        std::vector<unsigned int> mFilters;
+        std::vector<HavokFilter> mHavokFilters;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
@@ -420,7 +571,7 @@ namespace Nif
     struct bhkPackedNiTriStripsShape : public bhkShapeCollection
     {
         std::vector<hkSubPartData> mSubshapes;
-        unsigned int mUserData;
+        uint32_t mUserData;
         float mRadius;
         osg::Vec4f mScale;
         hkPackedNiTriStripsDataPtr mData;
@@ -435,6 +586,7 @@ namespace Nif
         std::vector<TriangleData> mTriangles;
         std::vector<osg::Vec3f> mVertices;
         std::vector<hkSubPartData> mSubshapes;
+
         void read(NIFStream* nif) override;
     };
 
@@ -442,6 +594,7 @@ namespace Nif
     struct bhkSphereRepShape : public bhkShape
     {
         HavokMaterial mHavokMaterial;
+
         void read(NIFStream* nif) override;
     };
 
@@ -449,9 +602,34 @@ namespace Nif
     struct bhkConvexShape : public bhkSphereRepShape
     {
         float mRadius;
+
         void read(NIFStream* nif) override;
     };
 
+    // A list of convex shapes sharing the same properties
+    struct bhkConvexListShape : public bhkShape
+    {
+        bhkShapeList mSubShapes;
+        HavokMaterial mMaterial;
+        float mRadius;
+        bhkWorldObjCInfoProperty mChildShapeProperty;
+        bool mUseCachedAABB;
+        float mClosestPointMinDistance;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct bhkConvexSweepShape : bhkShape
+    {
+        bhkConvexShapePtr mShape;
+        HavokMaterial mMaterial;
+        float mRadius;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
     // A convex shape built from vertices
     struct bhkConvexVerticesShape : public bhkConvexShape
     {
@@ -459,6 +637,7 @@ namespace Nif
         bhkWorldObjCInfoProperty mNormalsProperty;
         std::vector<osg::Vec4f> mVertices;
         std::vector<osg::Vec4f> mNormals;
+
         void read(NIFStream* nif) override;
     };
 
@@ -468,6 +647,7 @@ namespace Nif
         HavokMaterial mHavokMaterial;
         float mRadius;
         osg::Matrixf mTransform;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
@@ -476,6 +656,7 @@ namespace Nif
     struct bhkBoxShape : public bhkConvexShape
     {
         osg::Vec3f mExtents;
+
         void read(NIFStream* nif) override;
     };
 
@@ -488,9 +669,57 @@ namespace Nif
         void read(NIFStream* nif) override;
     };
 
+    // A cylinder
+    struct bhkCylinderShape : public bhkConvexShape
+    {
+        osg::Vec4f mVertexA, mVertexB;
+        float mCylinderRadius;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract shape that can collide with an array of spheres
+    struct bhkHeightfieldShape : bhkShape
+    {
+        HavokMaterial mHavokMaterial;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // A plane bounded by an AABB
+    struct bhkPlaneShape : bhkHeightfieldShape
+    {
+        osg::Plane mPlane;
+        osg::Vec4f mExtents;
+        osg::Vec4f mCenter;
+
+        void read(NIFStream* nif) override;
+    };
+
+    /// A shape based on triangle strips
+    struct bhkMeshShape : bhkShape
+    {
+        float mRadius;
+        osg::Vec4f mScale;
+        std::vector<bhkWorldObjCInfoProperty> mShapeProperties;
+        NiTriStripsDataList mDataList;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
     // A sphere
     using bhkSphereShape = bhkConvexShape;
 
+    // Multiple spheres
+    struct bhkMultiSphereShape : bhkSphereRepShape
+    {
+        bhkWorldObjCInfoProperty mShapeProperty;
+        std::vector<osg::BoundingSpheref> mSpheres;
+
+        void read(NIFStream* nif) override;
+    };
+
     // A list of shapes
     struct bhkListShape : public bhkShapeCollection
     {
@@ -499,28 +728,30 @@ namespace Nif
         bhkWorldObjCInfoProperty mChildShapeProperty;
         bhkWorldObjCInfoProperty mChildFilterProperty;
         std::vector<HavokFilter> mHavokFilters;
+
         void read(NIFStream* nif) override;
     };
 
     struct bhkCompressedMeshShape : public bhkShape
     {
-        NodePtr mTarget;
-        unsigned int mUserData;
+        NiAVObjectPtr mTarget;
+        uint32_t mUserData;
         float mRadius;
         osg::Vec4f mScale;
         bhkCompressedMeshShapeDataPtr mData;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
     struct bhkCompressedMeshShapeData : public bhkRefObject
     {
-        unsigned int mBitsPerIndex, mBitsPerWIndex;
-        unsigned int mMaskWIndex, mMaskIndex;
+        uint32_t mBitsPerIndex, mBitsPerWIndex;
+        uint32_t mMaskWIndex, mMaskIndex;
         float mError;
         osg::Vec4f mAabbMin, mAabbMax;
-        char mWeldingType;
-        char mMaterialType;
+        uint8_t mWeldingType;
+        uint8_t mMaterialType;
         std::vector<bhkMeshMaterial> mMaterials;
         std::vector<bhkQsTransform> mChunkTransforms;
         std::vector<osg::Vec4f> mBigVerts;
@@ -534,14 +765,34 @@ namespace Nif
     {
         bhkRigidBodyCInfo mInfo;
         bhkSerializableList mConstraints;
-        unsigned int mBodyFlags;
+        uint32_t mBodyFlags;
 
         void read(NIFStream* nif) override;
     };
 
-    struct bhkSimpleShapePhantom : public bhkWorldObject
+    // Abstract non-physical object that receives collision events
+    struct bhkPhantom : bhkWorldObject
+    {
+    };
+
+    // A Phantom with an AABB
+    struct bhkAabbPhantom : bhkPhantom
+    {
+        osg::Vec4f mAabbMin, mAabbMax;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract Phantom with a collision shape
+    struct bhkShapePhantom : bhkPhantom
+    {
+    };
+
+    // A ShapePhantom with a transformation
+    struct bhkSimpleShapePhantom : bhkShapePhantom
     {
         osg::Matrixf mTransform;
+
         void read(NIFStream* nif) override;
     };
 
@@ -549,6 +800,7 @@ namespace Nif
     struct bhkConstraint : public bhkSerializable
     {
         bhkConstraintCInfo mInfo;
+
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
@@ -556,18 +808,143 @@ namespace Nif
     struct bhkRagdollConstraint : public bhkConstraint
     {
         bhkRagdollConstraintCInfo mConstraint;
+
         void read(NIFStream* nif) override;
     };
 
     struct bhkHingeConstraint : public bhkConstraint
     {
         bhkHingeConstraintCInfo mConstraint;
+
         void read(NIFStream* nif) override;
     };
 
     struct bhkLimitedHingeConstraint : public bhkConstraint
     {
         bhkLimitedHingeConstraintCInfo mConstraint;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkBallAndSocketConstraint : bhkConstraint
+    {
+        bhkBallAndSocketConstraintCInfo mConstraint;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkBallSocketConstraintChain : bhkSerializable
+    {
+        std::vector<bhkBallAndSocketConstraintCInfo> mConstraints;
+        float mTau;
+        float mDamping;
+        float mConstraintForceMixing;
+        float mMaxErrorDistance;
+        bhkConstraintChainCInfo mConstraintChainInfo;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct bhkStiffSpringConstraint : bhkConstraint
+    {
+        bhkStiffSpringConstraintCInfo mConstraint;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkPrismaticConstraint : bhkConstraint
+    {
+        bhkPrismaticConstraintCInfo mConstraint;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkMalleableConstraint : bhkConstraint
+    {
+        bhkMalleableConstraintCInfo mConstraint;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkBreakableConstraint : bhkConstraint
+    {
+        bhkWrappedConstraintData mConstraint;
+        float mThreshold;
+        bool mRemoveWhenBroken;
+
+        void read(NIFStream* nif) override;
+    };
+
+    // Abstract action applied during the simulation
+    struct bhkAction : bhkSerializable
+    {
+    };
+
+    struct bhkUnaryAction : bhkAction
+    {
+        bhkRigidBodyPtr mEntity;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct bhkLiquidAction : bhkAction
+    {
+        float mInitialStickForce;
+        float mStickStrength;
+        float mNeighborDistance;
+        float mNeighborStrength;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkOrientHingedBodyAction : bhkUnaryAction
+    {
+        osg::Vec4f mHingeAxisLS;
+        osg::Vec4f mForwardLS;
+        float mStrength;
+        float mDamping;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkRagdollTemplate : Extra
+    {
+        NiAVObjectList mBones;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct bhkRagdollTemplateData : Record
+    {
+        std::string mName;
+        float mMass;
+        float mRestitution;
+        float mFriction;
+        float mRadius;
+        HavokMaterial mHavokMaterial;
+        std::vector<bhkWrappedConstraintData> mConstraints;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct bhkPoseArray : Record
+    {
+        struct BoneTransform
+        {
+            osg::Vec3f mTranslation;
+            // FIXME: this and some other quaternions are meant to be read in direct order
+            osg::Quat mRotation;
+            osg::Vec3f mScale;
+
+            void read(NIFStream* nif);
+        };
+
+        std::vector<std::string> mBones;
+        std::vector<std::vector<BoneTransform>> mPoses;
+
         void read(NIFStream* nif) override;
     };
 
diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index 3c1c424de9..00ffe9f14a 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -1,197 +1,396 @@
 #include "property.hpp"
 
-#include "controlled.hpp"
 #include "data.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
 
+    void NiTextureTransform::read(NIFStream* nif)
+    {
+        nif->read(mOffset);
+        nif->read(mScale);
+        nif->read(mRotation);
+        mTransformMethod = static_cast<Method>(nif->get<uint32_t>());
+        nif->read(mOrigin);
+    }
+
     void NiTexturingProperty::Texture::read(NIFStream* nif)
     {
-        inUse = nif->getBoolean();
-        if (!inUse)
+        nif->read(mEnabled);
+        if (!mEnabled)
             return;
 
-        texture.read(nif);
+        if (nif->getVersion() >= NIFStream::generateVersion(3, 3, 0, 13))
+            mSourceTexture.read(nif);
+
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
         {
-            clamp = nif->getInt();
-            nif->skip(4); // Filter mode. Ignoring because global filtering settings are more sensible
+            nif->read(mClamp);
+            nif->read(mFilter);
         }
         else
         {
-            clamp = nif->getUShort() & 0xF;
+            uint16_t flags;
+            nif->read(flags);
+            mClamp = flags & 0xF;
+            mFilter = (flags >> 4) & 0xF;
         }
-        // Max anisotropy. I assume we'll always only use the global anisotropy setting.
+
         if (nif->getVersion() >= NIFStream::generateVersion(20, 5, 0, 4))
-            nif->getUShort();
+            nif->read(mMaxAnisotropy);
 
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-            uvSet = nif->getUInt();
+            nif->read(mUVSet);
 
-        // Two PS2-specific shorts.
-        if (nif->getVersion() < NIFStream::generateVersion(10, 4, 0, 2))
+        // PS2 filtering settings
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 4, 0, 1))
             nif->skip(4);
-        if (nif->getVersion() <= NIFStream::generateVersion(4, 1, 0, 18))
-            nif->skip(2); // Unknown short
-        else if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+
+        if (nif->getVersion() <= NIFStream::generateVersion(4, 1, 0, 12))
+            nif->skip(2); // Unknown
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
         {
-            if (nif->getBoolean()) // Has texture transform
-            {
-                nif->getVector2(); // UV translation
-                nif->getVector2(); // UV scale
-                nif->getFloat(); // W axis rotation
-                nif->getUInt(); // Transform method
-                nif->getVector2(); // Texture rotation origin
-            }
+            nif->read(mHasTransform);
+            if (mHasTransform)
+                mTransform.read(nif);
         }
     }
 
     void NiTexturingProperty::Texture::post(Reader& nif)
     {
-        texture.post(nif);
+        mSourceTexture.post(nif);
     }
 
     void NiTexturingProperty::read(NIFStream* nif)
     {
-        Property::read(nif);
+        NiProperty::read(nif);
+
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD
             || nif->getVersion() >= NIFStream::generateVersion(20, 1, 0, 2))
-            flags = nif->getUShort();
+            nif->read(mFlags);
         if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 1))
-            apply = nif->getUInt();
+            mApplyMode = static_cast<ApplyMode>(nif->get<uint32_t>());
 
-        unsigned int numTextures = nif->getUInt();
-
-        if (!numTextures)
-            return;
-
-        textures.resize(numTextures);
-        for (unsigned int i = 0; i < numTextures; i++)
+        mTextures.resize(nif->get<uint32_t>());
+        for (size_t i = 0; i < mTextures.size(); i++)
         {
-            textures[i].read(nif);
-            if (i == 5 && textures[5].inUse) // Bump map settings
+            mTextures[i].read(nif);
+
+            if (i == 5 && mTextures[5].mEnabled)
             {
-                envMapLumaBias = nif->getVector2();
-                bumpMapMatrix = nif->getVector4();
+                nif->read(mEnvMapLumaBias);
+                nif->read(mBumpMapMatrix);
             }
-            else if (i == 7 && textures[7].inUse && nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
-                /*float parallaxOffset = */ nif->getFloat();
+            else if (i == 7 && mTextures[7].mEnabled && nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
+                nif->read(mParallaxOffset);
         }
 
         if (nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 0))
         {
-            unsigned int numShaderTextures = nif->getUInt();
-            shaderTextures.resize(numShaderTextures);
-            for (unsigned int i = 0; i < numShaderTextures; i++)
+            mShaderTextures.resize(nif->get<uint32_t>());
+            mShaderIds.resize(mShaderTextures.size());
+            for (size_t i = 0; i < mShaderTextures.size(); i++)
             {
-                shaderTextures[i].read(nif);
-                if (shaderTextures[i].inUse)
-                    nif->getUInt(); // Unique identifier
+                mShaderTextures[i].read(nif);
+                if (mShaderTextures[i].mEnabled)
+                    nif->read(mShaderIds[i]);
             }
         }
     }
 
     void NiTexturingProperty::post(Reader& nif)
     {
-        Property::post(nif);
-        for (size_t i = 0; i < textures.size(); i++)
-            textures[i].post(nif);
-        for (size_t i = 0; i < shaderTextures.size(); i++)
-            shaderTextures[i].post(nif);
+        NiProperty::post(nif);
+
+        for (Texture& tex : mTextures)
+            tex.post(nif);
+        for (Texture& tex : mShaderTextures)
+            tex.post(nif);
+    }
+
+    void BSSPParallaxParams::read(NIFStream* nif)
+    {
+        nif->read(mMaxPasses);
+        nif->read(mScale);
+    }
+
+    void BSSPRefractionParams::read(NIFStream* nif)
+    {
+        nif->read(mStrength);
+        nif->read(mPeriod);
     }
 
     void BSShaderProperty::read(NIFStream* nif)
     {
+        if (nif->getBethVersion() < NIFFile::BethVersion::BETHVER_F76 && recType == RC_BSLightingShaderProperty)
+            nif->read(mType);
+
         NiShadeProperty::read(nif);
-        if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+
+        if (nif->getUserVersion() <= 11)
         {
-            type = nif->getUInt();
-            flags1 = nif->getUInt();
-            flags2 = nif->getUInt();
-            envMapIntensity = nif->getFloat();
+            nif->read(mType);
+            nif->read(mShaderFlags1);
+            nif->read(mShaderFlags2);
+            nif->read(mEnvMapScale);
+            return;
         }
+
+        if (!mName.empty() && nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+            return;
+
+        if (nif->getBethVersion() <= 131)
+        {
+            nif->read(mShaderFlags1);
+            nif->read(mShaderFlags2);
+        }
+        else
+        {
+            if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76 && recType == RC_BSLightingShaderProperty)
+            {
+                nif->read(mType);
+
+                // Remap FO76+ shader types to FO4 system so that we can actually use them
+                // TODO: NifTools spec doesn't do anything about the misplaced EyeEnvmap. Bug or feature?
+                switch (mType)
+                {
+                    case 3:
+                        mType = static_cast<uint32_t>(BSLightingShaderType::ShaderType_FaceTint);
+                        break;
+                    case 4:
+                        mType = static_cast<uint32_t>(BSLightingShaderType::ShaderType_SkinTint);
+                        break;
+                    case 5:
+                        mType = static_cast<uint32_t>(BSLightingShaderType::ShaderType_HairTint);
+                        break;
+                    case 12:
+                        mType = static_cast<uint32_t>(BSLightingShaderType::ShaderType_EyeEnvmap);
+                        break;
+                    case 17:
+                        mType = static_cast<uint32_t>(BSLightingShaderType::ShaderType_Terrain);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            uint32_t numShaderFlags1 = 0, numShaderFlags2 = 0;
+            nif->read(numShaderFlags1);
+            if (nif->getBethVersion() >= 152)
+                nif->read(numShaderFlags2);
+            nif->readVector(mShaderFlags1Hashes, numShaderFlags1);
+            nif->readVector(mShaderFlags2Hashes, numShaderFlags2);
+        }
+
+        nif->read(mUVOffset);
+        nif->read(mUVScale);
     }
 
     void BSShaderLightingProperty::read(NIFStream* nif)
     {
         BSShaderProperty::read(nif);
-        if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
-            clamp = nif->getUInt();
+
+        if (nif->getUserVersion() <= 11)
+            nif->read(mClamp);
     }
 
     void BSShaderPPLightingProperty::read(NIFStream* nif)
     {
         BSShaderLightingProperty::read(nif);
-        textureSet.read(nif);
-        if (nif->getBethVersion() <= 14)
-            return;
-        refraction.strength = nif->getFloat();
-        refraction.period = nif->getInt();
-        if (nif->getBethVersion() <= 24)
-            return;
-        parallax.passes = nif->getFloat();
-        parallax.scale = nif->getFloat();
+
+        mTextureSet.read(nif);
+        if (nif->getUserVersion() == 11)
+        {
+            if (nif->getBethVersion() >= 15)
+                mRefraction.read(nif);
+            if (nif->getBethVersion() >= 25)
+                mParallax.read(nif);
+        }
+        else if (nif->getUserVersion() >= 12)
+            nif->read(mEmissiveColor);
     }
 
     void BSShaderPPLightingProperty::post(Reader& nif)
     {
         BSShaderLightingProperty::post(nif);
-        textureSet.post(nif);
+
+        mTextureSet.post(nif);
     }
 
     void BSShaderNoLightingProperty::read(NIFStream* nif)
     {
         BSShaderLightingProperty::read(nif);
-        filename = nif->getSizedString();
+
+        mFilename = nif->getSizedString();
         if (nif->getBethVersion() >= 27)
-            falloffParams = nif->getVector4();
+            nif->read(mFalloffParams);
+    }
+
+    void SkyShaderProperty::read(NIFStream* nif)
+    {
+        BSShaderLightingProperty::read(nif);
+
+        mFilename = nif->getSizedString();
+        mSkyObjectType = static_cast<SkyObjectType>(nif->get<uint32_t>());
+    }
+
+    void TallGrassShaderProperty::read(NIFStream* nif)
+    {
+        BSShaderProperty::read(nif);
+
+        mFilename = nif->getSizedString();
+    }
+
+    void TileShaderProperty::read(NIFStream* nif)
+    {
+        BSShaderLightingProperty::read(nif);
+
+        mFilename = nif->getSizedString();
+    }
+
+    void BSSPLuminanceParams::read(NIFStream* nif)
+    {
+        nif->read(mLumEmittance);
+        nif->read(mExposureOffset);
+        nif->read(mFinalExposureMin);
+        nif->read(mFinalExposureMax);
+    }
+
+    void BSSPWetnessParams::read(NIFStream* nif)
+    {
+        nif->read(mSpecScale);
+        nif->read(mSpecPower);
+        nif->read(mMinVar);
+        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_FO4)
+            nif->read(mEnvMapScale);
+        nif->read(mFresnelPower);
+        nif->read(mMetalness);
+        if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO4)
+            nif->skip(4); // Unknown
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+            nif->skip(4); // Unknown
+    }
+
+    void BSSPMLParallaxParams::read(NIFStream* nif)
+    {
+        nif->read(mInnerLayerThickness);
+        nif->read(mRefractionScale);
+        nif->read(mInnerLayerTextureScale);
+        nif->read(mEnvMapScale);
+    }
+
+    void BSSPTranslucencyParams::read(NIFStream* nif)
+    {
+        nif->read(mSubsurfaceColor);
+        nif->read(mTransmissiveScale);
+        nif->read(mTurbulence);
+        nif->read(mThickObject);
+        nif->read(mMixAlbedo);
     }
 
     void BSLightingShaderProperty::read(NIFStream* nif)
     {
-        type = nif->getUInt();
         BSShaderProperty::read(nif);
-        flags1 = nif->getUInt();
-        flags2 = nif->getUInt();
-        nif->skip(8); // UV offset
-        nif->skip(8); // UV scale
+
+        if (!mName.empty() && nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+            return;
+
         mTextureSet.read(nif);
-        mEmissive = nif->getVector3();
-        mEmissiveMult = nif->getFloat();
-        mClamp = nif->getUInt();
-        mAlpha = nif->getFloat();
-        nif->getFloat(); // Refraction strength
-        mGlossiness = nif->getFloat();
-        mSpecular = nif->getVector3();
-        mSpecStrength = nif->getFloat();
-        nif->skip(8); // Lighting effects
-        switch (static_cast<BSLightingShaderType>(type))
+        nif->read(mEmissive);
+        nif->read(mEmissiveMult);
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
+            nif->read(mRootMaterial);
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_STF)
+            nif->skip(4); // Unknown float
+
+        nif->read(mClamp);
+        nif->read(mAlpha);
+        nif->read(mRefractionStrength);
+
+        if (nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4)
+            nif->read(mGlossiness);
+        else
+            nif->read(mSmoothness);
+
+        nif->read(mSpecular);
+        nif->read(mSpecStrength);
+
+        if (nif->getBethVersion() < NIFFile::BethVersion::BETHVER_FO4)
+            nif->readArray(mLightingEffects);
+        else if (nif->getBethVersion() <= 139)
+        {
+            nif->read(mSubsurfaceRolloff);
+            nif->read(mRimlightPower);
+            if (mRimlightPower == std::numeric_limits<float>::max())
+                nif->read(mBacklightPower);
+        }
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
+        {
+            nif->read(mGrayscaleToPaletteScale);
+            nif->read(mFresnelPower);
+            mWetness.read(nif);
+        }
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+        {
+            mLuminance.read(nif);
+            if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_F76)
+            {
+                nif->read(mDoTranslucency);
+                if (mDoTranslucency)
+                    mTranslucency.read(nif);
+                if (nif->get<uint8_t>() != 0)
+                {
+                    mTextureArrays.resize(nif->get<uint32_t>());
+                    for (std::vector<std::string>& textureArray : mTextureArrays)
+                        nif->getSizedStrings(textureArray, nif->get<uint32_t>());
+                }
+            }
+            if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_STF)
+            {
+                nif->skip(4); // Unknown
+                nif->skip(4); // Unknown
+                nif->skip(2); // Unknown
+            }
+        }
+
+        switch (static_cast<BSLightingShaderType>(mType))
         {
             case BSLightingShaderType::ShaderType_EnvMap:
-                nif->skip(4); // Environment map scale
+                if (nif->getBethVersion() <= 139)
+                    nif->read(mEnvMapScale);
+                if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
+                {
+                    nif->read(mUseSSR);
+                    nif->read(mWetnessUseSSR);
+                }
                 break;
             case BSLightingShaderType::ShaderType_SkinTint:
+                nif->read(mSkinTintColor);
+                if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
+                    nif->read(mSkinTintAlpha);
+                break;
             case BSLightingShaderType::ShaderType_HairTint:
-                nif->skip(12); // Tint color
+                nif->read(mHairTintColor);
                 break;
             case BSLightingShaderType::ShaderType_ParallaxOcc:
-                nif->skip(4); // Max passes
-                nif->skip(4); // Scale
+                mParallax.read(nif);
                 break;
             case BSLightingShaderType::ShaderType_MultiLayerParallax:
-                nif->skip(4); // Inner layer thickness
-                nif->skip(4); // Refraction scale
-                nif->skip(8); // Inner layer texture scale
-                nif->skip(4); // Environment map strength
+                mMultiLayerParallax.read(nif);
                 break;
             case BSLightingShaderType::ShaderType_SparkleSnow:
-                nif->skip(16); // Sparkle parameters
+                nif->read(mSparkle);
                 break;
             case BSLightingShaderType::ShaderType_EyeEnvmap:
-                nif->skip(4); // Cube map scale
-                nif->skip(12); // Left eye cube map offset
-                nif->skip(12); // Right eye cube map offset
+                nif->read(mCubeMapScale);
+                nif->read(mLeftEyeReflectionCenter);
+                nif->read(mRightEyeReflectionCenter);
                 break;
             default:
                 break;
@@ -201,59 +400,174 @@ namespace Nif
     void BSLightingShaderProperty::post(Reader& nif)
     {
         BSShaderProperty::post(nif);
+
         mTextureSet.post(nif);
     }
 
     void BSEffectShaderProperty::read(NIFStream* nif)
     {
         BSShaderProperty::read(nif);
-        flags1 = nif->getUInt();
-        flags2 = nif->getUInt();
-        mUVOffset = nif->getVector2();
-        mUVScale = nif->getVector2();
+
+        if (!mName.empty() && nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+            return;
+
         mSourceTexture = nif->getSizedString();
-        unsigned int miscParams = nif->getUInt();
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_STF)
+            nif->skip(4); // Unknown
+
+        uint32_t miscParams = nif->get<uint32_t>();
         mClamp = miscParams & 0xFF;
         mLightingInfluence = (miscParams >> 8) & 0xFF;
         mEnvMapMinLOD = (miscParams >> 16) & 0xFF;
-        mFalloffParams = nif->getVector4();
-        mBaseColor = nif->getVector4();
-        mBaseColorScale = nif->getFloat();
-        mFalloffDepth = nif->getFloat();
+        nif->read(mFalloffParams);
+
+        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_F76)
+            nif->read(mRefractionPower);
+
+        nif->read(mBaseColor);
+        nif->read(mBaseColorScale);
+        nif->read(mFalloffDepth);
         mGreyscaleTexture = nif->getSizedString();
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_FO4)
+        {
+            mEnvMapTexture = nif->getSizedString();
+            mNormalTexture = nif->getSizedString();
+            mEnvMaskTexture = nif->getSizedString();
+            nif->read(mEnvMapScale);
+        }
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_F76)
+        {
+            mReflectanceTexture = nif->getSizedString();
+            mLightingTexture = nif->getSizedString();
+            nif->read(mEmittanceColor);
+            mEmitGradientTexture = nif->getSizedString();
+            mLuminance.read(nif);
+        }
+
+        if (nif->getBethVersion() >= NIFFile::BethVersion::BETHVER_STF)
+        {
+            nif->skip(7); // Unknown bytes
+            nif->skip(6 * sizeof(float)); // Unknown floats
+            nif->skip(1); // Unknown byte
+        }
+    }
+
+    void BSSkyShaderProperty::read(NIFStream* nif)
+    {
+        BSShaderProperty::read(nif);
+
+        mFilename = nif->getSizedString();
+        mSkyObjectType = static_cast<SkyObjectType>(nif->get<uint32_t>());
+    }
+
+    void BSWaterShaderProperty::read(NIFStream* nif)
+    {
+        BSShaderProperty::read(nif);
+
+        nif->read(mFlags);
+    }
+
+    void NiAlphaProperty::read(NIFStream* nif)
+    {
+        NiProperty::read(nif);
+
+        nif->read(mFlags);
+        nif->read(mThreshold);
+    }
+
+    void NiDitherProperty::read(NIFStream* nif)
+    {
+        NiProperty::read(nif);
+
+        nif->read(mFlags);
     }
 
     void NiFogProperty::read(NIFStream* nif)
     {
-        Property::read(nif);
-        mFlags = nif->getUShort();
-        mFogDepth = nif->getFloat();
-        mColour = nif->getVector3();
+        NiProperty::read(nif);
+
+        nif->read(mFlags);
+        nif->read(mFogDepth);
+        nif->read(mColour);
     }
 
-    void S_MaterialProperty::read(NIFStream* nif)
+    void NiMaterialProperty::read(NIFStream* nif)
     {
+        NiProperty::read(nif);
+
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
+            nif->read(mFlags);
         if (nif->getBethVersion() < 26)
         {
-            ambient = nif->getVector3();
-            diffuse = nif->getVector3();
+            nif->read(mAmbient);
+            nif->read(mDiffuse);
         }
-        specular = nif->getVector3();
-        emissive = nif->getVector3();
-        glossiness = nif->getFloat();
-        alpha = nif->getFloat();
+        nif->read(mSpecular);
+        nif->read(mEmissive);
+        nif->read(mGlossiness);
+        nif->read(mAlpha);
         if (nif->getBethVersion() >= 22)
-            emissiveMult = nif->getFloat();
+            nif->read(mEmissiveMult);
+    }
+
+    void NiShadeProperty::read(NIFStream* nif)
+    {
+        NiProperty::read(nif);
+
+        if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+            nif->read(mFlags);
+    }
+
+    void NiSpecularProperty::read(NIFStream* nif)
+    {
+        NiProperty::read(nif);
+
+        mEnable = nif->get<uint16_t>() & 1;
+    }
+
+    void NiStencilProperty::read(NIFStream* nif)
+    {
+        NiProperty::read(nif);
+
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+        {
+            if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
+                nif->read(mFlags);
+            mEnabled = nif->get<uint8_t>() != 0;
+            mTestFunction = static_cast<TestFunc>(nif->get<uint32_t>());
+            nif->read(mStencilRef);
+            nif->read(mStencilMask);
+            mFailAction = static_cast<Action>(nif->get<uint32_t>());
+            mZFailAction = static_cast<Action>(nif->get<uint32_t>());
+            mPassAction = static_cast<Action>(nif->get<uint32_t>());
+            mDrawMode = static_cast<DrawMode>(nif->get<uint32_t>());
+        }
+        else
+        {
+            nif->read(mFlags);
+            mEnabled = mFlags & 0x1;
+            mFailAction = static_cast<Action>((mFlags >> 1) & 0x7);
+            mZFailAction = static_cast<Action>((mFlags >> 4) & 0x7);
+            mPassAction = static_cast<Action>((mFlags >> 7) & 0x7);
+            mDrawMode = static_cast<DrawMode>((mFlags >> 10) & 0x3);
+            mTestFunction = static_cast<TestFunc>((mFlags >> 12) & 0x7);
+            nif->read(mStencilRef);
+            nif->read(mStencilMask);
+        }
     }
 
     void NiVertexColorProperty::read(NIFStream* nif)
     {
-        Property::read(nif);
-        mFlags = nif->getUShort();
+        NiProperty::read(nif);
+
+        nif->read(mFlags);
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
         {
-            mVertexMode = static_cast<VertexMode>(nif->getUInt());
-            mLightingMode = static_cast<LightMode>(nif->getUInt());
+            mVertexMode = static_cast<VertexMode>(nif->get<uint32_t>());
+            mLightingMode = static_cast<LightMode>(nif->get<uint32_t>());
         }
         else
         {
@@ -262,36 +576,23 @@ namespace Nif
         }
     }
 
-    void S_AlphaProperty::read(NIFStream* nif)
+    void NiWireframeProperty::read(NIFStream* nif)
     {
-        threshold = nif->getChar();
+        NiProperty::read(nif);
+
+        mEnable = nif->get<uint16_t>() & 1;
     }
 
-    void S_StencilProperty::read(NIFStream* nif)
+    void NiZBufferProperty::read(NIFStream* nif)
     {
-        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-        {
-            enabled = nif->getChar();
-            compareFunc = nif->getInt();
-            stencilRef = nif->getUInt();
-            stencilMask = nif->getUInt();
-            failAction = nif->getInt();
-            zFailAction = nif->getInt();
-            zPassAction = nif->getInt();
-            drawMode = nif->getInt();
-        }
+        NiProperty::read(nif);
+
+        nif->read(mFlags);
+        if (nif->getVersion() >= NIFStream::generateVersion(4, 1, 0, 12)
+            && nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+            nif->read(mTestFunction);
         else
-        {
-            unsigned short flags = nif->getUShort();
-            enabled = flags & 0x1;
-            failAction = (flags >> 1) & 0x7;
-            zFailAction = (flags >> 4) & 0x7;
-            zPassAction = (flags >> 7) & 0x7;
-            drawMode = (flags >> 10) & 0x3;
-            compareFunc = (flags >> 12) & 0x7;
-            stencilRef = nif->getUInt();
-            stencilMask = nif->getUInt();
-        }
+            mTestFunction = (mFlags >> 2) & 0x7;
     }
 
 }
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index a0800d2700..f8798003d3 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -1,26 +1,3 @@
-/*
-  OpenMW - The completely unofficial reimplementation of Morrowind
-  Copyright (C) 2008-2010  Nicolay Korslund
-  Email: < korslund@gmail.com >
-  WWW: https://openmw.org/
-
-  This file (property.h) is part of the OpenMW package.
-
-  OpenMW is distributed as free software: you can redistribute it
-  and/or modify it under the terms of the GNU General Public License
-  version 3, as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  version 3 along with this program. If not, see
-  https://www.gnu.org/licenses/ .
-
- */
-
 #ifndef OPENMW_COMPONENTS_NIF_PROPERTY_HPP
 #define OPENMW_COMPONENTS_NIF_PROPERTY_HPP
 
@@ -29,56 +6,41 @@
 namespace Nif
 {
 
-    struct Property : public Named
+    struct NiProperty : NiObjectNET
     {
     };
 
-    struct NiTexturingProperty : public Property
+    struct NiTextureTransform
     {
-        unsigned short flags{ 0u };
-
-        // A sub-texture
-        struct Texture
+        enum class Method : uint32_t
         {
-            /* Clamp mode
-            0 - clampS clampT
-            1 - clampS wrapT
-            2 - wrapS clampT
-            3 - wrapS wrapT
-            */
-
-            bool inUse;
-            NiSourceTexturePtr texture;
-
-            unsigned int clamp, uvSet;
-
-            void read(NIFStream* nif);
-            void post(Reader& nif);
-
-            bool wrapT() const { return clamp & 1; }
-            bool wrapS() const { return (clamp >> 1) & 1; }
+            // Back = inverse of mOrigin.
+            // FromMaya = inverse of the V axis with a positive translation along V of 1 unit.
+            MayaLegacy = 0, // mOrigin * mRotation * Back * mOffset * mScale
+            Max = 1, // mOrigin * mScale * mRotation * mOffset * Back
+            Maya = 2, // mOrigin * mRotation * Back * FromMaya * mOffset * mScale
         };
 
-        /* Apply mode:
-            0 - replace
-            1 - decal
-            2 - modulate
-            3 - hilight  // These two are for PS2 only?
-            4 - hilight2
-        */
-        unsigned int apply{ 0 };
+        osg::Vec2f mOffset;
+        osg::Vec2f mScale;
+        float mRotation;
+        Method mTransformMethod;
+        osg::Vec2f mOrigin;
+
+        void read(NIFStream* nif);
+    };
+
+    struct NiTexturingProperty : NiProperty
+    {
+        enum class ApplyMode : uint32_t
+        {
+            Replace = 0,
+            Decal = 1,
+            Modulate = 2,
+            Hilight = 3, // PS2-specific?
+            Hilight2 = 4, // Used for Oblivion parallax
+        };
 
-        /*
-         * The textures in this list are as follows:
-         *
-         * 0 - Base texture
-         * 1 - Dark texture
-         * 2 - Detail texture
-         * 3 - Gloss texture
-         * 4 - Glow texture
-         * 5 - Bump map texture
-         * 6 - Decal texture
-         */
         enum TextureType
         {
             BaseTexture = 0,
@@ -90,38 +52,48 @@ namespace Nif
             DecalTexture = 6,
         };
 
-        std::vector<Texture> textures;
-        std::vector<Texture> shaderTextures;
+        // A sub-texture
+        struct Texture
+        {
+            bool mEnabled;
+            NiSourceTexturePtr mSourceTexture;
+            uint32_t mClamp;
+            uint32_t mFilter;
+            uint16_t mMaxAnisotropy;
+            uint32_t mUVSet;
+            bool mHasTransform;
+            NiTextureTransform mTransform;
 
-        osg::Vec2f envMapLumaBias;
-        osg::Vec4f bumpMapMatrix;
+            void read(NIFStream* nif);
+            void post(Reader& nif);
+
+            bool wrapT() const { return mClamp & 1; }
+            bool wrapS() const { return mClamp & 2; }
+        };
+
+        uint16_t mFlags{ 0u };
+        ApplyMode mApplyMode{ ApplyMode::Modulate };
+
+        std::vector<Texture> mTextures;
+        std::vector<Texture> mShaderTextures;
+        std::vector<uint32_t> mShaderIds;
+
+        osg::Vec2f mEnvMapLumaBias;
+        osg::Vec4f mBumpMapMatrix;
+        float mParallaxOffset;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct NiFogProperty : public Property
+    struct NiShadeProperty : NiProperty
     {
-        unsigned short mFlags;
-        float mFogDepth;
-        osg::Vec3f mColour;
+        uint16_t mFlags{ 0u };
 
         void read(NIFStream* nif) override;
     };
 
-    // These contain no other data than the 'flags' field
-    struct NiShadeProperty : public Property
-    {
-        unsigned short flags{ 0u };
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
-                flags = nif->getUShort();
-        }
-    };
-
-    enum class BSShaderType : unsigned int
+    enum class BSShaderType : uint32_t
     {
         ShaderType_TallGrass = 0,
         ShaderType_Default = 1,
@@ -133,56 +105,117 @@ namespace Nif
         ShaderType_NoLighting = 33
     };
 
-    struct BSShaderProperty : public NiShadeProperty
+    enum BSShaderFlags1
     {
-        unsigned int type{ 0u }, flags1{ 0u }, flags2{ 0u };
-        float envMapIntensity{ 0.f };
-        void read(NIFStream* nif) override;
-
-        bool specular() const { return flags1 & 1; }
-        bool doubleSided() const { return (flags2 >> 4) & 1; }
-        bool treeAnim() const { return (flags2 >> 29) & 1; }
-        bool decal() const { return (flags1 >> 26) & 1; }
+        BSSFlag1_Specular = 0x00000001,
+        BSSFlag1_Refraction = 0x00008000,
+        BSSFlag1_FireRefraction = 0x00010000,
+        BSSFlag1_Decal = 0x04000000,
+        BSSFlag1_DepthTest = 0x80000000,
     };
 
-    struct BSShaderLightingProperty : public BSShaderProperty
+    enum BSShaderFlags2
     {
-        unsigned int clamp{ 0u };
-        void read(NIFStream* nif) override;
-
-        bool wrapT() const { return clamp & 1; }
-        bool wrapS() const { return (clamp >> 1) & 1; }
+        BSSFlag2_DepthWrite = 0x00000001,
     };
 
-    struct BSShaderPPLightingProperty : public BSShaderLightingProperty
+    struct BSSPParallaxParams
     {
-        BSShaderTextureSetPtr textureSet;
-        struct RefractionSettings
-        {
-            float strength{ 0.f };
-            int period{ 0 };
-        };
-        struct ParallaxSettings
-        {
-            float passes{ 0.f };
-            float scale{ 0.f };
-        };
-        RefractionSettings refraction;
-        ParallaxSettings parallax;
+        float mMaxPasses{ 4.f };
+        float mScale{ 1.f };
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSSPRefractionParams
+    {
+        float mStrength{ 0.f };
+        int32_t mPeriod{ 0 };
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSShaderProperty : NiShadeProperty
+    {
+        uint32_t mType{ 0u }, mShaderFlags1{ 0u }, mShaderFlags2{ 0u };
+        float mEnvMapScale{ 0.f };
+        std::vector<uint32_t> mShaderFlags1Hashes, mShaderFlags2Hashes;
+        osg::Vec2f mUVOffset, mUVScale;
+
+        void read(NIFStream* nif) override;
+
+        // These flags are shared between BSShader and BSLightingShader
+        // Shader-specific flag methods must be handled on per-record basis
+        bool specular() const { return mShaderFlags1 & BSSFlag1_Specular; }
+        bool decal() const { return mShaderFlags1 & BSSFlag1_Decal; }
+        bool depthTest() const { return mShaderFlags1 & BSSFlag1_DepthTest; }
+        bool depthWrite() const { return mShaderFlags2 & BSSFlag2_DepthWrite; }
+        bool refraction() const { return mShaderFlags1 & BSSFlag1_Refraction; }
+        bool fireRefraction() const { return mShaderFlags1 & BSSFlag1_FireRefraction; }
+    };
+
+    struct BSShaderLightingProperty : BSShaderProperty
+    {
+        uint32_t mClamp{ 3 };
+
+        void read(NIFStream* nif) override;
+
+        bool wrapT() const { return mClamp & 1; }
+        bool wrapS() const { return mClamp & 2; }
+    };
+
+    struct BSShaderPPLightingProperty : BSShaderLightingProperty
+    {
+        BSShaderTextureSetPtr mTextureSet;
+        BSSPRefractionParams mRefraction;
+        BSSPParallaxParams mParallax;
+        osg::Vec4f mEmissiveColor;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
     };
 
-    struct BSShaderNoLightingProperty : public BSShaderLightingProperty
+    struct BSShaderNoLightingProperty : BSShaderLightingProperty
     {
-        std::string filename;
-        osg::Vec4f falloffParams;
+        std::string mFilename;
+        osg::Vec4f mFalloffParams;
 
         void read(NIFStream* nif) override;
     };
 
-    enum class BSLightingShaderType : unsigned int
+    enum class SkyObjectType : uint32_t
+    {
+        SkyTexture = 0,
+        SkySunglare = 1,
+        Sky = 2,
+        SkyClouds = 3,
+        SkyStars = 5,
+        SkyMoonStarsMask = 7,
+    };
+
+    struct SkyShaderProperty : BSShaderLightingProperty
+    {
+        std::string mFilename;
+        SkyObjectType mSkyObjectType;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct TallGrassShaderProperty : BSShaderProperty
+    {
+        std::string mFilename;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct TileShaderProperty : BSShaderLightingProperty
+    {
+        std::string mFilename;
+
+        void read(NIFStream* nif) override;
+    };
+
+    enum class BSLightingShaderType : uint32_t
     {
         ShaderType_Default = 0,
         ShaderType_EnvMap = 1,
@@ -204,120 +237,198 @@ namespace Nif
         ShaderType_Cloud = 17,
         ShaderType_LODNoise = 18,
         ShaderType_MultitexLandLODBlend = 19,
-        ShaderType_Dismemberment = 20
+        ShaderType_Dismemberment = 20,
+        ShaderType_Terrain = 21, // FO76+, technically 17
     };
 
-    struct BSLightingShaderProperty : public BSShaderProperty
+    enum BSLightingShaderFlags1
     {
-        BSShaderTextureSetPtr mTextureSet;
-        unsigned int mClamp{ 0u };
-        float mAlpha;
-        float mGlossiness;
-        osg::Vec3f mEmissive, mSpecular;
-        float mEmissiveMult, mSpecStrength;
-
-        void read(NIFStream* nif) override;
-        void post(Reader& nif) override;
+        BSLSFlag1_Falloff = 0x00000040,
+        BSLSFlag1_SoftEffect = 0x40000000,
     };
 
-    struct BSEffectShaderProperty : public BSShaderProperty
+    enum BSLightingShaderFlags2
     {
-        osg::Vec2f mUVOffset, mUVScale;
-        std::string mSourceTexture;
-        unsigned char mClamp;
-        unsigned char mLightingInfluence;
-        unsigned char mEnvMapMinLOD;
-        osg::Vec4f mFalloffParams;
-        osg::Vec4f mBaseColor;
-        float mBaseColorScale;
-        float mFalloffDepth;
-        std::string mGreyscaleTexture;
-
-        void read(NIFStream* nif) override;
-
-        bool useFalloff() const { return (flags >> 6) & 1; }
+        BSLSFlag2_DoubleSided = 0x00000010,
+        BSLSFlag2_TreeAnim = 0x20000000,
     };
 
-    struct NiDitherProperty : public Property
+    struct BSSPLuminanceParams
     {
-        unsigned short flags;
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            flags = nif->getUShort();
-        }
-    };
-
-    struct NiZBufferProperty : public Property
-    {
-        unsigned short flags;
-        unsigned int testFunction;
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            flags = nif->getUShort();
-            testFunction = (flags >> 2) & 0x7;
-            if (nif->getVersion() >= NIFStream::generateVersion(4, 1, 0, 12)
-                && nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
-                testFunction = nif->getUInt();
-        }
-
-        bool depthTest() const { return flags & 1; }
-
-        bool depthWrite() const { return (flags >> 1) & 1; }
-    };
-
-    struct NiSpecularProperty : public Property
-    {
-        unsigned short flags;
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            flags = nif->getUShort();
-        }
-
-        bool isEnabled() const { return flags & 1; }
-    };
-
-    struct NiWireframeProperty : public Property
-    {
-        unsigned short flags;
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            flags = nif->getUShort();
-        }
-
-        bool isEnabled() const { return flags & 1; }
-    };
-
-    // The rest are all struct-based
-    template <typename T>
-    struct StructPropT : Property
-    {
-        T data;
-        unsigned short flags;
-
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            flags = nif->getUShort();
-            data.read(nif);
-        }
-    };
-
-    struct S_MaterialProperty
-    {
-        // The vector components are R,G,B
-        osg::Vec3f ambient{ 1.f, 1.f, 1.f }, diffuse{ 1.f, 1.f, 1.f };
-        osg::Vec3f specular, emissive;
-        float glossiness{ 0.f }, alpha{ 0.f }, emissiveMult{ 1.f };
+        float mLumEmittance;
+        float mExposureOffset;
+        float mFinalExposureMin, mFinalExposureMax;
 
         void read(NIFStream* nif);
     };
 
-    struct S_AlphaProperty
+    struct BSSPWetnessParams
     {
+        float mSpecScale;
+        float mSpecPower;
+        float mMinVar;
+        float mEnvMapScale;
+        float mFresnelPower;
+        float mMetalness;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSSPMLParallaxParams
+    {
+        float mInnerLayerThickness;
+        float mRefractionScale;
+        osg::Vec2f mInnerLayerTextureScale;
+        float mEnvMapScale;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSSPTranslucencyParams
+    {
+        osg::Vec3f mSubsurfaceColor;
+        float mTransmissiveScale;
+        float mTurbulence;
+        bool mThickObject;
+        bool mMixAlbedo;
+
+        void read(NIFStream* nif);
+    };
+
+    struct BSLightingShaderProperty : BSShaderProperty
+    {
+        BSShaderTextureSetPtr mTextureSet;
+        osg::Vec3f mEmissive;
+        float mEmissiveMult{ 1.f };
+        std::string mRootMaterial;
+        uint32_t mClamp{ 3 };
+        float mAlpha{ 1.f };
+        float mRefractionStrength;
+        float mGlossiness{ 80.f };
+        float mSmoothness{ 1.f };
+        osg::Vec3f mSpecular;
+        float mSpecStrength{ 1.f };
+        std::array<float, 2> mLightingEffects;
+        float mSubsurfaceRolloff;
+        float mRimlightPower;
+        float mBacklightPower;
+        float mGrayscaleToPaletteScale{ 1.f };
+        float mFresnelPower{ 5.f };
+        BSSPWetnessParams mWetness;
+        bool mDoTranslucency{ false };
+        BSSPTranslucencyParams mTranslucency;
+        std::vector<std::vector<std::string>> mTextureArrays;
+        BSSPLuminanceParams mLuminance;
+
+        bool mUseSSR;
+        bool mWetnessUseSSR;
+
+        osg::Vec3f mSkinTintColor;
+        float mSkinTintAlpha{ 1.f };
+        osg::Vec3f mHairTintColor;
+
+        BSSPParallaxParams mParallax;
+        BSSPMLParallaxParams mMultiLayerParallax;
+        osg::Vec4f mSparkle;
+
+        float mCubeMapScale;
+        osg::Vec3f mLeftEyeReflectionCenter;
+        osg::Vec3f mRightEyeReflectionCenter;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+
+        bool wrapT() const { return mClamp & 1; }
+        bool wrapS() const { return mClamp & 2; }
+
+        bool doubleSided() const { return mShaderFlags2 & BSLSFlag2_DoubleSided; }
+        bool treeAnim() const { return mShaderFlags2 & BSLSFlag2_TreeAnim; }
+    };
+
+    struct BSEffectShaderProperty : BSShaderProperty
+    {
+        std::string mSourceTexture;
+        uint8_t mClamp;
+        uint8_t mLightingInfluence;
+        uint8_t mEnvMapMinLOD;
+        osg::Vec4f mFalloffParams;
+        float mRefractionPower;
+        osg::Vec4f mBaseColor;
+        float mBaseColorScale;
+        float mFalloffDepth;
+        std::string mGreyscaleTexture;
+        std::string mEnvMapTexture;
+        std::string mNormalTexture;
+        std::string mEnvMaskTexture;
+        float mEnvMapScale;
+        std::string mReflectanceTexture;
+        std::string mLightingTexture;
+        osg::Vec3f mEmittanceColor;
+        std::string mEmitGradientTexture;
+        BSSPLuminanceParams mLuminance;
+
+        void read(NIFStream* nif) override;
+
+        bool wrapT() const { return mClamp & 1; }
+        bool wrapS() const { return mClamp & 2; }
+
+        bool useFalloff() const { return mShaderFlags1 & BSLSFlag1_Falloff; }
+        bool softEffect() const { return mShaderFlags1 & BSLSFlag1_SoftEffect; }
+        bool doubleSided() const { return mShaderFlags2 & BSLSFlag2_DoubleSided; }
+        bool treeAnim() const { return mShaderFlags2 & BSLSFlag2_TreeAnim; }
+    };
+
+    struct BSSkyShaderProperty : BSShaderProperty
+    {
+        std::string mFilename;
+        SkyObjectType mSkyObjectType;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSWaterShaderProperty : BSShaderProperty
+    {
+        enum Flags
+        {
+            Flag_Displacement = 0x0001,
+            Flag_LOD = 0x0002,
+            Flag_Depth = 0x0004,
+            Flag_ActorInWater = 0x0008,
+            Flag_ActorInWaterIsMoving = 0x0010,
+            Flag_Underwater = 0x0020,
+            Flag_Reflections = 0x0040,
+            Flag_Refractions = 0x0080,
+            Flag_VertexUV = 0x0100,
+            Flag_VertexAlphaDepth = 0x0200,
+            Flag_Procedural = 0x0400,
+            Flag_Fog = 0x0800,
+            Flag_UpdateConstants = 0x1000,
+            Flag_CubeMap = 0x2000,
+        };
+
+        uint32_t mFlags;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiAlphaProperty : NiProperty
+    {
+        enum Flags
+        {
+            Flag_Blending = 0x0001,
+            Flag_Testing = 0x0200,
+            Flag_NoSorter = 0x2000,
+        };
+
+        uint16_t mFlags;
+        uint8_t mThreshold;
+
+        void read(NIFStream* nif) override;
+
+        bool useAlphaBlending() const { return mFlags & Flag_Blending; }
+        bool useAlphaTesting() const { return mFlags & Flag_Testing; }
+        bool noSorter() const { return mFlags & Flag_NoSorter; }
+
         /*
             NiAlphaProperty blend modes (glBlendFunc):
             0000 GL_ONE
@@ -346,119 +457,143 @@ namespace Nif
             http://niftools.sourceforge.net/doc/nif/NiAlphaProperty.html
         */
 
-        // Tested against when certain flags are set (see above.)
-        unsigned char threshold;
-
-        void read(NIFStream* nif);
+        int sourceBlendMode() const { return (mFlags >> 1) & 0xF; }
+        int destinationBlendMode() const { return (mFlags >> 5) & 0xF; }
+        int alphaTestMode() const { return (mFlags >> 10) & 0x7; }
     };
 
-    /*
-        Docs taken from:
-        http://niftools.sourceforge.net/doc/nif/NiStencilProperty.html
-     */
-    struct S_StencilProperty
+    struct NiDitherProperty : NiProperty
     {
-        // Is stencil test enabled?
-        unsigned char enabled;
+        uint16_t mFlags;
 
-        /*
-            0   TEST_NEVER
-            1   TEST_LESS
-            2   TEST_EQUAL
-            3   TEST_LESS_EQUAL
-            4   TEST_GREATER
-            5   TEST_NOT_EQUAL
-            6   TEST_GREATER_EQUAL
-            7   TEST_NEVER (though nifskope comment says TEST_ALWAYS, but ingame it is TEST_NEVER)
-         */
-        int compareFunc;
-        unsigned stencilRef;
-        unsigned stencilMask;
-        /*
-            Stencil test fail action, depth test fail action and depth test pass action:
-            0   ACTION_KEEP
-            1   ACTION_ZERO
-            2   ACTION_REPLACE
-            3   ACTION_INCREMENT
-            4   ACTION_DECREMENT
-            5   ACTION_INVERT
-         */
-        int failAction;
-        int zFailAction;
-        int zPassAction;
-        /*
-            Face draw mode:
-            0   DRAW_CCW_OR_BOTH
-            1   DRAW_CCW        [default]
-            2   DRAW_CW
-            3   DRAW_BOTH
-         */
-        int drawMode;
-
-        void read(NIFStream* nif);
+        void read(NIFStream* nif) override;
     };
 
-    struct NiAlphaProperty : public StructPropT<S_AlphaProperty>
+    struct NiFogProperty : NiProperty
     {
-        bool useAlphaBlending() const { return flags & 1; }
-        int sourceBlendMode() const { return (flags >> 1) & 0xF; }
-        int destinationBlendMode() const { return (flags >> 5) & 0xF; }
-        bool noSorter() const { return (flags >> 13) & 1; }
+        enum Flags : uint16_t
+        {
+            Enabled = 0x02,
+            Radial = 0x08,
+            VertexAlpha = 0x10,
+        };
 
-        bool useAlphaTesting() const { return (flags >> 9) & 1; }
-        int alphaTestMode() const { return (flags >> 10) & 0x7; }
+        uint16_t mFlags;
+        float mFogDepth;
+        osg::Vec3f mColour;
+
+        void read(NIFStream* nif) override;
+
+        bool enabled() const { return mFlags & Flags::Enabled; }
+        bool radial() const { return mFlags & Flags::Radial; }
+        bool vertexAlpha() const { return mFlags & Flags::VertexAlpha; }
     };
 
-    struct NiVertexColorProperty : public Property
+    struct NiMaterialProperty : NiProperty
     {
-        enum class VertexMode : unsigned int
+        uint16_t mFlags{ 0u };
+        osg::Vec3f mAmbient{ 1.f, 1.f, 1.f };
+        osg::Vec3f mDiffuse{ 1.f, 1.f, 1.f };
+        osg::Vec3f mSpecular;
+        osg::Vec3f mEmissive;
+        float mGlossiness{ 0.f };
+        float mAlpha{ 0.f };
+        float mEmissiveMult{ 1.f };
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiSpecularProperty : NiProperty
+    {
+        bool mEnable;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiStencilProperty : NiProperty
+    {
+        enum class TestFunc : uint32_t
+        {
+            Never = 0,
+            Less = 1,
+            Equal = 2,
+            LessEqual = 3,
+            Greater = 4,
+            NotEqual = 5,
+            GreaterEqual = 6,
+            Always = 7,
+        };
+
+        enum class Action : uint32_t
+        {
+            Keep = 0,
+            Zero = 1,
+            Replace = 2,
+            Increment = 3,
+            Decrement = 4,
+            Invert = 5,
+        };
+
+        enum class DrawMode : uint32_t
+        {
+            Default = 0,
+            CounterClockwise = 1,
+            Clockwise = 2,
+            Both = 3,
+        };
+
+        uint16_t mFlags{ 0u };
+        bool mEnabled;
+        TestFunc mTestFunction;
+        uint32_t mStencilRef;
+        uint32_t mStencilMask;
+        Action mFailAction;
+        Action mZFailAction;
+        Action mPassAction;
+        DrawMode mDrawMode;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct NiVertexColorProperty : NiProperty
+    {
+        enum class VertexMode : uint32_t
         {
             VertMode_SrcIgnore = 0,
             VertMode_SrcEmissive = 1,
             VertMode_SrcAmbDif = 2
         };
 
-        enum class LightMode : unsigned int
+        enum class LightMode : uint32_t
         {
             LightMode_Emissive = 0,
             LightMode_EmiAmbDif = 1
         };
 
-        unsigned short mFlags;
+        uint16_t mFlags;
         VertexMode mVertexMode;
         LightMode mLightingMode;
 
         void read(NIFStream* nif) override;
     };
 
-    struct NiStencilProperty : public Property
+    struct NiWireframeProperty : NiProperty
     {
-        S_StencilProperty data;
-        unsigned short flags{ 0u };
+        bool mEnable;
 
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
-                flags = nif->getUShort();
-            data.read(nif);
-        }
+        void read(NIFStream* nif) override;
     };
 
-    struct NiMaterialProperty : public Property
+    struct NiZBufferProperty : NiProperty
     {
-        S_MaterialProperty data;
-        unsigned short flags{ 0u };
+        uint16_t mFlags;
+        uint32_t mTestFunction;
 
-        void read(NIFStream* nif) override
-        {
-            Property::read(nif);
-            if (nif->getVersion() >= NIFStream::generateVersion(3, 0, 0, 0)
-                && nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
-                flags = nif->getUShort();
-            data.read(nif);
-        }
+        void read(NIFStream* nif) override;
+
+        bool depthTest() const { return mFlags & 1; }
+        bool depthWrite() const { return mFlags & 2; }
     };
 
-} // Namespace
+}
 #endif
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index dc4fab8e2e..fe38cc4cad 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -35,149 +35,289 @@ namespace Nif
     enum RecordType
     {
         RC_MISSING = 0,
-        RC_NiNode,
-        RC_NiSwitchNode,
-        RC_NiLODNode,
-        RC_NiFltAnimationNode,
-        RC_NiBillboardNode,
         RC_AvoidNode,
-        RC_NiCollisionSwitch,
-        RC_NiTriShape,
-        RC_NiTriStrips,
-        RC_NiLines,
-        RC_NiParticles,
-        RC_NiBSParticleNode,
-        RC_NiCamera,
-        RC_NiTexturingProperty,
-        RC_NiFogProperty,
-        RC_NiMaterialProperty,
-        RC_NiZBufferProperty,
-        RC_NiAlphaProperty,
-        RC_NiVertexColorProperty,
-        RC_NiShadeProperty,
-        RC_NiDitherProperty,
-        RC_NiWireframeProperty,
-        RC_NiSpecularProperty,
-        RC_NiStencilProperty,
-        RC_NiVisController,
-        RC_NiGeomMorpherController,
-        RC_NiKeyframeController,
-        RC_NiAlphaController,
-        RC_NiRollController,
-        RC_NiUVController,
-        RC_NiPathController,
-        RC_NiMaterialColorController,
-        RC_NiBSPArrayController,
-        RC_NiParticleSystemController,
-        RC_NiFlipController,
-        RC_NiTextureTransformController,
-        RC_NiBSAnimationNode,
-        RC_NiLight,
-        RC_NiTextureEffect,
-        RC_NiExtraData,
-        RC_NiVertWeightsExtraData,
-        RC_NiTextKeyExtraData,
-        RC_NiStringExtraData,
-        RC_NiGravity,
-        RC_NiPlanarCollider,
-        RC_NiParticleGrowFade,
-        RC_NiParticleColorModifier,
-        RC_NiParticleRotation,
-        RC_NiFloatData,
-        RC_NiTriShapeData,
-        RC_NiTriStripsData,
-        RC_NiLinesData,
-        RC_NiVisData,
-        RC_NiColorData,
-        RC_NiPixelData,
-        RC_NiMorphData,
-        RC_NiKeyframeData,
-        RC_NiSkinData,
-        RC_NiUVData,
-        RC_NiPosData,
-        RC_NiRotatingParticlesData,
-        RC_NiParticlesData,
-        RC_NiSequenceStreamHelper,
-        RC_NiSourceTexture,
-        RC_NiSkinInstance,
-        RC_RootCollisionNode,
-        RC_NiSphericalCollider,
-        RC_NiLookAtController,
-        RC_NiPalette,
-        RC_NiIntegerExtraData,
-        RC_NiIntegersExtraData,
-        RC_NiBinaryExtraData,
-        RC_NiBooleanExtraData,
-        RC_NiVectorExtraData,
-        RC_NiColorExtraData,
-        RC_NiFloatExtraData,
-        RC_NiFloatsExtraData,
-        RC_NiStringPalette,
-        RC_NiBoolData,
-        RC_NiSkinPartition,
-        RC_BSXFlags,
-        RC_BSBound,
+        RC_bhkAabbPhantom,
+        RC_bhkBallAndSocketConstraint,
+        RC_bhkBallSocketConstraintChain,
+        RC_bhkBlendCollisionObject,
         RC_bhkBlendController,
-        RC_BSMaterialEmittanceMultController,
-        RC_BSRefractionFirePeriodController,
-        RC_BSRefractionStrengthController,
-        RC_NiFloatInterpolator,
-        RC_NiPoint3Interpolator,
-        RC_NiBoolInterpolator,
-        RC_NiBoolTimelineInterpolator,
-        RC_NiTransformInterpolator,
-        RC_NiColorInterpolator,
-        RC_BSShaderTextureSet,
-        RC_BSLODTriShape,
-        RC_BSShaderProperty,
-        RC_BSShaderPPLightingProperty,
-        RC_BSShaderNoLightingProperty,
-        RC_BSFurnitureMarker,
-        RC_NiCollisionObject,
-        RC_bhkCollisionObject,
-        RC_BSDismemberSkinInstance,
-        RC_NiControllerManager,
-        RC_bhkMoppBvTreeShape,
-        RC_bhkNiTriStripsShape,
-        RC_bhkPackedNiTriStripsShape,
-        RC_hkPackedNiTriStripsData,
-        RC_bhkConvexVerticesShape,
-        RC_bhkConvexTransformShape,
-        RC_bhkSimpleShapePhantom,
         RC_bhkBoxShape,
+        RC_bhkBreakableConstraint,
         RC_bhkCapsuleShape,
-        RC_bhkSphereShape,
-        RC_bhkListShape,
-        RC_bhkRigidBody,
-        RC_bhkRigidBodyT,
-        RC_bhkRagdollConstraint,
+        RC_bhkCylinderShape,
+        RC_bhkCollisionObject,
+        RC_bhkCompressedMeshShape,
+        RC_bhkCompressedMeshShapeData,
+        RC_bhkConvexListShape,
+        RC_bhkConvexSweepShape,
+        RC_bhkConvexTransformShape,
+        RC_bhkConvexVerticesShape,
         RC_bhkHingeConstraint,
         RC_bhkLimitedHingeConstraint,
-        RC_BSLightingShaderProperty,
+        RC_bhkLiquidAction,
+        RC_bhkListShape,
+        RC_bhkMalleableConstraint,
+        RC_bhkMeshShape,
+        RC_bhkMoppBvTreeShape,
+        RC_bhkMultiSphereShape,
+        RC_bhkNiTriStripsShape,
+        RC_bhkOrientHingedBodyAction,
+        RC_bhkPackedNiTriStripsShape,
+        RC_bhkPlaneShape,
+        RC_bhkPhysicsSystem,
+        RC_bhkPoseArray,
+        RC_bhkPrismaticConstraint,
+        RC_bhkRagdollConstraint,
+        RC_bhkRagdollSystem,
+        RC_bhkRagdollTemplate,
+        RC_bhkRagdollTemplateData,
+        RC_bhkRigidBody,
+        RC_bhkRigidBodyT,
+        RC_bhkSimpleShapePhantom,
+        RC_bhkSphereShape,
+        RC_bhkStiffSpringConstraint,
+        RC_BSAnimNote,
+        RC_BSAnimNotes,
+        RC_BSBehaviorGraphExtraData,
+        RC_BSBound,
+        RC_BSBoneLODExtraData,
+        RC_BSClothExtraData,
+        RC_BSCollisionQueryProxyExtraData,
+        RC_BSConnectPointChildren,
+        RC_BSConnectPointParents,
+        RC_BSDecalPlacementVectorExtraData,
+        RC_BSDistantTreeShaderProperty,
+        RC_BSDynamicTriShape,
+        RC_BSDismemberSkinInstance,
+        RC_BSDistantObjectExtraData,
+        RC_BSDistantObjectInstancedNode,
+        RC_BSDistantObjectLargeRefExtraData,
         RC_BSEffectShaderProperty,
-        RC_NiClusterAccumulator,
+        RC_BSEffectShaderPropertyColorController,
+        RC_BSEffectShaderPropertyFloatController,
+        RC_BSExtraData,
+        RC_BSEyeCenterExtraData,
+        RC_BSFrustumFOVController,
+        RC_BSFurnitureMarker,
+        RC_BSInvMarker,
+        RC_BSKeyframeController,
+        RC_BSLagBoneController,
+        RC_BSLightingShaderProperty,
+        RC_BSLightingShaderPropertyColorController,
+        RC_BSLightingShaderPropertyFloatController,
+        RC_BSLightingShaderPropertyUShortController,
+        RC_BSLODTriShape,
+        RC_BSMaterialEmittanceMultController,
+        RC_BSMeshLODTriShape,
+        RC_BSMultiBound,
+        RC_BSMultiBoundAABB,
+        RC_BSMultiBoundOBB,
+        RC_BSMultiBoundSphere,
+        RC_BSNiAlphaPropertyTestRefController,
+        RC_BSPackedAdditionalGeometryData,
+        RC_BSPackedCombinedSharedGeomDataExtra,
+        RC_BSParentVelocityModifier,
+        RC_BSPositionData,
+        RC_BSProceduralLightningController,
+        RC_BSPSysArrayEmitter,
+        RC_BSPSysHavokUpdateModifier,
+        RC_BSPSysInheritVelocityModifier,
+        RC_BSPSysLODModifier,
+        RC_BSPSysMultiTargetEmitterCtlr,
+        RC_BSPSysRecycleBoundModifier,
+        RC_BSPSysScaleModifier,
+        RC_BSPSysSimpleColorModifier,
+        RC_BSPSysStripUpdateModifier,
+        RC_BSPSysSubTexModifier,
+        RC_BSStripParticleSystem,
+        RC_BSStripPSysData,
+        RC_BSRefractionFirePeriodController,
+        RC_BSRefractionStrengthController,
+        RC_BSRotAccumTransfInterpolator,
+        RC_BSSegmentedTriShape,
+        RC_BSShaderNoLightingProperty,
+        RC_BSShaderPPLightingProperty,
+        RC_BSShaderProperty,
+        RC_BSShaderTextureSet,
+        RC_BSSkinBoneData,
+        RC_BSSkinInstance,
+        RC_BSSkyShaderProperty,
+        RC_BSSubIndexTriShape,
+        RC_BSTreadTransfInterpolator,
+        RC_BSTriShape,
+        RC_BSWArray,
+        RC_BSWaterShaderProperty,
+        RC_BSWindModifier,
+        RC_BSXFlags,
+        RC_DistantLODShaderProperty,
+        RC_HairShaderProperty,
+        RC_hkPackedNiTriStripsData,
+        RC_NiAdditionalGeometryData,
         RC_NiAlphaAccumulator,
-        RC_NiSortAdjustNode,
-        RC_NiMultiTargetTransformController,
-        RC_NiSequence,
-        RC_NiControllerSequence,
-        RC_NiDefaultAVObjectPalette,
+        RC_NiAlphaController,
+        RC_NiAlphaProperty,
+        RC_NiBillboardNode,
+        RC_NiBinaryExtraData,
         RC_NiBlendBoolInterpolator,
         RC_NiBlendFloatInterpolator,
         RC_NiBlendPoint3Interpolator,
         RC_NiBlendTransformInterpolator,
-        RC_bhkCompressedMeshShape,
-        RC_bhkCompressedMeshShapeData,
-        RC_BSMultiBound,
-        RC_BSMultiBoundOBB,
-        RC_BSMultiBoundSphere,
-        RC_BSInvMarker,
-        RC_BSTriShape,
-        RC_BSEffectShaderPropertyFloatController,
-        RC_BSEffectShaderPropertyColorController,
-        RC_BSLightingShaderPropertyFloatController,
-        RC_BSLightingShaderPropertyColorController,
-        RC_BSBehaviorGraphExtraData,
+        RC_NiBoneLODController,
+        RC_NiBoolData,
+        RC_NiBooleanExtraData,
+        RC_NiBoolInterpolator,
+        RC_NiBoolTimelineInterpolator,
+        RC_NiBSAnimationNode,
+        RC_NiBSPArrayController,
+        RC_NiBSParticleNode,
+        RC_NiBSplineData,
+        RC_NiBSplineBasisData,
+        RC_NiBSplineCompFloatInterpolator,
+        RC_NiBSplineCompPoint3Interpolator,
+        RC_NiBSplineCompTransformInterpolator,
+        RC_NiBSplineTransformInterpolator,
+        RC_NiCamera,
+        RC_NiClusterAccumulator,
+        RC_NiCollisionObject,
+        RC_NiCollisionSwitch,
+        RC_NiColorData,
+        RC_NiColorExtraData,
+        RC_NiColorExtraDataController,
+        RC_NiColorInterpolator,
+        RC_NiControllerManager,
+        RC_NiControllerSequence,
+        RC_NiDefaultAVObjectPalette,
+        RC_NiDitherProperty,
+        RC_NiExtraData,
+        RC_NiFlipController,
+        RC_NiFloatData,
+        RC_NiFloatExtraData,
+        RC_NiFloatExtraDataController,
+        RC_NiFloatInterpolator,
+        RC_NiFloatsExtraData,
+        RC_NiFloatsExtraDataController,
+        RC_NiFloatsExtraDataPoint3Controller,
+        RC_NiFltAnimationNode,
+        RC_NiFogProperty,
+        RC_NiGeomMorpherController,
+        RC_NiGravity,
+        RC_NiIntegerExtraData,
+        RC_NiIntegersExtraData,
+        RC_NiKeyframeController,
+        RC_NiKeyframeData,
+        RC_NiLight,
+        RC_NiLightColorController,
+        RC_NiLightDimmerController,
+        RC_NiLightRadiusController,
+        RC_NiLines,
+        RC_NiLinesData,
+        RC_NiLODNode,
+        RC_NiLookAtController,
+        RC_NiLookAtInterpolator,
+        RC_NiMaterialColorController,
+        RC_NiMaterialProperty,
+        RC_NiMeshPSysData,
+        RC_NiMorphData,
+        RC_NiMultiTargetTransformController,
+        RC_NiNode,
+        RC_NiPalette,
+        RC_NiParticleBomb,
+        RC_NiParticleColorModifier,
+        RC_NiParticleGrowFade,
+        RC_NiParticleRotation,
+        RC_NiParticles,
+        RC_NiParticlesData,
+        RC_NiParticleSystem,
+        RC_NiParticleSystemController,
+        RC_NiPathController,
+        RC_NiPathInterpolator,
+        RC_NiPixelData,
+        RC_NiPlanarCollider,
+        RC_NiPoint3Interpolator,
+        RC_NiPosData,
+        RC_NiPSysAgeDeathModifier,
+        RC_NiPSysAirFieldAirFrictionCtlr,
+        RC_NiPSysAirFieldInheritVelocityCtlr,
+        RC_NiPSysAirFieldSpreadCtlr,
+        RC_NiPSysBombModifier,
+        RC_NiPSysBoundUpdateModifier,
+        RC_NiPSysBoxEmitter,
+        RC_NiPSysColliderManager,
+        RC_NiPSysColorModifier,
+        RC_NiPSysCylinderEmitter,
+        RC_NiPSysData,
+        RC_NiPSysDragModifier,
+        RC_NiPSysEmitterCtlr,
+        RC_NiPSysEmitterCtlrData,
+        RC_NiPSysEmitterDeclinationCtlr,
+        RC_NiPSysEmitterDeclinationVarCtlr,
+        RC_NiPSysEmitterInitialRadiusCtlr,
+        RC_NiPSysEmitterLifeSpanCtlr,
+        RC_NiPSysEmitterPlanarAngleCtlr,
+        RC_NiPSysEmitterPlanarAngleVarCtlr,
+        RC_NiPSysEmitterSpeedCtlr,
+        RC_NiPSysFieldAttenuationCtlr,
+        RC_NiPSysFieldMagnitudeCtlr,
+        RC_NiPSysFieldMaxDistanceCtlr,
+        RC_NiPSysGravityModifier,
+        RC_NiPSysGravityStrengthCtlr,
+        RC_NiPSysGrowFadeModifier,
+        RC_NiPSysInitialRotSpeedCtlr,
+        RC_NiPSysInitialRotSpeedVarCtlr,
+        RC_NiPSysInitialRotAngleCtlr,
+        RC_NiPSysInitialRotAngleVarCtlr,
+        RC_NiPSysMeshEmitter,
+        RC_NiPSysMeshUpdateModifier,
+        RC_NiPSysModifierActiveCtlr,
+        RC_NiPSysPlanarCollider,
+        RC_NiPSysPositionModifier,
+        RC_NiPSysRotationModifier,
+        RC_NiPSysRotDampeningCtlr,
+        RC_NiPSysResetOnLoopCtlr,
+        RC_NiPSysSpawnModifier,
+        RC_NiPSysSphericalCollider,
+        RC_NiPSysSphereEmitter,
+        RC_NiPSysUpdateCtlr,
+        RC_NiRollController,
+        RC_NiSequence,
+        RC_NiSequenceStreamHelper,
+        RC_NiShadeProperty,
+        RC_NiSkinData,
+        RC_NiSkinInstance,
+        RC_NiSkinPartition,
+        RC_NiSortAdjustNode,
+        RC_NiSourceTexture,
+        RC_NiSpecularProperty,
+        RC_NiSphericalCollider,
+        RC_NiStencilProperty,
+        RC_NiStringExtraData,
+        RC_NiStringsExtraData,
+        RC_NiStringPalette,
+        RC_NiSwitchNode,
+        RC_NiTextKeyExtraData,
+        RC_NiTextureEffect,
+        RC_NiTextureTransformController,
+        RC_NiTexturingProperty,
+        RC_NiTransformInterpolator,
+        RC_NiTriShape,
+        RC_NiTriShapeData,
+        RC_NiTriStrips,
+        RC_NiTriStripsData,
+        RC_NiUVController,
+        RC_NiUVData,
+        RC_NiVectorExtraData,
+        RC_NiVertexColorProperty,
+        RC_NiVertWeightsExtraData,
+        RC_NiVisController,
+        RC_NiVisData,
+        RC_NiWireframeProperty,
+        RC_NiZBufferProperty,
+        RC_RootCollisionNode,
+        RC_SkyShaderProperty,
+        RC_TallGrassShaderProperty,
+        RC_TileShaderProperty,
+        RC_VolumetricFogShaderProperty,
+        RC_WaterShaderProperty,
     };
 
     /// Base class for all records
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index e2836d458d..d6311241d7 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -1,9 +1,10 @@
 #ifndef OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
 #define OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
 
+#include <vector>
+
 #include "niffile.hpp"
 #include "nifstream.hpp"
-#include <vector>
 
 namespace Nif
 {
@@ -39,7 +40,7 @@ namespace Nif
             assert(index == -2);
 
             // Store the index for later
-            index = nif->getInt();
+            index = nif->get<int32_t>();
             assert(index >= -1);
         }
 
@@ -90,12 +91,13 @@ namespace Nif
     template <class T>
     void readRecordList(NIFStream* nif, RecordListT<T>& list)
     {
-        const int length = nif->getInt();
+        const std::uint32_t length = nif->get<std::uint32_t>();
 
-        if (length < 0)
-            throw std::runtime_error("Negative NIF record list length: " + std::to_string(length));
+        // No reasonable list can hit this generous limit
+        if (length >= (1 << 24))
+            throw std::runtime_error("Record list too long: " + std::to_string(length));
 
-        list.resize(static_cast<std::size_t>(length));
+        list.resize(length);
 
         for (auto& value : list)
             value.read(nif);
@@ -108,14 +110,14 @@ namespace Nif
             value.post(nif);
     }
 
-    struct Node;
+    struct NiAVObject;
     struct Extra;
-    struct Property;
+    struct NiProperty;
     struct NiUVData;
     struct NiPosData;
     struct NiVisData;
-    struct Controller;
-    struct Named;
+    struct NiTimeController;
+    struct NiObjectNET;
     struct NiSkinData;
     struct NiFloatData;
     struct NiMorphData;
@@ -127,17 +129,30 @@ namespace Nif
     struct NiSourceTexture;
     struct NiPalette;
     struct NiParticleModifier;
+    struct BSMasterParticleSystem;
+    struct NiParticleSystem;
+    struct NiPSysCollider;
+    struct NiPSysColliderManager;
+    struct NiPSysEmitterCtlrData;
+    struct NiPSysModifier;
+    struct NiPSysSpawnModifier;
     struct NiBoolData;
+    struct NiBSplineData;
+    struct NiBSplineBasisData;
     struct NiSkinPartition;
     struct BSShaderTextureSet;
+    struct NiTriBasedGeom;
     struct NiGeometryData;
     struct BSShaderProperty;
     struct NiAlphaProperty;
     struct NiCollisionObject;
+    struct bhkSystem;
     struct bhkWorldObject;
     struct bhkShape;
     struct bhkSerializable;
     struct bhkEntity;
+    struct bhkConvexShape;
+    struct bhkRigidBody;
     struct hkPackedNiTriStripsData;
     struct NiAccumulator;
     struct NiInterpolator;
@@ -149,14 +164,17 @@ namespace Nif
     struct bhkCompressedMeshShapeData;
     struct BSMultiBound;
     struct BSMultiBoundData;
+    struct BSSkinBoneData;
+    struct BSAnimNote;
+    struct BSAnimNotes;
 
-    using NodePtr = RecordPtrT<Node>;
+    using NiAVObjectPtr = RecordPtrT<NiAVObject>;
     using ExtraPtr = RecordPtrT<Extra>;
     using NiUVDataPtr = RecordPtrT<NiUVData>;
     using NiPosDataPtr = RecordPtrT<NiPosData>;
     using NiVisDataPtr = RecordPtrT<NiVisData>;
-    using ControllerPtr = RecordPtrT<Controller>;
-    using NamedPtr = RecordPtrT<Named>;
+    using NiTimeControllerPtr = RecordPtrT<NiTimeController>;
+    using NiObjectNETPtr = RecordPtrT<NiObjectNET>;
     using NiSkinDataPtr = RecordPtrT<NiSkinData>;
     using NiMorphDataPtr = RecordPtrT<NiMorphData>;
     using NiPixelDataPtr = RecordPtrT<NiPixelData>;
@@ -167,16 +185,29 @@ namespace Nif
     using NiSourceTexturePtr = RecordPtrT<NiSourceTexture>;
     using NiPalettePtr = RecordPtrT<NiPalette>;
     using NiParticleModifierPtr = RecordPtrT<NiParticleModifier>;
+    using BSMasterParticleSystemPtr = RecordPtrT<BSMasterParticleSystem>;
+    using NiParticleSystemPtr = RecordPtrT<NiParticleSystem>;
+    using NiPSysColliderPtr = RecordPtrT<NiPSysCollider>;
+    using NiPSysColliderManagerPtr = RecordPtrT<NiPSysColliderManager>;
+    using NiPSysEmitterCtlrDataPtr = RecordPtrT<NiPSysEmitterCtlrData>;
+    using NiPSysModifierPtr = RecordPtrT<NiPSysModifier>;
+    using NiPSysSpawnModifierPtr = RecordPtrT<NiPSysSpawnModifier>;
     using NiBoolDataPtr = RecordPtrT<NiBoolData>;
+    using NiBSplineDataPtr = RecordPtrT<NiBSplineData>;
+    using NiBSplineBasisDataPtr = RecordPtrT<NiBSplineBasisData>;
     using NiSkinPartitionPtr = RecordPtrT<NiSkinPartition>;
     using BSShaderTextureSetPtr = RecordPtrT<BSShaderTextureSet>;
+    using NiTriBasedGeomPtr = RecordPtrT<NiTriBasedGeom>;
     using NiGeometryDataPtr = RecordPtrT<NiGeometryData>;
     using BSShaderPropertyPtr = RecordPtrT<BSShaderProperty>;
     using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
     using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
+    using bhkSystemPtr = RecordPtrT<bhkSystem>;
     using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
     using bhkShapePtr = RecordPtrT<bhkShape>;
     using bhkEntityPtr = RecordPtrT<bhkEntity>;
+    using bhkConvexShapePtr = RecordPtrT<bhkConvexShape>;
+    using bhkRigidBodyPtr = RecordPtrT<bhkRigidBody>;
     using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>;
     using NiAccumulatorPtr = RecordPtrT<NiAccumulator>;
     using NiInterpolatorPtr = RecordPtrT<NiInterpolator>;
@@ -187,9 +218,10 @@ namespace Nif
     using bhkCompressedMeshShapeDataPtr = RecordPtrT<bhkCompressedMeshShapeData>;
     using BSMultiBoundPtr = RecordPtrT<BSMultiBound>;
     using BSMultiBoundDataPtr = RecordPtrT<BSMultiBoundData>;
+    using BSSkinBoneDataPtr = RecordPtrT<BSSkinBoneData>;
 
-    using NodeList = RecordListT<Node>;
-    using PropertyList = RecordListT<Property>;
+    using NiAVObjectList = RecordListT<NiAVObject>;
+    using NiPropertyList = RecordListT<NiProperty>;
     using ExtraList = RecordListT<Extra>;
     using NiSourceTextureList = RecordListT<NiSourceTexture>;
     using NiInterpolatorList = RecordListT<NiInterpolator>;
@@ -197,7 +229,12 @@ namespace Nif
     using bhkShapeList = RecordListT<bhkShape>;
     using bhkSerializableList = RecordListT<bhkSerializable>;
     using bhkEntityList = RecordListT<bhkEntity>;
+    using bhkRigidBodyList = RecordListT<bhkEntity>;
     using NiControllerSequenceList = RecordListT<NiControllerSequence>;
+    using NiPSysModifierList = RecordListT<NiPSysModifier>;
+    using NiTriBasedGeomList = RecordListT<NiTriBasedGeom>;
+    using BSAnimNoteList = RecordListT<BSAnimNote>;
+    using BSAnimNotesList = RecordListT<BSAnimNotes>;
 
 } // Namespace
 #endif
diff --git a/components/nif/texture.cpp b/components/nif/texture.cpp
new file mode 100644
index 0000000000..3525c6f043
--- /dev/null
+++ b/components/nif/texture.cpp
@@ -0,0 +1,47 @@
+#include "texture.hpp"
+
+#include "data.hpp"
+
+namespace Nif
+{
+
+    void NiSourceTexture::read(NIFStream* nif)
+    {
+        NiTexture::read(nif);
+
+        nif->read(mExternal);
+        bool hasData = nif->getVersion() >= NIFStream::generateVersion(10, 0, 1, 4);
+        if (!hasData && !mExternal)
+            hasData = nif->get<uint8_t>() != 0;
+
+        if (mExternal || nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            nif->read(mFile);
+
+        if (hasData)
+            mData.read(nif);
+
+        mPrefs.mPixelLayout = static_cast<PixelLayout>(nif->get<uint32_t>());
+        mPrefs.mUseMipMaps = static_cast<MipMapFormat>(nif->get<uint32_t>());
+        mPrefs.mAlphaFormat = static_cast<AlphaFormat>(nif->get<uint32_t>());
+
+        nif->read(mIsStatic);
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 103))
+        {
+            nif->read(mDirectRendering);
+            if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 4))
+                nif->read(mPersistRenderData);
+        }
+    }
+
+    void NiSourceTexture::post(Reader& nif)
+    {
+        NiTexture::post(nif);
+        mData.post(nif);
+    }
+
+    void BSShaderTextureSet::read(NIFStream* nif)
+    {
+        nif->getSizedStrings(mTextures, nif->get<uint32_t>());
+    }
+
+}
diff --git a/components/nif/texture.hpp b/components/nif/texture.hpp
new file mode 100644
index 0000000000..8d7e44990f
--- /dev/null
+++ b/components/nif/texture.hpp
@@ -0,0 +1,81 @@
+#ifndef OPENMW_COMPONENTS_NIF_TEXTURE_HPP
+#define OPENMW_COMPONENTS_NIF_TEXTURE_HPP
+
+#include "base.hpp"
+
+namespace Nif
+{
+
+    struct NiTexture : public NiObjectNET
+    {
+    };
+
+    struct NiSourceTexture : public NiTexture
+    {
+        enum class PixelLayout : uint32_t
+        {
+            Palette = 0,
+            HighColor = 1,
+            TrueColor = 2,
+            Compressed = 3,
+            BumpMap = 4,
+            Default = 5,
+        };
+
+        enum class MipMapFormat : uint32_t
+        {
+            No = 0,
+            Yes = 1,
+            Default = 2,
+        };
+
+        enum class AlphaFormat : uint32_t
+        {
+            None = 0,
+            Binary = 1,
+            Smooth = 2,
+            Default = 3,
+        };
+
+        struct FormatPrefs
+        {
+            PixelLayout mPixelLayout;
+            MipMapFormat mUseMipMaps;
+            AlphaFormat mAlphaFormat;
+        };
+
+        char mExternal; // References external file
+
+        std::string mFile;
+        NiPixelDataPtr mData;
+
+        FormatPrefs mPrefs;
+
+        char mIsStatic{ 1 };
+        bool mDirectRendering{ true };
+        bool mPersistRenderData{ false };
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
+    struct BSShaderTextureSet : public Record
+    {
+        enum class TextureType : uint32_t
+        {
+            Base = 0,
+            Normal = 1,
+            Glow = 2,
+            Parallax = 3,
+            Environment = 4,
+            EnvironmentMask = 5,
+            Subsurface = 6,
+            BackLighting = 7,
+        };
+        std::vector<std::string> mTextures;
+
+        void read(NIFStream* nif) override;
+    };
+
+}
+#endif
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 251795eb21..6bf6ad89bb 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -6,22 +6,15 @@
 #include <variant>
 #include <vector>
 
-#include <BulletCollision/CollisionShapes/btBoxShape.h>
-#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
-
 #include <components/debug/debuglog.hpp>
-
+#include <components/files/conversion.hpp>
 #include <components/misc/convert.hpp>
-
 #include <components/misc/strings/algorithm.hpp>
-
-#include <components/nif/data.hpp>
 #include <components/nif/extra.hpp>
+#include <components/nif/nifstream.hpp>
 #include <components/nif/node.hpp>
 #include <components/nif/parent.hpp>
 
-#include <components/files/conversion.hpp>
-
 namespace
 {
 
@@ -32,91 +25,6 @@ namespace
         return letterPos < path.size() && (path[letterPos] == 'x' || path[letterPos] == 'X');
     }
 
-    void prepareTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriBasedGeomData& data)
-    {
-        // FIXME: copying vertices/indices individually is unreasonable
-        const std::vector<osg::Vec3f>& vertices = data.vertices;
-        mesh.preallocateVertices(static_cast<int>(vertices.size()));
-        for (const osg::Vec3f& vertex : vertices)
-            mesh.findOrAddVertex(Misc::Convert::toBullet(vertex), false);
-
-        mesh.preallocateIndices(static_cast<int>(data.mNumTriangles * 3));
-    }
-
-    void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriShapeData& data)
-    {
-        prepareTriangleMesh(mesh, data);
-        const std::vector<unsigned short>& triangles = data.triangles;
-        for (std::size_t i = 0; i < triangles.size(); i += 3)
-            mesh.addTriangleIndices(triangles[i + 0], triangles[i + 1], triangles[i + 2]);
-    }
-
-    void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data)
-    {
-        prepareTriangleMesh(mesh, data);
-        for (const std::vector<unsigned short>& strip : data.strips)
-        {
-            if (strip.size() < 3)
-                continue;
-
-            unsigned short a;
-            unsigned short b = strip[0];
-            unsigned short c = strip[1];
-            for (size_t i = 2; i < strip.size(); i++)
-            {
-                a = b;
-                b = c;
-                c = strip[i];
-                if (a == b || b == c || a == c)
-                    continue;
-                if (i % 2 == 0)
-                    mesh.addTriangleIndices(a, b, c);
-                else
-                    mesh.addTriangleIndices(a, c, b);
-            }
-        }
-    }
-
-    template <class Function>
-    auto handleNiGeometry(const Nif::NiGeometry& geometry, Function&& function)
-        -> decltype(function(static_cast<const Nif::NiTriShapeData&>(geometry.data.get())))
-    {
-        if (geometry.recType == Nif::RC_NiTriShape || geometry.recType == Nif::RC_BSLODTriShape)
-        {
-            if (geometry.data->recType != Nif::RC_NiTriShapeData)
-                return {};
-
-            auto data = static_cast<const Nif::NiTriShapeData*>(geometry.data.getPtr());
-            if (data->triangles.empty())
-                return {};
-
-            return function(static_cast<const Nif::NiTriShapeData&>(*data));
-        }
-
-        if (geometry.recType == Nif::RC_NiTriStrips)
-        {
-            if (geometry.data->recType != Nif::RC_NiTriStripsData)
-                return {};
-
-            auto data = static_cast<const Nif::NiTriStripsData*>(geometry.data.getPtr());
-            if (data->strips.empty())
-                return {};
-
-            return function(static_cast<const Nif::NiTriStripsData&>(*data));
-        }
-
-        return {};
-    }
-
-    std::unique_ptr<btTriangleMesh> makeChildMesh(const Nif::NiGeometry& geometry)
-    {
-        return handleNiGeometry(geometry, [&](const auto& data) {
-            auto mesh = std::make_unique<btTriangleMesh>();
-            fillTriangleMesh(*mesh, data);
-            return mesh;
-        });
-    }
-
 }
 
 namespace NifBullet
@@ -132,61 +40,36 @@ namespace NifBullet
         mShape->mFileHash = nif.getHash();
 
         const size_t numRoots = nif.numRoots();
-        std::vector<const Nif::Node*> roots;
+        std::vector<const Nif::NiAVObject*> roots;
         for (size_t i = 0; i < numRoots; ++i)
         {
             const Nif::Record* r = nif.getRoot(i);
             if (!r)
                 continue;
-            const Nif::Node* node = dynamic_cast<const Nif::Node*>(r);
+            const Nif::NiAVObject* node = dynamic_cast<const Nif::NiAVObject*>(r);
             if (node)
                 roots.emplace_back(node);
         }
-        const std::string filename = Files::pathToUnicodeString(nif.getFilename());
-        mShape->mFileName = filename;
+        mShape->mFileName = nif.getFilename();
         if (roots.empty())
         {
-            warn("Found no root nodes in NIF file " + filename);
+            warn("Found no root nodes in NIF file " + mShape->mFileName.value());
             return mShape;
         }
 
-        // Try to find a valid bounding box first. If one's found for any root node, use that.
-        for (const Nif::Node* node : roots)
-        {
-            if (findBoundingBox(*node, filename))
-            {
-                const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.mExtents);
-                const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.mCenter);
-                auto compound = std::make_unique<btCompoundShape>();
-                auto boxShape = std::make_unique<btBoxShape>(extents);
-                btTransform transform = btTransform::getIdentity();
-                transform.setOrigin(center);
-                compound->addChildShape(transform, boxShape.get());
-                std::ignore = boxShape.release();
+        for (const Nif::NiAVObject* node : roots)
+            if (findBoundingBox(*node))
+                break;
+
+        HandleNodeArgs args;
 
-                mShape->mCollisionShape.reset(compound.release());
-                return mShape;
-            }
-        }
         // files with the name convention xmodel.nif usually have keyframes stored in a separate file xmodel.kf (see
         // Animation::addAnimSource). assume all nodes in the file will be animated
         // TODO: investigate whether this should and could be optimized.
-        const bool isAnimated = pathFileNameStartsWithX(filename);
+        args.mAnimated = pathFileNameStartsWithX(mShape->mFileName);
 
-        // If there's no bounding box, we'll have to generate a Bullet collision shape
-        // from the collision data present in every root node.
-        for (const Nif::Node* node : roots)
-        {
-            bool hasCollisionNode = hasRootCollisionNode(*node);
-            bool hasCollisionShape = hasCollisionNode && !collisionShapeIsEmpty(*node);
-            if (hasCollisionNode && !hasCollisionShape)
-                mShape->mVisualCollisionType = Resource::VisualCollisionType::Camera;
-            bool generateCollisionShape = !hasCollisionShape;
-            HandleNodeArgs args;
-            args.mAutogenerated = args.mIsCollisionNode = generateCollisionShape;
-            args.mAnimated = isAnimated;
-            handleNode(filename, *node, nullptr, args, mShape->mVisualCollisionType);
-        }
+        for (const Nif::NiAVObject* node : roots)
+            handleRoot(nif, *node, args);
 
         if (mCompoundShape)
             mShape->mCollisionShape = std::move(mCompoundShape);
@@ -197,105 +80,157 @@ namespace NifBullet
         return mShape;
     }
 
-    // Find a boundingBox in the node hierarchy.
-    // Return: use bounding box for collision?
-    bool BulletNifLoader::findBoundingBox(const Nif::Node& node, const std::string& filename)
+    // Find a bounding box in the node hierarchy to use for actor collision
+    bool BulletNifLoader::findBoundingBox(const Nif::NiAVObject& node)
     {
-        if (node.hasBounds)
+        if (Misc::StringUtils::ciEqual(node.mName, "Bounding Box"))
         {
-            unsigned int type = node.bounds.type;
-            switch (type)
+            if (node.mBounds.mType == Nif::BoundingVolume::Type::BOX_BV
+                && std::ranges::all_of(node.mBounds.mBox.mExtents._v, [](float extent) { return extent > 0.f; }))
             {
-                case Nif::NiBoundingVolume::Type::BOX_BV:
-                    mShape->mCollisionBox.mExtents = node.bounds.box.extents;
-                    mShape->mCollisionBox.mCenter = node.bounds.box.center;
-                    break;
-                default:
+                mShape->mCollisionBox.mExtents = node.mBounds.mBox.mExtents;
+                mShape->mCollisionBox.mCenter = node.mBounds.mBox.mCenter;
+            }
+            else
+            {
+                warn("Invalid Bounding Box node bounds in file " + mShape->mFileName.value());
+            }
+            return true;
+        }
+
+        if (auto ninode = dynamic_cast<const Nif::NiNode*>(&node))
+            for (const auto& child : ninode->mChildren)
+                if (!child.empty() && findBoundingBox(child.get()))
+                    return true;
+
+        return false;
+    }
+
+    void BulletNifLoader::handleRoot(Nif::FileView nif, const Nif::NiAVObject& node, HandleNodeArgs args)
+    {
+        // Gamebryo/Bethbryo meshes
+        if (nif.getVersion() >= Nif::NIFStream::generateVersion(10, 0, 1, 0))
+        {
+            // Handle BSXFlags
+            const Nif::NiIntegerExtraData* bsxFlags = nullptr;
+            for (const auto& e : node.getExtraList())
+            {
+                if (e->recType == Nif::RC_BSXFlags)
                 {
-                    std::stringstream warning;
-                    warning << "Unsupported NiBoundingVolume type " << type << " in node " << node.recIndex;
-                    warning << " in file " << filename;
-                    warn(warning.str());
+                    bsxFlags = static_cast<const Nif::NiIntegerExtraData*>(e.getPtr());
+                    break;
                 }
             }
 
-            if (node.hasBBoxCollision())
+            // Collision flag
+            if (!bsxFlags || !(bsxFlags->mData & 2))
+                return;
+
+            // Editor marker flag
+            if (bsxFlags->mData & 32)
+                args.mHasMarkers = true;
+
+            // FIXME: hack, using rendered geometry instead of Bethesda Havok data
+            args.mAutogenerated = true;
+        }
+        // Pre-Gamebryo meshes
+        else
+        {
+            // Handle RootCollisionNode
+            const Nif::NiNode* colNode = nullptr;
+            if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&node))
             {
-                return true;
+                for (const auto& child : ninode->mChildren)
+                {
+                    if (!child.empty() && child.getPtr()->recType == Nif::RC_RootCollisionNode)
+                    {
+                        colNode = static_cast<const Nif::NiNode*>(child.getPtr());
+                        break;
+                    }
+                }
+            }
+
+            args.mAutogenerated = colNode == nullptr;
+
+            // Check for extra data
+            for (const auto& e : node.getExtraList())
+            {
+                if (e->recType == Nif::RC_NiStringExtraData)
+                {
+                    // String markers may contain important information
+                    // affecting the entire subtree of this node
+                    auto sd = static_cast<const Nif::NiStringExtraData*>(e.getPtr());
+
+                    // Editor marker flag
+                    if (sd->mData == "MRK")
+                        args.mHasTriMarkers = true;
+                    else if (Misc::StringUtils::ciStartsWith(sd->mData, "NC"))
+                    {
+                        // NC prefix is case-insensitive but the second C in NCC flag needs be uppercase.
+
+                        // Collide only with camera.
+                        if (sd->mData.length() > 2 && sd->mData[2] == 'C')
+                            mShape->mVisualCollisionType = Resource::VisualCollisionType::Camera;
+                        // No collision.
+                        else
+                            mShape->mVisualCollisionType = Resource::VisualCollisionType::Default;
+                    }
+                }
+            }
+
+            // FIXME: BulletNifLoader should never have to provide rendered geometry for camera collision
+            if (colNode && colNode->mChildren.empty())
+            {
+                args.mAutogenerated = true;
+                mShape->mVisualCollisionType = Resource::VisualCollisionType::Camera;
             }
         }
 
-        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&node))
-        {
-            const Nif::NodeList& list = ninode->children;
-            for (const auto& child : list)
-                if (!child.empty() && findBoundingBox(child.get(), filename))
-                    return true;
-        }
-        return false;
+        handleNode(node, nullptr, args);
     }
 
-    bool BulletNifLoader::hasRootCollisionNode(const Nif::Node& rootNode) const
-    {
-        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
-        {
-            for (const auto& child : ninode->children)
-            {
-                if (child.empty())
-                    continue;
-                if (child.getPtr()->recType == Nif::RC_RootCollisionNode)
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    bool BulletNifLoader::collisionShapeIsEmpty(const Nif::Node& rootNode) const
-    {
-        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
-        {
-            for (const auto& child : ninode->children)
-            {
-                if (child.empty())
-                    continue;
-                const Nif::Node* childNode = child.getPtr();
-                if (childNode->recType != Nif::RC_RootCollisionNode)
-                    continue;
-                const Nif::NiNode* niChildnode
-                    = static_cast<const Nif::NiNode*>(childNode); // RootCollisionNode is always a NiNode
-                if (childNode->hasBounds || niChildnode->children.size() > 0)
-                    return false;
-            }
-        }
-        return true;
-    }
-
-    void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent,
-        HandleNodeArgs args, Resource::VisualCollisionType& visualCollisionType)
+    void BulletNifLoader::handleNode(const Nif::NiAVObject& node, const Nif::Parent* parent, HandleNodeArgs args)
     {
         // TODO: allow on-the fly collision switching via toggling this flag
         if (node.recType == Nif::RC_NiCollisionSwitch && !node.collisionActive())
             return;
 
-        if (!node.controller.empty() && node.controller->recType == Nif::RC_NiKeyframeController
-            && node.controller->isActive())
-            args.mAnimated = true;
+        for (Nif::NiTimeControllerPtr ctrl = node.mController; !ctrl.empty(); ctrl = ctrl->mNext)
+        {
+            if (args.mAnimated)
+                break;
+            if (!ctrl->isActive())
+                continue;
+            switch (ctrl->recType)
+            {
+                case Nif::RC_NiKeyframeController:
+                case Nif::RC_NiPathController:
+                case Nif::RC_NiRollController:
+                    args.mAnimated = true;
+                    break;
+                default:
+                    continue;
+            }
+        }
 
         if (node.recType == Nif::RC_RootCollisionNode)
         {
-            args.mIsCollisionNode = true;
             if (args.mAutogenerated)
             {
                 // Encountered a RootCollisionNode inside an autogenerated mesh.
 
                 // We treat empty RootCollisionNodes as NCC flag (set collisionType to `Camera`)
                 // and generate the camera collision shape based on rendered geometry.
-                if (visualCollisionType == Resource::VisualCollisionType::Camera)
+                if (mShape->mVisualCollisionType == Resource::VisualCollisionType::Camera)
                     return;
 
                 // Otherwise we'll want to notify the user.
-                Log(Debug::Info) << "RootCollisionNode is not attached to the root node in " << fileName
-                                 << ". Treating it as a common NiTriShape.";
+                Log(Debug::Info) << "BulletNifLoader: RootCollisionNode is not attached to the root node in "
+                                 << mShape->mFileName << ". Treating it as a NiNode.";
+            }
+            else
+            {
+                args.mIsCollisionNode = true;
             }
         }
 
@@ -303,101 +238,68 @@ namespace NifBullet
         if (node.recType == Nif::RC_AvoidNode)
             args.mAvoid = true;
 
-        // Check for extra data
-        std::vector<Nif::ExtraPtr> extraCollection;
-        for (Nif::ExtraPtr e = node.extra; !e.empty(); e = e->next)
-            extraCollection.emplace_back(e);
-        for (const auto& extraNode : node.extralist)
-            if (!extraNode.empty())
-                extraCollection.emplace_back(extraNode);
-        for (const auto& e : extraCollection)
+        if (args.mAutogenerated || args.mIsCollisionNode)
         {
-            if (e->recType == Nif::RC_NiStringExtraData)
-            {
-                // String markers may contain important information
-                // affecting the entire subtree of this node
-                Nif::NiStringExtraData* sd = (Nif::NiStringExtraData*)e.getPtr();
-
-                if (Misc::StringUtils::ciStartsWith(sd->string, "NC"))
-                {
-                    // NCC flag in vanilla is partly case sensitive: prefix NC is case insensitive but second C needs be
-                    // uppercase
-                    if (sd->string.length() > 2 && sd->string[2] == 'C')
-                        // Collide only with camera.
-                        visualCollisionType = Resource::VisualCollisionType::Camera;
-                    else
-                        // No collision.
-                        visualCollisionType = Resource::VisualCollisionType::Default;
-                }
-                else if (sd->string == "MRK" && args.mAutogenerated)
-                {
-                    // Marker can still have collision if the model explicitely specifies it via a RootCollisionNode.
-                    return;
-                }
-            }
-            else if (e->recType == Nif::RC_BSXFlags)
-            {
-                auto bsxFlags = static_cast<const Nif::NiIntegerExtraData*>(e.getPtr());
-                if (bsxFlags->data & 32) // Editor marker flag
-                    args.mHasMarkers = true;
-            }
-        }
-
-        if (args.mIsCollisionNode)
-        {
-            // NOTE: a trishape with hasBounds=true, but no BBoxCollision flag should NOT go through handleNiTriShape!
-            // It must be ignored completely.
-            // (occurs in tr_ex_imp_wall_arch_04.nif)
-            if (!node.hasBounds
-                && (node.recType == Nif::RC_NiTriShape || node.recType == Nif::RC_NiTriStrips
-                    || node.recType == Nif::RC_BSLODTriShape))
-            {
-                handleNiTriShape(static_cast<const Nif::NiGeometry&>(node), parent, args);
-            }
+            auto geometry = dynamic_cast<const Nif::NiGeometry*>(&node);
+            if (geometry)
+                handleGeometry(*geometry, parent, args);
         }
 
         // For NiNodes, loop through children
         if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&node))
         {
-            const Nif::NodeList& list = ninode->children;
             const Nif::Parent currentParent{ *ninode, parent };
-            for (const auto& child : list)
+            for (const auto& child : ninode->mChildren)
             {
-                if (child.empty())
-                    continue;
-
-                assert(std::find(child->parents.begin(), child->parents.end(), ninode) != child->parents.end());
-                handleNode(fileName, child.get(), &currentParent, args, visualCollisionType);
+                if (!child.empty())
+                {
+                    assert(std::find(child->mParents.begin(), child->mParents.end(), ninode) != child->mParents.end());
+                    handleNode(child.get(), &currentParent, args);
+                }
+                // For NiSwitchNodes and NiFltAnimationNodes, only use the first child
+                // TODO: must synchronize with the rendering scene graph somehow
+                // Doing this for NiLODNodes is unsafe (the first level might not be the closest)
+                if (node.recType == Nif::RC_NiSwitchNode || node.recType == Nif::RC_NiFltAnimationNode)
+                    break;
             }
         }
     }
 
-    void BulletNifLoader::handleNiTriShape(
+    void BulletNifLoader::handleGeometry(
         const Nif::NiGeometry& niGeometry, const Nif::Parent* nodeParent, HandleNodeArgs args)
     {
-        // mHasMarkers is specifically BSXFlags editor marker flag.
-        // If this changes, the check must be corrected.
-        if (args.mHasMarkers && Misc::StringUtils::ciStartsWith(niGeometry.name, "EditorMarker"))
+        // This flag comes from BSXFlags
+        if (args.mHasMarkers && Misc::StringUtils::ciStartsWith(niGeometry.mName, "EditorMarker"))
             return;
 
-        if (niGeometry.data.empty() || niGeometry.data->vertices.empty())
+        // This flag comes from Morrowind
+        if (args.mHasTriMarkers && Misc::StringUtils::ciStartsWith(niGeometry.mName, "Tri EditorMarker"))
             return;
 
-        if (!niGeometry.skin.empty())
+        if (!niGeometry.mSkin.empty())
             args.mAnimated = false;
-        // TODO: handle NiSkinPartition
 
-        std::unique_ptr<btTriangleMesh> childMesh = makeChildMesh(niGeometry);
-        if (childMesh == nullptr || childMesh->getNumTriangles() == 0)
+        std::unique_ptr<btCollisionShape> childShape = niGeometry.getCollisionShape();
+        if (childShape == nullptr)
             return;
 
-        auto childShape = std::make_unique<Resource::TriangleMeshShape>(childMesh.get(), true);
-        std::ignore = childMesh.release();
-
-        osg::Matrixf transform = niGeometry.trafo.toMatrix();
+        osg::Matrixf transform = niGeometry.mTransform.toMatrix();
         for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
-            transform *= parent->mNiNode.trafo.toMatrix();
-        childShape->setLocalScaling(Misc::Convert::toBullet(transform.getScale()));
+            transform *= parent->mNiNode.mTransform.toMatrix();
+
+        if (childShape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+        {
+            auto scaledShape = std::make_unique<Resource::ScaledTriangleMeshShape>(
+                static_cast<btBvhTriangleMeshShape*>(childShape.get()), Misc::Convert::toBullet(transform.getScale()));
+            std::ignore = childShape.release();
+
+            childShape = std::move(scaledShape);
+        }
+        else
+        {
+            childShape->setLocalScaling(Misc::Convert::toBullet(transform.getScale()));
+        }
+
         transform.orthoNormalize(transform);
 
         btTransform trans;
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index c70eb997fa..a80e6fdc3d 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -22,10 +22,8 @@ class btCollisionShape;
 
 namespace Nif
 {
-    struct Node;
-    struct Transformation;
-    struct NiTriShape;
-    struct NiTriStrips;
+    struct NiAVObject;
+    struct NiNode;
     struct NiGeometry;
     struct Parent;
 }
@@ -50,24 +48,21 @@ namespace NifBullet
         osg::ref_ptr<Resource::BulletShape> load(Nif::FileView file);
 
     private:
-        bool findBoundingBox(const Nif::Node& node, const std::string& filename);
+        bool findBoundingBox(const Nif::NiAVObject& node);
 
         struct HandleNodeArgs
         {
             bool mHasMarkers{ false };
+            bool mHasTriMarkers{ false };
             bool mAnimated{ false };
             bool mIsCollisionNode{ false };
             bool mAutogenerated{ false };
             bool mAvoid{ false };
         };
 
-        void handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent,
-            HandleNodeArgs args, Resource::VisualCollisionType& visualCollisionType);
-
-        bool hasRootCollisionNode(const Nif::Node& rootNode) const;
-        bool collisionShapeIsEmpty(const Nif::Node& rootNode) const;
-
-        void handleNiTriShape(const Nif::NiGeometry& nifNode, const Nif::Parent* parent, HandleNodeArgs args);
+        void handleRoot(Nif::FileView nif, const Nif::NiAVObject& node, HandleNodeArgs args);
+        void handleNode(const Nif::NiAVObject& node, const Nif::Parent* parent, HandleNodeArgs args);
+        void handleGeometry(const Nif::NiGeometry& nifNode, const Nif::Parent* parent, HandleNodeArgs args);
 
         std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
         std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mAvoidCompoundShape;
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index ce5485ac53..7e4c5da7a0 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -5,6 +5,8 @@
 #include <osg/TexMat>
 #include <osg/Texture2D>
 
+#include <osgAnimation/Bone>
+
 #include <osgParticle/Emitter>
 
 #include <components/nif/data.hpp>
@@ -15,11 +17,11 @@
 namespace NifOsg
 {
 
-    ControllerFunction::ControllerFunction(const Nif::Controller* ctrl)
-        : mFrequency(ctrl->frequency)
-        , mPhase(ctrl->phase)
-        , mStartTime(ctrl->timeStart)
-        , mStopTime(ctrl->timeStop)
+    ControllerFunction::ControllerFunction(const Nif::NiTimeController* ctrl)
+        : mFrequency(ctrl->mFrequency)
+        , mPhase(ctrl->mPhase)
+        , mStartTime(ctrl->mTimeStart)
+        , mStopTime(ctrl->mTimeStop)
         , mExtrapolationMode(ctrl->extrapolationMode())
     {
     }
@@ -31,7 +33,7 @@ namespace NifOsg
             return time;
         switch (mExtrapolationMode)
         {
-            case Nif::Controller::ExtrapolationMode::Cycle:
+            case Nif::NiTimeController::ExtrapolationMode::Cycle:
             {
                 float delta = mStopTime - mStartTime;
                 if (delta <= 0)
@@ -40,7 +42,7 @@ namespace NifOsg
                 float remainder = (cycles - std::floor(cycles)) * delta;
                 return mStartTime + remainder;
             }
-            case Nif::Controller::ExtrapolationMode::Reverse:
+            case Nif::NiTimeController::ExtrapolationMode::Reverse:
             {
                 float delta = mStopTime - mStartTime;
                 if (delta <= 0)
@@ -55,9 +57,15 @@ namespace NifOsg
 
                 return mStopTime - remainder;
             }
-            case Nif::Controller::ExtrapolationMode::Constant:
+            case Nif::NiTimeController::ExtrapolationMode::Constant:
             default:
-                return std::clamp(time, mStartTime, mStopTime);
+            {
+                if (time < mStartTime)
+                    return mStartTime;
+                if (time > mStopTime)
+                    return mStopTime;
+                return time;
+            }
         }
     }
 
@@ -90,21 +98,23 @@ namespace NifOsg
             {
                 const Nif::NiTransformInterpolator* interp
                     = static_cast<const Nif::NiTransformInterpolator*>(keyctrl->mInterpolator.getPtr());
-                if (!interp->data.empty())
+                const Nif::NiQuatTransform& defaultTransform = interp->mDefaultValue;
+                if (!interp->mData.empty())
                 {
-                    mRotations = QuaternionInterpolator(interp->data->mRotations, interp->defaultRot);
-                    mXRotations = FloatInterpolator(interp->data->mXRotations);
-                    mYRotations = FloatInterpolator(interp->data->mYRotations);
-                    mZRotations = FloatInterpolator(interp->data->mZRotations);
-                    mTranslations = Vec3Interpolator(interp->data->mTranslations, interp->defaultPos);
-                    mScales = FloatInterpolator(interp->data->mScales, interp->defaultScale);
-                    mAxisOrder = interp->data->mAxisOrder;
+                    mRotations = QuaternionInterpolator(interp->mData->mRotations, defaultTransform.mRotation);
+                    mXRotations = FloatInterpolator(interp->mData->mXRotations);
+                    mYRotations = FloatInterpolator(interp->mData->mYRotations);
+                    mZRotations = FloatInterpolator(interp->mData->mZRotations);
+                    mTranslations = Vec3Interpolator(interp->mData->mTranslations, defaultTransform.mTranslation);
+                    mScales = FloatInterpolator(interp->mData->mScales, defaultTransform.mScale);
+
+                    mAxisOrder = interp->mData->mAxisOrder;
                 }
                 else
                 {
-                    mRotations = QuaternionInterpolator(Nif::QuaternionKeyMapPtr(), interp->defaultRot);
-                    mTranslations = Vec3Interpolator(Nif::Vector3KeyMapPtr(), interp->defaultPos);
-                    mScales = FloatInterpolator(Nif::FloatKeyMapPtr(), interp->defaultScale);
+                    mRotations = QuaternionInterpolator(Nif::QuaternionKeyMapPtr(), defaultTransform.mRotation);
+                    mTranslations = Vec3Interpolator(Nif::Vector3KeyMapPtr(), defaultTransform.mTranslation);
+                    mScales = FloatInterpolator(Nif::FloatKeyMapPtr(), defaultTransform.mScale);
                 }
             }
         }
@@ -117,6 +127,7 @@ namespace NifOsg
             mZRotations = FloatInterpolator(keydata->mZRotations);
             mTranslations = Vec3Interpolator(keydata->mTranslations);
             mScales = FloatInterpolator(keydata->mScales, 1.f);
+
             mAxisOrder = keydata->mAxisOrder;
         }
     }
@@ -166,25 +177,48 @@ namespace NifOsg
 
     void KeyframeController::operator()(NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
     {
+        auto [translation, rotation, scale] = getCurrentTransformation(nv);
+
+        if (rotation)
+        {
+            node->setRotation(*rotation);
+        }
+        else
+        {
+            // This is necessary to prevent first person animations glitching out due to RotationController
+            node->setRotation(node->mRotationScale);
+        }
+
+        if (translation)
+            node->setTranslation(*translation);
+
+        if (scale)
+            node->setScale(*scale);
+
+        traverse(node, nv);
+    }
+
+    KeyframeController::KfTransform KeyframeController::getCurrentTransformation(osg::NodeVisitor* nv)
+    {
+        KfTransform out;
+
         if (hasInput())
         {
             float time = getInputValue(nv);
 
             if (!mRotations.empty())
-                node->setRotation(mRotations.interpKey(time));
+                out.mRotation = mRotations.interpKey(time);
             else if (!mXRotations.empty() || !mYRotations.empty() || !mZRotations.empty())
-                node->setRotation(getXYZRotation(time));
-            else
-                node->setRotation(node->mRotationScale);
-
-            if (!mScales.empty())
-                node->setScale(mScales.interpKey(time));
+                out.mRotation = getXYZRotation(time);
 
             if (!mTranslations.empty())
-                node->setTranslation(mTranslations.interpKey(time));
+                out.mTranslation = mTranslations.interpKey(time);
+
+            if (!mScales.empty())
+                out.mScale = mScales.interpKey(time);
         }
 
-        traverse(node, nv);
+        return out;
     }
 
     GeomMorpherController::GeomMorpherController() {}
@@ -251,9 +285,7 @@ namespace NifOsg
         }
     }
 
-    UVController::UVController() {}
-
-    UVController::UVController(const Nif::NiUVData* data, const std::set<int>& textureUnits)
+    UVController::UVController(const Nif::NiUVData* data, const std::set<unsigned int>& textureUnits)
         : mUTrans(data->mKeyList[0], 0.f)
         , mVTrans(data->mKeyList[1], 0.f)
         , mUScale(data->mKeyList[2], 1.f)
@@ -277,8 +309,8 @@ namespace NifOsg
     void UVController::setDefaults(osg::StateSet* stateset)
     {
         osg::ref_ptr<osg::TexMat> texMat(new osg::TexMat);
-        for (std::set<int>::const_iterator it = mTextureUnits.begin(); it != mTextureUnits.end(); ++it)
-            stateset->setTextureAttributeAndModes(*it, texMat, osg::StateAttribute::ON);
+        for (unsigned int unit : mTextureUnits)
+            stateset->setTextureAttributeAndModes(unit, texMat, osg::StateAttribute::ON);
     }
 
     void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
@@ -314,12 +346,13 @@ namespace NifOsg
     {
         if (!ctrl->mInterpolator.empty())
         {
-            if (ctrl->mInterpolator->recType == Nif::RC_NiBoolInterpolator)
-                mInterpolator
-                    = ByteInterpolator(static_cast<const Nif::NiBoolInterpolator*>(ctrl->mInterpolator.getPtr()));
+            if (ctrl->mInterpolator->recType != Nif::RC_NiBoolInterpolator)
+                return;
+
+            mInterpolator = { static_cast<const Nif::NiBoolInterpolator*>(ctrl->mInterpolator.getPtr()) };
         }
         else if (!ctrl->mData.empty())
-            mData = ctrl->mData->mVis;
+            mData = ctrl->mData->mKeys;
     }
 
     VisController::VisController() {}
@@ -338,15 +371,13 @@ namespace NifOsg
         if (!mInterpolator.empty())
             return mInterpolator.interpKey(time);
 
-        if (mData.size() == 0)
+        if (mData->empty())
             return true;
 
-        for (size_t i = 1; i < mData.size(); i++)
-        {
-            if (mData[i].time > time)
-                return mData[i - 1].isSet;
-        }
-        return mData.back().isSet;
+        auto iter = mData->upper_bound(time);
+        if (iter != mData->begin())
+            --iter;
+        return iter->second;
     }
 
     void VisController::operator()(osg::Node* node, osg::NodeVisitor* nv)
@@ -442,11 +473,11 @@ namespace NifOsg
         }
     }
 
-    MaterialColorController::MaterialColorController() {}
+    MaterialColorController::MaterialColorController() = default;
 
     MaterialColorController::MaterialColorController(
         const Nif::NiMaterialColorController* ctrl, const osg::Material* baseMaterial)
-        : mTargetColor(static_cast<MaterialColorController::TargetColor>(ctrl->mTargetColor))
+        : mTargetColor(ctrl->mTargetColor)
         , mBaseMaterial(baseMaterial)
     {
         if (!ctrl->mInterpolator.empty())
@@ -479,30 +510,31 @@ namespace NifOsg
         {
             osg::Vec3f value = mData.interpKey(getInputValue(nv));
             osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+            using TargetColor = Nif::NiMaterialColorController::TargetColor;
             switch (mTargetColor)
             {
-                case Diffuse:
+                case TargetColor::Diffuse:
                 {
                     osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);
                     diffuse.set(value.x(), value.y(), value.z(), diffuse.a());
                     mat->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
                     break;
                 }
-                case Specular:
+                case TargetColor::Specular:
                 {
                     osg::Vec4f specular = mat->getSpecular(osg::Material::FRONT_AND_BACK);
                     specular.set(value.x(), value.y(), value.z(), specular.a());
                     mat->setSpecular(osg::Material::FRONT_AND_BACK, specular);
                     break;
                 }
-                case Emissive:
+                case TargetColor::Emissive:
                 {
                     osg::Vec4f emissive = mat->getEmission(osg::Material::FRONT_AND_BACK);
                     emissive.set(value.x(), value.y(), value.z(), emissive.a());
                     mat->setEmission(osg::Material::FRONT_AND_BACK, emissive);
                     break;
                 }
-                case Ambient:
+                case TargetColor::Ambient:
                 default:
                 {
                     osg::Vec4f ambient = mat->getAmbient(osg::Material::FRONT_AND_BACK);
@@ -554,14 +586,8 @@ namespace NifOsg
     }
 
     ParticleSystemController::ParticleSystemController(const Nif::NiParticleSystemController* ctrl)
-        : mEmitStart(ctrl->startTime)
-        , mEmitStop(ctrl->stopTime)
-    {
-    }
-
-    ParticleSystemController::ParticleSystemController()
-        : mEmitStart(0.f)
-        , mEmitStop(0.f)
+        : mEmitStart(ctrl->mEmitStartTime)
+        , mEmitStop(ctrl->mEmitStopTime)
     {
     }
 
@@ -596,9 +622,9 @@ namespace NifOsg
     }
 
     PathController::PathController(const Nif::NiPathController* ctrl)
-        : mPath(ctrl->posData->mKeyList, osg::Vec3f())
-        , mPercent(ctrl->floatData->mKeyList, 1.f)
-        , mFlags(ctrl->flags)
+        : mPath(ctrl->mPathData->mKeyList, osg::Vec3f())
+        , mPercent(ctrl->mPercentData->mKeyList, 1.f)
+        , mFlags(ctrl->mPathFlags)
     {
     }
 
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 7666fdeb3f..99d3df9545 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -1,19 +1,18 @@
 #ifndef COMPONENTS_NIFOSG_CONTROLLER_H
 #define COMPONENTS_NIFOSG_CONTROLLER_H
 
-#include <components/nif/controller.hpp>
-#include <components/nif/data.hpp>
-#include <components/nif/nifkey.hpp>
-
-#include <components/sceneutil/keyframe.hpp>
-#include <components/sceneutil/nodecallback.hpp>
-#include <components/sceneutil/statesetupdater.hpp>
-
 #include <set>
 #include <type_traits>
 
 #include <osg/Texture2D>
 
+#include <components/nif/controller.hpp>
+#include <components/nif/data.hpp>
+#include <components/nif/nifkey.hpp>
+#include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/nodecallback.hpp>
+#include <components/sceneutil/statesetupdater.hpp>
+
 namespace osg
 {
     class Material;
@@ -64,18 +63,17 @@ namespace NifOsg
         ValueInterpolator() = default;
 
         template <class T,
-            typename
-            = std::enable_if_t<std::conjunction_v<std::disjunction<std::is_same<ValueT, float>,
-                                                      std::is_same<ValueT, osg::Vec3f>, std::is_same<ValueT, bool>,
-                                                      std::is_same<ValueT, osg::Vec4f>, std::is_same<ValueT, char>>,
-                                   std::is_same<decltype(T::defaultVal), ValueT>>,
+            typename = std::enable_if_t<
+                std::conjunction_v<std::disjunction<std::is_same<ValueT, float>, std::is_same<ValueT, osg::Vec3f>,
+                                       std::is_same<ValueT, bool>, std::is_same<ValueT, osg::Vec4f>>,
+                    std::is_same<decltype(T::mDefaultValue), ValueT>>,
                 T>>
         ValueInterpolator(const T* interpolator)
-            : mDefaultVal(interpolator->defaultVal)
+            : mDefaultVal(interpolator->mDefaultValue)
         {
-            if (interpolator->data.empty())
+            if (interpolator->mData.empty())
                 return;
-            mKeys = interpolator->data->mKeyList;
+            mKeys = interpolator->mData->mKeyList;
             if (mKeys)
             {
                 mLastLowKey = mKeys->mKeys.end();
@@ -183,7 +181,7 @@ namespace NifOsg
     using FloatInterpolator = ValueInterpolator<Nif::FloatKeyMap>;
     using Vec3Interpolator = ValueInterpolator<Nif::Vector3KeyMap>;
     using Vec4Interpolator = ValueInterpolator<Nif::Vector4KeyMap>;
-    using ByteInterpolator = ValueInterpolator<Nif::ByteKeyMap>;
+    using BoolInterpolator = ValueInterpolator<Nif::BoolKeyMap>;
 
     class ControllerFunction : public SceneUtil::ControllerFunction
     {
@@ -192,10 +190,10 @@ namespace NifOsg
         float mPhase;
         float mStartTime;
         float mStopTime;
-        Nif::Controller::ExtrapolationMode mExtrapolationMode;
+        Nif::NiTimeController::ExtrapolationMode mExtrapolationMode;
 
     public:
-        ControllerFunction(const Nif::Controller* ctrl);
+        ControllerFunction(const Nif::NiTimeController* ctrl);
 
         float calculate(float value) const override;
 
@@ -240,6 +238,8 @@ namespace NifOsg
         osg::Vec3f getTranslation(float time) const override;
         osg::Callback* getAsCallback() override { return this; }
 
+        KfTransform getCurrentTransformation(osg::NodeVisitor* nv) override;
+
         void operator()(NifOsg::MatrixTransform*, osg::NodeVisitor*);
 
     private:
@@ -263,9 +263,9 @@ namespace NifOsg
     class UVController : public SceneUtil::StateSetUpdater, public SceneUtil::Controller
     {
     public:
-        UVController();
+        UVController() = default;
         UVController(const UVController&, const osg::CopyOp&);
-        UVController(const Nif::NiUVData* data, const std::set<int>& textureUnits);
+        UVController(const Nif::NiUVData* data, const std::set<unsigned int>& textureUnits);
 
         META_Object(NifOsg, UVController)
 
@@ -277,14 +277,14 @@ namespace NifOsg
         FloatInterpolator mVTrans;
         FloatInterpolator mUScale;
         FloatInterpolator mVScale;
-        std::set<int> mTextureUnits;
+        std::set<unsigned int> mTextureUnits;
     };
 
     class VisController : public SceneUtil::NodeCallback<VisController>, public SceneUtil::Controller
     {
     private:
-        std::vector<Nif::NiVisData::VisData> mData;
-        ByteInterpolator mInterpolator;
+        std::shared_ptr<std::map<float, bool>> mData;
+        BoolInterpolator mInterpolator;
         unsigned int mMask{ 0u };
 
         bool calculate(float time) const;
@@ -337,13 +337,6 @@ namespace NifOsg
     class MaterialColorController : public SceneUtil::StateSetUpdater, public SceneUtil::Controller
     {
     public:
-        enum TargetColor
-        {
-            Ambient = 0,
-            Diffuse = 1,
-            Specular = 2,
-            Emissive = 3
-        };
         MaterialColorController(const Nif::NiMaterialColorController* ctrl, const osg::Material* baseMaterial);
         MaterialColorController();
         MaterialColorController(const MaterialColorController& copy, const osg::CopyOp& copyop);
@@ -356,7 +349,9 @@ namespace NifOsg
 
     private:
         Vec3Interpolator mData;
-        TargetColor mTargetColor = Ambient;
+        Nif::NiMaterialColorController::TargetColor mTargetColor{
+            Nif::NiMaterialColorController::TargetColor::Ambient
+        };
         osg::ref_ptr<const osg::Material> mBaseMaterial;
     };
 
@@ -387,7 +382,7 @@ namespace NifOsg
     {
     public:
         ParticleSystemController(const Nif::NiParticleSystemController* ctrl);
-        ParticleSystemController();
+        ParticleSystemController() = default;
         ParticleSystemController(const ParticleSystemController& copy, const osg::CopyOp& copyop);
 
         META_Object(NifOsg, ParticleSystemController)
@@ -395,8 +390,8 @@ namespace NifOsg
         void operator()(osgParticle::ParticleProcessor* node, osg::NodeVisitor* nv);
 
     private:
-        float mEmitStart;
-        float mEmitStop;
+        float mEmitStart{ 0.f };
+        float mEmitStop{ 0.f };
     };
 
     class PathController : public SceneUtil::NodeCallback<PathController, NifOsg::MatrixTransform*>,
diff --git a/components/nifosg/fog.cpp b/components/nifosg/fog.cpp
new file mode 100644
index 0000000000..497193ec42
--- /dev/null
+++ b/components/nifosg/fog.cpp
@@ -0,0 +1,31 @@
+#include "fog.hpp"
+
+#include <osg/Matrix>
+#include <osg/State>
+
+namespace NifOsg
+{
+
+    Fog::Fog()
+        : osg::Fog()
+    {
+    }
+
+    Fog::Fog(const Fog& copy, const osg::CopyOp& copyop)
+        : osg::Fog(copy, copyop)
+        , mDepth(copy.mDepth)
+    {
+    }
+
+    void Fog::apply(osg::State& state) const
+    {
+        osg::Fog::apply(state);
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+        float fov, aspect, near, far;
+        state.getProjectionMatrix().getPerspective(fov, aspect, near, far);
+        glFogf(GL_FOG_START, near * mDepth + far * (1.f - mDepth));
+        glFogf(GL_FOG_END, far);
+#endif
+    }
+
+}
diff --git a/components/nifosg/fog.hpp b/components/nifosg/fog.hpp
new file mode 100644
index 0000000000..4557092477
--- /dev/null
+++ b/components/nifosg/fog.hpp
@@ -0,0 +1,38 @@
+#ifndef OPENMW_COMPONENTS_NIFOSG_FOG_H
+#define OPENMW_COMPONENTS_NIFOSG_FOG_H
+
+#include <osg/Fog>
+
+namespace NifOsg
+{
+
+    // osg::Fog-based wrapper for NiFogProperty that autocalculates the fog start and end distance.
+    class Fog : public osg::Fog
+    {
+    public:
+        Fog();
+        Fog(const Fog& copy, const osg::CopyOp& copyop);
+
+        META_StateAttribute(NifOsg, Fog, FOG)
+
+        int compare(const StateAttribute& sa) const override
+        {
+            if (const int base = osg::Fog::compare(sa); base != 0)
+                return base;
+            const Fog& rhs = static_cast<const Fog&>(sa);
+            COMPARE_StateAttribute_Parameter(mDepth);
+            return 0;
+        }
+
+        void setDepth(float depth) { mDepth = depth; }
+        float getDepth() const { return mDepth; }
+
+        void apply(osg::State& state) const override;
+
+    private:
+        float mDepth{ 1.f };
+    };
+
+}
+
+#endif
diff --git a/components/nifosg/matrixtransform.cpp b/components/nifosg/matrixtransform.cpp
index 44eac28def..a59f10360a 100644
--- a/components/nifosg/matrixtransform.cpp
+++ b/components/nifosg/matrixtransform.cpp
@@ -2,10 +2,10 @@
 
 namespace NifOsg
 {
-    MatrixTransform::MatrixTransform(const Nif::Transformation& trafo)
-        : osg::MatrixTransform(trafo.toMatrix())
-        , mScale(trafo.scale)
-        , mRotationScale(trafo.rotation)
+    MatrixTransform::MatrixTransform(const Nif::NiTransform& transform)
+        : osg::MatrixTransform(transform.toMatrix())
+        , mScale(transform.mScale)
+        , mRotationScale(transform.mRotation)
     {
     }
 
diff --git a/components/nifosg/matrixtransform.hpp b/components/nifosg/matrixtransform.hpp
index e1e7ff1828..4e42d00787 100644
--- a/components/nifosg/matrixtransform.hpp
+++ b/components/nifosg/matrixtransform.hpp
@@ -12,7 +12,7 @@ namespace NifOsg
     {
     public:
         MatrixTransform() = default;
-        MatrixTransform(const Nif::Transformation& trafo);
+        MatrixTransform(const Nif::NiTransform& transform);
         MatrixTransform(const MatrixTransform& copy, const osg::CopyOp& copyop);
 
         META_Node(NifOsg, MatrixTransform)
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 2e2d0293e6..d817ed2c9f 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -21,6 +21,7 @@
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/nif/parent.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 
 // particle
@@ -32,7 +33,6 @@
 
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
-#include <osg/Depth>
 #include <osg/FrontFace>
 #include <osg/Material>
 #include <osg/PolygonMode>
@@ -42,18 +42,23 @@
 #include <osg/TexEnvCombine>
 #include <osg/Texture2D>
 
-#include <components/nif/controlled.hpp>
+#include <components/bgsm/file.hpp>
 #include <components/nif/effect.hpp>
 #include <components/nif/exception.hpp>
 #include <components/nif/extra.hpp>
 #include <components/nif/niffile.hpp>
 #include <components/nif/node.hpp>
+#include <components/nif/particle.hpp>
 #include <components/nif/property.hpp>
+#include <components/nif/texture.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/extradata.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/texturetype.hpp>
 
+#include "fog.hpp"
 #include "matrixtransform.hpp"
 #include "particle.hpp"
 
@@ -75,18 +80,18 @@ namespace
         void apply(osg::Drawable& node) override { traverse(node); }
     };
 
-    void getAllNiNodes(const Nif::Node* node, std::vector<int>& outIndices)
+    void getAllNiNodes(const Nif::NiAVObject* node, std::vector<int>& outIndices)
     {
         if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(node))
         {
             outIndices.push_back(ninode->recIndex);
-            for (const auto& child : ninode->children)
+            for (const auto& child : ninode->mChildren)
                 if (!child.empty())
                     getAllNiNodes(child.getPtr(), outIndices);
         }
     }
 
-    bool isTypeGeometry(int type)
+    bool isTypeNiGeometry(int type)
     {
         switch (type)
         {
@@ -94,6 +99,20 @@ namespace
             case Nif::RC_NiTriStrips:
             case Nif::RC_NiLines:
             case Nif::RC_BSLODTriShape:
+            case Nif::RC_BSSegmentedTriShape:
+                return true;
+        }
+        return false;
+    }
+
+    bool isTypeBSGeometry(int type)
+    {
+        switch (type)
+        {
+            case Nif::RC_BSTriShape:
+            case Nif::RC_BSDynamicTriShape:
+            case Nif::RC_BSMeshLODTriShape:
+            case Nif::RC_BSSubIndexTriShape:
                 return true;
         }
         return false;
@@ -102,11 +121,11 @@ namespace
     // Collect all properties affecting the given drawable that should be handled on drawable basis rather than on the
     // node hierarchy above it.
     void collectDrawableProperties(
-        const Nif::Node* nifNode, const Nif::Parent* parent, std::vector<const Nif::Property*>& out)
+        const Nif::NiAVObject* nifNode, const Nif::Parent* parent, std::vector<const Nif::NiProperty*>& out)
     {
         if (parent != nullptr)
             collectDrawableProperties(&parent->mNiNode, parent->mParent, out);
-        for (const auto& property : nifNode->props)
+        for (const auto& property : nifNode->mProperties)
         {
             if (!property.empty())
             {
@@ -123,15 +142,6 @@ namespace
                 }
             }
         }
-
-        auto geometry = dynamic_cast<const Nif::NiGeometry*>(nifNode);
-        if (geometry)
-        {
-            if (!geometry->shaderprop.empty())
-                out.emplace_back(geometry->shaderprop.getPtr());
-            if (!geometry->alphaprop.empty())
-                out.emplace_back(geometry->alphaprop.getPtr());
-        }
     }
 
     // NodeCallback used to have a node always oriented towards the camera. The node can have translation and scale
@@ -174,16 +184,16 @@ namespace
 
     void extractTextKeys(const Nif::NiTextKeyExtraData* tk, SceneUtil::TextKeyMap& textkeys)
     {
-        for (size_t i = 0; i < tk->list.size(); i++)
+        for (const Nif::NiTextKeyExtraData::TextKey& key : tk->mList)
         {
             std::vector<std::string> results;
-            Misc::StringUtils::split(tk->list[i].text, results, "\r\n");
+            Misc::StringUtils::split(key.mText, results, "\r\n");
             for (std::string& result : results)
             {
                 Misc::StringUtils::trim(result);
                 Misc::StringUtils::lowerCaseInPlace(result);
                 if (!result.empty())
-                    textkeys.emplace(tk->list[i].time, std::move(result));
+                    textkeys.emplace(key.mTime, std::move(result));
             }
         }
     }
@@ -239,6 +249,8 @@ namespace NifOsg
         }
         std::filesystem::path mFilename;
         unsigned int mVersion, mUserVersion, mBethVersion;
+        Resource::BgsmFileManager* mMaterialManager{ nullptr };
+        Resource::ImageManager* mImageManager{ nullptr };
 
         size_t mFirstRootTextureIndex{ ~0u };
         bool mFoundFirstRootTexturingProperty = false;
@@ -274,21 +286,28 @@ namespace NifOsg
                 return;
             }
 
-            Nif::ExtraPtr extra = seq->extra;
-            if (extra.empty() || extra->recType != Nif::RC_NiTextKeyExtraData)
+            Nif::ExtraList extraList = seq->getExtraList();
+            if (extraList.empty())
             {
-                Log(Debug::Warning) << "NIFFile Warning: First extra data was not a NiTextKeyExtraData, but a "
-                                    << (extra.empty() ? std::string_view("nil") : std::string_view(extra->recName))
-                                    << ". File: " << nif.getFilename();
+                Log(Debug::Warning) << "NIFFile Warning: NiSequenceStreamHelper has no text keys. File: "
+                                    << nif.getFilename();
                 return;
             }
 
-            extractTextKeys(static_cast<const Nif::NiTextKeyExtraData*>(extra.getPtr()), target.mTextKeys);
-
-            extra = extra->next;
-            Nif::ControllerPtr ctrl = seq->controller;
-            for (; !extra.empty() && !ctrl.empty(); (extra = extra->next), (ctrl = ctrl->next))
+            if (extraList[0]->recType != Nif::RC_NiTextKeyExtraData)
             {
+                Log(Debug::Warning) << "NIFFile Warning: First extra data was not a NiTextKeyExtraData, but a "
+                                    << std::string_view(extraList[0]->recName) << ". File: " << nif.getFilename();
+                return;
+            }
+
+            auto textKeyExtraData = static_cast<const Nif::NiTextKeyExtraData*>(extraList[0].getPtr());
+            extractTextKeys(textKeyExtraData, target.mTextKeys);
+
+            Nif::NiTimeControllerPtr ctrl = seq->mController;
+            for (size_t i = 1; i < extraList.size() && !ctrl.empty(); i++, (ctrl = ctrl->mNext))
+            {
+                Nif::ExtraPtr extra = extraList[i];
                 if (extra->recType != Nif::RC_NiStringExtraData || ctrl->recType != Nif::RC_NiKeyframeController)
                 {
                     Log(Debug::Warning) << "NIFFile Warning: Unexpected extra data " << extra->recName
@@ -315,8 +334,8 @@ namespace NifOsg
                 osg::ref_ptr<SceneUtil::KeyframeController> callback = new NifOsg::KeyframeController(key);
                 setupController(key, callback, /*animflags*/ 0);
 
-                if (!target.mKeyframeControllers.emplace(strdata->string, callback).second)
-                    Log(Debug::Verbose) << "Controller " << strdata->string << " present more than once in "
+                if (!target.mKeyframeControllers.emplace(strdata->mData, callback).second)
+                    Log(Debug::Verbose) << "Controller " << strdata->mData << " present more than once in "
                                         << nif.getFilename() << ", ignoring later version";
             }
         }
@@ -324,7 +343,6 @@ namespace NifOsg
         struct HandleNodeArgs
         {
             unsigned int mNifVersion;
-            Resource::ImageManager* mImageManager;
             SceneUtil::TextKeyMap* mTextKeys;
             std::vector<unsigned int> mBoundTextures = {};
             int mAnimFlags = 0;
@@ -334,16 +352,16 @@ namespace NifOsg
             osg::Node* mRootNode = nullptr;
         };
 
-        osg::ref_ptr<osg::Node> load(Nif::FileView nif, Resource::ImageManager* imageManager)
+        osg::ref_ptr<osg::Node> load(Nif::FileView nif)
         {
             const size_t numRoots = nif.numRoots();
-            std::vector<const Nif::Node*> roots;
+            std::vector<const Nif::NiAVObject*> roots;
             for (size_t i = 0; i < numRoots; ++i)
             {
                 const Nif::Record* r = nif.getRoot(i);
                 if (!r)
                     continue;
-                const Nif::Node* nifNode = dynamic_cast<const Nif::Node*>(r);
+                const Nif::NiAVObject* nifNode = dynamic_cast<const Nif::NiAVObject*>(r);
                 if (nifNode)
                     roots.emplace_back(nifNode);
             }
@@ -354,12 +372,10 @@ namespace NifOsg
 
             osg::ref_ptr<osg::Group> created(new osg::Group);
             created->setDataVariance(osg::Object::STATIC);
-            for (const Nif::Node* root : roots)
+            for (const Nif::NiAVObject* root : roots)
             {
-                auto node = handleNode(root, nullptr, nullptr,
-                    { .mNifVersion = nif.getVersion(),
-                        .mImageManager = imageManager,
-                        .mTextKeys = &textkeys->mTextKeys });
+                auto node = handleNode(
+                    root, nullptr, nullptr, { .mNifVersion = nif.getVersion(), .mTextKeys = &textkeys->mTextKeys });
                 created->addChild(node);
             }
             if (mHasNightDayLabel)
@@ -389,13 +405,12 @@ namespace NifOsg
             return created;
         }
 
-        void applyNodeProperties(const Nif::Node* nifNode, osg::Node* applyTo,
-            SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager,
-            std::vector<unsigned int>& boundTextures, int animflags)
+        void applyNodeProperties(const Nif::NiAVObject* nifNode, osg::Node* applyTo,
+            SceneUtil::CompositeStateSetUpdater* composite, std::vector<unsigned int>& boundTextures, int animflags)
         {
             bool hasStencilProperty = false;
 
-            for (const auto& property : nifNode->props)
+            for (const auto& property : nifNode->mProperties)
             {
                 if (property.empty())
                     continue;
@@ -404,7 +419,7 @@ namespace NifOsg
                 {
                     const Nif::NiStencilProperty* stencilprop
                         = static_cast<const Nif::NiStencilProperty*>(property.getPtr());
-                    if (stencilprop->data.enabled != 0)
+                    if (stencilprop->mEnabled)
                     {
                         hasStencilProperty = true;
                         break;
@@ -412,13 +427,13 @@ namespace NifOsg
                 }
             }
 
-            for (const auto& property : nifNode->props)
+            for (const auto& property : nifNode->mProperties)
             {
                 if (!property.empty())
                 {
                     // Get the lowest numbered recIndex of the NiTexturingProperty root node.
                     // This is what is overridden when a spell effect "particle texture" is used.
-                    if (nifNode->parents.empty() && !mFoundFirstRootTexturingProperty
+                    if (nifNode->mParents.empty() && !mFoundFirstRootTexturingProperty
                         && property.getPtr()->recType == Nif::RC_NiTexturingProperty)
                     {
                         mFirstRootTextureIndex = property.getPtr()->recIndex;
@@ -429,19 +444,22 @@ namespace NifOsg
                         if (property.getPtr()->recIndex == mFirstRootTextureIndex)
                             applyTo->setUserValue("overrideFx", 1);
                     }
-                    handleProperty(property.getPtr(), applyTo, composite, imageManager, boundTextures, animflags,
-                        hasStencilProperty);
+                    handleProperty(property.getPtr(), applyTo, composite, boundTextures, animflags, hasStencilProperty);
                 }
             }
 
-            auto geometry = dynamic_cast<const Nif::NiGeometry*>(nifNode);
-            // NiGeometry's NiAlphaProperty doesn't get handled here because it's a drawable property
-            if (geometry && !geometry->shaderprop.empty())
-                handleProperty(geometry->shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures,
-                    animflags, hasStencilProperty);
+            // NiAlphaProperty is handled as a drawable property
+            Nif::BSShaderPropertyPtr shaderprop = nullptr;
+            if (isTypeNiGeometry(nifNode->recType))
+                shaderprop = static_cast<const Nif::NiGeometry*>(nifNode)->mShaderProperty;
+            else if (isTypeBSGeometry(nifNode->recType))
+                shaderprop = static_cast<const Nif::BSTriShape*>(nifNode)->mShaderProperty;
+
+            if (!shaderprop.empty())
+                handleProperty(shaderprop.getPtr(), applyTo, composite, boundTextures, animflags, hasStencilProperty);
         }
 
-        static void setupController(const Nif::Controller* ctrl, SceneUtil::Controller* toSetup, int animflags)
+        static void setupController(const Nif::NiTimeController* ctrl, SceneUtil::Controller* toSetup, int animflags)
         {
             bool autoPlay = animflags & Nif::NiNode::AnimFlag_AutoPlay;
             if (autoPlay)
@@ -453,13 +471,13 @@ namespace NifOsg
         static osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode)
         {
             osg::ref_ptr<osg::LOD> lod(new osg::LOD);
-            lod->setName(niLodNode->name);
+            lod->setName(niLodNode->mName);
             lod->setCenterMode(osg::LOD::USER_DEFINED_CENTER);
-            lod->setCenter(niLodNode->lodCenter);
-            for (unsigned int i = 0; i < niLodNode->lodLevels.size(); ++i)
+            lod->setCenter(niLodNode->mLODCenter);
+            for (unsigned int i = 0; i < niLodNode->mLODLevels.size(); ++i)
             {
-                const Nif::NiLODNode::LODRange& range = niLodNode->lodLevels[i];
-                lod->setRange(i, range.minRange, range.maxRange);
+                const Nif::NiLODNode::LODRange& range = niLodNode->mLODLevels[i];
+                lod->setRange(i, range.mMinRange, range.mMaxRange);
             }
             lod->setRangeMode(osg::LOD::DISTANCE_FROM_EYE_POINT);
             return lod;
@@ -468,29 +486,29 @@ namespace NifOsg
         static osg::ref_ptr<osg::Switch> handleSwitchNode(const Nif::NiSwitchNode* niSwitchNode)
         {
             osg::ref_ptr<osg::Switch> switchNode(new osg::Switch);
-            switchNode->setName(niSwitchNode->name);
+            switchNode->setName(niSwitchNode->mName);
             switchNode->setNewChildDefaultValue(false);
-            switchNode->setSingleChildOn(niSwitchNode->initialIndex);
+            switchNode->setSingleChildOn(niSwitchNode->mInitialIndex);
             return switchNode;
         }
 
-        static osg::ref_ptr<osg::Sequence> prepareSequenceNode(const Nif::Node* nifNode)
+        static osg::ref_ptr<osg::Sequence> prepareSequenceNode(const Nif::NiAVObject* nifNode)
         {
             const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
             osg::ref_ptr<osg::Sequence> sequenceNode(new osg::Sequence);
-            sequenceNode->setName(niFltAnimationNode->name);
-            if (!niFltAnimationNode->children.empty())
+            sequenceNode->setName(niFltAnimationNode->mName);
+            if (!niFltAnimationNode->mChildren.empty())
             {
                 if (niFltAnimationNode->swing())
                     sequenceNode->setDefaultTime(
-                        niFltAnimationNode->mDuration / (niFltAnimationNode->children.size() * 2));
+                        niFltAnimationNode->mDuration / (niFltAnimationNode->mChildren.size() * 2));
                 else
-                    sequenceNode->setDefaultTime(niFltAnimationNode->mDuration / niFltAnimationNode->children.size());
+                    sequenceNode->setDefaultTime(niFltAnimationNode->mDuration / niFltAnimationNode->mChildren.size());
             }
             return sequenceNode;
         }
 
-        static void activateSequenceNode(osg::Group* osgNode, const Nif::Node* nifNode)
+        static void activateSequenceNode(osg::Group* osgNode, const Nif::NiAVObject* nifNode)
         {
             const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
             osg::Sequence* sequenceNode = static_cast<osg::Sequence*>(osgNode);
@@ -502,32 +520,21 @@ namespace NifOsg
             sequenceNode->setMode(osg::Sequence::START);
         }
 
-        osg::ref_ptr<osg::Image> handleSourceTexture(
-            const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
+        osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st) const
         {
-            if (!st)
-                return nullptr;
+            if (st)
+            {
+                if (st->mExternal)
+                    return getTextureImage(st->mFile);
 
-            osg::ref_ptr<osg::Image> image;
-            if (!st->external && !st->data.empty())
-            {
-                image = handleInternalTexture(st->data.getPtr());
+                if (!st->mData.empty())
+                    return handleInternalTexture(st->mData.getPtr());
             }
-            else
-            {
-                std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
-                image = imageManager->getImage(filename);
-            }
-            return image;
+
+            return nullptr;
         }
 
-        void handleTextureWrapping(osg::Texture2D* texture, bool wrapS, bool wrapT)
-        {
-            texture->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-            texture->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-        }
-
-        bool handleEffect(const Nif::Node* nifNode, osg::StateSet* stateset, Resource::ImageManager* imageManager)
+        bool handleEffect(const Nif::NiAVObject* nifNode, osg::StateSet* stateset) const
         {
             if (nifNode->recType != Nif::RC_NiTextureEffect)
             {
@@ -536,47 +543,46 @@ namespace NifOsg
             }
 
             const Nif::NiTextureEffect* textureEffect = static_cast<const Nif::NiTextureEffect*>(nifNode);
-            if (textureEffect->textureType != Nif::NiTextureEffect::Environment_Map)
+            if (!textureEffect->mSwitchState)
+                return false;
+
+            if (textureEffect->mTextureType != Nif::NiTextureEffect::TextureType::EnvironmentMap)
             {
-                Log(Debug::Info) << "Unhandled NiTextureEffect type " << textureEffect->textureType << " in "
-                                 << mFilename;
+                Log(Debug::Info) << "Unhandled NiTextureEffect type "
+                                 << static_cast<uint32_t>(textureEffect->mTextureType) << " in " << mFilename;
                 return false;
             }
 
-            if (textureEffect->texture.empty())
+            if (textureEffect->mTexture.empty())
             {
                 Log(Debug::Info) << "NiTextureEffect missing source texture in " << mFilename;
                 return false;
             }
 
             osg::ref_ptr<osg::TexGen> texGen(new osg::TexGen);
-            switch (textureEffect->coordGenType)
+            switch (textureEffect->mCoordGenType)
             {
-                case Nif::NiTextureEffect::World_Parallel:
+                case Nif::NiTextureEffect::CoordGenType::WorldParallel:
                     texGen->setMode(osg::TexGen::OBJECT_LINEAR);
                     break;
-                case Nif::NiTextureEffect::World_Perspective:
+                case Nif::NiTextureEffect::CoordGenType::WorldPerspective:
                     texGen->setMode(osg::TexGen::EYE_LINEAR);
                     break;
-                case Nif::NiTextureEffect::Sphere_Map:
+                case Nif::NiTextureEffect::CoordGenType::SphereMap:
                     texGen->setMode(osg::TexGen::SPHERE_MAP);
                     break;
                 default:
-                    Log(Debug::Info) << "Unhandled NiTextureEffect coordGenType " << textureEffect->coordGenType
-                                     << " in " << mFilename;
+                    Log(Debug::Info) << "Unhandled NiTextureEffect CoordGenType "
+                                     << static_cast<uint32_t>(textureEffect->mCoordGenType) << " in " << mFilename;
                     return false;
             }
 
-            osg::ref_ptr<osg::Image> image(handleSourceTexture(textureEffect->texture.getPtr(), imageManager));
-            osg::ref_ptr<osg::Texture2D> texture2d(new osg::Texture2D(image));
-            if (image)
-                texture2d->setTextureSize(image->s(), image->t());
-            texture2d->setName("envMap");
-            handleTextureWrapping(texture2d, textureEffect->wrapS(), textureEffect->wrapT());
-
-            int texUnit = 3; // FIXME
-
-            stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+            const unsigned int uvSet = 0;
+            const unsigned int texUnit = 3; // FIXME
+            std::vector<unsigned int> boundTextures;
+            boundTextures.resize(3); // Dummy vector for attachNiSourceTexture
+            attachNiSourceTexture("envMap", textureEffect->mTexture.getPtr(), textureEffect->wrapS(),
+                textureEffect->wrapT(), uvSet, stateset, boundTextures);
             stateset->setTextureAttributeAndModes(texUnit, texGen, osg::StateAttribute::ON);
             stateset->setTextureAttributeAndModes(texUnit, createEmissiveTexEnv(), osg::StateAttribute::ON);
 
@@ -585,7 +591,7 @@ namespace NifOsg
         }
 
         // Get a default dataVariance for this node to be used as a hint by optimization (post)routines
-        osg::ref_ptr<osg::Group> createNode(const Nif::Node* nifNode)
+        static osg::ref_ptr<osg::Group> createNode(const Nif::NiAVObject* nifNode)
         {
             osg::ref_ptr<osg::Group> node;
             osg::Object::DataVariance dataVariance = osg::Object::UNSPECIFIED;
@@ -600,15 +606,15 @@ namespace NifOsg
                     // This takes advantage of the fact root nodes can't have additional controllers
                     // loaded from an external .kf file (original engine just throws "can't find node" errors if you
                     // try).
-                    if (nifNode->parents.empty() && nifNode->controller.empty() && nifNode->trafo.isIdentity())
+                    if (nifNode->mParents.empty() && nifNode->mController.empty() && nifNode->mTransform.isIdentity())
                         node = new osg::Group;
 
-                    dataVariance = nifNode->isBone ? osg::Object::DYNAMIC : osg::Object::STATIC;
+                    dataVariance = nifNode->mIsBone ? osg::Object::DYNAMIC : osg::Object::STATIC;
 
                     break;
             }
             if (!node)
-                node = new NifOsg::MatrixTransform(nifNode->trafo);
+                node = new NifOsg::MatrixTransform(nifNode->mTransform);
 
             node->setDataVariance(dataVariance);
 
@@ -616,9 +622,9 @@ namespace NifOsg
         }
 
         osg::ref_ptr<osg::Node> handleNode(
-            const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode, HandleNodeArgs args)
+            const Nif::NiAVObject* nifNode, const Nif::Parent* parent, osg::Group* parentNode, HandleNodeArgs args)
         {
-            if (args.mRootNode && Misc::StringUtils::ciEqual(nifNode->name, "Bounding Box"))
+            if (args.mRootNode && Misc::StringUtils::ciEqual(nifNode->mName, "Bounding Box"))
                 return nullptr;
 
             osg::ref_ptr<osg::Group> node = createNode(nifNode);
@@ -628,7 +634,7 @@ namespace NifOsg
                 node->addCullCallback(new BillboardCallback);
             }
 
-            node->setName(nifNode->name);
+            node->setName(nifNode->mName);
 
             if (parentNode)
                 parentNode->addChild(node);
@@ -642,16 +648,7 @@ namespace NifOsg
             // - finding a random child NiNode in NiBspArrayController
             node->setUserValue("recIndex", nifNode->recIndex);
 
-            std::vector<Nif::ExtraPtr> extraCollection;
-
-            for (Nif::ExtraPtr e = nifNode->extra; !e.empty(); e = e->next)
-                extraCollection.emplace_back(e);
-
-            for (const auto& extraNode : nifNode->extralist)
-                if (!extraNode.empty())
-                    extraCollection.emplace_back(extraNode);
-
-            for (const auto& e : extraCollection)
+            for (const auto& e : nifNode->getExtraList())
             {
                 if (e->recType == Nif::RC_NiTextKeyExtraData && args.mTextKeys)
                 {
@@ -666,31 +663,36 @@ namespace NifOsg
 
                     // String markers may contain important information
                     // affecting the entire subtree of this obj
-                    if (sd->string == "MRK" && !Loader::getShowMarkers())
+                    if (sd->mData == "MRK")
                     {
                         // Marker objects. These meshes are only visible in the editor.
-                        args.mHasMarkers = true;
+                        if (!Loader::getShowMarkers() && args.mRootNode == node)
+                            args.mHasMarkers = true;
                     }
-                    else if (sd->string == "BONE")
+                    else if (sd->mData == "BONE")
                     {
                         node->getOrCreateUserDataContainer()->addDescription("CustomBone");
                     }
-                    else if (sd->string.rfind(extraDataIdentifer, 0) == 0)
+                    else if (sd->mData.rfind(extraDataIdentifer, 0) == 0)
                     {
                         node->setUserValue(
-                            Misc::OsgUserValues::sExtraData, sd->string.substr(extraDataIdentifer.length()));
+                            Misc::OsgUserValues::sExtraData, sd->mData.substr(extraDataIdentifer.length()));
                     }
                 }
                 else if (e->recType == Nif::RC_BSXFlags)
                 {
+                    if (args.mRootNode != node)
+                        continue;
+
                     auto bsxFlags = static_cast<const Nif::NiIntegerExtraData*>(e.getPtr());
-                    if (bsxFlags->data & 32) // Editor marker flag
+                    // Marker objects.
+                    if (!Loader::getShowMarkers() && (bsxFlags->mData & 32))
                         args.mHasMarkers = true;
                 }
             }
 
             if (nifNode->recType == Nif::RC_NiBSAnimationNode || nifNode->recType == Nif::RC_NiBSParticleNode)
-                args.mAnimFlags = nifNode->flags;
+                args.mAnimFlags = nifNode->mFlags;
 
             if (nifNode->recType == Nif::RC_NiSortAdjustNode)
             {
@@ -704,7 +706,7 @@ namespace NifOsg
                 else
                 {
                     if (mPushedSorter && !mPushedSorter->mSubSorter.empty()
-                        && mPushedSorter->mMode != Nif::NiSortAdjustNode::SortingMode_Inherit)
+                        && mPushedSorter->mMode != Nif::NiSortAdjustNode::SortingMode::Inherit)
                         mLastAppliedNoInheritSorter = mPushedSorter;
                     mPushedSorter = sortNode;
                 }
@@ -723,7 +725,7 @@ namespace NifOsg
             if (nifNode->isHidden())
             {
                 bool hasVisController = false;
-                for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
+                for (Nif::NiTimeControllerPtr ctrl = nifNode->mController; !ctrl.empty(); ctrl = ctrl->mNext)
                 {
                     hasVisController |= (ctrl->recType == Nif::RC_NiVisController);
                     if (hasVisController)
@@ -738,35 +740,43 @@ namespace NifOsg
             }
 
             if (nifNode->recType == Nif::RC_NiCollisionSwitch && !nifNode->collisionActive())
+            {
                 node->setNodeMask(Loader::getIntersectionDisabledNodeMask());
+                // Don't let the optimizer mess with this node
+                node->setDataVariance(osg::Object::DYNAMIC);
+            }
 
             osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
 
-            applyNodeProperties(nifNode, node, composite, args.mImageManager, args.mBoundTextures, args.mAnimFlags);
+            applyNodeProperties(nifNode, node, composite, args.mBoundTextures, args.mAnimFlags);
 
-            const bool isGeometry = isTypeGeometry(nifNode->recType);
+            const bool isNiGeometry = isTypeNiGeometry(nifNode->recType);
+            const bool isBSGeometry = isTypeBSGeometry(nifNode->recType);
+            const bool isGeometry = isNiGeometry || isBSGeometry;
 
             if (isGeometry && !args.mSkipMeshes)
             {
-                bool skip;
+                bool skip = false;
                 if (args.mNifVersion <= Nif::NIFFile::NIFVersion::VER_MW)
                 {
-                    skip = (args.mHasMarkers && Misc::StringUtils::ciStartsWith(nifNode->name, "tri editormarker"))
-                        || Misc::StringUtils::ciStartsWith(nifNode->name, "shadow")
-                        || Misc::StringUtils::ciStartsWith(nifNode->name, "tri shadow");
+                    skip = (args.mHasMarkers && Misc::StringUtils::ciStartsWith(nifNode->mName, "tri editormarker"))
+                        || Misc::StringUtils::ciStartsWith(nifNode->mName, "shadow")
+                        || Misc::StringUtils::ciStartsWith(nifNode->mName, "tri shadow");
                 }
                 else
-                    skip = args.mHasMarkers && Misc::StringUtils::ciStartsWith(nifNode->name, "EditorMarker");
+                {
+                    if (args.mHasMarkers)
+                        skip = Misc::StringUtils::ciStartsWith(nifNode->mName, "EditorMarker")
+                            || Misc::StringUtils::ciStartsWith(nifNode->mName, "VisibilityEditorMarker");
+                }
                 if (!skip)
                 {
-                    Nif::NiSkinInstancePtr skin = static_cast<const Nif::NiGeometry*>(nifNode)->skin;
+                    if (isNiGeometry)
+                        handleNiGeometry(nifNode, parent, node, composite, args.mBoundTextures, args.mAnimFlags);
+                    else // isBSGeometry
+                        handleBSGeometry(nifNode, parent, node, composite, args.mBoundTextures, args.mAnimFlags);
 
-                    if (skin.empty())
-                        handleGeometry(nifNode, parent, node, composite, args.mBoundTextures, args.mAnimFlags);
-                    else
-                        handleSkinnedGeometry(nifNode, parent, node, composite, args.mBoundTextures, args.mAnimFlags);
-
-                    if (!nifNode->controller.empty())
+                    if (!nifNode->mController.empty())
                         handleMeshControllers(nifNode, node, composite, args.mBoundTextures, args.mAnimFlags);
                 }
             }
@@ -803,9 +813,9 @@ namespace NifOsg
                 const Nif::NiSwitchNode* niSwitchNode = static_cast<const Nif::NiSwitchNode*>(nifNode);
                 osg::ref_ptr<osg::Switch> switchNode = handleSwitchNode(niSwitchNode);
                 node->addChild(switchNode);
-                if (niSwitchNode->name == Constants::NightDayLabel)
+                if (niSwitchNode->mName == Constants::NightDayLabel)
                     mHasNightDayLabel = true;
-                else if (niSwitchNode->name == Constants::HerbalismLabel)
+                else if (niSwitchNode->mName == Constants::HerbalismLabel)
                     mHasHerbalismLabel = true;
 
                 currentNode = switchNode;
@@ -827,7 +837,7 @@ namespace NifOsg
             const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(nifNode);
             if (ninode)
             {
-                const Nif::NodeList& children = ninode->children;
+                const Nif::NiAVObjectList& children = ninode->mChildren;
                 const Nif::Parent currentParent{ *ninode, parent };
                 for (const auto& child : children)
                     if (!child.empty())
@@ -836,11 +846,11 @@ namespace NifOsg
                 // Propagate effects to the the direct subgraph instead of the node itself
                 // This simulates their "affected node list" which Morrowind appears to replace with the subgraph (?)
                 // Note that the serialized affected node list is actually unused
-                for (const auto& effect : ninode->effects)
+                for (const auto& effect : ninode->mEffects)
                     if (!effect.empty())
                     {
                         osg::ref_ptr<osg::StateSet> effectStateSet = new osg::StateSet;
-                        if (handleEffect(effect.getPtr(), effectStateSet, args.mImageManager))
+                        if (handleEffect(effect.getPtr(), effectStateSet))
                             for (unsigned int i = 0; i < currentNode->getNumChildren(); ++i)
                                 currentNode->getChild(i)->getOrCreateStateSet()->merge(*effectStateSet);
                     }
@@ -852,38 +862,38 @@ namespace NifOsg
             return node;
         }
 
-        void handleMeshControllers(const Nif::Node* nifNode, osg::Node* node,
+        static void handleMeshControllers(const Nif::NiAVObject* nifNode, osg::Node* node,
             SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
             int animflags)
         {
-            for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
+            for (Nif::NiTimeControllerPtr ctrl = nifNode->mController; !ctrl.empty(); ctrl = ctrl->mNext)
             {
                 if (!ctrl->isActive())
                     continue;
                 if (ctrl->recType == Nif::RC_NiUVController)
                 {
                     const Nif::NiUVController* niuvctrl = static_cast<const Nif::NiUVController*>(ctrl.getPtr());
-                    if (niuvctrl->data.empty())
+                    if (niuvctrl->mData.empty())
                         continue;
-                    const unsigned int uvSet = niuvctrl->uvSet;
-                    std::set<int> texUnits;
-                    // UVController should work only for textures which use a given UV Set, usually 0.
+                    std::set<unsigned int> texUnits;
+                    // UVController should only work for textures which use the given UV Set.
                     for (unsigned int i = 0; i < boundTextures.size(); ++i)
                     {
-                        if (boundTextures[i] == uvSet)
+                        if (boundTextures[i] == niuvctrl->mUvSet)
                             texUnits.insert(i);
                     }
 
-                    osg::ref_ptr<UVController> uvctrl = new UVController(niuvctrl->data.getPtr(), texUnits);
+                    osg::ref_ptr<UVController> uvctrl = new UVController(niuvctrl->mData.getPtr(), texUnits);
                     setupController(niuvctrl, uvctrl, animflags);
                     composite->addController(uvctrl);
                 }
             }
         }
 
-        void handleNodeControllers(const Nif::Node* nifNode, osg::Node* node, int animflags, bool& isAnimated)
+        void handleNodeControllers(
+            const Nif::NiAVObject* nifNode, osg::Node* node, int animflags, bool& isAnimated) const
         {
-            for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
+            for (Nif::NiTimeControllerPtr ctrl = nifNode->mController; !ctrl.empty(); ctrl = ctrl->mNext)
             {
                 if (!ctrl->isActive())
                     continue;
@@ -895,7 +905,7 @@ namespace NifOsg
                     if (!key->mInterpolator.empty() && key->mInterpolator->recType != Nif::RC_NiTransformInterpolator)
                     {
                         Log(Debug::Error) << "Unsupported interpolator type for NiKeyframeController " << key->recIndex
-                                          << " in " << mFilename;
+                                          << " in " << mFilename << ": " << key->mInterpolator->recName;
                         continue;
                     }
                     osg::ref_ptr<KeyframeController> callback = new KeyframeController(key);
@@ -906,7 +916,7 @@ namespace NifOsg
                 else if (ctrl->recType == Nif::RC_NiPathController)
                 {
                     const Nif::NiPathController* path = static_cast<const Nif::NiPathController*>(ctrl.getPtr());
-                    if (path->posData.empty() || path->floatData.empty())
+                    if (path->mPathData.empty() || path->mPercentData.empty())
                         continue;
                     osg::ref_ptr<PathController> callback(new PathController(path));
                     setupController(path, callback, animflags);
@@ -922,7 +932,7 @@ namespace NifOsg
                         && visctrl->mInterpolator->recType != Nif::RC_NiBoolInterpolator)
                     {
                         Log(Debug::Error) << "Unsupported interpolator type for NiVisController " << visctrl->recIndex
-                                          << " in " << mFilename;
+                                          << " in " << mFilename << ": " << visctrl->mInterpolator->recName;
                         continue;
                     }
                     osg::ref_ptr<VisController> callback(new VisController(visctrl, Loader::getHiddenNodeMask()));
@@ -938,7 +948,7 @@ namespace NifOsg
                         && rollctrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
                     {
                         Log(Debug::Error) << "Unsupported interpolator type for NiRollController " << rollctrl->recIndex
-                                          << " in " << mFilename;
+                                          << " in " << mFilename << ": " << rollctrl->mInterpolator->recName;
                         continue;
                     }
                     osg::ref_ptr<RollController> callback = new RollController(rollctrl);
@@ -958,10 +968,10 @@ namespace NifOsg
             }
         }
 
-        void handleMaterialControllers(const Nif::Property* materialProperty,
-            SceneUtil::CompositeStateSetUpdater* composite, int animflags, const osg::Material* baseMaterial)
+        void handleMaterialControllers(const Nif::NiProperty* materialProperty,
+            SceneUtil::CompositeStateSetUpdater* composite, int animflags, const osg::Material* baseMaterial) const
         {
-            for (Nif::ControllerPtr ctrl = materialProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
+            for (Nif::NiTimeControllerPtr ctrl = materialProperty->mController; !ctrl.empty(); ctrl = ctrl->mNext)
             {
                 if (!ctrl->isActive())
                     continue;
@@ -973,8 +983,9 @@ namespace NifOsg
                     if (!alphactrl->mInterpolator.empty()
                         && alphactrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
                     {
-                        Log(Debug::Error) << "Unsupported interpolator type for NiAlphaController "
-                                          << alphactrl->recIndex << " in " << mFilename;
+                        Log(Debug::Error)
+                            << "Unsupported interpolator type for NiAlphaController " << alphactrl->recIndex << " in "
+                            << mFilename << ": " << alphactrl->mInterpolator->recName;
                         continue;
                     }
                     osg::ref_ptr<AlphaController> osgctrl = new AlphaController(alphactrl, baseMaterial);
@@ -985,17 +996,16 @@ namespace NifOsg
                 {
                     const Nif::NiMaterialColorController* matctrl
                         = static_cast<const Nif::NiMaterialColorController*>(ctrl.getPtr());
-                    if (matctrl->mData.empty() && matctrl->mInterpolator.empty())
+                    Nif::NiInterpolatorPtr interp = matctrl->mInterpolator;
+                    if (matctrl->mData.empty() && interp.empty())
                         continue;
-                    auto targetColor = static_cast<MaterialColorController::TargetColor>(matctrl->mTargetColor);
                     if (mVersion <= Nif::NIFFile::VER_MW
-                        && targetColor == MaterialColorController::TargetColor::Specular)
+                        && matctrl->mTargetColor == Nif::NiMaterialColorController::TargetColor::Specular)
                         continue;
-                    if (!matctrl->mInterpolator.empty()
-                        && matctrl->mInterpolator->recType != Nif::RC_NiPoint3Interpolator)
+                    if (!interp.empty() && interp->recType != Nif::RC_NiPoint3Interpolator)
                     {
                         Log(Debug::Error) << "Unsupported interpolator type for NiMaterialColorController "
-                                          << matctrl->recIndex << " in " << mFilename;
+                                          << matctrl->recIndex << " in " << mFilename << ": " << interp->recName;
                         continue;
                     }
                     osg::ref_ptr<MaterialColorController> osgctrl = new MaterialColorController(matctrl, baseMaterial);
@@ -1007,10 +1017,63 @@ namespace NifOsg
             }
         }
 
-        void handleTextureControllers(const Nif::Property* texProperty, SceneUtil::CompositeStateSetUpdater* composite,
-            Resource::ImageManager* imageManager, osg::StateSet* stateset, int animflags)
+        osg::ref_ptr<osg::Image> getTextureImage(std::string_view path) const
         {
-            for (Nif::ControllerPtr ctrl = texProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
+            if (!mImageManager)
+                return nullptr;
+
+            return mImageManager->getImage(
+                VFS::Path::toNormalized(Misc::ResourceHelpers::correctTexturePath(path, mImageManager->getVFS())));
+        }
+
+        static osg::ref_ptr<osg::Texture2D> attachTexture(const std::string& name, osg::ref_ptr<osg::Image> image,
+            bool wrapS, bool wrapT, unsigned int uvSet, osg::StateSet* stateset,
+            std::vector<unsigned int>& boundTextures)
+        {
+            osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
+            if (image)
+                texture2d->setTextureSize(image->s(), image->t());
+            texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            unsigned int texUnit = boundTextures.size();
+            if (stateset)
+            {
+                stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+                osg::ref_ptr<SceneUtil::TextureType> textureType = new SceneUtil::TextureType(name);
+                textureType = shareAttribute(textureType);
+                stateset->setTextureAttributeAndModes(texUnit, textureType, osg::StateAttribute::ON);
+            }
+            boundTextures.emplace_back(uvSet);
+            return texture2d;
+        }
+
+        osg::ref_ptr<osg::Texture2D> attachExternalTexture(const std::string& name, const std::string& path, bool wrapS,
+            bool wrapT, unsigned int uvSet, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures) const
+        {
+            return attachTexture(name, getTextureImage(path), wrapS, wrapT, uvSet, stateset, boundTextures);
+        }
+
+        osg::ref_ptr<osg::Texture2D> attachNiSourceTexture(const std::string& name, const Nif::NiSourceTexture* st,
+            bool wrapS, bool wrapT, unsigned int uvSet, osg::StateSet* stateset,
+            std::vector<unsigned int>& boundTextures) const
+        {
+            return attachTexture(name, handleSourceTexture(st), wrapS, wrapT, uvSet, stateset, boundTextures);
+        }
+
+        static void clearBoundTextures(osg::StateSet* stateset, std::vector<unsigned int>& boundTextures)
+        {
+            if (!boundTextures.empty())
+            {
+                for (unsigned int i = 0; i < boundTextures.size(); ++i)
+                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                boundTextures.clear();
+            }
+        }
+
+        void handleTextureControllers(const Nif::NiProperty* texProperty,
+            SceneUtil::CompositeStateSetUpdater* composite, osg::StateSet* stateset, int animflags) const
+        {
+            for (Nif::NiTimeControllerPtr ctrl = texProperty->mController; !ctrl.empty(); ctrl = ctrl->mNext)
             {
                 if (!ctrl->isActive())
                     continue;
@@ -1021,7 +1084,7 @@ namespace NifOsg
                         && flipctrl->mInterpolator->recType != Nif::RC_NiFloatInterpolator)
                     {
                         Log(Debug::Error) << "Unsupported interpolator type for NiFlipController " << flipctrl->recIndex
-                                          << " in " << mFilename;
+                                          << " in " << mFilename << ": " << flipctrl->mInterpolator->recName;
                         continue;
                     }
                     std::vector<osg::ref_ptr<osg::Texture2D>> textures;
@@ -1037,17 +1100,16 @@ namespace NifOsg
                         wrapT = inherit->getWrap(osg::Texture2D::WRAP_T);
                     }
 
+                    const unsigned int uvSet = 0;
+                    std::vector<unsigned int> boundTextures; // Dummy list for attachTexture
                     for (const auto& source : flipctrl->mSources)
                     {
                         if (source.empty())
                             continue;
 
-                        osg::ref_ptr<osg::Image> image(handleSourceTexture(source.getPtr(), imageManager));
-                        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D(image));
-                        if (image)
-                            texture->setTextureSize(image->s(), image->t());
-                        texture->setWrap(osg::Texture::WRAP_S, wrapS);
-                        texture->setWrap(osg::Texture::WRAP_T, wrapT);
+                        // NB: not changing the stateset
+                        osg::ref_ptr<osg::Texture2D> texture
+                            = attachNiSourceTexture({}, source.getPtr(), wrapS, wrapT, uvSet, nullptr, boundTextures);
                         textures.push_back(texture);
                     }
                     osg::ref_ptr<FlipController> callback(new FlipController(flipctrl, textures));
@@ -1059,157 +1121,169 @@ namespace NifOsg
             }
         }
 
-        void handleParticlePrograms(Nif::NiParticleModifierPtr affectors, Nif::NiParticleModifierPtr colliders,
+        void handleParticlePrograms(Nif::NiParticleModifierPtr modifier, Nif::NiParticleModifierPtr collider,
             osg::Group* attachTo, osgParticle::ParticleSystem* partsys,
-            osgParticle::ParticleProcessor::ReferenceFrame rf)
+            osgParticle::ParticleProcessor::ReferenceFrame rf) const
         {
             osgParticle::ModularProgram* program = new osgParticle::ModularProgram;
             attachTo->addChild(program);
             program->setParticleSystem(partsys);
             program->setReferenceFrame(rf);
-            for (; !affectors.empty(); affectors = affectors->next)
+            for (; !modifier.empty(); modifier = modifier->mNext)
             {
-                if (affectors->recType == Nif::RC_NiParticleGrowFade)
+                if (modifier->recType == Nif::RC_NiParticleGrowFade)
                 {
-                    const Nif::NiParticleGrowFade* gf = static_cast<const Nif::NiParticleGrowFade*>(affectors.getPtr());
-                    program->addOperator(new GrowFadeAffector(gf->growTime, gf->fadeTime));
+                    const Nif::NiParticleGrowFade* gf = static_cast<const Nif::NiParticleGrowFade*>(modifier.getPtr());
+                    program->addOperator(new GrowFadeAffector(gf->mGrowTime, gf->mFadeTime));
                 }
-                else if (affectors->recType == Nif::RC_NiGravity)
+                else if (modifier->recType == Nif::RC_NiGravity)
                 {
-                    const Nif::NiGravity* gr = static_cast<const Nif::NiGravity*>(affectors.getPtr());
+                    const Nif::NiGravity* gr = static_cast<const Nif::NiGravity*>(modifier.getPtr());
                     program->addOperator(new GravityAffector(gr));
                 }
-                else if (affectors->recType == Nif::RC_NiParticleColorModifier)
+                else if (modifier->recType == Nif::RC_NiParticleBomb)
+                {
+                    auto bomb = static_cast<const Nif::NiParticleBomb*>(modifier.getPtr());
+                    osg::ref_ptr<osgParticle::ModularProgram> bombProgram(new osgParticle::ModularProgram);
+                    attachTo->addChild(bombProgram);
+                    bombProgram->setParticleSystem(partsys);
+                    bombProgram->setReferenceFrame(rf);
+                    bombProgram->setStartTime(bomb->mStartTime);
+                    bombProgram->setLifeTime(bomb->mDuration);
+                    bombProgram->setEndless(false);
+                    bombProgram->addOperator(new ParticleBomb(bomb));
+                }
+                else if (modifier->recType == Nif::RC_NiParticleColorModifier)
                 {
                     const Nif::NiParticleColorModifier* cl
-                        = static_cast<const Nif::NiParticleColorModifier*>(affectors.getPtr());
-                    if (cl->data.empty())
+                        = static_cast<const Nif::NiParticleColorModifier*>(modifier.getPtr());
+                    if (cl->mData.empty())
                         continue;
-                    const Nif::NiColorData* clrdata = cl->data.getPtr();
+                    const Nif::NiColorData* clrdata = cl->mData.getPtr();
                     program->addOperator(new ParticleColorAffector(clrdata));
                 }
-                else if (affectors->recType == Nif::RC_NiParticleRotation)
+                else if (modifier->recType == Nif::RC_NiParticleRotation)
                 {
                     // unused
                 }
                 else
-                    Log(Debug::Info) << "Unhandled particle modifier " << affectors->recName << " in " << mFilename;
+                    Log(Debug::Info) << "Unhandled particle modifier " << modifier->recName << " in " << mFilename;
             }
-            for (; !colliders.empty(); colliders = colliders->next)
+            for (; !collider.empty(); collider = collider->mNext)
             {
-                if (colliders->recType == Nif::RC_NiPlanarCollider)
+                if (collider->recType == Nif::RC_NiPlanarCollider)
                 {
                     const Nif::NiPlanarCollider* planarcollider
-                        = static_cast<const Nif::NiPlanarCollider*>(colliders.getPtr());
+                        = static_cast<const Nif::NiPlanarCollider*>(collider.getPtr());
                     program->addOperator(new PlanarCollider(planarcollider));
                 }
-                else if (colliders->recType == Nif::RC_NiSphericalCollider)
+                else if (collider->recType == Nif::RC_NiSphericalCollider)
                 {
                     const Nif::NiSphericalCollider* sphericalcollider
-                        = static_cast<const Nif::NiSphericalCollider*>(colliders.getPtr());
+                        = static_cast<const Nif::NiSphericalCollider*>(collider.getPtr());
                     program->addOperator(new SphericalCollider(sphericalcollider));
                 }
                 else
-                    Log(Debug::Info) << "Unhandled particle collider " << colliders->recName << " in " << mFilename;
+                    Log(Debug::Info) << "Unhandled particle collider " << collider->recName << " in " << mFilename;
             }
         }
 
         // Load the initial state of the particle system, i.e. the initial particles and their positions, velocity and
         // colors.
-        void handleParticleInitialState(
-            const Nif::Node* nifNode, ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
+        static void handleParticleInitialState(
+            const Nif::NiAVObject* nifNode, ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
         {
             auto particleNode = static_cast<const Nif::NiParticles*>(nifNode);
-            if (particleNode->data.empty() || particleNode->data->recType != Nif::RC_NiParticlesData)
+            if (particleNode->mData.empty())
             {
-                partsys->setQuota(partctrl->numParticles);
+                partsys->setQuota(partctrl->mParticles.size());
                 return;
             }
 
-            auto particledata = static_cast<const Nif::NiParticlesData*>(particleNode->data.getPtr());
-            partsys->setQuota(particledata->numParticles);
+            auto particledata = static_cast<const Nif::NiParticlesData*>(particleNode->mData.getPtr());
+            partsys->setQuota(particledata->mNumParticles);
 
             osg::BoundingBox box;
 
             int i = 0;
-            for (const auto& particle : partctrl->particles)
+            for (const auto& particle : partctrl->mParticles)
             {
-                if (i++ >= particledata->activeCount)
+                if (i++ >= particledata->mActiveCount)
                     break;
 
-                if (particle.lifespan <= 0)
+                if (particle.mLifespan <= 0)
                     continue;
 
-                if (particle.vertex >= particledata->vertices.size())
+                if (particle.mCode >= particledata->mVertices.size())
                     continue;
 
-                ParticleAgeSetter particletemplate(std::max(0.f, particle.lifetime));
+                ParticleAgeSetter particletemplate(std::max(0.f, particle.mAge));
 
                 osgParticle::Particle* created = partsys->createParticle(&particletemplate);
-                created->setLifeTime(particle.lifespan);
+                created->setLifeTime(particle.mLifespan);
 
                 // Note this position and velocity is not correct for a particle system with absolute reference frame,
                 // which can not be done in this loader since we are not attached to the scene yet. Will be fixed up
                 // post-load in the SceneManager.
-                created->setVelocity(particle.velocity);
-                const osg::Vec3f& position = particledata->vertices[particle.vertex];
+                created->setVelocity(particle.mVelocity);
+                const osg::Vec3f& position = particledata->mVertices[particle.mCode];
                 created->setPosition(position);
 
-                created->setColorRange(osgParticle::rangev4(partctrl->color, partctrl->color));
+                created->setColorRange(osgParticle::rangev4(partctrl->mInitialColor, partctrl->mInitialColor));
                 created->setAlphaRange(osgParticle::rangef(1.f, 1.f));
 
-                float size = partctrl->size;
-                if (particle.vertex < particledata->sizes.size())
-                    size *= particledata->sizes[particle.vertex];
+                float size = partctrl->mInitialSize;
+                if (particle.mCode < particledata->mSizes.size())
+                    size *= particledata->mSizes[particle.mCode];
 
                 created->setSizeRange(osgParticle::rangef(size, size));
                 box.expandBy(osg::BoundingSphere(position, size));
             }
 
             // radius may be used to force a larger bounding box
-            box.expandBy(osg::BoundingSphere(osg::Vec3(0, 0, 0), particledata->radius));
+            box.expandBy(osg::BoundingSphere(osg::Vec3(0, 0, 0), particledata->mBoundingSphere.radius()));
 
             partsys->setInitialBound(box);
         }
 
-        osg::ref_ptr<Emitter> handleParticleEmitter(const Nif::NiParticleSystemController* partctrl)
+        static osg::ref_ptr<Emitter> handleParticleEmitter(const Nif::NiParticleSystemController* partctrl)
         {
             std::vector<int> targets;
             if (partctrl->recType == Nif::RC_NiBSPArrayController && !partctrl->emitAtVertex())
             {
-                getAllNiNodes(partctrl->emitter.getPtr(), targets);
+                getAllNiNodes(partctrl->mEmitter.getPtr(), targets);
             }
 
             osg::ref_ptr<Emitter> emitter = new Emitter(targets);
 
             osgParticle::ConstantRateCounter* counter = new osgParticle::ConstantRateCounter;
             if (partctrl->noAutoAdjust())
-                counter->setNumberOfParticlesPerSecondToCreate(partctrl->emitRate);
-            else if (partctrl->lifetime == 0 && partctrl->lifetimeRandom == 0)
+                counter->setNumberOfParticlesPerSecondToCreate(partctrl->mBirthRate);
+            else if (partctrl->mLifetime == 0 && partctrl->mLifetimeVariation == 0)
                 counter->setNumberOfParticlesPerSecondToCreate(0);
             else
                 counter->setNumberOfParticlesPerSecondToCreate(
-                    partctrl->numParticles / (partctrl->lifetime + partctrl->lifetimeRandom / 2));
+                    partctrl->mParticles.size() / (partctrl->mLifetime + partctrl->mLifetimeVariation / 2));
 
             emitter->setCounter(counter);
 
-            ParticleShooter* shooter = new ParticleShooter(partctrl->velocity - partctrl->velocityRandom * 0.5f,
-                partctrl->velocity + partctrl->velocityRandom * 0.5f, partctrl->horizontalDir,
-                partctrl->horizontalAngle, partctrl->verticalDir, partctrl->verticalAngle, partctrl->lifetime,
-                partctrl->lifetimeRandom);
+            ParticleShooter* shooter = new ParticleShooter(partctrl->mSpeed - partctrl->mSpeedVariation * 0.5f,
+                partctrl->mSpeed + partctrl->mSpeedVariation * 0.5f, partctrl->mPlanarAngle,
+                partctrl->mPlanarAngleVariation, partctrl->mDeclination, partctrl->mDeclinationVariation,
+                partctrl->mLifetime, partctrl->mLifetimeVariation);
             emitter->setShooter(shooter);
-            emitter->setFlags(partctrl->flags);
+            emitter->setFlags(partctrl->mFlags);
 
             if (partctrl->recType == Nif::RC_NiBSPArrayController && partctrl->emitAtVertex())
             {
-                emitter->setGeometryEmitterTarget(partctrl->emitter->recIndex);
+                emitter->setGeometryEmitterTarget(partctrl->mEmitter->recIndex);
             }
             else
             {
                 osgParticle::BoxPlacer* placer = new osgParticle::BoxPlacer;
-                placer->setXRange(-partctrl->offsetRandom.x() / 2.f, partctrl->offsetRandom.x() / 2.f);
-                placer->setYRange(-partctrl->offsetRandom.y() / 2.f, partctrl->offsetRandom.y() / 2.f);
-                placer->setZRange(-partctrl->offsetRandom.z() / 2.f, partctrl->offsetRandom.z() / 2.f);
+                placer->setXRange(-partctrl->mEmitterDimensions.x() / 2.f, partctrl->mEmitterDimensions.x() / 2.f);
+                placer->setYRange(-partctrl->mEmitterDimensions.y() / 2.f, partctrl->mEmitterDimensions.y() / 2.f);
+                placer->setZRange(-partctrl->mEmitterDimensions.z() / 2.f, partctrl->mEmitterDimensions.z() / 2.f);
                 emitter->setPlacer(placer);
             }
 
@@ -1243,14 +1317,14 @@ namespace NifOsg
             mEmitterQueue.clear();
         }
 
-        void handleParticleSystem(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
+        void handleParticleSystem(const Nif::NiAVObject* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
             SceneUtil::CompositeStateSetUpdater* composite, int animflags)
         {
             osg::ref_ptr<ParticleSystem> partsys(new ParticleSystem);
             partsys->setSortMode(osgParticle::ParticleSystem::SORT_BACK_TO_FRONT);
 
             const Nif::NiParticleSystemController* partctrl = nullptr;
-            for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
+            for (Nif::NiTimeControllerPtr ctrl = nifNode->mController; !ctrl.empty(); ctrl = ctrl->mNext)
             {
                 if (!ctrl->isActive())
                     continue;
@@ -1278,11 +1352,13 @@ namespace NifOsg
 
             handleParticleInitialState(nifNode, partsys, partctrl);
 
-            partsys->getDefaultParticleTemplate().setSizeRange(osgParticle::rangef(partctrl->size, partctrl->size));
-            partsys->getDefaultParticleTemplate().setColorRange(osgParticle::rangev4(partctrl->color, partctrl->color));
+            partsys->getDefaultParticleTemplate().setSizeRange(
+                osgParticle::rangef(partctrl->mInitialSize, partctrl->mInitialSize));
+            partsys->getDefaultParticleTemplate().setColorRange(
+                osgParticle::rangev4(partctrl->mInitialColor, partctrl->mInitialColor));
             partsys->getDefaultParticleTemplate().setAlphaRange(osgParticle::rangef(1.f, 1.f));
 
-            if (!partctrl->emitter.empty())
+            if (!partctrl->mEmitter.empty())
             {
                 osg::ref_ptr<Emitter> emitter = handleParticleEmitter(partctrl);
                 emitter->setParticleSystem(partsys);
@@ -1291,7 +1367,7 @@ namespace NifOsg
                 // The emitter node may not actually be handled yet, so let's delay attaching the emitter to a later
                 // moment. If the emitter node is placed later than the particle node, it'll have a single frame delay
                 // in particle processing. But that shouldn't be a game-breaking issue.
-                mEmitterQueue.emplace_back(partctrl->emitter->recIndex, emitter);
+                mEmitterQueue.emplace_back(partctrl->mEmitter->recIndex, emitter);
 
                 osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
                 setupController(partctrl, callback, animflags);
@@ -1308,16 +1384,16 @@ namespace NifOsg
                 partsys->update(0.0, nv);
             }
 
-            // affectors should be attached *after* the emitter in the scene graph for correct update order
+            // modifiers should be attached *after* the emitter in the scene graph for correct update order
             // attach to same node as the ParticleSystem, we need osgParticle Operators to get the correct
             // localToWorldMatrix for transforming to particle space
-            handleParticlePrograms(partctrl->affectors, partctrl->colliders, parentNode, partsys.get(), rf);
+            handleParticlePrograms(partctrl->mModifier, partctrl->mCollider, parentNode, partsys.get(), rf);
 
-            std::vector<const Nif::Property*> drawableProps;
+            std::vector<const Nif::NiProperty*> drawableProps;
             collectDrawableProperties(nifNode, parent, drawableProps);
             applyDrawableProperties(parentNode, drawableProps, composite, true, animflags);
 
-            // particle system updater (after the emitters and affectors in the scene graph)
+            // particle system updater (after the emitters and modifiers in the scene graph)
             // I think for correct culling needs to be *before* the ParticleSystem, though osg examples do it the other
             // way
             osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater = new osgParticle::ParticleSystemUpdater;
@@ -1337,78 +1413,34 @@ namespace NifOsg
             }
         }
 
-        void handleNiGeometryData(osg::Geometry* geometry, const Nif::NiGeometryData* data,
-            const std::vector<unsigned int>& boundTextures, const std::string& name)
-        {
-            const auto& vertices = data->vertices;
-            const auto& normals = data->normals;
-            const auto& colors = data->colors;
-            if (!vertices.empty())
-                geometry->setVertexArray(new osg::Vec3Array(vertices.size(), vertices.data()));
-            if (!normals.empty())
-                geometry->setNormalArray(
-                    new osg::Vec3Array(normals.size(), normals.data()), osg::Array::BIND_PER_VERTEX);
-            if (!colors.empty())
-                geometry->setColorArray(new osg::Vec4Array(colors.size(), colors.data()), osg::Array::BIND_PER_VERTEX);
-
-            const auto& uvlist = data->uvlist;
-            int textureStage = 0;
-            for (std::vector<unsigned int>::const_iterator it = boundTextures.begin(); it != boundTextures.end();
-                 ++it, ++textureStage)
-            {
-                unsigned int uvSet = *it;
-                if (uvSet >= uvlist.size())
-                {
-                    Log(Debug::Verbose) << "Out of bounds UV set " << uvSet << " on shape \"" << name << "\" in "
-                                        << mFilename;
-                    if (uvlist.empty())
-                        continue;
-                    uvSet = 0;
-                }
-
-                geometry->setTexCoordArray(textureStage, new osg::Vec2Array(uvlist[uvSet].size(), uvlist[uvSet].data()),
-                    osg::Array::BIND_PER_VERTEX);
-            }
-        }
-
-        void handleNiGeometry(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Geometry* geometry,
+        void handleNiGeometryData(const Nif::NiAVObject* nifNode, const Nif::Parent* parent, osg::Geometry* geometry,
             osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite,
             const std::vector<unsigned int>& boundTextures, int animflags)
         {
             const Nif::NiGeometry* niGeometry = static_cast<const Nif::NiGeometry*>(nifNode);
-            if (niGeometry->data.empty())
+            if (niGeometry->mData.empty())
                 return;
 
             bool hasPartitions = false;
-            if (!niGeometry->skin.empty())
+            if (!niGeometry->mSkin.empty())
             {
-                const Nif::NiSkinInstance* skin = niGeometry->skin.getPtr();
-                const Nif::NiSkinData* data = nullptr;
-                const Nif::NiSkinPartition* partitions = nullptr;
-                if (!skin->data.empty())
-                {
-                    data = skin->data.getPtr();
-                    if (!data->partitions.empty())
-                        partitions = data->partitions.getPtr();
-                }
-                if (!partitions && !skin->partitions.empty())
-                    partitions = skin->partitions.getPtr();
-
+                const Nif::NiSkinInstance* skin = niGeometry->mSkin.getPtr();
+                const Nif::NiSkinPartition* partitions = skin->getPartitions();
                 hasPartitions = partitions != nullptr;
                 if (hasPartitions)
                 {
-                    std::vector<unsigned short> trueTriangles;
                     for (const Nif::NiSkinPartition::Partition& partition : partitions->mPartitions)
                     {
-                        trueTriangles = partition.getTrueTriangles();
+                        const std::vector<unsigned short>& trueTriangles = partition.mTrueTriangles;
                         if (!trueTriangles.empty())
                         {
                             geometry->addPrimitiveSet(new osg::DrawElementsUShort(
                                 osg::PrimitiveSet::TRIANGLES, trueTriangles.size(), trueTriangles.data()));
                         }
-                        const std::vector<std::vector<unsigned short>> trueStrips = partition.getTrueStrips();
-                        for (const auto& strip : trueStrips)
+                        for (const auto& strip : partition.mTrueStrips)
                         {
+                            if (strip.size() < 3)
+                                continue;
                             geometry->addPrimitiveSet(new osg::DrawElementsUShort(
                                 osg::PrimitiveSet::TRIANGLE_STRIP, strip.size(), strip.data()));
                         }
@@ -1416,15 +1448,13 @@ namespace NifOsg
                 }
             }
 
-            const Nif::NiGeometryData* niGeometryData = niGeometry->data.getPtr();
+            const Nif::NiGeometryData* niGeometryData = niGeometry->mData.getPtr();
             if (!hasPartitions)
             {
                 if (niGeometry->recType == Nif::RC_NiTriShape || nifNode->recType == Nif::RC_BSLODTriShape)
                 {
-                    if (niGeometryData->recType != Nif::RC_NiTriShapeData)
-                        return;
                     auto data = static_cast<const Nif::NiTriShapeData*>(niGeometryData);
-                    const std::vector<unsigned short>& triangles = data->triangles;
+                    const std::vector<unsigned short>& triangles = data->mTriangles;
                     if (triangles.empty())
                         return;
                     geometry->addPrimitiveSet(
@@ -1432,11 +1462,9 @@ namespace NifOsg
                 }
                 else if (niGeometry->recType == Nif::RC_NiTriStrips)
                 {
-                    if (niGeometryData->recType != Nif::RC_NiTriStripsData)
-                        return;
                     auto data = static_cast<const Nif::NiTriStripsData*>(niGeometryData);
                     bool hasGeometry = false;
-                    for (const std::vector<unsigned short>& strip : data->strips)
+                    for (const std::vector<unsigned short>& strip : data->mStrips)
                     {
                         if (strip.size() < 3)
                             continue;
@@ -1449,124 +1477,274 @@ namespace NifOsg
                 }
                 else if (niGeometry->recType == Nif::RC_NiLines)
                 {
-                    if (niGeometryData->recType != Nif::RC_NiLinesData)
-                        return;
                     auto data = static_cast<const Nif::NiLinesData*>(niGeometryData);
-                    const auto& line = data->lines;
+                    const auto& line = data->mLines;
                     if (line.empty())
                         return;
                     geometry->addPrimitiveSet(
                         new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, line.size(), line.data()));
                 }
             }
-            handleNiGeometryData(geometry, niGeometryData, boundTextures, nifNode->name);
+
+            const auto& vertices = niGeometryData->mVertices;
+            const auto& normals = niGeometryData->mNormals;
+            const auto& colors = niGeometryData->mColors;
+            if (!vertices.empty())
+                geometry->setVertexArray(new osg::Vec3Array(vertices.size(), vertices.data()));
+            if (!normals.empty())
+                geometry->setNormalArray(
+                    new osg::Vec3Array(normals.size(), normals.data()), osg::Array::BIND_PER_VERTEX);
+            if (!colors.empty())
+                geometry->setColorArray(new osg::Vec4Array(colors.size(), colors.data()), osg::Array::BIND_PER_VERTEX);
+
+            const auto& uvlist = niGeometryData->mUVList;
+            int textureStage = 0;
+            for (std::vector<unsigned int>::const_iterator it = boundTextures.begin(); it != boundTextures.end();
+                 ++it, ++textureStage)
+            {
+                unsigned int uvSet = *it;
+                if (uvSet >= uvlist.size())
+                {
+                    Log(Debug::Verbose) << "Out of bounds UV set " << uvSet << " on shape \"" << nifNode->mName
+                                        << "\" in " << mFilename;
+                    if (uvlist.empty())
+                        continue;
+                    uvSet = 0;
+                }
+
+                geometry->setTexCoordArray(textureStage, new osg::Vec2Array(uvlist[uvSet].size(), uvlist[uvSet].data()),
+                    osg::Array::BIND_PER_VERTEX);
+            }
 
             // osg::Material properties are handled here for two reasons:
             // - if there are no vertex colors, we need to disable colorMode.
             // - there are 3 "overlapping" nif properties that all affect the osg::Material, handling them
             //   above the actual renderable would be tedious.
-            std::vector<const Nif::Property*> drawableProps;
+            std::vector<const Nif::NiProperty*> drawableProps;
             collectDrawableProperties(nifNode, parent, drawableProps);
-            applyDrawableProperties(parentNode, drawableProps, composite, !niGeometryData->colors.empty(), animflags);
+            if (!niGeometry->mShaderProperty.empty())
+                drawableProps.emplace_back(niGeometry->mShaderProperty.getPtr());
+            if (!niGeometry->mAlphaProperty.empty())
+                drawableProps.emplace_back(niGeometry->mAlphaProperty.getPtr());
+            applyDrawableProperties(parentNode, drawableProps, composite, !niGeometryData->mColors.empty(), animflags);
         }
 
-        void handleGeometry(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
+        void handleNiGeometry(const Nif::NiAVObject* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
             SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
             int animflags)
         {
-            assert(isTypeGeometry(nifNode->recType));
+            assert(isTypeNiGeometry(nifNode->recType));
+
             osg::ref_ptr<osg::Geometry> geom(new osg::Geometry);
-            handleNiGeometry(nifNode, parent, geom, parentNode, composite, boundTextures, animflags);
+            handleNiGeometryData(nifNode, parent, geom, parentNode, composite, boundTextures, animflags);
             // If the record had no valid geometry data in it, early-out
             if (geom->empty())
                 return;
-            osg::ref_ptr<osg::Drawable> drawable;
-            for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
+
+            osg::ref_ptr<osg::Drawable> drawable = geom;
+
+            auto niGeometry = static_cast<const Nif::NiGeometry*>(nifNode);
+            if (!niGeometry->mSkin.empty())
+            {
+                osg::ref_ptr<SceneUtil::RigGeometry> rig(new SceneUtil::RigGeometry);
+                rig->setSourceGeometry(geom);
+
+                const Nif::NiSkinInstance* skin = niGeometry->mSkin.getPtr();
+                const Nif::NiSkinData* data = skin->mData.getPtr();
+                const Nif::NiAVObjectList& bones = skin->mBones;
+
+                // Assign bone weights
+                std::vector<SceneUtil::RigGeometry::BoneInfo> boneInfo;
+                std::vector<SceneUtil::RigGeometry::VertexWeights> influences;
+                boneInfo.resize(bones.size());
+                influences.resize(bones.size());
+                for (std::size_t i = 0; i < bones.size(); ++i)
+                {
+                    boneInfo[i].mName = Misc::StringUtils::lowerCase(bones[i].getPtr()->mName);
+                    boneInfo[i].mInvBindMatrix = data->mBones[i].mTransform.toMatrix();
+                    boneInfo[i].mBoundSphere = data->mBones[i].mBoundSphere;
+                    influences[i] = data->mBones[i].mWeights;
+                }
+                rig->setBoneInfo(std::move(boneInfo));
+                rig->setInfluences(influences);
+
+                drawable = rig;
+            }
+
+            for (Nif::NiTimeControllerPtr ctrl = nifNode->mController; !ctrl.empty(); ctrl = ctrl->mNext)
             {
                 if (!ctrl->isActive())
                     continue;
                 if (ctrl->recType == Nif::RC_NiGeomMorpherController)
                 {
-                    const Nif::NiGeomMorpherController* nimorphctrl
-                        = static_cast<const Nif::NiGeomMorpherController*>(ctrl.getPtr());
+                    if (!niGeometry->mSkin.empty())
+                        continue;
+
+                    auto nimorphctrl = static_cast<const Nif::NiGeomMorpherController*>(ctrl.getPtr());
                     if (nimorphctrl->mData.empty())
                         continue;
-                    drawable = handleMorphGeometry(nimorphctrl, geom, parentNode, composite, boundTextures, animflags);
+
+                    const std::vector<Nif::NiMorphData::MorphData>& morphs = nimorphctrl->mData.getPtr()->mMorphs;
+                    if (morphs.empty()
+                        || morphs[0].mVertices.size()
+                            != static_cast<const osg::Vec3Array*>(geom->getVertexArray())->size())
+                        continue;
+
+                    osg::ref_ptr<SceneUtil::MorphGeometry> morphGeom = new SceneUtil::MorphGeometry;
+                    morphGeom->setSourceGeometry(geom);
+                    for (unsigned int i = 0; i < morphs.size(); ++i)
+                        morphGeom->addMorphTarget(
+                            new osg::Vec3Array(morphs[i].mVertices.size(), morphs[i].mVertices.data()), 0.f);
 
                     osg::ref_ptr<GeomMorpherController> morphctrl = new GeomMorpherController(nimorphctrl);
                     setupController(ctrl.getPtr(), morphctrl, animflags);
-                    drawable->setUpdateCallback(morphctrl);
+                    morphGeom->setUpdateCallback(morphctrl);
+
+                    drawable = morphGeom;
                     break;
                 }
             }
-            if (!drawable.get())
-                drawable = geom;
-            drawable->setName(nifNode->name);
+
+            drawable->setName(nifNode->mName);
             parentNode->addChild(drawable);
         }
 
-        osg::ref_ptr<osg::Drawable> handleMorphGeometry(const Nif::NiGeomMorpherController* morpher,
-            osg::ref_ptr<osg::Geometry> sourceGeometry, osg::Node* parentNode,
+        void handleBSGeometry(const Nif::NiAVObject* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
             SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
             int animflags)
         {
-            osg::ref_ptr<SceneUtil::MorphGeometry> morphGeom = new SceneUtil::MorphGeometry;
-            morphGeom->setSourceGeometry(sourceGeometry);
+            assert(isTypeBSGeometry(nifNode->recType));
 
-            const std::vector<Nif::NiMorphData::MorphData>& morphs = morpher->mData.getPtr()->mMorphs;
-            if (morphs.empty())
-                return morphGeom;
-            if (morphs[0].mVertices.size()
-                != static_cast<const osg::Vec3Array*>(sourceGeometry->getVertexArray())->size())
-                return morphGeom;
-            for (unsigned int i = 0; i < morphs.size(); ++i)
-                morphGeom->addMorphTarget(
-                    new osg::Vec3Array(morphs[i].mVertices.size(), morphs[i].mVertices.data()), 0.f);
-
-            return morphGeom;
-        }
-
-        void handleSkinnedGeometry(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
-            SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
-            int animflags)
-        {
-            assert(isTypeGeometry(nifNode->recType));
-            osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
-            handleNiGeometry(nifNode, parent, geometry, parentNode, composite, boundTextures, animflags);
-            if (geometry->empty())
+            auto bsTriShape = static_cast<const Nif::BSTriShape*>(nifNode);
+            const std::vector<unsigned short>& triangles = bsTriShape->mTriangles;
+            if (triangles.empty())
                 return;
-            osg::ref_ptr<SceneUtil::RigGeometry> rig(new SceneUtil::RigGeometry);
-            rig->setSourceGeometry(geometry);
-            rig->setName(nifNode->name);
 
-            // Assign bone weights
-            osg::ref_ptr<SceneUtil::RigGeometry::InfluenceMap> map(new SceneUtil::RigGeometry::InfluenceMap);
+            osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
+            geometry->addPrimitiveSet(
+                new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, triangles.size(), triangles.data()));
 
-            const Nif::NiSkinInstance* skin = static_cast<const Nif::NiGeometry*>(nifNode)->skin.getPtr();
-            const Nif::NiSkinData* data = skin->data.getPtr();
-            const Nif::NodeList& bones = skin->bones;
-            for (std::size_t i = 0, n = bones.size(); i < n; ++i)
-            {
-                std::string boneName = Misc::StringUtils::lowerCase(bones[i].getPtr()->name);
+            osg::ref_ptr<osg::Drawable> drawable = geometry;
 
-                SceneUtil::RigGeometry::BoneInfluence influence;
-                const std::vector<Nif::NiSkinData::VertWeight>& weights = data->bones[i].weights;
-                for (size_t j = 0; j < weights.size(); j++)
+            // Some input geometry may not be used as is so it needs to be converted.
+            // Normals, tangents and bitangents use a special normal map-like format not equivalent to snorm8 or unorm8
+            auto normbyteToFloat = [](uint8_t value) { return value / 255.f * 2.f - 1.f; };
+            // Vertices and UV sets may be half-precision.
+            // OSG doesn't have a way to pass half-precision data at the moment.
+            auto halfToFloat = [](uint16_t value) {
+                uint32_t bits = static_cast<uint32_t>(value & 0x8000) << 16;
+
+                const uint32_t exp16 = (value & 0x7c00) >> 10;
+                uint32_t frac16 = value & 0x3ff;
+                if (exp16)
+                    bits |= (exp16 + 0x70) << 23;
+                else if (frac16)
                 {
-                    influence.mWeights.emplace_back(weights[j].vertex, weights[j].weight);
+                    uint8_t offset = 0;
+                    do
+                    {
+                        ++offset;
+                        frac16 <<= 1;
+                    } while ((frac16 & 0x400) != 0x400);
+                    frac16 &= 0x3ff;
+                    bits |= (0x71 - offset) << 23;
                 }
-                influence.mInvBindMatrix = data->bones[i].trafo.toMatrix();
-                influence.mBoundSphere
-                    = osg::BoundingSpheref(data->bones[i].boundSphereCenter, data->bones[i].boundSphereRadius);
+                bits |= frac16 << 13;
 
-                map->mData.emplace_back(boneName, influence);
+                float result;
+                std::memcpy(&result, &bits, sizeof(float));
+                return result;
+            };
+
+            const bool fullPrec = bsTriShape->mVertDesc.mFlags & Nif::BSVertexDesc::VertexAttribute::Full_Precision;
+            const bool hasVertices = bsTriShape->mVertDesc.mFlags & Nif::BSVertexDesc::VertexAttribute::Vertex;
+            const bool hasNormals = bsTriShape->mVertDesc.mFlags & Nif::BSVertexDesc::VertexAttribute::Normals;
+            const bool hasColors = bsTriShape->mVertDesc.mFlags & Nif::BSVertexDesc::VertexAttribute::Vertex_Colors;
+            const bool hasUV = bsTriShape->mVertDesc.mFlags & Nif::BSVertexDesc::VertexAttribute::UVs;
+
+            std::vector<osg::Vec3f> vertices;
+            std::vector<osg::Vec3f> normals;
+            std::vector<osg::Vec4ub> colors;
+            std::vector<osg::Vec2f> uvlist;
+            for (auto& elem : bsTriShape->mVertData)
+            {
+                if (hasVertices)
+                {
+                    if (fullPrec)
+                        vertices.emplace_back(elem.mVertex.x(), elem.mVertex.y(), elem.mVertex.z());
+                    else
+                        vertices.emplace_back(halfToFloat(elem.mHalfVertex[0]), halfToFloat(elem.mHalfVertex[1]),
+                            halfToFloat(elem.mHalfVertex[2]));
+                }
+                if (hasNormals)
+                    normals.emplace_back(normbyteToFloat(elem.mNormal[0]), normbyteToFloat(elem.mNormal[1]),
+                        normbyteToFloat(elem.mNormal[2]));
+                if (hasColors)
+                    colors.emplace_back(elem.mVertColor[0], elem.mVertColor[1], elem.mVertColor[2], elem.mVertColor[3]);
+                if (hasUV)
+                    uvlist.emplace_back(halfToFloat(elem.mUV[0]), 1.0 - halfToFloat(elem.mUV[1]));
             }
-            rig->setInfluenceMap(map);
 
-            parentNode->addChild(rig);
+            if (!vertices.empty())
+                geometry->setVertexArray(new osg::Vec3Array(vertices.size(), vertices.data()));
+            if (!normals.empty())
+                geometry->setNormalArray(
+                    new osg::Vec3Array(normals.size(), normals.data()), osg::Array::BIND_PER_VERTEX);
+            if (!colors.empty())
+                geometry->setColorArray(
+                    new osg::Vec4ubArray(colors.size(), colors.data()), osg::Array::BIND_PER_VERTEX);
+            if (!uvlist.empty())
+                geometry->setTexCoordArray(
+                    0, new osg::Vec2Array(uvlist.size(), uvlist.data()), osg::Array::BIND_PER_VERTEX);
+
+            // This is the skinning data Fallout 4 provides
+            // TODO: support Skyrim SE skinning data
+            if (!bsTriShape->mSkin.empty() && bsTriShape->mSkin->recType == Nif::RC_BSSkinInstance
+                && bsTriShape->mVertDesc.mFlags & Nif::BSVertexDesc::VertexAttribute::Skinned)
+            {
+                osg::ref_ptr<SceneUtil::RigGeometry> rig(new SceneUtil::RigGeometry);
+                rig->setSourceGeometry(std::move(geometry));
+
+                const Nif::BSSkinInstance* skin = static_cast<const Nif::BSSkinInstance*>(bsTriShape->mSkin.getPtr());
+                const Nif::BSSkinBoneData* data = skin->mData.getPtr();
+                const Nif::NiAVObjectList& bones = skin->mBones;
+
+                std::vector<SceneUtil::RigGeometry::BoneInfo> boneInfo;
+                std::vector<SceneUtil::RigGeometry::BoneWeights> influences;
+                boneInfo.resize(bones.size());
+                influences.resize(vertices.size());
+                for (std::size_t i = 0; i < bones.size(); ++i)
+                {
+                    boneInfo[i].mName = Misc::StringUtils::lowerCase(bones[i].getPtr()->mName);
+                    boneInfo[i].mInvBindMatrix = data->mBones[i].mTransform.toMatrix();
+                    boneInfo[i].mBoundSphere = data->mBones[i].mBoundSphere;
+                }
+
+                for (size_t i = 0; i < vertices.size(); i++)
+                {
+                    const Nif::BSVertexData& vertData = bsTriShape->mVertData[i];
+                    for (int j = 0; j < 4; j++)
+                        influences[i].emplace_back(vertData.mBoneIndices[j], halfToFloat(vertData.mBoneWeights[j]));
+                }
+                rig->setBoneInfo(std::move(boneInfo));
+                rig->setInfluences(influences);
+
+                drawable = rig;
+            }
+
+            std::vector<const Nif::NiProperty*> drawableProps;
+            collectDrawableProperties(nifNode, parent, drawableProps);
+            if (!bsTriShape->mShaderProperty.empty())
+                drawableProps.emplace_back(bsTriShape->mShaderProperty.getPtr());
+            if (!bsTriShape->mAlphaProperty.empty())
+                drawableProps.emplace_back(bsTriShape->mAlphaProperty.getPtr());
+            applyDrawableProperties(parentNode, drawableProps, composite, !colors.empty(), animflags);
+
+            drawable->setName(nifNode->mName);
+            parentNode->addChild(drawable);
         }
 
-        osg::BlendFunc::BlendFuncMode getBlendMode(int mode)
+        osg::BlendFunc::BlendFuncMode getBlendMode(int mode) const
         {
             switch (mode)
             {
@@ -1598,7 +1776,7 @@ namespace NifOsg
             }
         }
 
-        osg::AlphaFunc::ComparisonFunction getTestMode(int mode)
+        osg::AlphaFunc::ComparisonFunction getTestMode(int mode) const
         {
             switch (mode)
             {
@@ -1624,121 +1802,130 @@ namespace NifOsg
             }
         }
 
-        osg::Stencil::Function getStencilFunction(int func)
+        osg::Stencil::Function getStencilFunction(Nif::NiStencilProperty::TestFunc func) const
         {
+            using TestFunc = Nif::NiStencilProperty::TestFunc;
             switch (func)
             {
-                case 0:
+                case TestFunc::Never:
                     return osg::Stencil::NEVER;
-                case 1:
+                case TestFunc::Less:
                     return osg::Stencil::LESS;
-                case 2:
+                case TestFunc::Equal:
                     return osg::Stencil::EQUAL;
-                case 3:
+                case TestFunc::LessEqual:
                     return osg::Stencil::LEQUAL;
-                case 4:
+                case TestFunc::Greater:
                     return osg::Stencil::GREATER;
-                case 5:
+                case TestFunc::NotEqual:
                     return osg::Stencil::NOTEQUAL;
-                case 6:
+                case TestFunc::GreaterEqual:
                     return osg::Stencil::GEQUAL;
-                case 7:
+                case TestFunc::Always:
                     return osg::Stencil::ALWAYS;
                 default:
-                    Log(Debug::Info) << "Unexpected stencil function: " << func << " in " << mFilename;
+                    Log(Debug::Info) << "Unexpected stencil function: " << static_cast<uint32_t>(func) << " in "
+                                     << mFilename;
                     return osg::Stencil::NEVER;
             }
         }
 
-        osg::Stencil::Operation getStencilOperation(int op)
+        osg::Stencil::Operation getStencilOperation(Nif::NiStencilProperty::Action op) const
         {
+            using Action = Nif::NiStencilProperty::Action;
             switch (op)
             {
-                case 0:
+                case Action::Keep:
                     return osg::Stencil::KEEP;
-                case 1:
+                case Action::Zero:
                     return osg::Stencil::ZERO;
-                case 2:
+                case Action::Replace:
                     return osg::Stencil::REPLACE;
-                case 3:
+                case Action::Increment:
                     return osg::Stencil::INCR;
-                case 4:
+                case Action::Decrement:
                     return osg::Stencil::DECR;
-                case 5:
+                case Action::Invert:
                     return osg::Stencil::INVERT;
                 default:
-                    Log(Debug::Info) << "Unexpected stencil operation: " << op << " in " << mFilename;
+                    Log(Debug::Info) << "Unexpected stencil operation: " << static_cast<uint32_t>(op) << " in "
+                                     << mFilename;
                     return osg::Stencil::KEEP;
             }
         }
 
-        osg::ref_ptr<osg::Image> handleInternalTexture(const Nif::NiPixelData* pixelData)
+        osg::ref_ptr<osg::Image> handleInternalTexture(const Nif::NiPixelData* pixelData) const
         {
-            osg::ref_ptr<osg::Image> image(new osg::Image);
+            if (pixelData->mMipmaps.empty())
+                return nullptr;
 
-            // Pixel row alignment, defining it to be consistent with OSG DDS plugin
-            int packing = 1;
+            // Not fatal, but warn the user
+            if (pixelData->mNumFaces != 1)
+                Log(Debug::Info) << "Unsupported multifaceted internal texture in " << mFilename;
+
+            using Nif::NiPixelFormat;
+            NiPixelFormat niPixelFormat = pixelData->mPixelFormat;
             GLenum pixelformat = 0;
-            switch (pixelData->fmt)
+            // Pixel row alignment. Defining it to be consistent with OSG DDS plugin
+            int packing = 1;
+            switch (niPixelFormat.mFormat)
             {
-                case Nif::NiPixelData::NIPXFMT_RGB8:
+                case NiPixelFormat::Format::RGB:
                     pixelformat = GL_RGB;
                     break;
-                case Nif::NiPixelData::NIPXFMT_RGBA8:
+                case NiPixelFormat::Format::RGBA:
                     pixelformat = GL_RGBA;
                     break;
-                case Nif::NiPixelData::NIPXFMT_PAL8:
-                case Nif::NiPixelData::NIPXFMT_PALA8:
+                case NiPixelFormat::Format::Palette:
+                case NiPixelFormat::Format::PaletteAlpha:
                     pixelformat = GL_RED; // Each color is defined by a byte.
                     break;
-                case Nif::NiPixelData::NIPXFMT_BGR8:
+                case NiPixelFormat::Format::BGR:
                     pixelformat = GL_BGR;
                     break;
-                case Nif::NiPixelData::NIPXFMT_BGRA8:
+                case NiPixelFormat::Format::BGRA:
                     pixelformat = GL_BGRA;
                     break;
-                case Nif::NiPixelData::NIPXFMT_DXT1:
+                case NiPixelFormat::Format::DXT1:
                     pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
                     packing = 2;
                     break;
-                case Nif::NiPixelData::NIPXFMT_DXT3:
+                case NiPixelFormat::Format::DXT3:
                     pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
                     packing = 4;
                     break;
-                case Nif::NiPixelData::NIPXFMT_DXT5:
+                case NiPixelFormat::Format::DXT5:
                     pixelformat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
                     packing = 4;
                     break;
                 default:
-                    Log(Debug::Info) << "Unhandled internal pixel format " << pixelData->fmt << " in " << mFilename;
+                    Log(Debug::Info) << "Unhandled internal pixel format "
+                                     << static_cast<uint32_t>(niPixelFormat.mFormat) << " in " << mFilename;
                     return nullptr;
             }
 
-            if (pixelData->mipmaps.empty())
-                return nullptr;
-
             int width = 0;
             int height = 0;
 
-            std::vector<unsigned int> mipmapVector;
-            for (unsigned int i = 0; i < pixelData->mipmaps.size(); ++i)
+            std::vector<unsigned int> mipmapOffsets;
+            for (unsigned int i = 0; i < pixelData->mMipmaps.size(); ++i)
             {
-                const Nif::NiPixelData::Mipmap& mip = pixelData->mipmaps[i];
+                const Nif::NiPixelData::Mipmap& mip = pixelData->mMipmaps[i];
 
                 size_t mipSize = osg::Image::computeImageSizeInBytes(
-                    mip.width, mip.height, 1, pixelformat, GL_UNSIGNED_BYTE, packing);
-                if (mipSize + mip.dataOffset > pixelData->data.size())
+                    mip.mWidth, mip.mHeight, 1, pixelformat, GL_UNSIGNED_BYTE, packing);
+                if (mipSize + mip.mOffset > pixelData->mData.size())
                 {
                     Log(Debug::Info) << "Internal texture's mipmap data out of bounds, ignoring texture";
                     return nullptr;
                 }
 
                 if (i != 0)
-                    mipmapVector.push_back(mip.dataOffset);
+                    mipmapOffsets.push_back(mip.mOffset);
                 else
                 {
-                    width = mip.width;
-                    height = mip.height;
+                    width = mip.mWidth;
+                    height = mip.mHeight;
                 }
             }
 
@@ -1748,16 +1935,17 @@ namespace NifOsg
                 return nullptr;
             }
 
-            const std::vector<unsigned char>& pixels = pixelData->data;
-            switch (pixelData->fmt)
+            osg::ref_ptr<osg::Image> image(new osg::Image);
+            const std::vector<unsigned char>& pixels = pixelData->mData;
+            switch (niPixelFormat.mFormat)
             {
-                case Nif::NiPixelData::NIPXFMT_RGB8:
-                case Nif::NiPixelData::NIPXFMT_RGBA8:
-                case Nif::NiPixelData::NIPXFMT_BGR8:
-                case Nif::NiPixelData::NIPXFMT_BGRA8:
-                case Nif::NiPixelData::NIPXFMT_DXT1:
-                case Nif::NiPixelData::NIPXFMT_DXT3:
-                case Nif::NiPixelData::NIPXFMT_DXT5:
+                case NiPixelFormat::Format::RGB:
+                case NiPixelFormat::Format::RGBA:
+                case NiPixelFormat::Format::BGR:
+                case NiPixelFormat::Format::BGRA:
+                case NiPixelFormat::Format::DXT1:
+                case NiPixelFormat::Format::DXT3:
+                case NiPixelFormat::Format::DXT5:
                 {
                     unsigned char* data = new unsigned char[pixels.size()];
                     memcpy(data, pixels.data(), pixels.size());
@@ -1765,18 +1953,18 @@ namespace NifOsg
                         osg::Image::USE_NEW_DELETE, packing);
                     break;
                 }
-                case Nif::NiPixelData::NIPXFMT_PAL8:
-                case Nif::NiPixelData::NIPXFMT_PALA8:
+                case NiPixelFormat::Format::Palette:
+                case NiPixelFormat::Format::PaletteAlpha:
                 {
-                    if (pixelData->palette.empty() || pixelData->bpp != 8)
+                    if (pixelData->mPalette.empty() || niPixelFormat.mBitsPerPixel != 8)
                     {
                         Log(Debug::Info) << "Palettized texture in " << mFilename << " is invalid, ignoring";
                         return nullptr;
                     }
-                    pixelformat = pixelData->fmt == Nif::NiPixelData::NIPXFMT_PAL8 ? GL_RGB : GL_RGBA;
+                    pixelformat = niPixelFormat.mFormat == NiPixelFormat::Format::PaletteAlpha ? GL_RGBA : GL_RGB;
                     // We're going to convert the indices that pixel data contains
                     // into real colors using the palette.
-                    const auto& palette = pixelData->palette->colors;
+                    const auto& palette = pixelData->mPalette->mColors;
                     const int numChannels = pixelformat == GL_RGBA ? 4 : 3;
                     unsigned char* data = new unsigned char[pixels.size() * numChannels];
                     unsigned char* pixel = data;
@@ -1785,7 +1973,7 @@ namespace NifOsg
                         memcpy(pixel, &palette[index], sizeof(unsigned char) * numChannels);
                         pixel += numChannels;
                     }
-                    for (unsigned int& offset : mipmapVector)
+                    for (unsigned int& offset : mipmapOffsets)
                         offset *= numChannels;
                     image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data,
                         osg::Image::USE_NEW_DELETE, packing);
@@ -1795,13 +1983,13 @@ namespace NifOsg
                     return nullptr;
             }
 
-            image->setMipmapLevels(mipmapVector);
+            image->setMipmapLevels(mipmapOffsets);
             image->flipVertical();
 
             return image;
         }
 
-        osg::ref_ptr<osg::TexEnvCombine> createEmissiveTexEnv()
+        static osg::ref_ptr<osg::TexEnvCombine> createEmissiveTexEnv()
         {
             osg::ref_ptr<osg::TexEnvCombine> texEnv(new osg::TexEnvCombine);
             // Sum the previous colour and the emissive colour.
@@ -1815,35 +2003,59 @@ namespace NifOsg
             return texEnv;
         }
 
+        static void handleDepthFlags(osg::StateSet* stateset, bool depthTest, bool depthWrite)
+        {
+            if (!depthWrite && !depthTest)
+            {
+                stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+                return;
+            }
+            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
+            depth->setWriteMask(depthWrite);
+            if (!depthTest)
+                depth->setFunction(osg::Depth::ALWAYS);
+            depth = shareAttribute(depth);
+            stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+        }
+
         void handleTextureProperty(const Nif::NiTexturingProperty* texprop, const std::string& nodeName,
             osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite,
-            Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
+            std::vector<unsigned int>& boundTextures, int animflags) const
         {
-            if (!boundTextures.empty())
-            {
-                // overriding a parent NiTexturingProperty, so remove what was previously bound
-                for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                boundTextures.clear();
-            }
+            // overriding a parent NiTexturingProperty, so remove what was previously bound
+            clearBoundTextures(stateset, boundTextures);
 
             // If this loop is changed such that the base texture isn't guaranteed to end up in texture unit 0, the
             // shadow casting shader will need to be updated accordingly.
-            for (size_t i = 0; i < texprop->textures.size(); ++i)
+            for (size_t i = 0; i < texprop->mTextures.size(); ++i)
             {
-                if (texprop->textures[i].inUse
-                    || (i == Nif::NiTexturingProperty::BaseTexture && !texprop->controller.empty()))
+                const Nif::NiTexturingProperty::Texture& tex = texprop->mTextures[i];
+                if (tex.mEnabled || (i == Nif::NiTexturingProperty::BaseTexture && !texprop->mController.empty()))
                 {
+                    std::string textureName;
                     switch (i)
                     {
                         // These are handled later on
                         case Nif::NiTexturingProperty::BaseTexture:
+                            textureName = "diffuseMap";
+                            break;
                         case Nif::NiTexturingProperty::GlowTexture:
+                            textureName = "emissiveMap";
+                            break;
                         case Nif::NiTexturingProperty::DarkTexture:
+                            textureName = "darkMap";
+                            break;
                         case Nif::NiTexturingProperty::BumpTexture:
+                            textureName = "bumpMap";
+                            break;
                         case Nif::NiTexturingProperty::DetailTexture:
+                            textureName = "detailMap";
+                            break;
                         case Nif::NiTexturingProperty::DecalTexture:
+                            textureName = "decalMap";
+                            break;
                         case Nif::NiTexturingProperty::GlossTexture:
+                            textureName = "glossMap";
                             break;
                         default:
                         {
@@ -1853,13 +2065,10 @@ namespace NifOsg
                         }
                     }
 
-                    unsigned int uvSet = 0;
-                    // create a new texture, will later attempt to share using the SharedStateManager
-                    osg::ref_ptr<osg::Texture2D> texture2d;
-                    if (texprop->textures[i].inUse)
+                    const unsigned int texUnit = boundTextures.size();
+                    if (tex.mEnabled)
                     {
-                        const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i];
-                        if (tex.texture.empty() && texprop->controller.empty())
+                        if (tex.mSourceTexture.empty() && texprop->mController.empty())
                         {
                             if (i == 0)
                                 Log(Debug::Warning) << "Base texture is in use but empty on shape \"" << nodeName
@@ -1867,33 +2076,19 @@ namespace NifOsg
                             continue;
                         }
 
-                        if (!tex.texture.empty())
-                        {
-                            const Nif::NiSourceTexture* st = tex.texture.getPtr();
-                            osg::ref_ptr<osg::Image> image = handleSourceTexture(st, imageManager);
-                            texture2d = new osg::Texture2D(image);
-                            if (image)
-                                texture2d->setTextureSize(image->s(), image->t());
-                        }
+                        if (!tex.mSourceTexture.empty())
+                            attachNiSourceTexture(textureName, tex.mSourceTexture.getPtr(), tex.wrapS(), tex.wrapT(),
+                                tex.mUVSet, stateset, boundTextures);
                         else
-                            texture2d = new osg::Texture2D;
-
-                        handleTextureWrapping(texture2d, tex.wrapS(), tex.wrapT());
-
-                        uvSet = tex.uvSet;
+                            attachTexture(
+                                textureName, nullptr, tex.wrapS(), tex.wrapT(), tex.mUVSet, stateset, boundTextures);
                     }
                     else
                     {
                         // Texture only comes from NiFlipController, so tex is ignored, set defaults
-                        texture2d = new osg::Texture2D;
-                        handleTextureWrapping(texture2d, true, true);
-                        uvSet = 0;
+                        attachTexture(textureName, nullptr, true, true, 0, stateset, boundTextures);
                     }
 
-                    unsigned int texUnit = boundTextures.size();
-
-                    stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-
                     if (i == Nif::NiTexturingProperty::GlowTexture)
                     {
                         stateset->setTextureAttributeAndModes(texUnit, createEmissiveTexEnv(), osg::StateAttribute::ON);
@@ -1928,10 +2123,10 @@ namespace NifOsg
                         // Bump maps offset the environment map.
                         // Set this texture to Off by default since we can't render it with the fixed-function pipeline
                         stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                        osg::Matrix2 bumpMapMatrix(texprop->bumpMapMatrix.x(), texprop->bumpMapMatrix.y(),
-                            texprop->bumpMapMatrix.z(), texprop->bumpMapMatrix.w());
+                        osg::Matrix2 bumpMapMatrix(texprop->mBumpMapMatrix.x(), texprop->mBumpMapMatrix.y(),
+                            texprop->mBumpMapMatrix.z(), texprop->mBumpMapMatrix.w());
                         stateset->addUniform(new osg::Uniform("bumpMapMatrix", bumpMapMatrix));
-                        stateset->addUniform(new osg::Uniform("envMapLumaBias", texprop->envMapLumaBias));
+                        stateset->addUniform(new osg::Uniform("envMapLumaBias", texprop->mEnvMapLumaBias));
                     }
                     else if (i == Nif::NiTexturingProperty::GlossTexture)
                     {
@@ -1961,62 +2156,184 @@ namespace NifOsg
                         texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
-
-                    switch (i)
-                    {
-                        case Nif::NiTexturingProperty::BaseTexture:
-                            texture2d->setName("diffuseMap");
-                            break;
-                        case Nif::NiTexturingProperty::BumpTexture:
-                            texture2d->setName("bumpMap");
-                            break;
-                        case Nif::NiTexturingProperty::GlowTexture:
-                            texture2d->setName("emissiveMap");
-                            break;
-                        case Nif::NiTexturingProperty::DarkTexture:
-                            texture2d->setName("darkMap");
-                            break;
-                        case Nif::NiTexturingProperty::DetailTexture:
-                            texture2d->setName("detailMap");
-                            break;
-                        case Nif::NiTexturingProperty::DecalTexture:
-                            texture2d->setName("decalMap");
-                            break;
-                        case Nif::NiTexturingProperty::GlossTexture:
-                            texture2d->setName("glossMap");
-                            break;
-                        default:
-                            break;
-                    }
-
-                    boundTextures.push_back(uvSet);
                 }
             }
-            handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+            handleTextureControllers(texprop, composite, stateset, animflags);
         }
 
-        void handleTextureSet(const Nif::BSShaderTextureSet* textureSet, unsigned int clamp,
-            const std::string& nodeName, osg::StateSet* stateset, Resource::ImageManager* imageManager,
-            std::vector<unsigned int>& boundTextures)
+        static Bgsm::MaterialFilePtr getShaderMaterial(
+            std::string_view path, Resource::BgsmFileManager* materialManager)
         {
-            if (!boundTextures.empty())
+            if (!materialManager)
+                return nullptr;
+
+            if (!Misc::StringUtils::ciEndsWith(path, ".bgem") && !Misc::StringUtils::ciEndsWith(path, ".bgsm"))
+                return nullptr;
+
+            std::string normalizedPath = Misc::ResourceHelpers::correctMaterialPath(path, materialManager->getVFS());
+            try
             {
-                for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                boundTextures.clear();
+                return materialManager->get(VFS::Path::Normalized(normalizedPath));
+            }
+            catch (std::exception& e)
+            {
+                Log(Debug::Error) << "Failed to load shader material: " << e.what();
+                return nullptr;
+            }
+        }
+
+        void handleShaderMaterialNodeProperties(
+            const Bgsm::MaterialFile* material, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures) const
+        {
+            const unsigned int uvSet = 0;
+            const bool wrapS = material->wrapS();
+            const bool wrapT = material->wrapT();
+            if (material->mShaderType == Bgsm::ShaderType::Lighting)
+            {
+                const Bgsm::BGSMFile* bgsm = static_cast<const Bgsm::BGSMFile*>(material);
+
+                if (!bgsm->mDiffuseMap.empty())
+                    attachExternalTexture(
+                        "diffuseMap", bgsm->mDiffuseMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                if (!bgsm->mNormalMap.empty())
+                    attachExternalTexture("normalMap", bgsm->mNormalMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                if (bgsm->mGlowMapEnabled && !bgsm->mGlowMap.empty())
+                    attachExternalTexture("emissiveMap", bgsm->mGlowMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                if (bgsm->mTree)
+                    stateset->addUniform(new osg::Uniform("useTreeAnim", true));
+            }
+            else if (material->mShaderType == Bgsm::ShaderType::Effect)
+            {
+                const Bgsm::BGEMFile* bgem = static_cast<const Bgsm::BGEMFile*>(material);
+
+                if (!bgem->mBaseMap.empty())
+                    attachExternalTexture("diffuseMap", bgem->mBaseMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                bool useFalloff = bgem->mFalloff;
+                stateset->addUniform(new osg::Uniform("useFalloff", useFalloff));
+                if (useFalloff)
+                    stateset->addUniform(new osg::Uniform("falloffParams", bgem->mFalloffParams));
             }
 
+            if (material->mTwoSided)
+                stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+            handleDepthFlags(stateset, material->mDepthTest, material->mDepthWrite);
+        }
+
+        void handleDecal(bool enabled, bool hasSortAlpha, osg::Node& node) const
+        {
+            if (!enabled)
+                return;
+            osg::ref_ptr<osg::StateSet> stateset = node.getOrCreateStateSet();
+            osg::ref_ptr<osg::PolygonOffset> polygonOffset(new osg::PolygonOffset);
+            polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f);
+            polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 0.65f : -0.65f);
+            polygonOffset = shareAttribute(polygonOffset);
+            stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
+            if (!mPushedSorter && !hasSortAlpha)
+                stateset->setRenderBinDetails(1, "SORT_BACK_TO_FRONT");
+        }
+
+        static void handleAlphaTesting(
+            bool enabled, osg::AlphaFunc::ComparisonFunction function, int threshold, osg::Node& node)
+        {
+            if (enabled)
+            {
+                osg::ref_ptr<osg::AlphaFunc> alphaFunc(new osg::AlphaFunc(function, threshold / 255.f));
+                alphaFunc = shareAttribute(alphaFunc);
+                node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+            }
+            else if (osg::StateSet* stateset = node.getStateSet())
+            {
+                stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
+                stateset->removeMode(GL_ALPHA_TEST);
+            }
+        }
+
+        void handleAlphaBlending(
+            bool enabled, int sourceMode, int destMode, bool sort, bool& hasSortAlpha, osg::Node& node) const
+        {
+            if (enabled)
+            {
+                osg::ref_ptr<osg::StateSet> stateset = node.getOrCreateStateSet();
+                osg::ref_ptr<osg::BlendFunc> blendFunc(
+                    new osg::BlendFunc(getBlendMode(sourceMode), getBlendMode(destMode)));
+                // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
+                // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
+                // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
+                if (blendFunc->getDestination() == GL_DST_ALPHA)
+                    blendFunc->setDestination(GL_ONE);
+                blendFunc = shareAttribute(blendFunc);
+                stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+
+                if (sort)
+                {
+                    hasSortAlpha = true;
+                    if (!mPushedSorter)
+                        stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+                }
+                else if (!mPushedSorter)
+                {
+                    stateset->setRenderBinToInherit();
+                }
+            }
+            else if (osg::ref_ptr<osg::StateSet> stateset = node.getStateSet())
+            {
+                stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
+                stateset->removeMode(GL_BLEND);
+                if (!mPushedSorter)
+                    stateset->setRenderBinToInherit();
+            }
+        }
+
+        void handleShaderMaterialDrawableProperties(const Bgsm::MaterialFile* shaderMat,
+            osg::ref_ptr<osg::Material> mat, osg::Node& node, bool& hasSortAlpha) const
+        {
+            mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderMat->mTransparency);
+            handleAlphaTesting(shaderMat->mAlphaTest, osg::AlphaFunc::GREATER, shaderMat->mAlphaTestThreshold, node);
+            handleAlphaBlending(shaderMat->mAlphaBlend, shaderMat->mSourceBlendMode, shaderMat->mDestinationBlendMode,
+                true, hasSortAlpha, node);
+            handleDecal(shaderMat->mDecal, hasSortAlpha, node);
+            if (shaderMat->mShaderType == Bgsm::ShaderType::Lighting)
+            {
+                auto bgsm = static_cast<const Bgsm::BGSMFile*>(shaderMat);
+                mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgsm->mEmittanceColor, 1.f));
+                mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgsm->mSpecularColor, 1.f));
+            }
+            else if (shaderMat->mShaderType == Bgsm::ShaderType::Effect)
+            {
+                auto bgem = static_cast<const Bgsm::BGEMFile*>(shaderMat);
+                mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgem->mEmittanceColor, 1.f));
+                if (bgem->mSoft)
+                    SceneUtil::setupSoftEffect(node, bgem->mSoftDepth, true, bgem->mSoftDepth);
+            }
+        }
+
+        void handleTextureSet(const Nif::BSShaderTextureSet* textureSet, bool wrapS, bool wrapT,
+            const std::string& nodeName, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures) const
+        {
             const unsigned int uvSet = 0;
 
-            for (size_t i = 0; i < textureSet->textures.size(); ++i)
+            for (size_t i = 0; i < textureSet->mTextures.size(); ++i)
             {
-                if (textureSet->textures[i].empty())
+                if (textureSet->mTextures[i].empty())
                     continue;
-                switch (i)
+                switch (static_cast<Nif::BSShaderTextureSet::TextureType>(i))
                 {
-                    case Nif::BSShaderTextureSet::TextureType_Base:
-                    case Nif::BSShaderTextureSet::TextureType_Normal:
-                    case Nif::BSShaderTextureSet::TextureType_Glow:
+                    case Nif::BSShaderTextureSet::TextureType::Base:
+                        attachExternalTexture(
+                            "diffuseMap", textureSet->mTextures[i], wrapS, wrapT, uvSet, stateset, boundTextures);
+                        break;
+                    case Nif::BSShaderTextureSet::TextureType::Normal:
+                        attachExternalTexture(
+                            "normalMap", textureSet->mTextures[i], wrapS, wrapT, uvSet, stateset, boundTextures);
+                        break;
+                    case Nif::BSShaderTextureSet::TextureType::Glow:
+                        attachExternalTexture(
+                            "emissiveMap", textureSet->mTextures[i], wrapS, wrapT, uvSet, stateset, boundTextures);
                         break;
                     default:
                     {
@@ -2025,29 +2342,6 @@ namespace NifOsg
                         continue;
                     }
                 }
-                std::string filename
-                    = Misc::ResourceHelpers::correctTexturePath(textureSet->textures[i], imageManager->getVFS());
-                osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
-                osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
-                if (image)
-                    texture2d->setTextureSize(image->s(), image->t());
-                handleTextureWrapping(texture2d, (clamp >> 1) & 0x1, clamp & 0x1);
-                unsigned int texUnit = boundTextures.size();
-                stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-                // BSShaderTextureSet presence means there's no need for FFP support for the affected node
-                switch (i)
-                {
-                    case Nif::BSShaderTextureSet::TextureType_Base:
-                        texture2d->setName("diffuseMap");
-                        break;
-                    case Nif::BSShaderTextureSet::TextureType_Normal:
-                        texture2d->setName("normalMap");
-                        break;
-                    case Nif::BSShaderTextureSet::TextureType_Glow:
-                        texture2d->setName("emissiveMap");
-                        break;
-                }
-                boundTextures.emplace_back(uvSet);
             }
         }
 
@@ -2098,6 +2392,7 @@ namespace NifOsg
                 case Nif::BSLightingShaderType::ShaderType_LODNoise:
                 case Nif::BSLightingShaderType::ShaderType_MultitexLandLODBlend:
                 case Nif::BSLightingShaderType::ShaderType_Dismemberment:
+                case Nif::BSLightingShaderType::ShaderType_Terrain:
                     Log(Debug::Warning) << "Unhandled BSLightingShaderType " << type << " in " << mFilename;
                     return "bs/default";
             }
@@ -2105,23 +2400,26 @@ namespace NifOsg
             return "bs/default";
         }
 
-        void handleProperty(const Nif::Property* property, osg::Node* node,
-            SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager,
-            std::vector<unsigned int>& boundTextures, int animflags, bool hasStencilProperty)
+        void handleProperty(const Nif::NiProperty* property, osg::Node* node,
+            SceneUtil::CompositeStateSetUpdater* composite, std::vector<unsigned int>& boundTextures, int animflags,
+            bool hasStencilProperty)
         {
             switch (property->recType)
             {
                 case Nif::RC_NiStencilProperty:
                 {
                     const Nif::NiStencilProperty* stencilprop = static_cast<const Nif::NiStencilProperty*>(property);
+
                     osg::ref_ptr<osg::FrontFace> frontFace = new osg::FrontFace;
-                    switch (stencilprop->data.drawMode)
+                    using DrawMode = Nif::NiStencilProperty::DrawMode;
+                    switch (stencilprop->mDrawMode)
                     {
-                        case 2:
+                        case DrawMode::Clockwise:
                             frontFace->setMode(osg::FrontFace::CLOCKWISE);
                             break;
-                        case 0:
-                        case 1:
+                        case DrawMode::Default:
+                        case DrawMode::CounterClockwise:
+                        case DrawMode::Both:
                         default:
                             frontFace->setMode(osg::FrontFace::COUNTER_CLOCKWISE);
                             break;
@@ -2130,20 +2428,20 @@ namespace NifOsg
 
                     osg::StateSet* stateset = node->getOrCreateStateSet();
                     stateset->setAttribute(frontFace, osg::StateAttribute::ON);
-                    stateset->setMode(GL_CULL_FACE,
-                        stencilprop->data.drawMode == 3 ? osg::StateAttribute::OFF : osg::StateAttribute::ON);
+                    if (stencilprop->mDrawMode == DrawMode::Both)
+                        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+                    else
+                        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
 
-                    if (stencilprop->data.enabled != 0)
+                    if (stencilprop->mEnabled)
                     {
                         mHasStencilProperty = true;
                         osg::ref_ptr<osg::Stencil> stencil = new osg::Stencil;
-                        stencil->setFunction(getStencilFunction(stencilprop->data.compareFunc),
-                            stencilprop->data.stencilRef, stencilprop->data.stencilMask);
-                        stencil->setStencilFailOperation(getStencilOperation(stencilprop->data.failAction));
-                        stencil->setStencilPassAndDepthFailOperation(
-                            getStencilOperation(stencilprop->data.zFailAction));
-                        stencil->setStencilPassAndDepthPassOperation(
-                            getStencilOperation(stencilprop->data.zPassAction));
+                        stencil->setFunction(getStencilFunction(stencilprop->mTestFunction), stencilprop->mStencilRef,
+                            stencilprop->mStencilMask);
+                        stencil->setStencilFailOperation(getStencilOperation(stencilprop->mFailAction));
+                        stencil->setStencilPassAndDepthFailOperation(getStencilOperation(stencilprop->mZFailAction));
+                        stencil->setStencilPassAndDepthPassOperation(getStencilOperation(stencilprop->mPassAction));
                         stencil = shareAttribute(stencil);
 
                         stateset->setAttributeAndModes(stencil, osg::StateAttribute::ON);
@@ -2155,7 +2453,7 @@ namespace NifOsg
                     const Nif::NiWireframeProperty* wireprop = static_cast<const Nif::NiWireframeProperty*>(property);
                     osg::ref_ptr<osg::PolygonMode> mode = new osg::PolygonMode;
                     mode->setMode(osg::PolygonMode::FRONT_AND_BACK,
-                        wireprop->isEnabled() ? osg::PolygonMode::LINE : osg::PolygonMode::FILL);
+                        wireprop->mEnable ? osg::PolygonMode::LINE : osg::PolygonMode::FILL);
                     mode = shareAttribute(mode);
                     node->getOrCreateStateSet()->setAttributeAndModes(mode, osg::StateAttribute::ON);
                     break;
@@ -2164,16 +2462,8 @@ namespace NifOsg
                 {
                     const Nif::NiZBufferProperty* zprop = static_cast<const Nif::NiZBufferProperty*>(property);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
-                    stateset->setMode(
-                        GL_DEPTH_TEST, zprop->depthTest() ? osg::StateAttribute::ON : osg::StateAttribute::OFF);
-                    osg::ref_ptr<osg::Depth> depth = new osg::Depth;
-                    depth->setWriteMask(zprop->depthWrite());
-                    // Morrowind ignores depth test function, unless a NiStencilProperty is present, in which case it
-                    // uses a fixed depth function of GL_ALWAYS.
-                    if (hasStencilProperty)
-                        depth->setFunction(osg::Depth::ALWAYS);
-                    depth = shareAttribute(depth);
-                    stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                    // The test function from this property seems to be ignored.
+                    handleDepthFlags(stateset, zprop->depthTest(), zprop->depthWrite());
                     break;
                 }
                 // OSG groups the material properties that NIFs have separate, so we have to parse them all again when
@@ -2194,26 +2484,24 @@ namespace NifOsg
                 {
                     const Nif::NiTexturingProperty* texprop = static_cast<const Nif::NiTexturingProperty*>(property);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
-                    handleTextureProperty(
-                        texprop, node->getName(), stateset, composite, imageManager, boundTextures, animflags);
+                    handleTextureProperty(texprop, node->getName(), stateset, composite, boundTextures, animflags);
+                    node->setUserValue("applyMode", static_cast<int>(texprop->mApplyMode));
                     break;
                 }
                 case Nif::RC_BSShaderPPLightingProperty:
                 {
                     auto texprop = static_cast<const Nif::BSShaderPPLightingProperty*>(property);
                     bool shaderRequired = true;
-                    node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
+                    node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->mType)));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
-                    if (!texprop->textureSet.empty())
-                    {
-                        auto textureSet = texprop->textureSet.getPtr();
-                        handleTextureSet(
-                            textureSet, texprop->clamp, node->getName(), stateset, imageManager, boundTextures);
-                    }
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
-                    if (texprop->doubleSided())
-                        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+                    clearBoundTextures(stateset, boundTextures);
+                    if (!texprop->mTextureSet.empty())
+                        handleTextureSet(texprop->mTextureSet.getPtr(), texprop->wrapS(), texprop->wrapT(),
+                            node->getName(), stateset, boundTextures);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
+                    if (texprop->refraction())
+                        SceneUtil::setupDistortion(*node, texprop->mRefraction.mStrength);
                     break;
                 }
                 case Nif::RC_BSShaderNoLightingProperty:
@@ -2221,56 +2509,50 @@ namespace NifOsg
                     auto texprop = static_cast<const Nif::BSShaderNoLightingProperty*>(property);
                     bool shaderRequired = true;
                     bool useFalloff = false;
-                    node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
+                    node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->mType)));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
-                    if (!texprop->filename.empty())
+                    clearBoundTextures(stateset, boundTextures);
+                    if (!texprop->mFilename.empty())
                     {
-                        if (!boundTextures.empty())
-                        {
-                            for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                                stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                            boundTextures.clear();
-                        }
-                        std::string filename
-                            = Misc::ResourceHelpers::correctTexturePath(texprop->filename, imageManager->getVFS());
-                        osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
-                        osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
-                        texture2d->setName("diffuseMap");
-                        if (image)
-                            texture2d->setTextureSize(image->s(), image->t());
-                        handleTextureWrapping(texture2d, texprop->wrapS(), texprop->wrapT());
-                        const unsigned int texUnit = 0;
                         const unsigned int uvSet = 0;
-                        stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-                        boundTextures.push_back(uvSet);
-                        if (mBethVersion >= 27)
-                        {
-                            useFalloff = true;
-                            stateset->addUniform(new osg::Uniform("falloffParams", texprop->falloffParams));
-                        }
+                        attachExternalTexture("diffuseMap", texprop->mFilename, texprop->wrapS(), texprop->wrapT(),
+                            uvSet, stateset, boundTextures);
+                    }
+                    if (mBethVersion >= 27)
+                    {
+                        useFalloff = true;
+                        stateset->addUniform(new osg::Uniform("falloffParams", texprop->mFalloffParams));
                     }
                     stateset->addUniform(new osg::Uniform("useFalloff", useFalloff));
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
-                    if (texprop->doubleSided())
-                        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
+                    handleDepthFlags(stateset, texprop->depthTest(), texprop->depthWrite());
                     break;
                 }
                 case Nif::RC_BSLightingShaderProperty:
                 {
                     auto texprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
                     bool shaderRequired = true;
-                    node->setUserValue("shaderPrefix", std::string(getBSLightingShaderPrefix(texprop->type)));
+                    node->setUserValue("shaderPrefix", std::string(getBSLightingShaderPrefix(texprop->mType)));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
+                    clearBoundTextures(stateset, boundTextures);
+                    if (Bgsm::MaterialFilePtr material = getShaderMaterial(texprop->mName, mMaterialManager))
+                    {
+                        handleShaderMaterialNodeProperties(material.get(), stateset, boundTextures);
+                        break;
+                    }
                     if (!texprop->mTextureSet.empty())
-                        handleTextureSet(texprop->mTextureSet.getPtr(), texprop->mClamp, node->getName(), stateset,
-                            imageManager, boundTextures);
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                        handleTextureSet(texprop->mTextureSet.getPtr(), texprop->wrapS(), texprop->wrapT(),
+                            node->getName(), stateset, boundTextures);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
                     if (texprop->doubleSided())
                         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
                     if (texprop->treeAnim())
                         stateset->addUniform(new osg::Uniform("useTreeAnim", true));
+                    handleDepthFlags(stateset, texprop->depthTest(), texprop->depthWrite());
+                    if (texprop->refraction())
+                        SceneUtil::setupDistortion(*node, texprop->mRefractionStrength);
                     break;
                 }
                 case Nif::RC_BSEffectShaderProperty:
@@ -2281,27 +2563,18 @@ namespace NifOsg
                     node->setUserValue("shaderPrefix", std::string("bs/nolighting"));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
+                    clearBoundTextures(stateset, boundTextures);
+                    if (Bgsm::MaterialFilePtr material = getShaderMaterial(texprop->mName, mMaterialManager))
+                    {
+                        handleShaderMaterialNodeProperties(material.get(), stateset, boundTextures);
+                        break;
+                    }
                     if (!texprop->mSourceTexture.empty())
                     {
-                        if (!boundTextures.empty())
-                        {
-                            for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                                stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                            boundTextures.clear();
-                        }
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(
-                            texprop->mSourceTexture, imageManager->getVFS());
-                        osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
-                        osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
-                        texture2d->setName("diffuseMap");
-                        if (image)
-                            texture2d->setTextureSize(image->s(), image->t());
-                        handleTextureWrapping(texture2d, (texprop->mClamp >> 1) & 0x1, texprop->mClamp & 0x1);
-                        const unsigned int texUnit = 0;
                         const unsigned int uvSet = 0;
-                        stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-                        boundTextures.push_back(uvSet);
-
+                        unsigned int texUnit = boundTextures.size();
+                        attachExternalTexture("diffuseMap", texprop->mSourceTexture, texprop->wrapS(), texprop->wrapT(),
+                            uvSet, stateset, boundTextures);
                         {
                             osg::ref_ptr<osg::TexMat> texMat(new osg::TexMat);
                             // This handles 20.2.0.7 UV settings like 4.0.0.2 UV settings (see NifOsg::UVController)
@@ -2323,15 +2596,43 @@ namespace NifOsg
                     stateset->addUniform(new osg::Uniform("useFalloff", useFalloff));
                     if (useFalloff)
                         stateset->addUniform(new osg::Uniform("falloffParams", texprop->mFalloffParams));
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
                     if (texprop->doubleSided())
                         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+                    handleDepthFlags(stateset, texprop->depthTest(), texprop->depthWrite());
+                    break;
+                }
+                case Nif::RC_NiFogProperty:
+                {
+                    const Nif::NiFogProperty* fogprop = static_cast<const Nif::NiFogProperty*>(property);
+                    osg::StateSet* stateset = node->getOrCreateStateSet();
+                    // Vertex alpha mode appears to be broken
+                    if (!fogprop->vertexAlpha() && fogprop->enabled())
+                    {
+                        osg::ref_ptr<NifOsg::Fog> fog = new NifOsg::Fog;
+                        fog->setMode(osg::Fog::LINEAR);
+                        fog->setColor(osg::Vec4f(fogprop->mColour, 1.f));
+                        fog->setDepth(fogprop->mFogDepth);
+                        fog = shareAttribute(fog);
+                        stateset->setAttributeAndModes(fog, osg::StateAttribute::ON);
+                        // Intentionally ignoring radial fog flag
+                        // We don't really want to override the global setting
+                    }
+                    else
+                    {
+                        osg::ref_ptr<osg::Fog> fog = new osg::Fog;
+                        // Shaders don't respect glDisable(GL_FOG)
+                        fog->setMode(osg::Fog::LINEAR);
+                        fog->setStart(10000000);
+                        fog->setEnd(10000000);
+                        fog = shareAttribute(fog);
+                        stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+                    }
                     break;
                 }
                 // unused by mw
                 case Nif::RC_NiShadeProperty:
                 case Nif::RC_NiDitherProperty:
-                case Nif::RC_NiFogProperty:
                 {
                     break;
                 }
@@ -2353,9 +2654,9 @@ namespace NifOsg
         // global sharing of State Attributes will reduce the number of GL calls as the osg::State will check by pointer
         // to see if state is the same
         template <class Attribute>
-        Attribute* shareAttribute(const osg::ref_ptr<Attribute>& attr)
+        static Attribute* shareAttribute(const osg::ref_ptr<Attribute>& attr)
         {
-            typedef std::set<osg::ref_ptr<Attribute>, CompareStateAttribute> Cache;
+            using Cache = std::set<osg::ref_ptr<Attribute>, CompareStateAttribute>;
             static Cache sCache;
             static std::mutex sMutex;
             std::lock_guard<std::mutex> lock(sMutex);
@@ -2365,7 +2666,7 @@ namespace NifOsg
             return *found;
         }
 
-        void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties,
+        void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::NiProperty*>& properties,
             SceneUtil::CompositeStateSetUpdater* composite, bool hasVertexColors, int animflags)
         {
             // Specular lighting is enabled by default, but there's a quirk...
@@ -2379,18 +2680,15 @@ namespace NifOsg
 
             bool hasMatCtrl = false;
             bool hasSortAlpha = false;
-            osg::StateSet* blendFuncStateSet = nullptr;
 
-            auto setBin_Transparent = [](osg::StateSet* ss) { ss->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); };
             auto setBin_BackToFront = [](osg::StateSet* ss) { ss->setRenderBinDetails(0, "SORT_BACK_TO_FRONT"); };
             auto setBin_Traversal = [](osg::StateSet* ss) { ss->setRenderBinDetails(2, "TraversalOrderBin"); };
-            auto setBin_Inherit = [](osg::StateSet* ss) { ss->setRenderBinToInherit(); };
 
             auto lightmode = Nif::NiVertexColorProperty::LightMode::LightMode_EmiAmbDif;
             float emissiveMult = 1.f;
             float specStrength = 1.f;
 
-            for (const Nif::Property* property : properties)
+            for (const Nif::NiProperty* property : properties)
             {
                 switch (property->recType)
                 {
@@ -2399,23 +2697,25 @@ namespace NifOsg
                         // Specular property can turn specular lighting off.
                         // FIXME: NiMaterialColorController doesn't care about this.
                         auto specprop = static_cast<const Nif::NiSpecularProperty*>(property);
-                        specEnabled = specprop->isEnabled();
+                        specEnabled = specprop->mEnable;
                         break;
                     }
                     case Nif::RC_NiMaterialProperty:
                     {
                         const Nif::NiMaterialProperty* matprop = static_cast<const Nif::NiMaterialProperty*>(property);
 
-                        mat->setDiffuse(
-                            osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.diffuse, matprop->data.alpha));
-                        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.ambient, 1.f));
-                        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.emissive, 1.f));
-                        emissiveMult = matprop->data.emissiveMult;
+                        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->mDiffuse, matprop->mAlpha));
+                        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->mAmbient, 1.f));
+                        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->mEmissive, 1.f));
+                        emissiveMult = matprop->mEmissiveMult;
 
-                        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.specular, 1.f));
-                        mat->setShininess(osg::Material::FRONT_AND_BACK, matprop->data.glossiness);
+                        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->mSpecular, 1.f));
+                        // NIFs may provide specular exponents way above OpenGL's limit.
+                        // They can't be used properly, but we don't need OSG to constantly harass us about it.
+                        float glossiness = std::clamp(matprop->mGlossiness, 0.f, 128.f);
+                        mat->setShininess(osg::Material::FRONT_AND_BACK, glossiness);
 
-                        if (!matprop->controller.empty())
+                        if (!matprop->mController.empty())
                         {
                             hasMatCtrl = true;
                             handleMaterialControllers(matprop, composite, animflags, mat);
@@ -2428,29 +2728,31 @@ namespace NifOsg
                         const Nif::NiVertexColorProperty* vertprop
                             = static_cast<const Nif::NiVertexColorProperty*>(property);
 
+                        using VertexMode = Nif::NiVertexColorProperty::VertexMode;
                         switch (vertprop->mVertexMode)
                         {
-                            case Nif::NiVertexColorProperty::VertexMode::VertMode_SrcIgnore:
+                            case VertexMode::VertMode_SrcIgnore:
                             {
                                 mat->setColorMode(osg::Material::OFF);
                                 break;
                             }
-                            case Nif::NiVertexColorProperty::VertexMode::VertMode_SrcEmissive:
+                            case VertexMode::VertMode_SrcEmissive:
                             {
                                 mat->setColorMode(osg::Material::EMISSION);
                                 break;
                             }
-                            case Nif::NiVertexColorProperty::VertexMode::VertMode_SrcAmbDif:
+                            case VertexMode::VertMode_SrcAmbDif:
                             {
                                 lightmode = vertprop->mLightingMode;
+                                using LightMode = Nif::NiVertexColorProperty::LightMode;
                                 switch (lightmode)
                                 {
-                                    case Nif::NiVertexColorProperty::LightMode::LightMode_Emissive:
+                                    case LightMode::LightMode_Emissive:
                                     {
                                         mat->setColorMode(osg::Material::OFF);
                                         break;
                                     }
-                                    case Nif::NiVertexColorProperty::LightMode::LightMode_EmiAmbDif:
+                                    case LightMode::LightMode_EmiAmbDif:
                                     default:
                                     {
                                         mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
@@ -2466,52 +2768,10 @@ namespace NifOsg
                     case Nif::RC_NiAlphaProperty:
                     {
                         const Nif::NiAlphaProperty* alphaprop = static_cast<const Nif::NiAlphaProperty*>(property);
-                        if (alphaprop->useAlphaBlending())
-                        {
-                            osg::ref_ptr<osg::BlendFunc> blendFunc(
-                                new osg::BlendFunc(getBlendMode(alphaprop->sourceBlendMode()),
-                                    getBlendMode(alphaprop->destinationBlendMode())));
-                            // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
-                            // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
-                            // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
-                            if (blendFunc->getDestination() == GL_DST_ALPHA)
-                                blendFunc->setDestination(GL_ONE);
-                            blendFunc = shareAttribute(blendFunc);
-                            node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
-
-                            if (!alphaprop->noSorter())
-                            {
-                                hasSortAlpha = true;
-                                if (!mPushedSorter)
-                                    setBin_Transparent(node->getStateSet());
-                            }
-                            else
-                            {
-                                if (!mPushedSorter)
-                                    setBin_Inherit(node->getStateSet());
-                            }
-                        }
-                        else if (osg::StateSet* stateset = node->getStateSet())
-                        {
-                            stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
-                            stateset->removeMode(GL_BLEND);
-                            blendFuncStateSet = stateset;
-                            if (!mPushedSorter)
-                                blendFuncStateSet->setRenderBinToInherit();
-                        }
-
-                        if (alphaprop->useAlphaTesting())
-                        {
-                            osg::ref_ptr<osg::AlphaFunc> alphaFunc(new osg::AlphaFunc(
-                                getTestMode(alphaprop->alphaTestMode()), alphaprop->data.threshold / 255.f));
-                            alphaFunc = shareAttribute(alphaFunc);
-                            node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-                        }
-                        else if (osg::StateSet* stateset = node->getStateSet())
-                        {
-                            stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
-                            stateset->removeMode(GL_ALPHA_TEST);
-                        }
+                        handleAlphaBlending(alphaprop->useAlphaBlending(), alphaprop->sourceBlendMode(),
+                            alphaprop->destinationBlendMode(), !alphaprop->noSorter(), hasSortAlpha, *node);
+                        handleAlphaTesting(alphaprop->useAlphaTesting(), getTestMode(alphaprop->alphaTestMode()),
+                            alphaprop->mThreshold, *node);
                         break;
                     }
                     case Nif::RC_BSShaderPPLightingProperty:
@@ -2523,38 +2783,41 @@ namespace NifOsg
                     case Nif::RC_BSLightingShaderProperty:
                     {
                         auto shaderprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
+                        if (Bgsm::MaterialFilePtr shaderMat = getShaderMaterial(shaderprop->mName, mMaterialManager))
+                        {
+                            handleShaderMaterialDrawableProperties(shaderMat.get(), mat, *node, hasSortAlpha);
+                            if (shaderMat->mShaderType == Bgsm::ShaderType::Lighting)
+                            {
+                                auto bgsm = static_cast<const Bgsm::BGSMFile*>(shaderMat.get());
+                                specEnabled = false; // bgsm->mSpecularEnabled; TODO: PBR specular lighting
+                                specStrength = 1.f; // bgsm->mSpecularMult;
+                                emissiveMult = bgsm->mEmittanceMult;
+                            }
+                            break;
+                        }
                         mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderprop->mAlpha);
                         mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mEmissive, 1.f));
                         mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mSpecular, 1.f));
-                        mat->setShininess(osg::Material::FRONT_AND_BACK, shaderprop->mGlossiness);
+                        float glossiness = std::clamp(shaderprop->mGlossiness, 0.f, 128.f);
+                        mat->setShininess(osg::Material::FRONT_AND_BACK, glossiness);
                         emissiveMult = shaderprop->mEmissiveMult;
                         specStrength = shaderprop->mSpecStrength;
                         specEnabled = shaderprop->specular();
-                        if (shaderprop->decal())
-                        {
-                            osg::StateSet* stateset = node->getOrCreateStateSet();
-                            if (!mPushedSorter && !hasSortAlpha)
-                                stateset->setRenderBinDetails(1, "SORT_BACK_TO_FRONT");
-                            osg::ref_ptr<osg::PolygonOffset> polygonOffset(new osg::PolygonOffset);
-                            polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f);
-                            polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 0.65f : -0.65f);
-                            stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
-                        }
+                        handleDecal(shaderprop->decal(), hasSortAlpha, *node);
                         break;
                     }
                     case Nif::RC_BSEffectShaderProperty:
                     {
                         auto shaderprop = static_cast<const Nif::BSEffectShaderProperty*>(property);
-                        if (shaderprop->decal())
+                        if (Bgsm::MaterialFilePtr shaderMat = getShaderMaterial(shaderprop->mName, mMaterialManager))
                         {
-                            osg::StateSet* stateset = node->getOrCreateStateSet();
-                            if (!mPushedSorter && !hasSortAlpha)
-                                stateset->setRenderBinDetails(1, "SORT_BACK_TO_FRONT");
-                            osg::ref_ptr<osg::PolygonOffset> polygonOffset(new osg::PolygonOffset);
-                            polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f);
-                            polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 0.65f : -0.65f);
-                            stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
+                            handleShaderMaterialDrawableProperties(shaderMat.get(), mat, *node, hasSortAlpha);
+                            break;
                         }
+                        handleDecal(shaderprop->decal(), hasSortAlpha, *node);
+                        if (shaderprop->softEffect())
+                            SceneUtil::setupSoftEffect(
+                                *node, shaderprop->mFalloffDepth, true, shaderprop->mFalloffDepth);
                         break;
                     }
                     default:
@@ -2564,7 +2827,11 @@ namespace NifOsg
 
             // While NetImmerse and Gamebryo support specular lighting, Morrowind has its support disabled.
             if (mVersion <= Nif::NIFFile::VER_MW || !specEnabled)
+            {
                 mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
+                mat->setShininess(osg::Material::FRONT_AND_BACK, 0.f);
+                specStrength = 1.f;
+            }
 
             if (lightmode == Nif::NiVertexColorProperty::LightMode::LightMode_Emissive)
             {
@@ -2595,34 +2862,33 @@ namespace NifOsg
                 mat->setColorMode(osg::Material::OFF);
             }
 
-            if (!mPushedSorter && !hasSortAlpha && mHasStencilProperty)
-                setBin_Traversal(node->getOrCreateStateSet());
-
-            if (!mPushedSorter && !hasMatCtrl && mat->getColorMode() == osg::Material::OFF
-                && mat->getEmission(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0, 0, 0, 1)
-                && mat->getDiffuse(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1, 1, 1, 1)
-                && mat->getAmbient(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1, 1, 1, 1)
-                && mat->getShininess(osg::Material::FRONT_AND_BACK) == 0
-                && mat->getSpecular(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0.f, 0.f, 0.f, 0.f))
+            if (hasMatCtrl || mat->getColorMode() != osg::Material::OFF
+                || mat->getEmission(osg::Material::FRONT_AND_BACK) != osg::Vec4f(0, 0, 0, 1)
+                || mat->getDiffuse(osg::Material::FRONT_AND_BACK) != osg::Vec4f(1, 1, 1, 1)
+                || mat->getAmbient(osg::Material::FRONT_AND_BACK) != osg::Vec4f(1, 1, 1, 1)
+                || mat->getShininess(osg::Material::FRONT_AND_BACK) != 0
+                || mat->getSpecular(osg::Material::FRONT_AND_BACK) != osg::Vec4f(0.f, 0.f, 0.f, 0.f))
             {
-                // default state, skip
+                mat = shareAttribute(mat);
+                node->getOrCreateStateSet()->setAttributeAndModes(mat, osg::StateAttribute::ON);
+            }
+
+            if (emissiveMult != 1.f)
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
+
+            if (specStrength != 1.f)
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", specStrength));
+
+            if (!mPushedSorter)
+            {
+                if (!hasSortAlpha && mHasStencilProperty)
+                    setBin_Traversal(node->getOrCreateStateSet());
                 return;
             }
 
-            mat = shareAttribute(mat);
-
             osg::StateSet* stateset = node->getOrCreateStateSet();
-            stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
-            if (emissiveMult != 1.f)
-                stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
-            if (specStrength != 1.f)
-                stateset->addUniform(new osg::Uniform("specStrength", specStrength));
-
-            if (!mPushedSorter)
-                return;
-
-            auto assignBin = [&](int mode, int type) {
-                if (mode == Nif::NiSortAdjustNode::SortingMode_Off)
+            auto assignBin = [&](Nif::NiSortAdjustNode::SortingMode mode, int type) {
+                if (mode == Nif::NiSortAdjustNode::SortingMode::Off)
                 {
                     setBin_Traversal(stateset);
                     return;
@@ -2643,7 +2909,7 @@ namespace NifOsg
 
             switch (mPushedSorter->mMode)
             {
-                case Nif::NiSortAdjustNode::SortingMode_Inherit:
+                case Nif::NiSortAdjustNode::SortingMode::Inherit:
                 {
                     if (mLastAppliedNoInheritSorter)
                         assignBin(mLastAppliedNoInheritSorter->mMode, mLastAppliedNoInheritSorter->mSubSorter->recType);
@@ -2651,12 +2917,12 @@ namespace NifOsg
                         assignBin(mPushedSorter->mMode, Nif::RC_NiAlphaAccumulator);
                     break;
                 }
-                case Nif::NiSortAdjustNode::SortingMode_Off:
+                case Nif::NiSortAdjustNode::SortingMode::Off:
                 {
                     setBin_Traversal(stateset);
                     break;
                 }
-                case Nif::NiSortAdjustNode::SortingMode_Subsort:
+                case Nif::NiSortAdjustNode::SortingMode::Subsort:
                 {
                     assignBin(mPushedSorter->mMode, mPushedSorter->mSubSorter->recType);
                     break;
@@ -2665,10 +2931,13 @@ namespace NifOsg
         }
     };
 
-    osg::ref_ptr<osg::Node> Loader::load(Nif::FileView file, Resource::ImageManager* imageManager)
+    osg::ref_ptr<osg::Node> Loader::load(
+        Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager)
     {
         LoaderImpl impl(file.getFilename(), file.getVersion(), file.getUserVersion(), file.getBethVersion());
-        return impl.load(file, imageManager);
+        impl.mMaterialManager = materialManager;
+        impl.mImageManager = imageManager;
+        return impl.load(file);
     }
 
     void Loader::loadKf(Nif::FileView kf, SceneUtil::KeyframeHolder& target)
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index 21e0ae097c..14f16088cc 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -18,6 +18,7 @@ namespace osg
 namespace Resource
 {
     class ImageManager;
+    class BgsmFileManager;
 }
 
 namespace NifOsg
@@ -30,7 +31,8 @@ namespace NifOsg
     public:
         /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton
         /// if so.
-        static osg::ref_ptr<osg::Node> load(Nif::FileView file, Resource::ImageManager* imageManager);
+        static osg::ref_ptr<osg::Node> load(
+            Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager);
 
         /// Load keyframe controllers from the given kf file.
         static void loadKf(Nif::FileView kf, SceneUtil::KeyframeHolder& target);
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 2700b7eb93..f15678c879 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -9,7 +9,6 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
-#include <components/nif/controlled.hpp>
 #include <components/nif/data.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
@@ -281,20 +280,13 @@ namespace NifOsg
 
     GravityAffector::GravityAffector(const Nif::NiGravity* gravity)
         : mForce(gravity->mForce)
-        , mType(static_cast<ForceType>(gravity->mType))
+        , mType(gravity->mType)
         , mPosition(gravity->mPosition)
         , mDirection(gravity->mDirection)
         , mDecay(gravity->mDecay)
     {
     }
 
-    GravityAffector::GravityAffector()
-        : mForce(0)
-        , mType(Type_Wind)
-        , mDecay(0.f)
-    {
-    }
-
     GravityAffector::GravityAffector(const GravityAffector& copy, const osg::CopyOp& copyop)
         : osgParticle::Operator(copy, copyop)
     {
@@ -311,8 +303,8 @@ namespace NifOsg
     {
         bool absolute = (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF);
 
-        if (mType == Type_Point
-            || mDecay != 0.f) // we don't need the position for Wind gravity, except if decay is being applied
+        // We don't need the position for Wind gravity, except if decay is being applied
+        if (mType == Nif::ForceType::Point || mDecay != 0.f)
             mCachedWorldPosition = absolute ? program->transformLocalToWorld(mPosition) : mPosition;
 
         mCachedWorldDirection = absolute ? program->rotateLocalToWorld(mDirection) : mDirection;
@@ -324,7 +316,7 @@ namespace NifOsg
         const float magic = 1.6f;
         switch (mType)
         {
-            case Type_Wind:
+            case Nif::ForceType::Wind:
             {
                 float decayFactor = 1.f;
                 if (mDecay != 0.f)
@@ -338,7 +330,7 @@ namespace NifOsg
 
                 break;
             }
-            case Type_Point:
+            case Nif::ForceType::Point:
             {
                 osg::Vec3f diff = mCachedWorldPosition - particle->getPosition();
 
@@ -354,6 +346,84 @@ namespace NifOsg
         }
     }
 
+    ParticleBomb::ParticleBomb(const Nif::NiParticleBomb* bomb)
+        : mRange(bomb->mRange)
+        , mStrength(bomb->mStrength)
+        , mDecayType(bomb->mDecayType)
+        , mSymmetryType(bomb->mSymmetryType)
+        , mPosition(bomb->mPosition)
+        , mDirection(bomb->mDirection)
+    {
+    }
+
+    ParticleBomb::ParticleBomb(const ParticleBomb& copy, const osg::CopyOp& copyop)
+        : osgParticle::Operator(copy, copyop)
+    {
+        mRange = copy.mRange;
+        mStrength = copy.mStrength;
+        mDecayType = copy.mDecayType;
+        mSymmetryType = copy.mSymmetryType;
+        mCachedWorldPosition = copy.mCachedWorldPosition;
+        mCachedWorldDirection = copy.mCachedWorldDirection;
+    }
+
+    void ParticleBomb::beginOperate(osgParticle::Program* program)
+    {
+        bool absolute = (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF);
+
+        mCachedWorldPosition = absolute ? program->transformLocalToWorld(mPosition) : mPosition;
+
+        // We don't need the direction for Spherical bomb
+        if (mSymmetryType != Nif::SymmetryType::Spherical)
+        {
+            mCachedWorldDirection = absolute ? program->rotateLocalToWorld(mDirection) : mDirection;
+            mCachedWorldDirection.normalize();
+        }
+    }
+
+    void ParticleBomb::operate(osgParticle::Particle* particle, double dt)
+    {
+        float decay = 1.f;
+        osg::Vec3f explosionDir;
+
+        osg::Vec3f particleDir = particle->getPosition() - mCachedWorldPosition;
+        float distance = particleDir.length();
+        particleDir.normalize();
+
+        switch (mDecayType)
+        {
+            case Nif::DecayType::None:
+                break;
+            case Nif::DecayType::Linear:
+                decay = 1.f - distance / mRange;
+                break;
+            case Nif::DecayType::Exponential:
+                decay = std::exp(-distance / mRange);
+                break;
+        }
+
+        if (decay <= 0.f)
+            return;
+
+        switch (mSymmetryType)
+        {
+            case Nif::SymmetryType::Spherical:
+                explosionDir = particleDir;
+                break;
+            case Nif::SymmetryType::Cylindrical:
+                explosionDir = particleDir - mCachedWorldDirection * (mCachedWorldDirection * particleDir);
+                explosionDir.normalize();
+                break;
+            case Nif::SymmetryType::Planar:
+                explosionDir = mCachedWorldDirection;
+                if (explosionDir * particleDir < 0)
+                    explosionDir = -explosionDir;
+                break;
+        }
+
+        particle->addVelocity(explosionDir * mStrength * decay * dt);
+    }
+
     Emitter::Emitter()
         : osgParticle::Emitter()
         , mFlags(0)
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index 3424512208..272bc5baed 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -10,15 +10,14 @@
 #include <osgParticle/Placer>
 #include <osgParticle/Shooter>
 
+#include <components/nif/particle.hpp> // NiGravity::ForceType
+
 #include <components/sceneutil/nodecallback.hpp>
 
 #include "controller.hpp" // ValueInterpolator
 
 namespace Nif
 {
-    struct NiGravity;
-    struct NiPlanarCollider;
-    struct NiSphericalCollider;
     struct NiColorData;
 }
 
@@ -180,7 +179,7 @@ namespace NifOsg
     {
     public:
         GravityAffector(const Nif::NiGravity* gravity);
-        GravityAffector();
+        GravityAffector() = default;
         GravityAffector(const GravityAffector& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
 
         GravityAffector& operator=(const GravityAffector&) = delete;
@@ -191,16 +190,36 @@ namespace NifOsg
         void beginOperate(osgParticle::Program*) override;
 
     private:
-        float mForce;
-        enum ForceType
-        {
-            Type_Wind,
-            Type_Point
-        };
-        ForceType mType;
+        float mForce{ 0.f };
+        Nif::ForceType mType{ Nif::ForceType::Wind };
+        osg::Vec3f mPosition;
+        osg::Vec3f mDirection;
+        float mDecay{ 0.f };
+        osg::Vec3f mCachedWorldPosition;
+        osg::Vec3f mCachedWorldDirection;
+    };
+
+    class ParticleBomb : public osgParticle::Operator
+    {
+    public:
+        ParticleBomb(const Nif::NiParticleBomb* bomb);
+        ParticleBomb() = default;
+        ParticleBomb(const ParticleBomb& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
+
+        ParticleBomb& operator=(const ParticleBomb&) = delete;
+
+        META_Object(NifOsg, ParticleBomb)
+
+        void operate(osgParticle::Particle* particle, double dt) override;
+        void beginOperate(osgParticle::Program*) override;
+
+    private:
+        float mRange{ 0.f };
+        float mStrength{ 0.f };
+        Nif::DecayType mDecayType{ Nif::DecayType::None };
+        Nif::SymmetryType mSymmetryType{ Nif::SymmetryType::Spherical };
         osg::Vec3f mPosition;
         osg::Vec3f mDirection;
-        float mDecay;
         osg::Vec3f mCachedWorldPosition;
         osg::Vec3f mCachedWorldDirection;
     };
diff --git a/components/platform/application.cpp b/components/platform/application.cpp
new file mode 100644
index 0000000000..190887fa50
--- /dev/null
+++ b/components/platform/application.cpp
@@ -0,0 +1,118 @@
+#include "application.hpp"
+
+#include <QFile>
+#include <QOperatingSystemVersion>
+#include <QStyle>
+#include <QStyleHints>
+
+#include <components/debug/debuglog.hpp>
+#include <components/misc/scalableicon.hpp>
+
+namespace Platform
+{
+    Application::Application(int& argc, char* argv[])
+        : QApplication(argc, argv)
+    {
+#if defined(WIN32) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+        init();
+    }
+
+    static QString getStyleSheetPath()
+    {
+        QString qssPath(":/dark/dark_win10.qss");
+        if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows11)
+            qssPath = ":/dark/dark_win11.qss";
+
+        return qssPath;
+    }
+
+    void Application::init()
+    {
+        connect(this, &Application::darkModeChanged, this, &Application::updateStyle);
+
+        const auto* hints = QGuiApplication::styleHints();
+        const auto currentStyle = QApplication::style()->objectName();
+        mInitialStyle = currentStyle.toStdString();
+        mCurrentStyle = currentStyle.toStdString();
+        if (hints->colorScheme() == Qt::ColorScheme::Dark)
+        {
+            mDarkMode = true;
+            if (currentStyle == "windowsvista")
+            {
+                mCurrentStyle = "windows";
+                setStyle("windows");
+
+                QFile file(getStyleSheetPath());
+                if (!file.open(QIODevice::ReadOnly))
+                {
+                    qDebug() << "Failed to open style sheet file:" << getStyleSheetPath();
+                    return;
+                }
+
+                setStyleSheet(file.readAll());
+            }
+        }
+    }
+
+    void Application::updateStyle(bool isDark)
+    {
+        if (mInitialStyle != "windowsvista")
+            return;
+
+        if (isDark)
+        {
+            mCurrentStyle = "windows";
+            setStyle("windows");
+
+            QFile file(getStyleSheetPath());
+            if (!file.open(QIODevice::ReadOnly))
+            {
+                qDebug() << "Failed to open style sheet file:" << getStyleSheetPath();
+                return;
+            }
+
+            setStyleSheet(file.readAll());
+        }
+        else
+        {
+            mCurrentStyle = mInitialStyle;
+            setStyleSheet("");
+            setStyle(mInitialStyle.c_str());
+        }
+#endif
+    }
+
+    bool Application::notify(QObject* receiver, QEvent* event)
+    {
+        try
+        {
+            if (event->type() == QEvent::ThemeChange || event->type() == QEvent::PaletteChange)
+            {
+#if defined(WIN32) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+                const auto* hints = QGuiApplication::styleHints();
+                const auto currentStyle = QApplication::style()->objectName();
+                bool isDark = hints->colorScheme() == Qt::ColorScheme::Dark;
+                if (isDark != mDarkMode)
+                {
+                    mDarkMode = isDark;
+
+                    bool result = QApplication::notify(receiver, event);
+
+                    emit darkModeChanged(isDark);
+
+                    return result;
+                }
+#endif
+                Misc::ScalableIcon::updateAllIcons();
+            }
+
+            return QApplication::notify(receiver, event);
+        }
+        catch (const std::exception& exception)
+        {
+            Log(Debug::Error) << "An exception has been caught: " << exception.what();
+        }
+
+        return false;
+    }
+}
diff --git a/components/platform/application.hpp b/components/platform/application.hpp
new file mode 100644
index 0000000000..66954664d1
--- /dev/null
+++ b/components/platform/application.hpp
@@ -0,0 +1,30 @@
+#include <QApplication>
+#include <QEvent>
+
+namespace Platform
+{
+    class Application : public QApplication
+    {
+        Q_OBJECT
+
+    public:
+        Application(int& argc, char* argv[]);
+
+#if defined(WIN32) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+        void init();
+
+    private slots:
+        void updateStyle(bool isDark);
+#endif
+
+    signals:
+        void darkModeChanged(bool);
+
+    private:
+        bool notify(QObject* receiver, QEvent* event) override;
+
+        std::string mCurrentStyle{};
+        std::string mInitialStyle{};
+        bool mDarkMode{ false };
+    };
+}
diff --git a/components/platform/file.win32.cpp b/components/platform/file.win32.cpp
index efcb233fc0..3df99e8a8f 100644
--- a/components/platform/file.win32.cpp
+++ b/components/platform/file.win32.cpp
@@ -1,8 +1,7 @@
 #include "file.hpp"
 
-#include <boost/locale.hpp>
 #include <cassert>
-#include <components/windows.hpp>
+#include <components/misc/windows.hpp>
 #include <stdexcept>
 #include <string>
 
diff --git a/components/platform/platform.cpp b/components/platform/platform.cpp
index 787cfa522e..9743c14337 100644
--- a/components/platform/platform.cpp
+++ b/components/platform/platform.cpp
@@ -1,12 +1,15 @@
 #include "platform.hpp"
 
+#ifdef WIN32
+#include <stdio.h>
+#endif
+
 namespace Platform
 {
 
     static void increaseFileHandleLimit()
     {
 #ifdef WIN32
-#include <stdio.h>
         // Increase limit for open files at the stream I/O level, see
         // https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/setmaxstdio?view=msvc-170#remarks
         _setmaxstdio(8192);
diff --git a/components/process/processinvoker.cpp b/components/process/processinvoker.cpp
index 73e23eb9f9..9489076acb 100644
--- a/components/process/processinvoker.cpp
+++ b/components/process/processinvoker.cpp
@@ -76,9 +76,9 @@ bool Process::ProcessInvoker::startProcess(const QString& name, const QStringLis
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<html><head/><body><p><b>Could not find %1</b></p> \
-                          <p>The application is not found.</p> \
-                          <p>Please make sure OpenMW is installed correctly and try again.</p></body></html>")
+            tr("<html><head/><body><p><b>Could not find %1</b></p>"
+               "<p>The application is not found.</p>"
+               "<p>Please make sure OpenMW is installed correctly and try again.</p></body></html>")
                 .arg(info.fileName()));
         msgBox.exec();
         return false;
@@ -91,9 +91,9 @@ bool Process::ProcessInvoker::startProcess(const QString& name, const QStringLis
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<html><head/><body><p><b>Could not start %1</b></p> \
-                          <p>The application is not executable.</p> \
-                          <p>Please make sure you have the right permissions and try again.</p></body></html>")
+            tr("<html><head/><body><p><b>Could not start %1</b></p>"
+               "<p>The application is not executable.</p>"
+               "<p>Please make sure you have the right permissions and try again.</p></body></html>")
                 .arg(info.fileName()));
         msgBox.exec();
         return false;
@@ -109,9 +109,9 @@ bool Process::ProcessInvoker::startProcess(const QString& name, const QStringLis
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(
-                tr("<html><head/><body><p><b>Could not start %1</b></p> \
-                              <p>An error occurred while starting %1.</p> \
-                              <p>Press \"Show Details...\" for more information.</p></body></html>")
+                tr("<html><head/><body><p><b>Could not start %1</b></p>"
+                   "<p>An error occurred while starting %1.</p>"
+                   "<p>Press \"Show Details...\" for more information.</p></body></html>")
                     .arg(info.fileName()));
             msgBox.setDetailedText(mProcess->errorString());
             msgBox.exec();
@@ -168,9 +168,9 @@ void Process::ProcessInvoker::processError(QProcess::ProcessError error)
     msgBox.setIcon(QMessageBox::Critical);
     msgBox.setStandardButtons(QMessageBox::Ok);
     msgBox.setText(
-        tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
-                      <p>An error occurred while running %1.</p> \
-                      <p>Press \"Show Details...\" for more information.</p></body></html>")
+        tr("<html><head/><body><p><b>Executable %1 returned an error</b></p>"
+           "<p>An error occurred while running %1.</p>"
+           "<p>Press \"Show Details...\" for more information.</p></body></html>")
             .arg(mName));
     msgBox.setDetailedText(mProcess->errorString());
     msgBox.exec();
@@ -191,9 +191,9 @@ void Process::ProcessInvoker::processFinished(int exitCode, QProcess::ExitStatus
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(
-            tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
-                          <p>An error occurred while running %1.</p> \
-                          <p>Press \"Show Details...\" for more information.</p></body></html>")
+            tr("<html><head/><body><p><b>Executable %1 returned an error</b></p>"
+               "<p>An error occurred while running %1.</p>"
+               "<p>Press \"Show Details...\" for more information.</p></body></html>")
                 .arg(mName));
         msgBox.setDetailedText(error);
         msgBox.exec();
diff --git a/components/resource/animblendrulesmanager.cpp b/components/resource/animblendrulesmanager.cpp
new file mode 100644
index 0000000000..550315cace
--- /dev/null
+++ b/components/resource/animblendrulesmanager.cpp
@@ -0,0 +1,76 @@
+#include "animblendrulesmanager.hpp"
+
+#include <array>
+
+#include <components/vfs/manager.hpp>
+
+#include <osg/Stats>
+#include <osgAnimation/Animation>
+#include <osgAnimation/BasicAnimationManager>
+#include <osgAnimation/Channel>
+
+#include <components/debug/debuglog.hpp>
+#include <components/misc/pathhelpers.hpp>
+
+#include <components/sceneutil/osgacontroller.hpp>
+#include <components/vfs/pathutil.hpp>
+
+#include <components/resource/scenemanager.hpp>
+
+#include "objectcache.hpp"
+#include "scenemanager.hpp"
+
+namespace Resource
+{
+    using AnimBlendRules = SceneUtil::AnimBlendRules;
+
+    AnimBlendRulesManager::AnimBlendRulesManager(const VFS::Manager* vfs, double expiryDelay)
+        : ResourceManager(vfs, expiryDelay)
+    {
+    }
+
+    osg::ref_ptr<const AnimBlendRules> AnimBlendRulesManager::getRules(
+        const VFS::Path::NormalizedView path, const VFS::Path::NormalizedView overridePath)
+    {
+        // Note: Providing a non-existing path but an existing overridePath is not supported!
+        auto tmpl = loadRules(path);
+        if (!tmpl)
+            return nullptr;
+
+        // Create an instance based on template and store template reference inside so the template will not be removed
+        // from cache
+        osg::ref_ptr<SceneUtil::AnimBlendRules> blendRules(new AnimBlendRules(*tmpl, osg::CopyOp::SHALLOW_COPY));
+        blendRules->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(tmpl));
+
+        if (!overridePath.value().empty())
+        {
+            auto blendRuleOverrides = loadRules(overridePath);
+            if (blendRuleOverrides)
+            {
+                blendRules->addOverrideRules(*blendRuleOverrides);
+            }
+            blendRules->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(blendRuleOverrides));
+        }
+
+        return blendRules;
+    }
+
+    osg::ref_ptr<const AnimBlendRules> AnimBlendRulesManager::loadRules(VFS::Path::NormalizedView path)
+    {
+        std::optional<osg::ref_ptr<osg::Object>> obj = mCache->getRefFromObjectCacheOrNone(path);
+        if (obj.has_value())
+        {
+            return osg::ref_ptr<AnimBlendRules>(static_cast<AnimBlendRules*>(obj->get()));
+        }
+
+        osg::ref_ptr<AnimBlendRules> blendRules = AnimBlendRules::fromFile(mVFS, path);
+        mCache->addEntryToObjectCache(path.value(), blendRules);
+        return blendRules;
+    }
+
+    void AnimBlendRulesManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
+    {
+        Resource::reportStats("Blending Rules", frameNumber, mCache->getStats(), *stats);
+    }
+
+}
diff --git a/components/resource/animblendrulesmanager.hpp b/components/resource/animblendrulesmanager.hpp
new file mode 100644
index 0000000000..5b167f932d
--- /dev/null
+++ b/components/resource/animblendrulesmanager.hpp
@@ -0,0 +1,34 @@
+#ifndef OPENMW_COMPONENTS_ANIMBLENDRULESMANAGER_H
+#define OPENMW_COMPONENTS_ANIMBLENDRULESMANAGER_H
+
+#include <osg/ref_ptr>
+#include <string>
+
+#include <components/sceneutil/animblendrules.hpp>
+
+#include "resourcemanager.hpp"
+
+namespace Resource
+{
+    /// @brief Managing of keyframe resources
+    /// @note May be used from any thread.
+    class AnimBlendRulesManager : public ResourceManager
+    {
+    public:
+        explicit AnimBlendRulesManager(const VFS::Manager* vfs, double expiryDelay);
+        ~AnimBlendRulesManager() = default;
+
+        /// Retrieve a read-only keyframe resource by name (case-insensitive).
+        /// @note Throws an exception if the resource is not found.
+        osg::ref_ptr<const SceneUtil::AnimBlendRules> getRules(
+            const VFS::Path::NormalizedView path, const VFS::Path::NormalizedView overridePath);
+
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
+
+    private:
+        osg::ref_ptr<const SceneUtil::AnimBlendRules> loadRules(VFS::Path::NormalizedView path);
+    };
+
+}
+
+#endif
diff --git a/components/resource/bgsmfilemanager.cpp b/components/resource/bgsmfilemanager.cpp
new file mode 100644
index 0000000000..7d93608603
--- /dev/null
+++ b/components/resource/bgsmfilemanager.cpp
@@ -0,0 +1,55 @@
+#include "bgsmfilemanager.hpp"
+
+#include <osg/Object>
+
+#include <components/vfs/manager.hpp>
+
+#include "objectcache.hpp"
+
+namespace Resource
+{
+
+    class BgsmFileHolder : public osg::Object
+    {
+    public:
+        BgsmFileHolder(const Bgsm::MaterialFilePtr& file)
+            : mBgsmFile(file)
+        {
+        }
+        BgsmFileHolder(const BgsmFileHolder& copy, const osg::CopyOp& copyop)
+            : mBgsmFile(copy.mBgsmFile)
+        {
+        }
+
+        BgsmFileHolder() = default;
+
+        META_Object(Resource, BgsmFileHolder)
+
+        Bgsm::MaterialFilePtr mBgsmFile;
+    };
+
+    BgsmFileManager::BgsmFileManager(const VFS::Manager* vfs, double expiryDelay)
+        : ResourceManager(vfs, expiryDelay)
+    {
+    }
+
+    Bgsm::MaterialFilePtr BgsmFileManager::get(VFS::Path::NormalizedView name)
+    {
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
+        if (obj)
+            return static_cast<BgsmFileHolder*>(obj.get())->mBgsmFile;
+        else
+        {
+            Bgsm::MaterialFilePtr file = Bgsm::parse(mVFS->get(name));
+            obj = new BgsmFileHolder(file);
+            mCache->addEntryToObjectCache(name.value(), obj);
+            return file;
+        }
+    }
+
+    void BgsmFileManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
+    {
+        Resource::reportStats("BSShader Material", frameNumber, mCache->getStats(), *stats);
+    }
+
+}
diff --git a/components/resource/bgsmfilemanager.hpp b/components/resource/bgsmfilemanager.hpp
new file mode 100644
index 0000000000..3c77c2c665
--- /dev/null
+++ b/components/resource/bgsmfilemanager.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_BGSMFILEMANAGER_H
+#define OPENMW_COMPONENTS_RESOURCE_BGSMFILEMANAGER_H
+
+#include <components/bgsm/file.hpp>
+
+#include "resourcemanager.hpp"
+
+namespace Resource
+{
+
+    /// @brief Handles caching of material files.
+    /// @note May be used from any thread.
+    class BgsmFileManager : public ResourceManager
+    {
+    public:
+        BgsmFileManager(const VFS::Manager* vfs, double expiryDelay);
+        ~BgsmFileManager() = default;
+
+        /// Retrieve a material file from the cache or load it from the VFS if not cached yet.
+        Bgsm::MaterialFilePtr get(VFS::Path::NormalizedView name);
+
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
+    };
+
+}
+
+#endif
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index cc0a63359b..70348e956d 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -32,6 +32,13 @@ namespace Resource
                 return newShape;
             }
 
+            if (shape->getShapeType() == SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE)
+            {
+                const btScaledBvhTriangleMeshShape* trishape = static_cast<const btScaledBvhTriangleMeshShape*>(shape);
+                return CollisionShapePtr(new btScaledBvhTriangleMeshShape(
+                    const_cast<btBvhTriangleMeshShape*>(trishape->getChildShape()), trishape->getLocalScaling()));
+            }
+
             if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
             {
                 const btBvhTriangleMeshShape* trishape = static_cast<const btBvhTriangleMeshShape*>(shape);
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 9610fde49f..d9aad0f092 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_BULLETSHAPE_H
 #define OPENMW_COMPONENTS_RESOURCE_BULLETSHAPE_H
 
-#include <array>
 #include <map>
 #include <memory>
 
@@ -10,6 +9,9 @@
 #include <osg/ref_ptr>
 
 #include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
+#include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
+
+#include <components/vfs/pathutil.hpp>
 
 class btCollisionShape;
 
@@ -49,18 +51,19 @@ namespace Resource
         // collision box for creatures. For now, use one file <-> one resource for simplicity.
         CollisionBox mCollisionBox;
 
-        // Stores animated collision shapes. If any collision nodes in the NIF are animated, then mCollisionShape
-        // will be a btCompoundShape (which consists of one or more child shapes).
+        // Stores animated collision shapes.
+        // mCollisionShape is a btCompoundShape (which consists of one or more child shapes).
         // In this map, for each animated collision shape,
         // we store the node's record index mapped to the child index of the shape in the btCompoundShape.
         std::map<int, int> mAnimatedShapes;
 
-        std::string mFileName;
+        VFS::Path::Normalized mFileName;
         std::string mFileHash;
 
         VisualCollisionType mVisualCollisionType = VisualCollisionType::None;
 
         BulletShape() = default;
+        // Note this is always a shallow copy and the copy will not autodelete underlying vertex data
         BulletShape(const BulletShape& other, const osg::CopyOp& copyOp = osg::CopyOp());
 
         META_Object(Resource, BulletShape)
@@ -70,7 +73,7 @@ namespace Resource
         bool isAnimated() const { return !mAnimatedShapes.empty(); }
     };
 
-    // An instance of a BulletShape that may have its own unique scaling set on the mCollisionShape.
+    // An instance of a BulletShape that may have its own unique scaling set on collision shapes.
     // Vertex data is shallow-copied where possible. A ref_ptr to the original shape is held to keep vertex pointers
     // intact.
     class BulletShapeInstance : public BulletShape
@@ -102,6 +105,17 @@ namespace Resource
         }
     };
 
+    // btScaledBvhTriangleMeshShape that auto-deletes the child shape
+    struct ScaledTriangleMeshShape : public btScaledBvhTriangleMeshShape
+    {
+        ScaledTriangleMeshShape(btBvhTriangleMeshShape* childShape, const btVector3& localScaling)
+            : btScaledBvhTriangleMeshShape(childShape, localScaling)
+        {
+        }
+
+        ~ScaledTriangleMeshShape() override { delete getChildShape(); }
+    };
+
 }
 
 #endif
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 0e2089cb06..345efc7fbd 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -98,101 +98,91 @@ namespace Resource
     };
 
     BulletShapeManager::BulletShapeManager(
-        const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager)
-        : ResourceManager(vfs)
+        const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager, double expiryDelay)
+        : ResourceManager(vfs, expiryDelay)
         , mInstanceCache(new MultiObjectCache)
         , mSceneManager(sceneMgr)
         , mNifFileManager(nifFileManager)
     {
     }
 
-    BulletShapeManager::~BulletShapeManager() {}
+    BulletShapeManager::~BulletShapeManager() = default;
 
-    osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string& name)
+    osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(VFS::Path::NormalizedView name)
     {
-        const std::string normalized = VFS::Path::normalizeFilename(name);
+        if (osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name))
+            return osg::ref_ptr<BulletShape>(static_cast<BulletShape*>(obj.get()));
 
         osg::ref_ptr<BulletShape> shape;
-        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
-        if (obj)
-            shape = osg::ref_ptr<BulletShape>(static_cast<BulletShape*>(obj.get()));
+
+        if (Misc::getFileExtension(name.value()) == "nif")
+        {
+            NifBullet::BulletNifLoader loader;
+            shape = loader.load(*mNifFileManager->get(name));
+        }
         else
         {
-            if (Misc::getFileExtension(normalized) == "nif")
+            // TODO: support .bullet shape files
+
+            osg::ref_ptr<const osg::Node> constNode(mSceneManager->getTemplate(name));
+            // const-trickery required because there is no const version of NodeVisitor
+            osg::ref_ptr<osg::Node> node(const_cast<osg::Node*>(constNode.get()));
+
+            // Check first if there's a custom collision node
+            unsigned int visitAllNodesMask = 0xffffffff;
+            SceneUtil::FindByNameVisitor nameFinder("Collision");
+            nameFinder.setTraversalMask(visitAllNodesMask);
+            nameFinder.setNodeMaskOverride(visitAllNodesMask);
+            node->accept(nameFinder);
+            if (nameFinder.mFoundNode)
             {
-                NifBullet::BulletNifLoader loader;
-                shape = loader.load(*mNifFileManager->get(normalized));
+                NodeToShapeVisitor visitor;
+                visitor.setTraversalMask(visitAllNodesMask);
+                visitor.setNodeMaskOverride(visitAllNodesMask);
+                nameFinder.mFoundNode->accept(visitor);
+                shape = visitor.getShape();
             }
-            else
+
+            // Generate a collision shape from the mesh
+            if (!shape)
             {
-                // TODO: support .bullet shape files
-
-                osg::ref_ptr<const osg::Node> constNode(mSceneManager->getTemplate(normalized));
-                osg::ref_ptr<osg::Node> node(const_cast<osg::Node*>(
-                    constNode.get())); // const-trickery required because there is no const version of NodeVisitor
-
-                // Check first if there's a custom collision node
-                unsigned int visitAllNodesMask = 0xffffffff;
-                SceneUtil::FindByNameVisitor nameFinder("Collision");
-                nameFinder.setTraversalMask(visitAllNodesMask);
-                nameFinder.setNodeMaskOverride(visitAllNodesMask);
-                node->accept(nameFinder);
-                if (nameFinder.mFoundNode)
-                {
-                    NodeToShapeVisitor visitor;
-                    visitor.setTraversalMask(visitAllNodesMask);
-                    visitor.setNodeMaskOverride(visitAllNodesMask);
-                    nameFinder.mFoundNode->accept(visitor);
-                    shape = visitor.getShape();
-                }
-
-                // Generate a collision shape from the mesh
+                NodeToShapeVisitor visitor;
+                node->accept(visitor);
+                shape = visitor.getShape();
                 if (!shape)
-                {
-                    NodeToShapeVisitor visitor;
-                    node->accept(visitor);
-                    shape = visitor.getShape();
-                    if (!shape)
-                        return osg::ref_ptr<BulletShape>();
-                }
-
-                if (shape != nullptr)
-                {
-                    shape->mFileName = normalized;
-                    constNode->getUserValue(Misc::OsgUserValues::sFileHash, shape->mFileHash);
-                }
+                    return osg::ref_ptr<BulletShape>();
             }
 
-            mCache->addEntryToObjectCache(normalized, shape);
+            if (shape != nullptr)
+            {
+                shape->mFileName = name;
+                constNode->getUserValue(Misc::OsgUserValues::sFileHash, shape->mFileHash);
+            }
         }
+
+        mCache->addEntryToObjectCache(name.value(), shape);
+
         return shape;
     }
 
-    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::cacheInstance(const std::string& name)
+    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::cacheInstance(VFS::Path::NormalizedView name)
     {
-        const std::string normalized = VFS::Path::normalizeFilename(name);
-
-        osg::ref_ptr<BulletShapeInstance> instance = createInstance(normalized);
-        if (instance)
-            mInstanceCache->addEntryToObjectCache(normalized, instance.get());
+        osg::ref_ptr<BulletShapeInstance> instance = createInstance(name);
+        if (instance != nullptr)
+            mInstanceCache->addEntryToObjectCache(name, instance.get());
         return instance;
     }
 
-    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::getInstance(const std::string& name)
+    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::getInstance(VFS::Path::NormalizedView name)
     {
-        const std::string normalized = VFS::Path::normalizeFilename(name);
-
-        osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
-        if (obj.get())
+        if (osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(name))
             return static_cast<BulletShapeInstance*>(obj.get());
-        else
-            return createInstance(normalized);
+        return createInstance(name);
     }
 
-    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::string& name)
+    osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(VFS::Path::NormalizedView name)
     {
-        osg::ref_ptr<const BulletShape> shape = getShape(name);
-        if (shape)
+        if (osg::ref_ptr<const BulletShape> shape = getShape(name))
             return makeInstance(std::move(shape));
         return osg::ref_ptr<BulletShapeInstance>();
     }
@@ -213,8 +203,8 @@ namespace Resource
 
     void BulletShapeManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Shape", mCache->getCacheSize());
-        stats->setAttribute(frameNumber, "Shape Instance", mInstanceCache->getCacheSize());
+        Resource::reportStats("Shape", frameNumber, mCache->getStats(), *stats);
+        Resource::reportStats("Shape Instance", frameNumber, mInstanceCache->getStats(), *stats);
     }
 
 }
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index 1b4ce849fe..3c5a495c77 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -1,11 +1,10 @@
 #ifndef OPENMW_COMPONENTS_BULLETSHAPEMANAGER_H
 #define OPENMW_COMPONENTS_BULLETSHAPEMANAGER_H
 
-#include <map>
-#include <string>
-
 #include <osg/ref_ptr>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "bulletshape.hpp"
 #include "resourcemanager.hpp"
 
@@ -25,20 +24,21 @@ namespace Resource
     class BulletShapeManager : public ResourceManager
     {
     public:
-        BulletShapeManager(const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager);
+        BulletShapeManager(
+            const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager, double expiryDelay);
         ~BulletShapeManager();
 
         /// @note May return a null pointer if the object has no shape.
-        osg::ref_ptr<const BulletShape> getShape(const std::string& name);
+        osg::ref_ptr<const BulletShape> getShape(VFS::Path::NormalizedView name);
 
         /// Create an instance of the given shape and cache it for later use, so that future calls to getInstance() can
         /// simply return the cached instance instead of having to create a new one.
         /// @note The returned ref_ptr may be kept by the caller to ensure that the instance stays in cache for as long
         /// as needed.
-        osg::ref_ptr<BulletShapeInstance> cacheInstance(const std::string& name);
+        osg::ref_ptr<BulletShapeInstance> cacheInstance(VFS::Path::NormalizedView name);
 
         /// @note May return a null pointer if the object has no shape.
-        osg::ref_ptr<BulletShapeInstance> getInstance(const std::string& name);
+        osg::ref_ptr<BulletShapeInstance> getInstance(VFS::Path::NormalizedView name);
 
         /// @see ResourceManager::updateCache
         void updateCache(double referenceTime) override;
@@ -48,7 +48,7 @@ namespace Resource
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
     private:
-        osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
+        osg::ref_ptr<BulletShapeInstance> createInstance(VFS::Path::NormalizedView name);
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
         SceneManager* mSceneManager;
diff --git a/components/resource/cachestats.cpp b/components/resource/cachestats.cpp
new file mode 100644
index 0000000000..9cc0cea517
--- /dev/null
+++ b/components/resource/cachestats.cpp
@@ -0,0 +1,40 @@
+#include "cachestats.hpp"
+
+#include <osg/Stats>
+
+namespace Resource
+{
+    namespace
+    {
+        std::string makeAttribute(std::string_view prefix, std::string_view suffix)
+        {
+            std::string result;
+            result.reserve(prefix.size() + 1 + suffix.size());
+            result += prefix;
+            result += ' ';
+            result += suffix;
+            return result;
+        }
+    }
+
+    void addCacheStatsAttibutes(std::string_view prefix, std::vector<std::string>& out)
+    {
+        constexpr std::string_view suffixes[] = {
+            "Count",
+            "Get",
+            "Hit",
+            "Expired",
+        };
+
+        for (std::string_view suffix : suffixes)
+            out.push_back(makeAttribute(prefix, suffix));
+    }
+
+    void reportStats(std::string_view prefix, unsigned frameNumber, const CacheStats& src, osg::Stats& dst)
+    {
+        dst.setAttribute(frameNumber, makeAttribute(prefix, "Count"), static_cast<double>(src.mSize));
+        dst.setAttribute(frameNumber, makeAttribute(prefix, "Get"), static_cast<double>(src.mGet));
+        dst.setAttribute(frameNumber, makeAttribute(prefix, "Hit"), static_cast<double>(src.mHit));
+        dst.setAttribute(frameNumber, makeAttribute(prefix, "Expired"), static_cast<double>(src.mExpired));
+    }
+}
diff --git a/components/resource/cachestats.hpp b/components/resource/cachestats.hpp
new file mode 100644
index 0000000000..26589ffdda
--- /dev/null
+++ b/components/resource/cachestats.hpp
@@ -0,0 +1,29 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_CACHESATS
+#define OPENMW_COMPONENTS_RESOURCE_CACHESATS
+
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace osg
+{
+    class Stats;
+}
+
+namespace Resource
+{
+    struct CacheStats
+    {
+        std::size_t mSize = 0;
+        std::size_t mGet = 0;
+        std::size_t mHit = 0;
+        std::size_t mExpired = 0;
+    };
+
+    void addCacheStatsAttibutes(std::string_view prefix, std::vector<std::string>& out);
+
+    void reportStats(std::string_view prefix, unsigned frameNumber, const CacheStats& src, osg::Stats& dst);
+}
+
+#endif
diff --git a/components/resource/foreachbulletobject.cpp b/components/resource/foreachbulletobject.cpp
index dbad2aea62..9c205c8228 100644
--- a/components/resource/foreachbulletobject.cpp
+++ b/components/resource/foreachbulletobject.cpp
@@ -16,10 +16,6 @@
 #include <osg/ref_ptr>
 
 #include <algorithm>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -79,8 +75,7 @@ namespace Resource
 
             Log(Debug::Debug) << "Loaded " << cellRefs.size() << " cell refs";
 
-            const auto getKey
-                = [](const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
+            const auto getKey = [](const EsmLoader::Record<CellRef>& v) -> ESM::RefNum { return v.mValue.mRefNum; };
             std::vector<CellRef> result = prepareRecords(cellRefs, getKey);
 
             Log(Debug::Debug) << "Prepared " << result.size() << " unique cell refs";
@@ -98,7 +93,7 @@ namespace Resource
 
             for (CellRef& cellRef : cellRefs)
             {
-                std::string model(getModel(esmData, cellRef.mRefId, cellRef.mType));
+                VFS::Path::Normalized model(getModel(esmData, cellRef.mRefId, cellRef.mType));
                 if (model.empty())
                     continue;
 
@@ -108,7 +103,8 @@ namespace Resource
                 osg::ref_ptr<const Resource::BulletShape> shape = [&] {
                     try
                     {
-                        return bulletShapeManager.getShape("meshes/" + model);
+                        constexpr VFS::Path::NormalizedView prefix("meshes");
+                        return bulletShapeManager.getShape(prefix / model);
                     }
                     catch (const std::exception& e)
                     {
diff --git a/components/resource/foreachbulletobject.hpp b/components/resource/foreachbulletobject.hpp
index fe39a8ed8c..d7e99cf0b5 100644
--- a/components/resource/foreachbulletobject.hpp
+++ b/components/resource/foreachbulletobject.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_FOREACHBULLETOBJECT_H
 #define OPENMW_COMPONENTS_RESOURCE_FOREACHBULLETOBJECT_H
 
-#include <components/esm/defs.hpp>
+#include <components/esm/position.hpp>
 #include <components/resource/bulletshape.hpp>
 
 #include <osg/ref_ptr>
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index 178e681d4e..b7a19b4d52 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -5,6 +5,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/pathhelpers.hpp>
+#include <components/sceneutil/glextensions.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/pathutil.hpp>
 
@@ -46,8 +47,8 @@ namespace
 namespace Resource
 {
 
-    ImageManager::ImageManager(const VFS::Manager* vfs)
-        : ResourceManager(vfs)
+    ImageManager::ImageManager(const VFS::Manager* vfs, double expiryDelay)
+        : ResourceManager(vfs, expiryDelay)
         , mWarningImage(createWarningImage())
         , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba ignoreTga2Fields"))
         , mOptionsNoFlip(new osgDB::Options("dds_dxt1_detect_rgba ignoreTga2Fields"))
@@ -65,30 +66,28 @@ namespace Resource
             case (GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
             case (GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
             {
-                osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
-                if (exts
-                    && !exts->isTextureCompressionS3TCSupported
+                if (!SceneUtil::glExtensionsReady())
+                    return true; // hashtag yolo (CS might not have context when loading assets)
+                osg::GLExtensions& exts = SceneUtil::getGLExtensions();
+                if (!exts.isTextureCompressionS3TCSupported
                     // This one works too. Should it be included in isTextureCompressionS3TCSupported()? Submitted as a
                     // patch to OSG.
-                    && !osg::isGLExtensionSupported(0, "GL_S3_s3tc"))
+                    && !osg::isGLExtensionSupported(exts.contextID, "GL_S3_s3tc"))
                 {
                     return false;
                 }
                 break;
             }
-            // not bothering with checks for other compression formats right now, we are unlikely to ever use those
-            // anyway
+            // not bothering with checks for other compression formats right now
             default:
                 return true;
         }
         return true;
     }
 
-    osg::ref_ptr<osg::Image> ImageManager::getImage(std::string_view filename, bool disableFlip)
+    osg::ref_ptr<osg::Image> ImageManager::getImage(VFS::Path::NormalizedView path, bool disableFlip)
     {
-        const std::string normalized = VFS::Path::normalizeFilename(filename);
-
-        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(path);
         if (obj)
             return osg::ref_ptr<osg::Image>(static_cast<osg::Image*>(obj.get()));
         else
@@ -96,21 +95,21 @@ namespace Resource
             Files::IStreamPtr stream;
             try
             {
-                stream = mVFS->get(normalized);
+                stream = mVFS->get(path);
             }
             catch (std::exception& e)
             {
                 Log(Debug::Error) << "Failed to open image: " << e.what();
-                mCache->addEntryToObjectCache(normalized, mWarningImage);
+                mCache->addEntryToObjectCache(path.value(), mWarningImage);
                 return mWarningImage;
             }
 
-            const std::string ext(Misc::getFileExtension(normalized));
+            const std::string ext(Misc::getFileExtension(path.value()));
             osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(ext);
             if (!reader)
             {
-                Log(Debug::Error) << "Error loading " << filename << ": no readerwriter for '" << ext << "' found";
-                mCache->addEntryToObjectCache(normalized, mWarningImage);
+                Log(Debug::Error) << "Error loading " << path << ": no readerwriter for '" << ext << "' found";
+                mCache->addEntryToObjectCache(path.value(), mWarningImage);
                 return mWarningImage;
             }
 
@@ -122,8 +121,8 @@ namespace Resource
                 stream->read((char*)header, 18);
                 if (stream->gcount() != 18)
                 {
-                    Log(Debug::Error) << "Error loading " << filename << ": couldn't read TGA header";
-                    mCache->addEntryToObjectCache(normalized, mWarningImage);
+                    Log(Debug::Error) << "Error loading " << path << ": couldn't read TGA header";
+                    mCache->addEntryToObjectCache(path.value(), mWarningImage);
                     return mWarningImage;
                 }
                 int type = header[2];
@@ -141,23 +140,22 @@ namespace Resource
                 = reader->readImage(*stream, disableFlip ? mOptionsNoFlip : mOptions);
             if (!result.success())
             {
-                Log(Debug::Error) << "Error loading " << filename << ": " << result.message() << " code "
+                Log(Debug::Error) << "Error loading " << path << ": " << result.message() << " code "
                                   << result.status();
-                mCache->addEntryToObjectCache(normalized, mWarningImage);
+                mCache->addEntryToObjectCache(path.value(), mWarningImage);
                 return mWarningImage;
             }
 
             osg::ref_ptr<osg::Image> image = result.getImage();
 
-            image->setFileName(normalized);
+            image->setFileName(std::string(path.value()));
             if (!checkSupported(image))
             {
                 static bool uncompress = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr);
                 if (!uncompress)
                 {
-                    Log(Debug::Error) << "Error loading " << filename
-                                      << ": no S3TC texture compression support installed";
-                    mCache->addEntryToObjectCache(normalized, mWarningImage);
+                    Log(Debug::Error) << "Error loading " << path << ": no S3TC texture compression support installed";
+                    mCache->addEntryToObjectCache(path.value(), mWarningImage);
                     return mWarningImage;
                 }
                 else
@@ -188,7 +186,7 @@ namespace Resource
                 image = newImage;
             }
 
-            mCache->addEntryToObjectCache(normalized, image);
+            mCache->addEntryToObjectCache(path.value(), image);
             return image;
         }
     }
@@ -200,7 +198,7 @@ namespace Resource
 
     void ImageManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Image", mCache->getCacheSize());
+        Resource::reportStats("Image", frameNumber, mCache->getStats(), *stats);
     }
 
 }
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index ddb2fcc00c..ead55c792a 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -1,13 +1,12 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_IMAGEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCE_IMAGEMANAGER_H
 
-#include <map>
-#include <string>
-
 #include <osg/Image>
 #include <osg/Texture2D>
 #include <osg/ref_ptr>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "resourcemanager.hpp"
 
 namespace osgDB
@@ -23,12 +22,12 @@ namespace Resource
     class ImageManager : public ResourceManager
     {
     public:
-        ImageManager(const VFS::Manager* vfs);
+        explicit ImageManager(const VFS::Manager* vfs, double expiryDelay);
         ~ImageManager();
 
         /// Create or retrieve an Image
         /// Returns the dummy image if the given image is not found.
-        osg::ref_ptr<osg::Image> getImage(std::string_view filename, bool disableFlip = false);
+        osg::ref_ptr<osg::Image> getImage(VFS::Path::NormalizedView path, bool disableFlip = false);
 
         osg::Image* getWarningImage();
 
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 8820469e87..f962ba03fb 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -4,7 +4,6 @@
 
 #include <components/vfs/manager.hpp>
 
-#include <osg/Stats>
 #include <osgAnimation/Animation>
 #include <osgAnimation/BasicAnimationManager>
 #include <osgAnimation/Channel>
@@ -24,25 +23,45 @@
 
 namespace Resource
 {
+    namespace
+    {
+        std::string parseTextKey(const std::string& line)
+        {
+            const std::size_t spacePos = line.find_last_of(' ');
+            if (spacePos != std::string::npos)
+                return line.substr(0, spacePos);
+            return {};
+        }
+
+        double parseTimeSignature(std::string_view line)
+        {
+            const std::size_t spacePos = line.find_last_of(' ');
+            double time = 0.0;
+            if (spacePos != std::string_view::npos && spacePos + 1 < line.size())
+                time = Misc::StringUtils::toNumeric<double>(line.substr(spacePos + 1), time);
+            return time;
+        }
+    }
 
     RetrieveAnimationsVisitor::RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target,
-        osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager, const std::string& normalized,
-        const VFS::Manager* vfs)
+        osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager, VFS::Path::NormalizedView path,
+        const VFS::Manager& vfs)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mTarget(target)
         , mAnimationManager(std::move(animationManager))
-        , mNormalized(normalized)
-        , mVFS(vfs)
+        , mPath(path)
+        , mVFS(&vfs)
     {
+        mPath.changeExtension("txt");
     }
 
     bool RetrieveAnimationsVisitor::belongsToLeftUpperExtremity(const std::string& name)
     {
-        static const std::array boneNames = { "bip01_l_clavicle", "left_clavicle", "bip01_l_upperarm", "left_upper_arm",
-            "bip01_l_forearm", "bip01_l_hand", "left_hand", "left_wrist", "shield_bone", "bip01_l_pinky1",
-            "bip01_l_pinky2", "bip01_l_pinky3", "bip01_l_ring1", "bip01_l_ring2", "bip01_l_ring3", "bip01_l_middle1",
-            "bip01_l_middle2", "bip01_l_middle3", "bip01_l_pointer1", "bip01_l_pointer2", "bip01_l_pointer3",
-            "bip01_l_thumb1", "bip01_l_thumb2", "bip01_l_thumb3", "left_forearm" };
+        static const std::array boneNames = { "bip01 l clavicle", "left clavicle", "bip01 l upperarm", "left upper arm",
+            "bip01 l forearm", "bip01 l hand", "left hand", "left wrist", "shield bone", "bip01 l pinky1",
+            "bip01 l pinky2", "bip01 l pinky3", "bip01 l ring1", "bip01 l ring2", "bip01 l ring3", "bip01 l middle1",
+            "bip01 l middle2", "bip01 l middle3", "bip01 l pointer1", "bip01 l pointer2", "bip01 l pointer3",
+            "bip01 l thumb1", "bip01 l thumb2", "bip01 l thumb3", "left forearm" };
 
         if (std::find(boneNames.begin(), boneNames.end(), name) != boneNames.end())
             return true;
@@ -52,11 +71,11 @@ namespace Resource
 
     bool RetrieveAnimationsVisitor::belongsToRightUpperExtremity(const std::string& name)
     {
-        static const std::array boneNames = { "bip01_r_clavicle", "right_clavicle", "bip01_r_upperarm",
-            "right_upper_arm", "bip01_r_forearm", "bip01_r_hand", "right_hand", "right_wrist", "bip01_r_thumb1",
-            "bip01_r_thumb2", "bip01_r_thumb3", "weapon_bone", "bip01_r_pinky1", "bip01_r_pinky2", "bip01_r_pinky3",
-            "bip01_r_ring1", "bip01_r_ring2", "bip01_r_ring3", "bip01_r_middle1", "bip01_r_middle2", "bip01_r_middle3",
-            "bip01_r_pointer1", "bip01_r_pointer2", "bip01_r_pointer3", "right_forearm" };
+        static const std::array boneNames = { "bip01 r clavicle", "right clavicle", "bip01 r upperarm",
+            "right upper arm", "bip01 r forearm", "bip01 r hand", "right hand", "right wrist", "bip01 r thumb1",
+            "bip01 r thumb2", "bip01 r thumb3", "weapon bone", "bip01 r pinky1", "bip01 r pinky2", "bip01 r pinky3",
+            "bip01 r ring1", "bip01 r ring2", "bip01 r ring3", "bip01 r middle1", "bip01 r middle2", "bip01 r middle3",
+            "bip01 r pointer1", "bip01 r pointer2", "bip01 r pointer3", "right forearm" };
 
         if (std::find(boneNames.begin(), boneNames.end(), name) != boneNames.end())
             return true;
@@ -67,7 +86,7 @@ namespace Resource
     bool RetrieveAnimationsVisitor::belongsToTorso(const std::string& name)
     {
         static const std::array boneNames
-            = { "bip01_spine1", "bip01_spine2", "bip01_neck", "bip01_head", "head", "neck", "chest", "groin" };
+            = { "bip01 spine1", "bip01 spine2", "bip01 neck", "bip01 head", "head", "neck", "chest", "groin" };
 
         if (std::find(boneNames.begin(), boneNames.end(), name) != boneNames.end())
             return true;
@@ -123,7 +142,7 @@ namespace Resource
                     mergedAnimationTrack->addChannel(channel.get()->clone());
                 }
 
-                callback->addMergedAnimationTrack(mergedAnimationTrack);
+                callback->addMergedAnimationTrack(std::move(mergedAnimationTrack));
 
                 float startTime = animation->getStartTime();
                 float stopTime = startTime + animation->getDuration();
@@ -143,18 +162,22 @@ namespace Resource
         // InventoryWeaponOneHand, PickProbe, Slash, Thrust, Chop... even "Slash Small Follow" osgAnimation formats
         // should have a .txt file with the same name, each line holding a textkey and whitespace separated time
         // value e.g. idle: start 0.0333
-        try
+        if (const Files::IStreamPtr textKeysFile = mVFS->find(mPath))
         {
-            Files::IStreamPtr textKeysFile = mVFS->get(changeFileExtension(mNormalized, "txt"));
-            std::string line;
-            while (getline(*textKeysFile, line))
+            try
             {
-                mTarget.mTextKeys.emplace(parseTimeSignature(line), parseTextKey(line));
+                std::string line;
+                while (getline(*textKeysFile, line))
+                    mTarget.mTextKeys.emplace(parseTimeSignature(line), parseTextKey(line));
+            }
+            catch (const std::exception& e)
+            {
+                Log(Debug::Warning) << "Failed to read text key file \"" << mPath << "\": " << e.what();
             }
         }
-        catch (std::exception&)
+        else
         {
-            Log(Debug::Warning) << "No textkey file found for " << mNormalized;
+            Log(Debug::Warning) << "Text key file is not found: " << mPath;
         }
 
         callback->setEmulatedAnimations(emulatedAnimations);
@@ -175,80 +198,47 @@ namespace Resource
         traverse(node);
     }
 
-    std::string RetrieveAnimationsVisitor::parseTextKey(const std::string& line)
-    {
-        size_t spacePos = line.find_last_of(' ');
-        if (spacePos != std::string::npos)
-            return line.substr(0, spacePos);
-        return "";
-    }
-
-    double RetrieveAnimationsVisitor::parseTimeSignature(const std::string& line)
-    {
-        size_t spacePos = line.find_last_of(' ');
-        double time = 0.0;
-        if (spacePos != std::string::npos && spacePos + 1 < line.size())
-            time = Misc::StringUtils::toNumeric<double>(line.substr(spacePos + 1), time);
-        return time;
-    }
-
-    std::string RetrieveAnimationsVisitor::changeFileExtension(const std::string& file, const std::string& ext)
-    {
-        size_t extPos = file.find_last_of('.');
-        if (extPos != std::string::npos && extPos + 1 < file.size())
-        {
-            return file.substr(0, extPos + 1) + ext;
-        }
-        return file;
-    }
-
-}
-
-namespace Resource
-{
-
-    KeyframeManager::KeyframeManager(const VFS::Manager* vfs, SceneManager* sceneManager)
-        : ResourceManager(vfs)
+    KeyframeManager::KeyframeManager(const VFS::Manager* vfs, SceneManager* sceneManager, double expiryDelay,
+        const ToUTF8::StatelessUtf8Encoder* encoder)
+        : ResourceManager(vfs, expiryDelay)
         , mSceneManager(sceneManager)
+        , mEncoder(encoder)
     {
     }
 
-    osg::ref_ptr<const SceneUtil::KeyframeHolder> KeyframeManager::get(const std::string& name)
+    osg::ref_ptr<const SceneUtil::KeyframeHolder> KeyframeManager::get(VFS::Path::NormalizedView name)
     {
-        const std::string normalized = VFS::Path::normalizeFilename(name);
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
 
-        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
-        if (obj)
+        if (obj != nullptr)
             return osg::ref_ptr<const SceneUtil::KeyframeHolder>(static_cast<SceneUtil::KeyframeHolder*>(obj.get()));
+
+        osg::ref_ptr<SceneUtil::KeyframeHolder> loaded(new SceneUtil::KeyframeHolder);
+        if (Misc::getFileExtension(name.value()) == "kf")
+        {
+            auto file = std::make_shared<Nif::NIFFile>(name);
+            Nif::Reader reader(*file, mEncoder);
+            reader.parse(mVFS->get(name));
+            NifOsg::Loader::loadKf(*file, *loaded.get());
+        }
         else
         {
-            osg::ref_ptr<SceneUtil::KeyframeHolder> loaded(new SceneUtil::KeyframeHolder);
-            if (Misc::getFileExtension(normalized) == "kf")
+            osg::ref_ptr<osg::Node> scene = const_cast<osg::Node*>(mSceneManager->getTemplate(name).get());
+            osg::ref_ptr<osgAnimation::BasicAnimationManager> bam
+                = dynamic_cast<osgAnimation::BasicAnimationManager*>(scene->getUpdateCallback());
+            if (bam)
             {
-                auto file = std::make_shared<Nif::NIFFile>(normalized);
-                Nif::Reader reader(*file);
-                reader.parse(mVFS->getNormalized(normalized));
-                NifOsg::Loader::loadKf(*file, *loaded.get());
+                Resource::RetrieveAnimationsVisitor rav(*loaded.get(), std::move(bam), name, *mVFS);
+                scene->accept(rav);
             }
-            else
-            {
-                osg::ref_ptr<osg::Node> scene = const_cast<osg::Node*>(mSceneManager->getTemplate(normalized).get());
-                osg::ref_ptr<osgAnimation::BasicAnimationManager> bam
-                    = dynamic_cast<osgAnimation::BasicAnimationManager*>(scene->getUpdateCallback());
-                if (bam)
-                {
-                    Resource::RetrieveAnimationsVisitor rav(*loaded.get(), bam, normalized, mVFS);
-                    scene->accept(rav);
-                }
-            }
-            mCache->addEntryToObjectCache(normalized, loaded);
-            return loaded;
         }
+        mCache->addEntryToObjectCache(name.value(), loaded);
+        return loaded;
     }
 
     void KeyframeManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Keyframe", mCache->getCacheSize());
+        Resource::reportStats("Keyframe", frameNumber, mCache->getStats(), *stats);
     }
 
 }
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index d075e65d4c..ef7e7e4e4a 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -1,23 +1,29 @@
 #ifndef OPENMW_COMPONENTS_KEYFRAMEMANAGER_H
 #define OPENMW_COMPONENTS_KEYFRAMEMANAGER_H
 
+#include <string>
+
 #include <osg/ref_ptr>
 #include <osgAnimation/BasicAnimationManager>
-#include <string>
 
 #include <components/sceneutil/keyframe.hpp>
 
 #include "resourcemanager.hpp"
 
+namespace ToUTF8
+{
+    class StatelessUtf8Encoder;
+}
+
 namespace Resource
 {
     /// @brief extract animations from OSG formats to OpenMW's animation system
     class RetrieveAnimationsVisitor : public osg::NodeVisitor
     {
     public:
-        RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target,
-            osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager, const std::string& normalized,
-            const VFS::Manager* vfs);
+        explicit RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target,
+            osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager, VFS::Path::NormalizedView path,
+            const VFS::Manager& vfs);
 
         bool belongsToLeftUpperExtremity(const std::string& name);
         bool belongsToRightUpperExtremity(const std::string& name);
@@ -27,13 +33,9 @@ namespace Resource
         virtual void apply(osg::Node& node) override;
 
     private:
-        std::string changeFileExtension(const std::string& file, const std::string& ext);
-        std::string parseTextKey(const std::string& line);
-        double parseTimeSignature(const std::string& line);
-
         SceneUtil::KeyframeHolder& mTarget;
         osg::ref_ptr<osgAnimation::BasicAnimationManager> mAnimationManager;
-        std::string mNormalized;
+        VFS::Path::Normalized mPath;
         const VFS::Manager* mVFS;
     };
 }
@@ -48,17 +50,19 @@ namespace Resource
     class KeyframeManager : public ResourceManager
     {
     public:
-        KeyframeManager(const VFS::Manager* vfs, SceneManager* sceneManager);
+        explicit KeyframeManager(const VFS::Manager* vfs, SceneManager* sceneManager, double expiryDelay,
+            const ToUTF8::StatelessUtf8Encoder* encoder);
         ~KeyframeManager() = default;
 
         /// Retrieve a read-only keyframe resource by name (case-insensitive).
         /// @note Throws an exception if the resource is not found.
-        osg::ref_ptr<const SceneUtil::KeyframeHolder> get(const std::string& name);
+        osg::ref_ptr<const SceneUtil::KeyframeHolder> get(VFS::Path::NormalizedView name);
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
     private:
         SceneManager* mSceneManager;
+        const ToUTF8::StatelessUtf8Encoder* mEncoder;
     };
 
 }
diff --git a/components/resource/multiobjectcache.cpp b/components/resource/multiobjectcache.cpp
index f94dabc77c..0be9be232e 100644
--- a/components/resource/multiobjectcache.cpp
+++ b/components/resource/multiobjectcache.cpp
@@ -6,11 +6,6 @@
 
 namespace Resource
 {
-
-    MultiObjectCache::MultiObjectCache() {}
-
-    MultiObjectCache::~MultiObjectCache() {}
-
     void MultiObjectCache::removeUnreferencedObjectsInCache()
     {
         std::vector<osg::ref_ptr<osg::Object>> objectsToRemove;
@@ -25,6 +20,7 @@ namespace Resource
                 {
                     objectsToRemove.push_back(oitr->second);
                     _objectCache.erase(oitr++);
+                    ++mExpired;
                 }
                 else
                 {
@@ -43,7 +39,7 @@ namespace Resource
         _objectCache.clear();
     }
 
-    void MultiObjectCache::addEntryToObjectCache(const std::string& filename, osg::Object* object)
+    void MultiObjectCache::addEntryToObjectCache(VFS::Path::NormalizedView filename, osg::Object* object)
     {
         if (!object)
         {
@@ -51,21 +47,23 @@ namespace Resource
             return;
         }
         std::lock_guard<std::mutex> lock(_objectCacheMutex);
-        _objectCache.insert(std::make_pair(filename, object));
+        _objectCache.emplace(filename, object);
     }
 
-    osg::ref_ptr<osg::Object> MultiObjectCache::takeFromObjectCache(const std::string& fileName)
+    osg::ref_ptr<osg::Object> MultiObjectCache::takeFromObjectCache(VFS::Path::NormalizedView fileName)
     {
         std::lock_guard<std::mutex> lock(_objectCacheMutex);
-        ObjectCacheMap::iterator found = _objectCache.find(fileName);
-        if (found == _objectCache.end())
-            return osg::ref_ptr<osg::Object>();
-        else
+        ++mGet;
+        const auto it = _objectCache.find(fileName);
+        if (it != _objectCache.end())
         {
-            osg::ref_ptr<osg::Object> object = found->second;
-            _objectCache.erase(found);
+            osg::ref_ptr<osg::Object> object = std::move(it->second);
+            _objectCache.erase(it);
+            ++mHit;
             return object;
         }
+
+        return nullptr;
     }
 
     void MultiObjectCache::releaseGLObjects(osg::State* state)
@@ -79,10 +77,15 @@ namespace Resource
         }
     }
 
-    unsigned int MultiObjectCache::getCacheSize() const
+    CacheStats MultiObjectCache::getStats() const
     {
         std::lock_guard<std::mutex> lock(_objectCacheMutex);
-        return _objectCache.size();
+        return CacheStats{
+            .mSize = _objectCache.size(),
+            .mGet = mGet,
+            .mHit = mHit,
+            .mExpired = mExpired,
+        };
     }
 
 }
diff --git a/components/resource/multiobjectcache.hpp b/components/resource/multiobjectcache.hpp
index e1629f3197..6e05f462f0 100644
--- a/components/resource/multiobjectcache.hpp
+++ b/components/resource/multiobjectcache.hpp
@@ -3,11 +3,14 @@
 
 #include <map>
 #include <mutex>
-#include <string>
 
 #include <osg/Referenced>
 #include <osg/ref_ptr>
 
+#include <components/vfs/pathutil.hpp>
+
+#include "cachestats.hpp"
+
 namespace osg
 {
     class Object;
@@ -21,29 +24,29 @@ namespace Resource
     class MultiObjectCache : public osg::Referenced
     {
     public:
-        MultiObjectCache();
-        ~MultiObjectCache();
-
         void removeUnreferencedObjectsInCache();
 
         /** Remove all objects from the cache. */
         void clear();
 
-        void addEntryToObjectCache(const std::string& filename, osg::Object* object);
+        void addEntryToObjectCache(VFS::Path::NormalizedView filename, osg::Object* object);
 
         /** Take an Object from cache. Return nullptr if no object found. */
-        osg::ref_ptr<osg::Object> takeFromObjectCache(const std::string& fileName);
+        osg::ref_ptr<osg::Object> takeFromObjectCache(VFS::Path::NormalizedView fileName);
 
         /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state);
 
-        unsigned int getCacheSize() const;
+        CacheStats getStats() const;
 
     protected:
-        typedef std::multimap<std::string, osg::ref_ptr<osg::Object>> ObjectCacheMap;
+        typedef std::multimap<VFS::Path::Normalized, osg::ref_ptr<osg::Object>, std::less<>> ObjectCacheMap;
 
         ObjectCacheMap _objectCache;
         mutable std::mutex _objectCacheMutex;
+        std::size_t mGet = 0;
+        std::size_t mHit = 0;
+        std::size_t mExpired = 0;
     };
 
 }
diff --git a/components/resource/niffilemanager.cpp b/components/resource/niffilemanager.cpp
index ea95edf2ae..d670f41ee9 100644
--- a/components/resource/niffilemanager.cpp
+++ b/components/resource/niffilemanager.cpp
@@ -3,7 +3,6 @@
 #include <iostream>
 
 #include <osg/Object>
-#include <osg/Stats>
 
 #include <components/vfs/manager.hpp>
 
@@ -24,39 +23,40 @@ namespace Resource
         {
         }
 
-        NifFileHolder() {}
+        NifFileHolder() = default;
 
         META_Object(Resource, NifFileHolder)
 
         Nif::NIFFilePtr mNifFile;
     };
 
-    NifFileManager::NifFileManager(const VFS::Manager* vfs)
-        : ResourceManager(vfs)
+    NifFileManager::NifFileManager(const VFS::Manager* vfs, const ToUTF8::StatelessUtf8Encoder* encoder)
+        // NIF files aren't needed any more once the converted objects are cached in SceneManager / BulletShapeManager,
+        // so no point in using an expiry delay.
+        : ResourceManager(vfs, 0)
+        , mEncoder(encoder)
     {
     }
 
-    NifFileManager::~NifFileManager() {}
+    NifFileManager::~NifFileManager() = default;
 
-    Nif::NIFFilePtr NifFileManager::get(const std::string& name)
+    Nif::NIFFilePtr NifFileManager::get(VFS::Path::NormalizedView name)
     {
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
-        if (obj)
+        if (obj != nullptr)
             return static_cast<NifFileHolder*>(obj.get())->mNifFile;
-        else
-        {
-            auto file = std::make_shared<Nif::NIFFile>(name);
-            Nif::Reader reader(*file);
-            reader.parse(mVFS->get(name));
-            obj = new NifFileHolder(file);
-            mCache->addEntryToObjectCache(name, obj);
-            return file;
-        }
+
+        auto file = std::make_shared<Nif::NIFFile>(name);
+        Nif::Reader reader(*file, mEncoder);
+        reader.parse(mVFS->get(name));
+        obj = new NifFileHolder(file);
+        mCache->addEntryToObjectCache(name.value(), obj);
+        return file;
     }
 
     void NifFileManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Nif", mCache->getCacheSize());
+        Resource::reportStats("Nif", frameNumber, mCache->getStats(), *stats);
     }
 
 }
diff --git a/components/resource/niffilemanager.hpp b/components/resource/niffilemanager.hpp
index 5aef3f3016..a5395fef7e 100644
--- a/components/resource/niffilemanager.hpp
+++ b/components/resource/niffilemanager.hpp
@@ -5,6 +5,11 @@
 
 #include "resourcemanager.hpp"
 
+namespace ToUTF8
+{
+    class StatelessUtf8Encoder;
+}
+
 namespace Resource
 {
 
@@ -12,14 +17,16 @@ namespace Resource
     /// @note May be used from any thread.
     class NifFileManager : public ResourceManager
     {
+        const ToUTF8::StatelessUtf8Encoder* mEncoder;
+
     public:
-        NifFileManager(const VFS::Manager* vfs);
+        NifFileManager(const VFS::Manager* vfs, const ToUTF8::StatelessUtf8Encoder* encoder);
         ~NifFileManager();
 
         /// Retrieve a NIF file from the cache, or load it from the VFS if not cached yet.
         /// @note For performance reasons the NifFileManager does not handle case folding, needs
         /// to be done in advance by other managers accessing the NifFileManager.
-        Nif::NIFFilePtr get(const std::string& name);
+        Nif::NIFFilePtr get(VFS::Path::NormalizedView name);
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
     };
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index 3847129ed3..e619b7102c 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -20,76 +20,59 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
 #define OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
 
+#include "cachestats.hpp"
+
 #include <osg/Node>
 #include <osg/Referenced>
 #include <osg/ref_ptr>
 
+#include <algorithm>
 #include <map>
 #include <mutex>
 #include <optional>
 #include <string>
+#include <vector>
 
 namespace osg
 {
     class Object;
     class State;
     class NodeVisitor;
+    class Stats;
 }
 
 namespace Resource
 {
+    struct GenericObjectCacheItem
+    {
+        osg::ref_ptr<osg::Object> mValue;
+        double mLastUsage;
+    };
 
     template <typename KeyType>
     class GenericObjectCache : public osg::Referenced
     {
     public:
-        GenericObjectCache()
-            : osg::Referenced(true)
-        {
-        }
-
-        /** For each object in the cache which has an reference count greater than 1
-         * (and therefore referenced by elsewhere in the application) set the time stamp
-         * for that object in the cache to specified time.
-         * This would typically be called once per frame by applications which are doing database paging,
-         * and need to prune objects that are no longer required.
-         * The time used should be taken from the FrameStamp::getReferenceTime().*/
-        void updateTimeStampOfObjectsInCacheWithExternalReferences(double referenceTime)
-        {
-            // look for objects with external references and update their time stamp.
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
-            {
-                // If ref count is greater than 1, the object has an external reference.
-                // If the timestamp is yet to be initialized, it needs to be updated too.
-                if ((itr->second.first != nullptr && itr->second.first->referenceCount() > 1)
-                    || itr->second.second == 0.0)
-                    itr->second.second = referenceTime;
-            }
-        }
-
-        /** Removed object in the cache which have a time stamp at or before the specified expiry time.
-         * This would typically be called once per frame by applications which are doing database paging,
-         * and need to prune objects that are no longer required, and called after the a called
-         * after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(expirtyTime).*/
-        void removeExpiredObjectsInCache(double expiryTime)
+        // Update last usage timestamp using referenceTime for each cache time if they are not nullptr and referenced
+        // from somewhere else. Remove items with last usage > expiryTime. Note: last usage might be updated from other
+        // places so nullptr or not references elsewhere items are not always removed.
+        void update(double referenceTime, double expiryDelay)
         {
             std::vector<osg::ref_ptr<osg::Object>> objectsToRemove;
             {
-                std::lock_guard<std::mutex> lock(_objectCacheMutex);
-                // Remove expired entries from object cache
-                typename ObjectCacheMap::iterator oitr = _objectCache.begin();
-                while (oitr != _objectCache.end())
-                {
-                    if (oitr->second.second <= expiryTime)
-                    {
-                        if (oitr->second.first != nullptr)
-                            objectsToRemove.push_back(oitr->second.first);
-                        _objectCache.erase(oitr++);
-                    }
-                    else
-                        ++oitr;
-                }
+                const double expiryTime = referenceTime - expiryDelay;
+                std::lock_guard<std::mutex> lock(mMutex);
+                std::erase_if(mItems, [&](auto& v) {
+                    Item& item = v.second;
+                    if ((item.mValue != nullptr && item.mValue->referenceCount() > 1) || item.mLastUsage == 0)
+                        item.mLastUsage = referenceTime;
+                    if (item.mLastUsage > expiryTime)
+                        return false;
+                    ++mExpired;
+                    if (item.mValue != nullptr)
+                        objectsToRemove.push_back(std::move(item.mValue));
+                    return true;
+                });
             }
             // note, actual unref happens outside of the lock
             objectsToRemove.clear();
@@ -98,117 +81,127 @@ namespace Resource
         /** Remove all objects in the cache regardless of having external references or expiry times.*/
         void clear()
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            _objectCache.clear();
+            std::lock_guard<std::mutex> lock(mMutex);
+            mItems.clear();
         }
 
         /** Add a key,object,timestamp triple to the Registry::ObjectCache.*/
-        void addEntryToObjectCache(const KeyType& key, osg::Object* object, double timestamp = 0.0)
+        template <class K>
+        void addEntryToObjectCache(K&& key, osg::Object* object, double timestamp = 0.0)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            _objectCache[key] = ObjectTimeStampPair(object, timestamp);
+            std::lock_guard<std::mutex> lock(mMutex);
+            const auto it = mItems.find(key);
+            if (it == mItems.end())
+                mItems.emplace_hint(it, std::forward<K>(key), Item{ object, timestamp });
+            else
+                it->second = Item{ object, timestamp };
         }
 
         /** Remove Object from cache.*/
-        void removeFromObjectCache(const KeyType& key)
+        void removeFromObjectCache(const auto& key)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            typename ObjectCacheMap::iterator itr = _objectCache.find(key);
-            if (itr != _objectCache.end())
-                _objectCache.erase(itr);
+            std::lock_guard<std::mutex> lock(mMutex);
+            const auto itr = mItems.find(key);
+            if (itr != mItems.end())
+                mItems.erase(itr);
         }
 
         /** Get an ref_ptr<Object> from the object cache*/
-        osg::ref_ptr<osg::Object> getRefFromObjectCache(const KeyType& key)
+        osg::ref_ptr<osg::Object> getRefFromObjectCache(const auto& key)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            typename ObjectCacheMap::iterator itr = _objectCache.find(key);
-            if (itr != _objectCache.end())
-                return itr->second.first;
-            else
-                return nullptr;
+            std::lock_guard<std::mutex> lock(mMutex);
+            if (Item* const item = find(key))
+                return item->mValue;
+            return nullptr;
         }
 
-        std::optional<osg::ref_ptr<osg::Object>> getRefFromObjectCacheOrNone(const KeyType& key)
+        std::optional<osg::ref_ptr<osg::Object>> getRefFromObjectCacheOrNone(const auto& key)
         {
-            const std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            const auto it = _objectCache.find(key);
-            if (it == _objectCache.end())
-                return std::nullopt;
-            return it->second.first;
+            const std::lock_guard<std::mutex> lock(mMutex);
+            if (Item* const item = find(key))
+                return item->mValue;
+            return std::nullopt;
         }
 
         /** Check if an object is in the cache, and if it is, update its usage time stamp. */
-        bool checkInObjectCache(const KeyType& key, double timeStamp)
+        bool checkInObjectCache(const auto& key, double timeStamp)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            typename ObjectCacheMap::iterator itr = _objectCache.find(key);
-            if (itr != _objectCache.end())
+            std::lock_guard<std::mutex> lock(mMutex);
+            if (Item* const item = find(key))
             {
-                itr->second.second = timeStamp;
+                item->mLastUsage = timeStamp;
                 return true;
             }
-            else
-                return false;
+            return false;
         }
 
         /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
-            {
-                osg::Object* object = itr->second.first.get();
-                object->releaseGLObjects(state);
-            }
+            std::lock_guard<std::mutex> lock(mMutex);
+            for (const auto& [k, v] : mItems)
+                v.mValue->releaseGLObjects(state);
         }
 
         /** call node->accept(nv); for all nodes in the objectCache. */
         void accept(osg::NodeVisitor& nv)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
-            {
-                osg::Object* object = itr->second.first.get();
-                if (object)
-                {
-                    osg::Node* node = dynamic_cast<osg::Node*>(object);
-                    if (node)
+            std::lock_guard<std::mutex> lock(mMutex);
+            for (const auto& [k, v] : mItems)
+                if (osg::Object* const object = v.mValue.get())
+                    if (osg::Node* const node = dynamic_cast<osg::Node*>(object))
                         node->accept(nv);
-                }
-            }
         }
 
         /** call operator()(KeyType, osg::Object*) for each object in the cache. */
         template <class Functor>
-        void call(Functor& f)
+        void call(Functor&& f)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            for (typename ObjectCacheMap::iterator it = _objectCache.begin(); it != _objectCache.end(); ++it)
-                f(it->first, it->second.first.get());
+            std::lock_guard<std::mutex> lock(mMutex);
+            for (const auto& [k, v] : mItems)
+                f(k, v.mValue.get());
         }
 
-        /** Get the number of objects in the cache. */
-        unsigned int getCacheSize() const
+        template <class K>
+        std::optional<std::pair<KeyType, osg::ref_ptr<osg::Object>>> lowerBound(K&& key)
         {
-            std::lock_guard<std::mutex> lock(_objectCacheMutex);
-            return _objectCache.size();
+            const std::lock_guard<std::mutex> lock(mMutex);
+            const auto it = mItems.lower_bound(std::forward<K>(key));
+            if (it == mItems.end())
+                return std::nullopt;
+            return std::pair(it->first, it->second.mValue);
+        }
+
+        CacheStats getStats() const
+        {
+            const std::lock_guard<std::mutex> lock(mMutex);
+            return CacheStats{
+                .mSize = mItems.size(),
+                .mGet = mGet,
+                .mHit = mHit,
+                .mExpired = mExpired,
+            };
         }
 
     protected:
-        virtual ~GenericObjectCache() {}
+        using Item = GenericObjectCacheItem;
 
-        typedef std::pair<osg::ref_ptr<osg::Object>, double> ObjectTimeStampPair;
-        typedef std::map<KeyType, ObjectTimeStampPair> ObjectCacheMap;
+        std::map<KeyType, Item, std::less<>> mItems;
+        mutable std::mutex mMutex;
+        std::size_t mGet = 0;
+        std::size_t mHit = 0;
+        std::size_t mExpired = 0;
 
-        ObjectCacheMap _objectCache;
-        mutable std::mutex _objectCacheMutex;
+        Item* find(const auto& key)
+        {
+            ++mGet;
+            const auto it = mItems.find(key);
+            if (it == mItems.end())
+                return nullptr;
+            ++mHit;
+            return &it->second;
+        }
     };
-
-    class ObjectCache : public GenericObjectCache<std::string>
-    {
-    };
-
 }
 
 #endif
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index fc5ecc7f03..63ec95de63 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -3,6 +3,8 @@
 
 #include <osg/ref_ptr>
 
+#include <components/vfs/pathutil.hpp>
+
 #include "objectcache.hpp"
 
 namespace VFS
@@ -23,11 +25,11 @@ namespace Resource
     {
     public:
         virtual ~BaseResourceManager() = default;
-        virtual void updateCache(double referenceTime) {}
-        virtual void clearCache() {}
-        virtual void setExpiryDelay(double expiryDelay) {}
-        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) const {}
-        virtual void releaseGLObjects(osg::State* state) {}
+        virtual void updateCache(double referenceTime) = 0;
+        virtual void clearCache() = 0;
+        virtual void setExpiryDelay(double expiryDelay) = 0;
+        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) const = 0;
+        virtual void releaseGLObjects(osg::State* state) = 0;
     };
 
     /// @brief Base class for managers that require a virtual file system and object cache.
@@ -39,27 +41,23 @@ namespace Resource
     public:
         typedef GenericObjectCache<KeyType> CacheType;
 
-        GenericResourceManager(const VFS::Manager* vfs)
+        explicit GenericResourceManager(const VFS::Manager* vfs, double expiryDelay)
             : mVFS(vfs)
             , mCache(new CacheType)
-            , mExpiryDelay(0.0)
+            , mExpiryDelay(expiryDelay)
         {
         }
 
         virtual ~GenericResourceManager() = default;
 
         /// Clear cache entries that have not been referenced for longer than expiryDelay.
-        void updateCache(double referenceTime) override
-        {
-            mCache->updateTimeStampOfObjectsInCacheWithExternalReferences(referenceTime);
-            mCache->removeExpiredObjectsInCache(referenceTime - mExpiryDelay);
-        }
+        void updateCache(double referenceTime) override { mCache->update(referenceTime, mExpiryDelay); }
 
         /// Clear all cache entries.
         void clearCache() override { mCache->clear(); }
 
         /// How long to keep objects in cache after no longer being referenced.
-        void setExpiryDelay(double expiryDelay) override { mExpiryDelay = expiryDelay; }
+        void setExpiryDelay(double expiryDelay) final { mExpiryDelay = expiryDelay; }
         double getExpiryDelay() const { return mExpiryDelay; }
 
         const VFS::Manager* getVFS() const { return mVFS; }
@@ -77,8 +75,8 @@ namespace Resource
     class ResourceManager : public GenericResourceManager<std::string>
     {
     public:
-        ResourceManager(const VFS::Manager* vfs)
-            : GenericResourceManager<std::string>(vfs)
+        explicit ResourceManager(const VFS::Manager* vfs, double expiryDelay)
+            : GenericResourceManager(vfs, expiryDelay)
         {
         }
     };
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 1f3f6bf198..f3eb835ddb 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -2,6 +2,8 @@
 
 #include <algorithm>
 
+#include "animblendrulesmanager.hpp"
+#include "bgsmfilemanager.hpp"
 #include "imagemanager.hpp"
 #include "keyframemanager.hpp"
 #include "niffilemanager.hpp"
@@ -10,19 +12,25 @@
 namespace Resource
 {
 
-    ResourceSystem::ResourceSystem(const VFS::Manager* vfs)
+    ResourceSystem::ResourceSystem(
+        const VFS::Manager* vfs, double expiryDelay, const ToUTF8::StatelessUtf8Encoder* encoder)
         : mVFS(vfs)
     {
-        mNifFileManager = std::make_unique<NifFileManager>(vfs);
-        mImageManager = std::make_unique<ImageManager>(vfs);
-        mSceneManager = std::make_unique<SceneManager>(vfs, mImageManager.get(), mNifFileManager.get());
-        mKeyframeManager = std::make_unique<KeyframeManager>(vfs, mSceneManager.get());
+        mNifFileManager = std::make_unique<NifFileManager>(vfs, encoder);
+        mBgsmFileManager = std::make_unique<BgsmFileManager>(vfs, expiryDelay);
+        mImageManager = std::make_unique<ImageManager>(vfs, expiryDelay);
+        mSceneManager = std::make_unique<SceneManager>(
+            vfs, mImageManager.get(), mNifFileManager.get(), mBgsmFileManager.get(), expiryDelay);
+        mKeyframeManager = std::make_unique<KeyframeManager>(vfs, mSceneManager.get(), expiryDelay, encoder);
+        mAnimBlendRulesManager = std::make_unique<AnimBlendRulesManager>(vfs, expiryDelay);
 
         addResourceManager(mNifFileManager.get());
+        addResourceManager(mBgsmFileManager.get());
         addResourceManager(mKeyframeManager.get());
         // note, scene references images so add images afterwards for correct implementation of updateCache()
         addResourceManager(mSceneManager.get());
         addResourceManager(mImageManager.get());
+        addResourceManager(mAnimBlendRulesManager.get());
     }
 
     ResourceSystem::~ResourceSystem()
@@ -42,6 +50,11 @@ namespace Resource
         return mImageManager.get();
     }
 
+    BgsmFileManager* ResourceSystem::getBgsmFileManager()
+    {
+        return mBgsmFileManager.get();
+    }
+
     NifFileManager* ResourceSystem::getNifFileManager()
     {
         return mNifFileManager.get();
@@ -52,6 +65,11 @@ namespace Resource
         return mKeyframeManager.get();
     }
 
+    AnimBlendRulesManager* ResourceSystem::getAnimBlendRulesManager()
+    {
+        return mAnimBlendRulesManager.get();
+    }
+
     void ResourceSystem::setExpiryDelay(double expiryDelay)
     {
         for (std::vector<BaseResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end();
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index 72440d17ee..abc696aae3 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -15,14 +15,21 @@ namespace osg
     class State;
 }
 
+namespace ToUTF8
+{
+    class StatelessUtf8Encoder;
+}
+
 namespace Resource
 {
 
     class SceneManager;
     class ImageManager;
+    class BgsmFileManager;
     class NifFileManager;
     class KeyframeManager;
     class BaseResourceManager;
+    class AnimBlendRulesManager;
 
     /// @brief Wrapper class that constructs and provides access to the most commonly used resource subsystems.
     /// @par Resource subsystems can be used with multiple OpenGL contexts, just like the OSG equivalents, but
@@ -30,13 +37,16 @@ namespace Resource
     class ResourceSystem
     {
     public:
-        ResourceSystem(const VFS::Manager* vfs);
+        explicit ResourceSystem(
+            const VFS::Manager* vfs, double expiryDelay, const ToUTF8::StatelessUtf8Encoder* encoder);
         ~ResourceSystem();
 
         SceneManager* getSceneManager();
         ImageManager* getImageManager();
+        BgsmFileManager* getBgsmFileManager();
         NifFileManager* getNifFileManager();
         KeyframeManager* getKeyframeManager();
+        AnimBlendRulesManager* getAnimBlendRulesManager();
 
         /// Indicates to each resource manager to clear the cache, i.e. to drop cached objects that are no longer
         /// referenced.
@@ -68,8 +78,10 @@ namespace Resource
     private:
         std::unique_ptr<SceneManager> mSceneManager;
         std::unique_ptr<ImageManager> mImageManager;
+        std::unique_ptr<BgsmFileManager> mBgsmFileManager;
         std::unique_ptr<NifFileManager> mNifFileManager;
         std::unique_ptr<KeyframeManager> mKeyframeManager;
+        std::unique_ptr<AnimBlendRulesManager> mAnimBlendRulesManager;
 
         // Store the base classes separately to get convenient access to the common interface
         // Here users can register their own resourcemanager as well
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 78b2d5165a..cbda399120 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -4,11 +4,15 @@
 #include <filesystem>
 
 #include <osg/AlphaFunc>
+#include <osg/ColorMaski>
 #include <osg/Group>
 #include <osg/Node>
 #include <osg/UserDataContainer>
 
+#include <osgAnimation/BasicAnimationManager>
+#include <osgAnimation/Bone>
 #include <osgAnimation/RigGeometry>
+#include <osgAnimation/UpdateBone>
 
 #include <osgParticle/ParticleSystem>
 
@@ -51,6 +55,7 @@
 #include <components/files/hash.hpp>
 #include <components/files/memorystream.hpp>
 
+#include "bgsmfilemanager.hpp"
 #include "errormarker.hpp"
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
@@ -58,7 +63,6 @@
 
 namespace
 {
-
     class InitWorldSpaceParticlesCallback
         : public SceneUtil::NodeCallback<InitWorldSpaceParticlesCallback, osgParticle::ParticleSystem*>
     {
@@ -271,14 +275,14 @@ namespace Resource
             {
                 if (stateset->getRenderingHint() == osg::StateSet::TRANSPARENT_BIN)
                 {
-                    osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+                    osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
                     depth->setWriteMask(false);
 
                     stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
                 }
                 else if (stateset->getRenderingHint() == osg::StateSet::OPAQUE_BIN)
                 {
-                    osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+                    osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
                     depth->setWriteMask(true);
 
                     stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
@@ -352,9 +356,95 @@ namespace Resource
         std::vector<osg::ref_ptr<SceneUtil::RigGeometryHolder>> mRigGeometryHolders;
     };
 
-    SceneManager::SceneManager(
-        const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
-        : ResourceManager(vfs)
+    class ReplaceAnimationUnderscoresVisitor : public osg::NodeVisitor
+    {
+    public:
+        ReplaceAnimationUnderscoresVisitor()
+            : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
+        {
+        }
+
+        void apply(osg::Node& node) override
+        {
+            // NOTE: MUST update the animation manager names first!
+            if (auto* animationManager = dynamic_cast<osgAnimation::BasicAnimationManager*>(node.getUpdateCallback()))
+                renameAnimationChannelTargets(*animationManager);
+
+            // Then, any applicable node names
+            if (auto* rigGeometry = dynamic_cast<osgAnimation::RigGeometry*>(&node))
+            {
+                renameNode(*rigGeometry);
+                updateVertexInfluenceMap(*rigGeometry);
+            }
+            else if (auto* matrixTransform = dynamic_cast<osg::MatrixTransform*>(&node))
+            {
+                renameNode(*matrixTransform);
+                renameUpdateCallbacks(*matrixTransform);
+            }
+
+            traverse(node);
+        }
+
+    private:
+        inline void renameNode(osg::Node& node)
+        {
+            node.setName(Misc::StringUtils::underscoresToSpaces(node.getName()));
+        }
+
+        void renameUpdateCallbacks(osg::MatrixTransform& node)
+        {
+            osg::Callback* cb = node.getUpdateCallback();
+            while (cb)
+            {
+                auto* animCb = dynamic_cast<osgAnimation::AnimationUpdateCallback<osg::NodeCallback>*>(cb);
+                if (animCb)
+                {
+                    std::string newAnimCbName = Misc::StringUtils::underscoresToSpaces(animCb->getName());
+                    animCb->setName(newAnimCbName);
+                }
+                cb = cb->getNestedCallback();
+            }
+        }
+
+        void updateVertexInfluenceMap(osgAnimation::RigGeometry& rig)
+        {
+            osgAnimation::VertexInfluenceMap* vertexInfluenceMap = rig.getInfluenceMap();
+            if (!vertexInfluenceMap)
+                return;
+
+            std::vector<std::pair<std::string, std::string>> renameList;
+            for (const auto& [oldBoneName, _] : *vertexInfluenceMap)
+            {
+                const std::string newBoneName = Misc::StringUtils::underscoresToSpaces(oldBoneName);
+                if (newBoneName != oldBoneName)
+                    renameList.emplace_back(oldBoneName, newBoneName);
+            }
+
+            for (const auto& [oldName, newName] : renameList)
+            {
+                if (vertexInfluenceMap->find(newName) == vertexInfluenceMap->end())
+                    (*vertexInfluenceMap)[newName] = std::move((*vertexInfluenceMap)[oldName]);
+                vertexInfluenceMap->erase(oldName);
+            }
+        }
+
+        void renameAnimationChannelTargets(osgAnimation::BasicAnimationManager& animManager)
+        {
+            for (const osgAnimation::Animation* animation : animManager.getAnimationList())
+            {
+                if (animation)
+                {
+                    const osgAnimation::ChannelList& channels = animation->getChannels();
+                    for (osgAnimation::Channel* channel : channels)
+                        channel->setTargetName(Misc::StringUtils::underscoresToSpaces(channel->getTargetName()));
+                }
+            }
+        }
+    };
+
+    SceneManager::SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager,
+        Resource::NifFileManager* nifFileManager, Resource::BgsmFileManager* bgsmFileManager, double expiryDelay)
+        : ResourceManager(vfs, expiryDelay)
         , mShaderManager(new Shader::ShaderManager)
         , mForceShaders(false)
         , mClampLighting(true)
@@ -368,6 +458,7 @@ namespace Resource
         , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
+        , mBgsmFileManager(bgsmFileManager)
         , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
         , mMagFilter(osg::Texture::LINEAR)
         , mMaxAnisotropy(1)
@@ -506,9 +597,16 @@ namespace Resource
         mShaderManager->setShaderPath(path);
     }
 
-    bool SceneManager::checkLoaded(const std::string& name, double timeStamp)
+    bool SceneManager::checkLoaded(VFS::Path::NormalizedView name, double timeStamp)
     {
-        return mCache->checkInObjectCache(VFS::Path::normalizeFilename(name), timeStamp);
+        return mCache->checkInObjectCache(name, timeStamp);
+    }
+
+    void SceneManager::setUpNormalsRTForStateSet(osg::StateSet* stateset, bool enabled)
+    {
+        if (!getSupportsNormalsRT())
+            return;
+        stateset->setAttributeAndModes(new osg::ColorMaski(1, enabled, enabled, enabled, enabled));
     }
 
     /// @brief Callback to read image files from the VFS.
@@ -529,7 +627,8 @@ namespace Resource
                 filePath = std::filesystem::relative(filename, osgDB::getCurrentWorkingDirectory());
             try
             {
-                return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(Files::pathToUnicodeString(filePath)),
+                return osgDB::ReaderWriter::ReadResult(
+                    mImageManager->getImage(VFS::Path::toNormalized(Files::pathToUnicodeString(filePath))),
                     osgDB::ReaderWriter::ReadResult::FILE_LOADED);
             }
             catch (std::exception& e)
@@ -545,9 +644,10 @@ namespace Resource
     namespace
     {
         osg::ref_ptr<osg::Node> loadNonNif(
-            const std::string& normalizedFilename, std::istream& model, Resource::ImageManager* imageManager)
+            VFS::Path::NormalizedView normalizedFilename, std::istream& model, Resource::ImageManager* imageManager)
         {
-            auto ext = Misc::getFileExtension(normalizedFilename);
+            const std::string_view ext = Misc::getFileExtension(normalizedFilename.value());
+            const bool isColladaFile = ext == "dae";
             osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(std::string(ext));
             if (!reader)
             {
@@ -563,10 +663,10 @@ namespace Resource
             // findFileCallback would be necessary. but findFileCallback does not support virtual files, so we can't
             // implement it.
             options->setReadFileCallback(new ImageReadCallback(imageManager));
-            if (ext == "dae")
+            if (isColladaFile)
                 options->setOptionString("daeUseSequencedTextureUnits");
 
-            const std::array<std::uint64_t, 2> fileHash = Files::getHash(normalizedFilename, model);
+            const std::array<std::uint64_t, 2> fileHash = Files::getHash(normalizedFilename.value(), model);
 
             osgDB::ReaderWriter::ReadResult result = reader->readNode(model, options);
             if (!result.success())
@@ -589,11 +689,20 @@ namespace Resource
             // Recognize and convert osgAnimation::RigGeometry to OpenMW-optimized type
             SceneUtil::FindByClassVisitor rigFinder("RigGeometry");
             node->accept(rigFinder);
+
+            // If a collada file with rigs, we should replace underscores with spaces
+            if (isColladaFile && !rigFinder.mFoundNodes.empty())
+            {
+                ReplaceAnimationUnderscoresVisitor renamingVisitor;
+                node->accept(renamingVisitor);
+            }
+
             for (osg::Node* foundRigNode : rigFinder.mFoundNodes)
             {
-                if (foundRigNode->libraryName() == std::string("osgAnimation"))
+                if (foundRigNode->libraryName() == std::string_view("osgAnimation"))
                 {
                     osgAnimation::RigGeometry* foundRigGeometry = static_cast<osgAnimation::RigGeometry*>(foundRigNode);
+
                     osg::ref_ptr<SceneUtil::RigGeometryHolder> newRig
                         = new SceneUtil::RigGeometryHolder(*foundRigGeometry, osg::CopyOp::DEEP_COPY_ALL);
 
@@ -608,7 +717,7 @@ namespace Resource
                 }
             }
 
-            if (ext == "dae")
+            if (isColladaFile)
             {
                 Resource::ColladaDescriptionVisitor colladaDescriptionVisitor;
                 node->accept(colladaDescriptionVisitor);
@@ -649,6 +758,7 @@ namespace Resource
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1, 1, 1, 1)));
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("useFalloff", false));
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("distortionStrength", 0.f));
             }
 
             node->setUserValue(Misc::OsgUserValues::sFileHash,
@@ -720,12 +830,18 @@ namespace Resource
         }
     }
 
-    osg::ref_ptr<osg::Node> load(const std::string& normalizedFilename, const VFS::Manager* vfs,
-        Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
+    osg::ref_ptr<osg::Node> load(VFS::Path::NormalizedView normalizedFilename, const VFS::Manager* vfs,
+        Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager,
+        Resource::BgsmFileManager* materialMgr)
     {
-        auto ext = Misc::getFileExtension(normalizedFilename);
+        const std::string_view ext = Misc::getFileExtension(normalizedFilename.value());
         if (ext == "nif")
-            return NifOsg::Loader::load(*nifFileManager->get(normalizedFilename), imageManager);
+            return NifOsg::Loader::load(*nifFileManager->get(normalizedFilename), imageManager, materialMgr);
+        else if (ext == "spt")
+        {
+            Log(Debug::Warning) << "Ignoring SpeedTree data file " << normalizedFilename;
+            return new osg::Node();
+        }
         else
             return loadNonNif(normalizedFilename, *vfs->get(normalizedFilename), imageManager);
     }
@@ -772,12 +888,12 @@ namespace Resource
         }
     };
 
-    bool canOptimize(const std::string& filename)
+    static bool canOptimize(std::string_view filename)
     {
-        size_t slashpos = filename.find_last_of("\\/");
-        if (slashpos != std::string::npos && slashpos + 1 < filename.size())
+        const std::string_view::size_type slashpos = filename.find_last_of('/');
+        if (slashpos != std::string_view::npos && slashpos + 1 < filename.size())
         {
-            std::string basename = filename.substr(slashpos + 1);
+            const std::string_view basename = filename.substr(slashpos + 1);
             // xmesh.nif can not be optimized because there are keyframes added in post
             if (!basename.empty() && basename[0] == 'x')
                 return false;
@@ -790,7 +906,7 @@ namespace Resource
 
         // For spell VFX, DummyXX nodes must remain intact. Not adding those to reservedNames to avoid being overly
         // cautious - instead, decide on filename
-        if (filename.find("vfx_pattern") != std::string::npos)
+        if (filename.find("vfx_pattern") != std::string_view::npos)
             return false;
         return true;
     }
@@ -837,11 +953,12 @@ namespace Resource
     {
         try
         {
+            VFS::Path::Normalized path("meshes/marker_error.****");
             for (const auto meshType : { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae" })
             {
-                const std::string normalized = "meshes/marker_error." + std::string(meshType);
-                if (mVFS->exists(normalized))
-                    return load(normalized, mVFS, mImageManager, mNifFileManager);
+                path.changeExtension(meshType);
+                if (mVFS->exists(path))
+                    return load(path, mVFS, mImageManager, mNifFileManager, mBgsmFileManager);
             }
         }
         catch (const std::exception& e)
@@ -850,7 +967,8 @@ namespace Resource
                                 << ", using embedded marker_error instead";
         }
         Files::IMemStream file(ErrorMarker::sValue.data(), ErrorMarker::sValue.size());
-        return loadNonNif("error_marker.osgt", file, mImageManager);
+        constexpr VFS::Path::NormalizedView errorMarker("error_marker.osgt");
+        return loadNonNif(errorMarker, file, mImageManager);
     }
 
     osg::ref_ptr<osg::Node> SceneManager::cloneErrorMarker()
@@ -861,11 +979,9 @@ namespace Resource
         return static_cast<osg::Node*>(mErrorMarker->clone(osg::CopyOp::DEEP_COPY_ALL));
     }
 
-    osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string& name, bool compile)
+    osg::ref_ptr<const osg::Node> SceneManager::getTemplate(VFS::Path::NormalizedView path, bool compile)
     {
-        std::string normalized = VFS::Path::normalizeFilename(name);
-
-        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(path);
         if (obj)
             return osg::ref_ptr<const osg::Node>(static_cast<osg::Node*>(obj.get()));
         else
@@ -873,14 +989,14 @@ namespace Resource
             osg::ref_ptr<osg::Node> loaded;
             try
             {
-                loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
+                loaded = load(path, mVFS, mImageManager, mNifFileManager, mBgsmFileManager);
 
                 SceneUtil::ProcessExtraDataVisitor extraDataVisitor(this);
                 loaded->accept(extraDataVisitor);
             }
             catch (const std::exception& e)
             {
-                Log(Debug::Error) << "Failed to load '" << name << "': " << e.what() << ", using marker_error instead";
+                Log(Debug::Error) << "Failed to load '" << path << "': " << e.what() << ", using marker_error instead";
                 loaded = cloneErrorMarker();
             }
 
@@ -897,7 +1013,7 @@ namespace Resource
             osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor());
             loaded->accept(*shaderVisitor);
 
-            if (canOptimize(normalized))
+            if (canOptimize(path.value()))
             {
                 SceneUtil::Optimizer optimizer;
                 optimizer.setSharedStateManager(mSharedStateManager, &mSharedStateMutex);
@@ -916,15 +1032,14 @@ namespace Resource
             else
                 loaded->getBound();
 
-            mCache->addEntryToObjectCache(normalized, loaded);
+            mCache->addEntryToObjectCache(path.value(), loaded);
             return loaded;
         }
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string& name)
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(VFS::Path::NormalizedView path)
     {
-        osg::ref_ptr<const osg::Node> scene = getTemplate(name);
-        return getInstance(scene);
+        return getInstance(getTemplate(path));
     }
 
     osg::ref_ptr<osg::Node> SceneManager::cloneNode(const osg::Node* base)
@@ -962,9 +1077,9 @@ namespace Resource
         return cloned;
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string& name, osg::Group* parentNode)
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(VFS::Path::NormalizedView path, osg::Group* parentNode)
     {
-        osg::ref_ptr<osg::Node> cloned = getInstance(name);
+        osg::ref_ptr<osg::Node> cloned = getInstance(path);
         attachTo(cloned, parentNode);
         return cloned;
     }
@@ -1110,13 +1225,13 @@ namespace Resource
             stats->setAttribute(frameNumber, "StateSet", mSharedStateManager->getNumSharedStateSets());
         }
 
-        stats->setAttribute(frameNumber, "Node", mCache->getCacheSize());
+        Resource::reportStats("Node", frameNumber, mCache->getStats(), *stats);
     }
 
-    Shader::ShaderVisitor* SceneManager::createShaderVisitor(const std::string& shaderPrefix)
+    osg::ref_ptr<Shader::ShaderVisitor> SceneManager::createShaderVisitor(const std::string& shaderPrefix)
     {
-        Shader::ShaderVisitor* shaderVisitor
-            = new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix);
+        osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(
+            new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix));
         shaderVisitor->setForceShaders(mForceShaders);
         shaderVisitor->setAutoUseNormalMaps(mAutoUseNormalMaps);
         shaderVisitor->setNormalMapPattern(mNormalMapPattern);
@@ -1127,6 +1242,7 @@ namespace Resource
         shaderVisitor->setConvertAlphaTestToAlphaToCoverage(mConvertAlphaTestToAlphaToCoverage);
         shaderVisitor->setAdjustCoverageForAlphaTest(mAdjustCoverageForAlphaTest);
         shaderVisitor->setSupportsNormalsRT(mSupportsNormalsRT);
+        shaderVisitor->setWeatherParticleOcclusion(mWeatherParticleOcclusion);
         return shaderVisitor;
     }
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 54643b561d..219ecd2a94 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -32,6 +32,7 @@ namespace Resource
 {
     class ImageManager;
     class NifFileManager;
+    class BgsmFileManager;
     class SharedStateManager;
 }
 
@@ -89,8 +90,8 @@ namespace Resource
     class SceneManager : public ResourceManager
     {
     public:
-        SceneManager(
-            const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
+        explicit SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager,
+            Resource::NifFileManager* nifFileManager, Resource::BgsmFileManager* bgsmFileManager, double expiryDelay);
         ~SceneManager();
 
         Shader::ShaderManager& getShaderManager();
@@ -151,13 +152,13 @@ namespace Resource
         void setShaderPath(const std::filesystem::path& path);
 
         /// Check if a given scene is loaded and if so, update its usage timestamp to prevent it from being unloaded
-        bool checkLoaded(const std::string& name, double referenceTime);
+        bool checkLoaded(VFS::Path::NormalizedView name, double referenceTime);
 
         /// Get a read-only copy of this scene "template"
         /// @note If the given filename does not exist or fails to load, an error marker mesh will be used instead.
         ///  If even the error marker mesh can not be found, an exception is thrown.
         /// @note Thread safe.
-        osg::ref_ptr<const osg::Node> getTemplate(const std::string& name, bool compile = true);
+        osg::ref_ptr<const osg::Node> getTemplate(VFS::Path::NormalizedView path, bool compile = true);
 
         /// Clone osg::Node safely.
         /// @note Thread safe.
@@ -172,12 +173,12 @@ namespace Resource
         /// Instance the given scene template.
         /// @see getTemplate
         /// @note Thread safe.
-        osg::ref_ptr<osg::Node> getInstance(const std::string& name);
+        osg::ref_ptr<osg::Node> getInstance(VFS::Path::NormalizedView path);
 
         /// Instance the given scene template and immediately attach it to a parent node
         /// @see getTemplate
         /// @note Not thread safe, unless parentNode is not part of the main scene graph yet.
-        osg::ref_ptr<osg::Node> getInstance(const std::string& name, osg::Group* parentNode);
+        osg::ref_ptr<osg::Node> getInstance(VFS::Path::NormalizedView path, osg::Group* parentNode);
 
         /// Attach the given scene instance to the given parent node
         /// @note You should have the parentNode in its intended position before calling this method,
@@ -224,11 +225,15 @@ namespace Resource
         void setSupportsNormalsRT(bool supports) { mSupportsNormalsRT = supports; }
         bool getSupportsNormalsRT() const { return mSupportsNormalsRT; }
 
+        void setUpNormalsRTForStateSet(osg::StateSet* stateset, bool enabled);
+
         void setSoftParticles(bool enabled) { mSoftParticles = enabled; }
         bool getSoftParticles() const { return mSoftParticles; }
 
+        void setWeatherParticleOcclusion(bool value) { mWeatherParticleOcclusion = value; }
+
     private:
-        Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects");
+        osg::ref_ptr<Shader::ShaderVisitor> createShaderVisitor(const std::string& shaderPrefix = "objects");
         osg::ref_ptr<osg::Node> loadErrorMarker();
         osg::ref_ptr<osg::Node> cloneErrorMarker();
 
@@ -248,12 +253,14 @@ namespace Resource
         bool mSupportsNormalsRT;
         std::array<osg::ref_ptr<osg::Texture>, 2> mOpaqueDepthTex;
         bool mSoftParticles = false;
+        bool mWeatherParticleOcclusion = false;
 
         osg::ref_ptr<Resource::SharedStateManager> mSharedStateManager;
         mutable std::mutex mSharedStateMutex;
 
         Resource::ImageManager* mImageManager;
         Resource::NifFileManager* mNifFileManager;
+        Resource::BgsmFileManager* mBgsmFileManager;
 
         osg::Texture::FilterMode mMinFilter;
         osg::Texture::FilterMode mMagFilter;
@@ -268,8 +275,6 @@ namespace Resource
         SceneManager(const SceneManager&);
         void operator=(const SceneManager&);
     };
-
-    std::string getFileExtension(const std::string& file);
 }
 
 #endif
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 6ff2112381..c902265448 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -2,7 +2,11 @@
 
 #include <algorithm>
 #include <iomanip>
+#include <span>
 #include <sstream>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include <osg/PolygonMode>
 
@@ -16,145 +20,272 @@
 
 #include <components/vfs/manager.hpp>
 
+#include "cachestats.hpp"
+
 namespace Resource
 {
-
-    static bool collectStatRendering = false;
-    static bool collectStatCameraObjects = false;
-    static bool collectStatViewerObjects = false;
-    static bool collectStatResource = false;
-    static bool collectStatGPU = false;
-    static bool collectStatEvent = false;
-    static bool collectStatFrameRate = false;
-    static bool collectStatUpdate = false;
-    static bool collectStatEngine = false;
-
-    constexpr std::string_view sFontName = "Fonts/DejaVuLGCSansMono.ttf";
-
-    static void setupStatCollection()
+    namespace
     {
-        const char* envList = getenv("OPENMW_OSG_STATS_LIST");
-        if (envList == nullptr)
-            return;
+        constexpr float statsWidth = 1280.0f;
+        constexpr float statsHeight = 1024.0f;
+        constexpr float characterSize = 17.0f;
+        constexpr float backgroundMargin = 5;
+        constexpr float backgroundSpacing = 3;
+        constexpr float maxStatsHeight = 420.0f;
+        constexpr std::size_t pageSize
+            = static_cast<std::size_t>((maxStatsHeight - 2 * backgroundMargin) / characterSize);
+        constexpr int statsHandlerKey = osgGA::GUIEventAdapter::KEY_F4;
+        const VFS::Path::Normalized fontName("Fonts/DejaVuLGCSansMono.ttf");
 
-        std::string_view kwList(envList);
+        bool collectStatRendering = false;
+        bool collectStatCameraObjects = false;
+        bool collectStatViewerObjects = false;
+        bool collectStatResource = false;
+        bool collectStatGPU = false;
+        bool collectStatEvent = false;
+        bool collectStatFrameRate = false;
+        bool collectStatUpdate = false;
+        bool collectStatEngine = false;
 
-        auto kwBegin = kwList.begin();
-
-        while (kwBegin != kwList.end())
+        std::vector<std::string> generateAllStatNames()
         {
-            auto kwEnd = std::find(kwBegin, kwList.end(), ';');
+            constexpr std::size_t itemsPerPage = 24;
 
-            const auto kw = kwList.substr(std::distance(kwList.begin(), kwBegin), std::distance(kwBegin, kwEnd));
+            constexpr std::string_view firstPage[] = {
+                "FrameNumber",
+                "",
+                "Loading",
+                "Compiling",
+                "WorkQueue",
+                "WorkThread",
+                "UnrefQueue",
+                "",
+                "Texture",
+                "StateSet",
+                "Composite",
+                "",
+                "Mechanics Actors",
+                "Mechanics Objects",
+                "",
+                "Physics Actors",
+                "Physics Objects",
+                "Physics Projectiles",
+                "Physics HeightFields",
+                "",
+                "Lua UsedMemory",
+                "",
+                "",
+                "",
+            };
 
-            if (kw == "gpu")
-                collectStatGPU = true;
-            else if (kw == "event")
-                collectStatEvent = true;
-            else if (kw == "frame_rate")
-                collectStatFrameRate = true;
-            else if (kw == "update")
-                collectStatUpdate = true;
-            else if (kw == "engine")
-                collectStatEngine = true;
-            else if (kw == "rendering")
-                collectStatRendering = true;
-            else if (kw == "cameraobjects")
-                collectStatCameraObjects = true;
-            else if (kw == "viewerobjects")
-                collectStatViewerObjects = true;
-            else if (kw == "resource")
-                collectStatResource = true;
-            else if (kw == "times")
+            static_assert(std::size(firstPage) == itemsPerPage);
+
+            constexpr std::string_view caches[] = {
+                "Node",
+                "Shape",
+                "Shape Instance",
+                "Image",
+                "Nif",
+                "Keyframe",
+                "BSShader Material",
+                "Groundcover Chunk",
+                "Object Chunk",
+                "Terrain Chunk",
+                "Terrain Texture",
+                "Land",
+                "Blending Rules",
+            };
+
+            constexpr std::string_view cellPreloader[] = {
+                "CellPreloader Count",
+                "CellPreloader Added",
+                "CellPreloader Evicted",
+                "CellPreloader Loaded",
+                "CellPreloader Expired",
+            };
+
+            constexpr std::string_view navMesh[] = {
+                "NavMesh Jobs",
+                "NavMesh Removing",
+                "NavMesh Updating",
+                "NavMesh Delayed",
+                "NavMesh Pushed",
+                "NavMesh Processing",
+                "NavMesh DbJobs Write",
+                "NavMesh DbJobs Read",
+                "NavMesh DbCache Get",
+                "NavMesh DbCache Hit",
+                "NavMesh CacheSize",
+                "NavMesh UsedTiles",
+                "NavMesh CachedTiles",
+                "NavMesh Cache Get",
+                "NavMesh Cache Hit",
+                "NavMesh Recast Tiles",
+                "NavMesh Recast Objects",
+                "NavMesh Recast Heightfields",
+                "NavMesh Recast Water",
+            };
+
+            std::vector<std::string> statNames;
+
+            for (std::string_view name : firstPage)
+                statNames.emplace_back(name);
+
+            for (std::size_t i = 0; i < std::size(caches); ++i)
             {
-                collectStatGPU = true;
-                collectStatEvent = true;
-                collectStatFrameRate = true;
-                collectStatUpdate = true;
-                collectStatEngine = true;
-                collectStatRendering = true;
+                Resource::addCacheStatsAttibutes(caches[i], statNames);
+                if ((i + 1) % 5 != 0)
+                    statNames.emplace_back();
             }
 
-            if (kwEnd == kwList.end())
-                break;
+            for (std::string_view name : cellPreloader)
+                statNames.emplace_back(name);
 
-            kwBegin = std::next(kwEnd);
-        }
-    }
+            while (statNames.size() % itemsPerPage != 0)
+                statNames.emplace_back();
 
-    class SetFontVisitor : public osg::NodeVisitor
-    {
-    public:
-        SetFontVisitor(osgText::Font* font)
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-            , mFont(font)
-        {
+            for (std::string_view name : navMesh)
+                statNames.emplace_back(name);
+
+            return statNames;
         }
 
-        void apply(osg::Drawable& node) override
+        void setupStatCollection()
         {
-            if (osgText::Text* text = dynamic_cast<osgText::Text*>(&node))
+            const char* envList = getenv("OPENMW_OSG_STATS_LIST");
+            if (envList == nullptr)
+                return;
+
+            std::string_view kwList(envList);
+
+            auto kwBegin = kwList.begin();
+
+            while (kwBegin != kwList.end())
             {
-                text->setFont(mFont);
+                auto kwEnd = std::find(kwBegin, kwList.end(), ';');
+
+                const auto kw = kwList.substr(std::distance(kwList.begin(), kwBegin), std::distance(kwBegin, kwEnd));
+
+                if (kw == "gpu")
+                    collectStatGPU = true;
+                else if (kw == "event")
+                    collectStatEvent = true;
+                else if (kw == "frame_rate")
+                    collectStatFrameRate = true;
+                else if (kw == "update")
+                    collectStatUpdate = true;
+                else if (kw == "engine")
+                    collectStatEngine = true;
+                else if (kw == "rendering")
+                    collectStatRendering = true;
+                else if (kw == "cameraobjects")
+                    collectStatCameraObjects = true;
+                else if (kw == "viewerobjects")
+                    collectStatViewerObjects = true;
+                else if (kw == "resource")
+                    collectStatResource = true;
+                else if (kw == "times")
+                {
+                    collectStatGPU = true;
+                    collectStatEvent = true;
+                    collectStatFrameRate = true;
+                    collectStatUpdate = true;
+                    collectStatEngine = true;
+                    collectStatRendering = true;
+                }
+
+                if (kwEnd == kwList.end())
+                    break;
+
+                kwBegin = std::next(kwEnd);
             }
         }
 
-    private:
-        osgText::Font* mFont;
-    };
-
-    osg::ref_ptr<osgText::Font> getMonoFont(VFS::Manager* vfs)
-    {
-        if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
+        osg::ref_ptr<osg::Geometry> createBackgroundRectangle(
+            const osg::Vec3& pos, const float width, const float height, const osg::Vec4& color)
         {
-            Files::IStreamPtr streamPtr = vfs->get(sFontName);
-            return osgText::readRefFontStream(*streamPtr.get());
+            osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry;
+
+            geometry->setUseDisplayList(false);
+
+            osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
+            geometry->setStateSet(stateSet);
+
+            osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
+            vertices->push_back(osg::Vec3(pos.x(), pos.y(), 0));
+            vertices->push_back(osg::Vec3(pos.x(), pos.y() - height, 0));
+            vertices->push_back(osg::Vec3(pos.x() + width, pos.y() - height, 0));
+            vertices->push_back(osg::Vec3(pos.x() + width, pos.y(), 0));
+            geometry->setVertexArray(vertices);
+
+            osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
+            colors->push_back(color);
+            geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+
+            osg::ref_ptr<osg::DrawElementsUShort> base
+                = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_FAN, 0);
+            base->push_back(0);
+            base->push_back(1);
+            base->push_back(2);
+            base->push_back(3);
+            geometry->addPrimitiveSet(base);
+
+            return geometry;
         }
 
-        return nullptr;
+        osg::ref_ptr<osgText::Font> getMonoFont(const VFS::Manager& vfs)
+        {
+            if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs.exists(fontName))
+            {
+                const Files::IStreamPtr streamPtr = vfs.get(fontName);
+                return osgText::readRefFontStream(*streamPtr);
+            }
+
+            return nullptr;
+        }
+
+        class SetFontVisitor : public osg::NodeVisitor
+        {
+        public:
+            SetFontVisitor(osgText::Font* font)
+                : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+                , mFont(font)
+            {
+            }
+
+            void apply(osg::Drawable& node) override
+            {
+                if (osgText::Text* text = dynamic_cast<osgText::Text*>(&node))
+                {
+                    text->setFont(mFont);
+                }
+            }
+
+        private:
+            osgText::Font* mFont;
+        };
     }
 
-    StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs)
-        : _key(osgGA::GUIEventAdapter::KEY_F4)
-        , _initialized(false)
-        , _statsType(false)
-        , _offlineCollect(offlineCollect)
-        , _statsWidth(1280.0f)
-        , _statsHeight(1024.0f)
-        , _characterSize(18.0f)
+    Profiler::Profiler(bool offlineCollect, const VFS::Manager& vfs)
+        : mOfflineCollect(offlineCollect)
+        , mTextFont(getMonoFont(vfs))
     {
-        _camera = new osg::Camera;
-        _camera->getOrCreateStateSet()->setGlobalDefaults();
-        _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
-        _camera->setProjectionResizePolicy(osg::Camera::FIXED);
-
-        _resourceStatsChildNum = 0;
-
-        _textFont = getMonoFont(vfs);
-    }
-
-    Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs)
-        : _offlineCollect(offlineCollect)
-        , _initFonts(false)
-    {
-        _characterSize = 18;
+        _characterSize = characterSize;
         _font.clear();
 
-        _textFont = getMonoFont(vfs);
-
         setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
         setupStatCollection();
     }
 
     void Profiler::setUpFonts()
     {
-        if (_textFont != nullptr)
+        if (mTextFont != nullptr)
         {
-            SetFontVisitor visitor(_textFont);
+            SetFontVisitor visitor(mTextFont);
             _switch->accept(visitor);
         }
 
-        _initFonts = true;
+        mInitFonts = true;
     }
 
     bool Profiler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
@@ -162,24 +293,45 @@ namespace Resource
         osgViewer::ViewerBase* viewer = nullptr;
 
         bool handled = StatsHandler::handle(ea, aa);
-        if (_initialized && !_initFonts)
+        if (_initialized && !mInitFonts)
             setUpFonts();
 
         auto* view = dynamic_cast<osgViewer::View*>(&aa);
         if (view)
             viewer = view->getViewerBase();
 
-        if (viewer)
+        if (viewer != nullptr)
         {
             // Add/remove openmw stats to the osd as necessary
             viewer->getViewerStats()->collectStats("engine", _statsType >= StatsHandler::StatsType::VIEWER_STATS);
 
-            if (_offlineCollect)
-                CollectStatistics(viewer);
+            if (mOfflineCollect)
+                collectStatistics(*viewer);
         }
         return handled;
     }
 
+    StatsHandler::StatsHandler(bool offlineCollect, const VFS::Manager& vfs)
+        : mOfflineCollect(offlineCollect)
+        , mSwitch(new osg::Switch)
+        , mCamera(new osg::Camera)
+        , mTextFont(getMonoFont(vfs))
+        , mStatNames(generateAllStatNames())
+    {
+        osg::ref_ptr<osg::StateSet> stateset = mSwitch->getOrCreateStateSet();
+        stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+#ifdef OSG_GL1_AVAILABLE
+        stateset->setAttribute(new osg::PolygonMode(), osg::StateAttribute::PROTECTED);
+#endif
+
+        mCamera->getOrCreateStateSet()->setGlobalDefaults();
+        mCamera->setRenderer(new osgViewer::Renderer(mCamera.get()));
+        mCamera->setProjectionResizePolicy(osg::Camera::FIXED);
+        mCamera->addChild(mSwitch);
+    }
+
     bool StatsHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
     {
         if (ea.getHandled())
@@ -189,18 +341,21 @@ namespace Resource
         {
             case (osgGA::GUIEventAdapter::KEYDOWN):
             {
-                if (ea.getKey() == _key)
+                if (ea.getKey() == statsHandlerKey)
                 {
-                    osgViewer::View* myview = dynamic_cast<osgViewer::View*>(&aa);
-                    if (!myview)
+                    osgViewer::View* const view = dynamic_cast<osgViewer::View*>(&aa);
+                    if (view == nullptr)
                         return false;
 
-                    osgViewer::ViewerBase* viewer = myview->getViewerBase();
+                    osgViewer::ViewerBase* const viewer = view->getViewerBase();
 
-                    toggle(viewer);
+                    if (viewer == nullptr)
+                        return false;
 
-                    if (_offlineCollect)
-                        CollectStatistics(viewer);
+                    toggle(*viewer);
+
+                    if (mOfflineCollect)
+                        collectStatistics(*viewer);
 
                     aa.requestRedraw();
                     return true;
@@ -223,66 +378,69 @@ namespace Resource
         if (width <= 0 || height <= 0)
             return;
 
-        _camera->setViewport(0, 0, width, height);
-        if (fabs(height * _statsWidth) <= fabs(width * _statsHeight))
+        mCamera->setViewport(0, 0, width, height);
+        if (std::abs(height * statsWidth) <= std::abs(width * statsHeight))
         {
-            _camera->setProjectionMatrix(
-                osg::Matrix::ortho2D(_statsWidth - width * _statsHeight / height, _statsWidth, 0.0, _statsHeight));
+            mCamera->setProjectionMatrix(
+                osg::Matrix::ortho2D(statsWidth - width * statsHeight / height, statsWidth, 0.0, statsHeight));
         }
         else
         {
-            _camera->setProjectionMatrix(
-                osg::Matrix::ortho2D(0.0, _statsWidth, _statsHeight - height * _statsWidth / width, _statsHeight));
+            mCamera->setProjectionMatrix(
+                osg::Matrix::ortho2D(0.0, statsWidth, statsHeight - height * statsWidth / width, statsHeight));
         }
     }
 
-    void StatsHandler::toggle(osgViewer::ViewerBase* viewer)
+    void StatsHandler::toggle(osgViewer::ViewerBase& viewer)
     {
-        if (!_initialized)
+        if (!mInitialized)
         {
             setUpHUDCamera(viewer);
             setUpScene(viewer);
+            mInitialized = true;
         }
 
-        _statsType = !_statsType;
-
-        if (!_statsType)
+        if (mPage == mSwitch->getNumChildren())
         {
-            _camera->setNodeMask(0);
-            _switch->setAllChildrenOff();
+            mPage = 0;
 
-            viewer->getViewerStats()->collectStats("resource", false);
+            mCamera->setNodeMask(0);
+            mSwitch->setAllChildrenOff();
+
+            viewer.getViewerStats()->collectStats("resource", false);
         }
         else
         {
-            _camera->setNodeMask(0xffffffff);
-            _switch->setSingleChildOn(_resourceStatsChildNum);
+            mCamera->setNodeMask(0xffffffff);
+            mSwitch->setSingleChildOn(mPage);
 
-            viewer->getViewerStats()->collectStats("resource", true);
+            viewer.getViewerStats()->collectStats("resource", true);
+
+            ++mPage;
         }
     }
 
-    void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
+    void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase& viewer)
     {
         // Try GraphicsWindow first so we're likely to get the main viewer window
-        osg::GraphicsContext* context = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
+        osg::GraphicsContext* context = dynamic_cast<osgViewer::GraphicsWindow*>(mCamera->getGraphicsContext());
 
         if (!context)
         {
             osgViewer::Viewer::Windows windows;
-            viewer->getWindows(windows);
+            viewer.getWindows(windows);
 
             if (!windows.empty())
                 context = windows.front();
             else
             {
                 // No GraphicsWindows were found, so let's try to find a GraphicsContext
-                context = _camera->getGraphicsContext();
+                context = mCamera->getGraphicsContext();
 
                 if (!context)
                 {
                     osgViewer::Viewer::Contexts contexts;
-                    viewer->getContexts(contexts);
+                    viewer.getContexts(contexts);
 
                     if (contexts.empty())
                         return;
@@ -292,241 +450,151 @@ namespace Resource
             }
         }
 
-        _camera->setGraphicsContext(context);
+        mCamera->setGraphicsContext(context);
 
-        _camera->setRenderOrder(osg::Camera::POST_RENDER, 11);
+        mCamera->setRenderOrder(osg::Camera::POST_RENDER, 11);
 
-        _camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-        _camera->setViewMatrix(osg::Matrix::identity());
+        mCamera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+        mCamera->setViewMatrix(osg::Matrix::identity());
         setWindowSize(context->getTraits()->width, context->getTraits()->height);
 
         // only clear the depth buffer
-        _camera->setClearMask(0);
-        _camera->setAllowEventFocus(false);
+        mCamera->setClearMask(0);
+        mCamera->setAllowEventFocus(false);
 
-        _camera->setRenderer(new osgViewer::Renderer(_camera.get()));
-
-        _initialized = true;
+        mCamera->setRenderer(new osgViewer::Renderer(mCamera.get()));
     }
 
-    osg::Geometry* createBackgroundRectangle(
-        const osg::Vec3& pos, const float width, const float height, osg::Vec4& color)
+    namespace
     {
-        osg::StateSet* ss = new osg::StateSet;
-
-        osg::Geometry* geometry = new osg::Geometry;
-
-        geometry->setUseDisplayList(false);
-        geometry->setStateSet(ss);
-
-        osg::Vec3Array* vertices = new osg::Vec3Array;
-        geometry->setVertexArray(vertices);
-
-        vertices->push_back(osg::Vec3(pos.x(), pos.y(), 0));
-        vertices->push_back(osg::Vec3(pos.x(), pos.y() - height, 0));
-        vertices->push_back(osg::Vec3(pos.x() + width, pos.y() - height, 0));
-        vertices->push_back(osg::Vec3(pos.x() + width, pos.y(), 0));
-
-        osg::Vec4Array* colors = new osg::Vec4Array;
-        colors->push_back(color);
-        geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
-
-        osg::DrawElementsUShort* base = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_FAN, 0);
-        base->push_back(0);
-        base->push_back(1);
-        base->push_back(2);
-        base->push_back(3);
-
-        geometry->addPrimitiveSet(base);
-
-        return geometry;
-    }
-
-    class ResourceStatsTextDrawCallback : public osg::Drawable::DrawCallback
-    {
-    public:
-        ResourceStatsTextDrawCallback(osg::Stats* stats, const std::vector<std::string>& statNames)
-            : mStats(stats)
-            , mStatNames(statNames)
+        class ResourceStatsTextDrawCallback : public osg::Drawable::DrawCallback
         {
-        }
-
-        void drawImplementation(osg::RenderInfo& renderInfo, const osg::Drawable* drawable) const override
-        {
-            if (!mStats)
-                return;
-
-            osgText::Text* text = (osgText::Text*)(drawable);
-
-            std::ostringstream viewStr;
-            viewStr.setf(std::ios::left, std::ios::adjustfield);
-            viewStr.width(14);
-            // Used fixed formatting, as scientific will switch to "...e+.." notation for
-            // large numbers of vertices/drawables/etc.
-            viewStr.setf(std::ios::fixed);
-            viewStr.precision(0);
-
-            unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber() - 1;
-
-            for (const auto& statName : mStatNames.get())
+        public:
+            explicit ResourceStatsTextDrawCallback(osg::Stats* stats, std::span<const std::string> statNames)
+                : mStats(stats)
+                , mStatNames(statNames)
             {
-                if (statName.empty())
-                    viewStr << std::endl;
-                else
-                {
-                    double value = 0.0;
-                    if (mStats->getAttribute(frameNumber, statName, value))
-                        viewStr << std::setw(8) << value << std::endl;
-                    else
-                        viewStr << std::setw(8) << "." << std::endl;
-                }
             }
 
-            text->setText(viewStr.str());
+            void drawImplementation(osg::RenderInfo& renderInfo, const osg::Drawable* drawable) const override
+            {
+                if (mStats == nullptr)
+                    return;
 
-            text->drawImplementation(renderInfo);
-        }
+                osgText::Text* text = (osgText::Text*)(drawable);
 
-        osg::ref_ptr<osg::Stats> mStats;
-        std::reference_wrapper<const std::vector<std::string>> mStatNames;
-    };
+                std::ostringstream viewStr;
+                viewStr.setf(std::ios::left, std::ios::adjustfield);
+                viewStr.width(14);
+                // Used fixed formatting, as scientific will switch to "...e+.." notation for
+                // large numbers of vertices/drawables/etc.
+                viewStr.setf(std::ios::fixed);
+                viewStr.precision(0);
 
-    void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
+                const unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber() - 1;
+
+                for (const std::string& statName : mStatNames)
+                {
+                    if (statName.empty())
+                        viewStr << std::endl;
+                    else
+                    {
+                        double value = 0.0;
+                        if (mStats->getAttribute(frameNumber, statName, value))
+                            viewStr << std::setw(8) << value << std::endl;
+                        else
+                            viewStr << std::setw(8) << "." << std::endl;
+                    }
+                }
+
+                text->setText(viewStr.str());
+
+                text->drawImplementation(renderInfo);
+            }
+
+        private:
+            osg::ref_ptr<osg::Stats> mStats;
+            std::span<const std::string> mStatNames;
+        };
+    }
+
+    void StatsHandler::setUpScene(osgViewer::ViewerBase& viewer)
     {
-        _switch = new osg::Switch;
+        const osg::Vec4 backgroundColor(0.0, 0.0, 0.0f, 0.3);
+        const osg::Vec4 staticTextColor(1.0, 1.0, 0.0f, 1.0);
+        const osg::Vec4 dynamicTextColor(1.0, 1.0, 1.0f, 1.0);
 
-        _camera->addChild(_switch);
+        const auto longest = std::max_element(mStatNames.begin(), mStatNames.end(),
+            [](const std::string& lhs, const std::string& rhs) { return lhs.size() < rhs.size(); });
+        const std::size_t longestSize = longest->size();
+        const float statNamesWidth = longestSize * characterSize * 0.6 + 2 * backgroundMargin;
+        const float statTextWidth = 7 * characterSize + 2 * backgroundMargin;
+        const float statHeight = pageSize * characterSize + 2 * backgroundMargin;
+        const float width = statNamesWidth + backgroundSpacing + statTextWidth;
 
-        osg::StateSet* stateset = _switch->getOrCreateStateSet();
-        stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-        stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-#ifdef OSG_GL1_AVAILABLE
-        stateset->setAttribute(new osg::PolygonMode(), osg::StateAttribute::PROTECTED);
-#endif
-
-        osg::Vec4 backgroundColor(0.0, 0.0, 0.0f, 0.3);
-        osg::Vec4 staticTextColor(1.0, 1.0, 0.0f, 1.0);
-        osg::Vec4 dynamicTextColor(1.0, 1.0, 1.0f, 1.0);
-        float backgroundMargin = 5;
-        float backgroundSpacing = 3;
-
-        // resource stats
+        for (std::size_t offset = 0; offset < mStatNames.size(); offset += pageSize)
         {
-            osg::Group* group = new osg::Group;
+            osg::ref_ptr<osg::Group> group = new osg::Group;
+
             group->setCullingActive(false);
-            _resourceStatsChildNum = _switch->getNumChildren();
-            _switch->addChild(group, false);
 
-            static const std::vector<std::string> statNames({
-                "FrameNumber",
-                "",
-                "Compiling",
-                "WorkQueue",
-                "WorkThread",
-                "UnrefQueue",
-                "",
-                "Texture",
-                "StateSet",
-                "Node",
-                "Shape",
-                "Shape Instance",
-                "Image",
-                "Nif",
-                "Keyframe",
-                "",
-                "Groundcover Chunk",
-                "Object Chunk",
-                "Terrain Chunk",
-                "Terrain Texture",
-                "Land",
-                "Composite",
-                "",
-                "NavMesh Jobs",
-                "NavMesh Waiting",
-                "NavMesh Pushed",
-                "NavMesh Processing",
-                "NavMesh DbJobs Write",
-                "NavMesh DbJobs Read",
-                "NavMesh DbCache Get",
-                "NavMesh DbCache Hit",
-                "NavMesh CacheSize",
-                "NavMesh UsedTiles",
-                "NavMesh CachedTiles",
-                "NavMesh Cache Get",
-                "NavMesh Cache Hit",
-                "",
-                "Mechanics Actors",
-                "Mechanics Objects",
-                "",
-                "Physics Actors",
-                "Physics Objects",
-                "Physics Projectiles",
-                "Physics HeightFields",
-                "",
-                "Lua UsedMemory",
-            });
-
-            static const auto longest = std::max_element(statNames.begin(), statNames.end(),
-                [](const std::string& lhs, const std::string& rhs) { return lhs.size() < rhs.size(); });
-            const float statNamesWidth = 13 * _characterSize + 2 * backgroundMargin;
-            const float statTextWidth = 7 * _characterSize + 2 * backgroundMargin;
-            const float statHeight = statNames.size() * _characterSize + 2 * backgroundMargin;
-            osg::Vec3 pos(_statsWidth - statNamesWidth - backgroundSpacing - statTextWidth, statHeight, 0.0f);
+            const std::size_t count = std::min(mStatNames.size() - offset, pageSize);
+            std::span<const std::string> currentStatNames(mStatNames.data() + offset, count);
+            osg::Vec3 pos(statsWidth - width, statHeight - characterSize, 0.0f);
 
             group->addChild(
-                createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
+                createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, backgroundMargin + characterSize, 0),
                     statNamesWidth, statHeight, backgroundColor));
 
             osg::ref_ptr<osgText::Text> staticText = new osgText::Text;
             group->addChild(staticText.get());
             staticText->setColor(staticTextColor);
-            staticText->setCharacterSize(_characterSize);
+            staticText->setCharacterSize(characterSize);
             staticText->setPosition(pos);
 
             std::ostringstream viewStr;
             viewStr.clear();
             viewStr.setf(std::ios::left, std::ios::adjustfield);
-            viewStr.width(longest->size());
-            for (const auto& statName : statNames)
-            {
+            viewStr.width(longestSize);
+            for (const std::string& statName : currentStatNames)
                 viewStr << statName << std::endl;
-            }
 
             staticText->setText(viewStr.str());
 
             pos.x() += statNamesWidth + backgroundSpacing;
 
             group->addChild(
-                createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
+                createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, backgroundMargin + characterSize, 0),
                     statTextWidth, statHeight, backgroundColor));
 
             osg::ref_ptr<osgText::Text> statsText = new osgText::Text;
             group->addChild(statsText.get());
 
             statsText->setColor(dynamicTextColor);
-            statsText->setCharacterSize(_characterSize);
+            statsText->setCharacterSize(characterSize);
             statsText->setPosition(pos);
             statsText->setText("");
-            statsText->setDrawCallback(new ResourceStatsTextDrawCallback(viewer->getViewerStats(), statNames));
+            statsText->setDrawCallback(new ResourceStatsTextDrawCallback(viewer.getViewerStats(), currentStatNames));
 
-            if (_textFont)
+            if (mTextFont != nullptr)
             {
-                staticText->setFont(_textFont);
-                statsText->setFont(_textFont);
+                staticText->setFont(mTextFont);
+                statsText->setFont(mTextFont);
             }
+
+            mSwitch->addChild(group, false);
         }
     }
 
     void StatsHandler::getUsage(osg::ApplicationUsage& usage) const
     {
-        usage.addKeyboardMouseBinding(_key, "On screen resource usage stats.");
+        usage.addKeyboardMouseBinding(statsHandlerKey, "On screen resource usage stats.");
     }
 
-    void CollectStatistics(osgViewer::ViewerBase* viewer)
+    void collectStatistics(osgViewer::ViewerBase& viewer)
     {
         osgViewer::Viewer::Cameras cameras;
-        viewer->getCameras(cameras);
+        viewer.getCameras(cameras);
         for (auto* camera : cameras)
         {
             if (collectStatGPU)
@@ -537,17 +605,16 @@ namespace Resource
                 camera->getStats()->collectStats("scene", true);
         }
         if (collectStatEvent)
-            viewer->getViewerStats()->collectStats("event", true);
+            viewer.getViewerStats()->collectStats("event", true);
         if (collectStatFrameRate)
-            viewer->getViewerStats()->collectStats("frame_rate", true);
+            viewer.getViewerStats()->collectStats("frame_rate", true);
         if (collectStatUpdate)
-            viewer->getViewerStats()->collectStats("update", true);
+            viewer.getViewerStats()->collectStats("update", true);
         if (collectStatResource)
-            viewer->getViewerStats()->collectStats("resource", true);
+            viewer.getViewerStats()->collectStats("resource", true);
         if (collectStatViewerObjects)
-            viewer->getViewerStats()->collectStats("scene", true);
+            viewer.getViewerStats()->collectStats("scene", true);
         if (collectStatEngine)
-            viewer->getViewerStats()->collectStats("engine", true);
+            viewer.getViewerStats()->collectStats("engine", true);
     }
-
 }
diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp
index fc2899d386..0ea421e83d 100644
--- a/components/resource/stats.hpp
+++ b/components/resource/stats.hpp
@@ -28,57 +28,47 @@ namespace Resource
     class Profiler : public osgViewer::StatsHandler
     {
     public:
-        Profiler(bool offlineCollect, VFS::Manager* vfs);
+        explicit Profiler(bool offlineCollect, const VFS::Manager& vfs);
+
         bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override;
 
     private:
         void setUpFonts();
 
-        bool _offlineCollect;
-        bool _initFonts;
-        osg::ref_ptr<osgText::Font> _textFont;
+        bool mInitFonts = false;
+        bool mOfflineCollect;
+        osg::ref_ptr<osgText::Font> mTextFont;
     };
 
     class StatsHandler : public osgGA::GUIEventHandler
     {
     public:
-        StatsHandler(bool offlineCollect, VFS::Manager* vfs);
-
-        void setKey(int key) { _key = key; }
-        int getKey() const { return _key; }
+        explicit StatsHandler(bool offlineCollect, const VFS::Manager& vfs);
 
         bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override;
 
-        void setWindowSize(int w, int h);
-
-        void toggle(osgViewer::ViewerBase* viewer);
-
-        void setUpHUDCamera(osgViewer::ViewerBase* viewer);
-        void setUpScene(osgViewer::ViewerBase* viewer);
-
         /** Get the keyboard and mouse usage of this manipulator.*/
         void getUsage(osg::ApplicationUsage& usage) const override;
 
     private:
-        osg::ref_ptr<osg::Switch> _switch;
-        int _key;
-        osg::ref_ptr<osg::Camera> _camera;
-        bool _initialized;
-        bool _statsType;
-        bool _offlineCollect;
+        unsigned mPage = 0;
+        bool mInitialized = false;
+        bool mOfflineCollect;
+        osg::ref_ptr<osg::Switch> mSwitch;
+        osg::ref_ptr<osg::Camera> mCamera;
+        osg::ref_ptr<osgText::Font> mTextFont;
+        std::vector<std::string> mStatNames;
 
-        float _statsWidth;
-        float _statsHeight;
+        void setWindowSize(int w, int h);
 
-        float _characterSize;
+        void toggle(osgViewer::ViewerBase& viewer);
 
-        int _resourceStatsChildNum;
+        void setUpHUDCamera(osgViewer::ViewerBase& viewer);
 
-        osg::ref_ptr<osgText::Font> _textFont;
+        void setUpScene(osgViewer::ViewerBase& viewer);
     };
 
-    void CollectStatistics(osgViewer::ViewerBase* viewer);
-
+    void collectStatistics(osgViewer::ViewerBase& viewer);
 }
 
 #endif
diff --git a/components/sceneutil/actorutil.cpp b/components/sceneutil/actorutil.cpp
deleted file mode 100644
index c13cd093bf..0000000000
--- a/components/sceneutil/actorutil.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "actorutil.hpp"
-
-#include <components/settings/settings.hpp>
-
-namespace SceneUtil
-{
-    const std::string& getActorSkeleton(bool firstPerson, bool isFemale, bool isBeast, bool isWerewolf)
-    {
-        if (!firstPerson)
-        {
-            if (isWerewolf)
-                return Settings::Manager::getString("wolfskin", "Models");
-            else if (isBeast)
-                return Settings::Manager::getString("baseanimkna", "Models");
-            else if (isFemale)
-                return Settings::Manager::getString("baseanimfemale", "Models");
-            else
-                return Settings::Manager::getString("baseanim", "Models");
-        }
-        else
-        {
-            if (isWerewolf)
-                return Settings::Manager::getString("wolfskin1st", "Models");
-            else if (isBeast)
-                return Settings::Manager::getString("baseanimkna1st", "Models");
-            else if (isFemale)
-                return Settings::Manager::getString("baseanimfemale1st", "Models");
-            else
-                return Settings::Manager::getString("xbaseanim1st", "Models");
-        }
-    }
-}
diff --git a/components/sceneutil/actorutil.hpp b/components/sceneutil/actorutil.hpp
deleted file mode 100644
index 038fc4e15e..0000000000
--- a/components/sceneutil/actorutil.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef OPENMW_COMPONENTS_SCENEUTIL_ACTORUTIL_HPP
-#define OPENMW_COMPONENTS_SCENEUTIL_ACTORUTIL_HPP
-
-#include <string>
-
-namespace SceneUtil
-{
-    const std::string& getActorSkeleton(bool firstPerson, bool female, bool beast, bool werewolf);
-}
-
-#endif
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index 4e8f177e55..84afaa11f7 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -1,4 +1,5 @@
 #include "agentpath.hpp"
+
 #include "detourdebugdraw.hpp"
 
 #include <osg/Material>
@@ -38,13 +39,13 @@ namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
         const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
-        const DetourNavigator::RecastSettings& settings)
+        const DetourNavigator::RecastSettings& settings, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet)
     {
         using namespace DetourNavigator;
 
-        const osg::ref_ptr<osg::Group> group(new osg::Group);
+        osg::ref_ptr<osg::Group> group(new osg::Group);
 
-        DebugDraw debugDraw(*group, DebugDraw::makeStateSet(), osg::Vec3f(0, 0, 0), 1);
+        DebugDraw debugDraw(*group, debugDrawStateSet, osg::Vec3f(0, 0, 0), 1);
 
         const auto agentRadius = DetourNavigator::getAgentRadius(agentBounds);
         const auto agentHeight = DetourNavigator::getAgentHeight(agentBounds);
@@ -69,10 +70,6 @@ namespace SceneUtil
 
         debugDraw.depthMask(true);
 
-        osg::ref_ptr<osg::Material> material = new osg::Material;
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        group->getOrCreateStateSet()->setAttribute(material);
-
         return group;
     }
 }
diff --git a/components/sceneutil/agentpath.hpp b/components/sceneutil/agentpath.hpp
index af4e9cca71..0e420d0d63 100644
--- a/components/sceneutil/agentpath.hpp
+++ b/components/sceneutil/agentpath.hpp
@@ -9,6 +9,7 @@ namespace osg
 {
     class Group;
     class Vec3f;
+    class StateSet;
 }
 
 namespace DetourNavigator
@@ -21,7 +22,7 @@ namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
         const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
-        const DetourNavigator::RecastSettings& settings);
+        const DetourNavigator::RecastSettings& settings, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet);
 }
 
 #endif
diff --git a/components/sceneutil/animblendrules.cpp b/components/sceneutil/animblendrules.cpp
new file mode 100644
index 0000000000..c812feb07e
--- /dev/null
+++ b/components/sceneutil/animblendrules.cpp
@@ -0,0 +1,170 @@
+#include "animblendrules.hpp"
+
+#include <iterator>
+#include <map>
+
+#include <components/misc/strings/algorithm.hpp>
+#include <components/misc/strings/format.hpp>
+#include <components/misc/strings/lower.hpp>
+
+#include <components/debug/debuglog.hpp>
+#include <components/files/configfileparser.hpp>
+#include <components/files/conversion.hpp>
+#include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/textkeymap.hpp>
+
+#include <stdexcept>
+#include <yaml-cpp/yaml.h>
+
+namespace SceneUtil
+{
+    namespace
+    {
+        std::pair<std::string, std::string> splitRuleName(std::string full)
+        {
+            std::string group;
+            std::string key;
+            size_t delimiterInd = full.find(":");
+
+            Misc::StringUtils::lowerCaseInPlace(full);
+
+            if (delimiterInd == std::string::npos)
+            {
+                group = std::move(full);
+                Misc::StringUtils::trim(group);
+            }
+            else
+            {
+                group = full.substr(0, delimiterInd);
+                key = full.substr(delimiterInd + 1);
+                Misc::StringUtils::trim(group);
+                Misc::StringUtils::trim(key);
+            }
+            return std::make_pair(group, key);
+        }
+    }
+
+    using BlendRule = AnimBlendRules::BlendRule;
+
+    AnimBlendRules::AnimBlendRules(const AnimBlendRules& copy, const osg::CopyOp& copyop)
+        : mRules(copy.mRules)
+    {
+    }
+
+    AnimBlendRules::AnimBlendRules(const std::vector<BlendRule>& rules)
+        : mRules(rules)
+    {
+    }
+
+    osg::ref_ptr<AnimBlendRules> AnimBlendRules::fromFile(const VFS::Manager* vfs, VFS::Path::NormalizedView configPath)
+    {
+        Log(Debug::Debug) << "Attempting to load animation blending config '" << configPath << "'";
+
+        if (!vfs->exists(configPath))
+            return nullptr;
+
+        // Retrieving and parsing animation rules
+        std::string rawYaml(std::istreambuf_iterator<char>(*vfs->get(configPath)), {});
+
+        std::vector<BlendRule> rules;
+
+        YAML::Node root = YAML::Load(rawYaml);
+
+        if (!root.IsDefined() || root.IsNull() || root.IsScalar())
+        {
+            Log(Debug::Error) << Misc::StringUtils::format(
+                "Can't parse file '%s'. Check that it's a valid YAML/JSON file.", configPath);
+            return nullptr;
+        }
+
+        if (root["blending_rules"])
+        {
+            for (const auto& it : root["blending_rules"])
+            {
+                if (it["from"] && it["to"] && it["duration"] && it["easing"])
+                {
+                    auto fromNames = splitRuleName(it["from"].as<std::string>());
+                    auto toNames = splitRuleName(it["to"].as<std::string>());
+
+                    BlendRule ruleObj = {
+                        .mFromGroup = fromNames.first,
+                        .mFromKey = fromNames.second,
+                        .mToGroup = toNames.first,
+                        .mToKey = toNames.second,
+                        .mDuration = it["duration"].as<float>(),
+                        .mEasing = it["easing"].as<std::string>(),
+                    };
+
+                    rules.emplace_back(ruleObj);
+                }
+                else
+                {
+                    Log(Debug::Warning) << "Warning: Blending rule '"
+                                        << (it["from"] ? it["from"].as<std::string>() : "undefined") << "->"
+                                        << (it["to"] ? it["to"].as<std::string>() : "undefined")
+                                        << "' is missing some properties. File: '" << configPath << "'.";
+                }
+            }
+        }
+        else
+        {
+            throw std::domain_error(
+                Misc::StringUtils::format("'blending_rules' object not found in '%s' file!", configPath));
+        }
+
+        // If no rules then dont allocate any instance
+        if (rules.size() == 0)
+            return nullptr;
+
+        return new AnimBlendRules(rules);
+    }
+
+    void AnimBlendRules::addOverrideRules(const AnimBlendRules& overrideRules)
+    {
+        auto rules = overrideRules.getRules();
+        // Concat the rules together, overrides added at the end since the bottom-most rule has the highest priority.
+        mRules.insert(mRules.end(), rules.begin(), rules.end());
+    }
+
+    inline bool AnimBlendRules::fitsRuleString(const std::string_view str, const std::string_view ruleStr) const
+    {
+        // A wildcard only supported in the beginning or the end of the rule string in hopes that this will be more
+        // performant. And most likely this kind of support is enough.
+        return ruleStr == "*" || str == ruleStr || (ruleStr.starts_with("*") && str.ends_with(ruleStr.substr(1)))
+            || (ruleStr.ends_with("*") && str.starts_with(ruleStr.substr(0, ruleStr.length() - 1)));
+    }
+
+    std::optional<BlendRule> AnimBlendRules::findBlendingRule(
+        std::string fromGroup, std::string fromKey, std::string toGroup, std::string toKey) const
+    {
+        Misc::StringUtils::lowerCaseInPlace(fromGroup);
+        Misc::StringUtils::lowerCaseInPlace(fromKey);
+        Misc::StringUtils::lowerCaseInPlace(toGroup);
+        Misc::StringUtils::lowerCaseInPlace(toKey);
+        for (auto rule = mRules.rbegin(); rule != mRules.rend(); ++rule)
+        {
+            bool fromMatch = false;
+            bool toMatch = false;
+
+            // Pseudocode:
+            // If not a wildcard and found a wildcard
+            // starts with substr(0,wildcard)
+            if (fitsRuleString(fromGroup, rule->mFromGroup)
+                && (rule->mFromKey.empty() || fitsRuleString(fromKey, rule->mFromKey)))
+            {
+                fromMatch = true;
+            }
+
+            if ((fitsRuleString(toGroup, rule->mToGroup) || (rule->mToGroup == "$" && toGroup == fromGroup))
+                && (rule->mToKey.empty() || fitsRuleString(toKey, rule->mToKey)))
+            {
+                toMatch = true;
+            }
+
+            if (fromMatch && toMatch)
+                return std::make_optional<BlendRule>(*rule);
+        }
+
+        return std::nullopt;
+    }
+}
diff --git a/components/sceneutil/animblendrules.hpp b/components/sceneutil/animblendrules.hpp
new file mode 100644
index 0000000000..57e67164b9
--- /dev/null
+++ b/components/sceneutil/animblendrules.hpp
@@ -0,0 +1,49 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_ANIMBLENDRULES_HPP
+#define OPENMW_COMPONENTS_SCENEUTIL_ANIMBLENDRULES_HPP
+
+#include <optional>
+#include <string>
+#include <vector>
+
+#include <osg/Object>
+
+#include <components/vfs/manager.hpp>
+
+namespace SceneUtil
+{
+    class AnimBlendRules : public osg::Object
+    {
+    public:
+        struct BlendRule
+        {
+            std::string mFromGroup;
+            std::string mFromKey;
+            std::string mToGroup;
+            std::string mToKey;
+            float mDuration;
+            std::string mEasing;
+        };
+
+        AnimBlendRules() = default;
+        AnimBlendRules(const std::vector<BlendRule>& rules);
+        AnimBlendRules(const AnimBlendRules& copy, const osg::CopyOp& copyop);
+
+        META_Object(SceneUtil, AnimBlendRules)
+
+        void addOverrideRules(const AnimBlendRules& overrideRules);
+
+        std::optional<BlendRule> findBlendingRule(
+            std::string fromGroup, std::string fromKey, std::string toGroup, std::string toKey) const;
+
+        const std::vector<BlendRule>& getRules() const { return mRules; }
+
+        static osg::ref_ptr<AnimBlendRules> fromFile(const VFS::Manager* vfs, VFS::Path::NormalizedView yamlpath);
+
+    private:
+        std::vector<BlendRule> mRules;
+
+        inline bool fitsRuleString(const std::string_view str, const std::string_view ruleStr) const;
+    };
+}
+
+#endif
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index c855c9a458..7b43380c98 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -10,6 +10,8 @@
 #include <osg/PositionAttitudeTransform>
 
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/riggeometry.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
 #include <components/sceneutil/skeleton.hpp>
 
 #include "visitor.hpp"
@@ -37,6 +39,12 @@ namespace SceneUtil
                 return;
 
             const osg::Node* node = &drawable;
+            bool isRig = dynamic_cast<const SceneUtil::RigGeometry*>(node) != nullptr;
+            if (!isRig)
+                isRig = dynamic_cast<const SceneUtil::RigGeometryHolder*>(node) != nullptr;
+            if (!isRig)
+                return;
+
             for (auto it = getNodePath().rbegin() + 1; it != getNodePath().rend(); ++it)
             {
                 const osg::Node* parent = *it;
@@ -74,18 +82,32 @@ namespace SceneUtil
         std::string_view mFilter;
     };
 
-    void mergeUserData(const osg::UserDataContainer* source, osg::Object* target)
+    namespace
     {
-        if (!source)
-            return;
 
-        if (!target->getUserDataContainer())
-            target->setUserDataContainer(osg::clone(source, osg::CopyOp::SHALLOW_COPY));
-        else
+        void mergeUserData(const osg::UserDataContainer* source, osg::Object* target)
         {
-            for (unsigned int i = 0; i < source->getNumUserObjects(); ++i)
-                target->getUserDataContainer()->addUserObject(
-                    osg::clone(source->getUserObject(i), osg::CopyOp::SHALLOW_COPY));
+            if (!source)
+                return;
+
+            if (!target->getUserDataContainer())
+                target->setUserDataContainer(osg::clone(source, osg::CopyOp::SHALLOW_COPY));
+            else
+            {
+                for (unsigned int i = 0; i < source->getNumUserObjects(); ++i)
+                    target->getUserDataContainer()->addUserObject(
+                        osg::clone(source->getUserObject(i), osg::CopyOp::SHALLOW_COPY));
+            }
+        }
+
+        osg::ref_ptr<osg::StateSet> makeFrontFaceStateSet()
+        {
+            osg::ref_ptr<osg::FrontFace> frontFace = new osg::FrontFace;
+            frontFace->setMode(osg::FrontFace::CLOCKWISE);
+
+            osg::ref_ptr<osg::StateSet> frontFaceStateSet = new osg::StateSet;
+            frontFaceStateSet->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
+            return frontFaceStateSet;
         }
     }
 
@@ -151,14 +173,8 @@ namespace SceneUtil
                 // Note: for absolute correctness we would need to check the current front face for every mesh then
                 // invert it However MW isn't doing this either, so don't. Assuming all meshes are using backface
                 // culling is more efficient.
-                static osg::ref_ptr<osg::StateSet> frontFaceStateSet;
-                if (!frontFaceStateSet)
-                {
-                    frontFaceStateSet = new osg::StateSet;
-                    osg::FrontFace* frontFace = new osg::FrontFace;
-                    frontFace->setMode(osg::FrontFace::CLOCKWISE);
-                    frontFaceStateSet->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
-                }
+                static const osg::ref_ptr<osg::StateSet> frontFaceStateSet = makeFrontFaceStateSet();
+
                 trans->setStateSet(frontFaceStateSet);
             }
 
diff --git a/components/sceneutil/depth.cpp b/components/sceneutil/depth.cpp
index 738fa93dd8..5232d321dc 100644
--- a/components/sceneutil/depth.cpp
+++ b/components/sceneutil/depth.cpp
@@ -4,6 +4,7 @@
 #include <array>
 
 #include <components/debug/debuglog.hpp>
+#include <components/sceneutil/glextensions.hpp>
 #include <components/settings/values.hpp>
 
 namespace SceneUtil
@@ -116,8 +117,7 @@ namespace SceneUtil
 
         if (Settings::camera().mReverseZ)
         {
-            osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
-            if (exts && exts->isClipControlSupported)
+            if (SceneUtil::getGLExtensions().isClipControlSupported)
             {
                 enableReverseZ = true;
                 Log(Debug::Info) << "Using reverse-z depth buffer";
diff --git a/components/sceneutil/depth.hpp b/components/sceneutil/depth.hpp
index ccc214ae3e..a9f99b145f 100644
--- a/components/sceneutil/depth.hpp
+++ b/components/sceneutil/depth.hpp
@@ -64,7 +64,9 @@ namespace SceneUtil
     {
     public:
         AutoDepth(
-            osg::Depth::Function func = osg::Depth::LESS, double zNear = 0.0, double zFar = 1.0, bool writeMask = true)
+            // NB: OSG uses LESS test function by default, Morrowind uses LEQUAL
+            osg::Depth::Function func = osg::Depth::LEQUAL, double zNear = 0.0, double zFar = 1.0,
+            bool writeMask = true)
         {
             setFunction(func);
             setZNear(zNear);
diff --git a/components/sceneutil/detourdebugdraw.cpp b/components/sceneutil/detourdebugdraw.cpp
index 3e07d17a23..24d29b0b70 100644
--- a/components/sceneutil/detourdebugdraw.cpp
+++ b/components/sceneutil/detourdebugdraw.cpp
@@ -1,9 +1,15 @@
 #include "detourdebugdraw.hpp"
+
+#include "depth.hpp"
 #include "util.hpp"
 
 #include <osg/BlendFunc>
 #include <osg/Group>
 #include <osg/LineWidth>
+#include <osg/Material>
+#include <osg/PolygonOffset>
+
+#include <algorithm>
 
 namespace
 {
@@ -80,15 +86,16 @@ namespace SceneUtil
 
     void DebugDraw::end()
     {
+        const osg::ref_ptr<osg::DrawArrays> drawArrays
+            = new osg::DrawArrays(mMode, 0, static_cast<int>(mVertices->size()));
+
         osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
         geometry->setStateSet(mStateSet);
-        geometry->setVertexArray(mVertices);
-        geometry->setColorArray(mColors, osg::Array::BIND_PER_VERTEX);
-        geometry->addPrimitiveSet(new osg::DrawArrays(mMode, 0, static_cast<int>(mVertices->size())));
+        geometry->addPrimitiveSet(drawArrays);
+        geometry->setVertexArray(std::exchange(mVertices, nullptr));
+        geometry->setColorArray(std::exchange(mColors, nullptr), osg::Array::BIND_PER_VERTEX);
 
         mGroup.addChild(geometry);
-        mColors.release();
-        mVertices.release();
     }
 
     void DebugDraw::addVertex(osg::Vec3f&& position)
@@ -102,15 +109,19 @@ namespace SceneUtil
         mColors->push_back(value);
     }
 
-    osg::ref_ptr<osg::StateSet> DebugDraw::makeStateSet()
+    osg::ref_ptr<osg::StateSet> makeDetourGroupStateSet()
     {
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+
+        const float polygonOffsetFactor = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
+        const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
+        osg::ref_ptr<osg::PolygonOffset> polygonOffset
+            = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
+
         osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
-        stateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
-        stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-        stateSet->setMode(GL_DEPTH, osg::StateAttribute::OFF);
-        stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
-        stateSet->setAttributeAndModes(new osg::LineWidth());
-        stateSet->setAttributeAndModes(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+        stateSet->setAttribute(material);
+        stateSet->setAttributeAndModes(polygonOffset);
         return stateSet;
     }
 }
diff --git a/components/sceneutil/detourdebugdraw.hpp b/components/sceneutil/detourdebugdraw.hpp
index 1da68db73b..66e4e4103a 100644
--- a/components/sceneutil/detourdebugdraw.hpp
+++ b/components/sceneutil/detourdebugdraw.hpp
@@ -18,8 +18,6 @@ namespace SceneUtil
         explicit DebugDraw(osg::Group& group, const osg::ref_ptr<osg::StateSet>& stateSet, const osg::Vec3f& shift,
             float recastInvertedScaleFactor);
 
-        static osg::ref_ptr<osg::StateSet> makeStateSet();
-
         void depthMask(bool state) override;
 
         void texture(bool state) override;
@@ -53,6 +51,8 @@ namespace SceneUtil
 
         void addColor(osg::Vec4f&& value);
     };
+
+    osg::ref_ptr<osg::StateSet> makeDetourGroupStateSet();
 }
 
 #endif
\ No newline at end of file
diff --git a/components/sceneutil/extradata.cpp b/components/sceneutil/extradata.cpp
index e36efbad9c..2d00980565 100644
--- a/components/sceneutil/extradata.cpp
+++ b/components/sceneutil/extradata.cpp
@@ -9,35 +9,51 @@
 #include <yaml-cpp/yaml.h>
 
 #include <components/misc/osguservalues.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/shader/shadermanager.hpp>
 
 namespace SceneUtil
 {
-    void ProcessExtraDataVisitor::setupSoftEffect(osg::Node& node, float size, bool falloff)
+    void setupSoftEffect(osg::Node& node, float size, bool falloff, float falloffDepth)
     {
-        if (!mSceneMgr->getSoftParticles())
-            return;
-
-        const int unitSoftEffect
-            = mSceneMgr->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
-        static const osg::ref_ptr<SceneUtil::AutoDepth> depth = new SceneUtil::AutoDepth(osg::Depth::LESS, 0, 1, false);
+        static const osg::ref_ptr<SceneUtil::AutoDepth> depth
+            = new SceneUtil::AutoDepth(osg::Depth::LEQUAL, 0, 1, false);
 
         osg::StateSet* stateset = node.getOrCreateStateSet();
 
-        stateset->addUniform(new osg::Uniform("opaqueDepthTex", unitSoftEffect));
         stateset->addUniform(new osg::Uniform("particleSize", size));
         stateset->addUniform(new osg::Uniform("particleFade", falloff));
+        stateset->addUniform(new osg::Uniform("softFalloffDepth", falloffDepth));
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
         node.setUserValue(Misc::OsgUserValues::sXSoftEffect, true);
     }
 
+    void setupDistortion(osg::Node& node, float distortionStrength)
+    {
+        static const osg::ref_ptr<SceneUtil::AutoDepth> depth
+            = new SceneUtil::AutoDepth(osg::Depth::ALWAYS, 0, 1, false);
+
+        osg::StateSet* stateset = node.getOrCreateStateSet();
+
+        stateset->setNestRenderBins(false);
+        stateset->setRenderBinDetails(14, "Distortion", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
+        stateset->addUniform(new osg::Uniform("distortionStrength", distortionStrength));
+
+        stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+    }
+
     void ProcessExtraDataVisitor::apply(osg::Node& node)
     {
+        if (!mSceneMgr->getSoftParticles())
+            return;
+
         std::string source;
 
+        constexpr float defaultFalloffDepth = 300.f; // arbitrary value that simply looks good with common cases
+
         if (node.getUserValue(Misc::OsgUserValues::sExtraData, source) && !source.empty())
         {
             YAML::Node root = YAML::Load(source);
@@ -50,8 +66,15 @@ namespace SceneUtil
                 {
                     auto size = it.second["size"].as<float>(45.f);
                     auto falloff = it.second["falloff"].as<bool>(false);
+                    auto falloffDepth = it.second["falloffDepth"].as<float>(defaultFalloffDepth);
 
-                    setupSoftEffect(node, size, falloff);
+                    setupSoftEffect(node, size, falloff, falloffDepth);
+                }
+                else if (key == "distortion")
+                {
+                    auto strength = it.second["strength"].as<float>(0.1f);
+
+                    setupDistortion(node, strength);
                 }
             }
 
@@ -59,9 +82,10 @@ namespace SceneUtil
         }
         else if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&node))
         {
-            setupSoftEffect(node, partsys->getDefaultParticleTemplate().getSizeRange().maximum, false);
+            setupSoftEffect(
+                node, partsys->getDefaultParticleTemplate().getSizeRange().maximum, false, defaultFalloffDepth);
         }
 
         traverse(node);
     }
-}
\ No newline at end of file
+}
diff --git a/components/sceneutil/extradata.hpp b/components/sceneutil/extradata.hpp
index 4568a5289b..7054ac91b3 100644
--- a/components/sceneutil/extradata.hpp
+++ b/components/sceneutil/extradata.hpp
@@ -15,6 +15,9 @@ namespace osg
 
 namespace SceneUtil
 {
+    void setupSoftEffect(osg::Node& node, float size, bool falloff, float falloffDepth);
+    void setupDistortion(osg::Node& node, float distortionStrength);
+
     class ProcessExtraDataVisitor : public osg::NodeVisitor
     {
     public:
@@ -27,8 +30,6 @@ namespace SceneUtil
         void apply(osg::Node& node) override;
 
     private:
-        void setupSoftEffect(osg::Node& node, float size, bool falloff);
-
         Resource::SceneManager* mSceneMgr;
     };
 }
diff --git a/components/sceneutil/glextensions.cpp b/components/sceneutil/glextensions.cpp
new file mode 100644
index 0000000000..3a14dab8ed
--- /dev/null
+++ b/components/sceneutil/glextensions.cpp
@@ -0,0 +1,60 @@
+#include "glextensions.hpp"
+
+#include <osg/GraphicsContext>
+
+namespace SceneUtil
+{
+    namespace
+    {
+        std::set<osg::observer_ptr<osg::GLExtensions>> sGLExtensions;
+
+        class GLExtensionsObserver : public osg::Observer
+        {
+        public:
+            static GLExtensionsObserver sInstance;
+
+            ~GLExtensionsObserver() override
+            {
+                for (auto& ptr : sGLExtensions)
+                {
+                    osg::ref_ptr<osg::GLExtensions> ref;
+                    if (ptr.lock(ref))
+                        ref->removeObserver(this);
+                }
+            }
+
+            void objectDeleted(void* referenced) override
+            {
+                sGLExtensions.erase(static_cast<osg::GLExtensions*>(referenced));
+            }
+        };
+
+        // construct after sGLExtensions so this gets destroyed first.
+        GLExtensionsObserver GLExtensionsObserver::sInstance{};
+    }
+
+    bool glExtensionsReady()
+    {
+        return !sGLExtensions.empty();
+    }
+
+    osg::GLExtensions& getGLExtensions()
+    {
+        if (sGLExtensions.empty())
+            throw std::runtime_error(
+                "GetGLExtensionsOperation was not used when the current context was created or there is no current "
+                "context");
+        return **sGLExtensions.begin();
+    }
+
+    GetGLExtensionsOperation::GetGLExtensionsOperation()
+        : GraphicsOperation("GetGLExtensionsOperation", false)
+    {
+    }
+
+    void GetGLExtensionsOperation::operator()(osg::GraphicsContext* graphicsContext)
+    {
+        auto [itr, _] = sGLExtensions.emplace(graphicsContext->getState()->get<osg::GLExtensions>());
+        (*itr)->addObserver(&GLExtensionsObserver::sInstance);
+    }
+}
diff --git a/components/sceneutil/glextensions.hpp b/components/sceneutil/glextensions.hpp
new file mode 100644
index 0000000000..05e7f715c1
--- /dev/null
+++ b/components/sceneutil/glextensions.hpp
@@ -0,0 +1,21 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_GLEXTENSIONS_H
+#define OPENMW_COMPONENTS_SCENEUTIL_GLEXTENSIONS_H
+
+#include <osg/GLExtensions>
+#include <osg/GraphicsThread>
+
+namespace SceneUtil
+{
+    bool glExtensionsReady();
+    osg::GLExtensions& getGLExtensions();
+
+    class GetGLExtensionsOperation : public osg::GraphicsOperation
+    {
+    public:
+        GetGLExtensionsOperation();
+
+        void operator()(osg::GraphicsContext* graphicsContext) override;
+    };
+}
+
+#endif
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
index 3ea862d213..e8d53c1876 100644
--- a/components/sceneutil/keyframe.hpp
+++ b/components/sceneutil/keyframe.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_SCENEUTIL_KEYFRAME_HPP
 
 #include <map>
+#include <optional>
 
 #include <osg/Object>
 
@@ -21,8 +22,19 @@ namespace SceneUtil
         {
         }
 
+        std::shared_ptr<float> mTime = std::make_shared<float>(0.0f);
+
+        struct KfTransform
+        {
+            std::optional<osg::Vec3f> mTranslation;
+            std::optional<osg::Quat> mRotation;
+            std::optional<float> mScale;
+        };
+
         virtual osg::Vec3f getTranslation(float time) const { return osg::Vec3f(); }
 
+        virtual KfTransform getCurrentTransformation(osg::NodeVisitor* nv) { return KfTransform(); };
+
         /// @note We could drop this function in favour of osg::Object::asCallback from OSG 3.6 on.
         virtual osg::Callback* getAsCallback() = 0;
     };
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index 98af5d21c8..18b4580571 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -36,9 +36,12 @@ namespace SceneUtil
         // if (time == mLastTime)
         //    return;
 
+        osg::Light* light = node->getLight(nv->getTraversalNumber());
+
         if (mType == LT_Normal)
         {
-            node->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor);
+            light->setDiffuse(mDiffuseColor);
+            light->setSpecular(mSpecularColor);
             traverse(node, nv);
             return;
         }
@@ -63,7 +66,10 @@ namespace SceneUtil
                 mPhase = mPhase <= 0.5f ? 1.f : 0.25f;
         }
 
-        node->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor * mBrightness * node->getActorFade());
+        const float result = mBrightness * node->getActorFade();
+
+        light->setDiffuse(mDiffuseColor * result);
+        light->setSpecular(mSpecularColor * result);
 
         traverse(node, nv);
     }
@@ -73,4 +79,9 @@ namespace SceneUtil
         mDiffuseColor = color;
     }
 
+    void LightController::setSpecular(const osg::Vec4f& color)
+    {
+        mSpecularColor = color;
+    }
+
 }
diff --git a/components/sceneutil/lightcontroller.hpp b/components/sceneutil/lightcontroller.hpp
index 13f5501bf9..0c088d579f 100644
--- a/components/sceneutil/lightcontroller.hpp
+++ b/components/sceneutil/lightcontroller.hpp
@@ -27,12 +27,14 @@ namespace SceneUtil
         void setType(LightType type);
 
         void setDiffuse(const osg::Vec4f& color);
+        void setSpecular(const osg::Vec4f& color);
 
         void operator()(SceneUtil::LightSource* node, osg::NodeVisitor* nv);
 
     private:
         LightType mType;
         osg::Vec4f mDiffuseColor;
+        osg::Vec4f mSpecularColor;
         float mPhase;
         float mBrightness;
         double mStartTime;
diff --git a/components/sceneutil/lightingmethod.hpp b/components/sceneutil/lightingmethod.hpp
new file mode 100644
index 0000000000..00aafd1cb7
--- /dev/null
+++ b/components/sceneutil/lightingmethod.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_LIGHTINGMETHOD_H
+#define OPENMW_COMPONENTS_SCENEUTIL_LIGHTINGMETHOD_H
+
+namespace SceneUtil
+{
+    enum class LightingMethod
+    {
+        FFP,
+        PerObjectUniform,
+        SingleUBO,
+    };
+}
+
+#endif
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index ea7d3459ae..178ea087c0 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -13,6 +13,7 @@
 #include <osgUtil/CullVisitor>
 
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/glextensions.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/shader/shadermanager.hpp>
 
@@ -23,18 +24,8 @@
 
 namespace
 {
-    constexpr int maxLightsLowerLimit = 2;
-    constexpr int maxLightsUpperLimit = 64;
     constexpr int ffpMaxLights = 8;
 
-    bool sortLights(const SceneUtil::LightManager::LightSourceViewBound* left,
-        const SceneUtil::LightManager::LightSourceViewBound* right)
-    {
-        static auto constexpr illuminationBias = 81.f;
-        return left->mViewBound.center().length2() - left->mViewBound.radius2() * illuminationBias
-            < right->mViewBound.center().length2() - right->mViewBound.radius2() * illuminationBias;
-    }
-
     void configurePosition(osg::Matrixf& mat, const osg::Vec4& pos)
     {
         mat(0, 0) = pos.x();
@@ -538,6 +529,7 @@ namespace SceneUtil
                 configurePosition(lightMat, light->getPosition() * mViewMatrix);
                 configureAmbient(lightMat, light->getAmbient());
                 configureDiffuse(lightMat, light->getDiffuse());
+                configureSpecular(lightMat, light->getSpecular());
                 configureAttenuation(lightMat, light->getConstantAttenuation(), light->getLinearAttenuation(),
                     light->getQuadraticAttenuation(), lightList[i]->mLightSource->getRadius());
 
@@ -817,7 +809,7 @@ namespace SceneUtil
         return "";
     }
 
-    LightManager::LightManager(bool ffp)
+    LightManager::LightManager(const LightSettings& settings)
         : mStartLight(0)
         , mLightingMask(~0u)
         , mSun(nullptr)
@@ -825,7 +817,7 @@ namespace SceneUtil
         , mPointLightFadeEnd(0.f)
         , mPointLightFadeStart(0.f)
     {
-        osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
+        osg::GLExtensions* exts = SceneUtil::glExtensionsReady() ? &SceneUtil::getGLExtensions() : nullptr;
         bool supportsUBO = exts && exts->isUniformBufferObjectSupported;
         bool supportsGPU4 = exts && exts->isGpuShader4Supported;
 
@@ -835,41 +827,36 @@ namespace SceneUtil
 
         setUpdateCallback(new LightManagerUpdateCallback);
 
-        if (ffp)
+        if (settings.mLightingMethod == LightingMethod::FFP)
         {
             initFFP(ffpMaxLights);
-            return;
         }
-
-        const std::string& lightingMethodString = Settings::Manager::getString("lighting method", "Shaders");
-        auto lightingMethod = LightManager::getLightingMethodFromString(lightingMethodString);
-
-        static bool hasLoggedWarnings = false;
-
-        if (lightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings)
-        {
-            if (!supportsUBO)
-                Log(Debug::Warning)
-                    << "GL_ARB_uniform_buffer_object not supported: switching to shader compatibility lighting mode";
-            if (!supportsGPU4)
-                Log(Debug::Warning)
-                    << "GL_EXT_gpu_shader4 not supported: switching to shader compatibility lighting mode";
-            hasLoggedWarnings = true;
-        }
-
-        const int targetLights
-            = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), maxLightsLowerLimit, maxLightsUpperLimit);
-
-        if (!supportsUBO || !supportsGPU4 || lightingMethod == LightingMethod::PerObjectUniform)
-            initPerObjectUniform(targetLights);
         else
-            initSingleUBO(targetLights);
+        {
+            static bool hasLoggedWarnings = false;
 
-        updateSettings();
+            if (settings.mLightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings)
+            {
+                if (!supportsUBO)
+                    Log(Debug::Warning) << "GL_ARB_uniform_buffer_object not supported: switching to shader "
+                                           "compatibility lighting mode";
+                if (!supportsGPU4)
+                    Log(Debug::Warning)
+                        << "GL_EXT_gpu_shader4 not supported: switching to shader compatibility lighting mode";
+                hasLoggedWarnings = true;
+            }
 
-        getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
+            if (!supportsUBO || !supportsGPU4 || settings.mLightingMethod == LightingMethod::PerObjectUniform)
+                initPerObjectUniform(settings.mMaxLights);
+            else
+                initSingleUBO(settings.mMaxLights);
 
-        addCullCallback(new LightManagerCullCallback(this));
+            getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
+
+            addCullCallback(new LightManagerCullCallback(this));
+        }
+
+        updateSettings(settings.mLightBoundsMultiplier, settings.mMaximumLightDistance, settings.mLightFadeStart);
     }
 
     LightManager::LightManager(const LightManager& copy, const osg::CopyOp& copyop)
@@ -931,18 +918,18 @@ namespace SceneUtil
         return defines;
     }
 
-    void LightManager::processChangedSettings(const Settings::CategorySettingVector& changed)
+    void LightManager::processChangedSettings(
+        float lightBoundsMultiplier, float maximumLightDistance, float lightFadeStart)
     {
-        updateSettings();
+        updateSettings(lightBoundsMultiplier, maximumLightDistance, lightFadeStart);
     }
 
-    void LightManager::updateMaxLights()
+    void LightManager::updateMaxLights(int maxLights)
     {
         if (usingFFP())
             return;
 
-        setMaxLights(
-            std::clamp(Settings::Manager::getInt("max lights", "Shaders"), maxLightsLowerLimit, maxLightsUpperLimit));
+        setMaxLights(maxLights);
 
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
@@ -954,20 +941,12 @@ namespace SceneUtil
             cache.clear();
     }
 
-    void LightManager::updateSettings()
+    void LightManager::updateSettings(float lightBoundsMultiplier, float maximumLightDistance, float lightFadeStart)
     {
-        if (getLightingMethod() == LightingMethod::FFP)
-            return;
-
-        mPointLightRadiusMultiplier
-            = std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 5.f);
-
-        mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
+        mPointLightRadiusMultiplier = lightBoundsMultiplier;
+        mPointLightFadeEnd = maximumLightDistance;
         if (mPointLightFadeEnd > 0)
-        {
-            mPointLightFadeStart = std::clamp(Settings::Manager::getFloat("light fade start", "Shaders"), 0.f, 1.f);
-            mPointLightFadeStart = mPointLightFadeEnd * mPointLightFadeStart;
-        }
+            mPointLightFadeStart = mPointLightFadeEnd * lightFadeStart;
     }
 
     void LightManager::initFFP(int targetLights)
@@ -1158,7 +1137,7 @@ namespace SceneUtil
 
                 float radius = transform.mLightSource->getRadius();
 
-                osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0, 0, 0), radius);
+                osg::BoundingSphere viewBound(osg::Vec3f(), radius * mPointLightRadiusMultiplier);
                 transformBoundingSphere(worldViewMat, viewBound);
 
                 if (transform.mLightSource->getLastAppliedFrame() != frameNum && mPointLightFadeEnd != 0.f)
@@ -1171,18 +1150,10 @@ namespace SceneUtil
 
                     auto* light = transform.mLightSource->getLight(frameNum);
                     light->setDiffuse(light->getDiffuse() * fade);
+                    light->setSpecular(light->getSpecular() * fade);
                     transform.mLightSource->setLastAppliedFrame(frameNum);
                 }
 
-                // remove lights culled by this camera
-                if (!usingFFP())
-                {
-                    viewBound._radius *= 2.f;
-                    if (cv->getModelViewCullingStack().front().isCulled(viewBound))
-                        continue;
-                    viewBound._radius /= 2.f;
-                }
-                viewBound._radius *= mPointLightRadiusMultiplier;
                 LightSourceViewBound l;
                 l.mLightSource = transform.mLightSource;
                 l.mViewBound = viewBound;
@@ -1190,8 +1161,10 @@ namespace SceneUtil
             }
 
             const bool fillPPLights = mPPLightBuffer && it->first->getName() == Constants::SceneCamera;
+            const bool sceneLimitReached = getLightingMethod() == LightingMethod::SingleUBO
+                && it->second.size() > static_cast<size_t>(getMaxLightsInScene() - 1);
 
-            if (fillPPLights || getLightingMethod() == LightingMethod::SingleUBO)
+            if (fillPPLights || sceneLimitReached)
             {
                 auto sorter = [](const LightSourceViewBound& left, const LightSourceViewBound& right) {
                     return left.mViewBound.center().length2() - left.mViewBound.radius2()
@@ -1202,17 +1175,26 @@ namespace SceneUtil
 
                 if (fillPPLights)
                 {
+                    osg::CullingSet& cullingSet = cv->getModelViewCullingStack().front();
                     for (const auto& bound : it->second)
                     {
                         if (bound.mLightSource->getEmpty())
                             continue;
                         const auto* light = bound.mLightSource->getLight(frameNum);
-                        if (light->getDiffuse().x() >= 0.f)
-                            mPPLightBuffer->setLight(frameNum, light, bound.mLightSource->getRadius());
+                        // Ignore negative lights
+                        if (light->getDiffuse().x() < 0.f)
+                            continue;
+                        const float radius = bound.mLightSource->getRadius();
+                        osg::BoundingSphere frustumBound = bound.mViewBound;
+                        frustumBound.radius() = radius * 2.f;
+                        // Ignore culled lights
+                        if (cullingSet.isCulled(frustumBound))
+                            continue;
+                        mPPLightBuffer->setLight(frameNum, light, radius);
                     }
                 }
 
-                if (it->second.size() > static_cast<size_t>(getMaxLightsInScene() - 1))
+                if (sceneLimitReached)
                     it->second.resize(getMaxLightsInScene() - 1);
             }
         }
@@ -1227,6 +1209,7 @@ namespace SceneUtil
         auto& buf = getUBOManager()->getLightBuffer(frameNum);
         buf->setDiffuse(index, light->getDiffuse());
         buf->setAmbient(index, light->getAmbient());
+        buf->setSpecular(index, light->getSpecular());
         buf->setAttenuationRadius(index,
             osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(),
                 lightSource->getRadius()));
@@ -1293,74 +1276,63 @@ namespace SceneUtil
         // Possible optimizations:
         // - organize lights in a quad tree
 
-        mLastFrameNumber = cv->getTraversalNumber();
-
         // Don't use Camera::getViewMatrix, that one might be relative to another camera!
         const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
-        const std::vector<LightManager::LightSourceViewBound>& lights
-            = mLightManager->getLightsInViewSpace(cv, viewMatrix, mLastFrameNumber);
 
-        // get the node bounds in view space
-        // NB do not node->getBound() * modelView, that would apply the node's transformation twice
-        osg::BoundingSphere nodeBound;
-        osg::Transform* transform = node->asTransform();
-        if (transform)
+        // Update light list if necessary
+        // This makes sure we don't update it more than once per frame when rendering with multiple cameras
+        if (mLastFrameNumber != cv->getTraversalNumber())
         {
-            for (size_t i = 0; i < transform->getNumChildren(); ++i)
-                nodeBound.expandBy(transform->getChild(i)->getBound());
-        }
-        else
-            nodeBound = node->getBound();
-        osg::Matrixf mat = *cv->getModelViewMatrix();
-        transformBoundingSphere(mat, nodeBound);
+            mLastFrameNumber = cv->getTraversalNumber();
 
-        mLightList.clear();
-        for (size_t i = 0; i < lights.size(); ++i)
-        {
-            const LightManager::LightSourceViewBound& l = lights[i];
+            // Get the node bounds in view space
+            // NB: do not node->getBound() * modelView, that would apply the node's transformation twice
+            osg::BoundingSphere nodeBound;
+            const osg::Transform* transform = node->asTransform();
+            if (transform)
+            {
+                for (size_t i = 0; i < transform->getNumChildren(); ++i)
+                    nodeBound.expandBy(transform->getChild(i)->getBound());
+            }
+            else
+                nodeBound = node->getBound();
 
-            if (mIgnoredLightSources.count(l.mLightSource))
-                continue;
+            transformBoundingSphere(*cv->getModelViewMatrix(), nodeBound);
 
-            if (l.mViewBound.intersects(nodeBound))
-                mLightList.push_back(&l);
+            const std::vector<LightManager::LightSourceViewBound>& lights
+                = mLightManager->getLightsInViewSpace(cv, viewMatrix, mLastFrameNumber);
+
+            mLightList.clear();
+            for (const LightManager::LightSourceViewBound& light : lights)
+            {
+                if (mIgnoredLightSources.contains(light.mLightSource))
+                    continue;
+
+                if (light.mViewBound.intersects(nodeBound))
+                    mLightList.push_back(&light);
+            }
+
+            const size_t maxLights = mLightManager->getMaxLights() - mLightManager->getStartLight();
+
+            if (mLightList.size() > maxLights)
+            {
+                // Sort by proximity to object: prefer closer lights with larger radius
+                std::sort(mLightList.begin(), mLightList.end(),
+                    [&](const SceneUtil::LightManager::LightSourceViewBound* left,
+                        const SceneUtil::LightManager::LightSourceViewBound* right) {
+                        const float leftDist = (nodeBound.center() - left->mViewBound.center()).length2();
+                        const float rightDist = (nodeBound.center() - right->mViewBound.center()).length2();
+                        // A tricky way to compare normalized distance. This avoids division by near zero
+                        return left->mViewBound.radius() * rightDist > right->mViewBound.radius() * leftDist;
+                    });
+
+                mLightList.resize(maxLights);
+            }
         }
 
         if (!mLightList.empty())
         {
-            size_t maxLights = mLightManager->getMaxLights() - mLightManager->getStartLight();
-
-            osg::ref_ptr<osg::StateSet> stateset = nullptr;
-
-            if (mLightList.size() > maxLights)
-            {
-                LightManager::LightList lightList = mLightList;
-
-                if (mLightManager->usingFFP())
-                {
-                    for (auto it = lightList.begin(); it != lightList.end() && lightList.size() > maxLights;)
-                    {
-                        osg::BoundingSphere bs = (*it)->mViewBound;
-                        bs._radius = bs._radius * 2.0;
-                        if (cv->getModelViewCullingStack().front().isCulled(bs))
-                            it = lightList.erase(it);
-                        else
-                            ++it;
-                    }
-                }
-
-                // sort by proximity to camera, then get rid of furthest away lights
-                std::sort(lightList.begin(), lightList.end(), sortLights);
-                while (lightList.size() > maxLights)
-                    lightList.pop_back();
-                stateset = mLightManager->getLightListStateSet(
-                    lightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
-            }
-            else
-                stateset = mLightManager->getLightListStateSet(
-                    mLightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
-
-            cv->pushStateSet(stateset);
+            cv->pushStateSet(mLightManager->getLightListStateSet(mLightList, mLastFrameNumber, viewMatrix));
             return true;
         }
         return false;
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 93bddb800b..0b30a77e5c 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -12,7 +12,8 @@
 #include <osg/observer_ptr>
 
 #include <components/sceneutil/nodecallback.hpp>
-#include <components/settings/settings.hpp>
+
+#include "lightingmethod.hpp"
 
 namespace SceneUtil
 {
@@ -82,13 +83,6 @@ namespace SceneUtil
         std::array<osg::ref_ptr<osg::Uniform>, 2> mUniformCount;
     };
 
-    enum class LightingMethod
-    {
-        FFP,
-        PerObjectUniform,
-        SingleUBO,
-    };
-
     /// LightSource managed by a LightManager.
     /// @par Typically used for point lights. Spot lights are not supported yet. Directional lights affect the whole
     /// scene
@@ -186,6 +180,15 @@ namespace SceneUtil
         osg::ref_ptr<LightBuffer> mTemplate;
     };
 
+    struct LightSettings
+    {
+        LightingMethod mLightingMethod = LightingMethod::FFP;
+        int mMaxLights = 0;
+        float mMaximumLightDistance = 0;
+        float mLightFadeStart = 0;
+        float mLightBoundsMultiplier = 0;
+    };
+
     /// @brief Decorator node implementing the rendering of any number of LightSources that can be anywhere in the
     /// subgraph.
     class LightManager : public osg::Group
@@ -212,7 +215,7 @@ namespace SceneUtil
 
         META_Node(SceneUtil, LightManager)
 
-        LightManager(bool ffp = true);
+        explicit LightManager(const LightSettings& settings = LightSettings{});
 
         LightManager(const LightManager& copy, const osg::CopyOp& copyop);
 
@@ -264,10 +267,10 @@ namespace SceneUtil
 
         std::map<std::string, std::string> getLightDefines() const;
 
-        void processChangedSettings(const Settings::CategorySettingVector& changed);
+        void processChangedSettings(float lightBoundsMultiplier, float maximumLightDistance, float lightFadeStart);
 
         /// Not thread safe, it is the responsibility of the caller to stop/start threading on the viewer
-        void updateMaxLights();
+        void updateMaxLights(int maxLights);
 
         osg::ref_ptr<osg::Uniform> generateLightBufferUniform(const osg::Matrixf& sun);
 
@@ -281,7 +284,7 @@ namespace SceneUtil
         void initPerObjectUniform(int targetLights);
         void initSingleUBO(int targetLights);
 
-        void updateSettings();
+        void updateSettings(float lightBoundsMultiplier, float maximumLightDistance, float lightFadeStart);
 
         void setLightingMethod(LightingMethod method);
         void setMaxLights(int value);
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 9c0ebdf5c2..08992b1ae3 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -52,11 +52,15 @@ namespace SceneUtil
         static const bool useConstant = Fallback::Map::getBool("LightAttenuation_UseConstant");
         static const bool useLinear = Fallback::Map::getBool("LightAttenuation_UseLinear");
         static const bool useQuadratic = Fallback::Map::getBool("LightAttenuation_UseQuadratic");
-        static const float constantValue = Fallback::Map::getFloat("LightAttenuation_ConstantValue");
-        static const float linearValue = Fallback::Map::getFloat("LightAttenuation_LinearValue");
-        static const float quadraticValue = Fallback::Map::getFloat("LightAttenuation_QuadraticValue");
-        static const float linearRadiusMult = Fallback::Map::getFloat("LightAttenuation_LinearRadiusMult");
-        static const float quadraticRadiusMult = Fallback::Map::getFloat("LightAttenuation_QuadraticRadiusMult");
+        // User file might provide nonsense values
+        // Clamp these settings to prevent badness (e.g. illegal OpenGL calls)
+        static const float constantValue = std::max(Fallback::Map::getFloat("LightAttenuation_ConstantValue"), 0.f);
+        static const float linearValue = std::max(Fallback::Map::getFloat("LightAttenuation_LinearValue"), 0.f);
+        static const float quadraticValue = std::max(Fallback::Map::getFloat("LightAttenuation_QuadraticValue"), 0.f);
+        static const float linearRadiusMult
+            = std::max(Fallback::Map::getFloat("LightAttenuation_LinearRadiusMult"), 0.f);
+        static const float quadraticRadiusMult
+            = std::max(Fallback::Map::getFloat("LightAttenuation_QuadraticRadiusMult"), 0.f);
         static const int linearMethod = Fallback::Map::getInt("LightAttenuation_LinearMethod");
         static const int quadraticMethod = Fallback::Map::getInt("LightAttenuation_QuadraticMethod");
         static const bool outQuadInLin = Fallback::Map::getBool("LightAttenuation_OutQuadInLin");
@@ -68,7 +72,7 @@ namespace SceneUtil
         {
             linearAttenuation = linearMethod == 0 ? linearValue : 0.01f;
             float r = radius * linearRadiusMult;
-            if (r && (linearMethod == 1 || linearMethod == 2))
+            if (r > 0.f && (linearMethod == 1 || linearMethod == 2))
                 linearAttenuation = linearValue / std::pow(r, linearMethod);
         }
 
@@ -76,10 +80,14 @@ namespace SceneUtil
         {
             quadraticAttenuation = quadraticMethod == 0 ? quadraticValue : 0.01f;
             float r = radius * quadraticRadiusMult;
-            if (r && (quadraticMethod == 1 || quadraticMethod == 2))
+            if (r > 0.f && (quadraticMethod == 1 || quadraticMethod == 2))
                 quadraticAttenuation = quadraticValue / std::pow(r, quadraticMethod);
         }
 
+        // If the values are still nonsense, try to at least prevent UB and disable attenuation
+        if (constantAttenuation == 0.f && linearAttenuation == 0.f && quadraticAttenuation == 0.f)
+            constantAttenuation = 1.f;
+
         light->setConstantAttenuation(constantAttenuation);
         light->setLinearAttenuation(linearAttenuation);
         light->setQuadraticAttenuation(quadraticAttenuation);
@@ -117,19 +125,23 @@ namespace SceneUtil
         configureLight(light, radius, isExterior);
 
         osg::Vec4f diffuse = esmLight.mColor;
+        osg::Vec4f specular = esmLight.mColor; // ESM format doesn't provide specular
         if (esmLight.mNegative)
         {
             diffuse *= -1;
             diffuse.a() = 1;
+            // Using specular lighting for negative lights is unreasonable
+            specular = osg::Vec4f();
         }
         light->setDiffuse(diffuse);
         light->setAmbient(ambient);
-        light->setSpecular(osg::Vec4f(0, 0, 0, 0));
+        light->setSpecular(specular);
 
         lightSource->setLight(light);
 
         osg::ref_ptr<SceneUtil::LightController> ctrl(new SceneUtil::LightController);
         ctrl->setDiffuse(light->getDiffuse());
+        ctrl->setSpecular(light->getSpecular());
         if (esmLight.mFlicker)
             ctrl->setType(SceneUtil::LightController::LT_Flicker);
         if (esmLight.mFlickerSlow)
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 06930ebe59..9fd435f40d 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -30,6 +30,7 @@
 #include <deque>
 #include <vector>
 
+#include "glextensions.hpp"
 #include "shadowsbin.hpp"
 
 namespace {
@@ -557,11 +558,9 @@ MWShadowTechnique::ShadowData::ShadowData(MWShadowTechnique::ViewDependentData*
     _texture->setFilter(osg::Texture2D::MIN_FILTER,osg::Texture2D::LINEAR);
     _texture->setFilter(osg::Texture2D::MAG_FILTER,osg::Texture2D::LINEAR);
 
-    // the shadow comparison should fail if object is outside the texture
-    _texture->setWrap(osg::Texture2D::WRAP_S,osg::Texture2D::CLAMP_TO_BORDER);
-    _texture->setWrap(osg::Texture2D::WRAP_T,osg::Texture2D::CLAMP_TO_BORDER);
-    _texture->setBorderColor(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
-    //_texture->setBorderColor(osg::Vec4(0.0f,0.0f,0.0f,0.0f));
+    // the shader clips sampled coordinates, so no need for border
+    _texture->setWrap(osg::Texture2D::WRAP_S,osg::Texture2D::CLAMP_TO_EDGE);
+    _texture->setWrap(osg::Texture2D::WRAP_T,osg::Texture2D::CLAMP_TO_EDGE);
 
     // set up the camera
     _camera = new osg::Camera;
@@ -920,8 +919,7 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
     // This can't be part of the constructor as OSG mandates that there be a trivial constructor available
 
     osg::ref_ptr<osg::Shader> castingVertexShader = shaderManager.getShader("shadowcasting.vert");
-    osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
-    std::string useGPUShader4 = exts && exts->isGpuShader4Supported ? "1" : "0";
+    std::string useGPUShader4 = SceneUtil::getGLExtensions().isGpuShader4Supported ? "1" : "0";
     for (int alphaFunc = GL_NEVER; alphaFunc <= GL_ALWAYS; ++alphaFunc)
     {
         auto& program = _castingPrograms[alphaFunc - GL_NEVER];
@@ -1025,7 +1023,6 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
             {
                 dummyState->setTextureAttribute(i, _fallbackShadowMapTexture, osg::StateAttribute::ON);
                 dummyState->addUniform(new osg::Uniform(("shadowTexture" + std::to_string(i - baseUnit)).c_str(), i));
-                dummyState->addUniform(new osg::Uniform(("shadowTextureUnit" + std::to_string(i - baseUnit)).c_str(), i));
             }
 
             cv.pushStateSet(dummyState);
@@ -1711,14 +1708,6 @@ void MWShadowTechnique::createShaders()
             for (auto& perFrameUniformList : _uniforms)
                 perFrameUniformList.emplace_back(shadowTextureSampler.get());
         }
-
-        {
-            std::stringstream sstr;
-            sstr<<"shadowTextureUnit"<<sm_i;
-            osg::ref_ptr<osg::Uniform> shadowTextureUnit = new osg::Uniform(sstr.str().c_str(),(int)(settings->getBaseShadowTextureUnit()+sm_i));
-            for (auto& perFrameUniformList : _uniforms)
-                perFrameUniformList.emplace_back(shadowTextureUnit.get());
-        }
     }
 
     switch(settings->getShaderHint())
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index 2254150a53..9298afe760 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -1,5 +1,5 @@
 #include "navmesh.hpp"
-#include "depth.hpp"
+
 #include "detourdebugdraw.hpp"
 
 #include <components/detournavigator/settings.hpp>
@@ -7,10 +7,6 @@
 #include <DetourDebugDraw.h>
 
 #include <osg/Group>
-#include <osg/Material>
-#include <osg/PolygonOffset>
-
-#include <algorithm>
 
 namespace
 {
@@ -270,31 +266,14 @@ namespace
 
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::StateSet> makeNavMeshTileStateSet()
-    {
-        osg::ref_ptr<osg::Material> material = new osg::Material;
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-
-        const float polygonOffsetFactor = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
-        const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
-        osg::ref_ptr<osg::PolygonOffset> polygonOffset
-            = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
-
-        osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
-        stateSet->setAttribute(material);
-        stateSet->setAttributeAndModes(polygonOffset);
-        return stateSet;
-    }
-
     osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
-        const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& groupStateSet,
-        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet, unsigned char flags, unsigned minSalt, unsigned maxSalt)
+        const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet,
+        unsigned char flags, unsigned minSalt, unsigned maxSalt)
     {
         if (meshTile.header == nullptr)
             return nullptr;
 
         osg::ref_ptr<osg::Group> group(new osg::Group);
-        group->setStateSet(groupStateSet);
         constexpr float shift = 10.0f;
         DebugDraw debugDraw(
             *group, debugDrawStateSet, osg::Vec3f(0, 0, shift), 1.0f / settings.mRecast.mRecastScaleFactor);
diff --git a/components/sceneutil/navmesh.hpp b/components/sceneutil/navmesh.hpp
index 95d79ea4de..da9012ba7b 100644
--- a/components/sceneutil/navmesh.hpp
+++ b/components/sceneutil/navmesh.hpp
@@ -27,11 +27,9 @@ namespace SceneUtil
         NavMeshTileDrawFlagsHeat = 1 << 3,
     };
 
-    osg::ref_ptr<osg::StateSet> makeNavMeshTileStateSet();
-
     osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
-        const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& groupStateSet,
-        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet, unsigned char flags, unsigned minSalt, unsigned maxSalt);
+        const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet,
+        unsigned char flags, unsigned minSalt, unsigned maxSalt);
 }
 
 #endif
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 2646291053..7822f17448 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -38,6 +38,7 @@
 #include <numeric>
 
 #include <iterator>
+#include <cassert>
 
 #include <components/sceneutil/depth.hpp>
 
@@ -1197,6 +1198,67 @@ bool containsSharedPrimitives(const osg::Geometry* geom)
     return false;
 }
 
+    // clang-format on
+
+    namespace
+    {
+        unsigned getArraySizeOrZero(const osg::Array* array)
+        {
+            return array == nullptr ? 0 : array->getNumElements();
+        }
+
+        void fillArraySizes(const std::vector<osg::ref_ptr<osg::Array>>& arrays, std::vector<unsigned>& sizes)
+        {
+            sizes.reserve(arrays.size());
+            for (const auto& array : arrays)
+                sizes.push_back(getArraySizeOrZero(array));
+        }
+
+        void initArraySizes(const osg::Geometry& geometry, Optimizer::GeometryArraySizes& sizes)
+        {
+            sizes.mVertex = getArraySizeOrZero(geometry.getVertexArray());
+            sizes.mNormal = getArraySizeOrZero(geometry.getNormalArray());
+            sizes.mColor = getArraySizeOrZero(geometry.getColorArray());
+            sizes.mSecondaryColor = getArraySizeOrZero(geometry.getSecondaryColorArray());
+            sizes.mFogCoord = getArraySizeOrZero(geometry.getFogCoordArray());
+            sizes.mTexCoord.clear();
+            sizes.mVertexAttrib.clear();
+
+            fillArraySizes(geometry.getTexCoordArrayList(), sizes.mTexCoord);
+            fillArraySizes(geometry.getVertexAttribArrayList(), sizes.mVertexAttrib);
+        }
+
+        void addArraySize(const osg::Array* array, unsigned& size)
+        {
+            if (array != nullptr)
+                size += array->getNumElements();
+        }
+
+        void addArraySizes(const std::vector<osg::ref_ptr<osg::Array>>& dst,
+            const std::vector<osg::ref_ptr<osg::Array>>& src, std::vector<unsigned>& sizes)
+        {
+            assert(sizes.size() == dst.size());
+
+            for (std::size_t i = 0, n = std::min(dst.size(), src.size()); i < n; ++i)
+                if (osg::Array* const array = src[i])
+                    sizes[i] += array->getNumElements();
+        }
+
+        void addArraysSizes(const osg::Geometry& dst, const osg::Geometry& src, Optimizer::GeometryArraySizes& sizes)
+        {
+            addArraySize(src.getVertexArray(), sizes.mVertex);
+            addArraySize(src.getNormalArray(), sizes.mNormal);
+            addArraySize(src.getColorArray(), sizes.mColor);
+            addArraySize(src.getSecondaryColorArray(), sizes.mSecondaryColor);
+            addArraySize(src.getFogCoordArray(), sizes.mFogCoord);
+
+            addArraySizes(dst.getTexCoordArrayList(), src.getTexCoordArrayList(), sizes.mTexCoord);
+            addArraySizes(dst.getVertexAttribArrayList(), src.getVertexAttribArrayList(), sizes.mVertexAttrib);
+        }
+    }
+
+    // clang-format off
+
 bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
 {
     if (!isOperationPermissibleForObject(&group)) return false;
@@ -1346,6 +1408,9 @@ bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
                 group.addChild(*itr);
             }
 
+            // Place outside the loop to keep vectors allocated
+            GeometryArraySizes sizes;
+
             // now do the merging of geometries
             for(MergeList::iterator mitr = mergeList.begin();
                 mitr != mergeList.end();
@@ -1362,12 +1427,18 @@ bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
                     }
                     DuplicateList::iterator ditr = duplicateList.begin();
                     osg::ref_ptr<osg::Geometry> lhs = *ditr++;
+
+                    initArraySizes(*lhs, sizes);
+
+                    for (auto it = ditr; it != duplicateList.end(); ++it)
+                        addArraysSizes(*lhs, **it, sizes);
+
                     group.addChild(lhs.get());
                     for(;
                         ditr != duplicateList.end();
                         ++ditr)
                     {
-                        mergeGeometry(*lhs, **ditr);
+                        mergeGeometry(*lhs, **ditr, sizes);
                     }
                 }
             }
@@ -1665,7 +1736,7 @@ class MergeArrayVisitor : public osg::ArrayVisitor
         void apply(osg::Vec4sArray& rhs) override { _merge(rhs); }
 };
 
-bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geometry& rhs)
+bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs, osg::Geometry& rhs, const GeometryArraySizes& sizes)
 {
     MergeArrayVisitor merger;
     osg::VertexBufferObject* vbo = nullptr;
@@ -1675,6 +1746,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom
         base = lhs.getVertexArray()->getNumElements();
         if (lhs.getVertexArray()->referenceCount() > 1)
             lhs.setVertexArray(cloneArray(lhs.getVertexArray(), vbo, &lhs));
+        lhs.getVertexArray()->reserveArray(sizes.mVertex);
         if (!merger.merge(lhs.getVertexArray(),rhs.getVertexArray()))
         {
             OSG_DEBUG << "MergeGeometry: vertex array not merged. Some data may be lost." <<std::endl;
@@ -1691,6 +1763,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom
     {
         if (lhs.getNormalArray()->referenceCount() > 1)
             lhs.setNormalArray(cloneArray(lhs.getNormalArray(), vbo, &lhs));
+        lhs.getNormalArray()->reserveArray(sizes.mNormal);
         if (!merger.merge(lhs.getNormalArray(),rhs.getNormalArray()))
         {
             OSG_DEBUG << "MergeGeometry: normal array not merged. Some data may be lost." <<std::endl;
@@ -1706,6 +1779,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom
     {
         if (lhs.getColorArray()->referenceCount() > 1)
             lhs.setColorArray(cloneArray(lhs.getColorArray(), vbo, &lhs));
+        lhs.getColorArray()->reserveArray(sizes.mColor);
         if (!merger.merge(lhs.getColorArray(),rhs.getColorArray()))
         {
             OSG_DEBUG << "MergeGeometry: color array not merged. Some data may be lost." <<std::endl;
@@ -1720,6 +1794,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom
     {
         if (lhs.getSecondaryColorArray()->referenceCount() > 1)
             lhs.setSecondaryColorArray(cloneArray(lhs.getSecondaryColorArray(), vbo, &lhs));
+        lhs.getSecondaryColorArray()->reserveArray(static_cast<unsigned>(sizes.mSecondaryColor));
         if (!merger.merge(lhs.getSecondaryColorArray(),rhs.getSecondaryColorArray()))
         {
             OSG_DEBUG << "MergeGeometry: secondary color array not merged. Some data may be lost." <<std::endl;
@@ -1734,6 +1809,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom
     {
         if (lhs.getFogCoordArray()->referenceCount() > 1)
             lhs.setFogCoordArray(cloneArray(lhs.getFogCoordArray(), vbo, &lhs));
+        lhs.getFogCoordArray()->reserveArray(sizes.mFogCoord);
         if (!merger.merge(lhs.getFogCoordArray(),rhs.getFogCoordArray()))
         {
             OSG_DEBUG << "MergeGeometry: fog coord array not merged. Some data may be lost." <<std::endl;
@@ -1751,7 +1827,9 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom
         if (!lhs.getTexCoordArray(unit)) continue;
         if (lhs.getTexCoordArray(unit)->referenceCount() > 1)
             lhs.setTexCoordArray(unit, cloneArray(lhs.getTexCoordArray(unit), vbo, &lhs));
-        if (!merger.merge(lhs.getTexCoordArray(unit),rhs.getTexCoordArray(unit)))
+        osg::Array* const lhsArray = lhs.getTexCoordArray(unit);
+        lhsArray->reserveArray(sizes.mTexCoord[unit]);
+        if (!merger.merge(lhsArray, rhs.getTexCoordArray(unit)))
         {
             OSG_DEBUG << "MergeGeometry: tex coord array not merged. Some data may be lost." <<std::endl;
         }
@@ -1762,7 +1840,9 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom
         if (!lhs.getVertexAttribArray(unit)) continue;
         if (lhs.getVertexAttribArray(unit)->referenceCount() > 1)
             lhs.setVertexAttribArray(unit, cloneArray(lhs.getVertexAttribArray(unit), vbo, &lhs));
-        if (!merger.merge(lhs.getVertexAttribArray(unit),rhs.getVertexAttribArray(unit)))
+        osg::Array* const lhsArray = lhs.getVertexAttribArray(unit);
+        lhsArray->reserveArray(sizes.mVertexAttrib[unit]);
+        if (!merger.merge(lhsArray, rhs.getVertexAttribArray(unit)))
         {
             OSG_DEBUG << "MergeGeometry: vertex attrib array not merged. Some data may be lost." <<std::endl;
         }
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
index 6c19355331..86a05d7549 100644
--- a/components/sceneutil/optimizer.hpp
+++ b/components/sceneutil/optimizer.hpp
@@ -390,6 +390,17 @@ class Optimizer
             void apply(osg::Sequence& sequenceNode) override;
         };
 
+        struct GeometryArraySizes
+        {
+            unsigned mVertex = 0;
+            unsigned mNormal = 0;
+            unsigned mColor = 0;
+            unsigned mSecondaryColor = 0;
+            unsigned mFogCoord = 0;
+            std::vector<unsigned> mTexCoord;
+            std::vector<unsigned> mVertexAttrib;
+        };
+
         class MergeGeometryVisitor : public BaseOptimizerVisitor
         {
             public:
@@ -427,7 +438,7 @@ class Optimizer
 
                 bool mergeGroup(osg::Group& group);
 
-                static bool mergeGeometry(osg::Geometry& lhs,osg::Geometry& rhs);
+                static bool mergeGeometry(osg::Geometry& lhs, osg::Geometry& rhs, const GeometryArraySizes& sizes);
 
                 static bool mergePrimitive(osg::DrawArrays& lhs,osg::DrawArrays& rhs);
                 static bool mergePrimitive(osg::DrawArrayLengths& lhs,osg::DrawArrayLengths& rhs);
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 06b693a6ca..8955cd2c9f 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -1,5 +1,6 @@
 #include <components/sceneutil/osgacontroller.hpp>
 
+#include <osg/MatrixTransform>
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/ref_ptr>
@@ -9,6 +10,7 @@
 #include <osgAnimation/Sampler>
 #include <osgAnimation/UpdateMatrixTransform>
 
+#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/resource/animation.hpp>
 #include <components/sceneutil/controller.hpp>
@@ -85,9 +87,8 @@ namespace SceneUtil
         }
     }
 
-    osg::Vec3f OsgAnimationController::getTranslation(float time) const
+    osg::Matrixf OsgAnimationController::getTransformForNode(float time, const std::string_view name) const
     {
-        osg::Vec3f translationValue;
         std::string animationName;
         float newTime = time;
 
@@ -98,10 +99,11 @@ namespace SceneUtil
             {
                 newTime = time - emulatedAnimation.mStartTime;
                 animationName = emulatedAnimation.mName;
+                break;
             }
         }
 
-        // Find the root transform track in animation
+        // Find the bone's transform track in animation
         for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
         {
             if (mergedAnimationTrack->getName() != animationName)
@@ -111,7 +113,7 @@ namespace SceneUtil
 
             for (const auto& channel : channels)
             {
-                if (channel->getTargetName() != "bip01" || channel->getName() != "transform")
+                if (!Misc::StringUtils::ciEqual(name, channel->getTargetName()) || channel->getName() != "transform")
                     continue;
 
                 if (osgAnimation::MatrixLinearSampler* templateSampler
@@ -119,13 +121,17 @@ namespace SceneUtil
                 {
                     osg::Matrixf matrix;
                     templateSampler->getValueAt(newTime, matrix);
-                    translationValue = matrix.getTrans();
-                    return osg::Vec3f(translationValue[0], translationValue[1], translationValue[2]);
+                    return matrix;
                 }
             }
         }
 
-        return osg::Vec3f();
+        return osg::Matrixf::identity();
+    }
+
+    osg::Vec3f OsgAnimationController::getTranslation(float time) const
+    {
+        return getTransformForNode(time, "bip01").getTrans();
     }
 
     void OsgAnimationController::update(float time, const std::string& animationName)
@@ -162,6 +168,12 @@ namespace SceneUtil
                     update(time - emulatedAnimation.mStartTime, emulatedAnimation.mName);
                 }
             }
+
+            // Reset the transform of this node to whats in the animation
+            // we force this here because downstream some code relies on the bone having a non-modified transform
+            // as this is how the NIF controller behaves. RotationController is a good example of this.
+            // Without this here, it causes osgAnimation skeletons to spin wildly
+            static_cast<osg::MatrixTransform*>(node)->setMatrix(getTransformForNode(time, node->getName()));
         }
 
         traverse(node, nv);
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 8739d68b99..bb9a621760 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -59,6 +59,9 @@ namespace SceneUtil
         /// @brief Handles the location of the instance
         osg::Vec3f getTranslation(float time) const override;
 
+        /// @brief Handles finding bone position in the animation
+        osg::Matrixf getTransformForNode(float time, const std::string_view name) const;
+
         /// @brief Calls animation track update()
         void update(float time, const std::string& animationName);
 
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 09f28e098a..b4de250e77 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -5,69 +5,61 @@
 
 #include <components/esm3/loadpgrd.hpp>
 
+#include <limits>
+
 namespace SceneUtil
 {
-    const unsigned short DiamondVertexCount = 6;
-    const unsigned short DiamondIndexCount = 24;
-    const unsigned short DiamondWireframeIndexCount = 24;
-
-    const unsigned short DiamondConnectorVertexCount = 4;
-
-    const unsigned short DiamondTotalVertexCount = DiamondVertexCount + DiamondConnectorVertexCount;
-
-    const float DiamondWireframeScalar = 1.1f;
-
-    const osg::Vec3f DiamondPoints[DiamondVertexCount] = { osg::Vec3f(0.f, 0.f, DiamondHalfHeight * 2.f),
-        osg::Vec3f(-DiamondHalfWidth, -DiamondHalfWidth, DiamondHalfHeight),
-        osg::Vec3f(-DiamondHalfWidth, DiamondHalfWidth, DiamondHalfHeight),
-        osg::Vec3f(DiamondHalfWidth, -DiamondHalfWidth, DiamondHalfHeight),
-        osg::Vec3f(DiamondHalfWidth, DiamondHalfWidth, DiamondHalfHeight), osg::Vec3f(0.f, 0.f, 0.f) };
-
-    const unsigned short DiamondIndices[DiamondIndexCount]
-        = { 0, 2, 1, 0, 1, 3, 0, 3, 4, 0, 4, 2, 5, 1, 2, 5, 3, 1, 5, 4, 3, 5, 2, 4 };
-
-    const unsigned short DiamondWireframeIndices[DiamondWireframeIndexCount]
-        = { 0, 1, 0, 2, 0, 3, 0, 4, 1, 2, 2, 4, 4, 3, 3, 1, 5, 1, 5, 2, 5, 3, 5, 4 };
-
-    const unsigned short DiamondConnectorVertices[DiamondConnectorVertexCount] = { 1, 2, 3, 4 };
-
-    const osg::Vec4f DiamondColors[DiamondVertexCount]
-        = { osg::Vec4f(0.f, 0.f, 1.f, 1.f), osg::Vec4f(0.f, .05f, .95f, 1.f), osg::Vec4f(0.f, .1f, .95f, 1.f),
-              osg::Vec4f(0.f, .15f, .95f, 1.f), osg::Vec4f(0.f, .2f, .95f, 1.f), osg::Vec4f(0.f, .25f, 9.f, 1.f) };
-
-    const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
-    const osg::Vec4f DiamondWireColor = osg::Vec4f(0.72f, 0.f, 0.96f, 1.f);
-    const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
-
-    osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
+    namespace
     {
-        const unsigned short PointCount = static_cast<unsigned short>(pathgrid.mPoints.size());
-        const size_t EdgeCount = pathgrid.mEdges.size();
+        constexpr unsigned short DiamondVertexCount = 6;
+        constexpr unsigned short DiamondIndexCount = 24;
+        constexpr unsigned short DiamondWireframeIndexCount = 24;
 
-        const unsigned short VertexCount = PointCount * DiamondTotalVertexCount;
-        const unsigned short ColorCount = VertexCount;
-        const size_t PointIndexCount = PointCount * DiamondIndexCount;
-        const size_t EdgeIndexCount = EdgeCount * 2;
+        constexpr unsigned short DiamondConnectorVertexCount = 4;
 
-        osg::ref_ptr<osg::Geometry> gridGeometry = new osg::Geometry();
+        constexpr unsigned short DiamondTotalVertexCount = DiamondVertexCount + DiamondConnectorVertexCount;
 
-        if (PointIndexCount || EdgeIndexCount)
+        constexpr float DiamondWireframeScalar = 1.1f;
+
+        const osg::Vec3f DiamondPoints[DiamondVertexCount] = { osg::Vec3f(0.f, 0.f, DiamondHalfHeight * 2.f),
+            osg::Vec3f(-DiamondHalfWidth, -DiamondHalfWidth, DiamondHalfHeight),
+            osg::Vec3f(-DiamondHalfWidth, DiamondHalfWidth, DiamondHalfHeight),
+            osg::Vec3f(DiamondHalfWidth, -DiamondHalfWidth, DiamondHalfHeight),
+            osg::Vec3f(DiamondHalfWidth, DiamondHalfWidth, DiamondHalfHeight), osg::Vec3f(0.f, 0.f, 0.f) };
+
+        constexpr unsigned short DiamondIndices[DiamondIndexCount]
+            = { 0, 2, 1, 0, 1, 3, 0, 3, 4, 0, 4, 2, 5, 1, 2, 5, 3, 1, 5, 4, 3, 5, 2, 4 };
+
+        constexpr unsigned short DiamondWireframeIndices[DiamondWireframeIndexCount]
+            = { 0, 1, 0, 2, 0, 3, 0, 4, 1, 2, 2, 4, 4, 3, 3, 1, 5, 1, 5, 2, 5, 3, 5, 4 };
+
+        constexpr unsigned short DiamondConnectorVertices[DiamondConnectorVertexCount] = { 1, 2, 3, 4 };
+
+        const osg::Vec4f DiamondColors[DiamondVertexCount]
+            = { osg::Vec4f(0.f, 0.f, 1.f, 1.f), osg::Vec4f(0.f, .05f, .95f, 1.f), osg::Vec4f(0.f, .1f, .95f, 1.f),
+                  osg::Vec4f(0.f, .15f, .95f, 1.f), osg::Vec4f(0.f, .2f, .95f, 1.f), osg::Vec4f(0.f, .25f, 9.f, 1.f) };
+
+        const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
+        const osg::Vec4f DiamondWireColor = osg::Vec4f(0.72f, 0.f, 0.96f, 1.f);
+        const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
+
+        template <class PType, class LType>
+        void addPathgridToGeometry(const size_t vertexCount, const size_t pointIndexCount, const size_t edgeIndexCount,
+            osg::ref_ptr<osg::Geometry>& gridGeometry, const ESM::Pathgrid& pathgrid)
         {
-            osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
-            osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
-            osg::ref_ptr<osg::DrawElementsUShort> pointIndices
-                = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, PointIndexCount);
-            osg::ref_ptr<osg::DrawElementsUShort> lineIndices
-                = new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeIndexCount);
+            osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(vertexCount);
+            osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(vertexCount);
+            osg::ref_ptr<PType> pointIndices = new PType(osg::PrimitiveSet::TRIANGLES, pointIndexCount);
+            osg::ref_ptr<LType> lineIndices = new LType(osg::PrimitiveSet::LINES, edgeIndexCount);
 
             // Add each point/node
-            for (unsigned short pointIndex = 0; pointIndex < PointCount; ++pointIndex)
+            for (size_t pointIndex = 0; pointIndex < pathgrid.mPoints.size(); ++pointIndex)
             {
                 const ESM::Pathgrid::Point& point = pathgrid.mPoints[pointIndex];
                 osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ);
 
-                unsigned short vertexOffset = pointIndex * DiamondTotalVertexCount;
-                unsigned short indexOffset = pointIndex * DiamondIndexCount;
+                size_t vertexOffset = pointIndex * DiamondTotalVertexCount;
+                size_t indexOffset = pointIndex * DiamondIndexCount;
 
                 // Point
                 for (unsigned short i = 0; i < DiamondVertexCount; ++i)
@@ -91,16 +83,15 @@ namespace SceneUtil
             }
 
             // Add edges
-            unsigned short lineIndex = 0;
+            unsigned int lineIndex = 0;
 
-            for (ESM::Pathgrid::EdgeList::const_iterator edge = pathgrid.mEdges.begin(); edge != pathgrid.mEdges.end();
-                 ++edge)
+            for (const ESM::Pathgrid::Edge& edge : pathgrid.mEdges)
             {
-                if (edge->mV0 == edge->mV1 || edge->mV0 >= PointCount || edge->mV1 >= PointCount)
+                if (edge.mV0 == edge.mV1 || edge.mV0 >= pathgrid.mPoints.size() || edge.mV1 >= pathgrid.mPoints.size())
                     continue;
 
-                const ESM::Pathgrid::Point& from = pathgrid.mPoints[edge->mV0];
-                const ESM::Pathgrid::Point& to = pathgrid.mPoints[edge->mV1];
+                const ESM::Pathgrid::Point& from = pathgrid.mPoints[edge.mV0];
+                const ESM::Pathgrid::Point& to = pathgrid.mPoints[edge.mV1];
 
                 osg::Vec3f fromPos = osg::Vec3f(from.mX, from.mY, from.mZ);
                 osg::Vec3f toPos = osg::Vec3f(to.mX, to.mY, to.mZ);
@@ -122,8 +113,8 @@ namespace SceneUtil
                 else if (dir.x() >= 0 && dir.y() < 0)
                     diamondIndex = 2;
 
-                unsigned short fromIndex = static_cast<unsigned short>(edge->mV0);
-                unsigned short toIndex = static_cast<unsigned short>(edge->mV1);
+                unsigned fromIndex = static_cast<unsigned>(edge.mV0);
+                unsigned toIndex = static_cast<unsigned>(edge.mV1);
 
                 lineIndices->setElement(
                     lineIndex++, fromIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
@@ -135,55 +126,39 @@ namespace SceneUtil
 
             gridGeometry->setVertexArray(vertices);
             gridGeometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
-            if (PointIndexCount)
+            if (pointIndexCount)
                 gridGeometry->addPrimitiveSet(pointIndices);
-            if (EdgeIndexCount)
+            if (edgeIndexCount)
                 gridGeometry->addPrimitiveSet(lineIndices);
             gridGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
         }
 
-        osg::ref_ptr<osg::Material> material = new osg::Material;
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        gridGeometry->getOrCreateStateSet()->setAttribute(material);
-
-        return gridGeometry;
-    }
-
-    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(
-        const ESM::Pathgrid& pathgrid, const std::vector<unsigned short>& selected)
-    {
-        const unsigned short PointCount = selected.size();
-
-        const unsigned short VertexCount = PointCount * DiamondVertexCount;
-        const unsigned short ColorCount = VertexCount;
-        const size_t IndexCount = PointCount * DiamondWireframeIndexCount;
-
-        osg::ref_ptr<osg::Geometry> wireframeGeometry = new osg::Geometry();
-
-        if (IndexCount)
+        template <class T>
+        void addWireFrameGeometry(const size_t vertexCount, const size_t indexCount,
+            osg::ref_ptr<osg::Geometry>& wireframeGeometry, const ESM::Pathgrid& pathgrid,
+            const std::vector<unsigned short>& selected)
         {
-            osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
-            osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
-            osg::ref_ptr<osg::DrawElementsUShort> indices
-                = new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, IndexCount);
+            osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(vertexCount);
+            osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(vertexCount);
+            osg::ref_ptr<T> indices = new T(osg::PrimitiveSet::LINES, indexCount);
 
             osg::Vec3f wireOffset = osg::Vec3f(0, 0, (1 - DiamondWireframeScalar) * DiamondHalfHeight);
 
             // Add each point/node
-            for (unsigned short it = 0; it < PointCount; ++it)
+            for (size_t it = 0; it < selected.size(); ++it)
             {
                 const ESM::Pathgrid::Point& point = pathgrid.mPoints[selected[it]];
                 osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ) + wireOffset;
 
-                unsigned short vertexOffset = it * DiamondVertexCount;
-                unsigned short indexOffset = it * DiamondWireframeIndexCount;
+                size_t vertexOffset = it * DiamondVertexCount;
+                size_t indexOffset = it * DiamondWireframeIndexCount;
 
                 // Point
                 for (unsigned short i = 0; i < DiamondVertexCount; ++i)
                 {
                     (*vertices)[vertexOffset + i] = position + DiamondPoints[i] * DiamondWireframeScalar;
 
-                    if (it == PointCount - 1)
+                    if (it == selected.size() - 1)
                         (*colors)[vertexOffset + i] = DiamondFocusWireColor;
                     else
                         (*colors)[vertexOffset + i] = DiamondWireColor;
@@ -200,11 +175,63 @@ namespace SceneUtil
             wireframeGeometry->addPrimitiveSet(indices);
             wireframeGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
         }
+    }
+
+    osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
+    {
+        const size_t vertexCount = pathgrid.mPoints.size() * DiamondTotalVertexCount;
+        const size_t pointIndexCount = pathgrid.mPoints.size() * DiamondIndexCount;
+        const size_t edgeIndexCount = pathgrid.mEdges.size() * 2;
+
+        osg::ref_ptr<osg::Geometry> gridGeometry = new osg::Geometry();
+
+        if (pointIndexCount || edgeIndexCount)
+        {
+            const bool useIntPoints = pointIndexCount > std::numeric_limits<unsigned short>::max();
+            const bool useIntVertices = vertexCount > std::numeric_limits<unsigned short>::max();
+            if (useIntPoints && useIntVertices)
+                addPathgridToGeometry<osg::DrawElementsUInt, osg::DrawElementsUInt>(
+                    vertexCount, pointIndexCount, edgeIndexCount, gridGeometry, pathgrid);
+            else if (useIntPoints)
+                addPathgridToGeometry<osg::DrawElementsUInt, osg::DrawElementsUShort>(
+                    vertexCount, pointIndexCount, edgeIndexCount, gridGeometry, pathgrid);
+            else if (useIntVertices)
+                addPathgridToGeometry<osg::DrawElementsUShort, osg::DrawElementsUInt>(
+                    vertexCount, pointIndexCount, edgeIndexCount, gridGeometry, pathgrid);
+            else
+                addPathgridToGeometry<osg::DrawElementsUShort, osg::DrawElementsUShort>(
+                    vertexCount, pointIndexCount, edgeIndexCount, gridGeometry, pathgrid);
+        }
+
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        gridGeometry->getOrCreateStateSet()->setAttribute(material);
+
+        return gridGeometry;
+    }
+
+    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(
+        const ESM::Pathgrid& pathgrid, const std::vector<unsigned short>& selected)
+    {
+        const size_t vertexCount = selected.size() * DiamondVertexCount;
+        const size_t indexCount = selected.size() * DiamondWireframeIndexCount;
+
+        osg::ref_ptr<osg::Geometry> wireframeGeometry = new osg::Geometry();
+
+        if (indexCount)
+        {
+            if (vertexCount > std::numeric_limits<unsigned short>::max())
+                addWireFrameGeometry<osg::DrawElementsUInt>(
+                    vertexCount, indexCount, wireframeGeometry, pathgrid, selected);
+            else
+                addWireFrameGeometry<osg::DrawElementsUShort>(
+                    vertexCount, indexCount, wireframeGeometry, pathgrid, selected);
+        }
         return wireframeGeometry;
     }
 
-    unsigned short getPathgridNode(unsigned short vertexIndex)
+    unsigned short getPathgridNode(unsigned vertexIndex)
     {
-        return vertexIndex / (DiamondVertexCount + DiamondConnectorVertexCount);
+        return static_cast<unsigned short>(vertexIndex / (DiamondVertexCount + DiamondConnectorVertexCount));
     }
 }
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
index 4acdc29d5f..554ee278bc 100644
--- a/components/sceneutil/pathgridutil.hpp
+++ b/components/sceneutil/pathgridutil.hpp
@@ -11,15 +11,15 @@ namespace ESM
 
 namespace SceneUtil
 {
-    const float DiamondHalfHeight = 40.f;
-    const float DiamondHalfWidth = 16.f;
+    constexpr float DiamondHalfHeight = 40.f;
+    constexpr float DiamondHalfWidth = 16.f;
 
     osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid);
 
     osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(
         const ESM::Pathgrid& pathgrid, const std::vector<unsigned short>& selected);
 
-    unsigned short getPathgridNode(unsigned short vertexIndex);
+    unsigned short getPathgridNode(unsigned vertexIndex);
 }
 
 #endif
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index cdb2025d1d..7491eb7c95 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -1,5 +1,5 @@
 #include "recastmesh.hpp"
-#include "depth.hpp"
+
 #include "detourdebugdraw.hpp"
 
 #include <components/detournavigator/recastmesh.hpp>
@@ -41,13 +41,14 @@ namespace
 
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::Group> createRecastMeshGroup(
-        const DetourNavigator::RecastMesh& recastMesh, const DetourNavigator::RecastSettings& settings)
+    osg::ref_ptr<osg::Group> createRecastMeshGroup(const DetourNavigator::RecastMesh& recastMesh,
+        const DetourNavigator::RecastSettings& settings, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet)
     {
         using namespace DetourNavigator;
 
         const osg::ref_ptr<osg::Group> group(new osg::Group);
-        DebugDraw debugDraw(*group, DebugDraw::makeStateSet(), osg::Vec3f(0, 0, 0), 1.0f);
+
+        DebugDraw debugDraw(*group, debugDrawStateSet, osg::Vec3f(0, 0, 0), 1.0f);
         const DetourNavigator::Mesh& mesh = recastMesh.getMesh();
         std::vector<int> indices = mesh.getIndices();
         std::vector<float> vertices = mesh.getVertices();
@@ -70,18 +71,6 @@ namespace SceneUtil
         duDebugDrawTriMeshSlope(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3), indices.data(),
             normals.data(), static_cast<int>(indices.size() / 3), settings.mMaxSlope, texScale);
 
-        osg::ref_ptr<osg::Material> material = new osg::Material;
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-
-        const float polygonOffsetFactor = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
-        const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
-        osg::ref_ptr<osg::PolygonOffset> polygonOffset
-            = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
-
-        osg::ref_ptr<osg::StateSet> stateSet = group->getOrCreateStateSet();
-        stateSet->setAttribute(material);
-        stateSet->setAttributeAndModes(polygonOffset);
-
         return group;
     }
 }
diff --git a/components/sceneutil/recastmesh.hpp b/components/sceneutil/recastmesh.hpp
index bc9fb1c3ea..a1b199c6bb 100644
--- a/components/sceneutil/recastmesh.hpp
+++ b/components/sceneutil/recastmesh.hpp
@@ -6,6 +6,7 @@
 namespace osg
 {
     class Group;
+    class StateSet;
 }
 
 namespace DetourNavigator
@@ -16,8 +17,8 @@ namespace DetourNavigator
 
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::Group> createRecastMeshGroup(
-        const DetourNavigator::RecastMesh& recastMesh, const DetourNavigator::RecastSettings& settings);
+    osg::ref_ptr<osg::Group> createRecastMeshGroup(const DetourNavigator::RecastMesh& recastMesh,
+        const DetourNavigator::RecastSettings& settings, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet);
 }
 
 #endif
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index b940fb60ec..d93b88349d 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -1,5 +1,7 @@
 #include "riggeometry.hpp"
 
+#include <unordered_map>
+
 #include <osg/MatrixTransform>
 
 #include <osgUtil/CullVisitor>
@@ -10,39 +12,10 @@
 #include "skeleton.hpp"
 #include "util.hpp"
 
-namespace
-{
-    inline void accumulateMatrix(
-        const osg::Matrixf& invBindMatrix, const osg::Matrixf& matrix, const float weight, osg::Matrixf& result)
-    {
-        osg::Matrixf m = invBindMatrix * matrix;
-        float* ptr = m.ptr();
-        float* ptrresult = result.ptr();
-        ptrresult[0] += ptr[0] * weight;
-        ptrresult[1] += ptr[1] * weight;
-        ptrresult[2] += ptr[2] * weight;
-
-        ptrresult[4] += ptr[4] * weight;
-        ptrresult[5] += ptr[5] * weight;
-        ptrresult[6] += ptr[6] * weight;
-
-        ptrresult[8] += ptr[8] * weight;
-        ptrresult[9] += ptr[9] * weight;
-        ptrresult[10] += ptr[10] * weight;
-
-        ptrresult[12] += ptr[12] * weight;
-        ptrresult[13] += ptr[13] * weight;
-        ptrresult[14] += ptr[14] * weight;
-    }
-}
-
 namespace SceneUtil
 {
 
     RigGeometry::RigGeometry()
-        : mSkeleton(nullptr)
-        , mLastFrameNumber(0)
-        , mBoundsFirstFrame(true)
     {
         setNumChildrenRequiringUpdateTraversal(1);
         // update done in accept(NodeVisitor&)
@@ -50,12 +23,7 @@ namespace SceneUtil
 
     RigGeometry::RigGeometry(const RigGeometry& copy, const osg::CopyOp& copyop)
         : Drawable(copy, copyop)
-        , mSkeleton(nullptr)
-        , mInfluenceMap(copy.mInfluenceMap)
-        , mBone2VertexVector(copy.mBone2VertexVector)
-        , mBoneSphereVector(copy.mBoneSphereVector)
-        , mLastFrameNumber(0)
-        , mBoundsFirstFrame(true)
+        , mData(copy.mData)
     {
         setSourceGeometry(copy.mSourceGeometry);
         setNumChildrenRequiringUpdateTraversal(1);
@@ -151,42 +119,18 @@ namespace SceneUtil
             return false;
         }
 
-        if (!mInfluenceMap)
+        if (!mData)
         {
-            Log(Debug::Error) << "Error: No InfluenceMap set on RigGeometry";
+            Log(Debug::Error) << "Error: No influence data set on RigGeometry";
             return false;
         }
 
-        mBoneNodesVector.clear();
-        for (auto& bonePair : mBoneSphereVector->mData)
+        mNodes.clear();
+        for (const BoneInfo& info : mData->mBones)
         {
-            const std::string& boneName = bonePair.first;
-            Bone* bone = mSkeleton->getBone(boneName);
-            if (!bone)
-            {
-                mBoneNodesVector.push_back(nullptr);
-                Log(Debug::Error) << "Error: RigGeometry did not find bone " << boneName;
-                continue;
-            }
-
-            mBoneNodesVector.push_back(bone);
-        }
-
-        for (auto& pair : mBone2VertexVector->mData)
-        {
-            for (auto& weight : pair.first)
-            {
-                const std::string& boneName = weight.first.first;
-                Bone* bone = mSkeleton->getBone(boneName);
-                if (!bone)
-                {
-                    mBoneNodesVector.push_back(nullptr);
-                    Log(Debug::Error) << "Error: RigGeometry did not find bone " << boneName;
-                    continue;
-                }
-
-                mBoneNodesVector.push_back(bone);
-            }
+            mNodes.push_back(mSkeleton->getBone(info.mName));
+            if (!mNodes.back())
+                Log(Debug::Error) << "Error: RigGeometry did not find bone " << info.mName;
         }
 
         return true;
@@ -226,25 +170,36 @@ namespace SceneUtil
         osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(geom.getNormalArray());
         osg::Vec4Array* tangentDst = static_cast<osg::Vec4Array*>(geom.getTexCoordArray(7));
 
-        int index = mBoneSphereVector->mData.size();
-        for (auto& pair : mBone2VertexVector->mData)
+        std::vector<osg::Matrixf> boneMatrices(mNodes.size());
+        std::vector<Bone*>::const_iterator bone = mNodes.begin();
+        std::vector<BoneInfo>::const_iterator boneInfo = mData->mBones.begin();
+        for (osg::Matrixf& boneMat : boneMatrices)
+        {
+            if (*bone != nullptr)
+                boneMat = boneInfo->mInvBindMatrix * (*bone)->mMatrixInSkeletonSpace;
+            ++bone;
+            ++boneInfo;
+        }
+
+        for (const auto& [influences, vertices] : mData->mInfluences)
         {
             osg::Matrixf resultMat(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
 
-            for (auto& weight : pair.first)
+            for (const auto& [index, weight] : influences)
             {
-                Bone* bone = mBoneNodesVector[index];
-                if (bone == nullptr)
+                if (mNodes[index] == nullptr)
                     continue;
-
-                accumulateMatrix(weight.first.second, bone->mMatrixInSkeletonSpace, weight.second, resultMat);
-                index++;
+                const float* boneMatPtr = boneMatrices[index].ptr();
+                float* resultMatPtr = resultMat.ptr();
+                for (int i = 0; i < 16; ++i, ++resultMatPtr, ++boneMatPtr)
+                    if (i % 4 != 3)
+                        *resultMatPtr += *boneMatPtr * weight;
             }
 
             if (mGeomToSkelMatrix)
                 resultMat *= (*mGeomToSkelMatrix);
 
-            for (auto& vertex : pair.second)
+            for (unsigned short vertex : vertices)
             {
                 (*positionDst)[vertex] = resultMat.preMult((*positionSrc)[vertex]);
                 if (normalDst)
@@ -291,15 +246,14 @@ namespace SceneUtil
 
         osg::BoundingBox box;
 
-        int index = 0;
-        for (auto& boundPair : mBoneSphereVector->mData)
+        size_t index = 0;
+        for (const BoneInfo& info : mData->mBones)
         {
-            Bone* bone = mBoneNodesVector[index];
+            const Bone* bone = mNodes[index++];
             if (bone == nullptr)
                 continue;
 
-            index++;
-            osg::BoundingSpheref bs = boundPair.second;
+            osg::BoundingSpheref bs = info.mBoundSphere;
             if (mGeomToSkelMatrix)
                 transformBoundingSphere(bone->mMatrixInSkeletonSpace * (*mGeomToSkelMatrix), bs);
             else
@@ -355,37 +309,47 @@ namespace SceneUtil
         }
     }
 
-    void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)
+    void RigGeometry::setBoneInfo(std::vector<BoneInfo>&& bones)
     {
-        mInfluenceMap = influenceMap;
+        if (!mData)
+            mData = new InfluenceData;
 
-        typedef std::map<unsigned short, std::vector<BoneWeight>> Vertex2BoneMap;
-        Vertex2BoneMap vertex2BoneMap;
-        mBoneSphereVector = new BoneSphereVector;
-        mBoneSphereVector->mData.reserve(mInfluenceMap->mData.size());
-        mBone2VertexVector = new Bone2VertexVector;
-        for (auto& influencePair : mInfluenceMap->mData)
+        mData->mBones = std::move(bones);
+    }
+
+    void RigGeometry::setInfluences(const std::vector<VertexWeights>& influences)
+    {
+        if (!mData)
+            mData = new InfluenceData;
+
+        std::unordered_map<unsigned short, BoneWeights> vertexToInfluences;
+        size_t index = 0;
+        for (const auto& influence : influences)
         {
-            const std::string& boneName = influencePair.first;
-            const BoneInfluence& bi = influencePair.second;
-            mBoneSphereVector->mData.emplace_back(boneName, bi.mBoundSphere);
-
-            for (auto& weightPair : bi.mWeights)
-            {
-                std::vector<BoneWeight>& vec = vertex2BoneMap[weightPair.first];
-
-                vec.emplace_back(std::make_pair(boneName, bi.mInvBindMatrix), weightPair.second);
-            }
+            for (const auto& [vertex, weight] : influence)
+                vertexToInfluences[vertex].emplace_back(index, weight);
+            index++;
         }
 
-        Bone2VertexMap bone2VertexMap;
-        for (auto& vertexPair : vertex2BoneMap)
-        {
-            bone2VertexMap[vertexPair.second].emplace_back(vertexPair.first);
-        }
+        std::map<BoneWeights, VertexList> influencesToVertices;
+        for (const auto& [vertex, weights] : vertexToInfluences)
+            influencesToVertices[weights].emplace_back(vertex);
 
-        mBone2VertexVector->mData.reserve(bone2VertexMap.size());
-        mBone2VertexVector->mData.assign(bone2VertexMap.begin(), bone2VertexMap.end());
+        mData->mInfluences.reserve(influencesToVertices.size());
+        mData->mInfluences.assign(influencesToVertices.begin(), influencesToVertices.end());
+    }
+
+    void RigGeometry::setInfluences(const std::vector<BoneWeights>& influences)
+    {
+        if (!mData)
+            mData = new InfluenceData;
+
+        std::map<BoneWeights, VertexList> influencesToVertices;
+        for (size_t i = 0; i < influences.size(); i++)
+            influencesToVertices[influences[i]].emplace_back(i);
+
+        mData->mInfluences.reserve(influencesToVertices.size());
+        mData->mInfluences.assign(influencesToVertices.begin(), influencesToVertices.end());
     }
 
     void RigGeometry::accept(osg::NodeVisitor& nv)
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 72e8fcd032..64ea1e2519 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -36,20 +36,23 @@ namespace SceneUtil
         // static parts of the model.
         void compileGLObjects(osg::RenderInfo& renderInfo) const override {}
 
-        struct BoneInfluence
+        struct BoneInfo
         {
-            osg::Matrixf mInvBindMatrix;
+            std::string mName;
             osg::BoundingSpheref mBoundSphere;
-            // <vertex index, weight>
-            std::vector<std::pair<unsigned short, float>> mWeights;
+            osg::Matrixf mInvBindMatrix;
         };
 
-        struct InfluenceMap : public osg::Referenced
-        {
-            std::vector<std::pair<std::string, BoneInfluence>> mData;
-        };
+        using VertexWeight = std::pair<unsigned short, float>;
+        using VertexWeights = std::vector<VertexWeight>;
+        using BoneWeight = std::pair<size_t, float>;
+        using BoneWeights = std::vector<BoneWeight>;
 
-        void setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap);
+        void setBoneInfo(std::vector<BoneInfo>&& bones);
+        // Convert influences in vertex and weight list per bone format
+        void setInfluences(const std::vector<VertexWeights>& influences);
+        // Convert influences in bone and weight list per vertex format
+        void setInfluences(const std::vector<BoneWeights>& influences);
 
         /// Initialize this geometry from the source geometry.
         /// @note The source geometry will not be modified.
@@ -84,35 +87,21 @@ namespace SceneUtil
 
         osg::ref_ptr<osg::Geometry> mSourceGeometry;
         osg::ref_ptr<const osg::Vec4Array> mSourceTangents;
-        Skeleton* mSkeleton;
+        Skeleton* mSkeleton{ nullptr };
 
         osg::ref_ptr<osg::RefMatrix> mGeomToSkelMatrix;
 
-        osg::ref_ptr<InfluenceMap> mInfluenceMap;
-
-        typedef std::pair<std::string, osg::Matrixf> BoneBindMatrixPair;
-
-        typedef std::pair<BoneBindMatrixPair, float> BoneWeight;
-
-        typedef std::vector<unsigned short> VertexList;
-
-        typedef std::map<std::vector<BoneWeight>, VertexList> Bone2VertexMap;
-
-        struct Bone2VertexVector : public osg::Referenced
+        using VertexList = std::vector<unsigned short>;
+        struct InfluenceData : public osg::Referenced
         {
-            std::vector<std::pair<std::vector<BoneWeight>, VertexList>> mData;
+            std::vector<BoneInfo> mBones;
+            std::vector<std::pair<BoneWeights, VertexList>> mInfluences;
         };
-        osg::ref_ptr<Bone2VertexVector> mBone2VertexVector;
+        osg::ref_ptr<InfluenceData> mData;
+        std::vector<Bone*> mNodes;
 
-        struct BoneSphereVector : public osg::Referenced
-        {
-            std::vector<std::pair<std::string, osg::BoundingSpheref>> mData;
-        };
-        osg::ref_ptr<BoneSphereVector> mBoneSphereVector;
-        std::vector<Bone*> mBoneNodesVector;
-
-        unsigned int mLastFrameNumber;
-        bool mBoundsFirstFrame;
+        unsigned int mLastFrameNumber{ 0 };
+        bool mBoundsFirstFrame{ true };
 
         bool initFromParentSkeleton(osg::NodeVisitor* nv);
 
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index eec4aaa35d..54d53ddab9 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -20,7 +20,7 @@ namespace SceneUtil
     };
 
     RTTNode::RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps,
-        int renderOrderNum, StereoAwareness stereoAwareness)
+        int renderOrderNum, StereoAwareness stereoAwareness, bool addMSAAIntermediateTarget)
         : mTextureWidth(textureWidth)
         , mTextureHeight(textureHeight)
         , mSamples(samples)
@@ -29,6 +29,7 @@ namespace SceneUtil
         , mDepthBufferInternalFormat(SceneUtil::AutoDepth::depthInternalFormat())
         , mRenderOrderNum(renderOrderNum)
         , mStereoAwareness(stereoAwareness)
+        , mAddMSAAIntermediateTarget(addMSAAIntermediateTarget)
     {
         addCullCallback(new CullCallback);
         setCullingActive(false);
@@ -206,7 +207,8 @@ namespace SceneUtil
                     camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0,
                         Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps, mSamples);
                     SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER,
-                        vdd->mColorTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps);
+                        vdd->mColorTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps,
+                        mAddMSAAIntermediateTarget);
                 }
 
                 if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
@@ -234,8 +236,8 @@ namespace SceneUtil
                 {
                     vdd->mColorTexture = createTexture(mColorBufferInternalFormat);
                     camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, 0, mGenerateMipmaps, mSamples);
-                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(
-                        camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, 0, mGenerateMipmaps);
+                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER,
+                        vdd->mColorTexture, 0, 0, mGenerateMipmaps, mAddMSAAIntermediateTarget);
                 }
 
                 if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
diff --git a/components/sceneutil/rtt.hpp b/components/sceneutil/rtt.hpp
index 5c8183f6c0..d2f43f78ed 100644
--- a/components/sceneutil/rtt.hpp
+++ b/components/sceneutil/rtt.hpp
@@ -49,7 +49,7 @@ namespace SceneUtil
         };
 
         RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps,
-            int renderOrderNum, StereoAwareness stereoAwareness);
+            int renderOrderNum, StereoAwareness stereoAwareness, bool addMSAAIntermediateTarget);
         ~RTTNode();
 
         osg::Texture* getColorTexture(osgUtil::CullVisitor* cv);
@@ -110,6 +110,7 @@ namespace SceneUtil
         GLint mDepthBufferInternalFormat;
         int mRenderOrderNum;
         StereoAwareness mStereoAwareness;
+        bool mAddMSAAIntermediateTarget;
     };
 }
 #endif
diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp
index 8382e75e54..ed90668cfb 100644
--- a/components/sceneutil/screencapture.cpp
+++ b/components/sceneutil/screencapture.cpp
@@ -122,10 +122,10 @@ namespace SceneUtil
                               << mScreenshotFormat << "\": " << e.what();
         }
         if (fileName.empty())
-            mCallback("Failed to save screenshot");
+            mCallback(std::string());
         else
         {
-            mCallback(Files::pathToUnicodeString(fileName) + " has been saved");
+            mCallback(Files::pathToUnicodeString(fileName));
             Log(Debug::Info) << mScreenshotPath / fileName << " has been saved";
         }
     }
diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 066f43d123..81053aa476 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -3,6 +3,7 @@
 #include <osgDB/ObjectWrapper>
 #include <osgDB/Registry>
 
+#include <components/nifosg/fog.hpp>
 #include <components/nifosg/matrixtransform.hpp>
 
 #include <components/sceneutil/morphgeometry.hpp>
@@ -10,6 +11,7 @@
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>
 #include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/texturetype.hpp>
 
 namespace SceneUtil
 {
@@ -123,6 +125,29 @@ namespace SceneUtil
         }
     };
 
+    class FogSerializer : public osgDB::ObjectWrapper
+    {
+    public:
+        FogSerializer()
+            : osgDB::ObjectWrapper(
+                createInstanceFunc<osg::Fog>, "NifOsg::Fog", "osg::Object osg::StateAttribute osg::Fog NifOsg::Fog")
+        {
+            addSerializer(new osgDB::PropByValSerializer<NifOsg::Fog, float>(
+                              "Depth", 1.f, &NifOsg::Fog::getDepth, &NifOsg::Fog::setDepth),
+                osgDB::BaseSerializer::RW_FLOAT);
+        }
+    };
+
+    class TextureTypeSerializer : public osgDB::ObjectWrapper
+    {
+    public:
+        TextureTypeSerializer()
+            : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::TextureType>, "SceneUtil::TextureType",
+                "osg::Object osg::StateAttribute SceneUtil::TextureType")
+        {
+        }
+    };
+
     osgDB::ObjectWrapper* makeDummySerializer(const std::string& classname)
     {
         return new osgDB::ObjectWrapper(createInstanceFunc<osg::DummyObject>, classname, "osg::Object");
@@ -153,6 +178,8 @@ namespace SceneUtil
             mgr->addWrapper(new LightManagerSerializer);
             mgr->addWrapper(new CameraRelativeTransformSerializer);
             mgr->addWrapper(new MatrixTransformSerializer);
+            mgr->addWrapper(new FogSerializer);
+            mgr->addWrapper(new TextureTypeSerializer);
 
             // Don't serialize Geometry data as we are more interested in the overall structure rather than tons of
             // vertex data that would make the file large and hard to read.
@@ -160,18 +187,48 @@ namespace SceneUtil
             mgr->addWrapper(new GeometrySerializer);
 
             // ignore the below for now to avoid warning spam
-            const char* ignore[] = { "MWRender::PtrHolder", "Resource::TemplateRef", "Resource::TemplateMultiRef",
-                "SceneUtil::CompositeStateSetUpdater", "SceneUtil::UBOManager", "SceneUtil::LightListCallback",
-                "SceneUtil::LightManagerUpdateCallback", "SceneUtil::FFPLightStateAttribute",
-                "SceneUtil::UpdateRigBounds", "SceneUtil::UpdateRigGeometry", "SceneUtil::LightSource",
-                "SceneUtil::DisableLight", "SceneUtil::MWShadowTechnique", "SceneUtil::TextKeyMapHolder",
-                "Shader::AddedState", "Shader::RemovedAlphaFunc", "NifOsg::FlipController",
-                "NifOsg::KeyframeController", "NifOsg::Emitter", "NifOsg::ParticleColorAffector",
-                "NifOsg::ParticleSystem", "NifOsg::GravityAffector", "NifOsg::GrowFadeAffector",
-                "NifOsg::InverseWorldMatrix", "NifOsg::StaticBoundingBoxCallback", "NifOsg::GeomMorpherController",
-                "NifOsg::UpdateMorphGeometry", "NifOsg::UVController", "NifOsg::VisController", "osgMyGUI::Drawable",
-                "osg::DrawCallback", "osg::UniformBufferObject", "osgOQ::ClearQueriesCallback",
-                "osgOQ::RetrieveQueriesCallback", "osg::DummyObject" };
+            const char* ignore[] = {
+                "Debug::DebugDrawer",
+                "MWRender::NifAnimBlendController",
+                "MWRender::BoneAnimBlendController",
+                "MWRender::BoneAnimBlendControllerWrapper",
+                "MWRender::PtrHolder",
+                "Resource::TemplateRef",
+                "Resource::TemplateMultiRef",
+                "SceneUtil::CompositeStateSetUpdater",
+                "SceneUtil::UBOManager",
+                "SceneUtil::LightListCallback",
+                "SceneUtil::LightManagerUpdateCallback",
+                "SceneUtil::FFPLightStateAttribute",
+                "SceneUtil::UpdateRigBounds",
+                "SceneUtil::UpdateRigGeometry",
+                "SceneUtil::LightSource",
+                "SceneUtil::DisableLight",
+                "SceneUtil::MWShadowTechnique",
+                "SceneUtil::TextKeyMapHolder",
+                "Shader::AddedState",
+                "Shader::RemovedAlphaFunc",
+                "NifOsg::FlipController",
+                "NifOsg::KeyframeController",
+                "NifOsg::Emitter",
+                "NifOsg::ParticleColorAffector",
+                "NifOsg::ParticleSystem",
+                "NifOsg::GravityAffector",
+                "NifOsg::ParticleBomb",
+                "NifOsg::GrowFadeAffector",
+                "NifOsg::InverseWorldMatrix",
+                "NifOsg::StaticBoundingBoxCallback",
+                "NifOsg::GeomMorpherController",
+                "NifOsg::UpdateMorphGeometry",
+                "NifOsg::UVController",
+                "NifOsg::VisController",
+                "osgMyGUI::Drawable",
+                "osg::DrawCallback",
+                "osg::UniformBufferObject",
+                "osgOQ::ClearQueriesCallback",
+                "osgOQ::RetrieveQueriesCallback",
+                "osg::DummyObject",
+            };
             for (size_t i = 0; i < sizeof(ignore) / sizeof(ignore[0]); ++i)
             {
                 mgr->addWrapper(makeDummySerializer(ignore[i]));
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index f2748d70f1..1d5e5d6209 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -4,7 +4,7 @@
 #include <osgShadow/ShadowedScene>
 
 #include <components/misc/strings/algorithm.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/categories/shadows.hpp>
 #include <components/stereo/stereomanager.hpp>
 
 #include "mwshadowtechnique.hpp"
@@ -13,9 +13,20 @@ namespace SceneUtil
 {
     using namespace osgShadow;
 
-    void ShadowManager::setupShadowSettings(Shader::ShaderManager& shaderManager)
+    ShadowManager* ShadowManager::sInstance = nullptr;
+
+    const ShadowManager& ShadowManager::instance()
     {
-        mEnableShadows = Settings::Manager::getBool("enable shadows", "Shadows");
+        if (sInstance)
+            return *sInstance;
+        else
+            throw std::logic_error("No ShadowManager exists yet");
+    }
+
+    void ShadowManager::setupShadowSettings(
+        const Settings::ShadowsCategory& settings, Shader::ShaderManager& shaderManager)
+    {
+        mEnableShadows = settings.mEnableShadows;
 
         if (!mEnableShadows)
         {
@@ -28,67 +39,54 @@ namespace SceneUtil
         mShadowSettings->setLightNum(0);
         mShadowSettings->setReceivesShadowTraversalMask(~0u);
 
-        const int numberOfShadowMapsPerLight
-            = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
+        const int numberOfShadowMapsPerLight = settings.mNumberOfShadowMaps;
 
         mShadowSettings->setNumShadowMapsPerLight(numberOfShadowMapsPerLight);
         mShadowSettings->setBaseShadowTextureUnit(shaderManager.reserveGlobalTextureUnits(
             Shader::ShaderManager::Slot::ShadowMaps, numberOfShadowMapsPerLight));
 
-        const float maximumShadowMapDistance = Settings::Manager::getFloat("maximum shadow map distance", "Shadows");
+        const float maximumShadowMapDistance = settings.mMaximumShadowMapDistance;
         if (maximumShadowMapDistance > 0)
         {
-            const float shadowFadeStart
-                = std::clamp(Settings::Manager::getFloat("shadow fade start", "Shadows"), 0.f, 1.f);
+            const float shadowFadeStart = settings.mShadowFadeStart;
             mShadowSettings->setMaximumShadowMapDistance(maximumShadowMapDistance);
             mShadowTechnique->setShadowFadeStart(maximumShadowMapDistance * shadowFadeStart);
         }
 
-        mShadowSettings->setMinimumShadowMapNearFarRatio(
-            Settings::Manager::getFloat("minimum lispsm near far ratio", "Shadows"));
+        mShadowSettings->setMinimumShadowMapNearFarRatio(settings.mMinimumLispsmNearFarRatio);
 
-        const std::string& computeSceneBounds = Settings::Manager::getString("compute scene bounds", "Shadows");
+        const std::string& computeSceneBounds = settings.mComputeSceneBounds;
         if (Misc::StringUtils::ciEqual(computeSceneBounds, "primitives"))
             mShadowSettings->setComputeNearFarModeOverride(osg::CullSettings::COMPUTE_NEAR_FAR_USING_PRIMITIVES);
         else if (Misc::StringUtils::ciEqual(computeSceneBounds, "bounds"))
             mShadowSettings->setComputeNearFarModeOverride(osg::CullSettings::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
 
-        int mapres = Settings::Manager::getInt("shadow map resolution", "Shadows");
+        const int mapres = settings.mShadowMapResolution;
         mShadowSettings->setTextureSize(osg::Vec2s(mapres, mapres));
 
-        mShadowTechnique->setSplitPointUniformLogarithmicRatio(
-            Settings::Manager::getFloat("split point uniform logarithmic ratio", "Shadows"));
-        mShadowTechnique->setSplitPointDeltaBias(Settings::Manager::getFloat("split point bias", "Shadows"));
+        mShadowTechnique->setSplitPointUniformLogarithmicRatio(settings.mSplitPointUniformLogarithmicRatio);
+        mShadowTechnique->setSplitPointDeltaBias(settings.mSplitPointBias);
 
-        mShadowTechnique->setPolygonOffset(Settings::Manager::getFloat("polygon offset factor", "Shadows"),
-            Settings::Manager::getFloat("polygon offset units", "Shadows"));
+        mShadowTechnique->setPolygonOffset(settings.mPolygonOffsetFactor, settings.mPolygonOffsetUnits);
 
-        if (Settings::Manager::getBool("use front face culling", "Shadows"))
+        if (settings.mUseFrontFaceCulling)
             mShadowTechnique->enableFrontFaceCulling();
         else
             mShadowTechnique->disableFrontFaceCulling();
 
-        if (Settings::Manager::getBool("allow shadow map overlap", "Shadows"))
-            mShadowSettings->setMultipleShadowMapHint(osgShadow::ShadowSettings::CASCADED);
-        else
-            mShadowSettings->setMultipleShadowMapHint(osgShadow::ShadowSettings::PARALLEL_SPLIT);
+        mShadowSettings->setMultipleShadowMapHint(osgShadow::ShadowSettings::CASCADED);
 
-        if (Settings::Manager::getBool("enable debug hud", "Shadows"))
+        if (settings.mEnableDebugHud)
             mShadowTechnique->enableDebugHUD();
         else
             mShadowTechnique->disableDebugHUD();
     }
 
-    void ShadowManager::disableShadowsForStateSet(osg::ref_ptr<osg::StateSet> stateset)
+    void ShadowManager::disableShadowsForStateSet(osg::StateSet& stateset) const
     {
-        if (!Settings::Manager::getBool("enable shadows", "Shadows"))
+        if (!mEnableShadows)
             return;
 
-        const int numberOfShadowMapsPerLight
-            = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
-
-        int baseShadowTextureUnit = 8 - numberOfShadowMapsPerLight;
-
         osg::ref_ptr<osg::Image> fakeShadowMapImage = new osg::Image();
         fakeShadowMapImage->allocateImage(1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT);
         *(float*)fakeShadowMapImage->data() = std::numeric_limits<float>::infinity();
@@ -97,25 +95,28 @@ namespace SceneUtil
         fakeShadowMapTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         fakeShadowMapTexture->setShadowComparison(true);
         fakeShadowMapTexture->setShadowCompareFunc(osg::Texture::ShadowCompareFunc::ALWAYS);
-        for (int i = baseShadowTextureUnit; i < baseShadowTextureUnit + numberOfShadowMapsPerLight; ++i)
+        for (unsigned int i = mShadowSettings->getBaseShadowTextureUnit();
+             i < mShadowSettings->getBaseShadowTextureUnit() + mShadowSettings->getNumShadowMapsPerLight(); ++i)
         {
-            stateset->setTextureAttributeAndModes(i, fakeShadowMapTexture,
+            stateset.setTextureAttribute(i, fakeShadowMapTexture,
                 osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED);
-            stateset->addUniform(
-                new osg::Uniform(("shadowTexture" + std::to_string(i - baseShadowTextureUnit)).c_str(), i));
-            stateset->addUniform(
-                new osg::Uniform(("shadowTextureUnit" + std::to_string(i - baseShadowTextureUnit)).c_str(), i));
+            stateset.addUniform(new osg::Uniform(
+                ("shadowTexture" + std::to_string(i - mShadowSettings->getBaseShadowTextureUnit())).c_str(),
+                static_cast<int>(i)));
         }
     }
 
     ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode,
         unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask,
-        Shader::ShaderManager& shaderManager)
+        const Settings::ShadowsCategory& settings, Shader::ShaderManager& shaderManager)
         : mShadowedScene(new osgShadow::ShadowedScene)
         , mShadowTechnique(new MWShadowTechnique)
         , mOutdoorShadowCastingMask(outdoorShadowCastingMask)
         , mIndoorShadowCastingMask(indoorShadowCastingMask)
     {
+        if (sInstance)
+            throw std::logic_error("A ShadowManager already exists");
+
         mShadowedScene->setShadowTechnique(mShadowTechnique);
 
         if (Stereo::getStereo())
@@ -126,12 +127,14 @@ namespace SceneUtil
         mShadowedScene->setNodeMask(sceneRoot->getNodeMask());
 
         mShadowSettings = mShadowedScene->getShadowSettings();
-        setupShadowSettings(shaderManager);
+        setupShadowSettings(settings, shaderManager);
 
         mShadowTechnique->setupCastingShader(shaderManager);
         mShadowTechnique->setWorldMask(worldMask);
 
         enableOutdoorMode();
+
+        sInstance = this;
     }
 
     ShadowManager::~ShadowManager()
@@ -140,7 +143,7 @@ namespace SceneUtil
             Stereo::Manager::instance().setShadowTechnique(nullptr);
     }
 
-    Shader::ShaderManager::DefineMap ShadowManager::getShadowDefines()
+    Shader::ShaderManager::DefineMap ShadowManager::getShadowDefines(const Settings::ShadowsCategory& settings) const
     {
         if (!mEnableShadows)
             return getShadowsDisabledDefines();
@@ -155,24 +158,17 @@ namespace SceneUtil
         definesWithShadows["shadow_texture_unit_list"] = definesWithShadows["shadow_texture_unit_list"].substr(
             0, definesWithShadows["shadow_texture_unit_list"].length() - 1);
 
-        definesWithShadows["shadowMapsOverlap"]
-            = Settings::Manager::getBool("allow shadow map overlap", "Shadows") ? "1" : "0";
-
-        definesWithShadows["useShadowDebugOverlay"]
-            = Settings::Manager::getBool("enable debug overlay", "Shadows") ? "1" : "0";
+        definesWithShadows["useShadowDebugOverlay"] = settings.mEnableDebugOverlay ? "1" : "0";
 
         // switch this to reading settings if it's ever exposed to the user
         definesWithShadows["perspectiveShadowMaps"]
             = mShadowSettings->getShadowMapProjectionHint() == ShadowSettings::PERSPECTIVE_SHADOW_MAP ? "1" : "0";
 
-        definesWithShadows["disableNormalOffsetShadows"]
-            = Settings::Manager::getFloat("normal offset distance", "Shadows") == 0.0 ? "1" : "0";
+        definesWithShadows["disableNormalOffsetShadows"] = settings.mNormalOffsetDistance == 0.0 ? "1" : "0";
 
-        definesWithShadows["shadowNormalOffset"]
-            = std::to_string(Settings::Manager::getFloat("normal offset distance", "Shadows"));
+        definesWithShadows["shadowNormalOffset"] = std::to_string(settings.mNormalOffsetDistance);
 
-        definesWithShadows["limitShadowMapDistance"]
-            = Settings::Manager::getFloat("maximum shadow map distance", "Shadows") > 0 ? "1" : "0";
+        definesWithShadows["limitShadowMapDistance"] = settings.mMaximumShadowMapDistance > 0 ? "1" : "0";
 
         return definesWithShadows;
     }
@@ -185,8 +181,6 @@ namespace SceneUtil
 
         definesWithoutShadows["shadow_texture_unit_list"] = "";
 
-        definesWithoutShadows["shadowMapsOverlap"] = "0";
-
         definesWithoutShadows["useShadowDebugOverlay"] = "0";
 
         definesWithoutShadows["perspectiveShadowMaps"] = "0";
@@ -200,9 +194,9 @@ namespace SceneUtil
         return definesWithoutShadows;
     }
 
-    void ShadowManager::enableIndoorMode()
+    void ShadowManager::enableIndoorMode(const Settings::ShadowsCategory& settings)
     {
-        if (Settings::Manager::getBool("enable indoor shadows", "Shadows"))
+        if (settings.mEnableIndoorShadows)
             mShadowSettings->setCastsShadowTraversalMask(mIndoorShadowCastingMask);
         else
             mShadowTechnique->disableShadows(true);
diff --git a/components/sceneutil/shadow.hpp b/components/sceneutil/shadow.hpp
index 76fd2b7fdd..952d750051 100644
--- a/components/sceneutil/shadow.hpp
+++ b/components/sceneutil/shadow.hpp
@@ -8,36 +8,46 @@ namespace osg
     class StateSet;
     class Group;
 }
+
 namespace osgShadow
 {
     class ShadowSettings;
     class ShadowedScene;
 }
 
+namespace Settings
+{
+    struct ShadowsCategory;
+}
+
 namespace SceneUtil
 {
     class MWShadowTechnique;
     class ShadowManager
     {
     public:
-        static void disableShadowsForStateSet(osg::ref_ptr<osg::StateSet> stateSet);
-
         static Shader::ShaderManager::DefineMap getShadowsDisabledDefines();
 
-        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode,
+        static const ShadowManager& instance();
+
+        explicit ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode,
             unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask,
-            Shader::ShaderManager& shaderManager);
+            const Settings::ShadowsCategory& settings, Shader::ShaderManager& shaderManager);
         ~ShadowManager();
 
-        void setupShadowSettings(Shader::ShaderManager& shaderManager);
+        void setupShadowSettings(const Settings::ShadowsCategory& settings, Shader::ShaderManager& shaderManager);
 
-        Shader::ShaderManager::DefineMap getShadowDefines();
+        void disableShadowsForStateSet(osg::StateSet& stateset) const;
 
-        void enableIndoorMode();
+        Shader::ShaderManager::DefineMap getShadowDefines(const Settings::ShadowsCategory& settings) const;
+
+        void enableIndoorMode(const Settings::ShadowsCategory& settings);
 
         void enableOutdoorMode();
 
     protected:
+        static ShadowManager* sInstance;
+
         bool mEnableShadows;
 
         osg::ref_ptr<osgShadow::ShadowedScene> mShadowedScene;
diff --git a/components/sceneutil/texturetype.hpp b/components/sceneutil/texturetype.hpp
new file mode 100644
index 0000000000..dbed8a0e74
--- /dev/null
+++ b/components/sceneutil/texturetype.hpp
@@ -0,0 +1,34 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_TEXTURETYPE_H
+#define OPENMW_COMPONENTS_SCENEUTIL_TEXTURETYPE_H
+
+#include <osg/StateAttribute>
+
+namespace SceneUtil
+{
+    // The type bound to the given texture used by the ShaderVisitor to distinguish between them
+    class TextureType : public osg::StateAttribute
+    {
+    public:
+        TextureType() = default;
+
+        TextureType(const std::string& name) { setName(name); }
+
+        TextureType(const TextureType& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : StateAttribute(copy, copyop)
+        {
+        }
+
+        static const osg::StateAttribute::Type AttributeType = static_cast<osg::StateAttribute::Type>(69420);
+        META_StateAttribute(SceneUtil, TextureType, AttributeType)
+
+        bool isTextureAttribute() const override { return true; }
+
+        int compare(const osg::StateAttribute& sa) const override
+        {
+            COMPARE_StateAttribute_Types(TextureType, sa);
+            COMPARE_StateAttribute_Parameter(_name);
+            return 0;
+        }
+    };
+}
+#endif
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 7b921d15f4..e7a9cab730 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -1,6 +1,7 @@
 #include "util.hpp"
 
 #include <algorithm>
+#include <array>
 #include <iomanip>
 #include <sstream>
 
@@ -14,28 +15,51 @@
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/texturetype.hpp>
+#include <components/vfs/pathutil.hpp>
 
 namespace SceneUtil
 {
-
-    class FindLowestUnusedTexUnitVisitor : public osg::NodeVisitor
+    namespace
     {
-    public:
-        FindLowestUnusedTexUnitVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-            , mLowestUnusedTexUnit(0)
+        std::array<VFS::Path::Normalized, 32> generateGlowTextureNames()
         {
+            constexpr VFS::Path::NormalizedView prefix("textures/magicitem");
+            std::array<VFS::Path::Normalized, 32> result;
+            for (std::size_t i = 0; i < result.size(); ++i)
+            {
+                std::stringstream stream;
+                stream << "caust";
+                stream << std::setw(2);
+                stream << std::setfill('0');
+                stream << i;
+                stream << ".dds";
+                result[i] = prefix / VFS::Path::Normalized(std::move(stream).str());
+            }
+            return result;
         }
 
-        void apply(osg::Node& node) override
-        {
-            if (osg::StateSet* stateset = node.getStateSet())
-                mLowestUnusedTexUnit = std::max(mLowestUnusedTexUnit, int(stateset->getTextureAttributeList().size()));
+        const std::array<VFS::Path::Normalized, 32> glowTextureNames = generateGlowTextureNames();
 
-            traverse(node);
-        }
-        int mLowestUnusedTexUnit;
-    };
+        struct FindLowestUnusedTexUnitVisitor : public osg::NodeVisitor
+        {
+            FindLowestUnusedTexUnitVisitor()
+                : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            {
+            }
+
+            void apply(osg::Node& node) override
+            {
+                if (osg::StateSet* stateset = node.getStateSet())
+                    mLowestUnusedTexUnit
+                        = std::max(mLowestUnusedTexUnit, int(stateset->getTextureAttributeList().size()));
+
+                traverse(node);
+            }
+
+            int mLowestUnusedTexUnit = 0;
+        };
+    }
 
     GlowUpdater::GlowUpdater(int texUnit, const osg::Vec4f& color,
         const std::vector<osg::ref_ptr<osg::Texture2D>>& textures, osg::Node* node, float duration,
@@ -197,18 +221,10 @@ namespace SceneUtil
         const osg::Vec4f& glowColor, float glowDuration)
     {
         std::vector<osg::ref_ptr<osg::Texture2D>> textures;
-        for (int i = 0; i < 32; ++i)
+        for (const VFS::Path::Normalized& name : glowTextureNames)
         {
-            std::stringstream stream;
-            stream << "textures/magicitem/caust";
-            stream << std::setw(2);
-            stream << std::setfill('0');
-            stream << i;
-            stream << ".dds";
-
-            osg::ref_ptr<osg::Image> image = resourceSystem->getImageManager()->getImage(stream.str());
+            osg::ref_ptr<osg::Image> image = resourceSystem->getImageManager()->getImage(name);
             osg::ref_ptr<osg::Texture2D> tex(new osg::Texture2D(image));
-            tex->setName("envMap");
             tex->setWrap(osg::Texture::WRAP_S, osg::Texture2D::REPEAT);
             tex->setWrap(osg::Texture::WRAP_T, osg::Texture2D::REPEAT);
             resourceSystem->getSceneManager()->applyFilterSettings(tex);
@@ -233,19 +249,19 @@ namespace SceneUtil
             node->setStateSet(writableStateSet);
         }
         writableStateSet->setTextureAttributeAndModes(texUnit, textures.front(), osg::StateAttribute::ON);
+        writableStateSet->setTextureAttributeAndModes(texUnit, new TextureType("envMap"), osg::StateAttribute::ON);
         writableStateSet->addUniform(new osg::Uniform("envMapColor", glowColor));
-        resourceSystem->getSceneManager()->recreateShaders(node);
+        resourceSystem->getSceneManager()->recreateShaders(std::move(node));
 
         return glowUpdater;
     }
 
-    bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer,
-        osg::Texture* texture, unsigned int level, unsigned int face, bool mipMapGeneration)
+    void attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer,
+        osg::Texture* texture, unsigned int level, unsigned int face, bool mipMapGeneration,
+        bool addMSAAIntermediateTarget)
     {
         unsigned int samples = 0;
         unsigned int colourSamples = 0;
-        bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders")
-            && Settings::Manager::getInt("antialiasing", "Video") > 1;
         if (addMSAAIntermediateTarget)
         {
             // Alpha-to-coverage requires a multisampled framebuffer.
@@ -255,7 +271,6 @@ namespace SceneUtil
             colourSamples = 1;
         }
         camera->attach(buffer, texture, level, face, mipMapGeneration, samples, colourSamples);
-        return addMSAAIntermediateTarget;
     }
 
     OperationSequence::OperationSequence(bool keep)
@@ -274,4 +289,133 @@ namespace SceneUtil
         mOperationQueue->add(operation);
     }
 
+    GLenum computeUnsizedPixelFormat(GLenum format)
+    {
+        switch (format)
+        {
+            // Try compressed formats first, they're more likely to be used
+
+            // Generic
+            case GL_COMPRESSED_ALPHA_ARB:
+                return GL_ALPHA;
+            case GL_COMPRESSED_INTENSITY_ARB:
+                return GL_INTENSITY;
+            case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+                return GL_LUMINANCE_ALPHA;
+            case GL_COMPRESSED_LUMINANCE_ARB:
+                return GL_LUMINANCE;
+            case GL_COMPRESSED_RGB_ARB:
+                return GL_RGB;
+            case GL_COMPRESSED_RGBA_ARB:
+                return GL_RGBA;
+
+            // S3TC
+            case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+            case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+                return GL_RGB;
+            case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+            case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+            case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
+                return GL_RGBA;
+
+            // RGTC
+            case GL_COMPRESSED_RED_RGTC1_EXT:
+            case GL_COMPRESSED_SIGNED_RED_RGTC1_EXT:
+                return GL_RED;
+            case GL_COMPRESSED_RED_GREEN_RGTC2_EXT:
+            case GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT:
+                return GL_RG;
+
+            // PVRTC
+            case GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG:
+            case GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG:
+                return GL_RGB;
+            case GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG:
+            case GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG:
+                return GL_RGBA;
+
+            // ETC
+            case GL_COMPRESSED_R11_EAC:
+            case GL_COMPRESSED_SIGNED_R11_EAC:
+                return GL_RED;
+            case GL_COMPRESSED_RG11_EAC:
+            case GL_COMPRESSED_SIGNED_RG11_EAC:
+                return GL_RG;
+            case GL_ETC1_RGB8_OES:
+            case GL_COMPRESSED_RGB8_ETC2:
+            case GL_COMPRESSED_SRGB8_ETC2:
+                return GL_RGB;
+            case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+            case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+            case GL_COMPRESSED_RGBA8_ETC2_EAC:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+                return GL_RGBA;
+
+            // ASTC
+            case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
+            case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
+            case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
+                return GL_RGBA;
+
+            // Plug in some holes computePixelFormat has, you never know when these could come in handy
+            case GL_INTENSITY4:
+            case GL_INTENSITY8:
+            case GL_INTENSITY12:
+            case GL_INTENSITY16:
+                return GL_INTENSITY;
+
+            case GL_LUMINANCE4:
+            case GL_LUMINANCE8:
+            case GL_LUMINANCE12:
+            case GL_LUMINANCE16:
+                return GL_LUMINANCE;
+
+            case GL_LUMINANCE4_ALPHA4:
+            case GL_LUMINANCE6_ALPHA2:
+            case GL_LUMINANCE8_ALPHA8:
+            case GL_LUMINANCE12_ALPHA4:
+            case GL_LUMINANCE12_ALPHA12:
+            case GL_LUMINANCE16_ALPHA16:
+                return GL_LUMINANCE_ALPHA;
+        }
+
+        return osg::Image::computePixelFormat(format);
+    }
+
+    const std::string& getTextureType(const osg::StateSet& stateset, const osg::Texture& texture, unsigned int texUnit)
+    {
+        const osg::StateAttribute* type = stateset.getTextureAttribute(texUnit, SceneUtil::TextureType::AttributeType);
+        if (type)
+            return static_cast<const SceneUtil::TextureType*>(type)->getName();
+
+        return texture.getName();
+    }
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 0a65a9980f..b320195eff 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -96,8 +96,9 @@ namespace SceneUtil
         const osg::Vec4f& glowColor, float glowDuration = -1);
 
     // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
-    bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer,
-        osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
+    void attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer,
+        osg::Texture* texture, unsigned int level, unsigned int face, bool mipMapGeneration,
+        bool addMSAAIntermediateTarget);
 
     class OperationSequence : public osg::Operation
     {
@@ -111,6 +112,14 @@ namespace SceneUtil
     protected:
         osg::ref_ptr<osg::OperationQueue> mOperationQueue;
     };
+
+    // Compute the unsized format equivalent to the given pixel format
+    // Unlike osg::Image::computePixelFormat, this also covers compressed formats
+    GLenum computeUnsizedPixelFormat(GLenum format);
+
+    // Recover the presumed texture type for the given texture unit
+    // It may be set as a state attribute or it may come from the used texture's name
+    const std::string& getTextureType(const osg::StateSet& stateset, const osg::Texture& texture, unsigned int texUnit);
 }
 
 #endif
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index aadbf35af8..8d1bf46322 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -5,6 +5,8 @@
 
 #include <osgParticle/ParticleSystem>
 
+#include <osgAnimation/Bone>
+
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
@@ -13,7 +15,6 @@
 
 namespace SceneUtil
 {
-
     bool FindByNameVisitor::checkGroup(osg::Group& group)
     {
         if (Misc::StringUtils::ciEqual(group.getName(), mNameToFind))
@@ -21,6 +22,7 @@ namespace SceneUtil
             mFoundNode = &group;
             return true;
         }
+
         return false;
     }
 
@@ -46,21 +48,19 @@ namespace SceneUtil
 
     void FindByNameVisitor::apply(osg::Geometry&) {}
 
+    void NodeMapVisitorBoneOnly::apply(osg::MatrixTransform& trans)
+    {
+        // Choose first found bone in file
+        if (dynamic_cast<osgAnimation::Bone*>(&trans) != nullptr)
+            mMap.emplace(trans.getName(), &trans);
+
+        traverse(trans);
+    }
+
     void NodeMapVisitor::apply(osg::MatrixTransform& trans)
     {
         // Choose first found node in file
-
-        if (trans.libraryName() == std::string_view("osgAnimation"))
-        {
-            std::string nodeName = trans.getName();
-            // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses
-            // whitespace-separated names)
-            std::replace(nodeName.begin(), nodeName.end(), '_', ' ');
-            mMap.emplace(nodeName, &trans);
-        }
-        else
-            mMap.emplace(trans.getName(), &trans);
-
+        mMap.emplace(trans.getName(), &trans);
         traverse(trans);
     }
 
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index 3e3df4d4b3..a9a943423c 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -50,14 +50,14 @@ namespace SceneUtil
         std::vector<osg::Node*> mFoundNodes;
     };
 
+    typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash,
+        Misc::StringUtils::CiEqual>
+        NodeMap;
+
     /// Maps names to nodes
     class NodeMapVisitor : public osg::NodeVisitor
     {
     public:
-        typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash,
-            Misc::StringUtils::CiEqual>
-            NodeMap;
-
         NodeMapVisitor(NodeMap& map)
             : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
             , mMap(map)
@@ -70,6 +70,22 @@ namespace SceneUtil
         NodeMap& mMap;
     };
 
+    /// Maps names to bone nodes
+    class NodeMapVisitorBoneOnly : public osg::NodeVisitor
+    {
+    public:
+        NodeMapVisitorBoneOnly(NodeMap& map)
+            : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
+            , mMap(map)
+        {
+        }
+
+        void apply(osg::MatrixTransform& trans) override;
+
+    private:
+        NodeMap& mMap;
+    };
+
     /// @brief Base class for visitors that remove nodes from a scene graph.
     /// Subclasses need to fill the mToRemove vector.
     /// To use, node->accept(removeVisitor); removeVisitor.remove();
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index 3c2efc3728..36947460df 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -14,22 +14,16 @@ namespace SDLUtil
         close(true);
     }
 
-    GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits* traits, int vsync)
+    GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits* traits, VSyncMode vsyncMode)
         : mWindow(nullptr)
         , mContext(nullptr)
         , mValid(false)
         , mRealized(false)
         , mOwnsWindow(false)
+        , mVSyncMode(vsyncMode)
     {
         _traits = traits;
 
-        if (vsync == 2)
-            mVSyncMode = VSyncMode::Adaptive;
-        else if (vsync == 1)
-            mVSyncMode = VSyncMode::Enabled;
-        else
-            mVSyncMode = VSyncMode::Disabled;
-
         init();
         if (GraphicsWindowSDL2::valid())
         {
diff --git a/components/sdlutil/sdlgraphicswindow.hpp b/components/sdlutil/sdlgraphicswindow.hpp
index 3af6ef9276..238c872fb9 100644
--- a/components/sdlutil/sdlgraphicswindow.hpp
+++ b/components/sdlutil/sdlgraphicswindow.hpp
@@ -5,14 +5,10 @@
 
 #include <osgViewer/GraphicsWindow>
 
+#include "vsyncmode.hpp"
+
 namespace SDLUtil
 {
-    enum VSyncMode
-    {
-        Disabled = 0,
-        Enabled = 1,
-        Adaptive = 2
-    };
 
     class GraphicsWindowSDL2 : public osgViewer::GraphicsWindow
     {
@@ -29,7 +25,7 @@ namespace SDLUtil
         virtual ~GraphicsWindowSDL2();
 
     public:
-        GraphicsWindowSDL2(osg::GraphicsContext::Traits* traits, int vsync);
+        GraphicsWindowSDL2(osg::GraphicsContext::Traits* traits, VSyncMode vsyncMode);
 
         bool isSameKindAs(const Object* object) const override
         {
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 07cab33ad3..43de84bb70 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -1,7 +1,7 @@
 #include "sdlinputwrapper.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/settings/settings.hpp>
+#include <components/settings/values.hpp>
 
 #include <osgViewer/Viewer>
 
@@ -187,8 +187,10 @@ namespace SDLUtil
                     {
                         case SDL_DISPLAYEVENT_ORIENTATION:
                             if (mSensorListener
-                                && evt.display.display == (unsigned int)Settings::Manager::getInt("screen", "Video"))
+                                && evt.display.display == static_cast<Uint32>(Settings::video().mScreen))
+                            {
                                 mSensorListener->displayOrientationChanged();
+                            }
                             break;
                         default:
                             break;
@@ -250,6 +252,11 @@ namespace SDLUtil
                 SDL_GL_GetDrawableSize(mSDLWindow, &w, &h);
                 int x, y;
                 SDL_GetWindowPosition(mSDLWindow, &x, &y);
+
+                // Happens when you Alt-Tab out of game
+                if (w == 0 && h == 0)
+                    return;
+
                 mViewer->getCamera()->getGraphicsContext()->resized(x, y, w, h);
 
                 mViewer->getEventQueue()->windowResize(x, y, w, h);
diff --git a/components/sdlutil/sdlmappings.cpp b/components/sdlutil/sdlmappings.cpp
index fe248e6f70..8a82206c33 100644
--- a/components/sdlutil/sdlmappings.cpp
+++ b/components/sdlutil/sdlmappings.cpp
@@ -83,7 +83,7 @@ namespace SDLUtil
 
     Uint8 myGuiMouseButtonToSdl(MyGUI::MouseButton button)
     {
-        Uint8 value = button.getValue() + 1;
+        Uint8 value = static_cast<Uint8>(button.getValue() + 1);
         if (value == SDL_BUTTON_RIGHT)
             value = SDL_BUTTON_MIDDLE;
         else if (value == SDL_BUTTON_MIDDLE)
diff --git a/components/sdlutil/sdlvideowrapper.cpp b/components/sdlutil/sdlvideowrapper.cpp
index 3b612214b8..d93c16aace 100644
--- a/components/sdlutil/sdlvideowrapper.cpp
+++ b/components/sdlutil/sdlvideowrapper.cpp
@@ -30,14 +30,8 @@ namespace SDLUtil
             SDL_SetWindowGammaRamp(mWindow, mOldSystemGammaRamp, &mOldSystemGammaRamp[256], &mOldSystemGammaRamp[512]);
     }
 
-    void VideoWrapper::setSyncToVBlank(int mode)
+    void VideoWrapper::setSyncToVBlank(VSyncMode vsyncMode)
     {
-        VSyncMode vsyncMode = VSyncMode::Disabled;
-        if (mode == 1)
-            vsyncMode = VSyncMode::Enabled;
-        else if (mode == 2)
-            vsyncMode = VSyncMode::Adaptive;
-
         osgViewer::Viewer::Windows windows;
         mViewer->getWindows(windows);
         mViewer->stopThreading();
@@ -47,7 +41,7 @@ namespace SDLUtil
             if (GraphicsWindowSDL2* sdl2win = dynamic_cast<GraphicsWindowSDL2*>(win))
                 sdl2win->setSyncToVBlank(vsyncMode);
             else
-                win->setSyncToVBlank(static_cast<bool>(mode));
+                win->setSyncToVBlank(vsyncMode != VSyncMode::Disabled);
         }
         mViewer->startThreading();
     }
diff --git a/components/sdlutil/sdlvideowrapper.hpp b/components/sdlutil/sdlvideowrapper.hpp
index 9ed6ff1252..7977de40a7 100644
--- a/components/sdlutil/sdlvideowrapper.hpp
+++ b/components/sdlutil/sdlvideowrapper.hpp
@@ -5,6 +5,8 @@
 
 #include <SDL_types.h>
 
+#include "vsyncmode.hpp"
+
 struct SDL_Window;
 
 namespace osgViewer
@@ -26,7 +28,7 @@ namespace SDLUtil
         VideoWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer);
         ~VideoWrapper();
 
-        void setSyncToVBlank(int mode);
+        void setSyncToVBlank(VSyncMode vsyncMode);
 
         void setGammaContrast(float gamma, float contrast);
 
diff --git a/components/sdlutil/vsyncmode.hpp b/components/sdlutil/vsyncmode.hpp
new file mode 100644
index 0000000000..5156addc40
--- /dev/null
+++ b/components/sdlutil/vsyncmode.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_COMPONENTS_SDLUTIL_VSYNCMODE_H
+#define OPENMW_COMPONENTS_SDLUTIL_VSYNCMODE_H
+
+namespace SDLUtil
+{
+    enum VSyncMode
+    {
+        Disabled = 0,
+        Enabled = 1,
+        Adaptive = 2
+    };
+}
+
+#endif
diff --git a/components/settings/categories/camera.hpp b/components/settings/categories/camera.hpp
index 4712f88b45..5b3a9b742b 100644
--- a/components/settings/categories/camera.hpp
+++ b/components/settings/categories/camera.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CAMERA_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CAMERA_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/cells.hpp b/components/settings/categories/cells.hpp
index 723004d674..86fe944acf 100644
--- a/components/settings/categories/cells.hpp
+++ b/components/settings/categories/cells.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CELLS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CELLS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/fog.hpp b/components/settings/categories/fog.hpp
index 5acf3d20c6..3bc75587f1 100644
--- a/components/settings/categories/fog.hpp
+++ b/components/settings/categories/fog.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_FOG_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_FOG_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/game.hpp b/components/settings/categories/game.hpp
index ded367a54c..ec6f9dc206 100644
--- a/components/settings/categories/game.hpp
+++ b/components/settings/categories/game.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GAME_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GAME_H
 
-#include "components/detournavigator/collisionshapetype.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/detournavigator/collisionshapetype.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -39,6 +39,7 @@ namespace Settings
         SettingValue<bool> mCanLootDuringDeathAnimation{ mIndex, "Game", "can loot during death animation" };
         SettingValue<bool> mRebalanceSoulGemValues{ mIndex, "Game", "rebalance soul gem values" };
         SettingValue<bool> mUseAdditionalAnimSources{ mIndex, "Game", "use additional anim sources" };
+        SettingValue<bool> mSmoothAnimTransitions{ mIndex, "Game", "smooth animation transitions" };
         SettingValue<bool> mBarterDispositionChangeIsPermanent{ mIndex, "Game",
             "barter disposition change is permanent" };
         SettingValue<int> mStrengthInfluencesHandToHand{ mIndex, "Game", "strength influences hand to hand",
@@ -74,6 +75,7 @@ namespace Settings
             "unarmed creature attacks damage armor" };
         SettingValue<DetourNavigator::CollisionShapeType> mActorCollisionShapeType{ mIndex, "Game",
             "actor collision shape type" };
+        SettingValue<bool> mPlayerMovementIgnoresAnimation{ mIndex, "Game", "player movement ignores animation" };
     };
 }
 
diff --git a/components/settings/categories/general.hpp b/components/settings/categories/general.hpp
index 7bbb651ee8..a79ef83ea0 100644
--- a/components/settings/categories/general.hpp
+++ b/components/settings/categories/general.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GENERAL_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GENERAL_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/groundcover.hpp b/components/settings/categories/groundcover.hpp
index 48f97037ae..78615a4e76 100644
--- a/components/settings/categories/groundcover.hpp
+++ b/components/settings/categories/groundcover.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GROUNDCOVER_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GROUNDCOVER_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/gui.hpp b/components/settings/categories/gui.hpp
index 1d3a56af39..a26364c5dd 100644
--- a/components/settings/categories/gui.hpp
+++ b/components/settings/categories/gui.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GUI_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GUI_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -28,14 +28,16 @@ namespace Settings
         SettingValue<bool> mSubtitles{ mIndex, "GUI", "subtitles" };
         SettingValue<bool> mHitFader{ mIndex, "GUI", "hit fader" };
         SettingValue<bool> mWerewolfOverlay{ mIndex, "GUI", "werewolf overlay" };
-        SettingValue<float> mColorBackgroundOwned{ mIndex, "GUI", "color background owned",
-            makeClampSanitizerFloat(0, 1) };
-        SettingValue<float> mColorCrosshairOwned{ mIndex, "GUI", "color crosshair owned",
-            makeClampSanitizerFloat(0, 1) };
+        SettingValue<MyGUI::Colour> mColorBackgroundOwned{ mIndex, "GUI", "color background owned" };
+        SettingValue<MyGUI::Colour> mColorCrosshairOwned{ mIndex, "GUI", "color crosshair owned" };
         SettingValue<bool> mKeyboardNavigation{ mIndex, "GUI", "keyboard navigation" };
         SettingValue<bool> mColorTopicEnable{ mIndex, "GUI", "color topic enable" };
         SettingValue<MyGUI::Colour> mColorTopicSpecific{ mIndex, "GUI", "color topic specific" };
+        SettingValue<MyGUI::Colour> mColorTopicSpecificOver{ mIndex, "GUI", "color topic specific over" };
+        SettingValue<MyGUI::Colour> mColorTopicSpecificPressed{ mIndex, "GUI", "color topic specific pressed" };
         SettingValue<MyGUI::Colour> mColorTopicExhausted{ mIndex, "GUI", "color topic exhausted" };
+        SettingValue<MyGUI::Colour> mColorTopicExhaustedOver{ mIndex, "GUI", "color topic exhausted over" };
+        SettingValue<MyGUI::Colour> mColorTopicExhaustedPressed{ mIndex, "GUI", "color topic exhausted pressed" };
     };
 }
 
diff --git a/components/settings/categories/hud.hpp b/components/settings/categories/hud.hpp
index e97a81501d..fe05e39eda 100644
--- a/components/settings/categories/hud.hpp
+++ b/components/settings/categories/hud.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/input.hpp b/components/settings/categories/input.hpp
index 1e59b45334..0a450f1dcd 100644
--- a/components/settings/categories/input.hpp
+++ b/components/settings/categories/input.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_INPUT_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_INPUT_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/lua.hpp b/components/settings/categories/lua.hpp
index da11a605eb..88d74b2d1f 100644
--- a/components/settings/categories/lua.hpp
+++ b/components/settings/categories/lua.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_LUA_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_LUA_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/map.hpp b/components/settings/categories/map.hpp
index bdccd6f205..8a80d5aa63 100644
--- a/components/settings/categories/map.hpp
+++ b/components/settings/categories/map.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MAP_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MAP_H
 
-#include "components/misc/constants.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/misc/constants.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/models.hpp b/components/settings/categories/models.hpp
index fec8da7775..b7ded15151 100644
--- a/components/settings/categories/models.hpp
+++ b/components/settings/categories/models.hpp
@@ -1,15 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H
 
-#include "components/settings/settingvalue.hpp"
-
-#include <osg/Math>
-#include <osg/Vec2f>
-#include <osg/Vec3f>
-
-#include <cstdint>
-#include <string>
-#include <string_view>
+#include <components/settings/settingvalue.hpp>
+#include <components/vfs/pathutil.hpp>
 
 namespace Settings
 {
@@ -18,30 +11,29 @@ namespace Settings
         using WithIndex::WithIndex;
 
         SettingValue<bool> mLoadUnsupportedNifFiles{ mIndex, "Models", "load unsupported nif files" };
-        SettingValue<std::string> mXbaseanim{ mIndex, "Models", "xbaseanim" };
-        SettingValue<std::string> mBaseanim{ mIndex, "Models", "baseanim" };
-        SettingValue<std::string> mXbaseanim1st{ mIndex, "Models", "xbaseanim1st" };
-        SettingValue<std::string> mBaseanimkna{ mIndex, "Models", "baseanimkna" };
-        SettingValue<std::string> mBaseanimkna1st{ mIndex, "Models", "baseanimkna1st" };
-        SettingValue<std::string> mXbaseanimfemale{ mIndex, "Models", "xbaseanimfemale" };
-        SettingValue<std::string> mBaseanimfemale{ mIndex, "Models", "baseanimfemale" };
-        SettingValue<std::string> mBaseanimfemale1st{ mIndex, "Models", "baseanimfemale1st" };
-        SettingValue<std::string> mWolfskin{ mIndex, "Models", "wolfskin" };
-        SettingValue<std::string> mWolfskin1st{ mIndex, "Models", "wolfskin1st" };
-        SettingValue<std::string> mXargonianswimkna{ mIndex, "Models", "xargonianswimkna" };
-        SettingValue<std::string> mXbaseanimkf{ mIndex, "Models", "xbaseanimkf" };
-        SettingValue<std::string> mXbaseanim1stkf{ mIndex, "Models", "xbaseanim1stkf" };
-        SettingValue<std::string> mXbaseanimfemalekf{ mIndex, "Models", "xbaseanimfemalekf" };
-        SettingValue<std::string> mXargonianswimknakf{ mIndex, "Models", "xargonianswimknakf" };
-        SettingValue<std::string> mSkyatmosphere{ mIndex, "Models", "skyatmosphere" };
-        SettingValue<std::string> mSkyclouds{ mIndex, "Models", "skyclouds" };
-        SettingValue<std::string> mSkynight01{ mIndex, "Models", "skynight01" };
-        SettingValue<std::string> mSkynight02{ mIndex, "Models", "skynight02" };
-        SettingValue<std::string> mWeatherashcloud{ mIndex, "Models", "weatherashcloud" };
-        SettingValue<std::string> mWeatherblightcloud{ mIndex, "Models", "weatherblightcloud" };
-        SettingValue<std::string> mWeathersnow{ mIndex, "Models", "weathersnow" };
-        SettingValue<std::string> mWeatherblizzard{ mIndex, "Models", "weatherblizzard" };
-        SettingValue<bool> mWriteNifDebugLog{ mIndex, "Models", "write nif debug log" };
+        SettingValue<VFS::Path::Normalized> mXbaseanim{ mIndex, "Models", "xbaseanim" };
+        SettingValue<VFS::Path::Normalized> mBaseanim{ mIndex, "Models", "baseanim" };
+        SettingValue<VFS::Path::Normalized> mXbaseanim1st{ mIndex, "Models", "xbaseanim1st" };
+        SettingValue<VFS::Path::Normalized> mBaseanimkna{ mIndex, "Models", "baseanimkna" };
+        SettingValue<VFS::Path::Normalized> mBaseanimkna1st{ mIndex, "Models", "baseanimkna1st" };
+        SettingValue<VFS::Path::Normalized> mXbaseanimfemale{ mIndex, "Models", "xbaseanimfemale" };
+        SettingValue<VFS::Path::Normalized> mBaseanimfemale{ mIndex, "Models", "baseanimfemale" };
+        SettingValue<VFS::Path::Normalized> mBaseanimfemale1st{ mIndex, "Models", "baseanimfemale1st" };
+        SettingValue<VFS::Path::Normalized> mWolfskin{ mIndex, "Models", "wolfskin" };
+        SettingValue<VFS::Path::Normalized> mWolfskin1st{ mIndex, "Models", "wolfskin1st" };
+        SettingValue<VFS::Path::Normalized> mXargonianswimkna{ mIndex, "Models", "xargonianswimkna" };
+        SettingValue<VFS::Path::Normalized> mXbaseanimkf{ mIndex, "Models", "xbaseanimkf" };
+        SettingValue<VFS::Path::Normalized> mXbaseanim1stkf{ mIndex, "Models", "xbaseanim1stkf" };
+        SettingValue<VFS::Path::Normalized> mXbaseanimfemalekf{ mIndex, "Models", "xbaseanimfemalekf" };
+        SettingValue<VFS::Path::Normalized> mXargonianswimknakf{ mIndex, "Models", "xargonianswimknakf" };
+        SettingValue<VFS::Path::Normalized> mSkyatmosphere{ mIndex, "Models", "skyatmosphere" };
+        SettingValue<VFS::Path::Normalized> mSkyclouds{ mIndex, "Models", "skyclouds" };
+        SettingValue<VFS::Path::Normalized> mSkynight01{ mIndex, "Models", "skynight01" };
+        SettingValue<VFS::Path::Normalized> mSkynight02{ mIndex, "Models", "skynight02" };
+        SettingValue<VFS::Path::Normalized> mWeatherashcloud{ mIndex, "Models", "weatherashcloud" };
+        SettingValue<VFS::Path::Normalized> mWeatherblightcloud{ mIndex, "Models", "weatherblightcloud" };
+        SettingValue<VFS::Path::Normalized> mWeathersnow{ mIndex, "Models", "weathersnow" };
+        SettingValue<VFS::Path::Normalized> mWeatherblizzard{ mIndex, "Models", "weatherblizzard" };
     };
 }
 
diff --git a/components/settings/categories/navigator.hpp b/components/settings/categories/navigator.hpp
index 9dcf08d299..c65dd3392e 100644
--- a/components/settings/categories/navigator.hpp
+++ b/components/settings/categories/navigator.hpp
@@ -1,8 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_NAVIGATOR_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_NAVIGATOR_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/navmeshrendermode.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -52,8 +53,7 @@ namespace Settings
         SettingValue<std::string> mRecastMeshPathPrefix{ mIndex, "Navigator", "recast mesh path prefix" };
         SettingValue<std::string> mNavMeshPathPrefix{ mIndex, "Navigator", "nav mesh path prefix" };
         SettingValue<bool> mEnableNavMeshRender{ mIndex, "Navigator", "enable nav mesh render" };
-        SettingValue<std::string> mNavMeshRenderMode{ mIndex, "Navigator", "nav mesh render mode",
-            makeEnumSanitizerString({ "area type", "update frequency" }) };
+        SettingValue<NavMeshRenderMode> mNavMeshRenderMode{ mIndex, "Navigator", "nav mesh render mode" };
         SettingValue<bool> mEnableAgentsPathsRender{ mIndex, "Navigator", "enable agents paths render" };
         SettingValue<bool> mEnableRecastMeshRender{ mIndex, "Navigator", "enable recast mesh render" };
         SettingValue<int> mMaxTilesNumber{ mIndex, "Navigator", "max tiles number", makeMaxSanitizerInt(0) };
@@ -63,6 +63,7 @@ namespace Settings
         SettingValue<bool> mEnableNavMeshDiskCache{ mIndex, "Navigator", "enable nav mesh disk cache" };
         SettingValue<bool> mWriteToNavmeshdb{ mIndex, "Navigator", "write to navmeshdb" };
         SettingValue<std::uint64_t> mMaxNavmeshdbFileSize{ mIndex, "Navigator", "max navmeshdb file size" };
+        SettingValue<bool> mWaitForAllJobsOnExit{ mIndex, "Navigator", "wait for all jobs on exit" };
     };
 }
 
diff --git a/components/settings/categories/physics.hpp b/components/settings/categories/physics.hpp
index 41005a06cf..4720708db2 100644
--- a/components/settings/categories/physics.hpp
+++ b/components/settings/categories/physics.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_PHYSICS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_PHYSICS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/postprocessing.hpp b/components/settings/categories/postprocessing.hpp
index b1e217b611..7f5ddfba3e 100644
--- a/components/settings/categories/postprocessing.hpp
+++ b/components/settings/categories/postprocessing.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_POSTPROCESSING_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_POSTPROCESSING_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -19,7 +19,7 @@ namespace Settings
         using WithIndex::WithIndex;
 
         SettingValue<bool> mEnabled{ mIndex, "Post Processing", "enabled" };
-        SettingValue<std::string> mChain{ mIndex, "Post Processing", "chain" };
+        SettingValue<std::vector<std::string>> mChain{ mIndex, "Post Processing", "chain" };
         SettingValue<float> mAutoExposureSpeed{ mIndex, "Post Processing", "auto exposure speed",
             makeMaxStrictSanitizerFloat(0.0001f) };
         SettingValue<bool> mTransparentPostpass{ mIndex, "Post Processing", "transparent postpass" };
diff --git a/components/settings/categories/saves.hpp b/components/settings/categories/saves.hpp
index e565d98564..4861c68ba9 100644
--- a/components/settings/categories/saves.hpp
+++ b/components/settings/categories/saves.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SAVES_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SAVES_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -20,7 +20,6 @@ namespace Settings
 
         SettingValue<std::string> mCharacter{ mIndex, "Saves", "character" };
         SettingValue<bool> mAutosave{ mIndex, "Saves", "autosave" };
-        SettingValue<bool> mTimeplayed{ mIndex, "Saves", "timeplayed" };
         SettingValue<int> mMaxQuicksaves{ mIndex, "Saves", "max quicksaves", makeMaxSanitizerInt(1) };
     };
 }
diff --git a/components/settings/categories/shaders.hpp b/components/settings/categories/shaders.hpp
index e7d1e34713..e6d9976e57 100644
--- a/components/settings/categories/shaders.hpp
+++ b/components/settings/categories/shaders.hpp
@@ -1,8 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADERS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADERS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/sceneutil/lightingmethod.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -30,11 +31,12 @@ namespace Settings
         SettingValue<std::string> mSpecularMapPattern{ mIndex, "Shaders", "specular map pattern" };
         SettingValue<std::string> mTerrainSpecularMapPattern{ mIndex, "Shaders", "terrain specular map pattern" };
         SettingValue<bool> mApplyLightingToEnvironmentMaps{ mIndex, "Shaders", "apply lighting to environment maps" };
-        SettingValue<std::string> mLightingMethod{ mIndex, "Shaders", "lighting method",
-            makeEnumSanitizerString({ "legacy", "shaders compatibility", "shaders" }) };
+        SettingValue<SceneUtil::LightingMethod> mLightingMethod{ mIndex, "Shaders", "lighting method" };
+        SettingValue<bool> mClassicFalloff{ mIndex, "Shaders", "classic falloff" };
         SettingValue<float> mLightBoundsMultiplier{ mIndex, "Shaders", "light bounds multiplier",
             makeClampSanitizerFloat(0, 5) };
-        SettingValue<float> mMaximumLightDistance{ mIndex, "Shaders", "maximum light distance" };
+        SettingValue<float> mMaximumLightDistance{ mIndex, "Shaders", "maximum light distance",
+            makeMaxSanitizerFloat(0) };
         SettingValue<float> mLightFadeStart{ mIndex, "Shaders", "light fade start", makeClampSanitizerFloat(0, 1) };
         SettingValue<int> mMaxLights{ mIndex, "Shaders", "max lights", makeClampSanitizerInt(2, 64) };
         SettingValue<float> mMinimumInteriorBrightness{ mIndex, "Shaders", "minimum interior brightness",
diff --git a/components/settings/categories/shadows.hpp b/components/settings/categories/shadows.hpp
index d716272bce..b6349dfd44 100644
--- a/components/settings/categories/shadows.hpp
+++ b/components/settings/categories/shadows.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADOWS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADOWS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -23,7 +23,6 @@ namespace Settings
             makeClampSanitizerInt(1, 8) };
         SettingValue<float> mMaximumShadowMapDistance{ mIndex, "Shadows", "maximum shadow map distance" };
         SettingValue<float> mShadowFadeStart{ mIndex, "Shadows", "shadow fade start", makeClampSanitizerFloat(0, 1) };
-        SettingValue<bool> mAllowShadowMapOverlap{ mIndex, "Shadows", "allow shadow map overlap" };
         SettingValue<float> mSplitPointUniformLogarithmicRatio{ mIndex, "Shadows",
             "split point uniform logarithmic ratio", makeClampSanitizerFloat(0, 1) };
         SettingValue<float> mSplitPointBias{ mIndex, "Shadows", "split point bias" };
diff --git a/components/settings/categories/sound.hpp b/components/settings/categories/sound.hpp
index f4ce7e0269..8398a38c55 100644
--- a/components/settings/categories/sound.hpp
+++ b/components/settings/categories/sound.hpp
@@ -1,16 +1,11 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SOUND_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SOUND_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/hrtfmode.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
-#include <osg/Math>
-#include <osg/Vec2f>
-#include <osg/Vec3f>
-
-#include <cstdint>
 #include <string>
-#include <string_view>
 
 namespace Settings
 {
@@ -26,8 +21,9 @@ namespace Settings
         SettingValue<float> mVoiceVolume{ mIndex, "Sound", "voice volume", makeClampSanitizerFloat(0, 1) };
         SettingValue<int> mBufferCacheMin{ mIndex, "Sound", "buffer cache min", makeMaxSanitizerInt(1) };
         SettingValue<int> mBufferCacheMax{ mIndex, "Sound", "buffer cache max", makeMaxSanitizerInt(1) };
-        SettingValue<int> mHrtfEnable{ mIndex, "Sound", "hrtf enable", makeEnumSanitizerInt({ -1, 0, 1 }) };
+        SettingValue<HrtfMode> mHrtfEnable{ mIndex, "Sound", "hrtf enable" };
         SettingValue<std::string> mHrtf{ mIndex, "Sound", "hrtf" };
+        SettingValue<bool> mCameraListener{ mIndex, "Sound", "camera listener" };
     };
 }
 
diff --git a/components/settings/categories/stereo.hpp b/components/settings/categories/stereo.hpp
index 98fae8693f..aa903c5b53 100644
--- a/components/settings/categories/stereo.hpp
+++ b/components/settings/categories/stereo.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/stereoview.hpp b/components/settings/categories/stereoview.hpp
index 1e9d35ace8..7f08d9bc35 100644
--- a/components/settings/categories/stereoview.hpp
+++ b/components/settings/categories/stereoview.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREOVIEW_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREOVIEW_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -31,14 +31,14 @@ namespace Settings
             makeClampSanitizerDouble(-1, 1) };
         SettingValue<double> mLeftEyeOrientationW{ mIndex, "Stereo View", "left eye orientation w",
             makeClampSanitizerDouble(-1, 1) };
-        SettingValue<double> mLeftEyeFovLeft{ mIndex, "Stereo View", "left eye fov left",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
-        SettingValue<double> mLeftEyeFovRight{ mIndex, "Stereo View", "left eye fov right",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
-        SettingValue<double> mLeftEyeFovUp{ mIndex, "Stereo View", "left eye fov up",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
-        SettingValue<double> mLeftEyeFovDown{ mIndex, "Stereo View", "left eye fov down",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
+        SettingValue<float> mLeftEyeFovLeft{ mIndex, "Stereo View", "left eye fov left",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
+        SettingValue<float> mLeftEyeFovRight{ mIndex, "Stereo View", "left eye fov right",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
+        SettingValue<float> mLeftEyeFovUp{ mIndex, "Stereo View", "left eye fov up",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
+        SettingValue<float> mLeftEyeFovDown{ mIndex, "Stereo View", "left eye fov down",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
         SettingValue<double> mRightEyeOffsetX{ mIndex, "Stereo View", "right eye offset x" };
         SettingValue<double> mRightEyeOffsetY{ mIndex, "Stereo View", "right eye offset y" };
         SettingValue<double> mRightEyeOffsetZ{ mIndex, "Stereo View", "right eye offset z" };
@@ -50,14 +50,14 @@ namespace Settings
             makeClampSanitizerDouble(-1, 1) };
         SettingValue<double> mRightEyeOrientationW{ mIndex, "Stereo View", "right eye orientation w",
             makeClampSanitizerDouble(-1, 1) };
-        SettingValue<double> mRightEyeFovLeft{ mIndex, "Stereo View", "right eye fov left",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
-        SettingValue<double> mRightEyeFovRight{ mIndex, "Stereo View", "right eye fov right",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
-        SettingValue<double> mRightEyeFovUp{ mIndex, "Stereo View", "right eye fov up",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
-        SettingValue<double> mRightEyeFovDown{ mIndex, "Stereo View", "right eye fov down",
-            makeClampSanitizerDouble(-osg::PI, osg::PI) };
+        SettingValue<float> mRightEyeFovLeft{ mIndex, "Stereo View", "right eye fov left",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
+        SettingValue<float> mRightEyeFovRight{ mIndex, "Stereo View", "right eye fov right",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
+        SettingValue<float> mRightEyeFovUp{ mIndex, "Stereo View", "right eye fov up",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
+        SettingValue<float> mRightEyeFovDown{ mIndex, "Stereo View", "right eye fov down",
+            makeClampSanitizerFloat(-osg::PIf, osg::PIf) };
     };
 }
 
diff --git a/components/settings/categories/terrain.hpp b/components/settings/categories/terrain.hpp
index c2eef9dc20..d366aad97b 100644
--- a/components/settings/categories/terrain.hpp
+++ b/components/settings/categories/terrain.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_TERRAIN_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_TERRAIN_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -37,6 +37,7 @@ namespace Settings
             makeMaxStrictSanitizerFloat(0) };
         SettingValue<float> mObjectPagingMinSizeCostMultiplier{ mIndex, "Terrain",
             "object paging min size cost multiplier", makeMaxStrictSanitizerFloat(0) };
+        SettingValue<bool> mWaterCulling{ mIndex, "Terrain", "water culling" };
     };
 }
 
diff --git a/components/settings/categories/video.hpp b/components/settings/categories/video.hpp
index fd6bb0018a..fed3fd8489 100644
--- a/components/settings/categories/video.hpp
+++ b/components/settings/categories/video.hpp
@@ -1,8 +1,10 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_VIDEO_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_VIDEO_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/sdlutil/vsyncmode.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
+#include <components/settings/windowmode.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -20,16 +22,15 @@ namespace Settings
 
         SettingValue<int> mResolutionX{ mIndex, "Video", "resolution x", makeMaxSanitizerInt(1) };
         SettingValue<int> mResolutionY{ mIndex, "Video", "resolution y", makeMaxSanitizerInt(1) };
-        SettingValue<int> mWindowMode{ mIndex, "Video", "window mode", makeEnumSanitizerInt({ 0, 1, 2 }) };
+        SettingValue<WindowMode> mWindowMode{ mIndex, "Video", "window mode" };
         SettingValue<int> mScreen{ mIndex, "Video", "screen", makeMaxSanitizerInt(0) };
         SettingValue<bool> mMinimizeOnFocusLoss{ mIndex, "Video", "minimize on focus loss" };
         SettingValue<bool> mWindowBorder{ mIndex, "Video", "window border" };
         SettingValue<int> mAntialiasing{ mIndex, "Video", "antialiasing", makeMaxSanitizerInt(0) };
-        SettingValue<int> mVsyncMode{ mIndex, "Video", "vsync mode", makeEnumSanitizerInt({ 0, 1, 2 }) };
+        SettingValue<SDLUtil::VSyncMode> mVsyncMode{ mIndex, "Video", "vsync mode" };
         SettingValue<float> mFramerateLimit{ mIndex, "Video", "framerate limit", makeMaxSanitizerFloat(0) };
         SettingValue<float> mContrast{ mIndex, "Video", "contrast", makeMaxStrictSanitizerFloat(0) };
         SettingValue<float> mGamma{ mIndex, "Video", "gamma", makeMaxStrictSanitizerFloat(0) };
-        SettingValue<std::string> mScreenshotType{ mIndex, "Video", "screenshot type" };
     };
 }
 
diff --git a/components/settings/categories/water.hpp b/components/settings/categories/water.hpp
index 02b5f0c5dd..63adce4ee3 100644
--- a/components/settings/categories/water.hpp
+++ b/components/settings/categories/water.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WATER_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WATER_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -21,12 +21,13 @@ namespace Settings
         SettingValue<bool> mShader{ mIndex, "Water", "shader" };
         SettingValue<int> mRttSize{ mIndex, "Water", "rtt size", makeMaxSanitizerInt(1) };
         SettingValue<bool> mRefraction{ mIndex, "Water", "refraction" };
-        SettingValue<int> mReflectionDetail{ mIndex, "Water", "reflection detail",
-            makeEnumSanitizerInt({ 0, 1, 2, 3, 4, 5 }) };
-        SettingValue<int> mRainRippleDetail{ mIndex, "Water", "rain ripple detail", makeEnumSanitizerInt({ 0, 1, 2 }) };
+        SettingValue<int> mReflectionDetail{ mIndex, "Water", "reflection detail", makeClampSanitizerInt(0, 5) };
+        SettingValue<int> mRainRippleDetail{ mIndex, "Water", "rain ripple detail", makeClampSanitizerInt(0, 2) };
         SettingValue<float> mSmallFeatureCullingPixelSize{ mIndex, "Water", "small feature culling pixel size",
             makeMaxStrictSanitizerFloat(0) };
         SettingValue<float> mRefractionScale{ mIndex, "Water", "refraction scale", makeClampSanitizerFloat(0, 1) };
+        SettingValue<bool> mSunlightScattering{ mIndex, "Water", "sunlight scattering" };
+        SettingValue<bool> mWobblyShores{ mIndex, "Water", "wobbly shores" };
     };
 }
 
diff --git a/components/settings/categories/windows.hpp b/components/settings/categories/windows.hpp
index 77927c1204..2f22e751e6 100644
--- a/components/settings/categories/windows.hpp
+++ b/components/settings/categories/windows.hpp
@@ -1,8 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WINDOWS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WINDOWS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
@@ -161,6 +160,15 @@ namespace Settings
         SettingValue<float> mPostprocessorMaximizedW{ mIndex, "Windows", "postprocessor maximized w" };
         SettingValue<float> mPostprocessorMaximizedH{ mIndex, "Windows", "postprocessor maximized h" };
         SettingValue<bool> mPostprocessorMaximized{ mIndex, "Windows", "postprocessor maximized" };
+        SettingValue<float> mDebugX{ mIndex, "Windows", "debug x" };
+        SettingValue<float> mDebugY{ mIndex, "Windows", "debug y" };
+        SettingValue<float> mDebugW{ mIndex, "Windows", "debug w" };
+        SettingValue<float> mDebugH{ mIndex, "Windows", "debug h" };
+        SettingValue<float> mDebugMaximizedX{ mIndex, "Windows", "debug maximized x" };
+        SettingValue<float> mDebugMaximizedY{ mIndex, "Windows", "debug maximized y" };
+        SettingValue<float> mDebugMaximizedW{ mIndex, "Windows", "debug maximized w" };
+        SettingValue<float> mDebugMaximizedH{ mIndex, "Windows", "debug maximized h" };
+        SettingValue<bool> mDebugMaximized{ mIndex, "Windows", "debug maximized" };
     };
 }
 
diff --git a/components/settings/hrtfmode.hpp b/components/settings/hrtfmode.hpp
new file mode 100644
index 0000000000..9b741922b5
--- /dev/null
+++ b/components/settings/hrtfmode.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_COMPONENTS_SETTINGS_HRTFMODE_H
+#define OPENMW_COMPONENTS_SETTINGS_HRTFMODE_H
+
+namespace Settings
+{
+    enum class HrtfMode
+    {
+        Disable,
+        Enable,
+        Auto,
+    };
+}
+
+#endif
diff --git a/components/settings/navmeshrendermode.hpp b/components/settings/navmeshrendermode.hpp
new file mode 100644
index 0000000000..416e2afab1
--- /dev/null
+++ b/components/settings/navmeshrendermode.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_COMPONENTS_SETTINGS_NAVMESHRENDERMODE_H
+#define OPENMW_COMPONENTS_SETTINGS_NAVMESHRENDERMODE_H
+
+namespace Settings
+{
+    enum class NavMeshRenderMode
+    {
+        AreaType,
+        UpdateFrequency,
+    };
+}
+
+#endif
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index 5ec41c5f4b..4f42e109b6 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -77,7 +77,7 @@ void Settings::SettingsFileParser::loadSettingsFile(
         Misc::StringUtils::trim(value);
 
         if (overrideExisting)
-            settings[std::make_pair(currentCategory, setting)] = value;
+            settings[std::make_pair(currentCategory, setting)] = std::move(value);
         else if (settings.insert(std::make_pair(std::make_pair(currentCategory, setting), value)).second == false)
             fail(std::string("duplicate setting: [" + currentCategory + "] " + setting));
     }
@@ -287,13 +287,24 @@ void Settings::SettingsFileParser::saveSettingsFile(
     // exist), start the newly created file with a helpful comment.
     if (!existing)
     {
-        ostream << "# This is the OpenMW user 'settings.cfg' file.  This file only contains" << std::endl;
+        const std::string filename = Files::pathToUnicodeString(file.filename());
+        ostream << "# This is the OpenMW user '" << filename << "' file.  This file only contains" << std::endl;
         ostream << "# explicitly changed settings.  If you would like to revert a setting" << std::endl;
-        ostream << "# to its default, simply remove it from this file.  For available" << std::endl;
-        ostream << "# settings, see the file 'files/settings-default.cfg' in our source repo or the documentation at:"
-                << std::endl;
-        ostream << "#" << std::endl;
-        ostream << "#   https://openmw.readthedocs.io/en/master/reference/modding/settings/index.html" << std::endl;
+        ostream << "# to its default, simply remove it from this file." << std::endl;
+
+        if (filename == "settings.cfg")
+        {
+            ostream << "# For available settings, see the file 'files/settings-default.cfg' in our source repo or the "
+                       "documentation at:"
+                    << std::endl;
+            ostream << "#" << std::endl;
+            ostream << "#   https://openmw.readthedocs.io/en/master/reference/modding/settings/index.html" << std::endl;
+        }
+        else if (filename == "openmw-cs.cfg")
+        {
+            ostream << "# For available settings, see the file 'apps/opencs/model/prefs/values.hpp' in our source repo."
+                    << std::endl;
+        }
     }
 
     // We still have one more thing to do before we're completely done writing the file.
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 0b5260fb8e..ed73f8a800 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -16,6 +16,7 @@
 
 #endif
 
+#include <components/debug/debuglog.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/conversion.hpp>
@@ -87,6 +88,37 @@ namespace Settings
             stream << value;
             return stream.str();
         }
+
+        std::string toString(SceneUtil::LightingMethod value)
+        {
+            switch (value)
+            {
+                case SceneUtil::LightingMethod::FFP:
+                    return "legacy";
+                case SceneUtil::LightingMethod::PerObjectUniform:
+                    return "shaders compatibility";
+                case SceneUtil::LightingMethod::SingleUBO:
+                    return "shaders";
+            }
+
+            throw std::invalid_argument("Invalid LightingMethod value: " + std::to_string(static_cast<int>(value)));
+        }
+
+        int toInt(HrtfMode value)
+        {
+            switch (value)
+            {
+                case HrtfMode::Auto:
+                    return -1;
+                case HrtfMode::Disable:
+                    return 0;
+                case HrtfMode::Enable:
+                    return 1;
+            }
+
+            Log(Debug::Warning) << "Invalid HRTF mode value: " << static_cast<int>(value) << ", fallback to auto (-1)";
+            return -1;
+        }
     }
 
     CategorySettingValueMap Manager::mDefaultSettings = CategorySettingValueMap();
@@ -96,6 +128,8 @@ namespace Settings
 
     void Manager::clear()
     {
+        sInitialized.clear();
+        StaticValues::clear();
         mDefaultSettings.clear();
         mUserSettings.clear();
         mChangedSettings.clear();
@@ -459,6 +493,26 @@ namespace Settings
         setString(setting, category, value.print());
     }
 
+    void Manager::set(std::string_view setting, std::string_view category, SceneUtil::LightingMethod value)
+    {
+        setString(setting, category, toString(value));
+    }
+
+    void Manager::set(std::string_view setting, std::string_view category, HrtfMode value)
+    {
+        setInt(setting, category, toInt(value));
+    }
+
+    void Manager::set(std::string_view setting, std::string_view category, WindowMode value)
+    {
+        setInt(setting, category, static_cast<int>(value));
+    }
+
+    void Manager::set(std::string_view setting, std::string_view category, SDLUtil::VSyncMode value)
+    {
+        setInt(setting, category, static_cast<int>(value));
+    }
+
     void Manager::recordInit(std::string_view setting, std::string_view category)
     {
         sInitialized.emplace(category, setting);
@@ -481,4 +535,28 @@ namespace Settings
 
         throw std::runtime_error("Invalid gyroscope axis: " + std::string(value));
     }
+
+    NavMeshRenderMode parseNavMeshRenderMode(std::string_view value)
+    {
+        if (value == "area type")
+            return NavMeshRenderMode::AreaType;
+        if (value == "update frequency")
+            return NavMeshRenderMode::UpdateFrequency;
+
+        throw std::invalid_argument("Invalid navigation mesh rendering mode: " + std::string(value));
+    }
+
+    SceneUtil::LightingMethod parseLightingMethod(std::string_view value)
+    {
+        if (value == "legacy")
+            return SceneUtil::LightingMethod::FFP;
+        if (value == "shaders compatibility")
+            return SceneUtil::LightingMethod::PerObjectUniform;
+        if (value == "shaders")
+            return SceneUtil::LightingMethod::SingleUBO;
+
+        constexpr const char* fallback = "shaders compatibility";
+        Log(Debug::Warning) << "Unknown lighting method '" << value << "', returning fallback '" << fallback << "'";
+        return SceneUtil::LightingMethod::PerObjectUniform;
+    }
 }
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index c9a5dbc6ea..d269b5cea3 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -3,8 +3,14 @@
 
 #include "categories.hpp"
 #include "gyroscopeaxis.hpp"
+#include "hrtfmode.hpp"
+#include "navmeshrendermode.hpp"
+#include "windowmode.hpp"
 
-#include "components/detournavigator/collisionshapetype.hpp"
+#include <components/detournavigator/collisionshapetype.hpp>
+#include <components/sceneutil/lightingmethod.hpp>
+#include <components/sdlutil/vsyncmode.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include <filesystem>
 #include <set>
@@ -24,13 +30,6 @@ namespace Files
 
 namespace Settings
 {
-    enum class WindowMode
-    {
-        Fullscreen = 0,
-        WindowedFullscreen,
-        Windowed
-    };
-
     ///
     /// \brief Settings management (can change during runtime)
     ///
@@ -78,6 +77,15 @@ namespace Settings
         static osg::Vec2f getVector2(std::string_view setting, std::string_view category);
         static osg::Vec3f getVector3(std::string_view setting, std::string_view category);
 
+        template <class T>
+        static T getOrDefault(std::string_view setting, std::string_view category, const T& defaultValue)
+        {
+            const auto key = std::make_pair(category, setting);
+            if (!mUserSettings.contains(key) && !mDefaultSettings.contains(key))
+                return defaultValue;
+            return get<T>(setting, category);
+        }
+
         template <class T>
         static T get(std::string_view setting, std::string_view category)
         {
@@ -109,6 +117,10 @@ namespace Settings
         static void set(std::string_view setting, std::string_view category, DetourNavigator::CollisionShapeType value);
         static void set(std::string_view setting, std::string_view category, const std::vector<std::string>& value);
         static void set(std::string_view setting, std::string_view category, const MyGUI::Colour& value);
+        static void set(std::string_view setting, std::string_view category, SceneUtil::LightingMethod value);
+        static void set(std::string_view setting, std::string_view category, HrtfMode value);
+        static void set(std::string_view setting, std::string_view category, WindowMode value);
+        static void set(std::string_view setting, std::string_view category, SDLUtil::VSyncMode value);
 
     private:
         static std::set<std::pair<std::string_view, std::string_view>> sInitialized;
@@ -206,6 +218,59 @@ namespace Settings
     {
         return parseGyroscopeAxis(getString(setting, category));
     }
+
+    NavMeshRenderMode parseNavMeshRenderMode(std::string_view value);
+
+    template <>
+    inline NavMeshRenderMode Manager::getImpl<NavMeshRenderMode>(std::string_view setting, std::string_view category)
+    {
+        return parseNavMeshRenderMode(getString(setting, category));
+    }
+
+    SceneUtil::LightingMethod parseLightingMethod(std::string_view value);
+
+    template <>
+    inline SceneUtil::LightingMethod Manager::getImpl<SceneUtil::LightingMethod>(
+        std::string_view setting, std::string_view category)
+    {
+        return parseLightingMethod(getString(setting, category));
+    }
+
+    template <>
+    inline HrtfMode Manager::getImpl<HrtfMode>(std::string_view setting, std::string_view category)
+    {
+        const int value = getInt(setting, category);
+        if (value < 0)
+            return HrtfMode::Auto;
+        if (value > 0)
+            return HrtfMode::Enable;
+        return HrtfMode::Disable;
+    }
+
+    template <>
+    inline WindowMode Manager::getImpl<WindowMode>(std::string_view setting, std::string_view category)
+    {
+        const int value = getInt(setting, category);
+        if (value < 0 || 2 < value)
+            return WindowMode::Fullscreen;
+        return static_cast<WindowMode>(value);
+    }
+
+    template <>
+    inline SDLUtil::VSyncMode Manager::getImpl<SDLUtil::VSyncMode>(std::string_view setting, std::string_view category)
+    {
+        const int value = getInt(setting, category);
+        if (value < 0 || 2 < value)
+            return SDLUtil::VSyncMode::Disabled;
+        return static_cast<SDLUtil::VSyncMode>(value);
+    }
+
+    template <>
+    inline VFS::Path::Normalized Manager::getImpl<VFS::Path::Normalized>(
+        std::string_view setting, std::string_view category)
+    {
+        return VFS::Path::Normalized(getString(setting, category));
+    }
 }
 
 #endif // COMPONENTS_SETTINGS_H
diff --git a/components/settings/settingvalue.hpp b/components/settings/settingvalue.hpp
index 540ef1fe0b..addc557138 100644
--- a/components/settings/settingvalue.hpp
+++ b/components/settings/settingvalue.hpp
@@ -2,11 +2,13 @@
 #define OPENMW_COMPONENTS_SETTINGS_SETTINGVALUE_H
 
 #include "gyroscopeaxis.hpp"
+#include "navmeshrendermode.hpp"
 #include "sanitizer.hpp"
 #include "settings.hpp"
 
-#include "components/debug/debuglog.hpp"
-#include "components/detournavigator/collisionshapetype.hpp"
+#include <components/debug/debuglog.hpp>
+#include <components/detournavigator/collisionshapetype.hpp>
+#include <components/vfs/pathutil.hpp>
 
 #include <osg/io_utils>
 
@@ -38,6 +40,12 @@ namespace Settings
         StringArray,
         MyGuiColour,
         GyroscopeAxis,
+        NavMeshRenderMode,
+        LightingMethod,
+        HrtfMode,
+        WindowMode,
+        VSyncMode,
+        NormalizedPath,
     };
 
     template <class T>
@@ -139,6 +147,42 @@ namespace Settings
         return SettingValueType::GyroscopeAxis;
     }
 
+    template <>
+    inline constexpr SettingValueType getSettingValueType<NavMeshRenderMode>()
+    {
+        return SettingValueType::NavMeshRenderMode;
+    }
+
+    template <>
+    inline constexpr SettingValueType getSettingValueType<SceneUtil::LightingMethod>()
+    {
+        return SettingValueType::LightingMethod;
+    }
+
+    template <>
+    inline constexpr SettingValueType getSettingValueType<HrtfMode>()
+    {
+        return SettingValueType::HrtfMode;
+    }
+
+    template <>
+    inline constexpr SettingValueType getSettingValueType<WindowMode>()
+    {
+        return SettingValueType::WindowMode;
+    }
+
+    template <>
+    inline constexpr SettingValueType getSettingValueType<SDLUtil::VSyncMode>()
+    {
+        return SettingValueType::VSyncMode;
+    }
+
+    template <>
+    inline constexpr SettingValueType getSettingValueType<VFS::Path::Normalized>()
+    {
+        return SettingValueType::NormalizedPath;
+    }
+
     inline constexpr std::string_view getSettingValueTypeName(SettingValueType type)
     {
         switch (type)
@@ -175,6 +219,18 @@ namespace Settings
                 return "colour";
             case SettingValueType::GyroscopeAxis:
                 return "gyroscope axis";
+            case SettingValueType::NavMeshRenderMode:
+                return "navmesh render mode";
+            case SettingValueType::LightingMethod:
+                return "lighting method";
+            case SettingValueType::HrtfMode:
+                return "hrtf mode";
+            case SettingValueType::WindowMode:
+                return "window mode";
+            case SettingValueType::VSyncMode:
+                return "vsync mode";
+            case SettingValueType::NormalizedPath:
+                return "normalized path";
         }
         return "unsupported";
     }
@@ -280,6 +336,15 @@ namespace Settings
         {
         }
 
+        explicit SettingValue(Index& index, std::string_view category, std::string_view name, T&& defaultValue,
+            std::unique_ptr<const Sanitizer<T>>&& sanitizer = nullptr)
+            : BaseSettingValue(getSettingValueType<T>(), category, name, index)
+            , mSanitizer(std::move(sanitizer))
+            , mDefaultValue(sanitize(defaultValue))
+            , mValue(sanitize(Settings::Manager::getOrDefault<T>(mName, mCategory, mDefaultValue)))
+        {
+        }
+
         SettingValue(SettingValue&& other)
             : BaseSettingValue(std::move(other))
             , mSanitizer(std::move(other.mSanitizer))
diff --git a/components/settings/values.cpp b/components/settings/values.cpp
index 66460beb9a..a6bbec3df7 100644
--- a/components/settings/values.cpp
+++ b/components/settings/values.cpp
@@ -4,24 +4,29 @@
 
 namespace Settings
 {
-    Index* StaticValues::sIndex = nullptr;
-    Values* StaticValues::sValues = nullptr;
+    std::unique_ptr<Index> StaticValues::sIndex;
+    std::unique_ptr<Values> StaticValues::sDefaultValues;
+    std::unique_ptr<Values> StaticValues::sValues;
 
     void StaticValues::initDefaults()
     {
-        if (sValues != nullptr)
-            throw std::logic_error("Default settings already initialized");
-        static Index index;
-        static Values values(index);
-        sIndex = &index;
-        sValues = &values;
+        if (sDefaultValues != nullptr)
+            throw std::logic_error("Default settings are already initialized");
+        sIndex = std::make_unique<Index>();
+        sDefaultValues = std::make_unique<Values>(*sIndex);
     }
 
     void StaticValues::init()
     {
-        if (sValues == nullptr)
+        if (sDefaultValues == nullptr)
             throw std::logic_error("Default settings are not initialized");
-        static Values values(std::move(*sValues));
-        sValues = &values;
+        sValues = std::make_unique<Values>(std::move(*sDefaultValues));
+    }
+
+    void StaticValues::clear()
+    {
+        sValues = nullptr;
+        sDefaultValues = nullptr;
+        sIndex = nullptr;
     }
 }
diff --git a/components/settings/values.hpp b/components/settings/values.hpp
index 323be2e866..af28dc16f8 100644
--- a/components/settings/values.hpp
+++ b/components/settings/values.hpp
@@ -29,6 +29,7 @@
 #include "settingvalue.hpp"
 
 #include <cassert>
+#include <memory>
 #include <string_view>
 
 namespace Settings
@@ -71,9 +72,12 @@ namespace Settings
 
         static void init();
 
+        static void clear();
+
     private:
-        static Index* sIndex;
-        static Values* sValues;
+        static std::unique_ptr<Index> sIndex;
+        static std::unique_ptr<Values> sDefaultValues;
+        static std::unique_ptr<Values> sValues;
 
         friend Values& values();
 
diff --git a/components/settings/windowmode.hpp b/components/settings/windowmode.hpp
new file mode 100644
index 0000000000..96a81059f4
--- /dev/null
+++ b/components/settings/windowmode.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_COMPONENTS_SETTINGS_WINDOWMODE_H
+#define OPENMW_COMPONENTS_SETTINGS_WINDOWMODE_H
+
+namespace Settings
+{
+    enum class WindowMode
+    {
+        Fullscreen = 0,
+        WindowedFullscreen = 1,
+        Windowed = 2,
+    };
+}
+
+#endif
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 612552dabc..96d6346149 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -503,7 +503,7 @@ namespace Shader
                         {
                             break;
                         }
-                        shaderSource = source;
+                        shaderSource = std::move(source);
 
                         std::vector<std::string> linkedShaderNames;
                         if (!Manager.createSourceFromTemplate(
@@ -554,7 +554,7 @@ namespace Shader
             if (!addLineDirectivesAfterConditionalBlocks(source)
                 || !parseIncludes(mPath, source, templateName, fileNumber, {}, insertedPaths))
                 return nullptr;
-            mHotReloadManager->templateIncludedFiles[templateName] = insertedPaths;
+            mHotReloadManager->templateIncludedFiles[templateName] = std::move(insertedPaths);
             templateIt = mShaderTemplates.insert(std::make_pair(templateName, source)).first;
         }
 
@@ -597,7 +597,7 @@ namespace Shader
         if (!vert || !frag)
             throw std::runtime_error("failed initializing shader: " + templateName);
 
-        return getProgram(vert, frag, programTemplate);
+        return getProgram(std::move(vert), std::move(frag), programTemplate);
     }
 
     osg::ref_ptr<osg::Program> ShaderManager::getProgram(osg::ref_ptr<osg::Shader> vertexShader,
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 0112a3a699..d97276576f 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -22,9 +22,12 @@
 #include <components/misc/osguservalues.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/sceneutil/glextensions.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>
+#include <components/sceneutil/texturetype.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/settings/settings.hpp>
 #include <components/stereo/stereomanager.hpp>
 #include <components/vfs/manager.hpp>
@@ -181,7 +184,9 @@ namespace Shader
         , mAlphaBlend(false)
         , mBlendFuncOverridden(false)
         , mAdditiveBlending(false)
+        , mDiffuseHeight(false)
         , mNormalHeight(false)
+        , mReconstructNormalZ(false)
         , mTexStageRequiringTangents(-1)
         , mSoftParticles(false)
         , mNode(nullptr)
@@ -325,7 +330,7 @@ namespace Shader
                     const osg::Texture* texture = attr->asTexture();
                     if (texture)
                     {
-                        std::string texName = texture->getName();
+                        std::string texName = SceneUtil::getTextureType(*stateset, *texture, unit);
                         if ((texName.empty() || !isTextureNameRecognized(texName)) && unit == 0)
                             texName = "diffuseMap";
 
@@ -350,7 +355,17 @@ namespace Shader
                                 normalMap = texture;
                             }
                             else if (texName == "diffuseMap")
+                            {
+                                int applyMode;
+                                // Oblivion parallax
+                                if (node.getUserValue("applyMode", applyMode) && applyMode == 4)
+                                {
+                                    mRequirements.back().mShaderRequired = true;
+                                    mRequirements.back().mDiffuseHeight = true;
+                                    mRequirements.back().mTexStageRequiringTangents = unit;
+                                }
                                 diffuseMap = texture;
+                            }
                             else if (texName == "specularMap")
                                 specularMap = texture;
                             else if (texName == "bumpMap")
@@ -389,17 +404,19 @@ namespace Shader
                 bool normalHeight = false;
                 std::string normalHeightMap = normalMapFileName;
                 Misc::StringUtils::replaceLast(normalHeightMap, ".", mNormalHeightMapPattern + ".");
-                if (mImageManager.getVFS()->exists(normalHeightMap))
+                const VFS::Path::Normalized normalHeightMapPath(normalHeightMap);
+                if (mImageManager.getVFS()->exists(normalHeightMapPath))
                 {
-                    image = mImageManager.getImage(normalHeightMap);
+                    image = mImageManager.getImage(normalHeightMapPath);
                     normalHeight = true;
                 }
                 else
                 {
                     Misc::StringUtils::replaceLast(normalMapFileName, ".", mNormalMapPattern + ".");
-                    if (mImageManager.getVFS()->exists(normalMapFileName))
+                    const VFS::Path::Normalized normalMapPath(normalMapFileName);
+                    if (mImageManager.getVFS()->exists(normalMapPath))
                     {
-                        image = mImageManager.getImage(normalMapFileName);
+                        image = mImageManager.getImage(normalMapPath);
                     }
                 }
                 // Avoid using the auto-detected normal map if it's already being used as a bump map.
@@ -416,25 +433,43 @@ namespace Shader
                     normalMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
                     normalMapTex->setFilter(osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
                     normalMapTex->setMaxAnisotropy(diffuseMap->getMaxAnisotropy());
-                    normalMapTex->setName("normalMap");
+                    normalMap = normalMapTex;
 
                     int unit = texAttributes.size();
                     if (!writableStateSet)
                         writableStateSet = getWritableStateSet(node);
                     writableStateSet->setTextureAttributeAndModes(unit, normalMapTex, osg::StateAttribute::ON);
+                    writableStateSet->setTextureAttributeAndModes(
+                        unit, new SceneUtil::TextureType("normalMap"), osg::StateAttribute::ON);
                     mRequirements.back().mTextures[unit] = "normalMap";
                     mRequirements.back().mTexStageRequiringTangents = unit;
                     mRequirements.back().mShaderRequired = true;
                     mRequirements.back().mNormalHeight = normalHeight;
                 }
             }
+
+            if (normalMap != nullptr && normalMap->getImage(0))
+            {
+                // Special handling for red-green normal maps (e.g. BC5 or R8G8)
+                switch (SceneUtil::computeUnsizedPixelFormat(normalMap->getImage(0)->getPixelFormat()))
+                {
+                    case GL_RG:
+                    case GL_RG_INTEGER:
+                    {
+                        mRequirements.back().mReconstructNormalZ = true;
+                        mRequirements.back().mNormalHeight = false;
+                    }
+                }
+            }
+
             if (mAutoUseSpecularMaps && diffuseMap != nullptr && specularMap == nullptr && diffuseMap->getImage(0))
             {
                 std::string specularMapFileName = diffuseMap->getImage(0)->getFileName();
                 Misc::StringUtils::replaceLast(specularMapFileName, ".", mSpecularMapPattern + ".");
-                if (mImageManager.getVFS()->exists(specularMapFileName))
+                const VFS::Path::Normalized specularMapPath(specularMapFileName);
+                if (mImageManager.getVFS()->exists(specularMapPath))
                 {
-                    osg::ref_ptr<osg::Image> image(mImageManager.getImage(specularMapFileName));
+                    osg::ref_ptr<osg::Image> image(mImageManager.getImage(specularMapPath));
                     osg::ref_ptr<osg::Texture2D> specularMapTex(new osg::Texture2D(image));
                     specularMapTex->setTextureSize(image->s(), image->t());
                     specularMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
@@ -444,12 +479,13 @@ namespace Shader
                     specularMapTex->setFilter(
                         osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
                     specularMapTex->setMaxAnisotropy(diffuseMap->getMaxAnisotropy());
-                    specularMapTex->setName("specularMap");
 
                     int unit = texAttributes.size();
                     if (!writableStateSet)
                         writableStateSet = getWritableStateSet(node);
                     writableStateSet->setTextureAttributeAndModes(unit, specularMapTex, osg::StateAttribute::ON);
+                    writableStateSet->setTextureAttributeAndModes(
+                        unit, new SceneUtil::TextureType("specularMap"), osg::StateAttribute::ON);
                     mRequirements.back().mTextures[unit] = "specularMap";
                     mRequirements.back().mShaderRequired = true;
                 }
@@ -615,7 +651,9 @@ namespace Shader
             addedState->addUniform("useDiffuseMapForShadowAlpha");
         }
 
+        defineMap["diffuseParallax"] = reqs.mDiffuseHeight ? "1" : "0";
         defineMap["parallax"] = reqs.mNormalHeight ? "1" : "0";
+        defineMap["reconstructNormalZ"] = reqs.mReconstructNormalZ ? "1" : "0";
 
         writableStateSet->addUniform(new osg::Uniform("colorMode", reqs.mColorMode));
         addedState->addUniform("colorMode");
@@ -664,8 +702,7 @@ namespace Shader
                 defineMap["adjustCoverage"] = "1";
 
             // Preventing alpha tested stuff shrinking as lower mip levels are used requires knowing the texture size
-            osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
-            if (exts && exts->isGpuShader4Supported)
+            if (SceneUtil::getGLExtensions().isGpuShader4Supported)
                 defineMap["useGPUShader4"] = "1";
             // We could fall back to a texture size uniform if EXT_gpu_shader4 is missing
         }
@@ -680,14 +717,23 @@ namespace Shader
 
         bool particleOcclusion = false;
         node.getUserValue("particleOcclusion", particleOcclusion);
-        defineMap["particleOcclusion"]
-            = particleOcclusion && Settings::Manager::getBool("weather particle occlusion", "Shaders") ? "1" : "0";
+        defineMap["particleOcclusion"] = particleOcclusion && mWeatherParticleOcclusion ? "1" : "0";
 
         if (reqs.mAlphaBlend && mSupportsNormalsRT)
         {
             if (reqs.mSoftParticles)
                 defineMap["disableNormals"] = "1";
-            writableStateSet->setAttribute(new osg::ColorMaski(1, false, false, false, false));
+            auto colorMask = new osg::ColorMaski(1, false, false, false, false);
+            writableStateSet->setAttribute(colorMask);
+            addedState->setAttribute(colorMask);
+        }
+
+        if (reqs.mSoftParticles)
+        {
+            const int unitSoftEffect
+                = mShaderManager.reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
+            writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", unitSoftEffect));
+            addedState->addUniform("opaqueDepthTex");
         }
 
         if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT
@@ -719,7 +765,7 @@ namespace Shader
 
         auto program = mShaderManager.getProgram(shaderPrefix, defineMap, mProgramTemplate);
         writableStateSet->setAttributeAndModes(program, osg::StateAttribute::ON);
-        addedState->setAttributeAndModes(program);
+        addedState->setAttributeAndModes(std::move(program));
 
         for (const auto& [unit, name] : reqs.mTextures)
         {
@@ -843,12 +889,29 @@ namespace Shader
         if (mAllowedToModifyStateSets && (useShader || generateTangents))
         {
             // make sure that all UV sets are there
-            for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end();
-                 ++it)
+            // it's not safe to assume there's one for slot zero, so try and use one from another slot if possible
+            // if there are none at all, bail.
+            // the TangentSpaceGenerator would bail, but getTangentArray would give an empty array, which is enough to
+            // bypass null checks, but feeds the driver a bad pointer
+            if (sourceGeometry.getTexCoordArray(0) == nullptr)
             {
-                if (sourceGeometry.getTexCoordArray(it->first) == nullptr)
+                for (const auto& array : sourceGeometry.getTexCoordArrayList())
                 {
-                    sourceGeometry.setTexCoordArray(it->first, sourceGeometry.getTexCoordArray(0));
+                    if (array)
+                    {
+                        sourceGeometry.setTexCoordArray(0, array);
+                        break;
+                    }
+                }
+                if (sourceGeometry.getTexCoordArray(0) == nullptr)
+                    return changed;
+            }
+
+            for (const auto& [unit, name] : reqs.mTextures)
+            {
+                if (sourceGeometry.getTexCoordArray(unit) == nullptr)
+                {
+                    sourceGeometry.setTexCoordArray(unit, sourceGeometry.getTexCoordArray(0));
                     changed = true;
                 }
             }
@@ -913,13 +976,13 @@ namespace Shader
         {
             osg::ref_ptr<osg::Geometry> sourceGeometry = rig->getSourceGeometry();
             if (sourceGeometry && adjustGeometry(*sourceGeometry, reqs))
-                rig->setSourceGeometry(sourceGeometry);
+                rig->setSourceGeometry(std::move(sourceGeometry));
         }
         else if (auto morph = dynamic_cast<SceneUtil::MorphGeometry*>(&drawable))
         {
             osg::ref_ptr<osg::Geometry> sourceGeometry = morph->getSourceGeometry();
             if (sourceGeometry && adjustGeometry(*sourceGeometry, reqs))
-                morph->setSourceGeometry(sourceGeometry);
+                morph->setSourceGeometry(std::move(sourceGeometry));
         }
         else if (auto osgaRig = dynamic_cast<SceneUtil::RigGeometryHolder*>(&drawable))
         {
@@ -927,8 +990,8 @@ namespace Shader
             osg::ref_ptr<osg::Geometry> sourceGeometry = sourceOsgaRigGeometry->getSourceGeometry();
             if (sourceGeometry && adjustGeometry(*sourceGeometry, reqs))
             {
-                sourceOsgaRigGeometry->setSourceGeometry(sourceGeometry);
-                osgaRig->setSourceRigGeometry(sourceOsgaRigGeometry);
+                sourceOsgaRigGeometry->setSourceGeometry(std::move(sourceGeometry));
+                osgaRig->setSourceRigGeometry(std::move(sourceOsgaRigGeometry));
             }
         }
 
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 0bd8bb9cd7..9ce0819bd3 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -51,6 +51,8 @@ namespace Shader
 
         void setSupportsNormalsRT(bool supports) { mSupportsNormalsRT = supports; }
 
+        void setWeatherParticleOcclusion(bool value) { mWeatherParticleOcclusion = value; }
+
         void apply(osg::Node& node) override;
 
         void apply(osg::Drawable& drawable) override;
@@ -78,6 +80,7 @@ namespace Shader
         bool mAdjustCoverageForAlphaTest;
 
         bool mSupportsNormalsRT;
+        bool mWeatherParticleOcclusion = false;
 
         ShaderManager& mShaderManager;
         Resource::ImageManager& mImageManager;
@@ -105,7 +108,9 @@ namespace Shader
             bool mBlendFuncOverridden;
             bool mAdditiveBlending;
 
+            bool mDiffuseHeight; // true if diffuse map has height info in alpha channel
             bool mNormalHeight; // true if normal map has height info in alpha channel
+            bool mReconstructNormalZ; // used for red-green normal maps (e.g. BC5)
 
             // -1 == no tangents required
             int mTexStageRequiringTangents;
diff --git a/components/stereo/frustum.cpp b/components/stereo/frustum.cpp
index cf8a7e8c30..a35beba7dd 100644
--- a/components/stereo/frustum.cpp
+++ b/components/stereo/frustum.cpp
@@ -85,7 +85,7 @@ namespace Stereo
         }
     }
 
-    StereoFrustumManager::StereoFrustumManager(osg::Camera* camera)
+    StereoFrustumManager::StereoFrustumManager(bool sharedShadowMaps, osg::Camera* camera)
         : mCamera(camera)
         , mShadowTechnique(nullptr)
         , mShadowFrustumCallback(nullptr)
@@ -95,7 +95,7 @@ namespace Stereo
             mMultiviewFrustumCallback = std::make_unique<MultiviewFrustumCallback>(this, camera);
         }
 
-        if (Settings::Manager::getBool("shared shadow maps", "Stereo"))
+        if (sharedShadowMaps)
         {
             mShadowFrustumCallback = new ShadowFrustumCallback(this);
             auto* renderer = static_cast<osgViewer::Renderer*>(mCamera->getRenderer());
diff --git a/components/stereo/frustum.hpp b/components/stereo/frustum.hpp
index c3abdd87d2..35e3adf95a 100644
--- a/components/stereo/frustum.hpp
+++ b/components/stereo/frustum.hpp
@@ -45,7 +45,7 @@ namespace Stereo
     class StereoFrustumManager
     {
     public:
-        StereoFrustumManager(osg::Camera* camera);
+        StereoFrustumManager(bool sharedShadowMaps, osg::Camera* camera);
         ~StereoFrustumManager();
 
         void update(std::array<osg::Matrix, 2> projections);
diff --git a/components/stereo/multiview.cpp b/components/stereo/multiview.cpp
index 047a52747b..a2f6cfd626 100644
--- a/components/stereo/multiview.cpp
+++ b/components/stereo/multiview.cpp
@@ -124,12 +124,12 @@ namespace Stereo
         }
     }
 
-    void setVertexBufferHint(bool enableMultiview)
+    void setVertexBufferHint(bool enableMultiview, bool allowDisplayListsForMultiview)
     {
         if (getStereo() && enableMultiview)
         {
             auto* ds = osg::DisplaySettings::instance().get();
-            if (!Settings::Manager::getBool("allow display lists for multiview", "Stereo")
+            if (!allowDisplayListsForMultiview
                 && ds->getVertexBufferHint() == osg::DisplaySettings::VertexBufferHint::NO_PREFERENCE)
             {
                 // Note that this only works if this code is executed before realize() is called on the viewer.
diff --git a/components/stereo/multiview.hpp b/components/stereo/multiview.hpp
index fa69afc7a1..a9d84eae85 100644
--- a/components/stereo/multiview.hpp
+++ b/components/stereo/multiview.hpp
@@ -37,7 +37,7 @@ namespace Stereo
     void configureExtensions(unsigned int contextID, bool enableMultiview);
 
     //! Sets the appropriate vertex buffer hint on OSG's display settings if needed
-    void setVertexBufferHint(bool enableMultiview);
+    void setVertexBufferHint(bool enableMultiview, bool allowDisplayListsForMultiview);
 
     //! Creates a Texture2D as a texture view into a Texture2DArray
     osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index bf82d52078..c3d7f1d320 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -114,13 +114,15 @@ namespace Stereo
         return *sInstance;
     }
 
-    Manager::Manager(osgViewer::Viewer* viewer, bool enableStereo)
+    Manager::Manager(osgViewer::Viewer* viewer, bool enableStereo, double near, double far)
         : mViewer(viewer)
         , mMainCamera(mViewer->getCamera())
         , mUpdateCallback(new StereoUpdateCallback(this))
         , mMasterProjectionMatrix(osg::Matrixd::identity())
         , mEyeResolutionOverriden(false)
         , mEyeResolutionOverride(0, 0)
+        , mNear(near)
+        , mFar(far)
         , mFrustumManager(nullptr)
         , mUpdateViewCallback(nullptr)
     {
@@ -132,13 +134,13 @@ namespace Stereo
 
     Manager::~Manager() {}
 
-    void Manager::initializeStereo(osg::GraphicsContext* gc, bool enableMultiview)
+    void Manager::initializeStereo(osg::GraphicsContext* gc, bool enableMultiview, bool sharedShadowMaps)
     {
         auto ci = gc->getState()->getContextID();
         configureExtensions(ci, enableMultiview);
 
         mMainCamera->addUpdateCallback(mUpdateCallback);
-        mFrustumManager = std::make_unique<StereoFrustumManager>(mViewer->getCamera());
+        mFrustumManager = std::make_unique<StereoFrustumManager>(sharedShadowMaps, mViewer->getCamera());
 
         if (getMultiview())
             setupOVRMultiView2Technique();
@@ -273,7 +275,7 @@ namespace Stereo
     void Manager::updateStereoFramebuffer()
     {
         // VR-TODO: in VR, still need to have this framebuffer attached before the postprocessor is created
-        // auto samples = Settings::Manager::getInt("antialiasing", "Video");
+        // auto samples = /*do not use Settings here*/;
         // auto eyeRes = eyeResolution();
 
         // if (mMultiviewFramebuffer)
@@ -289,20 +291,17 @@ namespace Stereo
 
     void Manager::update()
     {
-        const double near_ = Settings::camera().mNearClip;
-        const double far_ = Settings::camera().mViewingDistance;
-
         if (mUpdateViewCallback)
         {
             mUpdateViewCallback->updateView(mView[0], mView[1]);
             mViewOffsetMatrix[0] = mView[0].viewMatrix(true);
             mViewOffsetMatrix[1] = mView[1].viewMatrix(true);
-            mProjectionMatrix[0] = mView[0].perspectiveMatrix(near_, far_, false);
-            mProjectionMatrix[1] = mView[1].perspectiveMatrix(near_, far_, false);
+            mProjectionMatrix[0] = mView[0].perspectiveMatrix(mNear, mFar, false);
+            mProjectionMatrix[1] = mView[1].perspectiveMatrix(mNear, mFar, false);
             if (SceneUtil::AutoDepth::isReversed())
             {
-                mProjectionMatrixReverseZ[0] = mView[0].perspectiveMatrix(near_, far_, true);
-                mProjectionMatrixReverseZ[1] = mView[1].perspectiveMatrix(near_, far_, true);
+                mProjectionMatrixReverseZ[0] = mView[0].perspectiveMatrix(mNear, mFar, true);
+                mProjectionMatrixReverseZ[1] = mView[1].perspectiveMatrix(mNear, mFar, true);
             }
 
             View masterView;
@@ -310,14 +309,13 @@ namespace Stereo
             masterView.fov.angleUp = std::max(mView[0].fov.angleUp, mView[1].fov.angleUp);
             masterView.fov.angleLeft = std::min(mView[0].fov.angleLeft, mView[1].fov.angleLeft);
             masterView.fov.angleRight = std::max(mView[0].fov.angleRight, mView[1].fov.angleRight);
-            auto projectionMatrix = masterView.perspectiveMatrix(near_, far_, false);
+            auto projectionMatrix = masterView.perspectiveMatrix(mNear, mFar, false);
             mMainCamera->setProjectionMatrix(projectionMatrix);
         }
         else
         {
             auto* ds = osg::DisplaySettings::instance().get();
-            auto viewMatrix = mMainCamera->getViewMatrix();
-            auto projectionMatrix = mMainCamera->getProjectionMatrix();
+            const auto& projectionMatrix = mMainCamera->getProjectionMatrix();
             auto s = ds->getEyeSeparation() * Constants::UnitsPerMeter;
             mViewOffsetMatrix[0]
                 = osg::Matrixd(1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, s, 0.0, 0.0, 1.0);
@@ -394,60 +392,30 @@ namespace Stereo
         right = mRight;
     }
 
-    InitializeStereoOperation::InitializeStereoOperation()
+    InitializeStereoOperation::InitializeStereoOperation(const Settings& settings)
         : GraphicsOperation("InitializeStereoOperation", false)
+        , mMultiview(settings.mMultiview)
+        , mSharedShadowMaps(settings.mSharedShadowMaps)
+        , mCustomView(settings.mCustomView)
+        , mEyeResolution(settings.mEyeResolution)
     {
         // Ideally, this would have belonged to the operator(). But the vertex buffer
         // hint has to be set before realize is called on the osg viewer, and so has to
         // be done here instead.
-        Stereo::setVertexBufferHint(Settings::Manager::getBool("multiview", "Stereo"));
+        Stereo::setVertexBufferHint(settings.mMultiview, settings.mAllowDisplayListsForMultiview);
     }
 
     void InitializeStereoOperation::operator()(osg::GraphicsContext* graphicsContext)
     {
         auto& sm = Stereo::Manager::instance();
 
-        if (Settings::Manager::getBool("use custom view", "Stereo"))
-        {
-            Stereo::View left;
-            Stereo::View right;
+        if (mCustomView.has_value())
+            sm.setUpdateViewCallback(
+                std::make_shared<Stereo::Manager::CustomViewCallback>(mCustomView->mLeft, mCustomView->mRight));
 
-            left.pose.position.x() = Settings::Manager::getDouble("left eye offset x", "Stereo View");
-            left.pose.position.y() = Settings::Manager::getDouble("left eye offset y", "Stereo View");
-            left.pose.position.z() = Settings::Manager::getDouble("left eye offset z", "Stereo View");
-            left.pose.orientation.x() = Settings::Manager::getDouble("left eye orientation x", "Stereo View");
-            left.pose.orientation.y() = Settings::Manager::getDouble("left eye orientation y", "Stereo View");
-            left.pose.orientation.z() = Settings::Manager::getDouble("left eye orientation z", "Stereo View");
-            left.pose.orientation.w() = Settings::Manager::getDouble("left eye orientation w", "Stereo View");
-            left.fov.angleLeft = Settings::Manager::getDouble("left eye fov left", "Stereo View");
-            left.fov.angleRight = Settings::Manager::getDouble("left eye fov right", "Stereo View");
-            left.fov.angleUp = Settings::Manager::getDouble("left eye fov up", "Stereo View");
-            left.fov.angleDown = Settings::Manager::getDouble("left eye fov down", "Stereo View");
+        if (mEyeResolution.has_value())
+            sm.overrideEyeResolution(*mEyeResolution);
 
-            right.pose.position.x() = Settings::Manager::getDouble("right eye offset x", "Stereo View");
-            right.pose.position.y() = Settings::Manager::getDouble("right eye offset y", "Stereo View");
-            right.pose.position.z() = Settings::Manager::getDouble("right eye offset z", "Stereo View");
-            right.pose.orientation.x() = Settings::Manager::getDouble("right eye orientation x", "Stereo View");
-            right.pose.orientation.y() = Settings::Manager::getDouble("right eye orientation y", "Stereo View");
-            right.pose.orientation.z() = Settings::Manager::getDouble("right eye orientation z", "Stereo View");
-            right.pose.orientation.w() = Settings::Manager::getDouble("right eye orientation w", "Stereo View");
-            right.fov.angleLeft = Settings::Manager::getDouble("right eye fov left", "Stereo View");
-            right.fov.angleRight = Settings::Manager::getDouble("right eye fov right", "Stereo View");
-            right.fov.angleUp = Settings::Manager::getDouble("right eye fov up", "Stereo View");
-            right.fov.angleDown = Settings::Manager::getDouble("right eye fov down", "Stereo View");
-
-            auto customViewCallback = std::make_shared<Stereo::Manager::CustomViewCallback>(left, right);
-            sm.setUpdateViewCallback(customViewCallback);
-        }
-
-        if (Settings::Manager::getBool("use custom eye resolution", "Stereo"))
-        {
-            osg::Vec2i eyeResolution = osg::Vec2i();
-            eyeResolution.x() = Settings::Manager::getInt("eye resolution x", "Stereo View");
-            eyeResolution.y() = Settings::Manager::getInt("eye resolution y", "Stereo View");
-            sm.overrideEyeResolution(eyeResolution);
-        }
-
-        sm.initializeStereo(graphicsContext, Settings::Manager::getBool("multiview", "Stereo"));
+        sm.initializeStereo(graphicsContext, mMultiview, mSharedShadowMaps);
     }
 }
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
index 6f4e971718..8ed88da550 100644
--- a/components/stereo/stereomanager.hpp
+++ b/components/stereo/stereomanager.hpp
@@ -76,15 +76,23 @@ namespace Stereo
         //! @Param viewer the osg viewer whose stereo should be managed.
         //! @Param enableStereo whether or not stereo should be enabled.
         //! @Param enableMultiview whether or not to make use of the GL_OVR_Multiview extension, if supported.
-        Manager(osgViewer::Viewer* viewer, bool enableStereo);
+        //! @Param near defines distance to near camera clipping plane from view point.
+        //! @Param far defines distance to far camera clipping plane from view point.
+        explicit Manager(osgViewer::Viewer* viewer, bool enableStereo, double near, double far);
         ~Manager();
 
         //! Called during update traversal
         void update();
 
+        void updateSettings(double near, double far)
+        {
+            mNear = near;
+            mFar = far;
+        }
+
         //! Initializes all details of stereo if applicable. If the constructor was called with enableMultiview=true,
         //! and the GL_OVR_Multiview extension is supported, Stereo::getMultiview() will return true after this call.
-        void initializeStereo(osg::GraphicsContext* gc, bool enableMultiview);
+        void initializeStereo(osg::GraphicsContext* gc, bool enableMultiview, bool sharedShadowMaps);
 
         //! Callback that updates stereo configuration during the update pass
         void setUpdateViewCallback(std::shared_ptr<UpdateViewCallback> cb);
@@ -138,6 +146,8 @@ namespace Stereo
         std::shared_ptr<MultiviewFramebuffer> mMultiviewFramebuffer;
         bool mEyeResolutionOverriden;
         osg::Vec2i mEyeResolutionOverride;
+        double mNear;
+        double mFar;
 
         std::array<View, 2> mView;
         std::array<osg::Matrixd, 2> mViewOffsetMatrix;
@@ -153,13 +163,34 @@ namespace Stereo
         osg::ref_ptr<Identifier> mIdentifierRight = new Identifier();
     };
 
+    struct CustomView
+    {
+        Stereo::View mLeft;
+        Stereo::View mRight;
+    };
+
+    struct Settings
+    {
+        bool mMultiview;
+        bool mAllowDisplayListsForMultiview;
+        bool mSharedShadowMaps;
+        std::optional<CustomView> mCustomView;
+        std::optional<osg::Vec2i> mEyeResolution;
+    };
+
     //! Performs stereo-specific initialization operations.
     class InitializeStereoOperation final : public osg::GraphicsOperation
     {
     public:
-        InitializeStereoOperation();
+        explicit InitializeStereoOperation(const Settings& settings);
 
         void operator()(osg::GraphicsContext* graphicsContext) override;
+
+    private:
+        bool mMultiview;
+        bool mSharedShadowMaps;
+        std::optional<CustomView> mCustomView;
+        std::optional<osg::Vec2i> mEyeResolution;
     };
 }
 
diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 06767531d3..b78691cd8d 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -6,6 +6,7 @@
 
 #include "world.hpp"
 
+#include <components/esm/util.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/terrain/storage.hpp>
@@ -25,7 +26,7 @@ namespace Terrain
     osg::ref_ptr<osg::Group> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain,
         Resource::SceneManager* sceneManager, int mask, ESM::RefId worldspace, float offset, osg::Vec4f color)
     {
-        const int cellSize = ESM::Land::REAL_SIZE;
+        const int cellSize = ESM::getCellSize(worldspace);
         const int borderSegments = 40;
 
         osg::Vec3 cellCorner = osg::Vec3(x * cellSize, y * cellSize, 0);
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 0364a0a4fd..7ccd89ac21 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -20,8 +20,8 @@ namespace Terrain
 {
 
     ChunkManager::ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager,
-        CompositeMapRenderer* renderer, ESM::RefId worldspace)
-        : GenericResourceManager<ChunkId>(nullptr)
+        CompositeMapRenderer* renderer, ESM::RefId worldspace, double expiryDelay)
+        : GenericResourceManager<ChunkKey>(nullptr, expiryDelay)
         , QuadTreeWorld::ChunkManager(worldspace)
         , mStorage(storage)
         , mSceneManager(sceneMgr)
@@ -39,55 +39,43 @@ namespace Terrain
         mMultiPassRoot->setAttributeAndModes(material, osg::StateAttribute::ON);
     }
 
-    struct FindChunkTemplate
-    {
-        void operator()(ChunkId id, osg::Object* obj)
-        {
-            if (std::get<0>(id) == std::get<0>(mId) && std::get<1>(id) == std::get<1>(mId))
-                mFoundTemplate = obj;
-        }
-        ChunkId mId;
-        osg::ref_ptr<osg::Object> mFoundTemplate;
-    };
-
     osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& center, unsigned char lod,
         unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
     {
         // Override lod with the vertexLodMod adjusted value.
         // TODO: maybe we can refactor this code by moving all vertexLodMod code into this class.
         lod = static_cast<unsigned char>(lodFlags >> (4 * 4));
-        ChunkId id = std::make_tuple(center, lod, lodFlags);
-        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
-        if (obj)
+
+        const ChunkKey key{ .mCenter = center, .mLod = lod, .mLodFlags = lodFlags };
+        if (osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(key))
             return static_cast<osg::Node*>(obj.get());
-        else
-        {
-            FindChunkTemplate find;
-            find.mId = id;
-            mCache->call(find);
-            TerrainDrawable* templateGeometry
-                = find.mFoundTemplate ? static_cast<TerrainDrawable*>(find.mFoundTemplate.get()) : nullptr;
-            osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile, templateGeometry);
-            mCache->addEntryToObjectCache(id, node.get());
-            return node;
-        }
+
+        const TerrainDrawable* templateGeometry = nullptr;
+        const TemplateKey templateKey{ .mCenter = center, .mLod = lod };
+        const auto pair = mCache->lowerBound(templateKey);
+        if (pair.has_value() && templateKey == TemplateKey{ .mCenter = pair->first.mCenter, .mLod = pair->first.mLod })
+            templateGeometry = static_cast<const TerrainDrawable*>(pair->second.get());
+
+        osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile, templateGeometry);
+        mCache->addEntryToObjectCache(key, node.get());
+        return node;
     }
 
     void ChunkManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Terrain Chunk", mCache->getCacheSize());
+        Resource::reportStats("Terrain Chunk", frameNumber, mCache->getStats(), *stats);
     }
 
     void ChunkManager::clearCache()
     {
-        GenericResourceManager<ChunkId>::clearCache();
+        GenericResourceManager<ChunkKey>::clearCache();
 
         mBufferCache.clearCache();
     }
 
     void ChunkManager::releaseGLObjects(osg::State* state)
     {
-        GenericResourceManager<ChunkId>::releaseGLObjects(state);
+        GenericResourceManager<ChunkKey>::releaseGLObjects(state);
         mBufferCache.releaseGLObjects(state);
     }
 
@@ -202,7 +190,7 @@ namespace Terrain
     }
 
     osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f& chunkCenter, unsigned char lod,
-        unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry)
+        unsigned int lodFlags, bool compile, const TerrainDrawable* templateGeometry)
     {
         osg::ref_ptr<TerrainDrawable> geometry(new TerrainDrawable);
 
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index 4238f01c8b..20d6ba9327 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -28,14 +28,55 @@ namespace Terrain
     class CompositeMap;
     class TerrainDrawable;
 
-    typedef std::tuple<osg::Vec2f, unsigned char, unsigned int> ChunkId; // Center, Lod, Lod Flags
+    struct TemplateKey
+    {
+        osg::Vec2f mCenter;
+        unsigned char mLod;
+    };
+
+    inline auto tie(const TemplateKey& v)
+    {
+        return std::tie(v.mCenter, v.mLod);
+    }
+
+    inline bool operator<(const TemplateKey& l, const TemplateKey& r)
+    {
+        return tie(l) < tie(r);
+    }
+
+    inline bool operator==(const TemplateKey& l, const TemplateKey& r)
+    {
+        return tie(l) == tie(r);
+    }
+
+    struct ChunkKey
+    {
+        osg::Vec2f mCenter;
+        unsigned char mLod;
+        unsigned mLodFlags;
+    };
+
+    inline auto tie(const ChunkKey& v)
+    {
+        return std::tie(v.mCenter, v.mLod, v.mLodFlags);
+    }
+
+    inline bool operator<(const ChunkKey& l, const ChunkKey& r)
+    {
+        return tie(l) < tie(r);
+    }
+
+    inline bool operator<(const ChunkKey& l, const TemplateKey& r)
+    {
+        return TemplateKey{ .mCenter = l.mCenter, .mLod = l.mLod } < r;
+    }
 
     /// @brief Handles loading and caching of terrain chunks
-    class ChunkManager : public Resource::GenericResourceManager<ChunkId>, public QuadTreeWorld::ChunkManager
+    class ChunkManager : public Resource::GenericResourceManager<ChunkKey>, public QuadTreeWorld::ChunkManager
     {
     public:
-        ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager,
-            CompositeMapRenderer* renderer, ESM::RefId worldspace);
+        explicit ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager,
+            CompositeMapRenderer* renderer, ESM::RefId worldspace, double expiryDelay);
 
         osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags,
             bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
@@ -55,7 +96,7 @@ namespace Terrain
 
     private:
         osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, unsigned char lod,
-            unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry);
+            unsigned int lodFlags, bool compile, const TerrainDrawable* templateGeometry);
 
         osg::ref_ptr<osg::Texture2D> createCompositeMapRTT();
 
diff --git a/components/terrain/compositemaprenderer.cpp b/components/terrain/compositemaprenderer.cpp
index 5319820c83..adf58162e8 100644
--- a/components/terrain/compositemaprenderer.cpp
+++ b/components/terrain/compositemaprenderer.cpp
@@ -43,19 +43,18 @@ namespace Terrain
             mImmediateCompileSet.erase(node);
 
             mMutex.unlock();
-            compile(*node, renderInfo, nullptr);
+            compile(*node, renderInfo);
             mMutex.lock();
         }
 
-        double timeLeft = availableTime;
-
-        while (!mCompileSet.empty() && timeLeft > 0)
+        const auto deadline = std::chrono::steady_clock::now() + std::chrono::duration<double>(availableTime);
+        while (!mCompileSet.empty() && std::chrono::steady_clock::now() < deadline)
         {
             osg::ref_ptr<CompositeMap> node = *mCompileSet.begin();
             mCompileSet.erase(node);
 
             mMutex.unlock();
-            compile(*node, renderInfo, &timeLeft);
+            compile(*node, renderInfo);
             mMutex.lock();
 
             if (node->mCompiled < node->mDrawables.size())
@@ -68,7 +67,7 @@ namespace Terrain
         mTimer.setStartTick();
     }
 
-    void CompositeMapRenderer::compile(CompositeMap& compositeMap, osg::RenderInfo& renderInfo, double* timeLeft) const
+    void CompositeMapRenderer::compile(CompositeMap& compositeMap, osg::RenderInfo& renderInfo) const
     {
         // if there are no more external references we can assume the texture is no longer required
         if (compositeMap.mTexture->referenceCount() <= 1)
@@ -124,15 +123,6 @@ namespace Terrain
             ++compositeMap.mCompiled;
 
             compositeMap.mDrawables[i] = nullptr;
-
-            if (timeLeft)
-            {
-                *timeLeft -= timer.time_s();
-                timer.setStartTick();
-
-                if (*timeLeft <= 0)
-                    break;
-            }
         }
         if (compositeMap.mCompiled == compositeMap.mDrawables.size())
             compositeMap.mDrawables = std::vector<osg::ref_ptr<osg::Drawable>>();
diff --git a/components/terrain/compositemaprenderer.hpp b/components/terrain/compositemaprenderer.hpp
index eeecec75dc..1e33c717ec 100644
--- a/components/terrain/compositemaprenderer.hpp
+++ b/components/terrain/compositemaprenderer.hpp
@@ -38,7 +38,7 @@ namespace Terrain
 
         void drawImplementation(osg::RenderInfo& renderInfo) const override;
 
-        void compile(CompositeMap& compositeMap, osg::RenderInfo& renderInfo, double* timeLeft) const;
+        void compile(CompositeMap& compositeMap, osg::RenderInfo& renderInfo) const;
 
         /// Set the available time in seconds for compiling (non-immediate) composite maps each frame
         void setMinimumTimeAvailableForCompile(double time);
diff --git a/components/terrain/defs.hpp b/components/terrain/defs.hpp
index c2342c50d2..48e4813e65 100644
--- a/components/terrain/defs.hpp
+++ b/components/terrain/defs.hpp
@@ -1,7 +1,7 @@
 #ifndef COMPONENTS_TERRAIN_DEFS_HPP
 #define COMPONENTS_TERRAIN_DEFS_HPP
 
-#include <string>
+#include <components/vfs/pathutil.hpp>
 
 namespace Terrain
 {
@@ -16,8 +16,8 @@ namespace Terrain
 
     struct LayerInfo
     {
-        std::string mDiffuseMap;
-        std::string mNormalMap;
+        VFS::Path::Normalized mDiffuseMap;
+        VFS::Path::Normalized mNormalMap;
         bool mParallax; // Height info in normal map alpha channel?
         bool mSpecular; // Specular info in diffuse map alpha channel?
 
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index fafe2dcb58..09d2680acd 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -10,6 +10,7 @@
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/stereo/stereomanager.hpp>
 
@@ -271,18 +272,37 @@ namespace Terrain
                     stateset->addUniform(UniformCollection::value().mBlendMap);
                 }
 
+                bool parallax = it->mNormalMap && it->mParallax;
+                bool reconstructNormalZ = false;
+
                 if (it->mNormalMap)
                 {
                     stateset->setTextureAttributeAndModes(2, it->mNormalMap);
                     stateset->addUniform(UniformCollection::value().mNormalMap);
+
+                    // Special handling for red-green normal maps (e.g. BC5 or R8G8).
+                    const osg::Image* image = it->mNormalMap->getImage(0);
+                    if (image)
+                    {
+                        switch (SceneUtil::computeUnsizedPixelFormat(image->getPixelFormat()))
+                        {
+                            case GL_RG:
+                            case GL_RG_INTEGER:
+                            {
+                                reconstructNormalZ = true;
+                                parallax = false;
+                            }
+                        }
+                    }
                 }
 
                 Shader::ShaderManager::DefineMap defineMap;
                 defineMap["normalMap"] = (it->mNormalMap) ? "1" : "0";
                 defineMap["blendMap"] = (!blendmaps.empty()) ? "1" : "0";
                 defineMap["specularMap"] = it->mSpecular ? "1" : "0";
-                defineMap["parallax"] = (it->mNormalMap && it->mParallax) ? "1" : "0";
+                defineMap["parallax"] = parallax ? "1" : "0";
                 defineMap["writeNormals"] = (it == layers.end() - 1) ? "1" : "0";
+                defineMap["reconstructNormalZ"] = reconstructNormalZ ? "1" : "0";
                 Stereo::shaderStereoDefines(defineMap);
 
                 stateset->setAttributeAndModes(shaderManager.getProgram("terrain", defineMap));
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 8449f3df25..99938d7b3a 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -7,6 +7,7 @@
 
 #include <limits>
 
+#include <components/esm/util.hpp>
 #include <components/loadinglistener/reporter.hpp>
 #include <components/misc/constants.hpp>
 #include <components/misc/mathutil.hpp>
@@ -280,8 +281,9 @@ namespace Terrain
     QuadTreeWorld::QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
         Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
         int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize,
-        bool debugChunks, ESM::RefId worldspace)
-        : TerrainGrid(parent, compileRoot, resourceSystem, storage, nodeMask, worldspace, preCompileMask, borderMask)
+        bool debugChunks, ESM::RefId worldspace, double expiryDelay)
+        : TerrainGrid(
+            parent, compileRoot, resourceSystem, storage, nodeMask, worldspace, expiryDelay, preCompileMask, borderMask)
         , mViewDataMap(new ViewDataMap)
         , mQuadTreeBuilt(false)
         , mLodFactor(lodFactor)
@@ -402,63 +404,68 @@ namespace Terrain
         }
     }
 
-    void updateWaterCullingView(
-        HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld)
+    namespace
     {
-        if (!(cv->getTraversalMask() & callback->getCullMask()))
-            return;
-        float lowZ = std::numeric_limits<float>::max();
-        float highZ = callback->getHighZ();
-        if (cv->getEyePoint().z() <= highZ || outofworld)
+        osg::ref_ptr<osg::StateSet> makeStateSet()
         {
-            callback->setLowZ(-std::numeric_limits<float>::max());
-            return;
+            osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
+            stateSet->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+            stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+            stateSet->setAttributeAndModes(
+                new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE),
+                osg::StateAttribute::ON);
+            osg::ref_ptr<osg::Material> material = new osg::Material;
+            material->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 1, 1));
+            material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 1));
+            material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 1));
+            stateSet->setAttributeAndModes(material, osg::StateAttribute::ON);
+            stateSet->setRenderBinDetails(100, "RenderBin");
+            return stateSet;
         }
-        cv->pushCurrentMask();
-        static bool debug = getenv("OPENMW_WATER_CULLING_DEBUG") != nullptr;
-        for (unsigned int i = 0; i < vd->getNumEntries(); ++i)
-        {
-            ViewDataEntry& entry = vd->getEntry(i);
-            osg::BoundingBox bb
-                = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
-            if (!bb.valid())
-                continue;
-            osg::Vec3f ofs(
-                entry.mNode->getCenter().x() * cellworldsize, entry.mNode->getCenter().y() * cellworldsize, 0.f);
-            bb._min += ofs;
-            bb._max += ofs;
-            bb._min.z() = highZ;
-            bb._max.z() = highZ;
-            if (cv->isCulled(bb))
-                continue;
-            lowZ = bb._min.z();
 
-            if (!debug)
-                break;
-            osg::Box* b = new osg::Box;
-            b->set(bb.center(), bb._max - bb.center());
-            osg::ShapeDrawable* drw = new osg::ShapeDrawable(b);
-            static osg::ref_ptr<osg::StateSet> stateset = nullptr;
-            if (!stateset)
+        void updateWaterCullingView(
+            HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld)
+        {
+            if (!(cv->getTraversalMask() & callback->getCullMask()))
+                return;
+            float lowZ = std::numeric_limits<float>::max();
+            float highZ = callback->getHighZ();
+            if (cv->getEyePoint().z() <= highZ || outofworld)
             {
-                stateset = new osg::StateSet;
-                stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
-                stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-                stateset->setAttributeAndModes(
-                    new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE),
-                    osg::StateAttribute::ON);
-                osg::Material* m = new osg::Material;
-                m->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 1, 1));
-                m->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 1));
-                m->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0, 0, 0, 1));
-                stateset->setAttributeAndModes(m, osg::StateAttribute::ON);
-                stateset->setRenderBinDetails(100, "RenderBin");
+                callback->setLowZ(-std::numeric_limits<float>::max());
+                return;
             }
-            drw->setStateSet(stateset);
-            drw->accept(*cv);
+            cv->pushCurrentMask();
+            static bool debug = getenv("OPENMW_WATER_CULLING_DEBUG") != nullptr;
+            for (unsigned int i = 0; i < vd->getNumEntries(); ++i)
+            {
+                ViewDataEntry& entry = vd->getEntry(i);
+                osg::BoundingBox bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))
+                                          ->getWaterBoundingBox();
+                if (!bb.valid())
+                    continue;
+                osg::Vec3f ofs(
+                    entry.mNode->getCenter().x() * cellworldsize, entry.mNode->getCenter().y() * cellworldsize, 0.f);
+                bb._min += ofs;
+                bb._max += ofs;
+                bb._min.z() = highZ;
+                bb._max.z() = highZ;
+                if (cv->isCulled(bb))
+                    continue;
+                lowZ = bb._min.z();
+
+                if (!debug)
+                    break;
+                osg::Box* b = new osg::Box;
+                b->set(bb.center(), bb._max - bb.center());
+                osg::ShapeDrawable* drw = new osg::ShapeDrawable(b);
+                static const osg::ref_ptr<osg::StateSet> stateset = makeStateSet();
+                drw->setStateSet(stateset);
+                drw->accept(*cv);
+            }
+            callback->setLowZ(lowZ);
+            cv->popCurrentMask();
         }
-        callback->setLowZ(lowZ);
-        cv->popCurrentMask();
     }
 
     void QuadTreeWorld::accept(osg::NodeVisitor& nv)
@@ -544,37 +551,16 @@ namespace Terrain
         vd->setViewPoint(viewPoint);
         vd->setActiveGrid(grid);
 
-        for (unsigned int pass = 0; pass < 3; ++pass)
+        DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid, cellWorldSize);
+        mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
+
+        reporter.addTotal(vd->getNumEntries());
+
+        for (unsigned int i = 0, n = vd->getNumEntries(); i < n && !abort; ++i)
         {
-            unsigned int startEntry = vd->getNumEntries();
-
-            float distanceModifier = 0.f;
-            if (pass == 1)
-                distanceModifier = 1024;
-            else if (pass == 2)
-                distanceModifier = -1024;
-            DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid, cellWorldSize, distanceModifier);
-            mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
-
-            if (pass == 0)
-            {
-                std::size_t progressTotal = 0;
-                for (unsigned int i = 0, n = vd->getNumEntries(); i < n; ++i)
-                    progressTotal += vd->getEntry(i).mNode->getSize();
-
-                reporter.addTotal(progressTotal);
-            }
-
-            for (unsigned int i = startEntry; i < vd->getNumEntries() && !abort; ++i)
-            {
-                ViewDataEntry& entry = vd->getEntry(i);
-
-                loadRenderingNode(entry, vd, cellWorldSize, grid, true);
-                if (pass == 0)
-                    reporter.addProgress(entry.mNode->getSize());
-                vd->removeNodeFromIndex(entry.mNode);
-                entry.mNode = nullptr; // Clear node lest we break the neighbours search for the next pass
-            }
+            ViewDataEntry& entry = vd->getEntry(i);
+            loadRenderingNode(entry, vd, cellWorldSize, grid, true);
+            reporter.addProgress(1);
         }
     }
 
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 2524dc046f..fa800d2655 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -33,7 +33,7 @@ namespace Terrain
         QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
             Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
             int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize,
-            bool debugChunks, ESM::RefId worldspace);
+            bool debugChunks, ESM::RefId worldspace, double expiryDelay);
 
         ~QuadTreeWorld();
 
diff --git a/components/terrain/storage.hpp b/components/terrain/storage.hpp
index 7a99478929..b1007c13e6 100644
--- a/components/terrain/storage.hpp
+++ b/components/terrain/storage.hpp
@@ -8,8 +8,8 @@
 #include <osg/Vec3f>
 #include <osg/ref_ptr>
 
+#include <components/esm/exteriorcelllocation.hpp>
 #include <components/esm/refid.hpp>
-#include <components/esm/util.hpp>
 
 #include "defs.hpp"
 
diff --git a/components/terrain/terraindrawable.hpp b/components/terrain/terraindrawable.hpp
index b94f47df97..3ce846ad73 100644
--- a/components/terrain/terraindrawable.hpp
+++ b/components/terrain/terraindrawable.hpp
@@ -60,7 +60,7 @@ namespace Terrain
         const osg::BoundingBox& getWaterBoundingBox() const { return mWaterBoundingBox; }
 
         void setCompositeMap(CompositeMap* map) { mCompositeMap = map; }
-        CompositeMap* getCompositeMap() { return mCompositeMap; }
+        CompositeMap* getCompositeMap() const { return mCompositeMap; }
         void setCompositeMapRenderer(CompositeMapRenderer* renderer) { mCompositeMapRenderer = renderer; }
 
     private:
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index cdbfdea723..2849c4d401 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -23,9 +23,10 @@ namespace Terrain
     };
 
     TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
-        Storage* storage, unsigned int nodeMask, ESM::RefId worldspace, unsigned int preCompileMask,
+        Storage* storage, unsigned int nodeMask, ESM::RefId worldspace, double expiryDelay, unsigned int preCompileMask,
         unsigned int borderMask)
-        : Terrain::World(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask, worldspace)
+        : Terrain::World(
+            parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask, worldspace, expiryDelay)
         , mNumSplits(4)
     {
     }
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 5204af7093..8483338f23 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -26,9 +26,9 @@ namespace Terrain
     class TerrainGrid : public Terrain::World
     {
     public:
-        TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
-            Storage* storage, unsigned int nodeMask, ESM::RefId worldspace, unsigned int preCompileMask = ~0u,
-            unsigned int borderMask = 0);
+        explicit TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
+            Storage* storage, unsigned int nodeMask, ESM::RefId worldspace, double expiryDelay,
+            unsigned int preCompileMask = ~0u, unsigned int borderMask = 0);
         TerrainGrid(osg::Group* parent, Storage* storage, ESM::RefId worldspace, unsigned int nodeMask = ~0u);
         ~TerrainGrid();
 
diff --git a/components/terrain/texturemanager.cpp b/components/terrain/texturemanager.cpp
index ff4a84707e..06f3243330 100644
--- a/components/terrain/texturemanager.cpp
+++ b/components/terrain/texturemanager.cpp
@@ -1,6 +1,5 @@
 #include "texturemanager.hpp"
 
-#include <osg/Stats>
 #include <osg/Texture2D>
 
 #include <components/resource/imagemanager.hpp>
@@ -10,8 +9,8 @@
 namespace Terrain
 {
 
-    TextureManager::TextureManager(Resource::SceneManager* sceneMgr)
-        : ResourceManager(sceneMgr->getVFS())
+    TextureManager::TextureManager(Resource::SceneManager* sceneMgr, double expiryDelay)
+        : ResourceManager(sceneMgr->getVFS(), expiryDelay)
         , mSceneManager(sceneMgr)
     {
     }
@@ -36,27 +35,26 @@ namespace Terrain
         mCache->call(f);
     }
 
-    osg::ref_ptr<osg::Texture2D> TextureManager::getTexture(const std::string& name)
+    osg::ref_ptr<osg::Texture2D> TextureManager::getTexture(VFS::Path::NormalizedView name)
     {
         // don't bother with case folding, since there is only one way of referring to terrain textures we can assume
         // the case is always the same
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
-        if (obj)
+
+        if (obj != nullptr)
             return static_cast<osg::Texture2D*>(obj.get());
-        else
-        {
-            osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D(mSceneManager->getImageManager()->getImage(name)));
-            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-            mSceneManager->applyFilterSettings(texture);
-            mCache->addEntryToObjectCache(name, texture.get());
-            return texture;
-        }
+
+        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D(mSceneManager->getImageManager()->getImage(name)));
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+        mSceneManager->applyFilterSettings(texture);
+        mCache->addEntryToObjectCache(name.value(), texture.get());
+        return texture;
     }
 
     void TextureManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
     {
-        stats->setAttribute(frameNumber, "Terrain Texture", mCache->getCacheSize());
+        Resource::reportStats("Terrain Texture", frameNumber, mCache->getStats(), *stats);
     }
 
 }
diff --git a/components/terrain/texturemanager.hpp b/components/terrain/texturemanager.hpp
index ae3e41f138..a79ef53b88 100644
--- a/components/terrain/texturemanager.hpp
+++ b/components/terrain/texturemanager.hpp
@@ -1,9 +1,8 @@
 #ifndef OPENMW_COMPONENTS_TERRAIN_TEXTUREMANAGER_H
 #define OPENMW_COMPONENTS_TERRAIN_TEXTUREMANAGER_H
 
-#include <string>
-
 #include <components/resource/resourcemanager.hpp>
+#include <components/vfs/pathutil.hpp>
 
 namespace Resource
 {
@@ -21,11 +20,11 @@ namespace Terrain
     class TextureManager : public Resource::ResourceManager
     {
     public:
-        TextureManager(Resource::SceneManager* sceneMgr);
+        explicit TextureManager(Resource::SceneManager* sceneMgr, double expiryDelay);
 
         void updateTextureFiltering();
 
-        osg::ref_ptr<osg::Texture2D> getTexture(const std::string& name);
+        osg::ref_ptr<osg::Texture2D> getTexture(VFS::Path::NormalizedView name);
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
diff --git a/components/terrain/viewdata.hpp b/components/terrain/viewdata.hpp
index b8b0b8a1f9..3014ba53f0 100644
--- a/components/terrain/viewdata.hpp
+++ b/components/terrain/viewdata.hpp
@@ -70,7 +70,6 @@ namespace Terrain
                 mNodes.clear();
             }
         }
-        const osg::Vec4i& getActiveGrid() const { return mActiveGrid; }
 
         unsigned int getWorldUpdateRevision() const { return mWorldUpdateRevision; }
         void setWorldUpdateRevision(int updateRevision) { mWorldUpdateRevision = updateRevision; }
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 98ce982285..58cfc0b068 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -5,6 +5,7 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/settings/values.hpp>
 
 #include "chunkmanager.hpp"
 #include "compositemaprenderer.hpp"
@@ -17,12 +18,11 @@ namespace Terrain
 
     World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
         Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
-        ESM::RefId worldspace)
+        ESM::RefId worldspace, double expiryDelay)
         : mStorage(storage)
         , mParent(parent)
         , mResourceSystem(resourceSystem)
         , mBorderVisible(false)
-        , mHeightCullCallback(new HeightCullCallback)
         , mWorldspace(worldspace)
     {
         mTerrainRoot = new osg::Group;
@@ -45,9 +45,9 @@ namespace Terrain
 
         mParent->addChild(mTerrainRoot);
 
-        mTextureManager = std::make_unique<TextureManager>(mResourceSystem->getSceneManager());
-        mChunkManager = std::make_unique<ChunkManager>(
-            mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer, mWorldspace);
+        mTextureManager = std::make_unique<TextureManager>(mResourceSystem->getSceneManager(), expiryDelay);
+        mChunkManager = std::make_unique<ChunkManager>(mStorage, mResourceSystem->getSceneManager(),
+            mTextureManager.get(), mCompositeMapRenderer, mWorldspace, expiryDelay);
         mChunkManager->setNodeMask(nodeMask);
         mCellBorder
             = std::make_unique<CellBorder>(this, mTerrainRoot.get(), borderMask, mResourceSystem->getSceneManager());
@@ -66,7 +66,6 @@ namespace Terrain
         , mChunkManager(nullptr)
         , mCellBorder(nullptr)
         , mBorderVisible(false)
-        , mHeightCullCallback(nullptr)
         , mWorldspace(worldspace)
     {
         mTerrainRoot = new osg::Group;
@@ -142,9 +141,17 @@ namespace Terrain
             mChunkManager->clearCache();
     }
 
+    void World::enableHeightCullCallback(bool enable)
+    {
+        if (enable)
+            mHeightCullCallback = new HeightCullCallback;
+        else
+            mHeightCullCallback = nullptr;
+    }
+
     osg::Callback* World::getHeightCullCallback(float highz, unsigned int mask)
     {
-        if (!mHeightCullCallback)
+        if (!mHeightCullCallback || mTerrainRoot->getNumChildren() == 0)
             return nullptr;
 
         mHeightCullCallback->setHighZ(highz);
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 16b39c1385..cfe9634773 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -49,8 +49,9 @@ namespace Terrain
         /// @param storage Storage instance to get terrain data from (heights, normals, colors, textures..)
         /// @param nodeMask mask for the terrain root
         /// @param preCompileMask mask for pre compiling textures
-        World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage,
-            unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, ESM::RefId worldspace);
+        explicit World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
+            Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
+            ESM::RefId worldspace, double expiryDelay);
         World(osg::Group* parent, Storage* storage, unsigned int nodeMask, ESM::RefId worldspace);
         virtual ~World();
 
@@ -105,6 +106,7 @@ namespace Terrain
 
         Storage* getStorage() { return mStorage; }
 
+        void enableHeightCullCallback(bool enable);
         osg::Callback* getHeightCullCallback(float highz, unsigned int mask);
 
         void setActiveGrid(const osg::Vec4i& grid) { mActiveGrid = grid; }
diff --git a/components/testing/expecterror.hpp b/components/testing/expecterror.hpp
new file mode 100644
index 0000000000..abd59124af
--- /dev/null
+++ b/components/testing/expecterror.hpp
@@ -0,0 +1,20 @@
+#ifndef OPENMW_COMPONENTS_TESTING_EXPECTERROR_H
+#define OPENMW_COMPONENTS_TESTING_EXPECTERROR_H
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <exception>
+
+#define EXPECT_ERROR(X, ERR_SUBSTR)                                                                                    \
+    try                                                                                                                \
+    {                                                                                                                  \
+        X;                                                                                                             \
+        FAIL() << "Expected error";                                                                                    \
+    }                                                                                                                  \
+    catch (const std::exception& e)                                                                                    \
+    {                                                                                                                  \
+        EXPECT_THAT(e.what(), ::testing::HasSubstr(ERR_SUBSTR));                                                       \
+    }
+
+#endif
diff --git a/components/testing/util.hpp b/components/testing/util.hpp
new file mode 100644
index 0000000000..941f495458
--- /dev/null
+++ b/components/testing/util.hpp
@@ -0,0 +1,84 @@
+#ifndef OPENMW_COMPONENTS_TESTING_UTIL_H
+#define OPENMW_COMPONENTS_TESTING_UTIL_H
+
+#include <filesystem>
+#include <initializer_list>
+#include <memory>
+#include <sstream>
+
+#include <components/misc/strings/conversion.hpp>
+#include <components/vfs/archive.hpp>
+#include <components/vfs/file.hpp>
+#include <components/vfs/manager.hpp>
+#include <components/vfs/pathutil.hpp>
+
+namespace TestingOpenMW
+{
+    inline std::filesystem::path outputFilePath(const std::string name)
+    {
+        std::filesystem::path dir("tests_output");
+        std::filesystem::create_directory(dir);
+        return dir / Misc::StringUtils::stringToU8String(name);
+    }
+
+    inline std::filesystem::path outputFilePathWithSubDir(const std::filesystem::path& subpath)
+    {
+        std::filesystem::path path("tests_output");
+        path /= subpath;
+        std::filesystem::create_directories(path.parent_path());
+        return path;
+    }
+
+    inline std::filesystem::path temporaryFilePath(const std::string name)
+    {
+        return std::filesystem::temp_directory_path() / name;
+    }
+
+    class VFSTestFile : public VFS::File
+    {
+    public:
+        explicit VFSTestFile(std::string content)
+            : mContent(std::move(content))
+        {
+        }
+
+        Files::IStreamPtr open() override { return std::make_unique<std::stringstream>(mContent, std::ios_base::in); }
+
+        std::filesystem::path getPath() override { return "TestFile"; }
+
+    private:
+        const std::string mContent;
+    };
+
+    struct VFSTestData : public VFS::Archive
+    {
+        VFS::FileMap mFiles;
+
+        explicit VFSTestData(VFS::FileMap&& files)
+            : mFiles(std::move(files))
+        {
+        }
+
+        void listResources(VFS::FileMap& out) override { out = mFiles; }
+
+        bool contains(VFS::Path::NormalizedView file) const override { return mFiles.contains(file); }
+
+        std::string getDescription() const override { return "TestData"; }
+    };
+
+    inline std::unique_ptr<VFS::Manager> createTestVFS(VFS::FileMap&& files)
+    {
+        auto vfs = std::make_unique<VFS::Manager>();
+        vfs->addArchive(std::make_unique<VFSTestData>(std::move(files)));
+        vfs->buildIndex();
+        return vfs;
+    }
+
+    inline std::unique_ptr<VFS::Manager> createTestVFS(
+        std::initializer_list<std::pair<VFS::Path::NormalizedView, VFS::File*>> files)
+    {
+        return createTestVFS(VFS::FileMap(files.begin(), files.end()));
+    }
+}
+
+#endif
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 11a466e44c..80af6586c9 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -68,7 +68,7 @@ namespace ToUTF8
         /// ASCII-only string. Otherwise returns a view to the input.
         std::string_view getLegacyEnc(std::string_view input);
 
-        StatelessUtf8Encoder getStatelessEncoder() const { return mImpl; }
+        const StatelessUtf8Encoder& getStatelessEncoder() const { return mImpl; }
 
     private:
         std::string mBuffer;
diff --git a/components/version/version.cpp b/components/version/version.cpp
deleted file mode 100644
index 85eea712b3..0000000000
--- a/components/version/version.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "version.hpp"
-
-#include <filesystem>
-#include <fstream>
-
-namespace Version
-{
-
-    Version getOpenmwVersion(const std::filesystem::path& resourcePath)
-    {
-        std::ifstream stream(resourcePath / "version");
-
-        Version v;
-        std::getline(stream, v.mVersion);
-        std::getline(stream, v.mCommitHash);
-        std::getline(stream, v.mTagHash);
-        return v;
-    }
-
-    std::string Version::describe() const
-    {
-        std::string str = "OpenMW version " + mVersion;
-        std::string rev = mCommitHash;
-        if (!rev.empty())
-        {
-            rev = rev.substr(0, 10);
-            str += "\nRevision: " + rev;
-        }
-        return str;
-    }
-
-    std::string getOpenmwVersionDescription(const std::filesystem::path& resourcePath)
-    {
-        Version v = getOpenmwVersion(resourcePath);
-        return v.describe();
-    }
-
-}
diff --git a/components/version/version.cpp.in b/components/version/version.cpp.in
new file mode 100644
index 0000000000..12192785b7
--- /dev/null
+++ b/components/version/version.cpp.in
@@ -0,0 +1,62 @@
+#include <components/version/version.hpp>
+
+#include <filesystem>
+#include <fstream>
+
+namespace Version
+{
+    std::string_view getVersion()
+    {
+        return "@OPENMW_VERSION@";
+    }
+
+    std::string_view getCommitHash()
+    {
+        return "@OPENMW_VERSION_COMMITHASH@";
+    }
+
+    std::string_view getTagHash()
+    {
+        return "@OPENMW_VERSION_TAGHASH@";
+    }
+
+    int getLuaApiRevision()
+    {
+        return @OPENMW_LUA_API_REVISION@;
+    }
+
+    int getPostprocessingApiRevision()
+    {
+        return @OPENMW_POSTPROCESSING_API_REVISION@;
+    }
+
+    std::string getOpenmwVersionDescription()
+    {
+        std::string str = "OpenMW version ";
+        str += getVersion();
+        if (!getCommitHash().empty())
+        {
+            str += "\nRevision: ";
+            str += getCommitHash().substr(0, 10);
+        }
+        return str;
+    }
+
+    bool checkResourcesVersion(const std::filesystem::path& resourcePath)
+    {
+        std::ifstream stream(resourcePath / "version");
+        std::string version, commitHash, tagHash;
+        std::getline(stream, version);
+        std::getline(stream, commitHash);
+        std::getline(stream, tagHash);
+        return getVersion() == version && getCommitHash() == commitHash && getTagHash() == tagHash;
+    }
+
+    std::string_view getDocumentationUrl()
+    {
+        if constexpr (std::string_view("@OPENMW_VERSION_COMMITHASH@") == "@OPENMW_VERSION_TAGHASH@")
+            return OPENMW_DOC_BASEURL "openmw-@OPENMW_VERSION_MAJOR@.@OPENMW_VERSION_MINOR@.@OPENMW_VERSION_RELEASE@/";
+        else
+            return OPENMW_DOC_BASEURL "latest/";
+    }
+}
diff --git a/components/version/version.hpp b/components/version/version.hpp
index f6427a4823..a8a8117dee 100644
--- a/components/version/version.hpp
+++ b/components/version/version.hpp
@@ -3,25 +3,22 @@
 
 #include <filesystem>
 #include <string>
+#include <string_view>
 
 namespace Version
 {
+    std::string_view getVersion();
+    std::string_view getCommitHash();
+    std::string_view getTagHash();
+    int getLuaApiRevision();
+    int getPostprocessingApiRevision();
 
-    struct Version
-    {
-        std::string mVersion;
-        std::string mCommitHash;
-        std::string mTagHash;
+    // Prepares string that contains version and commit hash.
+    std::string getOpenmwVersionDescription();
 
-        std::string describe() const;
-    };
-
-    /// Read OpenMW version from the version file located in resourcePath.
-    Version getOpenmwVersion(const std::filesystem::path& resourcePath);
-
-    /// Helper function to getOpenmwVersion and describe() it
-    std::string getOpenmwVersionDescription(const std::filesystem::path& resourcePath);
+    bool checkResourcesVersion(const std::filesystem::path& resourcePath);
 
+    std::string_view getDocumentationUrl();
 }
 
 #endif // VERSION_HPP
diff --git a/components/vfs/archive.hpp b/components/vfs/archive.hpp
index e377e8c5b6..bd793b8523 100644
--- a/components/vfs/archive.hpp
+++ b/components/vfs/archive.hpp
@@ -1,34 +1,23 @@
-#ifndef OPENMW_COMPONENTS_RESOURCE_ARCHIVE_H
-#define OPENMW_COMPONENTS_RESOURCE_ARCHIVE_H
+#ifndef OPENMW_COMPONENTS_VFS_ARCHIVE_H
+#define OPENMW_COMPONENTS_VFS_ARCHIVE_H
 
-#include <filesystem>
-#include <map>
+#include <string>
 
-#include <components/files/istreamptr.hpp>
+#include "filemap.hpp"
+#include "pathutil.hpp"
 
 namespace VFS
 {
-
-    class File
-    {
-    public:
-        virtual ~File() = default;
-
-        virtual Files::IStreamPtr open() = 0;
-
-        virtual std::filesystem::path getPath() = 0;
-    };
-
     class Archive
     {
     public:
         virtual ~Archive() = default;
 
         /// List all resources contained in this archive.
-        virtual void listResources(std::map<std::string, File*>& out) = 0;
+        virtual void listResources(FileMap& out) = 0;
 
         /// True if this archive contains the provided normalized file.
-        virtual bool contains(const std::string& file) const = 0;
+        virtual bool contains(Path::NormalizedView file) const = 0;
 
         virtual std::string getDescription() const = 0;
     };
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 517c95e273..664466fa40 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -2,6 +2,7 @@
 #define VFS_BSAARCHIVE_HPP_
 
 #include "archive.hpp"
+#include "file.hpp"
 #include "pathutil.hpp"
 
 #include <components/bsa/ba2dx10file.hpp>
@@ -9,6 +10,10 @@
 #include <components/bsa/bsa_file.hpp>
 #include <components/bsa/compressedbsafile.hpp>
 
+#include <algorithm>
+#include <memory>
+#include <stdexcept>
+
 namespace VFS
 {
     template <typename FileType>
@@ -43,30 +48,21 @@ namespace VFS
             for (Bsa::BSAFile::FileList::const_iterator it = filelist.begin(); it != filelist.end(); ++it)
             {
                 mResources.emplace_back(&*it, mFile.get());
+                mFiles.emplace_back(it->name());
             }
+
+            std::sort(mFiles.begin(), mFiles.end());
         }
 
-        virtual ~BsaArchive() {}
-
-        void listResources(std::map<std::string, File*>& out) override
+        void listResources(FileMap& out) override
         {
             for (auto& resource : mResources)
-            {
-                std::string ent = resource.mInfo->name();
-                Path::normalizeFilenameInPlace(ent);
-
-                out[ent] = &resource;
-            }
+                out[VFS::Path::Normalized(resource.mInfo->name())] = &resource;
         }
 
-        bool contains(const std::string& file) const override
+        bool contains(Path::NormalizedView file) const override
         {
-            for (const auto& it : mResources)
-            {
-                if (Path::pathEqual(file, it.mInfo->name()))
-                    return true;
-            }
-            return false;
+            return std::binary_search(mFiles.begin(), mFiles.end(), file);
         }
 
         std::string getDescription() const override { return std::string{ "BSA: " } + mFile->getFilename(); }
@@ -74,36 +70,27 @@ namespace VFS
     private:
         std::unique_ptr<BSAFileType> mFile;
         std::vector<BsaArchiveFile<BSAFileType>> mResources;
+        std::vector<VFS::Path::Normalized> mFiles;
     };
 
-    template <Bsa::BsaVersion>
-    struct ArchiveSelector
+    inline std::unique_ptr<VFS::Archive> makeBsaArchive(const std::filesystem::path& path)
     {
-    };
+        switch (Bsa::BSAFile::detectVersion(path))
+        {
+            case Bsa::BsaVersion::Unknown:
+                break;
+            case Bsa::BsaVersion::Uncompressed:
+                return std::make_unique<BsaArchive<Bsa::BSAFile>>(path);
+            case Bsa::BsaVersion::Compressed:
+                return std::make_unique<BsaArchive<Bsa::CompressedBSAFile>>(path);
+            case Bsa::BsaVersion::BA2GNRL:
+                return std::make_unique<BsaArchive<Bsa::BA2GNRLFile>>(path);
+            case Bsa::BsaVersion::BA2DX10:
+                return std::make_unique<BsaArchive<Bsa::BA2DX10File>>(path);
+        }
 
-    template <>
-    struct ArchiveSelector<Bsa::BSAVER_UNCOMPRESSED>
-    {
-        using type = BsaArchive<Bsa::BSAFile>;
-    };
-
-    template <>
-    struct ArchiveSelector<Bsa::BSAVER_COMPRESSED>
-    {
-        using type = BsaArchive<Bsa::CompressedBSAFile>;
-    };
-
-    template <>
-    struct ArchiveSelector<Bsa::BSAVER_BA2_GNRL>
-    {
-        using type = BsaArchive<Bsa::BA2GNRLFile>;
-    };
-
-    template <>
-    struct ArchiveSelector<Bsa::BSAVER_BA2_DX10>
-    {
-        using type = BsaArchive<Bsa::BA2DX10File>;
-    };
+        throw std::runtime_error("Unknown archive type '" + Files::pathToUnicodeString(path) + "'");
+    }
 }
 
 #endif
diff --git a/components/vfs/file.hpp b/components/vfs/file.hpp
new file mode 100644
index 0000000000..f2dadb1162
--- /dev/null
+++ b/components/vfs/file.hpp
@@ -0,0 +1,21 @@
+#ifndef OPENMW_COMPONENTS_VFS_FILE_H
+#define OPENMW_COMPONENTS_VFS_FILE_H
+
+#include <filesystem>
+
+#include <components/files/istreamptr.hpp>
+
+namespace VFS
+{
+    class File
+    {
+    public:
+        virtual ~File() = default;
+
+        virtual Files::IStreamPtr open() = 0;
+
+        virtual std::filesystem::path getPath() = 0;
+    };
+}
+
+#endif
diff --git a/components/vfs/filemap.hpp b/components/vfs/filemap.hpp
new file mode 100644
index 0000000000..1b7d390d88
--- /dev/null
+++ b/components/vfs/filemap.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_COMPONENTS_VFS_FILEMAP_H
+#define OPENMW_COMPONENTS_VFS_FILEMAP_H
+
+#include <map>
+#include <string>
+
+namespace VFS
+{
+    class File;
+
+    namespace Path
+    {
+        class Normalized;
+    }
+
+    using FileMap = std::map<Path::Normalized, File*, std::less<>>;
+}
+
+#endif
diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 96f5e87f5e..3303c6656c 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -12,53 +12,54 @@ namespace VFS
 {
 
     FileSystemArchive::FileSystemArchive(const std::filesystem::path& path)
-        : mBuiltIndex(false)
-        , mPath(path)
+        : mPath(path)
     {
-    }
+        const auto str = mPath.u8string();
+        std::size_t prefix = str.size();
 
-    void FileSystemArchive::listResources(std::map<std::string, File*>& out)
-    {
-        if (!mBuiltIndex)
+        if (prefix > 0 && str[prefix - 1] != '\\' && str[prefix - 1] != '/')
+            ++prefix;
+
+        std::filesystem::recursive_directory_iterator iterator(mPath);
+
+        for (auto it = std::filesystem::begin(iterator), end = std::filesystem::end(iterator); it != end;)
         {
-            const auto str = mPath.u8string();
-            size_t prefix = str.size();
+            const std::filesystem::directory_entry& entry = *it;
 
-            if (!mPath.empty() && str[prefix - 1] != '\\' && str[prefix - 1] != '/')
-                ++prefix;
-
-            for (const auto& i : std::filesystem::recursive_directory_iterator(mPath))
+            if (!entry.is_directory())
             {
-                if (std::filesystem::is_directory(i))
-                    continue;
+                const std::filesystem::path& filePath = entry.path();
+                const std::string proper = Files::pathToUnicodeString(filePath);
+                VFS::Path::Normalized searchable(std::string_view{ proper }.substr(prefix));
+                FileSystemArchiveFile file(filePath);
 
-                const auto& path = i.path();
-                const std::string proper = Files::pathToUnicodeString(path);
-
-                FileSystemArchiveFile file(path);
-
-                std::string searchable = Path::normalizeFilename(std::string_view{ proper }.substr(prefix));
-
-                const auto inserted = mIndex.emplace(searchable, file);
+                const auto inserted = mIndex.emplace(std::move(searchable), std::move(file));
                 if (!inserted.second)
                     Log(Debug::Warning)
-                        << "Warning: found duplicate file for '" << proper
+                        << "Found duplicate file for '" << proper
                         << "', please check your file system for two files with the same name in different cases.";
-                else
-                    out[inserted.first->first] = &inserted.first->second;
-            }
-            mBuiltIndex = true;
-        }
-        else
-        {
-            for (index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
-            {
-                out[it->first] = &it->second;
             }
+
+            // Exception thrown by the operator++ may not contain the context of the error like what exact path caused
+            // the problem which makes it hard to understand what's going on when iteration happens over a directory
+            // with thousands of files and subdirectories.
+            const std::filesystem::path prevPath = entry.path();
+            std::error_code ec;
+            it.increment(ec);
+            if (ec != std::error_code())
+                throw std::runtime_error("Failed to recursively iterate over \"" + Files::pathToUnicodeString(mPath)
+                    + "\" when incrementing to the next item from \"" + Files::pathToUnicodeString(prevPath)
+                    + "\": " + ec.message());
         }
     }
 
-    bool FileSystemArchive::contains(const std::string& file) const
+    void FileSystemArchive::listResources(FileMap& out)
+    {
+        for (auto& [k, v] : mIndex)
+            out[k] = &v;
+    }
+
+    bool FileSystemArchive::contains(Path::NormalizedView file) const
     {
         return mIndex.find(file) != mIndex.end();
     }
diff --git a/components/vfs/filesystemarchive.hpp b/components/vfs/filesystemarchive.hpp
index 39d711b327..215c443b58 100644
--- a/components/vfs/filesystemarchive.hpp
+++ b/components/vfs/filesystemarchive.hpp
@@ -2,8 +2,9 @@
 #define OPENMW_COMPONENTS_RESOURCE_FILESYSTEMARCHIVE_H
 
 #include "archive.hpp"
-#include <filesystem>
+#include "file.hpp"
 
+#include <filesystem>
 #include <string>
 
 namespace VFS
@@ -27,17 +28,14 @@ namespace VFS
     public:
         FileSystemArchive(const std::filesystem::path& path);
 
-        void listResources(std::map<std::string, File*>& out) override;
+        void listResources(FileMap& out) override;
 
-        bool contains(const std::string& file) const override;
+        bool contains(Path::NormalizedView file) const override;
 
         std::string getDescription() const override;
 
     private:
-        typedef std::map<std::string, FileSystemArchiveFile> index;
-        index mIndex;
-
-        bool mBuiltIndex;
+        std::map<VFS::Path::Normalized, FileSystemArchiveFile, std::less<>> mIndex;
         std::filesystem::path mPath;
     };
 
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index bfc001e4f2..12ef378017 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -1,16 +1,23 @@
 #include "manager.hpp"
 
-#include <algorithm>
+#include <cassert>
 #include <stdexcept>
 
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>
+#include <components/vfs/recursivedirectoryiterator.hpp>
 
 #include "archive.hpp"
+#include "file.hpp"
 #include "pathutil.hpp"
+#include "recursivedirectoryiterator.hpp"
 
 namespace VFS
 {
+    Manager::Manager() = default;
+
+    Manager::~Manager() = default;
+
     void Manager::reset()
     {
         mIndex.clear();
@@ -30,30 +37,45 @@ namespace VFS
             archive->listResources(mIndex);
     }
 
-    Files::IStreamPtr Manager::get(std::string_view name) const
+    Files::IStreamPtr Manager::find(Path::NormalizedView name) const
     {
-        return getNormalized(Path::normalizeFilename(name));
+        return findNormalized(name.value());
     }
 
-    Files::IStreamPtr Manager::getNormalized(const std::string& normalizedName) const
+    Files::IStreamPtr Manager::get(const Path::Normalized& name) const
     {
-        std::map<std::string, File*>::const_iterator found = mIndex.find(normalizedName);
-        if (found == mIndex.end())
-            throw std::runtime_error("Resource '" + normalizedName + "' not found");
-        return found->second->open();
+        return getNormalized(name);
     }
 
-    bool Manager::exists(std::string_view name) const
+    Files::IStreamPtr Manager::get(Path::NormalizedView name) const
     {
-        return mIndex.find(Path::normalizeFilename(name)) != mIndex.end();
+        return getNormalized(name.value());
     }
 
-    std::string Manager::getArchive(std::string_view name) const
+    Files::IStreamPtr Manager::getNormalized(std::string_view normalizedName) const
+    {
+        assert(Path::isNormalized(normalizedName));
+        auto ptr = findNormalized(normalizedName);
+        if (ptr == nullptr)
+            throw std::runtime_error("Resource '" + std::string(normalizedName) + "' not found");
+        return ptr;
+    }
+
+    bool Manager::exists(const Path::Normalized& name) const
+    {
+        return mIndex.find(name) != mIndex.end();
+    }
+
+    bool Manager::exists(Path::NormalizedView name) const
+    {
+        return mIndex.find(name) != mIndex.end();
+    }
+
+    std::string Manager::getArchive(const Path::Normalized& name) const
     {
-        std::string normalized = Path::normalizeFilename(name);
         for (auto it = mArchives.rbegin(); it != mArchives.rend(); ++it)
         {
-            if ((*it)->contains(normalized))
+            if ((*it)->contains(name))
                 return (*it)->getDescription();
         }
         return {};
@@ -66,27 +88,45 @@ namespace VFS
 
         const auto found = mIndex.find(normalized);
         if (found == mIndex.end())
-            throw std::runtime_error("Resource '" + normalized + "' not found");
+            throw std::runtime_error("Resource '" + normalized + "' is not found");
         return found->second->getPath();
     }
 
-    namespace
-    {
-        bool startsWith(std::string_view text, std::string_view start)
-        {
-            return text.rfind(start, 0) == 0;
-        }
-    }
-
-    Manager::RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator(std::string_view path) const
+    RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator(std::string_view path) const
     {
         if (path.empty())
             return { mIndex.begin(), mIndex.end() };
         std::string normalized = Path::normalizeFilename(path);
         const auto it = mIndex.lower_bound(normalized);
-        if (it == mIndex.end() || !startsWith(it->first, normalized))
+        if (it == mIndex.end() || !it->first.view().starts_with(normalized))
             return { it, it };
         ++normalized.back();
         return { it, mIndex.lower_bound(normalized) };
     }
+
+    RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator(VFS::Path::NormalizedView path) const
+    {
+        if (path.value().empty())
+            return { mIndex.begin(), mIndex.end() };
+        const auto it = mIndex.lower_bound(path);
+        if (it == mIndex.end() || !it->first.view().starts_with(path.value()))
+            return { it, it };
+        std::string copy(path.value());
+        ++copy.back();
+        return { it, mIndex.lower_bound(copy) };
+    }
+
+    RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator() const
+    {
+        return { mIndex.begin(), mIndex.end() };
+    }
+
+    Files::IStreamPtr Manager::findNormalized(std::string_view normalizedPath) const
+    {
+        assert(Path::isNormalized(normalizedPath));
+        const auto it = mIndex.find(normalizedPath);
+        if (it == mIndex.end())
+            return nullptr;
+        return it->second->open();
+    }
 }
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index db38e4b240..b6a9d796cc 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -4,32 +4,18 @@
 #include <components/files/istreamptr.hpp>
 
 #include <filesystem>
-#include <map>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "archive.hpp"
+#include "filemap.hpp"
+#include "pathutil.hpp"
 
 namespace VFS
 {
-
-    template <typename Iterator>
-    class IteratorPair
-    {
-    public:
-        IteratorPair(Iterator first, Iterator last)
-            : mFirst(first)
-            , mLast(last)
-        {
-        }
-        Iterator begin() const { return mFirst; }
-        Iterator end() const { return mLast; }
-
-    private:
-        Iterator mFirst;
-        Iterator mLast;
-    };
+    class Archive;
+    class RecursiveDirectoryRange;
 
     /// @brief The main class responsible for loading files from a virtual file system.
     /// @par Various archive types (e.g. directories on the filesystem, or compressed archives)
@@ -38,29 +24,11 @@ namespace VFS
     /// @par Most of the methods in this class are considered thread-safe, see each method documentation for details.
     class Manager
     {
-        class RecursiveDirectoryIterator
-        {
-        public:
-            RecursiveDirectoryIterator(std::map<std::string, File*>::const_iterator it)
-                : mIt(it)
-            {
-            }
-            const std::string& operator*() const { return mIt->first; }
-            const std::string* operator->() const { return &mIt->first; }
-            bool operator!=(const RecursiveDirectoryIterator& other) { return mIt != other.mIt; }
-            RecursiveDirectoryIterator& operator++()
-            {
-                ++mIt;
-                return *this;
-            }
-
-        private:
-            std::map<std::string, File*>::const_iterator mIt;
-        };
-
-        using RecursiveDirectoryRange = IteratorPair<RecursiveDirectoryIterator>;
-
     public:
+        Manager();
+
+        ~Manager();
+
         // Empty the file index and unregister archives.
         void reset();
 
@@ -73,19 +41,26 @@ namespace VFS
 
         /// Does a file with this name exist?
         /// @note May be called from any thread once the index has been built.
-        bool exists(std::string_view name) const;
+        bool exists(const Path::Normalized& name) const;
+
+        bool exists(Path::NormalizedView name) const;
+
+        // Returns open file if exists or nullptr.
+        Files::IStreamPtr find(Path::NormalizedView name) const;
 
         /// Retrieve a file by name.
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
-        Files::IStreamPtr get(std::string_view name) const;
+        Files::IStreamPtr get(const Path::Normalized& name) const;
+
+        Files::IStreamPtr get(Path::NormalizedView name) const;
 
         /// Retrieve a file by name (name is already normalized).
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
-        Files::IStreamPtr getNormalized(const std::string& normalizedName) const;
+        Files::IStreamPtr getNormalized(std::string_view normalizedName) const;
 
-        std::string getArchive(std::string_view name) const;
+        std::string getArchive(const Path::Normalized& name) const;
 
         /// Recursively iterate over the elements of the given path
         /// In practice it return all files of the VFS starting with the given path
@@ -93,6 +68,10 @@ namespace VFS
         /// @note May be called from any thread once the index has been built.
         RecursiveDirectoryRange getRecursiveDirectoryIterator(std::string_view path) const;
 
+        RecursiveDirectoryRange getRecursiveDirectoryIterator(VFS::Path::NormalizedView path) const;
+
+        RecursiveDirectoryRange getRecursiveDirectoryIterator() const;
+
         /// Retrieve the absolute path to the file
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
@@ -101,7 +80,9 @@ namespace VFS
     private:
         std::vector<std::unique_ptr<Archive>> mArchives;
 
-        std::map<std::string, File*> mIndex;
+        FileMap mIndex;
+
+        inline Files::IStreamPtr findNormalized(std::string_view normalizedPath) const;
     };
 
 }
diff --git a/components/vfs/pathutil.hpp b/components/vfs/pathutil.hpp
index 724b406f1d..f5393617d7 100644
--- a/components/vfs/pathutil.hpp
+++ b/components/vfs/pathutil.hpp
@@ -4,19 +4,34 @@
 #include <components/misc/strings/lower.hpp>
 
 #include <algorithm>
+#include <ostream>
+#include <stdexcept>
 #include <string>
 #include <string_view>
 
 namespace VFS::Path
 {
+    inline constexpr char separator = '/';
+    inline constexpr char extensionSeparator = '.';
+
     inline constexpr char normalize(char c)
     {
-        return c == '\\' ? '/' : Misc::StringUtils::toLower(c);
+        return c == '\\' ? separator : Misc::StringUtils::toLower(c);
+    }
+
+    inline constexpr bool isNormalized(std::string_view name)
+    {
+        return std::all_of(name.begin(), name.end(), [](char v) { return v == normalize(v); });
+    }
+
+    inline void normalizeFilenameInPlace(auto begin, auto end)
+    {
+        std::transform(begin, end, begin, normalize);
     }
 
     inline void normalizeFilenameInPlace(std::string& name)
     {
-        std::transform(name.begin(), name.end(), name.begin(), normalize);
+        normalizeFilenameInPlace(name.begin(), name.end());
     }
 
     /// Normalize the given filename, making slashes/backslashes consistent, and lower-casing.
@@ -51,6 +66,241 @@ namespace VFS::Path
 
         bool operator()(std::string_view left, std::string_view right) const { return pathLess(left, right); }
     };
+
+    inline constexpr auto findSeparatorOrExtensionSeparator(auto begin, auto end)
+    {
+        return std::find_if(begin, end, [](char v) { return v == extensionSeparator || v == separator; });
+    }
+
+    class Normalized;
+
+    class NormalizedView
+    {
+    public:
+        constexpr NormalizedView() noexcept = default;
+
+        constexpr explicit NormalizedView(const char* value)
+            : mValue(value)
+        {
+            if (!isNormalized(mValue))
+                throw std::invalid_argument("NormalizedView value is not normalized: \"" + std::string(mValue) + "\"");
+        }
+
+        NormalizedView(const Normalized& value) noexcept;
+
+        explicit NormalizedView(const std::string&) = delete;
+
+        explicit NormalizedView(std::string&&) = delete;
+
+        constexpr std::string_view value() const noexcept { return mValue; }
+
+        constexpr bool empty() const noexcept { return mValue.empty(); }
+
+        friend constexpr bool operator==(const NormalizedView& lhs, const NormalizedView& rhs) = default;
+
+        friend constexpr bool operator==(const NormalizedView& lhs, const auto& rhs) { return lhs.mValue == rhs; }
+
+#if defined(_MSC_VER) && _MSC_VER <= 1935
+        friend constexpr bool operator==(const auto& lhs, const NormalizedView& rhs)
+        {
+            return lhs == rhs.mValue;
+        }
+#endif
+
+        friend constexpr bool operator<(const NormalizedView& lhs, const NormalizedView& rhs)
+        {
+            return lhs.mValue < rhs.mValue;
+        }
+
+        friend constexpr bool operator<(const NormalizedView& lhs, const auto& rhs)
+        {
+            return lhs.mValue < rhs;
+        }
+
+        friend constexpr bool operator<(const auto& lhs, const NormalizedView& rhs)
+        {
+            return lhs < rhs.mValue;
+        }
+
+        friend std::ostream& operator<<(std::ostream& stream, const NormalizedView& value)
+        {
+            return stream << value.mValue;
+        }
+
+    private:
+        std::string_view mValue;
+    };
+
+    class Normalized
+    {
+    public:
+        Normalized() = default;
+
+        explicit Normalized(std::string_view value)
+            : mValue(normalizeFilename(value))
+        {
+        }
+
+        explicit Normalized(const char* value)
+            : Normalized(std::string_view(value))
+        {
+        }
+
+        Normalized(const std::string& value)
+            : Normalized(std::string_view(value))
+        {
+        }
+
+        explicit Normalized(std::string&& value)
+            : mValue(std::move(value))
+        {
+            normalizeFilenameInPlace(mValue);
+        }
+
+        explicit Normalized(NormalizedView value)
+            : mValue(value.value())
+        {
+        }
+
+        const std::string& value() const& { return mValue; }
+
+        std::string value() && { return std::move(mValue); }
+
+        std::string_view view() const { return mValue; }
+
+        bool empty() const { return mValue.empty(); }
+
+        operator std::string_view() const { return mValue; }
+
+        operator const std::string&() const { return mValue; }
+
+        bool changeExtension(std::string_view extension)
+        {
+            if (findSeparatorOrExtensionSeparator(extension.begin(), extension.end()) != extension.end())
+                throw std::invalid_argument("Invalid extension: " + std::string(extension));
+            const auto it = findSeparatorOrExtensionSeparator(mValue.rbegin(), mValue.rend());
+            if (it == mValue.rend() || *it == separator)
+                return false;
+            const std::string::difference_type pos = mValue.rend() - it;
+            mValue.replace(pos, mValue.size(), extension);
+            normalizeFilenameInPlace(mValue.begin() + pos, mValue.end());
+            return true;
+        }
+
+        void clear() { mValue.clear(); }
+
+        Normalized& operator=(NormalizedView value)
+        {
+            mValue = value.value();
+            return *this;
+        }
+
+        Normalized& operator/=(NormalizedView value)
+        {
+            mValue.reserve(mValue.size() + value.value().size() + 1);
+            mValue += separator;
+            mValue += value.value();
+            return *this;
+        }
+
+        Normalized& operator/=(std::string_view value)
+        {
+            mValue.reserve(mValue.size() + value.size() + 1);
+            mValue += separator;
+            const std::size_t offset = mValue.size();
+            mValue += value;
+            normalizeFilenameInPlace(mValue.begin() + offset, mValue.end());
+            return *this;
+        }
+
+        friend bool operator==(const Normalized& lhs, const Normalized& rhs) = default;
+
+        friend bool operator==(const Normalized& lhs, const auto& rhs) { return lhs.mValue == rhs; }
+
+#if defined(_MSC_VER) && _MSC_VER <= 1935
+        friend bool operator==(const auto& lhs, const Normalized& rhs)
+        {
+            return lhs == rhs.mValue;
+        }
+#endif
+
+        friend bool operator==(const Normalized& lhs, const NormalizedView& rhs)
+        {
+            return lhs.mValue == rhs.value();
+        }
+
+        friend bool operator<(const Normalized& lhs, const Normalized& rhs)
+        {
+            return lhs.mValue < rhs.mValue;
+        }
+
+        friend bool operator<(const Normalized& lhs, const auto& rhs)
+        {
+            return lhs.mValue < rhs;
+        }
+
+        friend bool operator<(const auto& lhs, const Normalized& rhs)
+        {
+            return lhs < rhs.mValue;
+        }
+
+        friend bool operator<(const Normalized& lhs, const NormalizedView& rhs)
+        {
+            return lhs.mValue < rhs.value();
+        }
+
+        friend bool operator<(const NormalizedView& lhs, const Normalized& rhs)
+        {
+            return lhs.value() < rhs.mValue;
+        }
+
+        friend std::ostream& operator<<(std::ostream& stream, const Normalized& value)
+        {
+            return stream << value.mValue;
+        }
+
+    private:
+        std::string mValue;
+    };
+
+    inline NormalizedView::NormalizedView(const Normalized& value) noexcept
+        : mValue(value.view())
+    {
+    }
+
+    inline Normalized operator/(NormalizedView lhs, NormalizedView rhs)
+    {
+        Normalized result(lhs);
+        result /= rhs;
+        return result;
+    }
+
+    struct Hash
+    {
+        using is_transparent = void;
+
+        [[nodiscard]] std::size_t operator()(std::string_view sv) const { return std::hash<std::string_view>{}(sv); }
+
+        [[nodiscard]] std::size_t operator()(const std::string& s) const { return std::hash<std::string>{}(s); }
+
+        [[nodiscard]] std::size_t operator()(const Normalized& s) const { return std::hash<std::string>{}(s.value()); }
+
+        [[nodiscard]] std::size_t operator()(NormalizedView s) const
+        {
+            return std::hash<std::string_view>{}(s.value());
+        }
+    };
+
+    // A special function to be removed once conversion to VFS::Path::Normalized* is complete
+    template <class T>
+    Normalized toNormalized(T&& value)
+    {
+        return Normalized(std::forward<T>(value));
+    }
+
+    Normalized toNormalized(NormalizedView value) = delete;
+
+    Normalized toNormalized(Normalized value) = delete;
 }
 
 #endif
diff --git a/components/vfs/qtconversion.cpp b/components/vfs/qtconversion.cpp
new file mode 100644
index 0000000000..472e3dd0b4
--- /dev/null
+++ b/components/vfs/qtconversion.cpp
@@ -0,0 +1,26 @@
+
+#include "qtconversion.hpp"
+
+#include <components/misc/strings/conversion.hpp>
+
+QString VFS::Path::normalizedToQString(NormalizedView path)
+{
+    return QString::fromUtf8(path.value().data(), path.value().size());
+}
+
+QString VFS::Path::normalizedToQString(Normalized&& path)
+{
+    return QString::fromUtf8(path.value().data(), path.value().size());
+}
+
+VFS::Path::Normalized VFS::Path::normalizedFromQString(QStringView path)
+{
+    const auto tmp = path.toUtf8();
+    return Normalized{ tmp };
+}
+
+VFS::Path::Normalized VFS::Path::normalizedFromQString(QString&& path)
+{
+    const auto tmp = path.toUtf8();
+    return Normalized{ tmp };
+}
diff --git a/components/vfs/qtconversion.hpp b/components/vfs/qtconversion.hpp
new file mode 100644
index 0000000000..b4ec7ab1a4
--- /dev/null
+++ b/components/vfs/qtconversion.hpp
@@ -0,0 +1,19 @@
+#ifndef COMPONENTS_VFS_QTCONVERSION_HPP
+#define COMPONENTS_VFS_QTCONVERSION_HPP
+
+#include <QString>
+
+#include "pathutil.hpp"
+
+namespace VFS::Path
+{
+    QString normalizedToQString(NormalizedView path);
+
+    QString normalizedToQString(Normalized&& path);
+
+    Normalized normalizedFromQString(QStringView path);
+
+    Normalized normalizedFromQString(QString&& path);
+}
+
+#endif // COMPONENTS_VFS_QTCONVERSION_HPP
diff --git a/components/vfs/recursivedirectoryiterator.hpp b/components/vfs/recursivedirectoryiterator.hpp
new file mode 100644
index 0000000000..3410a2092b
--- /dev/null
+++ b/components/vfs/recursivedirectoryiterator.hpp
@@ -0,0 +1,54 @@
+#ifndef OPENMW_COMPONENTS_VFS_RECURSIVEDIRECTORYITERATOR_H
+#define OPENMW_COMPONENTS_VFS_RECURSIVEDIRECTORYITERATOR_H
+
+#include <string>
+
+#include "filemap.hpp"
+#include "pathutil.hpp"
+
+namespace VFS
+{
+    class RecursiveDirectoryIterator
+    {
+    public:
+        RecursiveDirectoryIterator(FileMap::const_iterator it)
+            : mIt(it)
+        {
+        }
+
+        const Path::Normalized& operator*() const { return mIt->first; }
+
+        const Path::Normalized* operator->() const { return &mIt->first; }
+
+        RecursiveDirectoryIterator& operator++()
+        {
+            ++mIt;
+            return *this;
+        }
+
+        friend bool operator==(const RecursiveDirectoryIterator& lhs, const RecursiveDirectoryIterator& rhs) = default;
+
+    private:
+        FileMap::const_iterator mIt;
+    };
+
+    class RecursiveDirectoryRange
+    {
+    public:
+        RecursiveDirectoryRange(RecursiveDirectoryIterator first, RecursiveDirectoryIterator last)
+            : mBegin(first)
+            , mEnd(last)
+        {
+        }
+
+        RecursiveDirectoryIterator begin() const { return mBegin; }
+
+        RecursiveDirectoryIterator end() const { return mEnd; }
+
+    private:
+        RecursiveDirectoryIterator mBegin;
+        RecursiveDirectoryIterator mEnd;
+    };
+}
+
+#endif
diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index 9dbe878bca..f017b5f73c 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -25,18 +25,7 @@ namespace VFS
                 // Last BSA has the highest priority
                 const auto archivePath = collections.getPath(*archive);
                 Log(Debug::Info) << "Adding BSA archive " << archivePath;
-                Bsa::BsaVersion bsaVersion = Bsa::BSAFile::detectVersion(archivePath);
-
-                if (bsaVersion == Bsa::BSAVER_COMPRESSED)
-                    vfs->addArchive(std::make_unique<ArchiveSelector<Bsa::BSAVER_COMPRESSED>::type>(archivePath));
-                else if (bsaVersion == Bsa::BSAVER_BA2_GNRL)
-                    vfs->addArchive(std::make_unique<ArchiveSelector<Bsa::BSAVER_BA2_GNRL>::type>(archivePath));
-                else if (bsaVersion == Bsa::BSAVER_BA2_DX10)
-                    vfs->addArchive(std::make_unique<ArchiveSelector<Bsa::BSAVER_BA2_DX10>::type>(archivePath));
-                else if (bsaVersion == Bsa::BSAVER_UNCOMPRESSED)
-                    vfs->addArchive(std::make_unique<ArchiveSelector<Bsa::BSAVER_UNCOMPRESSED>::type>(archivePath));
-                else
-                    throw std::runtime_error("Unknown archive type '" + *archive + "'");
+                vfs->addArchive(makeBsaArchive(archivePath));
             }
             else
             {
diff --git a/components/widgets/box.cpp b/components/widgets/box.cpp
index 642721b807..d711925656 100644
--- a/components/widgets/box.cpp
+++ b/components/widgets/box.cpp
@@ -40,7 +40,7 @@ namespace Gui
         notifySizeChange(this);
     }
 
-    void AutoSizedTextBox::setPropertyOverride(const std::string& _key, const std::string& _value)
+    void AutoSizedTextBox::setPropertyOverride(std::string_view _key, std::string_view _value)
     {
         if (_key == "ExpandDirection")
         {
@@ -103,7 +103,7 @@ namespace Gui
         setEditStatic(true);
     }
 
-    void AutoSizedEditBox::setPropertyOverride(const std::string& _key, const std::string& _value)
+    void AutoSizedEditBox::setPropertyOverride(std::string_view _key, std::string_view _value)
     {
         if (_key == "ExpandDirection")
         {
@@ -136,7 +136,7 @@ namespace Gui
         notifySizeChange(this);
     }
 
-    void AutoSizedButton::setPropertyOverride(const std::string& _key, const std::string& _value)
+    void AutoSizedButton::setPropertyOverride(std::string_view _key, std::string_view _value)
     {
         if (_key == "ExpandDirection")
         {
@@ -147,6 +147,7 @@ namespace Gui
             Gui::Button::setPropertyOverride(_key, _value);
         }
     }
+
     Box::Box()
         : mSpacing(4)
         , mPadding(0)
@@ -159,7 +160,7 @@ namespace Gui
         align();
     }
 
-    bool Box::_setPropertyImpl(const std::string& _key, const std::string& _value)
+    bool Box::_setPropertyImpl(std::string_view _key, std::string_view _value)
     {
         if (_key == "Spacing")
             mSpacing = MyGUI::utility::parseValue<int>(_value);
@@ -260,7 +261,7 @@ namespace Gui
         }
     }
 
-    void HBox::setPropertyOverride(const std::string& _key, const std::string& _value)
+    void HBox::setPropertyOverride(std::string_view _key, std::string_view _value)
     {
         if (!Box::_setPropertyImpl(_key, _value))
             MyGUI::Widget::setPropertyOverride(_key, _value);
@@ -415,7 +416,7 @@ namespace Gui
         }
     }
 
-    void VBox::setPropertyOverride(const std::string& _key, const std::string& _value)
+    void VBox::setPropertyOverride(std::string_view _key, std::string_view _value)
     {
         if (!Box::_setPropertyImpl(_key, _value))
             MyGUI::Widget::setPropertyOverride(_key, _value);
diff --git a/components/widgets/box.hpp b/components/widgets/box.hpp
index b5fcc8e9b6..83cbddb3b0 100644
--- a/components/widgets/box.hpp
+++ b/components/widgets/box.hpp
@@ -53,7 +53,7 @@ namespace Gui
         void setCaption(const MyGUI::UString& _value) override;
 
     protected:
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+        void setPropertyOverride(std::string_view _key, std::string_view _value) override;
         std::string mFontSize;
     };
 
@@ -68,7 +68,7 @@ namespace Gui
         void initialiseOverride() override;
 
     protected:
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+        void setPropertyOverride(std::string_view _key, std::string_view _value) override;
         int getWidth();
         std::string mFontSize;
         bool mShrink = false;
@@ -85,7 +85,7 @@ namespace Gui
         void setCaption(const MyGUI::UString& _value) override;
 
     protected:
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+        void setPropertyOverride(std::string_view _key, std::string_view _value) override;
         std::string mFontSize;
     };
 
@@ -105,7 +105,7 @@ namespace Gui
     protected:
         virtual void align() = 0;
 
-        virtual bool _setPropertyImpl(const std::string& _key, const std::string& _value);
+        virtual bool _setPropertyImpl(std::string_view _key, std::string_view _value);
 
         int mSpacing; // how much space to put between elements
 
@@ -137,7 +137,7 @@ namespace Gui
         void align() override;
         MyGUI::IntSize getRequestedSize() override;
 
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+        void setPropertyOverride(std::string_view _key, std::string_view _value) override;
 
         void onWidgetCreated(MyGUI::Widget* _widget) override;
     };
@@ -156,7 +156,7 @@ namespace Gui
         void align() override;
         MyGUI::IntSize getRequestedSize() override;
 
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+        void setPropertyOverride(std::string_view _key, std::string_view _value) override;
 
         void onWidgetCreated(MyGUI::Widget* _widget) override;
     };
diff --git a/components/widgets/fontwrapper.hpp b/components/widgets/fontwrapper.hpp
index f2c30376b9..813d323f99 100644
--- a/components/widgets/fontwrapper.hpp
+++ b/components/widgets/fontwrapper.hpp
@@ -5,35 +5,20 @@
 
 #include "components/settings/values.hpp"
 
-#include <algorithm>
+#include <string>
 
 namespace Gui
 {
+    /// Wrapper to tell UI element to use font size from settings.cfg
     template <class T>
     class FontWrapper : public T
     {
-#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 2)
     public:
-        void setFontName(const std::string& name) override
+        void setFontName(std::string_view name) override
         {
             T::setFontName(name);
             T::setPropertyOverride("FontHeight", std::to_string(Settings::gui().mFontSize));
         }
-
-    protected:
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override
-        {
-            T::setPropertyOverride(_key, _value);
-
-            // https://github.com/MyGUI/mygui/issues/113
-            // There is a bug in MyGUI: when it initializes the FontName property, it reset the font height.
-            // We should restore it.
-            if (_key == "FontName")
-            {
-                T::setPropertyOverride("FontHeight", std::to_string(Settings::gui().mFontSize));
-            }
-        }
-#endif
     };
 }
 
diff --git a/components/widgets/imagebutton.cpp b/components/widgets/imagebutton.cpp
index 0eb193aea3..01fbd66cd5 100644
--- a/components/widgets/imagebutton.cpp
+++ b/components/widgets/imagebutton.cpp
@@ -34,7 +34,7 @@ namespace Gui
         updateImage();
     }
 
-    void ImageButton::setPropertyOverride(const std::string& _key, const std::string& _value)
+    void ImageButton::setPropertyOverride(std::string_view _key, std::string_view _value)
     {
         if (_key == "ImageHighlighted")
             mImageHighlighted = _value;
@@ -56,6 +56,7 @@ namespace Gui
         else
             ImageBox::setPropertyOverride(_key, _value);
     }
+
     void ImageButton::onMouseSetFocus(Widget* _old)
     {
         mMouseFocus = true;
diff --git a/components/widgets/imagebutton.hpp b/components/widgets/imagebutton.hpp
index 923f168ba4..90b5e6339e 100644
--- a/components/widgets/imagebutton.hpp
+++ b/components/widgets/imagebutton.hpp
@@ -32,7 +32,7 @@ namespace Gui
         static bool sDefaultNeedKeyFocus;
 
     protected:
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+        void setPropertyOverride(std::string_view _key, std::string_view _value) override;
         void onMouseLostFocus(MyGUI::Widget* _new) override;
         void onMouseSetFocus(MyGUI::Widget* _old) override;
         void onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id) override;
diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp
index b4784299a5..896057443c 100644
--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@@ -107,7 +107,7 @@ namespace Gui
         mScrollView->setViewOffset(MyGUI::IntPoint(0, -viewPosition));
     }
 
-    void MWList::setPropertyOverride(const std::string& _key, const std::string& _value)
+    void MWList::setPropertyOverride(std::string_view _key, std::string_view _value)
     {
         if (_key == "ListItemSkin")
             mListItemSkin = _value;
diff --git a/components/widgets/list.hpp b/components/widgets/list.hpp
index 88368e0794..3d5e320cf7 100644
--- a/components/widgets/list.hpp
+++ b/components/widgets/list.hpp
@@ -49,7 +49,7 @@ namespace Gui
 
         void scrollToTop();
 
-        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+        void setPropertyOverride(std::string_view _key, std::string_view _value) override;
 
     protected:
         void initialiseOverride() override;
diff --git a/components/widgets/sharedstatebutton.cpp b/components/widgets/sharedstatebutton.cpp
index ff24db1cfb..2d8070b0fb 100644
--- a/components/widgets/sharedstatebutton.cpp
+++ b/components/widgets/sharedstatebutton.cpp
@@ -116,7 +116,7 @@ namespace Gui
         }
     }
 
-    void SharedStateButton::createButtonGroup(ButtonGroup group)
+    void SharedStateButton::createButtonGroup(ButtonGroup& group)
     {
         for (ButtonGroup::iterator it = group.begin(); it != group.end(); ++it)
         {
diff --git a/components/widgets/sharedstatebutton.hpp b/components/widgets/sharedstatebutton.hpp
index 688d949f6e..33dd70c763 100644
--- a/components/widgets/sharedstatebutton.hpp
+++ b/components/widgets/sharedstatebutton.hpp
@@ -38,7 +38,7 @@ namespace Gui
         void shareStateWith(const ButtonGroup& shared);
 
         /// @note The ButtonGroup connection will be destroyed when any widget in the group gets destroyed.
-        static void createButtonGroup(ButtonGroup group);
+        static void createButtonGroup(ButtonGroup& group);
 
         //! Set button selected state
         void setStateSelected(bool _value);
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 9bfff7e9f2..333fa4fcce 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
 parse_cmake
-sphinx==1.8.5
-docutils==0.17.1
-jinja2==3.0.0
-sphinx_rtd_theme
+sphinx==7.1.2
+docutils==0.18.1
+jinja2==3.1.4
+sphinx_rtd_theme==3.0.1
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 207c3f7c13..fbce7975da 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -55,7 +55,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'OpenMW'
-copyright = u'2023, OpenMW Team'
+copyright = u'2024, OpenMW Team'
 
 
 # The version info for the project you're documenting, acts as replacement for
@@ -66,21 +66,34 @@ copyright = u'2023, OpenMW Team'
 # The full version, including alpha/beta/rc tags.
 
 release = version = "UNRELEASED"
+luaApiRevision = "UNKNOWN"
+ppApiRevision = "UNDEFINED"
 
 try:
     cmake_raw = open(project_root+'/CMakeLists.txt', 'r').read()
-    majorVersionMatch = re.search('set\(OPENMW_VERSION_MAJOR (\d+)\)', cmake_raw)
-    minorVersionMatch = re.search('set\(OPENMW_VERSION_MINOR (\d+)\)', cmake_raw)
-    releaseVersionMatch = re.search('set\(OPENMW_VERSION_RELEASE (\d+)\)', cmake_raw)
+    majorVersionMatch = re.search(r'set\(OPENMW_VERSION_MAJOR (\d+)\)', cmake_raw)
+    minorVersionMatch = re.search(r'set\(OPENMW_VERSION_MINOR (\d+)\)', cmake_raw)
+    releaseVersionMatch = re.search(r'set\(OPENMW_VERSION_RELEASE (\d+)\)', cmake_raw)
     if majorVersionMatch and minorVersionMatch and releaseVersionMatch:
         release = version = '.'.join((majorVersionMatch.group(1),
                                      minorVersionMatch.group(1),
                                      releaseVersionMatch.group(1)))
+    luaApiRevisionMatch = re.search(r'set\(OPENMW_LUA_API_REVISION (\d+)\)', cmake_raw)
+    if luaApiRevisionMatch:
+        luaApiRevision = luaApiRevisionMatch.group(1)
+    ppApiRevisionMatch = re.search(r'set\(OPENMW_POSTPROCESSING_API_REVISION (\d+)\)', cmake_raw)
+    if ppApiRevisionMatch:
+        ppApiRevision = ppApiRevisionMatch.group(1)
 
 except Exception as ex:
     print("WARNING: Version will be set to '{0}' because: '{1}'.".format(release, str(ex)))
     import traceback; traceback.print_exc()
 
+rst_prolog = f"""
+.. |luaApiRevision| replace:: {luaApiRevision}
+.. |ppApiRevision| replace:: {ppApiRevision}
+"""
+
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = cpp
@@ -130,7 +143,10 @@ html_theme = 'sphinx_rtd_theme'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    'navigation_with_keys': True,
+    'flyout_display': 'attached',
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
@@ -163,8 +179,8 @@ def setup(app):
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = [
-                    '_static'
-                    ]
+    '_static'
+]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
diff --git a/docs/source/install_luadocumentor_in_docker.sh b/docs/source/install_luadocumentor_in_docker.sh
index a1ec253600..5d37a37351 100755
--- a/docs/source/install_luadocumentor_in_docker.sh
+++ b/docs/source/install_luadocumentor_in_docker.sh
@@ -1,3 +1,5 @@
+#!/bin/bash -e
+
 if [ ! -f /.dockerenv ] && [ ! -f /home/docs/omw_luadoc_docker ]; then
     echo 'This script installs lua-5.1, luarocks, and openmwluadocumentor to $HOME. Should be used only in docker.'
     exit 1
@@ -5,7 +7,8 @@ fi
 
 echo "Install lua 5.1"
 cd ~
-curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz
+curl -R -O https://gitlab.com/OpenMW/openmw-deps/-/raw/main/lua/lua-5.1.5.tar.gz
+echo "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 lua-5.1.5.tar.gz" | sha256sum -c
 tar -zxf lua-5.1.5.tar.gz
 rm lua-5.1.5.tar.gz
 cd lua-5.1.5/
@@ -15,7 +18,8 @@ PATH=$PATH:~/lua-5.1.5/src
 
 echo "Install luarocks"
 luarocksV="3.9.2"
-wget https://luarocks.org/releases/luarocks-$luarocksV.tar.gz
+wget https://gitlab.com/OpenMW/openmw-deps/-/raw/main/lua/luarocks-$luarocksV.tar.gz
+echo "bca6e4ecc02c203e070acdb5f586045d45c078896f6236eb46aa33ccd9b94edb luarocks-$luarocksV.tar.gz" | sha256sum -c
 tar zxpf luarocks-$luarocksV.tar.gz
 rm luarocks-$luarocksV.tar.gz
 cd luarocks-$luarocksV/
@@ -28,8 +32,8 @@ PATH=$PATH:~/luarocks/bin
 
 echo "Install openmwluadocumentor"
 git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git
-git checkout 78577b255d19a1f4f4f539662e00357936b73c33
 cd openmw-luadocumentor
+git checkout 78577b255d19a1f4f4f539662e00357936b73c33
 luarocks make luarocks/openmwluadocumentor-0.2.0-1.rockspec
 cd ~
 rm -r openmw-luadocumentor
diff --git a/docs/source/luadoc_data_paths.sh b/docs/source/luadoc_data_paths.sh
index c4322dbc0a..997d5846af 100755
--- a/docs/source/luadoc_data_paths.sh
+++ b/docs/source/luadoc_data_paths.sh
@@ -2,10 +2,15 @@ paths=(
   openmw_aux/*lua
   scripts/omw/activationhandlers.lua
   scripts/omw/ai.lua
-  scripts/omw/playercontrols.lua
+  scripts/omw/input/playercontrols.lua
+  scripts/omw/mechanics/animationcontroller.lua
+  scripts/omw/input/gamepadcontrols.lua
   scripts/omw/camera/camera.lua
   scripts/omw/mwui/init.lua
   scripts/omw/settings/player.lua
   scripts/omw/ui.lua
+  scripts/omw/usehandlers.lua
+  scripts/omw/skillhandlers.lua
+  scripts/omw/crimes.lua
 )
-printf '%s\n' "${paths[@]}"
\ No newline at end of file
+printf '%s\n' "${paths[@]}"
diff --git a/docs/source/manuals/installation/install-game-files.rst b/docs/source/manuals/installation/install-game-files.rst
index 57460c4983..8a7a594691 100644
--- a/docs/source/manuals/installation/install-game-files.rst
+++ b/docs/source/manuals/installation/install-game-files.rst
@@ -68,18 +68,40 @@ You will find ``Morrowind.esm`` there.
 Users of other platforms running Wine, will find it at
 ``~/.wine/drive_c/Program Files/Bethesda Softworks/Morrowind``
 
------
-Steam
------
+Innoextract
+^^^^^^^^^^^
 
-Windows
--------
+macOS and Linux
+~~~~~~~~~~~~~~~
 
-Windows users can download Morrowind through Steam.
-Afterwards, you can point OpenMW to the Steam install location at
-``C:\Program Files\Steam\SteamApps\common\Morrowind\Data Files\``
-and find ``Morrowind.esm`` there.
+If you have purchased "The Elder Scrolls III: Morrowind" `from GOG <https://www.gog.com/en/game/the_elder_scrolls_iii_morrowind_goty_edition>`_ and wish to extract the game files on a Linux system without using Wine, or on macOS, you can do so using `innoextract <https://constexpr.org/innoextract/>`_. First install innoextract.
 
+For Distributions Using `apt` (e.g., Ubuntu, Debian)
+++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+.. code:: console
+
+    sudo apt update
+    sudo apt install innoextract
+
+For macOS using Homebrew
+++++++++++++++++++++++++
+
+.. code:: console
+
+    brew install innoextract
+
+Once innoextract is installed, download the game from GOG. The downloaded file should be called ``setup_tes_morrowind_goty_2.0.0.7.exe`` or something similar. When ``innoextract`` is run on it, it will extract the files directly into the folder the ``setup.exe`` file is located. If you have a specific folder where you want it to be extracted to, for example in ``~/Documents/Games/Morrowind`` You can specify it with the ``-d`` flag.
+
+.. code:: console
+
+    $ innoextract ./setup_tes_morrowind_goty_2.0.0.7.exe -d ~/Documents/Games/Morrowind/
+
+Assuming you used the filepath above, your ``.esm`` files will be located in ``~/Documents/Games/Morrowind/app/Data Files/``.
+
+You can now run the OpenMW launcher, and from there run the installation wizard. Point it to your ``Morrowind.esm`` in the folder you extracted it to, and follow the instructions.
+
+---------------------
 XBox Game Pass for PC
 ---------------------
 
@@ -92,8 +114,21 @@ option and the app will prompt you to move the Morrowind files to a
 new folder. Once done you can find ``Morrowind.esm`` in the folder you 
 chose.
 
-macOS
 -----
+Steam
+-----
+
+Windows
+^^^^^^^
+
+Windows users can download Morrowind through Steam.
+Afterwards, you can point OpenMW to the Steam install location at
+``C:\Program Files\Steam\SteamApps\common\Morrowind\Data Files\``
+and find ``Morrowind.esm`` there.
+
+
+macOS
+^^^^^
 
 If you are running macOS, you can also download Morrowind through Steam:
 
@@ -118,9 +153,9 @@ If you are running macOS, you can also download Morrowind through Steam:
 	``~/Library/Application Support/Steam/steamapps/common/The Elder Scrolls III - Morrowind/Data Files/``
 
 Linux
------
+^^^^^
 Debian/Ubuntu - using "Steam Proton" & "OpenMW launcher".
----------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #. Install Steam from "Ubuntu Software" Center  
 #. Enable Proton (basically WINE under the hood). This is done in the Steam client menu drop down. Select, "Steam | Settings" then in the "SteamPlay" section check the box next to "enable steam play for all other titles"  
 #. Now Morrowind should be selectable in your game list (as long as you own it). You can install it like any other game, choose to install it and remember the directory path of the location you pick.
@@ -128,10 +163,10 @@ Debian/Ubuntu - using "Steam Proton" & "OpenMW launcher".
 #. Launch "OpenMW launcher" and follow the setup wizard, when asked, point it at the location you installed Morrowind to, we will be looking for the directory that contains the Morrowing.esm file, for example '/steam library/steamapps/common/Morrowind/Data Files/'.
 #. Everything should now be in place, click that big "PLAY" button and fire up OpenMW.
 
-Nb. Bloodmoon.esm needs to be below Tribunal.esm in your datafiles list, if you dont have the right order a red "!" will apear next to the filename in the datafiles section of the OpenMW launcher, just drag bloodmoon below tribunal to fix it.
+Note, Bloodmoon.esm needs to be below Tribunal.esm in your datafiles list, if you don't have the right order a red "!" will apear next to the filename in the datafiles section of the OpenMW launcher, just drag bloodmoon below tribunal to fix it.
 
 Wine
-----
+~~~~
 
 Users of other platforms running Wine can run Steam within it
 and find ``Morrowind.esm`` at
diff --git a/docs/source/manuals/openmw-cs/tour.rst b/docs/source/manuals/openmw-cs/tour.rst
index fbd4fd0478..4c21cde401 100644
--- a/docs/source/manuals/openmw-cs/tour.rst
+++ b/docs/source/manuals/openmw-cs/tour.rst
@@ -52,7 +52,7 @@ a blank window rather than a table choose *World* → *Objects* from the menu.
 
 Let's talk about the interface for a second. Every window in OpenMW CS has
 *panels*, these are often but not always tables. You can close a panel by
-clicking the small "X" on the title bar of the panel, or you can detach it by
+clicking the small *X* on the title bar of the panel, or you can detach it by
 either dragging the title bar or clicking the icon with the two windows. A
 detached panel can be re-attached to a window by dragging it by the title bar
 on top of the window.
@@ -118,7 +118,7 @@ Finding records using filters
 We will add an icon first. Open the *Icons* table the same way you opened the
 *Objects* table: in the menu click *Assets* → *Icons*. If the window gets too
 crowded remember that you can detach panels. The table is huge and not every
-ring icon starts with "ring", so we have to use filters to find what we want.
+ring icon starts with :code:`ring`, so we have to use filters to find what we want.
 
 Filters are a central element of OpenMW CS and a major departure from how the
 original Morrowind CS was used. In fact, filters are so important that they
@@ -143,8 +143,8 @@ whether `<property>` matches `<pattern>`. The pattern is a regular expression,
 if you don't know about them you should learn their syntax. For now all that
 matters is that `.` stands for any character and `*` stands for any amount,
 even zero. In other words, we are looking for all entries which have an ID that
-contains the word "ring" somewhere in it. This is a pretty dumb pattern because
-it will also match words like "ringmail", but it's good enough for now.
+contains the word :code:`ring` somewhere in it. This is a pretty dumb pattern because
+it will also match words like :code:`ringmail`, but it's good enough for now.
 
 If you have typed the filter definition properly the text should change from
 red to black and our table will be narrowed down a lot. Browse for an icon you
@@ -225,7 +225,7 @@ and he's easy to find in the CS as his name comes early alphabetically.
    :alt: Putting the ring into Arrille's inventory
 
 Open the CS and open the *Objects* table (*World* → *Objects*).
-Scroll down to Arrille, or use a filter like !string("ID","arrille").
+Scroll down to Arrille, or use a filter like :code:`!string("ID","arrille")`.
 
 Open another pane to edit him - either right click and select edit or use the
 shortcut (default is shift double-click). Scroll down to the inventory section
@@ -242,8 +242,8 @@ Fargoth to give it to the player in exchange for his healing ring.
 .. figure:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/manuals/openmw-cs/_static/images/chapter-1/Ring_to_Fargoth_1.png
    :alt: Editing Fargoth to give ring to player
 
-Open the *Topicinfo* Table (*Characters* → *Topic Infos*). Use a filter !string(Topic,ring)
-and select the row with a response starting with "You found it!". Edit the record,
+Open the *Topicinfo* Table (*Characters* → *Topic Infos*). Use a filter :code:`!string(Topic,ring)`
+and select the row with a response starting with :code:`You found it!`. Edit the record,
 firstly by adding a bit more to the response, then by adding a line to the script
 to give the ring to the player - the same as used earlier in the console
 
@@ -265,65 +265,64 @@ in the game, or by applying a similar process in the CS -
 
 World/Cells
 
-Select "Seyda Neen, Census and Excise Office"
+Select `Seyda Neen, Census and Excise Office`
 
-Right-click and select "View"
+Right-click and select *View*
 
 Use mouse wheel to zoom in/out, and mouse plus WASD keys to navigate
 
 Click on the small chest
 
-Either way, you should find the ID, which is "chest_small_02_lockprac".
+Either way, you should find the ID, which is :code:`chest_small_02_lockprac`.
 
-Open the Objects table (World/Objects) and scroll down to find this item.
+Open the *Objects* table (*World* → *Objects*) and scroll down to find this item.
 
 Alternatively use the Edit/Search facility, selecting ID rather than text,
-enter "lockprac" (without the quotes) into the search box, press "Search",
-which should return two rows, then select the "Container" one rather than the "Instance"
+enter `lockprac` into the search box, press *Search*,
+which should return two rows, then select the *Container* one rather than the *Instance*
 
-Right-click and "Edit Record".
+Right-click and *Edit Record*.
 
-Right-click the "Content" section and select "Add a row"
+Right-click the *Content* section and select *Add a row*
 
-Set the Item ID of the new row to be your new ring - simplest way is probably to open the Objects
-table if it's not already open, sort on the "Modified" column which should bring the ring,
-with its status of "Added" to the top, then drag and drop to the chest row.
+Set the Item ID of the new row to be your new ring - simplest way is probably to open the *Objects*
+table if it's not already open, sort on the *Modified* column which should bring the ring,
+with its status of *Added* to the top, then drag and drop to the chest row.
 
-Increase the Count to 1.
+Increase the *Count* to :code:`1`.
 
 Save the addon, then test to ensure it works - e.g. start a new game and lockpick the chest.
 
 Placing in plain sight
 ======================
 
-Let's hide the Ring of Night vision in the cabin of the [Ancient Shipwreck]
-(https://en.uesp.net/wiki/Morrowind:Ancient_Shipwreck), a derelict vessel
+Let's hide the Ring of Night vision in the cabin of the `Ancient Shipwreck <https://en.uesp.net/wiki/Morrowind:Ancient_Shipwreck>`_, a derelict vessel
 southeast of Dagon Fel. Open the list of Cells (*World* → *Cells*) and find
-"Ancient Shipwreck, Cabin".
+:code:`Ancient Shipwreck, Cabin`.
 
 This will open a visualization of the cabin. You can navigate around the scene
 just like you would when playing Morrowind. Use the WASD keys to move forward,
 backwards, and sideways. Click and drag with the left mouse button to change the
 direction you are looking. Navigate to the table in the cabin.
 
-If you've closed the Objects table, reopen it via *World* → *Objects*. Navigate
-to your Ring of Night Vision (you can find it easily if you sort by the "Modified"
-column). Drag the ring from the Objects table onto the table in the Cell view.
+If you've closed the *Objects* table, reopen it via *World* → *Objects*. Navigate
+to your Ring of Night Vision (you can find it easily if you sort by the *Modified*
+column). Drag the ring from the *Objects* table onto the table in the Cell view.
 
 Now let's move the ring to the precise location we want. Hover over the ring and
 click the middle mouse button. If you don't have a middle mouse button, you can
 select an alternative command by going to *Edit* → *Preferences…* (Windows, Linux)
 or *OpenMW* → *Preferences…* (macOS). Go to the Key Bindings section and choose
-"Scene" from the dropdown menu. Then click on the button for "Primary Select" and
+*Scene* from the dropdown menu. Then click on the button for *Primary Select* and
 choose an alternative binding.
 
 After you have switched to movement mode, you will see several arrows. Clicking
 and dragging them with the right mouse button will allow you to move the object
 in the direction you want.
 
-If you'd like an easy way to test this, you can start OpenMW with the [game
-arguments](https://wiki.openmw.org/index.php?title=Testing)
-`--start="Ancient Shipwreck, Cabin" --skip-menu`. This will place you right in
+If you'd like an easy way to test this, you can start OpenMW with the `game
+arguments <https://wiki.openmw.org/index.php?title=Testing>`_
+:code:`--start="Ancient Shipwreck, Cabin" --skip-menu`. This will place you right in
 the cell and allow you to pick up and equip the ring in order to check that it
 works.
 
@@ -333,34 +332,36 @@ This is probably a suitable place to start talking about how navigation differs
 in vanilla Morrowind.
 
 There is advice in Scripting for Dummies, the definitive manual for Morrowind Scripting:
-"If you give your scripts a common tag, that will make it easier to jump between the
-different scripts of your project, e.g. start every script name with AA_Scriptname
-this will put them right at the beginning of the list and keep them neatly together."
+   "If you give your scripts a common tag, that will make it easier to jump between the
+   different scripts of your project, e.g. start every script name with AA_Scriptname
+   this will put them right at the beginning of the list and keep them neatly together."
 
 This is valid for the rather poorer navigation facilities there, but it's not sensible for
 the OpenMW CS. Some modders took it further, and started script names and object id with numbers,
-typically "1", to bring the items even earlier in the default alphabetical sorts. In fact
-the CS won't allow names/ids to start with numbers or to include ".".
+typically :code:`1`, to bring the items even earlier in the default alphabetical sorts. In fact
+the CS won't allow names/ids to start with numbers or to include :code:`.`.
 
 There are better options available:
 
 Filtering, which isn't available at all in TESCS - put in a filter like
 
-!string("ID",".*ring.*")
+.. code::
 
-to find all IDs which contain the string "ring"
+   !string("ID",".*ring.*")
+
+to find all IDs which contain the string :code:`ring`
 
 Sorting, which is available in some parts of TESCS, but not for scripts (other than script names being
 sorted in ascending order)- hence the recommendation
-Typically the "Modified" column is useful here - most items will have "Base" status, unchanged from
+Typically the *Modified* column is useful here - most items will have *Base* status, unchanged from
 the base game.
 
-"Added" status" will cover those items added in this addon.
+*Added* status will cover those items added in this addon.
 
-"Modified" status will cover items from the base game which have been modified in this addon.
+*Modified* status will cover items from the base game which have been modified in this addon.
 
-Click on the top of the column to toggle between ascending and descending order - thus between "Added"
-and "Modified" at the top. Or put your desired modified status into a filter then sort alphabetically
+Click on the top of the column to toggle between ascending and descending order - thus between *Added*
+and *Modified* at the top. Or put your desired modified status into a filter then sort alphabetically
 on a different column.
 
 
diff --git a/docs/source/reference/lua-scripting/aipackages.rst b/docs/source/reference/lua-scripting/aipackages.rst
index 39f973c65d..7a23d156f5 100644
--- a/docs/source/reference/lua-scripting/aipackages.rst
+++ b/docs/source/reference/lua-scripting/aipackages.rst
@@ -1,6 +1,8 @@
 Built-in AI packages
 ====================
 
+.. include:: version.rst
+
 Starting an AI package
 ----------------------
 
@@ -97,6 +99,18 @@ Follow another actor.
   * - target
     - `GameObject <openmw_core.html##(GameObject)>`_ [required]
     - the actor to follow
+  * - destCell
+    - Cell [optional]
+    - the destination cell
+  * - duration
+    - number [optional]
+    - duration in game time (will be rounded up to the next hour)
+  * - destPosition
+    - `3d vector <openmw_util.html##(Vector3)>`_ [optional]
+    - the destination point
+  * - isRepeat
+    - boolean [optional]
+    - Will the package repeat (true or false)
 
 Escort
 ------
@@ -124,6 +138,9 @@ Escort another actor to the given location.
   * - duration
     - number [optional]
     - duration in game time (will be rounded up to the next hour)
+  * - isRepeat
+    - boolean [optional]
+    - Will the package repeat (true or false)
 
 **Example**
 
@@ -134,6 +151,7 @@ Escort another actor to the given location.
         target = object.self,
         destPosition = util.vector3(x, y, z),
         duration = 3 * time.hour,
+        isRepeat = true
     })
 
 Wander
@@ -156,6 +174,34 @@ Wander nearby current position.
   * - duration
     - number [optional]
     - duration in game time (will be rounded up to the next hour)
+  * - idle
+    - table [optional]
+    - Idle chance values, up to 8
+  * - isRepeat
+    - boolean [optional]
+    - Will the package repeat (true or false)
+
+**Example**
+
+.. code-block:: Lua
+
+    local idleTable = {
+        idle2 = 60,
+        idle3 = 50,
+        idle4 = 40,
+        idle5 = 30,
+        idle6 = 20,
+        idle7 = 10,
+        idle8 = 0,
+        idle9 = 25
+    }
+    actor:sendEvent('StartAIPackage', {
+        type = 'Wander',
+        distance = 5000,
+        duration = 5 * time.hour,
+        idle = idleTable,
+        isRepeat = true
+    })
 
 Travel
 ------
@@ -174,4 +220,6 @@ Go to given location.
   * - destPosition
     - `3d vector <openmw_util.html##(Vector3)>`_ [required]
     - the point to travel to
-
+  * - isRepeat
+    - boolean [optional]
+    - Will the package repeat (true or false)
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 76092fec3f..82a860b355 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -2,6 +2,8 @@
 Lua API reference
 #################
 
+.. include:: version.rst
+
 .. toctree::
     :hidden:
 
@@ -10,31 +12,40 @@ Lua API reference
     aipackages
     setting_renderers
     events
-    openmw_util
-    openmw_storage
-    openmw_core
-    openmw_types
-    openmw_async
-    openmw_world
-    openmw_self
-    openmw_nearby
-    openmw_input
     openmw_ambient
-    openmw_ui
+    openmw_animation
+    openmw_async
     openmw_camera
-    openmw_postprocessing
+    openmw_core
     openmw_debug
+    openmw_input
+    openmw_markup
+    openmw_menu
+    openmw_nearby
+    openmw_postprocessing
+    openmw_self
+    openmw_storage
+    openmw_types
+    openmw_ui
+    openmw_util
+    openmw_vfs
+    openmw_world
     openmw_aux_calendar
-    openmw_aux_util
     openmw_aux_time
     openmw_aux_ui
+    openmw_aux_util
     interface_activation
     interface_ai
+    interface_animation
     interface_camera
     interface_controls
+    interface_gamepadcontrols
+    interface_item_usage
     interface_mwui
     interface_settings
+    interface_skill_progression
     interface_ui
+    interface_crimes
     iterables
 
 
@@ -62,36 +73,6 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 
 .. include:: tables/aux_packages.rst
 
-Interfaces of built-in scripts
-------------------------------
+**Interfaces of built-in scripts**
 
-.. list-table::
-  :widths: 20 20 60
-
-  * - Interface
-    - Can be used
-    - Description
-  * - :ref:`Activation <Interface Activation>`
-    - by global scripts
-    - Allows to extend or override built-in activation mechanics.
-  * - :ref:`AI <Interface AI>`
-    - by local scripts
-    - Control basic AI of NPCs and creatures.
-  * - :ref:`Camera <Interface Camera>`
-    - by player scripts
-    - | Allows to alter behavior of the built-in camera script
-      | without overriding the script completely.
-  * - :ref:`Controls <Interface Controls>`
-    - by player scripts
-    - | Allows to alter behavior of the built-in script
-      | that handles player controls.
-  * - :ref:`Settings <Interface Settings>`
-    - by player and global scripts
-    - Save, display and track changes of setting values.
-  * - :ref:`MWUI <Interface MWUI>`
-    - by player scripts
-    - Morrowind-style UI templates.
-  * - :ref:`UI <Interface UI>`
-    - by player scripts
-    - | High-level UI modes interface. Allows to override parts
-      | of the interface.
+.. include:: tables/interfaces.rst
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index 8d5db51f84..ac6979a236 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -1,12 +1,21 @@
 Engine handlers reference
 =========================
 
+.. include:: version.rst
+
 Engine handler is a function defined by a script, that can be called by the engine.
 
-
-
 **Can be defined by any script**
 
+.. list-table::
+  :widths: 20 80
+
+  * - onInterfaceOverride(base)
+    - | Called if the current script has an interface and overrides an interface
+      | (``base``) of another script.
+
+**Can be defined by any non-menu script**
+
 .. list-table::
   :widths: 20 80
 
@@ -27,9 +36,6 @@ Engine handler is a function defined by a script, that can be called by the engi
       | Note that ``onLoad`` means loading a script rather than loading a game.
       | If a script did not exist when a game was saved onLoad will not be
       | called, but ``onInit`` will.
-  * - onInterfaceOverride(base)
-    - | Called if the current script has an interface and overrides an interface
-      | (``base``) of another script.
 
 **Only for global scripts**
 
@@ -78,7 +84,7 @@ Engine handler is a function defined by a script, that can be called by the engi
       | Similarly to onActivated, the item has already been removed
       | from the actor's inventory, and the count was set to zero.
 
-**Only for local scripts attached to a player**
+**Only menu scripts and local scripts attached to a player**
 
 .. list-table::
   :widths: 20 80
@@ -92,8 +98,6 @@ Engine handler is a function defined by a script, that can be called by the engi
     - | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.
       | Usage example:
       | ``if key.symbol == 'z' and key.withShift then ...``
-  * - onQuestUpdate(questId, stage)
-    - | Called when a quest is updated.
   * - onKeyRelease(key)
     - | `Key <openmw_input.html##(KeyboardEvent)>`_ is released.
       | Usage example:
@@ -107,7 +111,8 @@ Engine handler is a function defined by a script, that can be called by the engi
       | Usage example:
       | ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``
   * - onInputAction(id)
-    - | `Game control <openmw_input.html##(ACTION)>`_ is pressed.
+    - | (DEPRECATED, use `registerActionHandler <openmw_input.html##(registerActionHandler)>`_)
+      | `Game control <openmw_input.html##(ACTION)>`_ is pressed.
       | Usage example:
       | ``if id == input.ACTION.ToggleWeapon then ...``
   * - onTouchPress(touchEvent)
@@ -119,8 +124,37 @@ Engine handler is a function defined by a script, that can be called by the engi
   * - onTouchMove(touchEvent)
     - | A finger moved on a touch device.
       | `Touch event <openmw_input.html##(TouchEvent)>`_.
+  * - onMouseButtonPress(button)
+    - | A mouse button was pressed
+      | Button id
+  * - onMouseButtonRelease(button)
+    - | A mouse button was released
+      | Button id
+  * - onMouseWheel(vertical, horizontal)
+    - | Mouse wheel was scrolled
+      | vertical and horizontal mouse wheel change
   * - | onConsoleCommand(
       |     mode, command, selectedObject)
     - | User entered `command` in in-game console. Called if either
       | `mode` is not default or `command` starts with prefix `lua`.
 
+**Only for local scripts attached to a player**
+
+.. list-table::
+  :widths: 20 80
+
+  * - onKeyPress(key)
+    - | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.
+      | Usage example:
+      | ``if key.symbol == 'z' and key.withShift then ...``
+  * - onQuestUpdate(questId, stage)
+    - | Called when a quest is updated.
+
+**Only for menu scripts**
+
+.. list-table::
+  :widths: 20 80
+
+  * - onStateChanged()
+    - | Called whenever the current game changes
+      | (i. e. the result of `getState <openmw_menu.html##(menu).getState>`_ changes)
diff --git a/docs/source/reference/lua-scripting/events.rst b/docs/source/reference/lua-scripting/events.rst
index da4b2e3812..282e3d1173 100644
--- a/docs/source/reference/lua-scripting/events.rst
+++ b/docs/source/reference/lua-scripting/events.rst
@@ -1,9 +1,25 @@
 Built-in events
 ===============
 
+.. include:: version.rst
+
 Actor events
 ------------
 
+**Died**
+
+This event is sent to an actor's local script when that actor dies.
+
+.. code-block:: Lua
+
+    eventHandlers = {
+        Died = function()
+            print('Alas, ye hardly knew me!')
+        end
+    }
+
+**StartAIPackage, RemoveAIPackages**
+
 Any script can send to any actor (except player, for player will be ignored) events ``StartAIPackage`` and ``RemoveAIPackages``.
 The effect is equivalent to calling ``interfaces.AI.startPackage`` or ``interfaces.AI.removePackages`` in a local script on this actor.
 
@@ -14,9 +30,22 @@ Examples:
     actor:sendEvent('StartAIPackage', {type='Combat', target=self.object})
     actor:sendEvent('RemoveAIPackages', 'Pursue')
 
+**UseItem**
+
+Any script can send global event ``UseItem`` with arguments ``object``, ``actor``, and optional boolean ``force``.
+The actor will use (e.g. equip or consume) the object. The object should be in the actor's inventory.
+
+Example:
+
+.. code-block:: Lua
+
+    core.sendGlobalEvent('UseItem', {object = potion, actor = player, force = true})
+
 UI events
 ---------
 
+**UiModeChanged**
+
 Every time UI mode is changed built-in scripts send to player the event ``UiModeChanged`` with arguments ``oldMode, ``newMode`` (same as ``I.UI.getMode()``)
 and ``arg`` (for example in the mode ``Book`` the argument is the book the player is reading).
 
@@ -27,3 +56,38 @@ and ``arg`` (for example in the mode ``Book`` the argument is the book the playe
             print('UiModeChanged from', data.oldMode , 'to', data.newMode, '('..tostring(data.arg)..')')
         end
     }
+
+**AddUiMode**
+
+Equivalent to ``I.UI.addMode``, but can be sent from another object or global script.
+
+.. code-block:: Lua
+
+    player:sendEvent('AddUiMode', {mode = 'Book', target = book})
+
+**SetUiMode**
+
+Equivalent to ``I.UI.setMode``, but can be sent from another object or global script.
+
+.. code-block:: Lua
+
+    player:sendEvent('SetUiMode', {mode = 'Book', target = book})
+
+World events
+------------
+
+Global events that just call the corresponding function in `openmw.world`.
+
+.. code-block:: Lua
+
+    -- world.pause(tag)
+    core.sendGlobalEvent('Pause', tag)
+
+    -- world.unpause(tag)
+    core.sendGlobalEvent('Unpause', tag)
+
+    -- world.setGameTimeScale(scale)
+    core.sendGlobalEvent('SetGameTimeScale', scale)
+
+    -- world.setSimulationTimeScale(scale)
+    core.sendGlobalEvent('SetSimulationTimeScale', scale)
diff --git a/docs/source/reference/lua-scripting/index.rst b/docs/source/reference/lua-scripting/index.rst
index c6adfc7723..f3764c4401 100644
--- a/docs/source/reference/lua-scripting/index.rst
+++ b/docs/source/reference/lua-scripting/index.rst
@@ -2,8 +2,10 @@
 OpenMW Lua scripting
 ####################
 
-.. warning::
-    OpenMW Lua scripting is in early stage of development. Also note that OpenMW Lua is not compatible with MWSE.
+.. note::
+    OpenMW Lua is not compatible with MWSE.
+
+.. include:: version.rst
 
 .. toctree::
     :caption: Table of Contents
diff --git a/docs/source/reference/lua-scripting/interface_activation.rst b/docs/source/reference/lua-scripting/interface_activation.rst
index ccc51ca457..ad31cca3f6 100644
--- a/docs/source/reference/lua-scripting/interface_activation.rst
+++ b/docs/source/reference/lua-scripting/interface_activation.rst
@@ -1,6 +1,8 @@
 Interface Activation
 ====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/scripts_omw_activationhandlers.html
 
diff --git a/docs/source/reference/lua-scripting/interface_ai.rst b/docs/source/reference/lua-scripting/interface_ai.rst
index ec79b50d5d..43197721e2 100644
--- a/docs/source/reference/lua-scripting/interface_ai.rst
+++ b/docs/source/reference/lua-scripting/interface_ai.rst
@@ -1,6 +1,8 @@
 Interface AI
 ============
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/scripts_omw_ai.html
 
diff --git a/docs/source/reference/lua-scripting/interface_animation.rst b/docs/source/reference/lua-scripting/interface_animation.rst
new file mode 100644
index 0000000000..5bde11775e
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_animation.rst
@@ -0,0 +1,8 @@
+Interface AnimationController
+=============================
+
+.. include:: version.rst
+
+.. raw:: html
+   :file: generated_html/scripts_omw_mechanics_animationcontroller.html
+
diff --git a/docs/source/reference/lua-scripting/interface_camera.rst b/docs/source/reference/lua-scripting/interface_camera.rst
index 6a0f19d47b..0a71680ee3 100644
--- a/docs/source/reference/lua-scripting/interface_camera.rst
+++ b/docs/source/reference/lua-scripting/interface_camera.rst
@@ -1,6 +1,8 @@
 Interface Camera
 ================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/scripts_omw_camera_camera.html
 
diff --git a/docs/source/reference/lua-scripting/interface_controls.rst b/docs/source/reference/lua-scripting/interface_controls.rst
index e458aca133..f8e8fd0d4e 100644
--- a/docs/source/reference/lua-scripting/interface_controls.rst
+++ b/docs/source/reference/lua-scripting/interface_controls.rst
@@ -1,6 +1,8 @@
 Interface Controls
 ==================
 
-.. raw:: html
-   :file: generated_html/scripts_omw_playercontrols.html
+.. include:: version.rst
+
+.. raw:: html
+   :file: generated_html/scripts_omw_input_playercontrols.html
 
diff --git a/docs/source/reference/lua-scripting/interface_crimes.rst b/docs/source/reference/lua-scripting/interface_crimes.rst
new file mode 100644
index 0000000000..dc4e68477f
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_crimes.rst
@@ -0,0 +1,5 @@
+Interface Crimes
+==========================
+
+.. raw:: html
+   :file: generated_html/scripts_omw_crimes.html
diff --git a/docs/source/reference/lua-scripting/interface_gamepadcontrols.rst b/docs/source/reference/lua-scripting/interface_gamepadcontrols.rst
new file mode 100644
index 0000000000..f89738b25b
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_gamepadcontrols.rst
@@ -0,0 +1,8 @@
+Interface GamepadControls
+=========================
+
+.. include:: version.rst
+
+.. raw:: html
+   :file: generated_html/scripts_omw_input_gamepadcontrols.html
+
diff --git a/docs/source/reference/lua-scripting/interface_item_usage.rst b/docs/source/reference/lua-scripting/interface_item_usage.rst
new file mode 100644
index 0000000000..cdaa53353f
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_item_usage.rst
@@ -0,0 +1,6 @@
+Interface ItemUsage
+===================
+
+.. raw:: html
+   :file: generated_html/scripts_omw_usehandlers.html
+
diff --git a/docs/source/reference/lua-scripting/interface_mwui.rst b/docs/source/reference/lua-scripting/interface_mwui.rst
index cd9b00cb87..51a86843b4 100644
--- a/docs/source/reference/lua-scripting/interface_mwui.rst
+++ b/docs/source/reference/lua-scripting/interface_mwui.rst
@@ -1,6 +1,8 @@
 Interface MWUI
 ==============
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/scripts_omw_mwui_init.html
 
diff --git a/docs/source/reference/lua-scripting/interface_settings.rst b/docs/source/reference/lua-scripting/interface_settings.rst
index cd1994ccfa..1f57f00d2a 100644
--- a/docs/source/reference/lua-scripting/interface_settings.rst
+++ b/docs/source/reference/lua-scripting/interface_settings.rst
@@ -1,6 +1,8 @@
 Interface Settings
 ==================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/scripts_omw_settings_player.html
 
diff --git a/docs/source/reference/lua-scripting/interface_skill_progression.rst b/docs/source/reference/lua-scripting/interface_skill_progression.rst
new file mode 100644
index 0000000000..f27f03d556
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_skill_progression.rst
@@ -0,0 +1,6 @@
+Interface SkillProgression
+==========================
+
+.. raw:: html
+   :file: generated_html/scripts_omw_skillhandlers.html
+
diff --git a/docs/source/reference/lua-scripting/interface_ui.rst b/docs/source/reference/lua-scripting/interface_ui.rst
index 8c3ac679e5..f406924cd5 100644
--- a/docs/source/reference/lua-scripting/interface_ui.rst
+++ b/docs/source/reference/lua-scripting/interface_ui.rst
@@ -1,6 +1,8 @@
 Interface UI
 ============
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/scripts_omw_ui.html
 
diff --git a/docs/source/reference/lua-scripting/iterables.rst b/docs/source/reference/lua-scripting/iterables.rst
index 208b7f1c92..420ff593ef 100644
--- a/docs/source/reference/lua-scripting/iterables.rst
+++ b/docs/source/reference/lua-scripting/iterables.rst
@@ -1,6 +1,8 @@
 Iterable types
 ==============
 
+.. include:: version.rst
+
 List Iterable
 -------------
 
diff --git a/docs/source/reference/lua-scripting/openmw_ambient.rst b/docs/source/reference/lua-scripting/openmw_ambient.rst
index a68f5f4469..4a44636bd3 100644
--- a/docs/source/reference/lua-scripting/openmw_ambient.rst
+++ b/docs/source/reference/lua-scripting/openmw_ambient.rst
@@ -1,5 +1,7 @@
 Package openmw.ambient
 ======================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_ambient.html
diff --git a/docs/source/reference/lua-scripting/openmw_animation.rst b/docs/source/reference/lua-scripting/openmw_animation.rst
new file mode 100644
index 0000000000..35ac26ecec
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_animation.rst
@@ -0,0 +1,7 @@
+Package openmw.animation
+========================
+
+.. include:: version.rst
+
+.. raw:: html
+   :file: generated_html/openmw_animation.html
diff --git a/docs/source/reference/lua-scripting/openmw_async.rst b/docs/source/reference/lua-scripting/openmw_async.rst
index 9f24f63a4f..55e44526be 100644
--- a/docs/source/reference/lua-scripting/openmw_async.rst
+++ b/docs/source/reference/lua-scripting/openmw_async.rst
@@ -1,5 +1,7 @@
 Package openmw.async
 ====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_async.html
diff --git a/docs/source/reference/lua-scripting/openmw_aux_calendar.rst b/docs/source/reference/lua-scripting/openmw_aux_calendar.rst
index ea60b62852..728d3e89da 100644
--- a/docs/source/reference/lua-scripting/openmw_aux_calendar.rst
+++ b/docs/source/reference/lua-scripting/openmw_aux_calendar.rst
@@ -1,5 +1,7 @@
 Package openmw_aux.calendar
 ===========================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_aux_calendar.html
diff --git a/docs/source/reference/lua-scripting/openmw_aux_time.rst b/docs/source/reference/lua-scripting/openmw_aux_time.rst
index 120d888a01..919690c19f 100644
--- a/docs/source/reference/lua-scripting/openmw_aux_time.rst
+++ b/docs/source/reference/lua-scripting/openmw_aux_time.rst
@@ -1,5 +1,7 @@
 Package openmw_aux.time
 =======================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_aux_time.html
diff --git a/docs/source/reference/lua-scripting/openmw_aux_ui.rst b/docs/source/reference/lua-scripting/openmw_aux_ui.rst
index 18c0926c03..2a45bb529e 100644
--- a/docs/source/reference/lua-scripting/openmw_aux_ui.rst
+++ b/docs/source/reference/lua-scripting/openmw_aux_ui.rst
@@ -1,5 +1,7 @@
 Package openmw_aux.ui
 =======================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_aux_ui.html
diff --git a/docs/source/reference/lua-scripting/openmw_aux_util.rst b/docs/source/reference/lua-scripting/openmw_aux_util.rst
index 01b200bfc2..662498f693 100644
--- a/docs/source/reference/lua-scripting/openmw_aux_util.rst
+++ b/docs/source/reference/lua-scripting/openmw_aux_util.rst
@@ -1,5 +1,7 @@
 Package openmw_aux.util
 =======================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_aux_util.html
diff --git a/docs/source/reference/lua-scripting/openmw_camera.rst b/docs/source/reference/lua-scripting/openmw_camera.rst
index 4090843920..3c9a74c037 100644
--- a/docs/source/reference/lua-scripting/openmw_camera.rst
+++ b/docs/source/reference/lua-scripting/openmw_camera.rst
@@ -1,5 +1,7 @@
 Package openmw.camera
 =====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_camera.html
diff --git a/docs/source/reference/lua-scripting/openmw_core.rst b/docs/source/reference/lua-scripting/openmw_core.rst
index bde93fb9c9..2dc3f762b3 100644
--- a/docs/source/reference/lua-scripting/openmw_core.rst
+++ b/docs/source/reference/lua-scripting/openmw_core.rst
@@ -1,5 +1,7 @@
 Package openmw.core
 ===================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_core.html
diff --git a/docs/source/reference/lua-scripting/openmw_debug.rst b/docs/source/reference/lua-scripting/openmw_debug.rst
index 5be48f6558..c139131853 100644
--- a/docs/source/reference/lua-scripting/openmw_debug.rst
+++ b/docs/source/reference/lua-scripting/openmw_debug.rst
@@ -1,5 +1,7 @@
 Package openmw.debug
 ====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_debug.html
diff --git a/docs/source/reference/lua-scripting/openmw_input.rst b/docs/source/reference/lua-scripting/openmw_input.rst
index 39136dc4c2..9e327d00e1 100644
--- a/docs/source/reference/lua-scripting/openmw_input.rst
+++ b/docs/source/reference/lua-scripting/openmw_input.rst
@@ -1,6 +1,8 @@
 Package openmw.input
 ====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_input.html
 
diff --git a/docs/source/reference/lua-scripting/openmw_markup.rst b/docs/source/reference/lua-scripting/openmw_markup.rst
new file mode 100644
index 0000000000..b37afec88f
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_markup.rst
@@ -0,0 +1,7 @@
+Package openmw.markup
+=====================
+
+.. include:: version.rst
+
+.. raw:: html
+   :file: generated_html/openmw_markup.html
diff --git a/docs/source/reference/lua-scripting/openmw_menu.rst b/docs/source/reference/lua-scripting/openmw_menu.rst
new file mode 100644
index 0000000000..ae1803a4f2
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_menu.rst
@@ -0,0 +1,7 @@
+Package openmw.menu
+======================
+
+.. include:: version.rst
+
+.. raw:: html
+   :file: generated_html/openmw_menu.html
diff --git a/docs/source/reference/lua-scripting/openmw_nearby.rst b/docs/source/reference/lua-scripting/openmw_nearby.rst
index ca0a7d5d00..6812fad44e 100644
--- a/docs/source/reference/lua-scripting/openmw_nearby.rst
+++ b/docs/source/reference/lua-scripting/openmw_nearby.rst
@@ -1,5 +1,7 @@
 Package openmw.nearby
 =====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_nearby.html
diff --git a/docs/source/reference/lua-scripting/openmw_postprocessing.rst b/docs/source/reference/lua-scripting/openmw_postprocessing.rst
index ec2f025049..0acf32c38b 100644
--- a/docs/source/reference/lua-scripting/openmw_postprocessing.rst
+++ b/docs/source/reference/lua-scripting/openmw_postprocessing.rst
@@ -1,5 +1,7 @@
 Package openmw.postprocessing
 =============================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_postprocessing.html
diff --git a/docs/source/reference/lua-scripting/openmw_self.rst b/docs/source/reference/lua-scripting/openmw_self.rst
index 71a2cb04ae..4c0b8dbec3 100644
--- a/docs/source/reference/lua-scripting/openmw_self.rst
+++ b/docs/source/reference/lua-scripting/openmw_self.rst
@@ -1,5 +1,7 @@
 Package openmw.self
 ===================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_self.html
diff --git a/docs/source/reference/lua-scripting/openmw_storage.rst b/docs/source/reference/lua-scripting/openmw_storage.rst
index 5abf664e1a..785d1b661c 100644
--- a/docs/source/reference/lua-scripting/openmw_storage.rst
+++ b/docs/source/reference/lua-scripting/openmw_storage.rst
@@ -1,5 +1,7 @@
 Package openmw.storage
 ======================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_storage.html
diff --git a/docs/source/reference/lua-scripting/openmw_types.rst b/docs/source/reference/lua-scripting/openmw_types.rst
index 1819b1a6ce..3f408909db 100644
--- a/docs/source/reference/lua-scripting/openmw_types.rst
+++ b/docs/source/reference/lua-scripting/openmw_types.rst
@@ -1,5 +1,7 @@
 Package openmw.types
 ====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_types.html
diff --git a/docs/source/reference/lua-scripting/openmw_ui.rst b/docs/source/reference/lua-scripting/openmw_ui.rst
index 1b7b57c359..d523fe57fd 100644
--- a/docs/source/reference/lua-scripting/openmw_ui.rst
+++ b/docs/source/reference/lua-scripting/openmw_ui.rst
@@ -1,5 +1,7 @@
 Package openmw.ui
 =================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_ui.html
diff --git a/docs/source/reference/lua-scripting/openmw_util.rst b/docs/source/reference/lua-scripting/openmw_util.rst
index f054d7b44d..d7d692a1f7 100644
--- a/docs/source/reference/lua-scripting/openmw_util.rst
+++ b/docs/source/reference/lua-scripting/openmw_util.rst
@@ -1,5 +1,7 @@
 Package openmw.util
 ===================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_util.html
diff --git a/docs/source/reference/lua-scripting/openmw_vfs.rst b/docs/source/reference/lua-scripting/openmw_vfs.rst
new file mode 100644
index 0000000000..407459e7e0
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_vfs.rst
@@ -0,0 +1,7 @@
+Package openmw.vfs
+==================
+
+.. include:: version.rst
+
+.. raw:: html
+   :file: generated_html/openmw_vfs.html
diff --git a/docs/source/reference/lua-scripting/openmw_world.rst b/docs/source/reference/lua-scripting/openmw_world.rst
index b8818d4027..3ee7f8ac51 100644
--- a/docs/source/reference/lua-scripting/openmw_world.rst
+++ b/docs/source/reference/lua-scripting/openmw_world.rst
@@ -1,5 +1,7 @@
 Package openmw.world
 ====================
 
+.. include:: version.rst
+
 .. raw:: html
    :file: generated_html/openmw_world.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index d0eb0a4cb2..b889b09a9f 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -1,10 +1,12 @@
 Overview of Lua scripting
 #########################
 
+.. include:: version.rst
+
 Language and sandboxing
 =======================
 
-OpenMW supports scripts written in Lua 5.1 with some extensions (see below) from Lua 5.2.
+OpenMW supports scripts written in Lua 5.1 with some extensions (see below) from Lua 5.2 and Lua 5.3.
 There are no plans to switch to any newer version of the language, because newer versions are not supported by LuaJIT.
 
 .. note::
@@ -38,6 +40,10 @@ Supported Lua 5.2 features:
 - ``__pairs`` and ``__ipairs`` metamethods;
 - Function ``table.unpack`` (alias to Lua 5.1 ``unpack``).
 
+Supported Lua 5.3 features:
+
+- All functions in the `UTF-8 Library <https://www.lua.org/manual/5.3/manual.html#6.5>`__
+
 Loading libraries with ``require('library_name')`` is allowed, but limited. It works this way:
 
 1. If `library_name` is one of the standard libraries, then return the library.
@@ -64,6 +70,9 @@ Cell
 Global scripts
     Lua scripts that are not attached to any game object and are always active. Global scripts can not be started or stopped during a game session. Lists of global scripts are defined by `omwscripts` files, which should be :ref:`registered <Lua scripting>` in `openmw.cfg`.
 
+Menu scripts
+    Lua scripts that are ran regardless of a game being loaded. They can be used to add features to the main menu and manage save files.
+
 Local scripts
     Lua scripts that are attached to some game object. A local script is active only if the object it is attached to is in an active cell. There are no limitations to the number of local scripts on one object. Local scripts can be attached to (or detached from) any object at any moment by a global script. In some cases inactive local scripts still can run code (for example during saving and loading), but while inactive they can not see nearby objects.
 
@@ -167,6 +176,7 @@ The order of lines determines the script load order (i.e. script priorities).
 Possible flags are:
 
 - ``GLOBAL`` - a global script; always active, can not be stopped;
+- ``MENU`` - a menu script; always active, even before a game is loaded
 - ``CUSTOM`` - dynamic local script that can be started or stopped by a global script;
 - ``PLAYER`` - an auto started player script;
 - ``ACTIVATOR`` - a local script that will be automatically attached to any activator;
@@ -206,6 +216,7 @@ To enter the Lua mode run one of the commands:
 - ``lua player`` or ``luap`` - enter player context
 - ``lua global`` or ``luag`` - enter global context
 - ``lua selected`` or ``luas`` - enter local context on the selected object
+- ``lua menu`` or ``luam`` - enter menu context
 
 Script structure
 ================
@@ -453,38 +464,10 @@ Using the interface:
 
 The order in which the scripts are started is important. So if one mod should override an interface provided by another mod, make sure that load order (i.e. the sequence of `lua-scripts=...` in `openmw.cfg`) is correct.
 
-**Interfaces of built-in scripts**
+Interfaces of built-in scripts
+------------------------------
 
-.. list-table::
-  :widths: 20 20 60
-
-  * - Interface
-    - Can be used
-    - Description
-  * - :ref:`Activation <Interface Activation>`
-    - by global scripts
-    - Allows to extend or override built-in activation mechanics.
-  * - :ref:`AI <Interface AI>`
-    - by local scripts
-    - Control basic AI of NPCs and creatures.
-  * - :ref:`Camera <Interface Camera>`
-    - by player scripts
-    - | Allows to alter behavior of the built-in camera script
-      | without overriding the script completely.
-  * - :ref:`Controls <Interface Controls>`
-    - by player scripts
-    - | Allows to alter behavior of the built-in script
-      | that handles player controls.
-  * - :ref:`Settings <Interface Settings>`
-    - by player and global scripts
-    - Save, display and track changes of setting values.
-  * - :ref:`MWUI <Interface MWUI>`
-    - by player scripts
-    - Morrowind-style UI templates.
-  * - :ref:`UI <Interface UI>`
-    - by player scripts
-    - | High-level UI modes interface. Allows to override parts
-      | of the interface.
+.. include:: tables/interfaces.rst
 
 Event system
 ============
@@ -496,6 +479,12 @@ This is another kind of script-to-script interactions. The differences:
 - Event handlers can not return any data to the sender.
 - Event handlers have a single argument `eventData` (must be :ref:`serializable <Serializable data>`)
 
+There are a few methods for sending events:
+
+- `core.sendGlobalEvent <openmw_core.html##(sendGlobalEvent)>`_ to send events to global scripts
+- `GameObject:sendEvent <openmw_core.html##(GameObject).sendEvent>`_ to send events to local scripts attached to a game object
+- `types.Player.sendMenuEvent <openmw_types.html##(Player).sendMenuEvent>`_ to send events to menu scripts of the given player
+
 Events are the main way of interacting between local and global scripts.
 They are not recommended for interactions between two global scripts, because in this case interfaces are more convenient.
 
@@ -636,7 +625,7 @@ Also in `openmw_aux`_ is the helper function ``runRepeatedly``, it is implemente
     local core = require('openmw.core')
     local time = require('openmw_aux.time')
 
-    -- call `doSomething()` at the end of every game day. 
+    -- call `doSomething()` at the end of every game day.
     -- the second argument (`time.day`) is the interval.
     -- the periodical evaluation can be stopped at any moment by calling `stopFn()`
     local timeBeforeMidnight = time.day - core.getGameTime() % time.day
diff --git a/docs/source/reference/lua-scripting/setting_renderers.rst b/docs/source/reference/lua-scripting/setting_renderers.rst
index a0ce9e99f9..b85c7fbaab 100644
--- a/docs/source/reference/lua-scripting/setting_renderers.rst
+++ b/docs/source/reference/lua-scripting/setting_renderers.rst
@@ -1,6 +1,8 @@
 Built-in Setting Renderers
 ==========================
 
+.. include:: version.rst
+
 textLine
 --------
 
@@ -124,3 +126,26 @@ Table with the following optional fields:
   * - disabled
     - bool (false)
     - Disables changing the setting from the UI
+
+inputBinding
+------------
+
+Allows the user to bind inputs to an action or trigger
+
+**Argument**
+
+Table with the following fields:
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default)
+    - description
+  * - key
+    - #string
+    - Key of the action or trigger to which the input is bound
+  * - type
+    - 'action', 'trigger'
+    - Type of the key
diff --git a/docs/source/reference/lua-scripting/tables/interfaces.rst b/docs/source/reference/lua-scripting/tables/interfaces.rst
new file mode 100644
index 0000000000..3a074c1ad7
--- /dev/null
+++ b/docs/source/reference/lua-scripting/tables/interfaces.rst
@@ -0,0 +1,48 @@
+.. list-table::
+  :widths: 20 20 60
+
+  * - Interface
+    - Can be used
+    - Description
+  * - :ref:`Activation <Interface Activation>`
+    - by global scripts
+    - Allows to extend or override built-in activation mechanics.
+  * - :ref:`AI <Interface AI>`
+    - by local scripts
+    - Control basic AI of NPCs and creatures.
+  * - :ref:`AnimationController <Interface AnimationController>`
+    - by local scripts
+    - Control animations of NPCs and creatures.
+  * - :ref:`Camera <Interface Camera>`
+    - by player scripts
+    - | Allows to alter behavior of the built-in camera script
+      | without overriding the script completely.
+  * - :ref:`Controls <Interface Controls>`
+    - by player scripts
+    - | Allows to alter behavior of the built-in script
+      | that handles player controls.
+  * - :ref:`Controls <Interface GamepadControls>`
+    - by player scripts
+    - | Allows to alter behavior of the built-in script
+      | that handles player gamepad controls.
+  * - :ref:`ItemUsage <Interface ItemUsage>`
+    - by global scripts
+    - | Allows to extend or override built-in item usage
+      | mechanics.
+  * - :ref:`SkillProgression <Interface SkillProgression>`
+    - by local scripts
+    - | Control, extend, and override skill progression of the 
+      | player.
+  * - :ref:`Settings <Interface Settings>`
+    - by player and global scripts
+    - Save, display and track changes of setting values.
+  * - :ref:`MWUI <Interface MWUI>`
+    - by player scripts
+    - Morrowind-style UI templates.
+  * - :ref:`UI <Interface UI>`
+    - by player scripts
+    - | High-level UI modes interface. Allows to override parts
+      | of the interface.
+  * - :ref:`Crimes <Interface Crimes>`
+    - by global scripts
+    - Commit crimes.
diff --git a/docs/source/reference/lua-scripting/tables/packages.rst b/docs/source/reference/lua-scripting/tables/packages.rst
index e746274e6d..fd82608aed 100644
--- a/docs/source/reference/lua-scripting/tables/packages.rst
+++ b/docs/source/reference/lua-scripting/tables/packages.rst
@@ -13,8 +13,14 @@
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.animation <Package openmw.animation>`          | everywhere         | | Animation controls                                          |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`                  | everywhere         | | Timers and callbacks.                                       |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.vfs <Package openmw.vfs>`                      | everywhere         | | Read-only access to data directories via VFS.               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.markup <Package openmw.markup>`                | everywhere         | | API to work with markup languages.                          |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.self <Package openmw.self>`                    | by local scripts   | | Full access to the object the script is attached to.        |
@@ -27,6 +33,8 @@
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.ui <Package openmw.ui>`                        | by player scripts  | | Controls :ref:`user interface <User interface reference>`.  |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.menu <Package openmw.menu>`                    | by menu scripts    | | Main menu functionality, such as managing game saves        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.camera <Package openmw.camera>`                | by player scripts  | | Controls camera.                                            |
 +------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls post-process shaders.                              |
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index d1d3162a4b..9251538657 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -1,6 +1,8 @@
 User interface reference
 ========================
 
+.. include:: version.rst
+
 Layouts
 -------
 
diff --git a/docs/source/reference/lua-scripting/version.rst b/docs/source/reference/lua-scripting/version.rst
new file mode 100644
index 0000000000..ad96ee456b
--- /dev/null
+++ b/docs/source/reference/lua-scripting/version.rst
@@ -0,0 +1,2 @@
+| `OpenMW version:` |version|
+| `core.API_REVISION:` |luaApiRevision| `* <openmw_core.html##(core).API_REVISION>`_
diff --git a/docs/source/reference/lua-scripting/widgets/image.rst b/docs/source/reference/lua-scripting/widgets/image.rst
index c461a69a65..49eaec79e0 100644
--- a/docs/source/reference/lua-scripting/widgets/image.rst
+++ b/docs/source/reference/lua-scripting/widgets/image.rst
@@ -21,5 +21,5 @@ Properties
     - boolean (false)
     - Tile the texture vertically
   * - color
-    - util.color (1, 1, 1)
+    - util.color (``rgb(1, 1, 1)``)
     - Modulate constant color with the color of the image texture.
diff --git a/docs/source/reference/lua-scripting/widgets/text.rst b/docs/source/reference/lua-scripting/widgets/text.rst
index 074100577a..2970724c74 100644
--- a/docs/source/reference/lua-scripting/widgets/text.rst
+++ b/docs/source/reference/lua-scripting/widgets/text.rst
@@ -22,7 +22,7 @@ Properties
     - number (10)
     - The size of the text.
   * - textColor
-    - util.color (0, 0, 0, 1)
+    - util.color (``rgb(0, 0, 0)``)
     - The color of the text.
   * - multiline
     - boolean (false)
@@ -40,5 +40,5 @@ Properties
     - boolean (false)
     - Whether to render a shadow behind the text.
   * - textShadowColor
-    - util.color (0, 0, 0, 1)
+    - util.color (``rgb(0, 0, 0)``)
     - The color of the text shadow.
diff --git a/docs/source/reference/lua-scripting/widgets/textedit.rst b/docs/source/reference/lua-scripting/widgets/textedit.rst
index 4e80c18197..6cb18fc685 100644
--- a/docs/source/reference/lua-scripting/widgets/textedit.rst
+++ b/docs/source/reference/lua-scripting/widgets/textedit.rst
@@ -18,7 +18,7 @@ Properties
     - number (10)
     - The size of the text.
   * - textColor
-    - util.color (0, 0, 0, 1)
+    - util.color (``rgb(0, 0, 0)``)
     - The color of the text.
   * - multiline
     - boolean (false)
diff --git a/docs/source/reference/modding/animation-blending.rst b/docs/source/reference/modding/animation-blending.rst
new file mode 100644
index 0000000000..1cc10b8863
--- /dev/null
+++ b/docs/source/reference/modding/animation-blending.rst
@@ -0,0 +1,90 @@
+Animation blending
+##################
+
+Animation blending introduces smooth animation transitions between essentially every animation in the game without affecting gameplay. Effective if ``smooth animation transitions`` setting is enabled in the launcher or the config files.
+
+Animation developers can bundle ``.yaml``/``.json`` files together with their ``.kf`` files to specify the blending style of their animations. Those settings will only affect the corresponding animation files.
+
+The default OpenMW animation blending config file (the global config) affects actors only, that restriction doesn't apply to other animation blending config files; they can affect animated objects too.
+Do not override the global config file in your mod, instead create a ``your_modded_animation_file_name.yaml`` file and put it in the same folder as your ``.kf`` file.
+
+For example, if your mod includes a ``newAnimations.kf`` file, you can put a ``newAnimations.yaml`` file beside it and fill it with your blending rules.
+Animation config files shipped in this fashion will only affect your modded animations and will not meddle with other animations in the game. 
+
+Local (per-kf-file) animation rules will only affect transitions between animations provided in that file and transitions to those animations; they will not affect transitions from the file animation to some other animation.
+
+Editing animation config files
+------------------------------
+
+In examples below ``.yaml`` config file will be used. You can provide ``.json`` files instead of ``.yaml`` if you adhere to the same overall structures and field names.
+
+Animation blending config file is a list of blending rules that look like this:
+
+::
+
+ blending_rules:
+  - from: "*"
+    to: "*"
+    easing: "sineOut"
+    duration: 0.25
+  - from: "*"
+    to: "idlesneak*"
+    easing: "springOutWeak"
+    duration: 0.4
+
+See `files/data/animations/animation-config.yaml <https://gitlab.com/OpenMW/openmw/-/tree/master/files/data/animations/animation-config.yaml>`__ for an example of such a file.
+
+Every blending rule should include a set of following fields:
+
+``from`` and ``to`` are rules that will attempt to match animation names; they usually look like ``animationGroupName:keyName`` where ``keyName`` is essentially the name of a specific action within the animation group. 
+Examples: ``"weapononehanded: chop start"``, ``"idle1h"``, ``"jump: start"`` e.t.c.
+
+.. note::
+
+    ``keyName`` is not always present and if omitted - the rule will match any ``keyName``.
+    The different animation names the game uses can be inspected by opening ``.kf`` animation files in Blender.
+
+
+Both ``animationGroupName`` and ``keyName`` support wildcard characters either at the beginning, the end of the name, or instead of the name:
+
+- ``"*"`` will match any name.
+- ``"*idle:sta*"`` will match an animationGroupName ending with ``idle`` and a keyName starting with ``sta``.
+- ``"weapon*handed: chop*attack"`` will not work since we don't support wildcards in the middle.
+
+``easing`` is an animation blending function, i.e., a style of transition between animations, look below to see the list of possible easings.
+
+``duration`` is the transition duration in seconds, 0.2-0.4 are usually reasonable transition times, but this highly depends on your use case.
+
+.. note::
+
+    The bottom-most rule takes precedence in the animation config files.
+
+
+List of possible easings
+------------------------
+
+- "linear"
+- "sineOut"
+- "sineIn"
+- "sineInOut"
+- "cubicOut"
+- "cubicIn"
+- "cubicInOut"
+- "quartOut"
+- "quartIn"
+- "quartInOut"
+- "springOutGeneric"
+- "springOutWeak"
+- "springOutMed"
+- "springOutStrong"
+- "springOutTooMuch"
+
+``"sineOut"`` easing is usually a safe bet. In general ``"...Out"`` easing functions will yield a transition that is fast at the beginning of the transition but slows down towards the end, that style of transitions usually looks good on organic animations e.g. humanoids and creatures.
+
+``"...In"`` transitions begin slow but end fast, ``"...InOut"`` begin fast, slowdown in the middle, end fast.
+
+Its hard to give an example of use cases for the latter 2 types of easing functions, they are there for developers to experiment.
+
+The possible easings are largely ported from `easings.net <https://easings.net/>`__ and have similar names. Except for the ``springOut`` family, those are similar to ``elasticOut``, with ``springOutWeak`` being almost identical to ``elasticOut``.
+
+Don't be afraid to experiment with different timing and easing functions!
diff --git a/docs/source/reference/modding/custom-shader-effects.rst b/docs/source/reference/modding/custom-shader-effects.rst
index 340ed5ffed..5953af5238 100644
--- a/docs/source/reference/modding/custom-shader-effects.rst
+++ b/docs/source/reference/modding/custom-shader-effects.rst
@@ -6,10 +6,9 @@ This node must have the prefix `omw:data` and have a valid JSON object that foll
 
 .. note::
 
-    This is a new feature to inject OpenMW-specific shader effects. Only a single
-    effect is currently supported. By default, the shader effects will propogate
-    to all a node's children. Other propogation modes and effects will come with
-    future releases.
+    This is a new feature to inject OpenMW-specific shader effects. By default,
+    the shader effects will propagate to all of a node's children.
+    Other propagation modes and effects will come with future releases.
 
 
 Soft Effect
@@ -31,13 +30,15 @@ This setting can either be activated in the OpenMW launcher or changed in `setti
 
 Variables.
 
-+---------+--------------------------------------------------------------------------------------------------------+---------+---------+
-| Name    | Description                                                                                            | Type    | Default |
-+---------+--------------------------------------------------------------------------------------------------------+---------+---------+
-| size    | Scaling ratio. Larger values will make a softer fade effect. Larger geometry requires higher values.   | integer | 45      |
-+---------+--------------------------------------------------------------------------------------------------------+---------+---------+
-| falloff | Fades away geometry as camera gets closer. Geometry full fades when parallel to camera.                | boolean | false   |
-+---------+--------------------------------------------------------------------------------------------------------+---------+---------+
++--------------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| Name         | Description                                                                                            | Type    | Default |
++--------------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| size         | Scaling ratio. Larger values will make a softer fade effect. Larger geometry requires higher values.   | integer | 45      |
++--------------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| falloff      | Fades away geometry as camera gets closer. Geometry full fades when parallel to camera.                | boolean | false   |
++--------------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| falloffDepth | The units at which geometry starts to fade.                                                            | float   | 300     |
++--------------+--------------------------------------------------------------------------------------------------------+---------+---------+
 
 Example usage.
 
@@ -48,6 +49,42 @@ Example usage.
             "soft_effect" : {
                 "size": 250,
                 "falloff" : false,
+                "falloffDepth": 5,
+            }
+        }
+    }
+
+Distortion
+----------
+
+This effect is used to imitate effects such as refraction and heat distortion. A common use case is to assign a normal map to the
+diffuse slot to a material and add uv scrolling. The red and green channels of the texture are used to offset the final scene texture.
+Blue and alpha channels are ignored.
+
+To use this feature the :ref:`post processing <Post Processing>` setting must be enabled.
+This setting can either be activated in the OpenMW launcher, in-game, or changed in `settings.cfg`:
+
+::
+
+    [Post Processing]
+    enabled = true
+
+Variables.
+
++---------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| Name    | Description                                                                                            | Type    | Default |
++---------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| strength| The strength of the distortion effect. Scales linearly.                                                | float   | 0.1     |
++---------+--------------------------------------------------------------------------------------------------------+---------+---------+
+
+Example usage.
+
+::
+
+    omw:data {
+        "shader" : {
+            "distortion" : {
+                "strength": 0.12,
             }
         }
     }
diff --git a/docs/source/reference/modding/extended.rst b/docs/source/reference/modding/extended.rst
index db7df2e916..3243809949 100644
--- a/docs/source/reference/modding/extended.rst
+++ b/docs/source/reference/modding/extended.rst
@@ -276,6 +276,14 @@ Also it is possible to add a "Bip01 Arrow" bone to actor skeletons. In this case
 Such approach allows to implement better shooting animations (for example, beast races have tail, so quivers should be attached under different angle and
 default arrow fetching animation does not look good).
 
+Animation blending
+------------------
+
+Animation blending introduces smooth animation transitions between essentially every animation in the game without affecting gameplay. Effective if ``smooth animation transitions`` setting is enabled in the launcher or the config files.
+
+Animation developers can bundle ``.yaml``/``.json`` files together with their ``.kf`` files to specify the blending style of their animations. Those settings will only affect the corresponding animation files. 
+For more details see :doc:`animation-blending`.
+
 Groundcover support
 -------------------
 
diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
index 33532e385b..4914a52be7 100644
--- a/docs/source/reference/modding/index.rst
+++ b/docs/source/reference/modding/index.rst
@@ -31,5 +31,6 @@ about creating new content for OpenMW, please refer to
 	doors-and-teleports
 	custom-shader-effects
 	extended
+	animation-blending
 	paths
 	localisation
diff --git a/docs/source/reference/modding/settings/GUI.rst b/docs/source/reference/modding/settings/GUI.rst
index 76c83be4da..8a27ed2c01 100644
--- a/docs/source/reference/modding/settings/GUI.rst
+++ b/docs/source/reference/modding/settings/GUI.rst
@@ -11,7 +11,7 @@ scaling factor
 This setting scales GUI windows.
 A value of 1.0 results in the normal scale. Larger values are useful to increase the scale of the GUI for high resolution displays.
 
-This setting can be configured in the Interface section of the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 font size
 ---------
@@ -24,7 +24,7 @@ Allows to specify glyph size for in-game fonts.
 Note: default bitmap fonts are supposed to work with 16px size, otherwise glyphs will be blurry.
 TrueType fonts do not have this issue.
 
-This setting can be configured in the Interface section of the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 menu transparency
 -----------------
@@ -52,6 +52,15 @@ such as weight, value, damage, armor rating, magical effects, and detailed descr
 This setting can be adjusted between 0.0 and 1.0 in game
 with the Menu Help Delay slider in the Prefs panel of the Options menu.
 
+keyboard navigation
+-------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Enable or disable keyboard navigation, such as arrow keys and tab moving UI focus, spacebar and Use keys pressing buttons.
+
 stretch menu background
 -----------------------
 
@@ -65,7 +74,7 @@ The Bethesda provided assets have a 4:3 aspect ratio, but other assets are permi
 If this setting is false, the assets will be centered in the mentioned 4:3 aspect ratio,
 with black bars filling the remainder of the screen.
 
-This setting can be configured in the Interface section of the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 subtitles
 ---------
@@ -148,8 +157,8 @@ color topic specific
 --------------------
 
 :Type:		RGBA floating point
-:Range:		0.0 to 1.0
-:Default:	empty
+:Range:		0.0 to 1.0 for each channel
+:Default:	0.45 0.5 0.8 1 (blue)
 
 This setting overrides the colour of dialogue topics that have a response unique to the actors speaking.
 The value is composed of four floating point values representing the red, green, blue and alpha channels.
@@ -157,15 +166,67 @@ The alpha value is currently ignored.
 
 A topic response is considered unique if its Actor filter field contains the speaking actor's object ID and hasn't yet been read.
 
+color topic specific over
+-------------------------
+
+:Type:		RGBA floating point
+:Range:		0.0 to 1.0 for each channel
+:Default:	0.6 0.6 0.85 1 (blue)
+
+This setting provides an "over" colour to dialogue topics that meet the color topic specific criteria.
+The value is composed of four floating point values representing the red, green, blue and alpha channels.
+The alpha value is currently ignored.
+
+A dialogue topic is considered "over" if it is the active GUI element through keyboard or mouse events.
+
+color topic specific pressed
+----------------------------
+
+:Type:		RGBA floating point
+:Range:		0.0 to 1.0 for each channel
+:Default:	0.3 0.35 0.75 1 (blue)
+
+This setting provides an "pressed" colour to dialogue topics that meet the color topic specific criteria.
+The value is composed of four floating point values representing the red, green, blue and alpha channels.
+The alpha value is currently ignored.
+
+A dialogue topic is considered "pressed" if it is the active GUI element and it receives a sustained keyboard or mouse event.
+
 color topic exhausted
 ---------------------
 
 :Type:		RGBA floating point
-:Range:		0.0 to 1.0
-:Default:	empty
+:Range:		0.0 to 1.0 for each channel
+:Default:	0.3 0.3 0.3 1 (grey)
 
 This setting overrides the colour of dialogue topics which have been "exhausted" by the player.
 The value is composed of four floating point values representing the red, green, blue and alpha channels.
 The alpha value is currently ignored.
 
 A topic is considered "exhausted" if the response the player is about to see has already been seen.
+
+color topic exhausted over
+--------------------------
+
+:Type:		RGBA floating point
+:Range:		0.0 to 1.0 for each channel
+:Default:	0.55 0.55 0.55 1 (grey)
+
+This setting provides an "over" colour to dialogue topics that meet the color topic exhausted criteria.
+The value is composed of four floating point values representing the red, green, blue and alpha channels.
+The alpha value is currently ignored.
+
+A dialogue topic is considered "over" if it is the active GUI element through keyboard or mouse events.
+
+color topic exhausted pressed
+-----------------------------
+
+:Type:		RGBA floating point
+:Range:		0.0 to 1.0 for each channel
+:Default:	0.45 0.45 0.45 1 (grey)
+
+This setting provides a "pressed" colour to dialogue topics that meet the color topic exhausted criteria.
+The value is composed of four floating point values representing the red, green, blue and alpha channels.
+The alpha value is currently ignored.
+
+A dialogue topic is considered "pressed" if it is the active GUI element and it receives a sustained keyboard or mouse event.
diff --git a/docs/source/reference/modding/settings/fog.rst b/docs/source/reference/modding/settings/fog.rst
index b05112162e..20bfdaf14d 100644
--- a/docs/source/reference/modding/settings/fog.rst
+++ b/docs/source/reference/modding/settings/fog.rst
@@ -125,6 +125,8 @@ By default, the fog becomes thicker proportionally to your distance from the cli
 This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.
 Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 exponential fog
 ---------------
 
@@ -135,6 +137,8 @@ exponential fog
 Similar to "radial fog" but uses an exponential formula for the fog.
 Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 sky blending
 ------------
 
@@ -146,6 +150,8 @@ Whether to use blending with the sky for everything that is close to the clippin
 If enabled the clipping plane becomes invisible.
 Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 sky blending start
 ------------------
 
@@ -155,6 +161,8 @@ sky blending start
 
 The fraction of the maximum distance at which blending with the sky starts.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 sky rtt resolution
 ------------------
 
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index c88ae4e28f..3994fd5077 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -16,7 +16,7 @@ If the setting is 2, the crosshair is the colour of the colour crosshair owned s
 If the setting is 3, both the tool tip background and the crosshair are coloured.
 The crosshair is not visible if crosshair is false.
 
-This setting can be configured in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 show projectile damage
 ----------------------
@@ -27,7 +27,7 @@ show projectile damage
 
 If this setting is true, the damage bonus of arrows and bolts will show on their tooltip.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 show melee info
 ---------------
@@ -38,7 +38,7 @@ show melee info
 
 If this setting is true, the reach and speed of weapons will show on their tooltip.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 show enchant chance
 -------------------
@@ -49,7 +49,7 @@ show enchant chance
 
 Whether or not the chance of success will be displayed in the enchanting menu.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 best attack
 -----------
@@ -78,7 +78,7 @@ If this setting is false, player has to wait until end of death animation in all
 Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder.
 Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 difficulty
 ----------
@@ -123,7 +123,7 @@ and the caster will absorb their own stat resulting in no effect on either the c
 This makes the gameplay as a mage easier, but these spells become imbalanced.
 This is how Morrowind behaves.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 classic calm spells behavior
 ----------------------------------------
@@ -137,7 +137,7 @@ This means that a Calm spell of any magnitude will always take actors out of com
 This is how Morrowind behaves without the Morrowind Code Patch. If this setting is off,
 Calm spells will only take their target out of combat once. Allowing them to re-engage if the spell was not sufficiently strong.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 use magic item animations
 -------------------------
@@ -161,7 +161,7 @@ show effect duration
 Show the remaining duration of magic effects and lights if this setting is true.
 The remaining duration is displayed in the tooltip by hovering over the magical effect.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 enchanted weapons are magical
 -----------------------------
@@ -173,7 +173,7 @@ enchanted weapons are magical
 Make enchanted weapons without Magical flag bypass normal weapons resistance (and weakness) certain creatures have.
 This is how Morrowind behaves.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 prevent merchant equipping
 --------------------------
@@ -184,7 +184,7 @@ prevent merchant equipping
 
 Prevent merchants from equipping items that are sold to them.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 followers attack on sight
 -------------------------
@@ -196,7 +196,8 @@ followers attack on sight
 Make player followers and escorters start combat with enemies who have started combat with them or the player.
 Otherwise they wait for the enemies or the player to do an attack first.
 Please note this setting has not been extensively tested and could have side effects with certain quests.
-This setting can be toggled in the Settings tab of the launcher.
+
+This setting can be controlled in the Settings tab of the launcher.
 
 shield sheathing
 ----------------
@@ -214,6 +215,8 @@ To avoid conflicts, you can use _sh mesh without "Bip01 Sheath" node for such "s
 Also you can use an _sh node with empty "Bip01 Sheath" node.
 In this case the engine will use basic shield model, but will use transformations from the "Bip01 Sheath" node.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 weapon sheathing
 ----------------
 
@@ -226,6 +229,8 @@ If this setting is true, OpenMW will utilize weapon sheathing-compatible assets
 To make use of this, you need to have an xbase_anim_sh.nif file with weapon bones that will be injected into the skeleton.
 Additional _sh suffix models are not essential for weapon sheathing to work but will act as quivers or scabbards for the weapons they correspond to.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 use additional anim sources
 ---------------------------
 
@@ -238,7 +243,8 @@ For example, if the main animation mesh has name Meshes/x.nif,
 the engine will load all KF-files from Animations/x folder and its child folders.
 This can be useful if you want to use several animation replacers without merging them.
 Attention: animations from AnimKit have their own format and are not supposed to be directly loaded in-game!
-This setting can only be configured by editing the settings configuration file.
+
+This setting can be controlled in the Settings tab of the launcher.
 
 barter disposition change is permanent
 --------------------------------------
@@ -251,7 +257,7 @@ If this setting is true,
 disposition change of merchants caused by trading will be permanent and won't be discarded upon exiting dialogue with them.
 This imitates the option that Morrowind Code Patch offers.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 only appropriate ammunition bypasses resistance
 -----------------------------------------------
@@ -264,7 +270,7 @@ If this setting is true, you will have to use the appropriate ammunition to bypa
 An enchanted bow with chitin arrows will no longer be enough for the purpose, while a steel longbow with glass arrows will still work.
 This was previously the default engine behavior that diverged from Morrowind design.
 
-This setting can be toggled in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 strength influences hand to hand
 --------------------------------
@@ -454,6 +460,8 @@ Some mods add harvestable container models. When this setting is enabled, activa
 
 When this setting is turned off or when activating a regular container, the menu will open as usual.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 allow actors to follow over water surface
 -----------------------------------------
 
@@ -489,6 +497,8 @@ day night switches
 
 Some mods add models which change visuals based on time of day. When this setting is enabled, supporting models will automatically make use of Day/night state.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 unarmed creature attacks damage armor
 -------------------------------------
 
@@ -500,7 +510,7 @@ If disabled unarmed creature attacks do not reduce armor condition, just as with
 
 If enabled unarmed creature attacks reduce armor condition, the same as attacks from NPCs and armed creatures.
 
-This setting can be controlled in the Settings tab of the launcher, under Game Mechanics.
+This setting can be controlled in the Settings tab of the launcher.
 
 actor collision shape type
 --------------------------
@@ -517,3 +527,45 @@ will not be useful with another.
 * 0: Axis-aligned bounding box
 * 1: Rotating box
 * 2: Cylinder
+
+This setting can be controlled in the Settings tab of the launcher.
+
+player movement ignores animation
+---------------------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+In third person, the camera will sway along with the movement animations of the player. 
+Enabling this option disables this swaying by having the player character move independently of its animation.
+
+This setting can be controlled in the Settings tab of the launcher.
+
+smooth animation transitions
+----------------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Enabling this option uses smooth transitions between animations making them a lot less jarring. Also allows to load modded animation blending.
+
+This setting can be controlled in the Settings tab of the launcher.
+
+rebalance soul gem values
+-------------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Enabling this option drastically reduces the value of filled soul gems.
+The value will depend on soul magnitude but not the size of the used
+soul gem.
+
+The new value formula is based on the Morrowind Code Patch project::
+
+	new value = 0.0001 * (soul magnitude)³ + 2 * (soul magnitude)
+
+This setting can be controlled in the Settings tab of the launcher.
diff --git a/docs/source/reference/modding/settings/general.rst b/docs/source/reference/modding/settings/general.rst
index e56b84ab89..d7afc04349 100644
--- a/docs/source/reference/modding/settings/general.rst
+++ b/docs/source/reference/modding/settings/general.rst
@@ -29,7 +29,7 @@ Specify the format for screen shots taken by pressing the screen shot key (bound
 This setting should be the file extension commonly associated with the desired format.
 The formats supported will be determined at compilation, but "jpg", "png", and "tga" should be allowed.
 
-This setting can be configured in the Settings tab of the launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 texture mag filter
 ------------------
@@ -69,6 +69,8 @@ notify on saved screenshot
 
 Show message box when screenshot is saved to a file.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 preferred locales
 -----------------
 
diff --git a/docs/source/reference/modding/settings/models.rst b/docs/source/reference/modding/settings/models.rst
index 998be9e6ea..f39faca7cf 100644
--- a/docs/source/reference/modding/settings/models.rst
+++ b/docs/source/reference/modding/settings/models.rst
@@ -27,9 +27,6 @@ If enabled, this setting allows the NIF loader to make use of that functionality
 	
 	**Do not enable** this if you're not so sure that you know what you're doing.
 
-To help debug possible issues OpenMW will log its progress in loading
-every file that uses an unsupported NIF version.
-
 xbaseanim
 ---------
 
@@ -263,13 +260,3 @@ weatherblizzard
 Path to the file used for the blizzard clouds weather effect in Morrowind. 
 OpenMW doesn't use this file, instead it renders a similar looking particle 
 effect. Changing this won't have any effect.
-
-write nif debug log
--------------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	True
-
-If enabled, log the loading process of unsupported NIF files.
-:ref:`load unsupported nif files` setting must be enabled for this setting to have any effect.
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index 0de061d8f0..6fafdcdfd2 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -13,16 +13,15 @@ enable
 :Range:		True/False
 :Default:	True
 
-Enable navigator.
-When enabled background threads are started to build nav mesh for world geometry.
-Pathfinding system uses nav mesh to build paths.
-When disabled only pathgrid is used to build paths.
-Single-core CPU systems may have big performance impact on exiting interior location and moving across exterior world.
+Enable navigator to make all settings in this category take effect.
+When enabled, a navigation mesh (navmesh) is built in the background for world geometry to be used for pathfinding.
+When disabled only the path grid is used to build paths.
+Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world.
 May slightly affect performance on multi-core CPU systems.
-Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance.
-Moving across external world, entering/exiting location produce nav mesh update.
-NPC and creatures may not be able to find path before nav mesh is built around them.
-Try to disable this if you want to have old fashioned AI which doesn't know where to go when you stand behind that stone and casting a firebolt.
+Multi-core CPU systems may have different latency for navigation mesh update depending on other settings and system performance.
+Moving across external world, entering/exiting location produce navigation mesh update.
+NPC and creatures may not be able to find path before navigation mesh is built around them.
+Try to disable this if you want to have old fashioned AI which doesn't know where to go when you stand behind that stone and cast a firebolt.
 
 max tiles number
 ----------------
@@ -31,14 +30,14 @@ max tiles number
 :Range:		>= 0
 :Default:	512
 
-Number of tiles at nav mesh.
+Number of tiles at navigation mesh.
 Nav mesh covers circle area around player.
-This option allows to set an explicit limit for nav mesh size, how many tiles should fit into circle.
-If actor is inside this area it able to find path over nav mesh.
+This option allows to set an explicit limit for navigation mesh size, how many tiles should fit into circle.
+If actor is inside this area it able to find path over navigation mesh.
 Increasing this value may decrease performance.
 
 .. note::
-    Don't expect infinite nav mesh size increasing.
+    Don't expect infinite navigation mesh size increasing.
     This condition is always true: ``max tiles number * max polygons per tile <= 4194304``.
     It's a limitation of `Recastnavigation <https://github.com/recastnavigation/recastnavigation>`_ library.
 
@@ -49,9 +48,9 @@ wait until min distance to player
 :Range:		>= 0
 :Default:	5
 
-Distance in navmesh tiles around the player to keep loading screen until navigation mesh is generated.
+Distance in navigation mesh tiles around the player to keep loading screen until navigation mesh is generated.
 Allows to complete cell loading only when minimal navigation mesh area is generated to correctly find path for actors
-nearby the player. Increasing this value will keep loading screen longer but will slightly increase nav mesh generation
+nearby the player. Increasing this value will keep loading screen longer but will slightly increase navigation mesh generation
 speed on systems bound by CPU. Zero means no waiting.
 
 enable nav mesh disk cache
@@ -61,8 +60,8 @@ enable nav mesh disk cache
 :Range:		True/False
 :Default:	True
 
-If true navmesh cache stored on disk will be used in addition to memory cache.
-If navmesh tile is not present in memory cache, it will be looked up in the disk cache.
+If true navigation mesh cache stored on disk will be used in addition to memory cache.
+If navigation mesh tile is not present in memory cache, it will be looked up in the disk cache.
 If it's not found there it will be generated.
 
 write to navmeshdb
@@ -72,7 +71,7 @@ write to navmeshdb
 :Range:		True/False
 :Default:	True
 
-If true generated navmesh tiles will be stored into disk cache while game is running.
+If true generated navigation mesh tiles will be stored into disk cache while game is running.
 
 max navmeshdb file size
 -----------------------
@@ -95,8 +94,8 @@ async nav mesh updater threads
 :Range:		>= 1
 :Default:	1
 
-Number of background threads to update nav mesh.
-Increasing this value may decrease performance, but also may decrease or increase nav mesh update latency depending on number of CPU cores.
+Number of background threads to update navigation mesh.
+Increasing this value may decrease performance, but also may decrease or increase navigation mesh update latency depending on number of CPU cores.
 On systems with not less than 4 CPU cores latency dependens approximately like 1/log(n) from number of threads.
 Don't expect twice better latency by doubling this value.
 
@@ -107,12 +106,12 @@ max nav mesh tiles cache size
 :Range:		>= 0
 :Default:	268435456
 
-Maximum total cached size of all nav mesh tiles in bytes.
-Setting greater than zero value will reduce nav mesh update latency for previously visited locations.
+Maximum total cached size of all navigation mesh tiles in bytes.
+Setting greater than zero value will reduce navigation mesh update latency for previously visited locations.
 Increasing this value may increase total memory consumption, but potentially will reduce latency for recently visited locations.
 Limit this value by total available physical memory minus base game memory consumption and other applications.
 Game will not eat all memory at once.
-Memory will be consumed in approximately linear dependency from number of nav mesh updates.
+Memory will be consumed in approximately linear dependency from number of navigation mesh updates.
 But only for new locations or already dropped from cache.
 
 min update interval ms
@@ -122,17 +121,17 @@ min update interval ms
 :Range:		>= 0
 :Default:	250
 
-Minimum time duration required to pass before next navmesh update for the same tile in milliseconds.
+Minimum time duration required to pass before next navigation mesh update for the same tile in milliseconds.
 Only tiles affected where objects are transformed.
 Next update for tile with added or removed object will not be delayed.
-Visible ingame effect is navmesh update around opening or closing door.
+Visible ingame effect is navigation mesh update around opening or closing door.
 Primary usage is for rotating signs like in Seyda Neen at Arrille's Tradehouse entrance.
 Decreasing this value may increase CPU usage by background threads.
 
 Developer's settings
 ********************
 
-This section is for developers or anyone who wants to investigate how nav mesh system works in OpenMW.
+This section is for developers or anyone who wants to learn how navigation mesh system works in OpenMW.
 
 enable write recast mesh to file
 --------------------------------
@@ -141,8 +140,8 @@ enable write recast mesh to file
 :Range:		True/False
 :Default:	False
 
-Write recast mesh to file in .obj format for each use to update nav mesh.
-Option is used to find out what world geometry is used to build nav mesh.
+Write recast mesh to file in .obj format for each use to update navigation mesh.
+Option is used to find out what world geometry is used to build navigation mesh.
 Potentially decreases performance.
 
 enable write nav mesh to file
@@ -152,7 +151,7 @@ enable write nav mesh to file
 :Range:		True/False
 :Default:	False
 
-Write nav mesh to file to be able to open by RecastDemo application.
+Write navigation mesh to file to be able to open by RecastDemo application.
 Usually it is more useful to have both enable write recast mesh to file and this options enabled.
 RecastDemo supports .obj files.
 Potentially decreases performance.
@@ -175,9 +174,9 @@ enable nav mesh file name revision
 :Range:		True/False
 :Default:	False
 
-Write each nav mesh file with revision in name.
+Write each navigation mesh file with revision in name.
 Otherwise will rewrite same file.
-If it is unclear when nav mesh is changed use this option to dump multiple files for each state.
+If it is unclear when navigation mesh is changed use this option to dump multiple files for each state.
 
 recast mesh path prefix
 -----------------------
@@ -195,7 +194,7 @@ nav mesh path prefix
 :Range:		file system path
 :Default:	""
 
-Write nav mesh file at path with this prefix.
+Write navigation mesh file at path with this prefix.
 
 enable nav mesh render
 ----------------------
@@ -206,7 +205,7 @@ enable nav mesh render
 
 Render navigation mesh.
 Allows to do in-game debug.
-Every nav mesh is visible and every update is noticeable.
+Every navigation mesh is visible and every update is noticeable.
 Potentially decreases performance.
 
 nav mesh render mode
@@ -246,16 +245,15 @@ Absent pieces usually mean a bug in recast mesh tiles building.
 Allows to do in-game debug.
 Potentially decreases performance.
 
-nav mesh version
-----------------
+wait for all jobs on exit
+-------------------------
 
-:Type:		integer
-:Range:		> 0
-:Default:	1
+:Type:		boolean
+:Range:		True/False
+:Default:	False
 
-Version of navigation mesh generation algorithm.
-Should be increased each time there is a difference between output of makeNavMeshTileData function for the same input.
-Changing the value will invalidate navmesh disk cache.
+Wait until all queued async navmesh jobs are processed before exiting the engine.
+Useful when a benchmark generates jobs to write into navmeshdb faster than they are processed.
 
 Expert settings
 ***************
@@ -269,12 +267,12 @@ recast scale factor
 :Range:		> 0.0
 :Default:	0.029411764705882353
 
-Scale of nav mesh coordinates to world coordinates. Recastnavigation builds voxels for world geometry.
+Scale of navigation mesh coordinates to world coordinates. Recastnavigation builds voxels for world geometry.
 Basically voxel size is 1 / "cell size". To reduce amount of voxels we apply scale factor, to make voxel size
 "recast scale factor" / "cell size". Default value calculates by this equation:
 sStepSizeUp * "recast scale factor" / "cell size" = 5 (max climb height should be equal to 4 voxels).
-Changing this value will change generated nav mesh. Some locations may become unavailable for NPC and creatures.
-Pay attention to slopes and roofs when change it. Increasing this value will reduce nav mesh update latency.
+Changing this value will change generated navigation mesh. Some locations may become unavailable for NPC and creatures.
+Pay attention to slopes and roofs when change it. Increasing this value will reduce navigation mesh update latency.
 
 max polygon path size
 ---------------------
@@ -397,13 +395,13 @@ max polygons per tile
 :Range:		2^n, 0 < n < 22
 :Default:	4096
 
-Maximum number of polygons per nav mesh tile. Maximum number of nav mesh tiles depends on
+Maximum number of polygons per navigation mesh tile. Maximum number of navigation mesh tiles depends on
 this value. 22 bits is a limit to store both tile identifier and polygon identifier (tiles = 2^(22 - log2(polygons))).
 See `recastnavigation <https://github.com/recastnavigation/recastnavigation>`_ for more details.
 
 .. Warning::
-    Lower value may lead to ignored world geometry on nav mesh.
-    Greater value will reduce number of nav mesh tiles.
+    Lower value may lead to ignored world geometry on navigation mesh.
+    Greater value will reduce number of navigation mesh tiles.
     This condition is always true: ``max tiles number * max polygons per tile <= 4194304``.
     It's a limitation of `Recastnavigation <https://github.com/recastnavigation/recastnavigation>`_ library.
 
diff --git a/docs/source/reference/modding/settings/postprocessing.rst b/docs/source/reference/modding/settings/postprocessing.rst
index b4b2f5a8d4..ed876c88d6 100644
--- a/docs/source/reference/modding/settings/postprocessing.rst
+++ b/docs/source/reference/modding/settings/postprocessing.rst
@@ -1,6 +1,8 @@
 Post Processing Settings
 ########################
 
+.. _Post Processing:
+
 enabled
 -------
 
diff --git a/docs/source/reference/modding/settings/saves.rst b/docs/source/reference/modding/settings/saves.rst
index 0e58d66d84..88aa48fc56 100644
--- a/docs/source/reference/modding/settings/saves.rst
+++ b/docs/source/reference/modding/settings/saves.rst
@@ -21,19 +21,6 @@ This setting determines whether the game will be automatically saved when the ch
 
 This setting can be toggled in game with the Auto-Save when Rest button in the Prefs panel of the Options menu.
 
-timeplayed
-----------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	False
-
-This setting determines whether the amount of the time the player has spent playing will be displayed
-for each saved game in the Load menu. Currently, the counter includes time spent in menus, including the pause menu, 
-but does not include time spent with the game window minimized.
-
-This setting can only be configured by editing the settings configuration file.
-
 max quicksaves
 --------------
 
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index b21444b9ef..d0011df0b0 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -8,11 +8,15 @@ force shaders
 :Range:		True/False
 :Default:	False
 
-Force rendering with shaders. By default, only bump-mapped objects will use shaders.
-Enabling this option may cause slightly different visuals if the "clamp lighting" option is set to false.
+Force rendering with shaders, even for objects that don't strictly need them.
+By default, only objects with certain effects, such as bump or normal maps will use shaders.
+With enhancements enabled, such as :ref:`enable shadows` and :ref:`reverse z`, shaders must be used for all objects, as if this setting is true.
+Typically, one or more of these enhancements will be enabled, and shaders will be needed for everything anyway, meaning toggling this setting will have no effect.
+
+Some settings, such as :ref:`clamp lighting` only apply to objects using shaders, so enabling this option may cause slightly different visuals when used at the same time.
 Otherwise, there should not be a visual difference.
 
-Please note enabling shaders has a significant performance impact on most systems.
+Please note enabling shaders may have a significant performance impact on some systems, and a mild impact on many others.
 
 force per pixel lighting
 ------------------------
@@ -21,12 +25,10 @@ force per pixel lighting
 :Range:		True/False
 :Default:	False
 
-Force the use of per pixel lighting. By default, only bump mapped objects use per-pixel lighting.
-Has no effect if the 'force shaders' option is false.
-Enabling per-pixel lighting results in visual differences to the original MW engine.
-It is not recommended to enable this option when using vanilla Morrowind files,
-because certain lights in Morrowind rely on vertex lighting to look as intended.
-Note that groundcover shaders ignore this setting.
+Force the use of per pixel lighting. By default, only bump and normal mapped objects use per-pixel lighting.
+Only affects objects drawn with shaders (see :ref:`force shaders` option).
+Enabling per-pixel lighting results in visual differences to the original MW engine as certain lights in Morrowind rely on vertex lighting to look as intended.
+Note that groundcover shaders and particle effects ignore this setting.
 
 clamp lighting
 --------------
@@ -36,8 +38,8 @@ clamp lighting
 :Default:	True
 
 Restrict the amount of lighting that an object can receive to a maximum of (1,1,1).
-Only affects objects that render with shaders (see 'force shaders' option).
-Always affects terrain.
+Only affects objects drawn with shaders (see :ref:`force shaders` option) as objects drawn without shaders always have clamped lighting.
+When disabled, terrain is always drawn with shaders to prevent seams between tiles that are and that aren't.
 
 Leaving this option at its default makes the lighting compatible with Morrowind's fixed-function method,
 but the lighting may appear dull and there might be colour shifts.
@@ -51,9 +53,9 @@ auto use object normal maps
 :Default:	False
 
 If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
-(see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+(see :ref:`normal map pattern`, e.g. for a base texture ``foo.dds``, the normal map texture would have to be named ``foo_n.dds``).
 If this option is disabled,
-normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.
+normal maps are only used if they are explicitly listed within the mesh file (``.nif`` or ``.osg`` file). Affects objects.
 
 auto use object specular maps
 -----------------------------
@@ -63,10 +65,10 @@ auto use object specular maps
 :Default:	False
 
 If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
-(see 'specular map pattern', e.g. for a base texture foo.dds,
-the specular map texture would have to be named foo_spec.dds).
+(see :ref:`specular map pattern`, e.g. for a base texture ``foo.dds``,
+the specular map texture would have to be named ``foo_spec.dds``).
 If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
-(.osg file, not supported in .nif files). Affects objects.
+(``.osg`` file, not supported in ``.nif`` files). Affects objects.
 
 auto use terrain normal maps
 ----------------------------
@@ -75,7 +77,7 @@ auto use terrain normal maps
 :Range:		True/False
 :Default:	False
 
-See 'auto use object normal maps'. Affects terrain.
+See :ref:`auto use object normal maps`. Affects terrain.
 
 auto use terrain specular maps
 ------------------------------
@@ -84,7 +86,7 @@ auto use terrain specular maps
 :Range:		True/False
 :Default:	False
 
-If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map.
+If a file with pattern :ref:`terrain specular map pattern` exists, use that file as a 'diffuse specular' map.
 The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.
 
 normal map pattern
@@ -95,7 +97,7 @@ normal map pattern
 :Default:	_n
 
 The filename pattern to probe for when detecting normal maps
-(see 'auto use object normal maps', 'auto use terrain normal maps')
+(see :ref:`auto use object normal maps`, :ref:`auto use terrain normal maps`)
 
 normal height map pattern
 -------------------------
@@ -115,7 +117,7 @@ specular map pattern
 :Range:
 :Default:	_spec
 
-The filename pattern to probe for when detecting object specular maps (see 'auto use object specular maps')
+The filename pattern to probe for when detecting object specular maps (see :ref:`auto use object specular maps`)
 
 terrain specular map pattern
 ----------------------------
@@ -124,7 +126,7 @@ terrain specular map pattern
 :Range:
 :Default:	_diffusespec
 
-The filename pattern to probe for when detecting terrain specular maps (see 'auto use terrain specular maps')
+The filename pattern to probe for when detecting terrain specular maps (see :ref:`auto use terrain specular maps`)
 
 apply lighting to environment maps
 ----------------------------------
@@ -146,13 +148,13 @@ lighting method
 
 Sets the internal handling of light sources.
 
-'legacy' is restricted to 8 lights per object and emulates fixed function
-pipeline compatible lighting.
+'legacy' is restricted to 8 lights per object and it is the method closest to
+fixed function pipeline lighting.
 
 'shaders compatibility' removes the light limit controllable through :ref:`max
 lights` and follows a modified attenuation formula which can drastically reduce
-light popping and seams. This mode also enables lighting on groundcover and a
-configurable light fade. It is recommended to use this with older hardware and a
+light popping and seams. This mode also enables lighting on groundcover.
+It is recommended to use this with older hardware and a
 light limit closer to 8. Because of its wide range of compatibility it is set as
 the default.
 
@@ -168,7 +170,7 @@ normal maps are provided. This is due to some groundcover mods using the Z-Up
 normals technique to avoid some common issues with shading. As a consequence,
 per pixel lighting would give undesirable results.
 
-Note that the rendering will act as if you have 'force shaders' option enabled
+Note that the rendering will act as if you have :ref:`force shaders` option enabled
 when not set to 'legacy'. This means that shaders will be used to render all objects and
 the terrain.
 
@@ -187,7 +189,26 @@ increase in :ref:`max lights` and thus carries a performance penalty. This
 especially helps with abrupt light popping with handheld light sources such as
 torches and lanterns.
 
-This setting has no effect if :ref:`lighting method` is 'legacy'.
+In Morrowind, this multiplier is non-existent, i.e. it is always 1.0.
+
+classic falloff
+---------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Use the traditional point light attenuation formula which lacks an early fade out.
+
+A flaw of the traditional formula is that light influence never quite reaches zero.
+This is physically accurate, but because lights don't have infinite radius (see :ref:`light bounds multiplier`),
+this can cause lighting seams between objects that got the relevant point light assigned and objects that didn't.
+Early fade out helps diminish these seams at the cost of darkening the scene.
+
+Morrowind uses the traditional formula, so you may want to enable this if you dislike the brightness differences.
+Alternatively, refer to :ref:`minimum interior brightness`.
+
+'legacy' :ref:`lighting method` behaves as if this setting were enabled.
 
 maximum light distance
 ----------------------
@@ -200,7 +221,7 @@ The maximum distance from the camera that lights will be illuminated, applies to
 both interiors and exteriors. A lower distance will improve performance. Set
 this to a non-positive value to disable fading.
 
-This setting has no effect if :ref:`lighting method` is 'legacy'.
+In Morrowind, there is no distance-based light fading.
 
 light fade start
 ----------------
@@ -212,8 +233,7 @@ light fade start
 The fraction of the maximum distance at which lights will begin to fade away.
 Tweaking it will make the transition proportionally more or less smooth.
 
-This setting has no effect if the :ref:`maximum light distance` is non-positive
-or :ref:`lighting method` is 'legacy'.
+This setting has no effect if the :ref:`maximum light distance` is non-positive.
 
 max lights
 ----------
@@ -236,17 +256,19 @@ minimum interior brightness
 :Range:		0.0-1.0
 :Default:	0.08
 
-Sets the minimum interior ambient brightness for interior cells when
-:ref:`lighting method` is not 'legacy'. A consequence of the new lighting system
-is that interiors will sometimes be darker since light sources now have sensible
-fall-offs. A couple solutions are to either add more lights or increase their
+Sets the minimum interior ambient brightness for interior cells.
+
+A consequence of the new lighting system is that interiors will sometimes be darker
+since light sources now have sensible fall-offs.
+A couple solutions are to either add more lights or increase their
 radii to compensate, but these require content changes. For best results it is
 recommended to set this to 0.0 to retain the colors that level designers
 intended. If brighter interiors are wanted, however, this setting should be
 increased. Note, it is advised to keep this number small (< 0.1) to avoid the
 aforementioned changes in visuals.
 
-This setting has no effect if :ref:`lighting method` is 'legacy'.
+This setting has no effect if :ref:`lighting method` is 'legacy'
+or if :ref:`classic falloff` is enabled.
 
 antialias alpha test
 --------------------
@@ -285,7 +307,7 @@ between them. Note, this relies on overriding specific properties of particle
 systems that potentially differ from the source content, this setting may change
 the look of some particle systems.
 
-Note that the rendering will act as if you have 'force shaders' option enabled.
+Note that the rendering will act as if you have :ref:`force shaders` option enabled.
 This means that shaders will be used to render all objects and the terrain.
 
 weather particle occlusion
diff --git a/docs/source/reference/modding/settings/shadows.rst b/docs/source/reference/modding/settings/shadows.rst
index 0670a81092..061184bdb9 100644
--- a/docs/source/reference/modding/settings/shadows.rst
+++ b/docs/source/reference/modding/settings/shadows.rst
@@ -16,6 +16,8 @@ Unlike in the original Morrowind engine, 'Shadow Mapping' is used, which can hav
 Bear in mind that this will force OpenMW to use shaders as if :ref:`force shaders` was enabled.
 A keen developer may be able to implement compatibility with fixed-function mode using the advice of `this post <https://github.com/OpenMW/openmw/pull/1547#issuecomment-369657381>`_, but it may be more difficult than it seems.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 number of shadow maps
 ---------------------
 
@@ -38,6 +40,8 @@ The maximum distance from the camera shadows cover, limiting their overall area
 and improving their quality and performance at the cost of removing shadows of distant objects or terrain.
 Set this to a non-positive value to remove the limit.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 shadow fade start
 -------------------
 
@@ -49,16 +53,7 @@ The fraction of the maximum shadow map distance at which the shadows will begin
 Tweaking it will make the transition proportionally more or less smooth.
 This setting has no effect if the maximum shadow map distance is non-positive (infinite).
 
-allow shadow map overlap
-------------------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	True
-
-If true, allow shadow maps to overlap.
-Counter-intuitively, will produce much better results when the light is behind the camera.
-When enabled, OpenMW uses Cascaded Shadow Maps and when disabled, it uses Parallel Split Shadow Maps.
+This setting can be controlled in the Settings tab of the launcher.
 
 enable debug hud
 ----------------
@@ -90,6 +85,8 @@ compute scene bounds
 Two different ways to make better use of shadow map(s) by making them cover a smaller area.
 While primitives give better shadows at expense of more CPU, bounds gives better performance overall but with lower quality shadows. There is also the ability to disable this computation with none.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 shadow map resolution
 ---------------------
 
@@ -101,6 +98,8 @@ Control How large to make the shadow map(s).
 Higher values increase GPU load but can produce better-looking results.
 Power-of-two values may turn out to be faster than smaller values which are not powers of two on some GPU/driver combinations.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 actor shadows
 -------------
 
@@ -111,6 +110,8 @@ actor shadows
 Allow actors to cast shadows.
 Potentially decreases performance.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 player shadows
 --------------
 
@@ -121,6 +122,8 @@ player shadows
 Allow the player to cast shadows.
 Potentially decreases performance.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 terrain shadows
 ---------------
 
@@ -131,6 +134,8 @@ terrain shadows
 Allow terrain to cast shadows.
 Potentially decreases performance.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 object shadows
 --------------
 
@@ -141,6 +146,8 @@ object shadows
 Allow static objects to cast shadows.
 Potentially decreases performance.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 enable indoor shadows
 ---------------------
 
@@ -152,6 +159,8 @@ Allow shadows indoors.
 Due to limitations with Morrowind's data, only actors can cast shadows indoors without the ceiling casting a shadow everywhere.
 Some might feel this is distracting as shadows can be cast through other objects, so indoor shadows can be disabled completely.
 
+This setting can be controlled in the Settings tab of the launcher.
+
 Expert settings
 ***************
 
@@ -212,7 +221,7 @@ split point uniform logarithmic ratio
 :Default:	0.5
 
 Controls the ratio of :math:`C_i^{log}` versus :math:`C_i^{uniform}` used to form the Practical Split Scheme as described in the linked paper.
-When using a larger-than-default viewing distance and distant terrain, and you have `allow shadow map overlap`_ enabled, larger values will prevent nearby shadows losing quality.
+When using a larger-than-default viewing distance and distant terrain, larger values will prevent nearby shadows losing quality.
 It is therefore recommended that this isn't left at the default when the viewing distance is changed.
 
 split point bias
diff --git a/docs/source/reference/modding/settings/sound.rst b/docs/source/reference/modding/settings/sound.rst
index 4cc665582b..dbcad65d0d 100644
--- a/docs/source/reference/modding/settings/sound.rst
+++ b/docs/source/reference/modding/settings/sound.rst
@@ -13,7 +13,7 @@ which should usually be sufficient, but if you need to explicitly specify a devi
 
 The names of detected devices can be found in the openmw.log file in your configuration directory.
 
-This setting can be configured by editing the settings configuration file, or in the Audio tab of the OpenMW Launcher.
+This setting can be controlled in the Settings tab of the launcher.
 
 master volume
 -------------
@@ -111,7 +111,8 @@ Enabling HRTF may also require an OpenAL Soft version greater than 1.17.0,
 and possibly some operating system configuration.
 A value of 0 disables HRTF processing, while a value of 1 explicitly enables HRTF processing.
 The default value is -1, which should enable the feature automatically for most users when possible.
-This setting can be configured by editing the settings configuration file, or in the Audio tab of the OpenMW Launcher.
+
+This setting can be controlled in the Settings tab of the launcher.
 
 hrtf
 ----
@@ -123,6 +124,19 @@ hrtf
 This setting specifies which HRTF profile to use when HRTF is enabled. Blank means use the default.
 This setting has no effect if HRTF is not enabled based on the hrtf enable setting.
 Allowed values for this field are enumerated in openmw.log file is an HRTF enabled audio system is installed.
-
 The default value is empty, which uses the default profile.
-This setting can be configured by editing the settings configuration file, or in the Audio tab of the OpenMW Launcher.
+
+This setting can be controlled in the Settings tab of the launcher.
+
+camera listener
+---------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+When true, uses the camera position and direction for audio instead of the player position.
+This makes audio in third person sound relative to camera instead of the player.
+False is vanilla Morrowind behaviour.
+
+This setting can be controlled in the Settings tab of the launcher.
\ No newline at end of file
diff --git a/docs/source/reference/modding/settings/terrain.rst b/docs/source/reference/modding/settings/terrain.rst
index 44b02f59d4..767f549fc7 100644
--- a/docs/source/reference/modding/settings/terrain.rst
+++ b/docs/source/reference/modding/settings/terrain.rst
@@ -205,3 +205,16 @@ object paging min size cost multiplier
 This setting adjusts the calculated cost of merging an object used in the mentioned functionality.
 The larger this value is, the less expensive objects can be before they are discarded.
 See the formula above to figure out the math.
+
+water culling
+-------------
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Controls whether water culling is used.
+
+Water culling is an optimisation that prevents the expensive rendering of water when it is
+evaluated to be below any visible terrain chunk, potentially improving performance in many scenes.
+
+You may want to opt out of it if it causes framerate instability or inappropriately invisible water on your setup.
diff --git a/docs/source/reference/modding/settings/video.rst b/docs/source/reference/modding/settings/video.rst
index 4cb5ba1842..76b20bb1da 100644
--- a/docs/source/reference/modding/settings/video.rst
+++ b/docs/source/reference/modding/settings/video.rst
@@ -13,8 +13,8 @@ Larger values produce more detailed images within the constraints of your graphi
 but may reduce the frame rate.
 
 The window resolution can be selected from a menu of common screen sizes
-in the Video tab of the Video Panel of the Options menu, or in the Graphics tab of the OpenMW Launcher.
-The horizontal resolution can also be set to a custom value in the Graphics tab of the OpenMW Launcher.
+in the Video tab of the Video Panel of the Options menu, or in the Display tab of the launcher.
+The horizontal resolution can also be set to a custom value in the Display tab of the launcher.
 
 resolution y
 ------------
@@ -28,8 +28,8 @@ Larger values produce more detailed images within the constraints of your graphi
 but may reduce the frame rate.
 
 The window resolution can be selected from a menu of common screen sizes
-in the Video tab of the Video Panel of the Options menu, or in the Graphics tab of the OpenMW Launcher.
-The vertical resolution can also be set to a custom value in the Graphics tab of the OpenMW Launcher.
+in the Video tab of the Video Panel of the Options menu, or in the Display tab of the launcher.
+The vertical resolution can also be set to a custom value in the Display tab of the launcher.
 
 window mode
 -----------
@@ -48,7 +48,7 @@ This setting determines the window mode.
 
 
 This setting can be toggled in game using the dropdown list in the Video tab of the Video panel in the Options menu.
-It can also be toggled with the window mode dropdown in the Graphics tab of the OpenMW Launcher.
+It can also be toggled with the window mode dropdown in the Display tab of the launcher.
 
 screen
 ------
@@ -63,7 +63,7 @@ since this is the only way to control which screen is used,
 but it can also be used to control which screen a normal window or a borderless window opens on as well.
 The screens are numbered in increasing order, beginning with 0.
 
-This setting can be selected from a pull down menu in the Graphics tab of the OpenMW Launcher,
+This setting can be selected from a pull down menu in the Display tab of the OpenMW Launcher,
 but cannot be changed during game play.
 
 minimize on focus loss
@@ -143,7 +143,7 @@ cannot reach your display's refresh rate. This prevents the input lag from becom
 Some hardware might not support this mode, in which case traditional vsync will be used.
 
 This setting can be adjusted in game using the VSync combo box in the Video tab of the Video panel in the Options menu.
-It can also be changed by toggling the Vertical Sync combo box in the Graphics tab of the OpenMW Launcher.
+It can also be changed by toggling the Vertical Sync combo box in the Display tab of the launcher.
 
 framerate limit
 ---------------
diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index fe407071f2..b04b92de94 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -58,6 +58,34 @@ This setting has no effect if the shader setting is false.
 
 This setting can be toggled with the 'Refraction' button in the Water tab of the Video panel of the Options menu.
 
+sunlight scattering
+-------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+This setting enables sunlight scattering.
+This makes incident sunlight seemingly spread through water, simulating the optical property.
+
+This setting has no effect if refraction is turned off.
+
+This setting can be toggled with the 'Sunlight Scattering' button in the Water tab of the Video panel of the Options menu.
+
+wobbly shores
+-------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+This setting makes shores wobbly.
+The water surface will smoothly fade into the shoreline and wobble based on water normal-mapping, which avoids harsh transitions.
+
+This setting has no effect if refraction is turned off.
+
+This setting can be toggled with the 'Wobbly Shores' button in the Water tab of the Video panel of the Options menu.
+
 reflection detail
 -----------------
 
diff --git a/docs/source/reference/modding/texture-modding/texture-basics.rst b/docs/source/reference/modding/texture-modding/texture-basics.rst
index 78ae007704..8bbf018fba 100644
--- a/docs/source/reference/modding/texture-modding/texture-basics.rst
+++ b/docs/source/reference/modding/texture-modding/texture-basics.rst
@@ -25,6 +25,19 @@ Content creators need to know that OpenMW uses the DX format for normal maps, an
 
 See the section `Automatic use`_ further down below for detailed information.
 
+The RGB channels of the normal map are used to store XYZ components of tangent space normals and the alpha channel of the normal map may be used to store a height map used for parallax.
+
+This is different from the setup used in Bethesda games that use the traditional pipeline, which may store specular information in the alpha channel.
+
+Special pixel formats that only store two color channels exist and are used by Bethesda games that employ a PBR-based pipeline. Compressed red-green formats are optimized for use with normal maps and suffer from far less quality degradation than S3TC-compressed normal maps of equivalent size.
+
+OpenMW supports the use of such pixel formats. When a red-green normal map is provided, the Z component of the normal will be reconstructed based on XY components it stores.
+Naturally, since these formats cannot provide an alpha channel, they do not support parallax.
+
+Keep in mind, however, that while the necessary hardware support is widespread for compressed red-green formats, it is less ubiquitous than the support for S3TC family of compressed formats.
+Should you run into the consequences of this, you might want to convert such textures into an uncompressed red-green format such as R8G8.
+Be careful not to try and convert such textures into a full-color format as the previously non-existent blue channel would then be used.
+
 Specular Mapping
 ################
 
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index a4028c5040..60fd2663c4 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -107,6 +107,8 @@ Builtin Uniforms
 +-------------+------------------------------+--------------------------------------------------+
 | float       | ``omw.deltaSimulationTime``  | The change in `omw.simulationTime`               |
 +-------------+------------------------------+--------------------------------------------------+
+| int         | ``omw.frameNumber``          | The current frame number                         |
++-------------+------------------------------+--------------------------------------------------+
 | float       | ``omw.windSpeed``            | The current wind speed                           |
 +-------------+------------------------------+--------------------------------------------------+
 | float       | ``omw.weatherTransition``    | The transition factor between weathers [0, 1]    |
@@ -126,45 +128,49 @@ Builtin Uniforms
 Builtin Macros
 ##############
 
-+-----------------------+----------------+----------------------------------------------------------------------+
-| Macro                 | Definition     | Description                                                          |
-+=======================+================+======================================================================+
-|``OMW_REVERSE_Z``      | ``0`` or ``1`` | Whether a reversed depth buffer is in use.                           |
-|                       |                |                                                                      |
-|                       |                | ``0``  Depth sampler will be in range [1, 0]                         |
-|                       |                |                                                                      |
-|                       |                | ``1``  Depth sampler will be in range [0, 1]                         |
-+-----------------------+----------------+----------------------------------------------------------------------+
-|``OMW_RADIAL_FOG``     | ``0`` or ``1`` | Whether radial fog is in use.                                        |
-|                       |                |                                                                      |
-|                       |                | ``0``  Fog is linear                                                 |
-|                       |                |                                                                      |
-|                       |                | ``1``  Fog is radial                                                 |
-+-----------------------+----------------+----------------------------------------------------------------------+
-|``OMW_EXPONENTIAL_FOG``| ``0`` or ``1`` | Whether exponential fog is in use.                                   |
-|                       |                |                                                                      |
-|                       |                | ``0``  Fog is linear                                                 |
-|                       |                |                                                                      |
-|                       |                | ``1``  Fog is exponential                                            |
-+-----------------------+----------------+----------------------------------------------------------------------+
-| ``OMW_HDR``           | ``0`` or ``1`` | Whether average scene luminance is computed every frame.             |
-|                       |                |                                                                      |
-|                       |                | ``0``  Average scene luminance is not computed                       |
-|                       |                |                                                                      |
-|                       |                | ``1``  Average scene luminance is computed                           |
-+-----------------------+----------------+----------------------------------------------------------------------+
-|  ``OMW_NORMALS``      | ``0`` or ``1`` | Whether normals are available as a sampler in the technique.         |
-|                       |                |                                                                      |
-|                       |                | ``0``  Normals are not available                                     |
-|                       |                |                                                                      |
-|                       |                | ``1``  Normals are available.                                        |
-+-----------------------+----------------+----------------------------------------------------------------------+
-| ``OMW_MULTIVIEW``     | ``0`` or ``1`` | Whether multiview rendering is in use.                               |
-|                       |                |                                                                      |
-|                       |                | ``0``  Multiview not in use                                          |
-|                       |                |                                                                      |
-|                       |                | ``1``  Multiview in use.                                             |
-+-----------------------+----------------+----------------------------------------------------------------------+
++-----------------------+-----------------+----------------------------------------------------------------------+
+| Macro                 | Definition      | Description                                                          |
++=======================+=================+======================================================================+
+|``OMW_REVERSE_Z``      | ``0`` or ``1``  | Whether a reversed depth buffer is in use.                           |
+|                       |                 |                                                                      |
+|                       |                 | ``0``  Depth sampler will be in range [1, 0]                         |
+|                       |                 |                                                                      |
+|                       |                 | ``1``  Depth sampler will be in range [0, 1]                         |
++-----------------------+-----------------+----------------------------------------------------------------------+
+|``OMW_RADIAL_FOG``     | ``0`` or ``1``  | Whether radial fog is in use.                                        |
+|                       |                 |                                                                      |
+|                       |                 | ``0``  Fog is linear                                                 |
+|                       |                 |                                                                      |
+|                       |                 | ``1``  Fog is radial                                                 |
++-----------------------+-----------------+----------------------------------------------------------------------+
+|``OMW_EXPONENTIAL_FOG``| ``0`` or ``1``  | Whether exponential fog is in use.                                   |
+|                       |                 |                                                                      |
+|                       |                 | ``0``  Fog is linear                                                 |
+|                       |                 |                                                                      |
+|                       |                 | ``1``  Fog is exponential                                            |
++-----------------------+-----------------+----------------------------------------------------------------------+
+| ``OMW_HDR``           | ``0`` or ``1``  | Whether average scene luminance is computed every frame.             |
+|                       |                 |                                                                      |
+|                       |                 | ``0``  Average scene luminance is not computed                       |
+|                       |                 |                                                                      |
+|                       |                 | ``1``  Average scene luminance is computed                           |
++-----------------------+-----------------+----------------------------------------------------------------------+
+|  ``OMW_NORMALS``      | ``0`` or ``1``  | Whether normals are available as a sampler in the technique.         |
+|                       |                 |                                                                      |
+|                       |                 | ``0``  Normals are not available                                     |
+|                       |                 |                                                                      |
+|                       |                 | ``1``  Normals are available.                                        |
++-----------------------+-----------------+----------------------------------------------------------------------+
+| ``OMW_MULTIVIEW``     | ``0`` or ``1``  | Whether multiview rendering is in use.                               |
+|                       |                 |                                                                      |
+|                       |                 | ``0``  Multiview not in use                                          |
+|                       |                 |                                                                      |
+|                       |                 | ``1``  Multiview in use.                                             |
++-----------------------+-----------------+----------------------------------------------------------------------+
+| ``OMW_API_VERSION``   | |ppApiRevision| | The revision of OpenMW postprocessing API.                           |
+|                       |                 | It is an integer that is incremented every time the API is changed.  |
+|                       |                 | This was added in 0.49, so it will be undefined in 0.48.             |
++-----------------------+-----------------+----------------------------------------------------------------------+
 
 
 Builtin Functions
@@ -189,19 +195,30 @@ The following functions can be accessed in any fragment or vertex shader.
 +--------------------------------------------------+-------------------------------------------------------------------------------+
 | ``vec4 omw_GetLastPass(vec2 uv)``                | Returns RGBA color output of the last pass                                    |
 +--------------------------------------------------+-------------------------------------------------------------------------------+
-| ``vec3 omw_GetNormals(vec2 uv)``                 | Returns normalized worldspace normals [-1, 1]                                 |
-|                                                  |                                                                               |
-|                                                  | The values in sampler are in [0, 1] but are transformed to [-1, 1]            |
-+--------------------------------------------------+-----------------------+-------------------------------------------------------+
+| ``vec3 omw_GetNormals(vec2 uv)``                 | Returns normalized view-space normals [-1, 1]                                 |
++--------------------------------------------------+-------------------------------------------------------------------------------+
+| ``vec3 omw_GetNormalsWorldSpace(vec2 uv)``       | Returns normalized world-space normals [-1, 1]                                |
++--------------------------------------------------+-------------------------------------------------------------------------------+
 | ``vec3 omw_GetWorldPosFromUV(vec2 uv)``          | Returns world position for given uv coordinate.                               |
-+--------------------------------------------------+-----------------------+-------------------------------------------------------+
++--------------------------------------------------+-------------------------------------------------------------------------------+
 | ``float omw_GetLinearDepth(vec2 uv)``            | Returns the depth in game units for given uv coordinate.                      |
-+--------------------------------------------------+-----------------------+-------------------------------------------------------+
++--------------------------------------------------+-------------------------------------------------------------------------------+
 | ``float omw_EstimateFogCoverageFromUV(vec2 uv)`` | Returns a fog coverage in the range from 0.0 (no fog) and 1.0 (full fog)      |
 |                                                  |                                                                               |
 |                                                  | Calculates an estimated fog coverage for given uv coordinate.                 |
-+--------------------------------------------------+-----------------------+-------------------------------------------------------+
-
++--------------------------------------------------+-------------------------------------------------------------------------------+
+| ``int omw_GetPointLightCount()``                 | Returns the number of point lights available to sample from in the scene.     |
++--------------------------------------------------+-------------------------------------------------------------------------------+
+| ``vec3 omw_GetPointLightWorldPos(int index)``    | Returns the world space position of a point light.                            |
++--------------------------------------------------+-------------------------------------------------------------------------------+
+| ``vec3 omw_GetPointLightDiffuse(int index)``     | Returns the diffuse color of the point light.                                 |
++--------------------------------------------------+-------------------------------------------------------------------------------+
+| ``int omw_GetPointLightAttenuation(int index)``  | Returns the attenuation values of the point light.                            |
+|                                                  |                                                                               |
+|                                                  | The XYZ channels hold the constant, linear, and quadratic components.         |
++--------------------------------------------------+-------------------------------------------------------------------------------+
+| ``float omw_GetPointLightRadius(int index)``     | Returns the radius of the point light, in game units.                         |
++--------------------------------------------------+-------------------------------------------------------------------------------+
 
 Special Attributes
 ##################
@@ -318,7 +335,7 @@ Exactly one ``technique`` block is required for every shader file. In this we de
 +------------------+--------------------+---------------------------------------------------+
 | author           | string             | Shader authors that shows in HUD                  |
 +------------------+--------------------+---------------------------------------------------+
-| glsl_Version     | integer            | GLSL version                                      |
+| glsl_version     | integer            | GLSL version                                      |
 +------------------+--------------------+---------------------------------------------------+
 | glsl_profile     | string             | GLSL profile, like ``compatibility``              |
 +------------------+--------------------+---------------------------------------------------+
@@ -436,21 +453,21 @@ To use the sampler, define the appropriately named `sampler2D` in any of your pa
 It is possible to define settings for your shaders that can be adjusted by either users or a Lua script.
 
 
-+-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
-| Block           | default  | min      | max      | static  | step     | description  |  display_name     | header  |
-+=================+==========+==========+==========+=========+==========+==============+===================+=========+
-|``uniform_bool`` | boolean  | x        | x        | boolean | x        | string       |  string           | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
-|``uniform_float``| float    | float    | float    | boolean | float    | string       |  string           | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
-|``uniform_int``  | integer  | integer  | integer  | boolean | integer  | string       |  string           | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
-|``uniform_vec2`` | vec2     | vec2     | vec2     | boolean | vec2     | string       |  string           | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
-|``uniform_vec3`` | vec3     | vec3     | vec3     | boolean | vec3     | string       |  string           | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
-|``uniform_vec4`` | vec4     | vec4     | vec4     | boolean | vec4     | string       |  string           | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+--------------+
+| Block           | default  | min      | max      | static  | step     | description  |  display_name     | header  |  widget_type |
++=================+==========+==========+==========+=========+==========+==============+===================+=========+==============+
+|``uniform_bool`` | boolean  | x        | x        | boolean | x        | string       |  string           | string  |  choice(...) |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+--------------+
+|``uniform_float``| float    | float    | float    | boolean | float    | string       |  string           | string  |  choice(...) |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+--------------+
+|``uniform_int``  | integer  | integer  | integer  | boolean | integer  | string       |  string           | string  |  choice(...) |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+--------------+
+|``uniform_vec2`` | vec2     | vec2     | vec2     | boolean | vec2     | string       |  string           | string  |  choice(...) |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+--------------+
+|``uniform_vec3`` | vec3     | vec3     | vec3     | boolean | vec3     | string       |  string           | string  |  choice(...) |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+--------------+
+|``uniform_vec4`` | vec4     | vec4     | vec4     | boolean | vec4     | string       |  string           | string  |  choice(...) |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+--------------+
 
 The ``description`` field is used to display a toolip when viewed in the in-game HUD. The ``header`` field
 field can be used to organize uniforms into groups in the HUD. The ``display_name`` field can be used to create a
@@ -494,6 +511,21 @@ These uniform blocks must be defined with the new ``size`` parameter.
         size = 10;
     }
 
+You may also define a dropdown list for users to select specific values from instead of the default sliders using the ``widget_type`` field.
+Each item in the dropdown has an associated display name, which can be a localized string.
+
+.. code-block:: none
+
+    uniform_int uStrength {
+        default = 2;
+        display_name = "Strength";
+        widget_type = choice(
+            "Low" = 1,
+            "Medium" = 2,
+            "High" = 3
+        );
+    }
+
 ``render_target``
 *****************
 
@@ -528,49 +560,138 @@ is not wanted and you want a custom render target.
 +------------------+---------------------+-----------------------------------------------------------------------------+
 | mipmaps          | boolean             | Whether mipmaps should be generated every frame                             |
 +------------------+---------------------+-----------------------------------------------------------------------------+
+| clear_color      | vec4                | The color the texture will be cleared to when it's first created            |
++------------------+---------------------+-----------------------------------------------------------------------------+
 
-To use the render target a pass must be assigned to it, along with any optional clear or blend modes.
+To use the render target a pass must be assigned to it, along with any optional blend modes.
+As a restriction, only three render targets can be bound per pass with ``rt1``, ``rt2``, ``rt3``, respectively.
 
-In the code snippet below a rendertarget is used to draw the red channel of a scene at half resolution, then a quarter. As a restriction,
-only three render targets can be bound per pass with ``rt1``, ``rt2``, ``rt3``, respectively.
+Blending modes can be useful at times. Below is a simple shader which, when activated, will slowly turn the screen pure red.
+Notice how we only ever write the value `.01` to the `RT_Red` buffer. Since we're using appropriate blending modes the
+color buffer will accumulate.
 
 .. code-block:: none
 
-    render_target RT_Downsample {
-        width_ratio = 0.5;
-        height_ratio = 0.5;
-        internal_format = r16f;
-        source_type = float;
-        source_format = red;
+    render_target RT_Red {
+        width = 4;
+        height = 4;
+        source_format = rgb;
+        internal_format = rgb16f;
+        source_type = half_float;
+        clear_color = vec4(0,0,0,1);
     }
 
-    render_target RT_Downsample4 {
-        width_ratio = 0.25;
-        height_ratio = 0.25;
-    }
-
-    fragment downsample2x(target=RT_Downsample) {
-
+    fragment red(target=RT_Red,blend=(add, src_color, one), rt1=RT_Red) {
         omw_In vec2 omw_TexCoord;
 
         void main()
         {
-            omw_FragColor.r = omw_GetLastShader(omw_TexCoord).r;
+            omw_FragColor.rgb = vec3(0.01,0,0);
         }
     }
 
-    fragment downsample4x(target=RT_Downsample4, rt1=RT_Downsample) {
-
+    fragment view(rt1=RT_Red) {
         omw_In vec2 omw_TexCoord;
 
         void main()
         {
-            omw_FragColor = omw_Texture2D(RT_Downsample, omw_TexCoord);
+            omw_FragColor = omw_Texture2D(RT_Red, omw_TexCoord);
         }
     }
 
-Now, when the `downsample2x` pass runs it will write to the target buffer instead of the default
-one assigned by the engine.
+    technique {
+        author = "OpenMW";
+        passes = red, view;
+    }
+
+
+These custom render targets are persistent and ownership is given to the shader which defines them.
+This gives potential to implement temporal effects by storing previous frame data in these buffers.
+Below is an example which calculates a naive average scene luminance and transitions between values smoothly.
+
+.. code-block:: none
+
+    render_target RT_Lum {
+        width = 256;
+        height = 256;
+        mipmaps = true;
+        source_format = rgb;
+        internal_format = rgb16f;
+        source_type = half_float;
+        min_filter = linear_mipmap_linear;
+        mag_filter = linear;
+    }
+
+    render_target RT_LumAvg {
+        source_type = half_float;
+        source_format = rgb;
+        internal_format = rgb16f;
+        min_filter = nearest;
+        mag_filter = nearest;
+    }
+
+    render_target RT_LumAvgLastFrame {
+        source_type = half_float;
+        source_format = rgb;
+        internal_format = rgb16f;
+        min_filter = nearest;
+        mag_filter = nearest;
+    }
+
+    fragment calculateLum(target=RT_Lum) {
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            vec3 orgi = pow(omw_GetLastShader(omw_TexCoord), vec4(2.2)).rgb;
+            omw_FragColor.rgb = orgi;
+        }
+    }
+
+    fragment fetchLumAvg(target=RT_LumAvg, rt1=RT_Lum, rt2=RT_LumAvgLastFrame) {
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            vec3 avgLumaCurrFrame = textureLod(RT_Lum, vec2(0.5, 0.5), 6).rgb;
+            vec3 avgLumaLastFrame = omw_Texture2D(RT_LumAvgLastFrame, vec2(0.5, 0.5)).rgb;
+
+            const float speed = 0.9;
+
+            vec3 avgLuma = avgLumaLastFrame + (avgLumaCurrFrame - avgLumaLastFrame) * (1.0 - exp(-omw.deltaSimulationTime * speed));
+
+            omw_FragColor.rgb = avgLuma;
+        }
+    }
+
+    fragment adaptation(rt1=RT_LumAvg) {
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            vec3 avgLuma = omw_Texture2D(RT_LumAvg, vec2(0.5, 0.5)).rgb;
+
+            if (omw_TexCoord.y < 0.2)
+                omw_FragColor = vec4(avgLuma, 1.0);
+            else
+                omw_FragColor = omw_GetLastShader(omw_TexCoord);
+        }
+    }
+
+    fragment store(target=RT_LumAvgLastFrame, rt1=RT_LumAvg) {
+        void main()
+        {
+            vec3 avgLuma = omw_Texture2D(RT_LumAvg, vec2(0.5, 0.5)).rgb;
+            omw_FragColor.rgb = avgLuma;
+        }
+    }
+
+    technique {
+        author = "OpenMW";
+        passes = calculateLum, fetchLumAvg, store, adaptation;
+        glsl_version = 330;
+    }
+
 
 Simple Example
 ##############
@@ -625,7 +746,6 @@ together passes, setting up metadata, and setting up various flags.
         passes = desaturate;
         version = "1.0";
         author = "Fargoth";
-        passes = desaturate;
     }
 
 
@@ -809,6 +929,8 @@ Types
 +--------------------+-----------------------+
 | float              | GL_FLOAT              |
 +--------------------+-----------------------+
+| half_float         | GL_HALF_FLOAT         |
++--------------------+-----------------------+
 | double             | GL_DOUBLE             |
 +--------------------+-----------------------+
 
diff --git a/extern/Base64/CMakeLists.txt b/extern/Base64/CMakeLists.txt
index 94992a22b5..fc750823c7 100644
--- a/extern/Base64/CMakeLists.txt
+++ b/extern/Base64/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(Base64 INTERFACE)
 target_include_directories(Base64 INTERFACE .)
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(Base64 INTERFACE <string>)
 endif()
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 9a536069e6..74ba957813 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -68,6 +68,7 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
     set(MYGUI_BUILD_DEMOS OFF CACHE BOOL "")
     set(MYGUI_BUILD_PLUGINS OFF CACHE BOOL "")
     set(MYGUI_BUILD_TOOLS OFF CACHE BOOL "")
+    set(MYGUI_DONT_USE_OBSOLETE ON CACHE BOOL "")
 
     if(MYGUI_STATIC)
         set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
@@ -77,8 +78,8 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
 
     include(FetchContent)
     FetchContent_Declare(mygui
-        URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.2.zip
-        URL_HASH SHA512=d15de716102237ca55b952c2ab52f84b91766332a0357a50b17c20cf2f168666ddaab52d088d7bb8f713ad0fc27e19d74e6ae2673f310a8f60a3b5754f0a0ba7
+        URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.3.zip
+        URL_HASH SHA512=c804ef665e786076582367f171082cd2181fdbd214300ddcca4a4245c5a0f45e62e72778ee2d96ec46b393e22477dd729f9bb3006e6eecbf536674e34a057721
         SOURCE_DIR fetched/mygui
     )
     FetchContent_MakeAvailableExcludeFromAll(mygui)
@@ -172,11 +173,10 @@ if(NOT OPENMW_USE_SYSTEM_RECASTNAVIGATION)
     set(RECASTNAVIGATION_TESTS OFF CACHE BOOL "")
     set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "")
 
-    # master on 12 Oct 2022
     include(FetchContent)
     FetchContent_Declare(recastnavigation
-        URL https://github.com/recastnavigation/recastnavigation/archive/405cc095ab3a2df976a298421974a2af83843baf.zip
-        URL_HASH SHA512=39580ca258783ab3bda237843facc918697266e729c85065cdae1f0ed3d0ed1429a7ed08b18b926ba64402d9875a18f52904a87f43fe4fe30252f23edcfa6c70
+        URL https://github.com/recastnavigation/recastnavigation/archive/c393777d26d2ff6519ac23612abf8af42678c9dd.zip
+        URL_HASH SHA512=48f20cee7a70c2f20f4c68bb74d5af11a1434be85294e37f5fe7b7aae820fbcdff4f35d3be286eaf6f9cbce0aed4201fcc090df409a5bd04aec5fd7c29b3ad94
         SOURCE_DIR fetched/recastnavigation
     )
     FetchContent_MakeAvailableExcludeFromAll(recastnavigation)
@@ -212,8 +212,8 @@ if (BUILD_BENCHMARKS AND NOT OPENMW_USE_SYSTEM_BENCHMARK)
 
     include(FetchContent)
     FetchContent_Declare(benchmark
-        URL https://github.com/google/benchmark/archive/refs/tags/v1.7.1.zip
-        URL_HASH SHA512=bec4016263587a57648e02b094c69e838c0a21e16c3dcfc6f03100397ab8f95d5fab1f5fd0d7e0e8adbb8212fff1eb574581158fdda1fa7fd6ff12762154b0cc
+        URL https://github.com/google/benchmark/archive/refs/tags/v1.8.3.zip
+        URL_HASH SHA512=d73587ad9c49338749e1d117a6f8c7ff9c603a91a2ffa91a7355c7df7dea82710b9a810d34ddfef20973ecdc77092ec10fb2b4e4cc8d2e7810cbed79617b3828
         SOURCE_DIR fetched/benchmark
     )
     FetchContent_MakeAvailableExcludeFromAll(benchmark)
@@ -234,7 +234,7 @@ if (NOT OPENMW_USE_SYSTEM_YAML_CPP)
     )
     FetchContent_MakeAvailableExcludeFromAll(yaml-cpp)
 
-    if (MSVC)
+    if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
         target_precompile_headers(yaml-cpp PRIVATE <algorithm>)
     endif()
 endif()
@@ -294,7 +294,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
     set(ICU_LIBRARIES ICU::i18n ICU::uc ICU::data PARENT_SCOPE)
 endif()
 
-if ((BUILD_UNITTESTS OR BUILD_OPENCS_TESTS) AND NOT OPENMW_USE_SYSTEM_GOOGLETEST)
+if ((BUILD_COMPONENTS_TESTS OR BUILD_OPENCS_TESTS OR BUILD_OPENMW_TESTS) AND NOT OPENMW_USE_SYSTEM_GOOGLETEST)
 
     include(FetchContent)
     FetchContent_Declare(googletest
diff --git a/extern/oics/CMakeLists.txt b/extern/oics/CMakeLists.txt
index 1b9fea9217..2d34f3f3e6 100644
--- a/extern/oics/CMakeLists.txt
+++ b/extern/oics/CMakeLists.txt
@@ -20,6 +20,8 @@ else()
     target_link_libraries(oics local_tinyxml)
 endif()
 
-if (MSVC)
+target_link_libraries(oics SDL2::SDL2)
+
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(oics PUBLIC <algorithm> <string>)
 endif()
diff --git a/extern/oics/ICSInputControlSystem.cpp b/extern/oics/ICSInputControlSystem.cpp
index 9f03ec121e..e64fef0fc6 100644
--- a/extern/oics/ICSInputControlSystem.cpp
+++ b/extern/oics/ICSInputControlSystem.cpp
@@ -42,6 +42,7 @@ namespace ICS
         , mXmouseAxisBinded(false), mYmouseAxisBinded(false)
         , mClientWidth(1)
         , mClientHeight(1)
+        , mMouseAxisBindingInitialValues{0}
 	{
 		ICS_LOG(" - Creating InputControlSystem - ");
 
@@ -356,14 +357,9 @@ namespace ICS
 		return file.substr(0, file.find_last_of("."));
 	}
 
-	bool InputControlSystem::save(std::string fileName)
+	bool InputControlSystem::save(const std::string& fileName)
 	{
-		if(fileName != "")
-		{
-			mFileName = fileName;
-		}
-
-		TiXmlDocument doc(  mFileName.c_str() );
+		TiXmlDocument doc(fileName.c_str());
 
 		TiXmlDeclaration dec;
 		dec.Parse( "<?xml version='1.0' encoding='utf-8'?>", 0, TIXML_ENCODING_UNKNOWN );
@@ -802,11 +798,7 @@ namespace ICS
 
     std::string InputControlSystem::scancodeToString(SDL_Scancode key)
 	{
-        SDL_Keycode code = SDL_GetKeyFromScancode(key);
-        if (code == SDLK_UNKNOWN)
-            return std::string(SDL_GetScancodeName(key));
-        else
-            return std::string(SDL_GetKeyName(code));
+		return std::string(SDL_GetScancodeName(key));
 	}
 
     void InputControlSystem::adjustMouseRegion(Uint16 width, Uint16 height)
diff --git a/extern/oics/ICSInputControlSystem.h b/extern/oics/ICSInputControlSystem.h
index 97ab8d2edf..f0736409c9 100644
--- a/extern/oics/ICSInputControlSystem.h
+++ b/extern/oics/ICSInputControlSystem.h
@@ -84,11 +84,11 @@ namespace ICS
 		// in seconds
 		void update(float timeSinceLastFrame);
 
-        inline Channel* getChannel(int i){ return mChannels[i]; };
+		Channel* getChannel(int i){ return mChannels.at(i); };
 		float getChannelValue(int i);
 		inline int getChannelCount(){ return (int)mChannels.size(); };
 
-		inline Control* getControl(int i){ return mControls[i]; };
+		Control* getControl(int i){ return mControls.at(i); };
 		float getControlValue(int i);
 		inline int getControlCount(){ return (int)mControls.size(); };
 		inline void addControl(Control* control){ mControls.push_back(control); };
@@ -144,7 +144,7 @@ namespace ICS
 		void cancelDetectingBindingState();
         bool detectingBindingState();
 
-		bool save(std::string fileName = "");
+		bool save(const std::string& fileName);
 
 		void adjustMouseRegion (Uint16 width, Uint16 height);
 
diff --git a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
index 7e2712f19b..8ff608bf04 100644
--- a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
+++ b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@@ -14,10 +14,11 @@ include_directories(${FFmpeg_INCLUDE_DIRS})
 add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${OSG_LIBRARIES})
+target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} SDL2::SDL2)
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} PUBLIC
         <memory>
         <string>
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
index decf57e4df..9a48dff459 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -1,5 +1,7 @@
 #include "audiodecoder.hpp"
 
+#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+
 #include <algorithm>
 #include <stdexcept>
 #include <string>
@@ -18,6 +20,10 @@ extern "C"
     #pragma warning (pop)
 #endif
 
+#if OPENMW_FFMPEG_5_OR_GREATER
+    #include <libavutil/channel_layout.h>
+#endif
+
 #include "videostate.hpp"
 
 namespace
@@ -53,7 +59,11 @@ MovieAudioDecoder::MovieAudioDecoder(VideoState* videoState)
     : mVideoState(videoState)
     , mAVStream(*videoState->audio_st)
     , mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
+    #if OPENMW_FFMPEG_5_OR_GREATER
+    , mOutputChannelLayout({})
+    #else
     , mOutputChannelLayout(0)
+    #endif
     , mOutputSampleRate(0)
     , mFramePos(0)
     , mFrameSize(0)
@@ -109,21 +119,49 @@ void MovieAudioDecoder::setupFormat()
 
     AVSampleFormat inputSampleFormat = mAudioContext->sample_fmt;
 
+#if OPENMW_FFMPEG_5_OR_GREATER
+    AVChannelLayout inputChannelLayout = mAudioContext->ch_layout;
+    if (inputChannelLayout.u.mask != 0)
+        mOutputChannelLayout = inputChannelLayout;
+    else
+        av_channel_layout_default(&mOutputChannelLayout, mAudioContext->ch_layout.nb_channels);
+#else
     uint64_t inputChannelLayout = mAudioContext->channel_layout;
     if (inputChannelLayout == 0)
         inputChannelLayout = av_get_default_channel_layout(mAudioContext->channels);
+#endif
 
     int inputSampleRate = mAudioContext->sample_rate;
 
     mOutputSampleRate = inputSampleRate;
     mOutputSampleFormat = inputSampleFormat;
+
+#if OPENMW_FFMPEG_5_OR_GREATER
+    adjustAudioSettings(mOutputSampleFormat, mOutputChannelLayout.u.mask, mOutputSampleRate);
+#else
     mOutputChannelLayout = inputChannelLayout;
     adjustAudioSettings(mOutputSampleFormat, mOutputChannelLayout, mOutputSampleRate);
+#endif
 
     if (inputSampleFormat != mOutputSampleFormat
+        #if OPENMW_FFMPEG_5_OR_GREATER
+            || inputChannelLayout.u.mask != mOutputChannelLayout.u.mask
+        #else
             || inputChannelLayout != mOutputChannelLayout
+        #endif
             || inputSampleRate != mOutputSampleRate)
     {
+    #if OPENMW_FFMPEG_5_OR_GREATER
+        swr_alloc_set_opts2(&mAudioResampler->mSwr,
+          &mOutputChannelLayout,
+          mOutputSampleFormat,
+          mOutputSampleRate,
+          &inputChannelLayout,
+          inputSampleFormat,
+          inputSampleRate,
+          0,                             // logging level offset
+          nullptr);                      // log context
+    #else
         mAudioResampler->mSwr = swr_alloc_set_opts(mAudioResampler->mSwr,
                           mOutputChannelLayout,
                           mOutputSampleFormat,
@@ -133,6 +171,8 @@ void MovieAudioDecoder::setupFormat()
                           inputSampleRate,
                           0,                             // logging level offset
                           nullptr);                      // log context
+    #endif
+
         if(!mAudioResampler->mSwr)
             fail(std::string("Couldn't allocate SwrContext"));
         if(swr_init(mAudioResampler->mSwr) < 0)
@@ -158,7 +198,11 @@ int MovieAudioDecoder::synchronize_audio()
         if(fabs(avg_diff) >= mAudioDiffThreshold)
         {
             int n = av_get_bytes_per_sample(mOutputSampleFormat) *
+        #if OPENMW_FFMPEG_5_OR_GREATER
+                    mOutputChannelLayout.nb_channels;
+        #else
                     av_get_channel_layout_nb_channels(mOutputChannelLayout);
+        #endif
             sample_skip = ((int)(diff * mAudioContext->sample_rate) * n);
         }
     }
@@ -204,7 +248,11 @@ int MovieAudioDecoder::audio_decode_frame(AVFrame *frame, int &sample_skip)
                 if(!mDataBuf || mDataBufLen < frame->nb_samples)
                 {
                     av_freep(&mDataBuf);
+    #if OPENMW_FFMPEG_5_OR_GREATER
+                    if(av_samples_alloc(&mDataBuf, nullptr, mOutputChannelLayout.nb_channels,
+    #else
                     if(av_samples_alloc(&mDataBuf, nullptr, av_get_channel_layout_nb_channels(mOutputChannelLayout),
+    #endif
                                         frame->nb_samples, mOutputSampleFormat, 0) < 0)
                         break;
                     else
@@ -221,7 +269,11 @@ int MovieAudioDecoder::audio_decode_frame(AVFrame *frame, int &sample_skip)
             else
                 mFrameData = &frame->data[0];
 
+    #if OPENMW_FFMPEG_5_OR_GREATER
+            int result = frame->nb_samples * mOutputChannelLayout.nb_channels *
+    #else
             int result = frame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout) *
+    #endif
                     av_get_bytes_per_sample(mOutputSampleFormat);
 
             /* We have data, return it and come back for more later */
@@ -298,7 +350,11 @@ size_t MovieAudioDecoder::read(char *stream, size_t len)
             len1 = std::min<size_t>(len1, -mFramePos);
 
             int n = av_get_bytes_per_sample(mOutputSampleFormat)
+    #if OPENMW_FFMPEG_5_OR_GREATER
+                    * mOutputChannelLayout.nb_channels;
+    #else
                     * av_get_channel_layout_nb_channels(mOutputChannelLayout);
+    #endif
 
             /* add samples by copying the first sample*/
             if(n == 1)
@@ -348,7 +404,11 @@ int MovieAudioDecoder::getOutputSampleRate() const
 
 uint64_t MovieAudioDecoder::getOutputChannelLayout() const
 {
+    #if OPENMW_FFMPEG_5_OR_GREATER
+    return mOutputChannelLayout.u.mask;
+    #else
     return mOutputChannelLayout;
+    #endif
 }
 
 AVSampleFormat MovieAudioDecoder::getOutputSampleFormat() const
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp
index bbb5a27838..250ba1db64 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp
@@ -6,6 +6,8 @@
 #include <new>
 #include <memory>
 
+#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+
 #if defined(_MSC_VER)
     #pragma warning (push)
     #pragma warning (disable : 4244)
@@ -43,7 +45,11 @@ protected:
     AVCodecContext* mAudioContext;
     AVStream *mAVStream;
     enum AVSampleFormat mOutputSampleFormat;
+    #if OPENMW_FFMPEG_5_OR_GREATER
+    AVChannelLayout mOutputChannelLayout;
+    #else
     uint64_t mOutputChannelLayout;
+    #endif
     int mOutputSampleRate;
     ssize_t mFramePos;
     ssize_t mFrameSize;
diff --git a/extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp b/extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp
new file mode 100644
index 0000000000..106259ced7
--- /dev/null
+++ b/extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVFORMATDEFINES_H
+#define OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVFORMATDEFINES_H
+
+extern "C"
+{
+
+#include <libavformat/version.h>
+
+}
+
+#define OPENMW_FFMPEG_CONST_WRITEPACKET (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(61, 0, 100))
+
+#endif
diff --git a/extern/osg-ffmpeg-videoplayer/libavutildefines.hpp b/extern/osg-ffmpeg-videoplayer/libavutildefines.hpp
new file mode 100644
index 0000000000..e1b0ac93bd
--- /dev/null
+++ b/extern/osg-ffmpeg-videoplayer/libavutildefines.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVUTILDEFINES_H
+#define OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVUTILDEFINES_H
+
+extern "C"
+{
+
+#include <libavutil/version.h>
+
+}
+
+#define OPENMW_FFMPEG_5_OR_GREATER (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100))
+
+#endif
diff --git a/extern/osg-ffmpeg-videoplayer/videoplayer.cpp b/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
index e101bd4870..bc1668971b 100644
--- a/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
@@ -2,6 +2,7 @@
 
 #include <iostream>
 
+#include <osg/Notify>
 #include <osg/Texture2D>
 
 #include "audiofactory.hpp"
@@ -45,7 +46,7 @@ void VideoPlayer::playVideo(std::unique_ptr<std::istream>&& inputstream, const s
         }
     }
     catch(std::exception& e) {
-        std::cerr<< "Failed to play video: "<<e.what() <<std::endl;
+        OSG_FATAL << "Failed to play video: " << e.what() << std::endl;
         close();
     }
 }
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 096651dfd8..0d9c0144e0 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -43,6 +43,7 @@ static FlushPacket flush_pkt;
 #include "videoplayer.hpp"
 #include "audiodecoder.hpp"
 #include "audiofactory.hpp"
+#include "libavformatdefines.hpp"
 
 namespace
 {
@@ -204,7 +205,7 @@ int VideoPicture::set_dimensions(int w, int h) {
   std::unique_ptr<AVFrame, VideoPicture::AVFrameDeleter> frame{
       av_frame_alloc()};
   if (frame == nullptr) {
-    std::cerr << "av_frame_alloc failed" << std::endl;
+    OSG_FATAL << "av_frame_alloc failed" << std::endl;
     return -1;
   }
 
@@ -214,7 +215,7 @@ int VideoPicture::set_dimensions(int w, int h) {
   frame->height = h;
   if (av_image_alloc(frame->data, frame->linesize, frame->width, frame->height,
                      kPixFmt, 1) < 0) {
-    std::cerr << "av_image_alloc failed" << std::endl;
+    OSG_FATAL << "av_image_alloc failed" << std::endl;
     return -1;
   }
 
@@ -235,15 +236,25 @@ int VideoState::istream_read(void *user_data, uint8_t *buf, int buf_size)
         std::istream& stream = *static_cast<VideoState*>(user_data)->stream;
         stream.clear();
         stream.read((char*)buf, buf_size);
-        return stream.gcount();
+        if (stream.bad())
+            return AVERROR_UNKNOWN;
+        auto count = stream.gcount();
+        // avio_alloc_context says we mustn't return 0 for stream protocols
+        if (!count)
+            return AVERROR_EOF;
+        return count;
     }
     catch (std::exception& )
     {
-        return 0;
+        return AVERROR_UNKNOWN;
     }
 }
 
+#if OPENMW_FFMPEG_CONST_WRITEPACKET
+int VideoState::istream_write(void *, const unsigned char *, int)
+#else
 int VideoState::istream_write(void *, uint8_t *, int)
+#endif
 {
     throw std::runtime_error("can't write to read-only stream");
 }
@@ -431,7 +442,7 @@ public:
             }
             catch(std::exception& e)
             {
-                std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
+                OSG_FATAL << "An error occurred playing the video: " << e.what() << std::endl;
             }
         })
     {
@@ -556,9 +567,9 @@ public:
                     {
 // In the FFMpeg 4.0 a "filename" field was replaced by "url"
 #if LIBAVCODEC_VERSION_INT < 3805796
-                        std::cerr << "Error seeking " << self->format_ctx->filename << std::endl;
+                        OSG_FATAL << "Error seeking " << self->format_ctx->filename << std::endl;
 #else
-                        std::cerr << "Error seeking " << self->format_ctx->url << std::endl;
+                        OSG_FATAL << "Error seeking " << self->format_ctx->url << std::endl;
 #endif
                     }
                     else
@@ -598,8 +609,17 @@ public:
 
                 if(av_read_frame(pFormatCtx, packet.get()) < 0)
                 {
-                    if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0 && self->pictq_size == 0)
-                        self->mVideoEnded = true;
+                    if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0)
+                    {
+                        self->pictq_mutex.lock();
+                        bool videoEnded = self->pictq_size == 0;
+                        self->pictq_mutex.unlock();
+                        if (videoEnded)
+                            self->mVideoEnded = true;
+                        else
+                            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                    }
+
                     continue;
                 }
                 else
@@ -615,7 +635,7 @@ public:
             }
         }
         catch(std::exception& e) {
-            std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
+            OSG_FATAL << "An error occurred playing the video: " << e.what() << std::endl;
         }
 
         self->mQuit = true;
@@ -669,7 +689,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
 
         if (!mAudioFactory)
         {
-            std::cerr << "No audio factory registered, can not play audio stream" << std::endl;
+            OSG_FATAL << "No audio factory registered, can not play audio stream" << std::endl;
             avcodec_free_context(&this->audio_ctx);
             this->audio_st = nullptr;
             return -1;
@@ -678,7 +698,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         mAudioDecoder = mAudioFactory->createDecoder(this);
         if (!mAudioDecoder)
         {
-            std::cerr << "Failed to create audio decoder, can not play audio stream" << std::endl;
+            OSG_FATAL << "Failed to create audio decoder, can not play audio stream" << std::endl;
             avcodec_free_context(&this->audio_ctx);
             this->audio_st = nullptr;
             return -1;
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 3681a64976..548bbca713 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -11,6 +11,7 @@
 #include <condition_variable>
 
 #include <osg/ref_ptr>
+
 namespace osg
 {
     class Texture2D;
@@ -39,6 +40,7 @@ extern "C"
 #endif
 
 #include "videodefs.hpp"
+#include "libavformatdefines.hpp"
 
 #define VIDEO_PICTURE_QUEUE_SIZE 50
 
@@ -155,7 +157,13 @@ struct VideoState {
     double get_master_clock();
 
     static int istream_read(void *user_data, uint8_t *buf, int buf_size);
-    static int istream_write(void *user_data, uint8_t *buf, int buf_size);
+
+#if OPENMW_FFMPEG_CONST_WRITEPACKET
+    static int istream_write(void *, const unsigned char *, int);
+#else
+    static int istream_write(void *, uint8_t *, int);
+#endif
+
     static int64_t istream_seek(void *user_data, int64_t offset, int whence);
 
     osg::ref_ptr<osg::Texture2D> mTexture;
diff --git a/files/data-mw/l10n/Calendar/de.yaml b/files/data-mw/l10n/Calendar/de.yaml
index b3ee621402..6d83cd2aad 100644
--- a/files/data-mw/l10n/Calendar/de.yaml
+++ b/files/data-mw/l10n/Calendar/de.yaml
@@ -1,4 +1,5 @@
-# source: https://en.uesp.net/wiki/Lore:Calendar
+# Source for month and weekday names: German Morrowind GOTY version
+# For reference: https://www.elderscrollsportal.de/almanach/Tamriel-Almanach:%C3%9Cbersetzungskompendium
 
 month1: "Morgenstern"
 month2: "Morgenröte"
@@ -13,8 +14,26 @@ month10: "Eisherbst"
 month11: "Abenddämmerung"
 month12: "Abendstern"
 
-# The variant of month names in the context "day X of month Y".
-# In English it is the same, but some languages require a different form.
+# In German, there are two different options to generate the genitive form of a month name:
+#
+# (1) Apply standard rules for genitive (too complicated to elaborate here, but you usually add an "s"/"es" at the end of the word).
+# (2) Use the nominative version.
+#
+# Nowadays, option (2) is more commonly used, so let's apply that here as well.
+# Let me add the names for option (1) in case we want to switch in the future:
+#
+# monthInGenitive1: "des Morgensterns"
+# monthInGenitive2: "der Morgenröte"
+# monthInGenitive3: "der Erstsaat"
+# monthInGenitive4: "der Regenhand"
+# monthInGenitive5: "der Zweitsaat"
+# monthInGenitive6: "des Mittjahres"
+# monthInGenitive7: "der Sonnenhöhe"
+# monthInGenitive8: "der Herbstsaat"
+# monthInGenitive9: "des Herdfeuers"
+# monthInGenitive10: "des Eisherbstes"
+# monthInGenitive11: "der Abenddämmerung"
+# monthInGenitive12: "des Abendsterns"
 monthInGenitive1: "Morgenstern"
 monthInGenitive2: "Morgenröte"
 monthInGenitive3: "Erstsaat"
@@ -28,7 +47,9 @@ monthInGenitive10: "Eisherbst"
 monthInGenitive11: "Abenddämmerung"
 monthInGenitive12: "Abendstern"
 
-dateFormat: "tag {day} im {monthInGenitive} {year, number, :: group-off}"
+# Standard German date format: d. MMMM YYYY
+# Modified example for TES lore: "16. Herbstsaat 3E 427"
+dateFormat: "{day}. {month} {year, number, :: group-off}"
 
 weekday1: "Sundas"
 weekday2: "Morndas"
@@ -37,3 +58,9 @@ weekday4: "Middas"
 weekday5: "Turdas"
 weekday6: "Fredas"
 weekday7: "Loredas"
+
+# In German, there are usually no "a.m."/"p.m." shenanigans going on.
+# In case of ambiguity, "vormittags" ("mornings") and "nachmittags" ("in the afternoon") are used.
+am: "vormittags"
+pm: "nachmittags"
+day: "Tag"
diff --git a/files/data-mw/l10n/Calendar/en.yaml b/files/data-mw/l10n/Calendar/en.yaml
index b8c850281c..5fea9d8971 100644
--- a/files/data-mw/l10n/Calendar/en.yaml
+++ b/files/data-mw/l10n/Calendar/en.yaml
@@ -37,3 +37,7 @@ weekday4: "Middas"
 weekday5: "Turdas"
 weekday6: "Fredas"
 weekday7: "Loredas"
+
+am: "a.m."
+pm: "p.m."
+day: "Day"
diff --git a/files/data-mw/l10n/Calendar/ru.yaml b/files/data-mw/l10n/Calendar/ru.yaml
index 95828e1e6b..f79ada8a03 100644
--- a/files/data-mw/l10n/Calendar/ru.yaml
+++ b/files/data-mw/l10n/Calendar/ru.yaml
@@ -38,3 +38,7 @@ weekday4: "Миддас"
 weekday5: "Турдас"
 weekday6: "Фредас"
 weekday7: "Лордас"
+
+am: "д.п."
+pm: "п.п."
+day: "День"
diff --git a/files/data-mw/l10n/Calendar/sv.yaml b/files/data-mw/l10n/Calendar/sv.yaml
index 7aecb93455..b78f445067 100644
--- a/files/data-mw/l10n/Calendar/sv.yaml
+++ b/files/data-mw/l10n/Calendar/sv.yaml
@@ -1,7 +1,15 @@
 # source: https://en.uesp.net/wiki/Lore:Calendar
 
-# Sv: Ingen vits att översätta namn på månader och dagar till svenska när inte spelets innehåll finns på svenska. Det lär mest bara förvirra. Därför finns bara dateFormat i denna fil.
+# Sv: Ingen vits att översätta namn på månader och dagar till svenska när inte spelets innehåll finns på svenska. Det lär mest bara förvirra.
+# Därför finns bara dateFormat, am, pm och day i denna fil.
 
-# En: No use translating names on months and weekdays to Swedish when the game's content isn't in Swedish. It will probably just confuse people. Therefore, only dateFormat is present in this file.
+# En: No use translating names on months and weekdays to Swedish when the game's content isn't in Swedish. It will probably just confuse people.
+# Therefore, only dateFormat, am, pm and day are present in this file.
 
 dateFormat: "dag {day} av {monthInGenitive} år {year, number, :: group-off}"
+
+# In Swedish, as with German, we don't use AM/PM but instead a 24h clock.
+# But instead of that, we could use "förmiddag" and "eftermiddag", which is basically "morning" and "afternoon"
+am: "f.m."
+pm: "e.m."
+day: "Dag"
diff --git a/files/data-mw/l10n/OMWEngine/gmst.yaml b/files/data-mw/l10n/OMWEngine/gmst.yaml
index 8f16726fbc..1292a0e87d 100644
--- a/files/data-mw/l10n/OMWEngine/gmst.yaml
+++ b/files/data-mw/l10n/OMWEngine/gmst.yaml
@@ -5,10 +5,13 @@ AudioMaster: "sMaster"
 AudioMusic: "sMusic"
 Audio: "sAudio"
 AudioVoice: "sVoice"
+AutoSaveOnResting: "sQuick_Save"
+BestAttack: "sBestAttack"
 ConfirmResetBindings: "sNotifyMessage66"
 ConfirmResolution: "sNotifyMessage67"
 ConsoleWindow: "sConsoleTitle"
 Controls: "sControls"
+Crosshair: "sCursorOff"
 DelayHigh: "sSlow"
 DelayLow: "sFast"
 DeleteGameConfirmation: "sMessage3"
@@ -26,8 +29,10 @@ FieldOfViewLow: "sLow"
 GammaCorrection: "sGamma_Correction"
 GammaDark: "sDark_Gamma"
 GammaLight: "sLight_Gamma"
+Health: "sHealth"
 InitializingData: "sLoadingMessage4"
 InvertYAxis: "sMouseFlip"
+Level: "sLevel"
 LoadGameConfirmation: "sMessage1"
 LoadingExterior: "sLoadingMessage3"
 LoadingInProgress: "sLoadingMessage14"
diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index f52be02451..d9218b45b2 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -21,8 +21,14 @@ set(BUILTIN_DATA_FILES
     fonts/MysticCards.omwfont
     fonts/MysticCardsFontLicense.txt
 
+    # Default animation blending config
+    animations/animation-config.yaml
+
     # Month names and date formatting
+    l10n/Calendar/de.yaml
     l10n/Calendar/en.yaml
+    l10n/Calendar/ru.yaml
+    l10n/Calendar/sv.yaml
 
     # Generic UI messages that can be reused by mods
     l10n/Interface/de.yaml
@@ -37,7 +43,9 @@ set(BUILTIN_DATA_FILES
     l10n/OMWCamera/ru.yaml
     l10n/OMWCamera/sv.yaml
     l10n/OMWCamera/fr.yaml
+    l10n/OMWControls/de.yaml
     l10n/OMWControls/en.yaml
+    l10n/OMWControls/fr.yaml
     l10n/OMWControls/ru.yaml
     l10n/OMWControls/sv.yaml
 
@@ -48,6 +56,13 @@ set(BUILTIN_DATA_FILES
     l10n/OMWEngine/sv.yaml
     l10n/OMWEngine/fr.yaml
 
+    # L10n for music system
+    l10n/OMWMusic/de.yaml
+    l10n/OMWMusic/en.yaml
+    l10n/OMWMusic/ru.yaml
+    l10n/OMWMusic/sv.yaml
+    l10n/OMWMusic/fr.yaml
+
     # L10n for post-processing HUD and built-in shaders
     l10n/OMWShaders/de.yaml
     l10n/OMWShaders/en.yaml
@@ -72,15 +87,20 @@ set(BUILTIN_DATA_FILES
     scripts/omw/camera/settings.lua
     scripts/omw/camera/move360.lua
     scripts/omw/camera/first_person_auto_switch.lua
-    scripts/omw/console/player.lua
     scripts/omw/console/global.lua
     scripts/omw/console/local.lua
+    scripts/omw/console/player.lua
+    scripts/omw/console/menu.lua
+    scripts/omw/mechanics/animationcontroller.lua
     scripts/omw/mechanics/playercontroller.lua
-    scripts/omw/playercontrols.lua
+    scripts/omw/settings/menu.lua
+    scripts/omw/music/actor.lua
+    scripts/omw/music/helpers.lua
+    scripts/omw/music/music.lua
+    scripts/omw/music/settings.lua
     scripts/omw/settings/player.lua
     scripts/omw/settings/global.lua
     scripts/omw/settings/common.lua
-    scripts/omw/settings/render.lua
     scripts/omw/settings/renderers.lua
     scripts/omw/mwui/constants.lua
     scripts/omw/mwui/borders.lua
@@ -89,11 +109,21 @@ set(BUILTIN_DATA_FILES
     scripts/omw/mwui/textEdit.lua
     scripts/omw/mwui/space.lua
     scripts/omw/mwui/init.lua
+    scripts/omw/skillhandlers.lua
+    scripts/omw/crimes.lua
     scripts/omw/ui.lua
-
+    scripts/omw/usehandlers.lua
+    scripts/omw/worldeventhandlers.lua
+    scripts/omw/input/settings.lua
+    scripts/omw/input/playercontrols.lua
+    scripts/omw/input/actionbindings.lua
+    scripts/omw/input/smoothmovement.lua
+    scripts/omw/input/gamepadcontrols.lua
+    
     shaders/adjustments.omwfx
     shaders/bloomlinear.omwfx
     shaders/debug.omwfx
+    shaders/internal_distortion.omwfx
 
     mygui/core.skin
     mygui/core.xml
diff --git a/files/data/animations/animation-config.yaml b/files/data/animations/animation-config.yaml
new file mode 100644
index 0000000000..1dd8c1da04
--- /dev/null
+++ b/files/data/animations/animation-config.yaml
@@ -0,0 +1,69 @@
+# This is the default OpenMW animation blending config file (global config) , will affect NPCs and creatures but not animated objects.
+# If you want to provide an animation blending config for your modded animations - DO NOT override the global config in your mod.
+# For details on how to edit and create your own blending rules, see https://openmw.readthedocs.io/en/latest/reference/modding/animation-blending.html
+
+blending_rules:
+  # General blending rule, any transition that will not be caught by the rules below - will use this rule
+  - from: "*"
+    to: "*"
+    easing: "sineOut"
+    duration: 0.25
+  # From anything to sneaking
+  - from: "*"
+    to: "idlesneak*"
+    easing: "springOutWeak"
+    duration: 0.4
+  - from: "*"
+    to: "sneakforward*"
+    easing: "springOutWeak"
+    duration: 0.4
+  # From any to preparing for an attack swing (e.g "weapononehanded: chop start").
+  # Note that Rules like *:chop* will technically match any weapon attack animation with
+  # an animation key beginning on "chop". This includes attack preparation, attack itself and follow-through.
+  # Yet since rules below this block take care of more specific transitions - most likely this block will
+  # only affect "any animation"->"attack swing preparation".
+  - from: "*"
+    to: "*:shoot*"
+    easing: "sineOut"
+    duration: 0.1
+  - from: "*"
+    to: "*:chop*"
+    easing: "sineOut"
+    duration: 0.1
+  - from: "*"
+    to: "*:thrust*"
+    easing: "sineOut"
+    duration: 0.1
+  - from: "*"
+    to: "*:slash*"
+    easing: "sineOut"
+    duration: 0.1
+  # From preparing for an attack swing (e.g "weapononehanded: chop start") to an attack swing (e.g "weapononehanded: chop max attack").
+  - from: "*:*start"
+    to: "*:*attack"
+    easing: "sineOut"
+    duration: 0.05
+  # From a weapon swing to the final follow-through
+  - from: "*"
+    to: "*:*follow start"
+    easing: "linear"
+    duration: 0
+  # Sharper out of jumping transition, so bunny-hopping looks similar to vanilla
+  - from: "jump:start"
+    to: "*"
+    easing: "sineOut"
+    duration: 0.1
+  # Inventory doll poses don't work with transitions, so 0 duraion.
+  - from: "*"
+    to: "inventory*"
+    easing: "linear"
+    duration: 0
+  - from: "inventory*"
+    to: "*"
+    easing: "linear"
+    duration: 0
+  # Transitions from a no-state are always instant
+  - from: ""
+    to: "*"
+    easing: "linear"
+    duration: 0
diff --git a/files/data/builtin.omwscripts b/files/data/builtin.omwscripts
index 8999a98f80..37367783ab 100644
--- a/files/data/builtin.omwscripts
+++ b/files/data/builtin.omwscripts
@@ -1,22 +1,39 @@
 # UI framework
-PLAYER: scripts/omw/mwui/init.lua
+MENU,PLAYER: scripts/omw/mwui/init.lua
 
 # Settings framework
-GLOBAL: scripts/omw/settings/global.lua
+MENU: scripts/omw/settings/menu.lua
 PLAYER: scripts/omw/settings/player.lua
+GLOBAL: scripts/omw/settings/global.lua
 
 # Mechanics
 GLOBAL: scripts/omw/activationhandlers.lua
 GLOBAL: scripts/omw/cellhandlers.lua
+GLOBAL: scripts/omw/usehandlers.lua
+GLOBAL: scripts/omw/worldeventhandlers.lua
+GLOBAL: scripts/omw/crimes.lua
+CREATURE, NPC, PLAYER: scripts/omw/mechanics/animationcontroller.lua
+PLAYER: scripts/omw/skillhandlers.lua
 PLAYER: scripts/omw/mechanics/playercontroller.lua
-PLAYER: scripts/omw/playercontrols.lua
+MENU: scripts/omw/camera/settings.lua
+MENU: scripts/omw/input/settings.lua
+PLAYER: scripts/omw/input/playercontrols.lua
 PLAYER: scripts/omw/camera/camera.lua
+PLAYER: scripts/omw/input/actionbindings.lua
+PLAYER: scripts/omw/input/smoothmovement.lua
+PLAYER: scripts/omw/input/gamepadcontrols.lua
 NPC,CREATURE: scripts/omw/ai.lua
 
 # User interface
 PLAYER: scripts/omw/ui.lua
 
 # Lua console
+MENU: scripts/omw/console/menu.lua
 PLAYER: scripts/omw/console/player.lua
 GLOBAL: scripts/omw/console/global.lua
 CUSTOM: scripts/omw/console/local.lua
+
+# Music system
+PLAYER: scripts/omw/music/music.lua
+MENU: scripts/omw/music/settings.lua
+NPC,CREATURE: scripts/omw/music/actor.lua
diff --git a/files/data/l10n/Calendar/de.yaml b/files/data/l10n/Calendar/de.yaml
new file mode 100644
index 0000000000..c02765c5c2
--- /dev/null
+++ b/files/data/l10n/Calendar/de.yaml
@@ -0,0 +1,49 @@
+month1: "Januar"
+month2: "Februar"
+month3: "März"
+month4: "April"
+month5: "Mai"
+month6: "Juni"
+month7: "Juli"
+month8: "August"
+month9: "September"
+month10: "Oktober"
+month11: "November"
+month12: "Dezember"
+
+# In German, there are two different options to generate the genitive form of a month name:
+#
+# (1) Apply standard rules for genitive (too complicated to elaborate here, but you usually add an "s"/"es" at the end of the word).
+# (2) Use the nominative version.
+#
+# Nowadays, option (2) is more commonly used, so let's apply that here as well.
+monthInGenitive1: "Januar"
+monthInGenitive2: "Februar"
+monthInGenitive3: "März"
+monthInGenitive4: "April"
+monthInGenitive5: "Mai"
+monthInGenitive6: "Juni"
+monthInGenitive7: "Juli"
+monthInGenitive8: "August"
+monthInGenitive9: "September"
+monthInGenitive10: "Oktober"
+monthInGenitive11: "November"
+monthInGenitive12: "Dezember"
+
+# Standard German date format: d. MMMM YYYY
+# Example: "23. Februar 1337"
+dateFormat: "{day}. {month} {year, number, :: group-off}"
+
+weekday1: "Sonntag"
+weekday2: "Montag"
+weekday3: "Dienstag"
+weekday4: "Mittwoch"
+weekday5: "Donnerstag"
+weekday6: "Freitag"
+weekday7: "Samstag"
+
+# In German, there are usually no "a.m."/"p.m." shenanigans going on.
+# In case of ambiguity, "vormittags" ("mornings") and "nachmittags" ("in the afternoon") are used.
+am: "vormittags"
+pm: "nachmittags"
+day: "Tag"
diff --git a/files/data/l10n/Calendar/en.yaml b/files/data/l10n/Calendar/en.yaml
index 6fd9c070bd..3ac92e9296 100644
--- a/files/data/l10n/Calendar/en.yaml
+++ b/files/data/l10n/Calendar/en.yaml
@@ -36,6 +36,6 @@ weekday5: "Thursday"
 weekday6: "Friday"
 weekday7: "Saturday"
 
-am: "am"
-pm: "pm"
-day: "day"
+am: "a.m."
+pm: "p.m."
+day: "Day"
diff --git a/files/data/l10n/Calendar/ru.yaml b/files/data/l10n/Calendar/ru.yaml
new file mode 100644
index 0000000000..16a80e47bd
--- /dev/null
+++ b/files/data/l10n/Calendar/ru.yaml
@@ -0,0 +1,40 @@
+month1: "январь"
+month2: "февраль"
+month3: "март"
+month4: "апрель"
+month5: "май"
+month6: "июнь"
+month7: "июль"
+month8: "август"
+month9: "сентябрь"
+month10: "октябрь"
+month11: "ноябрь"
+month12: "декабрь"
+
+monthInGenitive1: "января"
+monthInGenitive2: "февраля"
+monthInGenitive3: "марта"
+monthInGenitive4: "апреля"
+monthInGenitive5: "мая"
+monthInGenitive6: "июня"
+monthInGenitive7: "июля"
+monthInGenitive8: "августа"
+monthInGenitive9: "сентября"
+monthInGenitive10: "октября"
+monthInGenitive11: "ноября"
+monthInGenitive12: "декабря"
+
+# Example: 1 января 1970
+dateFormat: "{day} {monthInGenitive} {year, number, :: group-off}"
+
+weekday1: "воскресенье"
+weekday2: "понедельник"
+weekday3: "вторник"
+weekday4: "среда"
+weekday5: "четверг"
+weekday6: "пятница"
+weekday7: "суббота"
+
+am: "д.п."
+pm: "п.п."
+day: "День"
diff --git a/files/data/l10n/Calendar/sv.yaml b/files/data/l10n/Calendar/sv.yaml
new file mode 100644
index 0000000000..c62837a875
--- /dev/null
+++ b/files/data/l10n/Calendar/sv.yaml
@@ -0,0 +1,50 @@
+# Swedish does not actually upper-case first letter on months and weekday names, so I'm doing them lower case right now.
+
+month1: "januari"
+month2: "februari"
+month3: "mars"
+month4: "april"
+month5: "maj"
+month6: "juni"
+month7: "juli"
+month8: "augusti"
+month9: "september"
+month10: "oktober"
+month11: "november"
+month12: "december"
+
+# There are no different grammatical forms of the months in Swedish
+
+monthInGenitive1: "januari"
+monthInGenitive2: "februari"
+monthInGenitive3: "mars"
+monthInGenitive4: "april"
+monthInGenitive5: "maj"
+monthInGenitive6: "juni"
+monthInGenitive7: "juli"
+monthInGenitive8: "augusti"
+monthInGenitive9: "september"
+monthInGenitive10: "oktober"
+monthInGenitive11: "november"
+monthInGenitive12: "december"
+
+# Standard Swedish date format: d MMMM YYYY
+# Source: http://www4.sprakochfolkminnen.se/cgi-bin/srfl/visasvar.py?sok=datum&svar=26089
+# Example: "23 februari 1337"
+dateFormat: "{day} {month} {year, number, :: group-off}"
+
+# The Swedish week starts with monday actually, but whatever.
+
+weekday1: "söndag"
+weekday2: "måndag"
+weekday3: "tisdag"
+weekday4: "onsdag"
+weekday5: "torsdag"
+weekday6: "fredag"
+weekday7: "lördag"
+
+# In Swedish, as with German, we don't use AM/PM but instead a 24h clock.
+# But instead of that, we could use "förmiddag" and "eftermiddag", which is basically "morning" and "afternoon"
+am: "f.m."
+pm: "e.m."
+day: "Dag"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index 1cabad01a9..8457797422 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -1,27 +1,34 @@
+DurationDay: "{days} d "
+DurationHour: "{hours} h "
+DurationMinute: "{minutes} min "
+# There is no abbreviation for "Monat" ("month") in German, so full terms are used instead.
+DurationMonth: |-
+ {months, plural,
+   one{{months} Monat }
+   other{{months} Monate }
+ }
+DurationSecond: "{seconds} s "
+# In German, "J."/"Jr." exist as abbreviations for "Jahr" ("year") but are seldomly used.
+# A plural version of these does not exist (at least, to my knowledge).
+#
+# To avoid confusion, use full terms instead.
+DurationYear: |-
+ {years, plural,
+   one{{years} Jahr }
+   other{{years} Jahre }
+ }
 No: "Nein"
 NotAvailableShort: "N/A"
 Reset: "Zurücksetzen"
 Yes: "Ja"
-
-# To be translated:
-
-#DurationDay: "{days} d "
-#DurationHour: "{hours} h "
-#DurationMinute: "{minutes} min "
-#DurationMonth: |-
-#  {months, plural,
-#    one{{months} mo }
-#    other{{months} mos }
-#  }
-#DurationSecond: "{seconds} s "
-#DurationYear: |-
-#  {years, plural,
-#    one{{years} yr }
-#    other{{years} yrs }
-#  }
-#Cancel: "Cancel"
-#Close: "Close"
-#None: "None"
-#OK: "OK"
-#Off: "Off"
-#On: "On"
+Cancel: "Abbrechen"
+Close: "Schließen"
+# This one is a bit tricky since it can be translated to
+# "keiner"/"keine"/"keines", "nichts", or "leer" ("empty") depending on context.
+#
+# Using the "keine" option for now.
+None: "Keine"
+OK: "OK"
+Off: "Aus"
+On: "Ein"
+Copy: "Kopieren"
\ No newline at end of file
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index df450b5c38..82c1aeba1a 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -22,3 +22,4 @@ None: "None"
 OK: "OK"
 Cancel: "Cancel"
 Close: "Close"
+Copy: "Copy"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index 5aa0260680..0a078a1676 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -22,3 +22,4 @@ None: "Aucun"
 OK: "Valider"
 Cancel: "Annuler"
 Close: "Fermer"
+Copy: "Copier"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 6d81dd7797..44b38a77b8 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -1,5 +1,6 @@
 Cancel: "Отмена"
 Close: "Закрыть"
+Copy: "Скопировать"
 DurationDay: "{days} д "
 DurationHour: "{hours} ч "
 DurationMinute: "{minutes} мин "
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index 5e9260cf97..10a6c50b58 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -1,16 +1,25 @@
-Cancel: "Avbryt"
-Close: "Stäng"
 DurationDay: "{days} d "
 DurationHour: "{hours} tim "
 DurationMinute: "{minutes} min "
-DurationMonth: "{months} må "
+DurationMonth: |-
+  {months, plural,
+    one{{months} må }
+    other{{months} må }
+  }
 DurationSecond: "{seconds} sek "
-DurationYear: "{years} år "
+DurationYear: |-
+  {years, plural,
+    one{{years} år }
+    other{{years} år }
+  }
 No: "Nej"
-None: "Inget"
 NotAvailableShort: "N/A"
-OK: "Ok"
-Off: "Av"
-On: "På"
-Reset: "Återställ"
+Reset: "Reset"
 Yes: "Ja"
+On: "På"
+Off: "Av"
+None: "Inget"
+OK: "Ok"
+Cancel: "Avbryt"
+Close: "Stäng"
+Copy: "Kopiera"
\ No newline at end of file
diff --git a/files/data/l10n/OMWCamera/de.yaml b/files/data/l10n/OMWCamera/de.yaml
index 62b50c5862..eeedb2704e 100644
--- a/files/data/l10n/OMWCamera/de.yaml
+++ b/files/data/l10n/OMWCamera/de.yaml
@@ -1,72 +1,72 @@
-Camera: "OpenMW Kamera"
-settingsPageDescription: "OpenMW Kameraeinstellungen"
+Camera: "OpenMW: Kamera"
+settingsPageDescription: "OpenMW-Kameraeinstellungen"
 
-thirdPersonSettings: "Dritte-Person-Modus"
+thirdPersonSettings: "Verfolgerperspektive"
 
-viewOverShoulder: "Blick über die Schulter"
+viewOverShoulder: "Über-die-Schulter-Ansicht"
 viewOverShoulderDescription: |
-    Steuert den Dritte-Person-Ansichtsmodus.
-      Nein: Die Ansicht ist auf den Kopf vom Spielercharakter zentriert. Fadenkreuz ist ausgeblendet.
-      Ja: Während die Kamera mit ungezogener Waffe hinter der Schulter des Spielercharakter positioniert ist, ist das Fadenkreuz immer sichtbar.
+    Beeinflusst die Verfolgerperspektive.
+      Nein: Die Ansicht ist auf den Kopf des Spielercharakters zentriert; das Fadenkreuz ist ausgeblendet.
+      Ja: Die Kamera ist bei weggesteckter Waffe hinter der Schulter des Spielercharakters positioniert; das Fadenkreuz ist immer sichtbar.
 
-shoulderOffsetX: "Schulteransicht horizontaler Versatz"
+shoulderOffsetX: "Schulteransicht: horizontaler Offset"
 shoulderOffsetXDescription: >
-    Horizontaler Versatz der Über-die-Schulter-Ansicht.
-    Verwenden Sie für die linke Schulter einen negativen Wert.
+    Horizontaler Offset der "Über-die-Schulter-Ansicht".
+    Größere Werte verschieben die Ansicht nach rechts; negative Werte verschieben die Ansicht über die linke Schulter.
 
-shoulderOffsetY: "Schulteransicht vertikaler Versatz"
+shoulderOffsetY: "Schulteransicht: vertikaler Offset"
 shoulderOffsetYDescription: >
-    Vertikaler Versatz der Über-die-Schulter-Ansicht.
+    Vertikaler Offset der "Über-die-Schulter-Ansicht".
 
-autoSwitchShoulder: "Automatischer Schulteransicht wechsel"
+autoSwitchShoulder: "Schulter automatisch wechseln"
 autoSwitchShoulderDescription: >
-    Bei Hindernissen welche die Kamera in die Nähe des Spielercharakter bringen würde,
-    hat diese Einstellung den Effekt dass die Kamera automatisch auf Schulteransicht wechselt.
+    Falls aktiviert, wechselt die Ansicht temporär auf die andere Schulter, solange ein Hindernis die Kamera zu nah an den Spielercharakter bewegen würde.
 
-zoomOutWhenMoveCoef: "Kamera-Zoom bei Bewegung"
+zoomOutWhenMoveCoef: "Kamera-Zoomfaktor bei Bewegung"
 zoomOutWhenMoveCoefDescription: >
-    Bewegt die Kamera vom Spielercharakter weg (positiver Wert) oder auf sie zu (negativer Wert), während sich der Charakter bewegt.
-    Funktioniert nur, wenn "Blick über die Schulter" aktiviert ist. Der Wert 0 deaktiviert den Zoom (Standard: 20.0).
+    Bewegt die Kamera vom Spielercharakter weg (positiver Wert) oder auf ihn zu (negativer Wert), solange sich dieser bewegt. Der Wert 0 deaktiviert den Zoom (Standard: 20,0).
+    Funktioniert nur, wenn "Über-die-Schulter-Ansicht" aktiviert ist.
 
 previewIfStandStill: "Vorschau bei Stillstand"
 previewIfStandStillDescription: >
-    Verhindert dass sich der Spielercharakter in die Kamerarichtung dreht, während er untätig ist und seine Waffe weggesteckt hat.
+    Falls aktiviert, dreht sich der Spielercharakter nicht in Blickrichtung der Kamera, solange er untätig ist und seine Waffe weggesteckt ist.
 
-deferredPreviewRotation: "Verzögerte Drehung der Vorschau"
+deferredPreviewRotation: "Sanfter Übergang aus der Vorschau"
 deferredPreviewRotationDescription: |
-    Wenn diese Einstellung aktiv ist, dreht sich die Figur nach dem Verlassen des Vorschau- oder Vanity-Modus sanft in die Blickrichtung.
-    Wenn deaktiviert, dreht sich die Kamera und nicht der Spielercharakter.
+    Falls aktiviert, dreht sich der Spielercharakter nach dem Verlassen des Vorschau- oder Vanity-Modus sanft in die Blickrichtung der Kamera.
+    Falls deaktiviert, dreht sich die Kamera ruckartig in Richtung des Spielercharakters.
 
-ignoreNC: "Ignoriere „Keine Kollision“-Variable"
+ignoreNC: |
+    Ignoriere "No Collision"-Flag
 ignoreNCDescription: >
-    Verhindert dass die Kamera sich durch Objekte bewegt bei denen das NC-Flag (No Collision) im NIF-Modell aktiviert ist.
+    Falls aktiviert, bewegt sich die Kamera nicht durch Objekte, deren NC-Flag ("No Collision"-Flag) im NIF-Modell aktiviert ist.
 
 move360: "360°-Bewegung"
 move360Description: >
-    Macht die Bewegungsrichtung unabhängig von der Kamerarichtung, während die Waffe des Spielercharakters nicht gezogen ist.
-    Zum Beispiel schaut der Spielercharakter in die Kamera, während er rückwärts läuft.
+    Falls aktiviert, ist die Bewegungsrichtung des Spielercharakters bei weggesteckter Waffe unabhängig von der Kamerarichtung.
+    Beispiel: Läuft der Spielercharakter in diesem Modus rückwärts, dreht er sich stattdessen mit dem Gesicht zur Kamera.
 
-move360TurnSpeed: "360°-Bewegungs-Drehgeschwindigkeit"
-move360TurnSpeedDescription: "Drehgeschwindigkeitsmultiplikator (Standard: 5.0)."
+move360TurnSpeed: "Multiplikator für 360°-Bewegung-Drehgeschwindigkeit"
+move360TurnSpeedDescription: |
+    Multiplikator für die Drehgeschwindigkeit bei aktivierter "360°-Bewegung" (Standard: 5,0).
 
 slowViewChange: "Sanfter Ansichtswechsel"
-slowViewChangeDescription: "Macht den Übergang von der Ego-Perspektive zur Dritte-Person-Perspektive nicht augenblicklich."
+slowViewChangeDescription: "Falls aktiviert, wechselt die Kamera nicht mehr ruckartig von der Ego- in die Verfolgerperspektive."
 
-povAutoSwitch: "Automatischer Wechsel in Ego-Perspektive"
-povAutoSwitchDescription: "Wechselt automatisch in die Ego-Perspektive wenn sich direkt hinter dem Spielercharakter ein Hindernis befindet."
+povAutoSwitch: "Automatischer Wechsel zur Egoperspektive"
+povAutoSwitchDescription: "Falls aktiviert, wechselt die Kamera automatisch in die Egoperspektive, sobald sich sich ein Hindernis direkt hinter dem Spielercharakter befindet."
 
 
-headBobbingSettings: "Kopfbewegungen in der Ego-Perspektive"
+headBobbingSettings: "Kopfwippen in der Egoperspektive"
 
 headBobbing_enabled: "Eingeschaltet"
-headBobbing_enabledDescription: ""
+headBobbing_enabledDescription: "Falls aktiviert, wippt die Kamera beim Laufen in der Egoperspektive auf und ab."
 
-headBobbing_step: "Schrittweite"
-headBobbing_stepDescription: "Die Länge jedes Schritts (Standard: 90.0)."
+headBobbing_step: "Schrittlänge"
+headBobbing_stepDescription: "Definiert die Länge eines Schritts, also die Frequenz des Kopfwippens (Standard: 90,0)."
 
 headBobbing_height: "Schritthöhe"
-headBobbing_heightDescription: "Die Amplitude der Kopfbewegung (Standard: 3.0)."
+headBobbing_heightDescription: "Definiert die Höhe eines Schritts, also die Amplitude des Kopfwippens (Standard: 3,0)."
 
 headBobbing_roll: "Maximaler Rollwinkel"
-headBobbing_rollDescription: "Der maximale Rollwinkel in Grad (Standard: 0.2)."
-
+headBobbing_rollDescription: "Der maximale Rollwinkel der Kamera beim Kopfwippen in Grad (Standard: 0,2)."
diff --git a/files/data/l10n/OMWCamera/en.yaml b/files/data/l10n/OMWCamera/en.yaml
index d030bd22ec..609b028167 100644
--- a/files/data/l10n/OMWCamera/en.yaml
+++ b/files/data/l10n/OMWCamera/en.yaml
@@ -1,43 +1,43 @@
 Camera: "OpenMW Camera"
-settingsPageDescription: "OpenMW Camera settings"
+settingsPageDescription: "OpenMW camera settings."
 
-thirdPersonSettings: "Third person mode"
+thirdPersonSettings: "Third Person Mode"
 
-viewOverShoulder: "View over the shoulder"
+viewOverShoulder: "View Over the Shoulder"
 viewOverShoulderDescription: |
     Controls third person view mode.
       No: view is centered on the character's head. Crosshair is hidden.
       Yes: while weapon sheathed the camera is positioned behind the character's shoulder, crosshair is always visible.
 
-shoulderOffsetX: "Shoulder view horizontal offset"
+shoulderOffsetX: "Shoulder View Horizontal Offset"
 shoulderOffsetXDescription: >
     Horizontal offset of the over-the-shoulder view.
     For the left shoulder use a negative value.
 
-shoulderOffsetY: "Shoulder view vertical offset"
+shoulderOffsetY: "Shoulder View Vertical Offset"
 shoulderOffsetYDescription: >
     Vertical offset of the over-the-shoulder view.
 
-autoSwitchShoulder: "Auto switch shoulder"
+autoSwitchShoulder: "Auto Switch Shoulder"
 autoSwitchShoulderDescription: >
     When there are obstacles that would push the camera close to the player character,
     this setting makes the camera automatically switch to the shoulder farther away from the obstacles.
 
-zoomOutWhenMoveCoef: "Zoom out when move coef"
+zoomOutWhenMoveCoef: "Zoom Out When Move Coef"
 zoomOutWhenMoveCoefDescription: >
     Moves the camera away (positive value) or towards (negative value) the player character while the character is moving.
     Works only if "view over the shoulder" is enabled. Set this to zero to disable (default: 20.0).
 
-previewIfStandStill: "Preview if stand still"
+previewIfStandStill: "Preview if Stand Still"
 previewIfStandStillDescription: >
     Prevents the player character from turning towards the camera direction while they're idle and have their weapon sheathed.
 
-deferredPreviewRotation: "Deferred preview rotation"
+deferredPreviewRotation: "Deferred Preview Rotation"
 deferredPreviewRotationDescription: |
     If enabled then the character smoothly rotates to the view direction after exiting preview or vanity mode.
     If disabled then the camera rotates rather than the character.
 
-ignoreNC: "Ignore 'No Collision' flag"
+ignoreNC: "Ignore 'No Collision' Flag"
 ignoreNCDescription: >
     Prevents the camera from clipping through objects that have NC (No Collision) flag turned on in the NIF model.
 
@@ -46,27 +46,27 @@ move360Description: >
     Makes the movement direction independent from the camera direction while the player character's weapon
     is sheathed. For example, the player character will look at the camera while running backwards.
 
-move360TurnSpeed: "Move 360 turning speed"
+move360TurnSpeed: "Move 360 Turning Speed"
 move360TurnSpeedDescription: "Turning speed multiplier (default: 5.0)."
 
-slowViewChange: "Smooth view change"
+slowViewChange: "Smooth View Change"
 slowViewChangeDescription: "Makes the transition from 1st person to 3rd person view non-instantaneous."
 
-povAutoSwitch: "First person auto switch"
+povAutoSwitch: "First Person Auto Switch"
 povAutoSwitchDescription: "Auto switch to the first person view if there is an obstacle right behind the player."
 
 
-headBobbingSettings: "Head bobbing in first person view"
+headBobbingSettings: "Head Bobbing in First Person View"
 
 headBobbing_enabled: "Enabled"
 headBobbing_enabledDescription: ""
 
-headBobbing_step: "Base step length"
+headBobbing_step: "Base Step Length"
 headBobbing_stepDescription: "The length of each step (default: 90.0)."
 
-headBobbing_height: "Step height"
+headBobbing_height: "Step Height"
 headBobbing_heightDescription: "The amplitude of the head bobbing (default: 3.0)."
 
-headBobbing_roll: "Max roll angle"
+headBobbing_roll: "Max Roll Angle"
 headBobbing_rollDescription: "The maximum roll angle in degrees (default: 0.2)."
 
diff --git a/files/data/l10n/OMWCamera/fr.yaml b/files/data/l10n/OMWCamera/fr.yaml
index a9dde33f79..00a0e3d3c1 100644
--- a/files/data/l10n/OMWCamera/fr.yaml
+++ b/files/data/l10n/OMWCamera/fr.yaml
@@ -1,5 +1,5 @@
-Camera: "Caméra d’OpenMW"
-settingsPageDescription: "Configuration de la caméra d’OpenMW"
+Camera: "OpenMW : Caméra"
+settingsPageDescription: "Paramètres de la caméra d’OpenMW"
 
 thirdPersonSettings: "Vue à la troisième personne"
 
diff --git a/files/data/l10n/OMWCamera/ru.yaml b/files/data/l10n/OMWCamera/ru.yaml
index 2b41ef0ee7..49821157cc 100644
--- a/files/data/l10n/OMWCamera/ru.yaml
+++ b/files/data/l10n/OMWCamera/ru.yaml
@@ -1,5 +1,5 @@
 Camera: "Камера OpenMW"
-settingsPageDescription: "Настройки камеры для OpenMW"
+settingsPageDescription: "Настройки камеры OpenMW."
 
 thirdPersonSettings: "Режим от третьего лица"
 
diff --git a/files/data/l10n/OMWControls/de.yaml b/files/data/l10n/OMWControls/de.yaml
new file mode 100644
index 0000000000..06dfe808cc
--- /dev/null
+++ b/files/data/l10n/OMWControls/de.yaml
@@ -0,0 +1,99 @@
+# Source for most of the setting names: German Morrowind GOTY version
+
+ControlsPage: "OpenMW-Steuerung"
+ControlsPageDescription: "Zusätzliche Einstellungen für Spielereingaben"
+
+MovementSettings: "Fortbewegung"
+
+alwaysRun: "Immer rennen"
+alwaysRunDescription: |
+    Falls aktiviert, rennt der Spielercharakter standardmäßig; falls deaktiviert, geht er standardmäßig.
+    Gedrückthalten der Umschalttaste ("Shift") invertiert das aktuelle Verhalten vorübergehend, Drücken der Feststelltaste ("Caps Lock") schaltet das aktuelle Verhalten um.
+
+toggleSneak: "Schleichen umschalten"
+toggleSneakDescription: |
+    Falls aktiviert, schaltet die "Schleichen"-Taste den Schleichen-Modus dauerhaft ein bzw. aus; falls deaktiviert, muss die "Schleichen"-Taste gedrückt gehalten werden, um im Schleichen-Modus zu bleiben.
+    Diese Option ist vor allem für Spieler mit schleichlastigen Spielercharakteren zu empfehlen.
+
+smoothControllerMovement: "Sanfte Controller-Bewegung"
+smoothControllerMovementDescription: |
+   Aktiviert die sanfte Controller-Steuerung mit den Analog-Sticks. Dies macht den Übergang zwischen gehen und rennen weniger abrupt.
+
+TogglePOV_name: "Perspektive umschalten"
+TogglePOV_description: "Zwischen Ego- und Verfolgerperspektive umschalten. Gedrückt halten, um den Vorschau-Modus zu aktivieren."
+
+Zoom3rdPerson_name: "Hinein-/Herauszoomen"
+Zoom3rdPerson_description: "Bewegt die Kamera in Verfolgerperspektive näher an den Spielercharakter oder weiter von ihm weg."
+
+MoveForward_name: "Vorwärts"
+MoveForward_description: |
+   Kann sich mit "Rückwärts"-Eingabe aufheben.
+
+MoveBackward_name: "Rückwärts"
+MoveBackward_description: |
+   Kann sich mit "Vorwärts"-Eingabe aufheben.
+
+MoveLeft_name: "Links"
+MoveLeft_description: |
+   Kann sich mit "Rechts"-Eingabe aufheben.
+
+MoveRight_name: "Rechts"
+MoveRight_description: |
+   Kann sich mit "Links"-Eingabe aufheben.
+
+Use_name: "Benutzen"
+Use_description: "Abhängig von der Haltung des Spielercharakters mit einer Waffe angreifen, einen Zauber wirken oder ein Objekt verwenden bzw. aktivieren."
+
+Run_name: "Rennen"
+Run_description: |
+   Gedrückt halten, um den Spielercharakter abhängig vom "Immer rennen"-Status gehen bzw. rennen zu lassen.
+
+AlwaysRun_name: "Immer rennen"
+AlwaysRun_description: |
+   "Immer rennen"-Status umschalten.
+
+Jump_name: "Sprung"
+Jump_description: "Springen, solange sich der Spielercharakter auf dem Boden befindet."
+
+AutoMove_name: "Automatische Vorwärts-Bewegung"
+AutoMove_description: |
+   "Automatische Bewegung"-Status umschalten. Falls aktiviert, bewegt sich der Spielercharakter kontinuierlich vorwärts.
+
+Sneak_name: "Schleichen"
+Sneak_description: |
+   "Gedrückt halten, um bei ausgeschalteter "Schleichen umschalten"-Option zu schleichen.
+
+ToggleSneak_name: "Schleichen umschalten"
+ToggleSneak_description: |
+   "Bei eingeschalteter "Schleichen umschalten"-Option den Schleichen-Modus umschalten.
+
+ToggleWeapon_name: "Waffe ziehen"
+ToggleWeapon_description: "Kampfhaltung einnehmen bzw. verlassen."
+
+ToggleSpell_name: "Zauber vorbereiten"
+ToggleSpell_description: "Zauberhaltung einnehmen bzw. verlassen."
+
+Inventory_name: "Menü-Modus"
+Inventory_description: "Inventar-Modus öffnen bzw. schließen."
+
+Journal_name: "Tagebuch"
+Journal_description: "Tagebuch öffnen bzw. schließen."
+
+QuickKeysMenu_name: "Kurzmenü"
+QuickKeysMenu_description: "Kurzmenü für Schnellauswahl von Gegenständen und Zaubern öffnen bzw. schließen."
+
+SmoothMoveForward_name: "Sanfte Vorwärts-Bewegung"
+SmoothMoveForward_description: |
+   Angepasste Vorwärts-Bewegung für aktivierte "Sanfte Controller-Bewegung"-Option
+
+SmoothMoveBackward_name: "Sanfte Rückwärts-Bewegung"
+SmoothMoveBackward_description: |
+   Angepasste Rückwärts-Bewegung für aktivierte "Sanfte Controller-Bewegung"-Option
+
+SmoothMoveLeft_name: "Sanfte Bewegung nach links"
+SmoothMoveLeft_description: |
+   Angepasste Bewegung nach links für aktivierte "Sanfte Controller-Bewegung"-Option
+
+SmoothMoveRight_name: "Sanfte Bewegung nach rechts"
+SmoothMoveRight_description: |
+   Angepasste Bewegung nach rechts für aktivierte "Sanfte Controller-Bewegung"-Option
diff --git a/files/data/l10n/OMWControls/en.yaml b/files/data/l10n/OMWControls/en.yaml
index de6edde19a..1be6da6baf 100644
--- a/files/data/l10n/OMWControls/en.yaml
+++ b/files/data/l10n/OMWControls/en.yaml
@@ -1,16 +1,130 @@
 ControlsPage: "OpenMW Controls"
-ControlsPageDescription: "Additional settings related to player controls"
+ControlsPageDescription: "Additional settings related to player controls."
 
 MovementSettings: "Movement"
 
-alwaysRun: "Always run"
+alwaysRun: "Always Run"
 alwaysRunDescription: |
-    If this setting is true, the character is running by default, otherwise the character is walking by default.
-    The shift key will temporarily invert this setting, and the caps lock key will invert this setting while it's "locked".
+    If this setting is true, the character will run by default, otherwise the character will walk by default.
+    The Shift key will temporarily invert this setting, and the Caps Lock key will invert this setting while it's "locked".
 
-toggleSneak: "Toggle sneak"
+toggleSneak: "Toggle Sneak"
 toggleSneakDescription: |
-    This setting causes the behavior of the sneak key (bound to Ctrl by default)
-    to toggle sneaking on and off rather than requiring the key to be held down while sneaking.
+    This setting makes the Sneak key (bound to Ctrl by default) toggle sneaking instead of having to be held down to sneak.
     Players that spend significant time sneaking may find the character easier to control with this option enabled.
 
+smoothControllerMovement: "Smooth Controller Movement"
+smoothControllerMovementDescription: |
+   Enables smooth controller stick movement. This makes the transition from walking to running less abrupt.
+
+TogglePOV_name: "Toggle POV"
+TogglePOV_description: "Toggle between first and third person view. Hold to enter preview mode."
+
+Zoom3rdPerson_name: "Zoom In/Out"
+Zoom3rdPerson_description: "Moves the camera closer / further away when in third person view."
+
+MoveForward_name: "Move Forward"
+MoveForward_description: "Can cancel out with Move Backward."
+
+MoveBackward_name: "Move Backward"
+MoveBackward_description: "Can cancel out with Move Forward."
+
+MoveLeft_name: "Move Left"
+MoveLeft_description: "Can cancel out with Move Right."
+
+MoveRight_name: "Move Right"
+MoveRight_description: "Can cancel out with Move Left."
+
+Use_name: "Use"
+Use_description: "Attack with a weapon or cast a spell depending on the current stance."
+
+Run_name: "Run"
+Run_description: "Hold to run/walk depending on the Always Run setting."
+
+AlwaysRun_name: "Always Run"
+AlwaysRun_description: "Toggle the Always Run setting."
+
+Jump_name: "Jump"
+Jump_description: "Jump whenever you are on the ground."
+
+AutoMove_name: "Auto Run"
+AutoMove_description: "Toggle continuous forward movement."
+
+Sneak_name: "Sneak"
+Sneak_description: "Hold to sneak if the Toggle Sneak setting is off."
+
+ToggleSneak_name: "Toggle Sneak"
+ToggleSneak_description: "Toggle sneak if the Toggle Sneak setting is on."
+
+ToggleWeapon_name: "Ready Weapon"
+ToggleWeapon_description: "Enter or leave the weapon stance."
+
+ToggleSpell_name: "Ready Magic"
+ToggleSpell_description: "Enter or leave the magic stance."
+
+Inventory_name: "Inventory"
+Inventory_description: "Open the inventory."
+
+Journal_name: "Journal"
+Journal_description: "Open the journal."
+
+QuickKeysMenu_name: "Quick Menu"
+QuickKeysMenu_description: "Open the quick keys menu."
+
+SmoothMoveForward_name: "Smooth Move Forward"
+SmoothMoveForward_description: "Forward movement adjusted for smooth Walk-Run transitions."
+
+SmoothMoveBackward_name: "Smooth Move Backward"
+SmoothMoveBackward_description: "Backward movement adjusted for smooth Walk-Run transitions."
+
+SmoothMoveLeft_name: "Smooth Move Left"
+SmoothMoveLeft_description: "Left movement adjusted for smooth Walk-Run transitions."
+
+SmoothMoveRight_name: "Smooth Move Right"
+SmoothMoveRight_description: "Right movement adjusted for smooth Walk-Run transitions."
+
+#  Non-dehardcoded actions
+Activate_name: "Activate"
+Activate_description: "Fallback for input.ACTIONS.Activate, binding does not do anything yet"
+Console_name: "Console"
+Console_description: "Fallback for input.ACTIONS.Console, binding does not do anything yet"
+CycleSpellLeft_name: "CycleSpellLeft"
+CycleSpellLeft_description: "Fallback for input.ACTIONS.CycleSpellLeft, binding does not do anything yet"
+CycleSpellRight_name: "CycleSpellRight"
+CycleSpellRight_description: "Fallback for input.ACTIONS.CycleSpellRight, binding does not do anything yet"
+CycleWeaponLeft_name: "CycleWeaponLeft"
+CycleWeaponLeft_description: "Fallback for input.ACTIONS.CycleWeaponLeft, binding does not do anything yet"
+CycleWeaponRight_name: "CycleWeaponRight"
+CycleWeaponRight_description: "Fallback for input.ACTIONS.CycleWeaponRight, binding does not do anything yet"
+GameMenu_name: "GameMenu"
+GameMenu_description: "Fallback for input.ACTIONS.GameMenu, binding does not do anything yet"
+QuickLoad_name: "QuickLoad"
+QuickLoad_description: "Fallback for input.ACTIONS.QuickLoad, binding does not do anything yet"
+QuickSave_name: "QuickSave"
+QuickSave_description: "Fallback for input.ACTIONS.QuickSave, binding does not do anything yet"
+Screenshot_name: "Screenshot"
+Screenshot_description: "Fallback for input.ACTIONS.Screenshot, binding does not do anything yet"
+ToggleDebug_name: "ToggleDebug"
+ToggleDebug_description: "Fallback for input.ACTIONS.ToggleDebug, binding does not do anything yet"
+ToggleHUD_name: "ToggleHUD"
+ToggleHUD_description: "Fallback for input.ACTIONS.ToggleHUD, binding does not do anything yet"
+TogglePostProcessorHUD_name: "TogglePostProcessorHUD"
+TogglePostProcessorHUD_description: "Fallback for input.ACTIONS.TogglePostProcessorHUD, binding does not do anything yet"
+QuickKey1_name: "QuickKey1"
+QuickKey1_description: "Fallback for input.ACTIONS.QuickKey1, binding does not do anything yet"
+QuickKey2_name: "QuickKey2"
+QuickKey2_description: "Fallback for input.ACTIONS.QuickKey2, binding does not do anything yet"
+QuickKey3_name: "QuickKey3"
+QuickKey3_description: "Fallback for input.ACTIONS.QuickKey3, binding does not do anything yet"
+QuickKey4_name: "QuickKey4"
+QuickKey4_description: "Fallback for input.ACTIONS.QuickKey4, binding does not do anything yet"
+QuickKey5_name: "QuickKey5"
+QuickKey5_description: "Fallback for input.ACTIONS.QuickKey5, binding does not do anything yet"
+QuickKey6_name: "QuickKey6"
+QuickKey6_description: "Fallback for input.ACTIONS.QuickKey6, binding does not do anything yet"
+QuickKey7_name: "QuickKey7"
+QuickKey7_description: "Fallback for input.ACTIONS.QuickKey7, binding does not do anything yet"
+QuickKey8_name: "QuickKey8"
+QuickKey8_description: "Fallback for input.ACTIONS.QuickKey8, binding does not do anything yet"
+QuickKey9_name: "QuickKey9"
+QuickKey9_description: "Fallback for input.ACTIONS.QuickKey9, binding does not do anything yet"
diff --git a/files/data/l10n/OMWControls/fr.yaml b/files/data/l10n/OMWControls/fr.yaml
index 6d58ee1794..7dc18dc00f 100644
--- a/files/data/l10n/OMWControls/fr.yaml
+++ b/files/data/l10n/OMWControls/fr.yaml
@@ -1,16 +1,87 @@
 ControlsPage: "OpenMW : Contrôles"
-ControlsPageDescription: "Paramètres additionnels de contrôle"
+ControlsPageDescription: "Paramètres additionnels des contrôles d'OpenMW"
 
 MovementSettings: "Mouvements"
 
 alwaysRun: "Course permanente"
 alwaysRunDescription: |
-    Actif : Le personnage se déplace par défaut en courant ; \n\n
-    Inactif : Le personnage se déplace par défaut en marchant.\n\n
-    La touche Maj.  inverse temporairement ce paramètre.\n\n
+    Actif : Le personnage se déplace par défaut en courant ;
+    Inactif : Le personnage se déplace par défaut en marchant.
+    La touche Maj.  inverse temporairement ce paramètre.
     La touche Verr Maj inverse ce paramètre lorsqu'elle est verrouillée.
+
 toggleSneak: "Mode discrétion maintenu"
 toggleSneakDescription: |
-    Une simple pression de la touche associée (Ctrl par défaut) active le mode discrétion, une seconde pression désactive le mode discrétion.\n\n
-    Il n'est plus nécessaire de maintenir une touche appuyée pour que le mode discrétion soit actif.\n\n
+    Une simple pression de la touche associée (Ctrl par défaut) active le mode discrétion, une seconde pression désactive le mode discrétion.
+    Il n'est plus nécessaire de maintenir une touche appuyée pour que le mode discrétion soit actif.
     Certains joueurs ayant une utilisation intensive du mode discrétion considèrent qu'il est plus aisé de contrôler leur personnage ainsi.
+
+smoothControllerMovement: "Mouvements à la manette adoucis"
+smoothControllerMovementDescription: |
+    Active le lissage des mouvements du stick analogique. Ceci permet une transition entre marche et course moins abrupte.
+
+TogglePOV_name: "Changer de vue"
+TogglePOV_description: "Change entre la vue à la première et la troisième personne. Maintenir la touche pour activer le mode attente."
+
+Zoom3rdPerson_name: "Zoom Avant/Arrière"
+Zoom3rdPerson_description: "Approche / éloigne la caméra lorsque la caméra est à la troisième personne."
+
+MoveForward_name: "En avant"
+MoveForward_description: "Annulé par En arrière."
+
+MoveBackward_name: "En arrière"
+MoveBackward_description: "Annulé par En avant."
+
+MoveLeft_name: "À gauche"
+MoveLeft_description: "Annulé par Droite."
+
+MoveRight_name: "À droite"
+MoveRight_description: "Annulé par Gauche."
+
+Use_name: "Utiliser"
+Use_description: "Attaque avec une arme ou lance une magie, dépend de la préparation du joueur."
+
+Run_name: "Courir"
+Run_description: "Maintenir pour courir/marcher, en fonction du paramètre Toujours Courir."
+
+AlwaysRun_name: "Toujours courir"
+AlwaysRun_description: "Active le paramètre Toujours courir."
+
+Jump_name: "Sauter"
+Jump_description: "Saute lorsque le joueur touche le sol."
+
+AutoMove_name: "Course automatique"
+AutoMove_description: "Active un mouvement continu vers l'avant."
+
+Sneak_name: "Discrétion"
+Sneak_description: "Maintenez la touche si le paramètre Mode discrétion maintenu est désactivé."
+
+ToggleSneak_name: "Maintenir la discrétion"
+ToggleSneak_description: "Entre en mode discrétion si le paramètre Mode discrétion maintenu est activé."
+
+ToggleWeapon_name: "Préparer arme"
+ToggleWeapon_description: "Entre ou sort de la position armée."
+
+ToggleSpell_name: "Préparer sort"
+ToggleSpell_description: "Entre ou sort de la position lanceur de sort."
+
+Inventory_name: "Inventaire"
+Inventory_description: "Ouvre l'inventaire."
+
+Journal_name: "Journal"
+Journal_description: "Ouvre le journal."
+
+QuickKeysMenu_name: "Menu Touches rapides"
+QuickKeysMenu_description: "Ouvre le menu des touches rapides."
+
+SmoothMoveForward_name: "En avant, doux"
+SmoothMoveForward_description: "Déplace le joueur en avant, avec une transition douce entre la marche et la course."
+
+SmoothMoveBackward_name: "En arrière, doux"
+SmoothMoveBackward_description: "Déplace le joueur en arrière, avec une transition douce entre la marche et la course."
+
+SmoothMoveLeft_name: "À gauche, doux"
+SmoothMoveLeft_description: "Déplace le joueur à gauche, avec une transition douce entre la marche et la course.."
+
+SmoothMoveRight_name: "À droite, doux"
+SmoothMoveRight_description: "Déplace le joueur à droite, avec une transition douce entre la marche et la course."
diff --git a/files/data/l10n/OMWControls/ru.yaml b/files/data/l10n/OMWControls/ru.yaml
index 30bb15ee57..4675321969 100644
--- a/files/data/l10n/OMWControls/ru.yaml
+++ b/files/data/l10n/OMWControls/ru.yaml
@@ -1,5 +1,5 @@
 ControlsPage: "Управление OpenMW"
-ControlsPageDescription: "Дополнительные настройки, связанные с управлением игроком"
+ControlsPageDescription: "Дополнительные настройки, связанные с управлением игроком."
 
 MovementSettings: "Движение"
 
@@ -14,3 +14,72 @@ toggleSneakDescription: |
     чтобы красться, её достаточно нажать единожды для переключения положения, а не зажимать.
     Игрокам, которые много времени крадутся, может быть проще управлять персонажем, когда опция включена.
 
+smoothControllerMovement: "Плавное движение на геймпаде"
+smoothControllerMovementDescription: |
+    Эта настройка сглаживает движение при использовании стика. Это делает переход от ходьбы к бегу не таким резким.
+
+TogglePOV_name: "Изменить вид"
+TogglePOV_description: "Переключиться между видами от первого и третьего лица. При зажатии будет включен режим предпросмотра."
+
+Zoom3rdPerson_name: "Приблизить/отдалить камеру"
+Zoom3rdPerson_description: "Приблизить или отдалить от персонажа камеру в виде от третьего лица."
+
+MoveForward_name: "Двигаться вперед"
+MoveForward_description: "Одновременное зажатие кнопки движения назад отменит движение."
+
+MoveBackward_name: "Двигаться назад"
+MoveBackward_description: "Одновременное зажатие кнопки движения вперед отменит движение."
+
+MoveLeft_name: "Двигаться влево"
+MoveLeft_description: "Одновременное зажатие кнопки движения вправо отменит движение."
+
+MoveRight_name: "Двигаться вправо"
+MoveRight_description: "Одновременное зажатие кнопки движения влево отменит движение."
+
+Use_name: "Использовать"
+Use_description: "Совершить атаку оружием или использовать заклинание в зависимости от текущей стойки."
+
+Run_name: "Бежать"
+Run_description: "Бежать или идти при зажатии (в зависимости от значения настройки постоянного бега)."
+
+AlwaysRun_name: "Постоянный бег"
+AlwaysRun_description: "Переключить настройку постоянного бега."
+
+Jump_name: "Прыгать"
+Jump_description: "Прыгнуть, если вы находитесь на земле."
+
+AutoMove_name: "Автоматический бег"
+AutoMove_description: "Переключить непрерывное движение вперед."
+
+Sneak_name: "Красться"
+Sneak_description: "Красться при зажатии, если настройка переключения движения крадучись выключена."
+
+ToggleSneak_name: "Переключить движение крадучись"
+ToggleSneak_description: "Переключить движение крадучись, если соответствующая настройка включена."
+
+ToggleWeapon_name: "Приготовить оружие"
+ToggleWeapon_description: "Принять стойку оружия или покинуть её."
+
+ToggleSpell_name: "Приготовить магию"
+ToggleSpell_description: "Принять стойку магии или покинуть её."
+
+Inventory_name: "Инвентарь"
+Inventory_description: "Открыть инвентарь."
+
+Journal_name: "Дневник"
+Journal_description: "Открыть дневник."
+
+QuickKeysMenu_name: "Меню быстрых клавиш"
+QuickKeysMenu_description: "Открыть меню быстрых клавиш."
+
+SmoothMoveForward_name: "Плавно двигаться вперед"
+SmoothMoveForward_description: "Движение вперед с плавными переходами от ходьбы к бегу."
+
+SmoothMoveBackward_name: "Плавно двигаться назад"
+SmoothMoveBackward_description: "Движение назад с плавными переходами от ходьбы к бегу."
+
+SmoothMoveLeft_name: "Плавно двигаться влево"
+SmoothMoveLeft_description: "Движение влево с плавными переходами от ходьбы к бегу."
+
+SmoothMoveRight_name: "Плавно двигаться вправо"
+SmoothMoveRight_description: "Движение вправо с плавными переходами от ходьбы к бегу."
diff --git a/files/data/l10n/OMWControls/sv.yaml b/files/data/l10n/OMWControls/sv.yaml
index 43565053c5..59fecd1f35 100644
--- a/files/data/l10n/OMWControls/sv.yaml
+++ b/files/data/l10n/OMWControls/sv.yaml
@@ -1,7 +1,7 @@
 ControlsPage: "OpenMW Kontroller"
 ControlsPageDescription: "Ytterligare inställningar relaterade till spelarkontroller"
 
-MovementSettings: "Rörelse"
+MovementSettings: "Rörelser"
 
 alwaysRun: "Spring alltid"
 alwaysRunDescription: |
@@ -13,3 +13,73 @@ toggleSneakDescription: |
     Denna inställningen gör att smygknappen (förinställt till ctrl) slår smygning på eller av vid ett knapptryck
     istället för att att kräva att knappen hålls nedtryckt för att smyga.
     Spelare som spenderar mycket tid med att smyga lär ha lättare att kontrollera rollfiguren med denna funktion aktiverad.
+
+smoothControllerMovement: "Mjuka handkontrollsrörelser"
+smoothControllerMovementDescription: |
+   Aktiverar mjuka styrspaksrörelser för handkontroller. Gör övergången från gående till springande mindre abrubt.
+
+TogglePOV_name: "Växla perspektiv"
+TogglePOV_description: "Växlar mellan första- och tredjepersonsperspektiv. Håll in för att aktivera omloppskamera."
+
+Zoom3rdPerson_name: "Zooma in/ut"
+Zoom3rdPerson_description: "Flyttar kameran närmare / längre bort i tredjepersonsperspektivet."
+
+MoveForward_name: "Förflyttning framåt"
+MoveForward_description: "Kan avbrytas med Förflyttning bakåt."
+
+MoveBackward_name: "Förflyttning bakåt"
+MoveBackward_description: "Kan avbrytas med Förflyttning framåt."
+
+MoveLeft_name: "Förflyttning vänster"
+MoveLeft_description: "Kan avbrytas med Förflyttning höger."
+
+MoveRight_name: "Förflyttning höger"
+MoveRight_description: "Kan avbrytas med Förflyttning vänster."
+
+Use_name: "Använd"
+Use_description: "Attackera med ett vapen eller kasta en besvärjelse beroende på nuvarande hållning."
+
+Run_name: "Spring"
+Run_description: "Håll in för att springa/gå, beroende på Spring alltid-inställningen."
+
+AlwaysRun_name: "Spring alltid"
+AlwaysRun_description: "Aktiverar Spring alltid-funktionen."
+
+Jump_name: "Hoppa"
+Jump_description: "Hoppar när du är på marken."
+
+AutoMove_name: "Förflytta automatiskt"
+AutoMove_description: "Aktiverar konstant förflyttning framåt."
+
+Sneak_name: "Smyg"
+Sneak_description: "Håll in för att smyga, om Växla till smyg-inställningen är av."
+
+ToggleSneak_name: "Växla till smygläge"
+ToggleSneak_description: "Knappen för smyg växlar till smygläge med ett tryck om denna är på."
+
+ToggleWeapon_name: "Redo vapen"
+ToggleWeapon_description: "Gå in i eller lämna vapenposition."
+
+ToggleSpell_name: "Redo magi"
+ToggleSpell_description: "Gå in i eller lämna magiposition."
+
+Inventory_name: "Lager"
+Inventory_description: "Öppna lagret."
+
+Journal_name: "Dagbok"
+Journal_description: "Öppna dagboken."
+
+QuickKeysMenu_name: "Snabbknappsmeny"
+QuickKeysMenu_description: "Öppnar snabbknappsmenyn."
+
+SmoothMoveForward_name: "Mjuk förflyttning framåt"
+SmoothMoveForward_description: "Framåtförflyttning anpassad för mjuka övergångar från gång till spring."
+
+SmoothMoveBackward_name: "Mjuk förflyttning bakåt"
+SmoothMoveBackward_description: "Bakåtförflyttning anpassad för mjuka övergångar från gång till spring."
+
+SmoothMoveLeft_name: "Mjuk förflyttning vänster"
+SmoothMoveLeft_description: "Vänsterförflyttning anpassad för mjuka övergångar från gång till spring."
+
+SmoothMoveRight_name: "Mjuk förflyttning höger"
+SmoothMoveRight_description: "Högerförflyttning anpassad för mjuka övergångar från gång till spring."
diff --git a/files/data/l10n/OMWEngine/de.yaml b/files/data/l10n/OMWEngine/de.yaml
index f2b4ee7e5a..8543436c44 100644
--- a/files/data/l10n/OMWEngine/de.yaml
+++ b/files/data/l10n/OMWEngine/de.yaml
@@ -1,93 +1,167 @@
 # Console
 
-#-- To be translated
-#ConsoleWindow: "Console"
+ConsoleWindow: "Kommandokonsole"
 
 # Debug window
 
-DebugWindow: "Debug"
-LogViewer: "Protokollansicht"
+DebugWindow: "Debug-Fenster"
+LogViewer: "Log-Ansicht"
 LuaProfiler: "Lua-Profiler"
 PhysicsProfiler: "Physik-Profiler"
 
 
 # Messages
 
-BuildingNavigationMesh: "Baue Navigationsgitter"
-
-#-- To be translated
-#AskLoadLastSave: "The most recent save is '%s'. Do you want to load it?"
-#InitializingData: "Initializing Data..."
-#LoadingExterior: "Loading Area"
-#LoadingFailed: "Failed to load saved game"
-#LoadingInterior: "Loading Area"
-#LoadingInProgress: "Loading Save Game"
-#LoadingRequiresNewVersionError: |-
-#    This save file was created using a newer version of OpenMW and is thus not supported.
-#    Please upgrade to the newest OpenMW version to load this file.
-#NewGameConfirmation: "Do you want to start a new game and lose the current one?"
-#SaveGameDenied: "The game cannot be saved right now."
-#SavingInProgress: "Saving..."
-#QuitGameConfirmation: "Quit the game?"
+AskLoadLastSave: "Der aktuellste Spielstand ist '%s'. Soll er geladen werden?"
+BuildingNavigationMesh: "Erstelle Navigationsgitter..."
+InitializingData: "Initialisiere Daten..."
+LoadingExterior: "Lade Bereich..."
+LoadingFailed: "Laden des Spielstandes fehlgeschlagen!"
+LoadingInterior: "Lade Bereich..."
+LoadingInProgress: "Lade Spielstand..."
+LoadingRequiresNewVersionError: |-
+   Der Spielstand wurde mit einer neueren Version von OpenMW erstellt und wird daher nicht unterstützt.
+   Bitte aktualisieren Sie Ihre OpenMW-Installation, um den Spielstand laden zu können.
+LoadingRequiresOldVersionError: |-
+    Der Spielstand wurde mit einer älteren Version von OpenMW erstellt, deren Speicherformat nicht mehr unterstützt wird.
+    Laden und speichern Sie den Spielstand mit Version {version}, um das Format anzupassen.
+NewGameConfirmation: "Neues Spiel starten und aktuellen Fortschritt verwerfen?"
+QuitGameConfirmation: "Spiel verlassen?"
+SaveGameDenied: "Das Spiel kann gerade nicht gespeichert werden!"
+SavingInProgress: "Speichere Spiel..."
+ScreenshotFailed: "Speichern des Screenshots fehlgeschlagen!"
+ScreenshotMade: "%s wurde gespeichert."
 
 
 # Save game menu
 
-SelectCharacter: "Charakterauswahl..."
+DeleteGame: "Spielstand löschen"
+DeleteGameConfirmation: "Möchten Sie den Spielstand wirklich löschen?"
+EmptySaveNameError: "Der Spielstand kann ohne Name nicht gespeichert werden!"
+Health: "Lebensenergie"
+Level: "Stufe"
+LoadGameConfirmation: "Spielstand laden und aktuellen Fortschritt verwerfen?"
+MissingContentFilesConfirmation: |-
+   Die aktuell ausgewählten Spieledateien stimmen nicht mit den im Spielstand verwendeten überein,
+   was zu Fehlern beim Laden und während des Spielens führen kann.
+   Möchten Sie wirklich fortfahren?
+MissingContentFilesList: |-
+ {files, plural,
+   one{\n\nEine fehlende Datei gefunden: }
+   few{\n\n{files} fehlende Dateien gefunden:\n}
+   other{\n\n{files} fehlende Dateien gefunden:\n}
+ }
+MissingContentFilesListCopy: |-
+ {files, plural,
+   one{\n\nDrücken Sie „Kopieren“, um den Namen in die Zwischenablage zu kopieren.}
+   few{\n\nDrücken Sie „Kopieren“, um alle Namen in die Zwischenablage zu kopieren.}
+   other{\n\nDrücken Sie „Kopieren“, um alle Namen in die Zwischenablage zu kopieren.}
+ }
+OverwriteGameConfirmation: "Sind Sie sicher, dass Sie den Spielstand überschreiben wollen?"
+SelectCharacter: "Charakter auswählen..."
 TimePlayed: "Spielzeit"
 
-#-- To be translated
-#DeleteGame: "Delete Game"
-#DeleteGameConfirmation: "Are you sure you want to delete this saved game?"
-#EmptySaveNameError: "Game can not be saved without a name!"
-#LoadGameConfirmation: "Do you want to load a saved game and lose the current one?"
-#MissingContentFilesConfirmation: |
-#    The currently selected content files do not match the ones used by this save game.
-#    Errors may occur during load or game play.
-#    Do you wish to continue?
-#OverwriteGameConfirmation: "Are you sure you want to overwrite this saved game?"
-
 
 # Settings menu
 
 ActorsProcessingRange: "Akteur-Verarbeitungsreichweite"
 Anisotropy: "Anisotropie"
+Audio: "Audio"
+AudioMaster: "Master-Lautstärke"
+AudioVoice: "Stimmen"
+AudioEffects: "Effekte"
+AudioFootsteps: "Schritte"
+AudioMusic: "Musik"
+AutoSaveOnResting: "Beim Rasten speichern"
+BestAttack: "Immer bester Angriff"
 CameraSensitivity: "Kameraempfindlichkeit"
 CameraZoomIn: "Kamera hineinzoomen"
 CameraZoomOut: "Kamera herauszoomen"
-ChangeRequiresRestart: "Diese Änderung erfordert einen Neustart um wirksam zu werden."
+ChangeRequiresRestart: "Diese Änderung erfordert einen Neustart, um wirksam zu werden."
+ClassicFalloff: "Klassischer Lichtabfall"
+ClassicFalloffTooltip: |-
+    Standard: aus
+    Verwendet die traditionelle Formel für die Abschwächung von Punktlichtquellen, die kein frühzeitiges Ausblenden aufweist.
+
+    Ein Nachteil der traditionellen Formel ist, dass der Lichteinfluss nie ganz Null erreicht.
+    Dies ist physikalisch korrekt, kann aber zu Beleuchtungsnähten führen, da Lichter nicht die gesamte Szene beeinflussen.
+    Frühzeitiges Ausblenden hilft, diese Nähte zu verringern, allerdings auf Kosten einer dunkleren Szene.
+
+    Morrowind verwendet die traditionelle Formel, daher möchten Sie dies möglicherweise aktivieren, wenn Ihnen die Helligkeitsunterschiede nicht gefallen.
+    Alternativ können Sie versuchen, die minimale Innenraumhelligkeit zu ändern.
+ConfirmResetBindings: "Alle Tastenbelegungen zurücksetzen?"
+ConfirmResolution: "Neue Auflösung wird sofort angewendet. Fortsetzen?"
 Controller: "Controller"
+Controls: "Steuerung"
+Crosshair: "Fadenkreuz"
+DelayLow: "Schnell"
+DelayHigh: "Langsam"
+DetailLevel: "Detailgrad"
+Difficulty: "Schwierigkeitsgrad"
+DifficultyEasy: "Leicht"
+DifficultyHard: "Schwer"
+DistanceHigh: "Weit"
+DistanceLow: "Kurz"
+EnableController: "Controller aktivieren"
 FieldOfView: "Sichtfeld"
-FrameRateHint: "Hinweis: Drücken Sie F3, um die aktuelle Bildrate\nanzuzeigen."
-InvertXAxis: "X-Achse umkehren"
+FieldOfViewLow: "Niedrig"
+FieldOfViewHigh: "Hoch"
+ForcePerPixelLighting: "Beleuchtung pro Pixel"
+ForcePerPixelLightingTooltip: |-
+    Erzwingt die Verwendung der Beleuchtung pro Pixel. Standardmäßig verwenden nur Bump- und Normal-mapped-Objekte eine Beleuchtung pro Pixel.
+
+    Betrifft nur mit Shadern gezeichnete Objekte.
+
+    Die Aktivierung der Per-Pixel-Beleuchtung führt zu visuellen Unterschieden zur ursprünglichen Morrowind-Engine, da bestimmte Lichter in Morrowind auf Vertex-Beleuchtung angewiesen sind, um wie beabsichtigt auszusehen.
+
+    Beachten Sie, dass Bodendecker-Shader und Partikeleffekte diese Einstellung ignorieren.
+FrameRateHint: "Hinweis: Drücken Sie F3,\num die aktuelle Bildrate anzuzeigen."
+GammaCorrection: "Gamma-Korrektur"
+GammaDark: "Dunkel"
+GammaLight: "Hell"
+GmstOverridesL10n: "Texte aus ESM-Dateien haben Vorrang"
+InvertXAxis: "X-Achse invertieren"
+InvertYAxis: "Y-Achse invertieren"
 Language: "Sprache"
-LanguageNote: "Hinweis: Diese Einstellungen wirkt sich nicht auf Text von ESM-Dateien aus."
+LanguageNote: "Hinweis: Diese Einstellungen wirken sich nicht auf Texte aus ESM-Dateien aus."
 LightingMethod: "Beleuchtungsmethode"
 LightingMethodLegacy: "Veraltet"
 LightingMethodShaders: "Shader"
-LightingMethodShadersCompatibility: "Shader (Kompatibilität)"
-LightingResetToDefaults: "Setzt auf Standardwerte zurück; möchten Sie fortfahren? Änderungen an der Beleuchtungsmethode erfordern einen Neustart."
+LightingMethodShadersCompatibility: "Shader (Kompatibilitätsmodus)"
+LightingResetToDefaults: "Einstellungen wirklich zurücksetzen? Das Ändern der „Beleuchtungsmethode“ erfordert einen Neustart."
 Lights: "Beleuchtung"
-LightsBoundingSphereMultiplier: "Bounding-Sphere-Multiplikator"
-LightsBoundingSphereMultiplierTooltip: "Standard: 1.65\nMultiplikator für Begrenzungskugel.\nHöhere Zahlen ermöglichen einen sanften Abfall, erfordern jedoch eine Erhöhung der Anzahl der maximalen Lichter.\n\nBeeinflusst nicht die Beleuchtung oder Lichtstärke."
-LightsFadeStartMultiplier: "Licht Verblassungs-Start-Multiplikator"
-LightsFadeStartMultiplierTooltip: "Standard: 0.85\nBruchteil der maximalen Entfernung, bei der die Lichter zu verblassen beginnen.\n\nStellen Sie hier einen niedrigen Wert für langsamere Übergänge oder einen hohen Wert für schnellere Übergänge ein."
+LightsBoundingSphereMultiplier: "Multiplikator für Begrenzungssphäre"
+LightsBoundingSphereMultiplierTooltip: "Standard: 1,65\nMultiplikator für Größe der Begrenzungssphäre.\nGrößere Werte ermöglichen einen sanfteren Abfall, erfordern jedoch eine Erhöhung der maximalen Anzahl von Lichtquellen.\n\nBeeinflusst nicht die Beleuchtung oder Lichtintensität."
+LightsFadeStartMultiplier: "Multiplikator für Startwert der Lichtabblendung"
+LightsFadeStartMultiplierTooltip: "Standard: 0,85\nBruchteil der maximalen Lichtreichweite, bei der Lichtquellen langsam zu verblassen beginnen.\n\nKleinere Werte führen zu einem sanfteren Übergang, der allerdings bereits bei geringerer Entfernung startet; größere Werte machen den Übergang abrupter, betreffen aber nur weiter entfernte Lichtquellen."
+LightsLightingMethodTooltip: "Legt die interne Behandlung von Lichtquellen fest.\n\n
+   „Veraltet“ verwendet immer bis zu 8 Lichtquellen pro Objekt und führt zu Ergebnissen, die denen der Original-Engine am ähnlichsten sind.\n\n
+   „Shader (Kompatibilitätsmodus)“ entfernt das Maximum von 8 Lichtquellen pro Objekt; Bodenvegetation wird von Lichtquellen beleuchtet. Es wird empfohlen, diese Option für ältere Hardware und Maximalwerte für Lichtquellen nahe 8 zu verwenden.\n\n
+   „Shader“ bietet alle Vorteile von „Shader (Kompatibilitätsmodus)“, nutzt aber einen moderneren Ansatz, der größere Maximalwerte für Lichtquellen bei geringen bis keinen Leistungseinbußen ermöglicht. Funktioniert möglicherweise nicht auf älterer Hardware."
 LightsMaximumDistance: "Maximale Lichtreichweite"
-LightsMaximumDistanceTooltip: "Standard: 8192\nMaximale Entfernung, bei der Lichter erscheinen (gemessen in Einheiten).\n\nSetzen Sie dies auf 0, um eine unbegrenzte Entfernung zu verwenden."
-LightsMinimumInteriorBrightness: "Minimale Innenhelligkeit"
-LightsMinimumInteriorBrightnessTooltip: "Standard: 0.08\nMinimale Umgebungshelligkeit im Innenraum.\n\nErhöhen Sie dies, wenn Sie das Gefühl haben, dass Innenräume zu dunkel sind."
-MaxLights: "Maximale Anzahl an Lichtern"
-MaxLightsTooltip: "Standard: 8\nMaximale Anzahl von Lichtern pro Objekt.\n\nEine niedrige Zahl in der Nähe des Standardwerts führt zu Lichtsprüngen, ähnlich wie bei klassischer Beleuchtung."
+LightsMaximumDistanceTooltip: "Standard: 8192 (1 Zelle)\nMaximale Entfernung, bis zu der Lichtquellen noch dargestellt werden (gemessen in In-Game-Einheiten).\n\nEin Wert von 0 entspricht einer unbegrenzten Reichweite."
+LightsMinimumInteriorBrightness: "Minimale Helligkeit in Innenräumen"
+LightsMinimumInteriorBrightnessTooltip: "Standard: 0,08\nMinimale Umgebungshelligkeit in Innenräumen.\n\nKann erhöht werden, falls Innenräume zu dunkel dargestellt werden.\n\nDies hat keine Auswirkung, wenn der klassische Lichtabfall verwendet wird."
+MaxLights: "Maximale Anzahl von Lichtquellen pro Objekt"
+MaxLightsTooltip: "Standard: 8\nMaximale Anzahl von Lichtquellen, die ein Objekt beleuchten können.\n\nKleine Werte können gerade an Orten mit vielen Lichtquellen zum Aufploppen und zum schnellen Wechsel von Lichtern führen, wie es aus der Original-Engine und anderen The-Elder-Scrolls-Titeln bekannt ist."
+MenuHelpDelay: "Verzögerung des Hilfe-Menüs"
+MenuTransparency: "Menü-Transparenz"
 MouseAndKeyboard: "Maus/Tastatur"
-PostProcessing: "Nachbearbeitung"
-PostProcessingTooltip: "Optimiert über Nachbearbeitungs-HUD, siehe Eingabeeinstellungen."
+PostProcessing: "Post-Processing"
+PostProcessingIsNotEnabled: "Post-Processing ist nicht aktiviert!"
+PostProcessingTooltip: "Wird über Post-Processing-HUD konfiguriert (siehe Tastenbelegung)."
+Preferences: "Einstellungen"
 PrimaryLanguage: "Hauptsprache"
 PrimaryLanguageTooltip: "Lokalisierungsdateien für diese Sprache haben die höchste Priorität."
-RainRippleDetail: "Detail der Regenkräuselung"
-RainRippleDetailDense: "Dicht"
-RainRippleDetailSimple: "Einfach"
-RainRippleDetailSparse: "Spärlich"
-ReflectionShaderDetail: "Reflexions-Shader-Detail"
+QualityHigh: "Hoch"
+QualityLow: "Niedrig"
+QualityMedium: "Mittel"
+RainRippleDetail: "Detailgrad der Regentropfen-Wellen"
+RainRippleDetailDense: "Dicht (mit Normal-Maps)"
+RainRippleDetailSimple: "Einfach (keine Normal-Maps)"
+RainRippleDetailSparse: "Spärlich (mit Normal-Maps)"
+RebindAction: "Drücken Sie eine Taste oder einen Knopf, um diese Tastenbelegung zu ändern."
+ReflectionShaderDetail: "Detailgrad des Wasserreflexions-Shaders"
 ReflectionShaderDetailActors: "Akteure"
 ReflectionShaderDetailGroundcover: "Bodenvegetation"
 ReflectionShaderDetailObjects: "Objekte"
@@ -95,69 +169,41 @@ ReflectionShaderDetailSky: "Himmel"
 ReflectionShaderDetailTerrain: "Terrain"
 ReflectionShaderDetailWorld: "Welt"
 Refraction: "Lichtbrechung"
-Screenshot: "Bildschirmfoto"
+ResetControls: "Tastenbelegungen zurücksetzen"
+Screenshot: "Screenshot"
 Scripts: "Skripte"
+ScriptsDisabled: "Laden Sie einen Spielstand, um auf die Skripteinstellungen zugreifen zu können."
 SecondaryLanguage: "Sekundäre Sprache"
-SecondaryLanguageTooltip: "Lokalisierungsdateien für diese Sprache können verwendet werden, wenn bei der primären Sprachdateien die erforderlichen Zeilen fehlen."
-TextureFiltering: "Texturfilterung"
+SecondaryLanguageTooltip: "Lokalisierungsdateien für diese Sprache werden als Rückfalloption verwendet, falls in den Dateien der Primärsprache die erforderlichen Zeilen fehlen."
+SensitivityHigh: "Hoch"
+SensitivityLow: "Niedrig"
+SettingsWindow: "Optionen"
+Subtitles: "Untertitel"
+SunlightScattering: "Sonnenlicht-Streuung"
+TestingExteriorCells: "Außenzellen testen"
+TestingInteriorCells: "Innenzellen testen"
+TextureFiltering: "Texturfilter"
 TextureFilteringBilinear: "Bilinear"
-TextureFilteringDisabled: "Nichts"
+TextureFilteringNearest: "Nächstgelegen"
+TextureFilteringDisabled: "Keiner"
 TextureFilteringOther: "Sonstiges"
 TextureFilteringTrilinear: "Trilinear"
 ToggleHUD: "HUD umschalten"
-TogglePostProcessorHUD: "Nachbearbeitungs-HUD umschalten"
+TogglePostProcessorHUD: "Post-Processing-HUD umschalten"
+TransparencyFull: "Vollständig"
+TransparencyNone: "Keine"
+Video: "Video"
+ViewDistance: "Sichtweite"
 VSync: "VSync"
+VSyncAdaptive: "Adaptiv"
 Water: "Wasser"
-WaterShader: "Wasser Shader"
+WaterShader: "Wasser-Shader"
 WaterShaderTextureQuality: "Texturqualität"
-WindowBorder: "Fensterrand"
+WindowBorder: "Fensterrahmen darstellen"
 WindowMode: "Fenstermodus"
 WindowModeFullscreen: "Vollbild"
+WindowModeHint: "Hinweis: Die Option „Fenster in Vollbildgröße“\nverwendet automatisch die native Bildschirmauflösung."
 WindowModeWindowed: "Fenster"
-WindowModeWindowedFullscreen: "Fenster Vollbild"
-
-#-- To be translated
-#Audio: "Audio"
-#AudioMaster: "Master"
-#AudioVoice: "Voice"
-#AudioEffects: "Effects"
-#AudioFootsteps: "Footsteps"
-#AudioMusic: "Music"
-#ConfirmResetBindings: "Reset all controls to the default?"
-#ConfirmResolution: "New resolution will be applied immediately. Do you want to continue?"
-#Controls: "Controls"
-#DelayLow: "Fast"
-#DelayHigh: "Slow"
-#DetailLevel: "Detail Level"
-#Difficulty: "Difficulty"
-#DifficultyEasy: "Easy"
-#DifficultyHard: "Hard"
-#DistanceHigh: "Far"
-#DistanceLow: "Near"
-#EnableController: "Enable Controller"
-#FieldOfViewLow: "Low"
-#FieldOfViewHigh: "High"
-#GammaCorrection: "Gamma Correction"
-#GammaDark: "Dark"
-#GammaLight: "Light"
-#GmstOverridesL10n: "Strings from ESM files have priority"
-#InvertYAxis: "Invert Y Axis"
-#MenuHelpDelay: "Menu Help Delay"
-#MenuTransparency: "Menu Transparency"
-#Preferences: "Prefs"
-#PostProcessingIsNotEnabled
-#QualityHigh: "High"
-#QualityLow: "Low"
-#QualityMedium: "Medium"
-#RebindAction: "Press a key or button to rebind this control."
-#ResetControls: "Reset Controls"
-#SensitivityHigh: "High"
-#SensitivityLow: "Low"
-#SettingsWindow: "Options"
-#Subtitles: "Subtitles"
-#TestingExteriorCells: "Testing exterior cells"
-#TestingInteriorCells: "Testing interior cells"
-#TransparencyFull: "Full"
-#TransparencyNone: "None"
-#Video: "Video"
-#ViewDistance: "View Distance"
+WindowModeWindowedFullscreen: "Fenster in Vollbildgröße"
+# More fitting translations of "wobbly" are welcome
+WobblyShores: "Wabbelige Uferlinien"
diff --git a/files/data/l10n/OMWEngine/en.yaml b/files/data/l10n/OMWEngine/en.yaml
index 08df886f18..c1e3e8b27a 100644
--- a/files/data/l10n/OMWEngine/en.yaml
+++ b/files/data/l10n/OMWEngine/en.yaml
@@ -13,7 +13,7 @@ PhysicsProfiler: "Physics Profiler"
 # Messages
 
 AskLoadLastSave: "The most recent save is '%s'. Do you want to load it?"
-BuildingNavigationMesh: "Building navigation mesh"
+BuildingNavigationMesh: "Building Navigation Mesh"
 InitializingData: "Initializing Data..."
 LoadingExterior: "Loading Area"
 LoadingFailed: "Failed to load saved game"
@@ -22,10 +22,15 @@ LoadingInProgress: "Loading Save Game"
 LoadingRequiresNewVersionError: |-
     This save file was created using a newer version of OpenMW and is thus not supported.
     Please upgrade to the newest OpenMW version to load this file.
+LoadingRequiresOldVersionError: |-
+    This save file was created using an older version of OpenMW in a format that is no longer supported.
+    Load and save this file using {version} to upgrade it.
 NewGameConfirmation: "Do you want to start a new game and lose the current one?"
+QuitGameConfirmation: "Quit the game?"
 SaveGameDenied: "The game cannot be saved right now."
 SavingInProgress: "Saving..."
-QuitGameConfirmation: "Quit the game?"
+ScreenshotFailed: "Failed to save screenshot"
+ScreenshotMade: "%s has been saved"
 
 
 # Save game menu
@@ -33,14 +38,28 @@ QuitGameConfirmation: "Quit the game?"
 DeleteGame: "Delete Game"
 DeleteGameConfirmation: "Are you sure you want to delete this saved game?"
 EmptySaveNameError: "Game can not be saved without a name!"
+Health: "Health"
+Level: "Level"
 LoadGameConfirmation: "Do you want to load a saved game and lose the current one?"
-MissingContentFilesConfirmation: |
+MissingContentFilesConfirmation: |-
     The currently selected content files do not match the ones used by this save game.
     Errors may occur during load or game play.
     Do you wish to continue?
+MissingContentFilesList: |-
+  {files, plural,
+    one{\n\nFound missing file: }
+    few{\n\nFound {files} missing files:\n}
+    other{\n\nFound {files} missing files:\n}
+  }
+MissingContentFilesListCopy: |-
+  {files, plural,
+    one{\n\nPress Copy to place its name to the clipboard.}
+    few{\n\nPress Copy to place their names to the clipboard.}
+    other{\n\nPress Copy to place their names to the clipboard.}
+  }
 OverwriteGameConfirmation: "Are you sure you want to overwrite this saved game?"
 SelectCharacter: "Select Character..."
-TimePlayed: "Time played"
+TimePlayed: "Time Played"
 
 
 # Settings menu
@@ -53,14 +72,28 @@ AudioFootsteps: "Footsteps"
 AudioMaster: "Master"
 AudioMusic: "Music"
 AudioVoice: "Voice"
+AutoSaveOnResting: "Auto-Save on Resting"
+BestAttack: "Always Use Best Attack"
 CameraSensitivity: "Camera Sensitivity"
 CameraZoomIn: "Zoom Camera In"
 CameraZoomOut: "Zoom Camera Out"
 ChangeRequiresRestart: "This change requires a restart to take effect."
+ClassicFalloff: "Classic Falloff"
+ClassicFalloffTooltip: |-
+    Default: off
+    Use the traditional point light attenuation formula which lacks an early fade out.
+
+    A flaw of the traditional formula is that light influence never quite reaches zero.
+    This is physically accurate, but can cause lighting seams because lights do not affect the entire scene.
+    Early fade out helps diminish these seams at the cost of darkening the scene.
+
+    Morrowind uses the traditional formula, so you may want to enable this if you dislike the brightness differences.
+    Alternatively, try changing the minimum interior brightness.
 ConfirmResetBindings: "Reset all controls to the default?"
 ConfirmResolution: "New resolution will be applied immediately. Do you want to continue?"
 Controller: "Controller"
 Controls: "Controls"
+Crosshair: "Crosshair"
 DelayLow: "Fast"
 DelayHigh: "Slow"
 DetailLevel: "Detail Level"
@@ -73,11 +106,20 @@ EnableController: "Enable Controller"
 FieldOfView: "Field of View"
 FieldOfViewHigh: "High"
 FieldOfViewLow: "Low"
+ForcePerPixelLighting: "Per-Pixel Lighting"
+ForcePerPixelLightingTooltip: |-
+    Force the use of per-pixel lighting. By default, only bump- and normal-mapped objects use per-pixel lighting.
+
+    Only affects objects drawn with shaders.
+
+    Enabling per-pixel lighting results in visual differences to the original MW engine as certain lights in Morrowind rely on vertex lighting to look as intended.
+
+    Note that groundcover shaders and particle effects ignore this setting.
 FrameRateHint: "Hint: press F3 to show\nthe current frame rate."
 GammaCorrection: "Gamma Correction"
 GammaDark: "Dark"
 GammaLight: "Light"
-GmstOverridesL10n: "Strings from ESM files have priority"
+GmstOverridesL10n: "Strings From ESM Files Have Priority"
 InvertXAxis: "Invert X Axis"
 InvertYAxis: "Invert Y Axis"
 Language: "Language"
@@ -89,13 +131,17 @@ LightingMethodShadersCompatibility: "Shaders (compatibility)"
 LightingResetToDefaults: "Resets to default values, would you like to continue? Changes to lighting method will require a restart."
 Lights: "Lights"
 LightsBoundingSphereMultiplier: "Bounding Sphere Multiplier"
-LightsBoundingSphereMultiplierTooltip: "Default: 1.65\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."
+LightsBoundingSphereMultiplierTooltip: "Default: 1.65\nMultiplier for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."
 LightsFadeStartMultiplier: "Fade Start Multiplier"
 LightsFadeStartMultiplierTooltip: "Default: 0.85\nFraction of maximum distance at which lights will start to fade.\n\nSet this to a low value for slower transitions or a high value for quicker transitions."
+LightsLightingMethodTooltip: "Set the internal handling of light sources.\n\n
+    \"Legacy\" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.\n\n
+    \"Shaders (compatibility)\" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.\n\n
+    \"Shaders\" carries all of the benefits that \"Shaders (compatibility)\" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware."
 LightsMaximumDistance: "Maximum Light Distance"
 LightsMaximumDistanceTooltip: "Default: 8192\nMaximum distance at which lights will appear (measured in units).\n\nSet this to 0 to use an unlimited distance."
 LightsMinimumInteriorBrightness: "Minimum Interior Brightness"
-LightsMinimumInteriorBrightnessTooltip: "Default: 0.08\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."
+LightsMinimumInteriorBrightnessTooltip: "Default: 0.08\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark.\n\nThis has no effect if classic falloff is used."
 MaxLights: "Max Lights"
 MaxLightsTooltip: "Default: 8\nMaximum number of lights per object.\n\nA low number near default will cause light popping similar to what you would see with legacy lighting."
 MenuHelpDelay: "Menu Help Delay"
@@ -110,12 +156,12 @@ PrimaryLanguageTooltip: "Localization files for this language have the highest p
 QualityHigh: "High"
 QualityLow: "Low"
 QualityMedium: "Medium"
-RainRippleDetail: "Rain ripple detail"
+RainRippleDetail: "Rain Ripple Detail"
 RainRippleDetailDense: "Dense"
 RainRippleDetailSimple: "Simple"
 RainRippleDetailSparse: "Sparse"
 RebindAction: "Press a key or button to rebind this control."
-ReflectionShaderDetail: "Reflection shader detail"
+ReflectionShaderDetail: "Reflection Shader Detail"
 ReflectionShaderDetailActors: "Actors"
 ReflectionShaderDetailGroundcover: "Groundcover"
 ReflectionShaderDetailObjects: "Objects"
@@ -133,10 +179,12 @@ SensitivityHigh: "High"
 SensitivityLow: "Low"
 SettingsWindow: "Options"
 Subtitles: "Subtitles"
-TestingExteriorCells: "Testing exterior cells"
-TestingInteriorCells: "Testing interior cells"
+SunlightScattering: "Sunlight Scattering"
+TestingExteriorCells: "Testing Exterior Cells"
+TestingInteriorCells: "Testing Interior Cells"
 TextureFiltering: "Texture Filtering"
 TextureFilteringBilinear: "Bilinear"
+TextureFilteringNearest: "Nearest"
 TextureFilteringDisabled: "None"
 TextureFilteringOther: "Other"
 TextureFilteringTrilinear: "Trilinear"
@@ -149,11 +197,12 @@ ViewDistance: "View Distance"
 VSync: "VSync"
 VSyncAdaptive: "Adaptive"
 Water: "Water"
-WaterShader: "Water shader"
-WaterShaderTextureQuality: "Texture quality"
+WaterShader: "Water Shader"
+WaterShaderTextureQuality: "Texture Quality"
 WindowBorder: "Window Border"
 WindowMode: "Window Mode"
 WindowModeFullscreen: "Fullscreen"
 WindowModeHint: "Hint: Windowed Fullscreen mode\nalways uses the native display resolution."
 WindowModeWindowed: "Windowed"
 WindowModeWindowedFullscreen: "Windowed Fullscreen"
+WobblyShores: "Wobbly Shores"
diff --git a/files/data/l10n/OMWEngine/fr.yaml b/files/data/l10n/OMWEngine/fr.yaml
index 5a6209b44c..2ff7da5d2f 100644
--- a/files/data/l10n/OMWEngine/fr.yaml
+++ b/files/data/l10n/OMWEngine/fr.yaml
@@ -2,11 +2,11 @@
 
 ConsoleWindow: "Console"
 
-
 # Debug window
 
 DebugWindow: "Fenêtre de débogage"
 LogViewer: "Journal"
+LuaProfiler: "Profileur Lua"
 PhysicsProfiler: "Profileur des performances de la physique"
 
 
@@ -22,26 +22,44 @@ LoadingInProgress: "Chargement de la sauvegarde"
 LoadingRequiresNewVersionError: |-
     Ce fichier de sauvegarde provient d'une version plus récente d'OpenMW, il n'est par consequent pas supporté.
     Mettez à jour votre version d'OpenMW afin de pouvoir charger cette sauvegarde.
+LoadingRequiresOldVersionError: |-
+    Ce fichier de sauvegarde provient d'une version trop ancienne d'OpenMW, il n'est par consequent pas supporté.
+    Ouvrez et enregistez cette sauvegarde avec {version} pour la mettre à jour.
 NewGameConfirmation: "Voulez-vous démarrer une nouvelle partie ? Toute progression non sauvegardée sera perdue."
+QuitGameConfirmation: "Quitter la partie ?"
 SaveGameDenied: "Sauvegarde impossible"
 SavingInProgress: "Sauvegarde en cours..."
-QuitGameConfirmation: "Quitter la partie ?"
+ScreenshotFailed: "Échec de la sauvegarde de la capture d'écran"
+ScreenshotMade: "Capture d'écran %s sauvegardée"
 
 
 # Save game menu
 
-SelectCharacter: "Sélection du personnage..."
-TimePlayed: "Temps de jeu"
-
 DeleteGame: "Supprimer la partie"
 DeleteGameConfirmation: "Voulez-vous réellement supprimer cette partie sauvegardée ?"
 EmptySaveNameError: "Impossible de sauvegarder une partie lui donner un nom !"
+Health: "Santé"
+Level: "Niveau"
 LoadGameConfirmation: "Voulez-vous charger cette autre partie ? Toute progression non sauvegardée sera perdue."
-MissingContentFilesConfirmation: |
+MissingContentFilesConfirmation: |-
     Les données de jeu actuellement sélectionnées ne correspondent pas à celle indiquée dans cette sauvegarde.
     Cela peut entraîner des erreurs lors du chargement, mais aussi lors de votre partie.
     Voulez-vous continuer ?
+MissingContentFilesList: |-
+  {files, plural,
+    one{\n\nUn fichier manquant trouvé : }
+    few{\n\n{files} fichiers manquant trouvés :\n}
+    other{\n\n{files} fichiers manquant trouvés :\n}
+  }
+MissingContentFilesListCopy: |-
+  {files, plural,
+    one{\n\nCliquez sur Copier pour placer ce nom dans le presse-papier.}
+    few{\n\nCliquez sur Copier pour placer ces noms dans le presse-papier.}
+    other{\n\nCliquez sur Copier pour placer ces noms dans le presse-papier.}
+  }
 OverwriteGameConfirmation: "Écraser la sauvegarde précédente ?"
+SelectCharacter: "Sélection du personnage..."
+TimePlayed: "Temps de jeu"
 
 
 # Settings menu
@@ -54,14 +72,28 @@ AudioFootsteps: "Bruits de pas"
 AudioMaster: "Général"
 AudioMusic: "Musique"
 AudioVoice: "Voix"
+AutoSaveOnResting: "Sauvegarde auto au repos"
+BestAttack: "Toujours meilleure attaque"
 CameraSensitivity: "Sensibilité de la caméra"
 CameraZoomIn: "Zoom avant de la caméra"
 CameraZoomOut: "Zoom arrière de la caméra"
 ChangeRequiresRestart: "Ce changement requiert un redémarrage de l'application pour prendre effet."
+ClassicFalloff: "Atténuation classique"
+ClassicFalloffTooltip: |-
+    valeur par défaut: inactif
+    Utilise la formule traditionnelle d'atténuation de la lumière ponctuelle qui n'a pas de diminution précoce.
+
+    Un défaut de la formule traditionnelle est que l'influence de la lumière n'atteint jamais tout à fait zéro.
+    C'est physiquement précis, mais peut causer des coutures d'éclairage car les lumières n'affectent pas toute la scène.
+    La diminution précoce aide à atténuer ces coutures au prix d'un assombrissement de la scène.
+
+    Morrowind utilise la formule traditionnelle, vous pourriez donc vouloir activer ceci si vous n'aimez pas les différences de luminosité.
+    Alternativement, essayez de modifier la luminosité minimale intérieure.
 ConfirmResetBindings: "Réinitialiser tous les contrôles à leurs valeurs par défaut ?"
 ConfirmResolution: "La nouvelle résolution d'affichage sera appliquée instantanément. Voulez-vous continuer ?"
 Controller: "Manette"
 Controls: "Contrôles"
+Crosshair: "Viseur"
 DelayHigh: "Lent"
 DelayLow: "Rapide"
 DetailLevel: "Niveau de détails"
@@ -74,6 +106,15 @@ EnableController: "Activer la manette"
 FieldOfView: "Champ de vision"
 FieldOfViewHigh: "Étendu"
 FieldOfViewLow: "Restreint"
+ForcePerPixelLighting: "Éclairage par pixel"
+ForcePerPixelLightingTooltip: |-
+    Force l'usage de l'éclairage par pixel. Par défaut, seuls les objets avec des "bump" et "normal" maps utilisent l'éclairage par pixel.
+
+    Affecte uniquement les objets rendus via des shaders.
+
+    Activer l'éclairage par pixel donne des résultats visuels différents de ceux du moteur de jeu original, car certaines lumières de Morrowind furent implémentées pour un éclairage par vertex.
+
+    Les shaders de végétation au sol et les particules ignorent cette option.
 FrameRateHint: "Note: Appuyez sur F3 pour afficher la fréquence d'affichage (FPS)."
 GammaCorrection: "Correction Gamma"
 GammaDark: "Sombre"
@@ -83,27 +124,31 @@ InvertXAxis: "Inverser l'axe X"
 InvertYAxis: "Inverser l'axe Y"
 Language: "Localisation"
 LanguageNote: "Note: Ce paramètre n'affecte pas les textes des fichiers ESM."
-LightingMethodLegacy: "Traditionnelle"
 LightingMethod: "Méthode d'affichage des lumières"
-LightingMethodShadersCompatibility: "Shaders (mode de compatibilité)"
+LightingMethodLegacy: "Traditionnelle"
 LightingMethodShaders: "Shaders"
+LightingMethodShadersCompatibility: "Shaders (mode de compatibilité)"
 LightingResetToDefaults: "Voulez-vous réinitialiser les paramètres d'affichage des lumières à leur valeur par défaut ? Ces changements requièrent un redémarrage de l'application."
+Lights: "Sources lumineuses"
 LightsBoundingSphereMultiplier: "Multiplicateur de sphère englobante"
 LightsBoundingSphereMultiplierTooltip: "valeur par défaut: 1.65\nMultiplicateur pour le rayon de la sphère incluant les sources lumineuses.\nUn multiplicateur plus élevé permet une extinction plus douce, mais applique un plus grand nombre de sources lumineuses sur chaque objet.\n\nCe paramètre ne modifie ni l'intensité ni la luminance des lumières."
 LightsFadeStartMultiplier: "Seuil de perte d'éclat lumineux"
 LightsFadeStartMultiplierTooltip: "valeur par défaut: 0.85\nFraction de la distance maximale d'une source à partir de laquelle l'intensité lumineuse commence à décroître.\n\nSélectionnez une valeur basse pour une transition douce ou une valeur plus élevée pour une transition plus abrupte."
+LightsLightingMethodTooltip: "Définit la gestion des sources lumineuses :\n\n
+    \"Traditionnelle\" Chaque objet est éclairé par 8 sources lumineuses. Cet méthode est la plus proche du jeu original.\n\n
+    \"Shaders (mode de compatibilité)\" supprime la limite des 8 sources lumineuses. Cette méthode permet d'éclairer la végétation au sol. Ce choix est recommandé pour les ordinateurs plus anciens avec un nombre de sources lumineuses proche de 8.\n\n
+    \"Shaders\" offre tous les bénéfices apportés par \"Shaders (mode de compatibilité)\", mais utilise une approche moderne. Celle-ci permet, sur du matériel moderne, d'augmenter le nombre de sources lumineuses par objet sans perte de performance."
 LightsMaximumDistance: "Distance maximale des sources lumineuses"
 LightsMaximumDistanceTooltip: "valeur par défaut: 8192\nDistance maximale d'affichage des sources lumineuses (en unité de distance).\n\nMettez cette valeur à 0 pour une distance d'affichage infinie."
 LightsMinimumInteriorBrightness: "Luminosité intérieure minimale"
-LightsMinimumInteriorBrightnessTooltip: "valeur par défaut: 0.08\nLuminosité ambiante minimum en intérieur.\n\nAugmentez cette valeur si les intérieurs vous semblent trop sombres."
-Lights: "Sources lumineuses"
+LightsMinimumInteriorBrightnessTooltip: "valeur par défaut: 0.08\nLuminosité ambiante minimum en intérieur.\n\nAugmentez cette valeur si les intérieurs vous semblent trop sombres.\n\nCela n'a aucun effet si l'atténuation classique est utilisée."
 MaxLights: "Maximum de sources lumineuses"
 MaxLightsTooltip: "valeur par défaut: 8\nNombre maximum de sources lumineuses par objet.\n\nUne valeur faible mène à des apparitions tardives des sources lumineuses similaires à celles obtenues avec la méthode d'éclairage traditionnelle."
 MenuHelpDelay: "Délai d'affichage du menu d'aide"
 MenuTransparency: "Transparence des menus"
 MouseAndKeyboard: "Souris/Clavier"
-PostProcessingIsNotEnabled: "Le post-traitement est désactivé"
 PostProcessing: "Post-traitement"
+PostProcessingIsNotEnabled: "Le post-traitement est désactivé"
 PostProcessingTooltip: "Modifiable dans le HUD de post-traitement, accessible à partir les paramètres de contrôle."
 Preferences: "Préférences"
 PrimaryLanguage: "Localisation principale"
@@ -126,19 +171,21 @@ ReflectionShaderDetailWorld: "Monde"
 Refraction: "Réfraction"
 ResetControls: "Réinitialiser les contrôles"
 Screenshot: "Capture d'écran"
-ScriptsDisabled: "Chargez une sauvegarde pour accéder aux paramètres des scripts."
 Scripts: "Scripts"
+ScriptsDisabled: "Chargez une sauvegarde pour accéder aux paramètres des scripts."
 SecondaryLanguage: "Localisation secondaire"
 SecondaryLanguageTooltip: "Localisation utilisée si le texte est absent de la localisation principale."
 SensitivityHigh: "Haute"
 SensitivityLow: "Faible"
 SettingsWindow: "Options"
 Subtitles: "Sous-titres"
+SunlightScattering: "Diffusion des rayons solaires"
 TestingExteriorCells: "Vérification des espaces (cells) extérieurs"
 TestingInteriorCells: "Vérification des espaces (cells) intérieurs"
-TextureFilteringBilinear: "Bilinéaire"
-TextureFilteringDisabled: "Aucun"
 TextureFiltering: "Filtre appliqué aux textures"
+TextureFilteringBilinear: "Bilinéaire"
+TextureFilteringNearest: "Plus proche voisin"
+TextureFilteringDisabled: "Aucun"
 TextureFilteringOther: "Autre"
 TextureFilteringTrilinear: "Trilinéaire"
 ToggleHUD: "Afficher/masquer le HUD"
@@ -148,11 +195,14 @@ TransparencyNone: "Basse"
 Video: "Graphisme"
 ViewDistance: "Distance d'affichage"
 VSync: "VSync"
+VSyncAdaptive: "Adaptif"
 Water: "Eau"
 WaterShader: "Shader pour l'eau"
 WaterShaderTextureQuality: "Qualité des textures"
 WindowBorder: "Bordure de fenêtre"
-WindowModeFullscreen: "Plein écran"
 WindowMode: "Mode d'affichage"
+WindowModeFullscreen: "Plein écran"
+WindowModeHint: "Info : Le mode \"Fenêtré plein écran\" utilise toujours la résolution native de l'écran."
 WindowModeWindowed: "Fenêtré"
 WindowModeWindowedFullscreen: "Fenêtré plein écran"
+WobblyShores: "Rivages vacillants"
diff --git a/files/data/l10n/OMWEngine/ru.yaml b/files/data/l10n/OMWEngine/ru.yaml
index cbc71f91e4..1dc5ccf5bf 100644
--- a/files/data/l10n/OMWEngine/ru.yaml
+++ b/files/data/l10n/OMWEngine/ru.yaml
@@ -22,10 +22,15 @@ LoadingInProgress: "Загрузка сохранения"
 LoadingRequiresNewVersionError: |-
     Это сохранение создано более новой версией OpenMW и поэтому не может быть загружено.
     Обновите OpenMW до последней версии, чтобы загрузить этот файл.
+LoadingRequiresOldVersionError: |-
+    Это сохранение создано старой версией OpenMW и использует формат, который больше не поддерживается.
+    Загрузите и сохраните этот файл в {version}, чтобы обновить его.
 NewGameConfirmation: "Вы хотите начать новую игру? Текущая игра будет потеряна."
+QuitGameConfirmation: "Выйти из игры?"
 SaveGameDenied: "В данный момент игру нельзя сохранить."
 SavingInProgress: "Сохранение..."
-QuitGameConfirmation: "Выйти из игры?"
+ScreenshotFailed: "Не удалось создать снимок экрана"
+ScreenshotMade: "Создан снимок экрана %s"
 
 
 # Save game menu
@@ -33,11 +38,25 @@ QuitGameConfirmation: "Выйти из игры?"
 DeleteGame: "Удалить игру"
 DeleteGameConfirmation: "Вы уверены, что хотите удалить это сохранение?"
 EmptySaveNameError: "Имя сохранения не может быть пустым!"
+Health: "Здоровье"
+Level: "Уровень"
 LoadGameConfirmation: "Вы хотите загрузить сохранение? Текущая игра будет потеряна."
-MissingContentFilesConfirmation: |
+MissingContentFilesConfirmation: |-
     Выбранные ESM/ESP файлы не соответствуют тем, которые использовались для этого сохранения.
     Во время загрузки или в процессе игры могут возникнуть ошибки.
     Вы хотите продолжить?
+MissingContentFilesList: |-
+  {files, plural,
+    one{\n\nОтсутствует файл }
+    few{\n\nОтсутствуют {files} файла:\n}
+    other{\n\nОтсутствуют {files} файлов:\n}
+  }
+MissingContentFilesListCopy: |-
+  {files, plural,
+    one{\n\nНажмите Скопировать, чтобы поместить его название в буфер обмена.}
+    few{\n\nНажмите Скопировать, чтобы поместить их названия в буфер обмена.}
+    other{\n\nНажмите Скопировать, чтобы поместить их названия в буфер обмена.}
+  }
 OverwriteGameConfirmation: "Вы уверены, что хотите перезаписать это сохранение?"
 SelectCharacter: "Выберите персонажа..."
 TimePlayed: "Время в игре"
@@ -53,14 +72,28 @@ AudioFootsteps: "Шаги"
 AudioMaster: "Общая громкость"
 AudioMusic: "Музыка"
 AudioVoice: "Голос"
+AutoSaveOnResting: "Автосохранение при отдыхе"
+BestAttack: "Всегда лучшая атака"
 CameraSensitivity: "Чувствительность камеры"
 CameraZoomIn: "Приблизить камеру"
 CameraZoomOut: "Отдалить камеру"
 ChangeRequiresRestart: "Чтобы это изменение вступило в силу, нужно перезапустить приложение."
+ClassicFalloff: "Классическое угасание"
+ClassicFalloffTooltip: |-
+    По умолчанию: выкл
+    Использовать традиционную формулу угасания точечных источников света, в которой полного угасания не происходит.
+
+    Изъян традиционной формулы заключается в том, что влияние света на сцену никогда не достигает нуля.
+    Это корректно с физической точки зрения, но приводит к швам, потому что источник света не может влиять на всю сцену сразу.
+    Полное угасание позволяет сильно уменьшить количество таких швов ценой того, что сцена становится темнее.
+
+    Morrowind использует традиционную формулу, поэтому вы можете решить включить эту настройку, если изменения освещенности вам не по душе.
+    Кроме того, вместо включения этой настройки вы также можете попробовать изменить минимальный уровень освещения в интерьерах.
 ConfirmResetBindings: "Сбросить все настройки управления?"
 ConfirmResolution: "Разрешение будет изменено немедленно. Продолжить?"
 Controller: "Геймпад"
 Controls: "Управление"
+Crosshair: "Прицел"
 DelayLow: "Маленькая"
 DelayHigh: "Большая"
 DetailLevel: "Уровень детализации"
@@ -73,6 +106,15 @@ EnableController: "Геймпад"
 FieldOfView: "Поле зрения"
 FieldOfViewLow: "Маленькое"
 FieldOfViewHigh: "Большое"
+ForcePerPixelLighting: "Попиксельное освещение"
+ForcePerPixelLightingTooltip: |-
+    Использовать попиксельное освещение принудительно. По умолчанию его используют только объекты, использующие карты бампа и карты нормалей.
+
+    Влияет только на объекты, отрисовываемые шейдерами.
+
+    Включение попиксельного освещения приводит к визуальным отличиям по сравнению с оригинальным движком Morrowind, так как некоторые источники света в Morrowind полагаются на повершинное освещение для того, чтобы выглядеть, как задумывалось.
+
+    Обратите внимание, что шейдеры растительности и системы частиц игнорируют эту настройку.
 FrameRateHint: "Подсказка: нажмите F3, чтобы показать\nтекущую частоту смены кадров."
 GammaCorrection: "Гамма-коррекция"
 GammaDark: "Темно"
@@ -92,10 +134,14 @@ LightsBoundingSphereMultiplier: "Множитель размера ограни
 LightsBoundingSphereMultiplierTooltip: "Значение по умолчанию: 1.65\nМножитель размера ограничивающей сферы источников света.\nВысокие значения делают затухание света плавнее, но требуют более высокого максимального количества источников света.\n\nНастройка не влияет на уровень освещения или мощность источников света."
 LightsFadeStartMultiplier: "Множитель начала затухания"
 LightsFadeStartMultiplierTooltip: "Значение по умолчанию: 0.85\nДоля расстояния (относительно дальности отображения источников света), на которой свет начинает затухать.\n\nНизкие значения ведут к плавному затуханию, высокие - к резкому."
+LightsLightingMethodTooltip: "Задает способ обработки источников света.\n\n
+    \"Устаревший\" всегда использует 8 источников света на объект и выдает освещение, наиболее близкое к таковому в оригинальной игре.\n\n
+    \"Шейдеры (режим совместимости)\" убирает ограничение в 8 источников света. Этот режим также позволяет освещению влиять на анимированную траву. Рекомендуется использовать этот режим на устаревшем аппаратном обеспечении и с количеством источников света на объект около 8.\n\n
+    \"Шейдеры\" работает аналогично режиму \"Шейдеры (режим совместимости)\", но использует более современный подход, позволяющий использовать большее количество источников света с минимальным влиянием на производительность на современном аппаратном обеспечении."
 LightsMaximumDistance: "Дальность отображения источников света"
 LightsMaximumDistanceTooltip: "Значение по умолчанию: 8192\nМаксимальное расстояние, на котором будут отображаться источники света (во внутриигровых единицах измерения).\n\nЕсли 0, то расстояние не ограничено."
 LightsMinimumInteriorBrightness: "Минимальный уровень освещения в помещениях"
-LightsMinimumInteriorBrightnessTooltip: "Значение по умолчанию: 0.08\nМинимальный уровень фонового освещения в помещениях.\n\nУвеличьте значение, если помещения в игре кажутся слишком темными."
+LightsMinimumInteriorBrightnessTooltip: "Значение по умолчанию: 0.08\nМинимальный уровень фонового освещения в помещениях.\n\nУвеличьте значение, если помещения в игре кажутся слишком темными. Эта настройка не имеет эффекта, если используется классическое угасание."
 MaxLights: "Макс. кол-во источников света"
 MaxLightsTooltip: "Значение по умолчанию: 8\nМаксимальное количество источников света для каждого объекта.\n\nНизкие числа (близкие к значению по умолчанию) приводят к резким перепадам освещения, как при устаревшем методе освещения."
 MenuHelpDelay: "Задержка всплывающих подсказок"
@@ -114,6 +160,7 @@ RainRippleDetail: "Капли дождя на воде"
 RainRippleDetailDense: "Плотные"
 RainRippleDetailSimple: "Упрощенные"
 RainRippleDetailSparse: "Редкие"
+RebindAction: "Нажмите клавишу, которую нужно назначить на это действие."
 ReflectionShaderDetail: "Детализация отражений"
 ReflectionShaderDetailActors: "Персонажи"
 ReflectionShaderDetailGroundcover: "Трава"
@@ -122,7 +169,6 @@ ReflectionShaderDetailSky: "Небо"
 ReflectionShaderDetailTerrain: "Ландшафт"
 ReflectionShaderDetailWorld: "Мир"
 Refraction: "Рефракция"
-RebindAction: "Нажмите клавишу, которую нужно назначить на это действие."
 ResetControls: "Сбросить"
 Screenshot: "Снимок экрана"
 Scripts: "Скрипты"
@@ -133,17 +179,19 @@ SensitivityHigh: "Высокая"
 SensitivityLow: "Низкая"
 SettingsWindow: "Настройки"
 Subtitles: "Субтитры"
-TestingExteriorCells: "Проверка наружних ячеек"
+SunlightScattering: "Рассеяние солнечного света"
+TestingExteriorCells: "Проверка наружных ячеек"
 TestingInteriorCells: "Проверка ячеек-помещений"
 TextureFiltering: "Фильтрация текстур"
 TextureFilteringBilinear: "Билинейная"
+TextureFilteringNearest: "Ступенчатая"
 TextureFilteringDisabled: "Отключена"
 TextureFilteringOther: "Другая"
 TextureFilteringTrilinear: "Трилинейная"
-TransparencyFull: "Прозрачное"
-TransparencyNone: "Непрозрачное"
 ToggleHUD: "Переключить HUD"
 TogglePostProcessorHUD: "Меню настроек постобработки"
+TransparencyFull: "Прозрачное"
+TransparencyNone: "Непрозрачное"
 ViewDistance: "Дальность обзора"
 Video: "Видео"
 VSync: "Вертикальная синхронизация"
@@ -157,3 +205,4 @@ WindowModeFullscreen: "Полный экран"
 WindowModeHint: "Подсказка: режим Оконный без полей\nвсегда использует родное разрешение экрана."
 WindowModeWindowed: "Оконный"
 WindowModeWindowedFullscreen: "Оконный без полей"
+WobblyShores: "Колеблющиеся берега"
diff --git a/files/data/l10n/OMWEngine/sv.yaml b/files/data/l10n/OMWEngine/sv.yaml
index 1ee8bdc707..da5586a05d 100644
--- a/files/data/l10n/OMWEngine/sv.yaml
+++ b/files/data/l10n/OMWEngine/sv.yaml
@@ -22,10 +22,15 @@ LoadingInProgress: "Laddar sparat spel"
 LoadingRequiresNewVersionError: |-
     Denna sparfil skapades i en nyare version av OpenMW och stöds därför inte.
     Uppgradera till den senaste versionen av OpenMW för att ladda filen.
+LoadingRequiresOldVersionError: |-
+    Denna sparfil skapades i en äldre version av OpenMW i ett format som inte längre stöds.
+    Ladda och spara denna sparfil med {version} för att uppgradera den.
 NewGameConfirmation: "Vill du starta ett nytt spel och förlora det pågående spelet?"
+QuitGameConfirmation: "Avsluta spelet?"
 SaveGameDenied: "Spelet kan inte sparas just nu."
 SavingInProgress: "Sparar..."
-QuitGameConfirmation: "Avsluta spelet?"
+ScreenshotFailed: "Misslyckades att spara skärmdump"
+ScreenshotMade: "%s har sparats"
 
 
 # Save game menu
@@ -34,11 +39,25 @@ TimePlayed: "Speltid"
 DeleteGame: "Radera spel"
 DeleteGameConfirmation: "Är du säker på att du vill radera sparfilen?"
 EmptySaveNameError: "Spelet kan inte sparas utan ett namn!"
+Health: "Hälsa"
+Level: "Nivå"
 LoadGameConfirmation: "Vill du ladda ett sparat spel och förlora det pågående spelet?"
-MissingContentFilesConfirmation: |
+MissingContentFilesConfirmation: |-
     De valda innehållsfilerna matchar inte filerna som används av denna sparfil.
     Fel kan uppstå vid laddning eller under spel.
     Vill du fortsätta?
+MissingContentFilesList: |-
+  {files, plural,
+    one{\n\nHittade saknad fil: }
+    few{\n\nHittade {files} saknade filer:\n}
+    other{\n\nHittade {files} saknade filer:\n}
+  }
+MissingContentFilesListCopy: |-
+  {files, plural,
+    one{\n\nKlicka på kopiera för att placera namnet i urklipp.}
+    few{\n\nKlicka på kopiera för att placera deras namn i urklipp.}
+    other{\n\nKlicka på kopiera för att placera deras namn i urklipp.}
+  } 
 OverwriteGameConfirmation: "Är du säker på att du vill skriva över det här sparade spelet?"
 SelectCharacter: "Välj spelfigur..."
 
@@ -53,14 +72,28 @@ AudioFootsteps: "Fotsteg"
 AudioMaster: "Huvudvolym"
 AudioMusic: "Musik"
 AudioVoice: "Röster"
+AutoSaveOnResting: "Autospara vid vila"
+BestAttack: "Använd alltid bästa attack"
 CameraSensitivity: "Kamerakänslighet"
 CameraZoomIn: "Zooma in kamera"
 CameraZoomOut: "Zooma ut kamera"
 ChangeRequiresRestart: "Den här ändringen kräver omstart för att ge effekt."
+ClassicFalloff: "Klassiskt ljusavtagande"
+ClassicFalloffTooltip: |-
+    Förvalt: av
+    Använd den traditionella formeln för dämpning av punktljus som saknar en tidig uttoning.
+
+    En nackdel med den traditionella formeln är att ljusets påverkan aldrig riktigt når noll.
+    Detta är fysiskt korrekt, men kan orsaka "sömmar" eftersom ljuset inte påverkar hela scenen.
+    Tidig uttoning minskar synligheten av dessa sömmar på bekostnad av att scenen blir mörkare.
+
+    Morrowind använder den traditionella formeln, så du kanske vill aktivera detta om du ogillar skillnaderna i ljusstyrka.
+    Alternativt kan du prova att justera minsta ljusstyrkan i interiörer.
 ConfirmResetBindings: "Återställ alla kontroller till standard?"
 ConfirmResolution: "Ny upplösning kommer ställas in omedelbart. Vill du fortsätta?"
 Controller: "Handkontroll"
 Controls: "Kontroller"
+Crosshair: "Hårkors"
 DelayLow: "Snabbt"
 DelayHigh: "Långsamt"
 DetailLevel: "Detaljnivå"
@@ -73,6 +106,16 @@ EnableController: "Aktivera handkontroll"
 FieldOfView: "Synfält"
 FieldOfViewLow: "Låg"
 FieldOfViewHigh: "Hög"
+ForcePerPixelLighting: "Per-pixelljussättning"
+ForcePerPixelLightingTooltip: |-
+    Tvingar användningen av per-pixelljussättning. Som standard är det annars bara objekt med normalkartor som använder per-pixelljussättning.
+
+    Denna inställning påverkar endast objekt som ritas med shaderteknik.
+
+    Aktivering av per-pixelljussättning kommer ge visuella skillnader jämfört med hur Morrowind ser ut i ordinarie spelmotor.
+    Detta då visst ljus i Morrowind är beroende av vertexljussättning för att se ut som det var avsett.
+
+    Notera att shaders för marktäckare och partikeleffekter ignorerar denna inställning.
 FrameRateHint: "Tips: tryck på F3 för att visa\naktuell bilduppdateringsfrekvens."
 GammaCorrection: "Gammakorrigering"
 GammaDark: "Mörkt"
@@ -92,18 +135,22 @@ LightsBoundingSphereMultiplier: "Gränssfärsmultiplikator"
 LightsBoundingSphereMultiplierTooltip: "Förvalt: 1.65\nMultiplikator för ljusens gränssfär.\nHögre värden ger mjukare minskning av gränssfären, men kräver högre värde i Max antal ljuskällor.\n\nPåverkar inte ljusstyrkan."
 LightsFadeStartMultiplier: "Blekningsstartmultiplikator"
 LightsFadeStartMultiplierTooltip: "Förvalt: 0.85\nFraktion av det maximala avståndet från vilket ljuskällor börjar blekna.\n\nVälj lågt värde för långsammare övergång eller högre värde för snabbare övergång."
+LightsLightingMethodTooltip: "Välj intern hantering av ljuskällor.\n\n
+    \"Gammaldags\" använder alltid max 8 ljuskällor per objekt och ger ljussättning likt ett gammaldags spel.\n\n
+    \"Shader (kompatibilitet)\" tar bort begränsningen med max 8 ljuskällor per objekt. Detta läge aktiverar också ljus på marktäckning. Rekommenderas för äldre hårdvara tillsammans med en ljusbegränsning nära 8.\n\n
+    \"Shader\" har alla fördelar som \"Shader (kompatibilitet)\" har, med med ett modernt förhållningssätt som möjliggör fler maximalt antal ljuskällor med liten eller ingen prestandaförlust på modern hårdvara."
 LightsMaximumDistance: "Maximalt ljusavstånd"
 LightsMaximumDistanceTooltip: "Förvalt: 8192\nMaximala avståndet där ljuskällor syns (mätt i enheter).\n\nVärdet 0 ger oändligt avstånd."
 LightsMinimumInteriorBrightness: "Minsta ljusstyrka i interiörer"
-LightsMinimumInteriorBrightnessTooltip: "Förvalt: 0.08\nMinsta omgivande ljusstyrka i interiörer.\n\nÖka värdet om du anser att interiörer är för mörka."
+LightsMinimumInteriorBrightnessTooltip: "Förvalt: 0.08\nMinsta omgivande ljusstyrka i interiörer.\n\nÖka värdet om du anser att interiörer är för mörka.\n\nDetta har ingen effekt om klassiskt ljusavtagande används."
 MaxLights: "Max antal ljuskällor"
 MaxLightsTooltip: "Förvalt: 8\nMaximalt antal ljuskällor per objekt.\n\nEtt lågt tal nära det förvalda kommer orsaka att ljuskällor poppar upp som vid ljussättningsmetoden Gammaldags."
 MenuHelpDelay: "Menyhjälp, fördröjning" #Unsure in what context this goes
 MenuTransparency: "Menytransparens"
 MouseAndKeyboard: "Mus/Tangentbord"
-PostProcessing: "Postprocessing"
-PostProcessingIsNotEnabled: "Postprocessing är inte aktiverat"
-PostProcessingTooltip: "Justeras via Postprocessing-gränssnittet, se input bindings."
+PostProcessing: "Efterbehandling (post processing)"
+PostProcessingIsNotEnabled: "Efterbehandling (post processing) är inte aktiverat"
+PostProcessingTooltip: "Justeras via Efterbehandlings-gränssnittet, se input bindings."
 Preferences: "Inställningar" #Den engelska texten är "prefs", alltså "preferences" men förkortat. Men översättningen "preferenser" känns inte helt rätt. Kan vara bra att fundera över den här framöver.
 PrimaryLanguage: "Primärt språk"
 PrimaryLanguageTooltip: "Lokaliseringsfiler för detta språk har högst prioritet."
@@ -133,26 +180,30 @@ SensitivityHigh: "Hög"
 SensitivityLow: "Låg"
 SettingsWindow: "Inställningar"
 Subtitles: "Undertexter"
+SunlightScattering: "Solljusspridning"
 TestingExteriorCells: "Testar exteriöra celler"
 TestingInteriorCells: "Testar interiöra celler"
 TextureFiltering: "Texturfiltrering"
 TextureFilteringBilinear: "Bilinjär"
+TextureFilteringNearest: "Närmaste"
 TextureFilteringDisabled: "Ingen"
 TextureFilteringOther: "Annan"
 TextureFilteringTrilinear: "Trilinjär"
-ToggleHUD: "Växla till HUD"
-TogglePostProcessorHUD: "Växla till Postprocess-HUD"
+ToggleHUD: "Visa/dölj HUD"
+TogglePostProcessorHUD: "Visa/dölj Efterbehandlingsgränssnitt"
 TransparencyFull: "Full"
 TransparencyNone: "Ingen"
-Video: "Video"
-VSync: "VSynk"
+Video: "Bild"
 ViewDistance: "Siktavstånd"
+VSync: "VSynk"
+VSyncAdaptive: "Adaptiv"
 Water: "Vatten"
 WaterShader: "Vattenshader"
 WaterShaderTextureQuality: "Texturkvalitet"
 WindowBorder: "Fönster, ram"
 WindowMode: "Fönsterläge"
-WindowModeFullscreen: "Fullskärm"
-WindowModeHint: "Notera: Fullskärm i fönsterläge\nanvänder alltid skärmens nativa upplösning."
+WindowModeFullscreen: "Helskärm"
+WindowModeHint: "Notera: Helskärm i fönsterläge\nanvänder alltid skärmens nativa upplösning."
 WindowModeWindowed: "Fönster"
-WindowModeWindowedFullscreen: "Fullskärm i fönsterläge"
+WindowModeWindowedFullscreen: "Helskärm i fönsterläge"
+WobblyShores: "Vaggande stränder"
diff --git a/files/data/l10n/OMWMusic/de.yaml b/files/data/l10n/OMWMusic/de.yaml
new file mode 100755
index 0000000000..8b223164dd
--- /dev/null
+++ b/files/data/l10n/OMWMusic/de.yaml
@@ -0,0 +1,7 @@
+Music: "OpenMW: Musik"
+settingsPageDescription: "OpenMW-Musikeinstellungen"
+
+musicSettings: "Musik"
+
+CombatMusicEnabled: "Kampfmusik abspielen"
+CombatMusicEnabledDescription: "Falls aktiviert, wechselt das Spiel zu Kampfmusik, sobald sich Akteure im Kampf befinden."
diff --git a/files/data/l10n/OMWMusic/en.yaml b/files/data/l10n/OMWMusic/en.yaml
new file mode 100755
index 0000000000..ec96aed2cf
--- /dev/null
+++ b/files/data/l10n/OMWMusic/en.yaml
@@ -0,0 +1,7 @@
+Music: "OpenMW Music"
+settingsPageDescription: "OpenMW music settings."
+
+musicSettings: "Music Configuration"
+
+CombatMusicEnabled: "Play Combat Music"
+CombatMusicEnabledDescription: "If enabled, the game switches to combat music if there are actors in combat."
diff --git a/files/data/l10n/OMWMusic/fr.yaml b/files/data/l10n/OMWMusic/fr.yaml
new file mode 100755
index 0000000000..0f2977dbf0
--- /dev/null
+++ b/files/data/l10n/OMWMusic/fr.yaml
@@ -0,0 +1,7 @@
+Music: "OpenMW : Musique"
+settingsPageDescription: "Paramètre de la musique d'OpenMW"
+
+musicSettings: "Configuration de la musique"
+
+CombatMusicEnabled: "Jouer la musique de combat"
+CombatMusicEnabledDescription: "Si activé, le jeu bascule vers la musique de combat dès qu'un personnage est en combat."
diff --git a/files/data/l10n/OMWMusic/ru.yaml b/files/data/l10n/OMWMusic/ru.yaml
new file mode 100755
index 0000000000..59982205c5
--- /dev/null
+++ b/files/data/l10n/OMWMusic/ru.yaml
@@ -0,0 +1,7 @@
+Music: "Музыка OpenMW"
+settingsPageDescription: "Настройки музыки OpenMW"
+
+musicSettings: "Настройки музыки"
+
+CombatMusicEnabled: "Играть боевую музыку"
+CombatMusicEnabledDescription: "Нужно ли переключаться на боевую музыку, когда есть сражающиеся персонажи."
diff --git a/files/data/l10n/OMWMusic/sv.yaml b/files/data/l10n/OMWMusic/sv.yaml
new file mode 100755
index 0000000000..4e6d70e32c
--- /dev/null
+++ b/files/data/l10n/OMWMusic/sv.yaml
@@ -0,0 +1,7 @@
+Music: "OpenMW Musik"
+settingsPageDescription: "OpenMW Musikinställningar"
+
+musicSettings: "Musikkonfiguration"
+
+CombatMusicEnabled: "Spela stridsmusik"
+CombatMusicEnabledDescription: "Om aktiv kommer spelet byta till stridsmusik när det finns figurer som är i strid."
diff --git a/files/data/l10n/OMWShaders/de.yaml b/files/data/l10n/OMWShaders/de.yaml
index 7d17199dd9..7ea5eb59e3 100644
--- a/files/data/l10n/OMWShaders/de.yaml
+++ b/files/data/l10n/OMWShaders/de.yaml
@@ -1,6 +1,6 @@
 # Post-processing HUD
 
-Abovewater: "Überwasser"
+Abovewater: "Über Wasser"
 ActiveShaders: "Aktive Shader"
 Author: "Autor"
 Description: "Beschreibung"
@@ -8,27 +8,66 @@ InactiveShaders: "Inaktive Shader"
 InExteriors: "Außenbereich"
 InInteriors: "Innenbereich"
 KeyboardControls: |
-    Tastatursteuerung::
+    Tastatursteuerung:
 
     Shift+Pfeil-Rechts > Aktiviere Shader
     Shift+Pfeil-Links > Deaktiviere Shader
-    Shift+Pfeil-Hoch > Verschiebe Shader nach oben
-    Shift+Pfeil-Runter > Verschiebe Shader nach unten
-PostProcessHUD: "Nachbearbeitungs HUD"
-ResetShader: "Setze Shader auf Standardzustand zurück"
-ShaderLocked: "Verschlossen"
-ShaderLockedDescription: "Kann nicht umgeschaltet oder verschoben werden, gesteuert durch externes Lua-Skript"
+    Shift+Pfeil-Hoch > Verschiebe Shader in Liste nach oben
+    Shift+Pfeil-Runter > Verschiebe Shader in Liste nach unten
+# Better avoid the German translation "Nachbearbeitung" as it might lead to confusion.
+PostProcessHUD: "Post-Processing-HUD"
+ResetShader: "Shader zurücksetzen"
+ShaderLocked: "Gesperrt"
+ShaderLockedDescription: "Shader kann nicht umgeschaltet oder verschoben werden, sondern wird durch externes Lua-Skript gesteuert."
 ShaderResetUniform: "r"
-Underwater: "Unterwasser"
+Underwater: "Unter Wasser"
 Version: "Version"
 
 
 # Built-in post-processing shaders
 
-DisplayDepthName: "Visualisiert den Tiefenpuffer."
-DisplayDepthFactorDescription: "Bestimmt die Korrelation zwischen dem Pixeltiefenwert und seiner Ausgabefarbe. Hohe Werte führen zu einem helleren Bild."
-DisplayDepthFactorName: "Farbfaktor"
-ContrastLevelDescription: "Kontraststufe"
+# Adjustments
+# <Meta>
+AdjustmentsDescription: "Farbanpassungen"
+# "Contrast Level"
+ContrastLevelDescription: "Kontrast-Wert"
 ContrastLevelName: "Kontrast"
-GammaLevelDescription: "Gamma-Level"
+# "Gamma Level"
 GammaLevelName: "Gamma"
+GammaLevelDescription: "Gamma-Wert"
+
+# Bloom
+# <Meta>
+BloomDescription: "Bloom-Shader, der seine Berechnungen bei ungefähr linearem Licht durchführt."
+# "Bloom Clamp Level"
+BloomClampLevelName: "Oberer Grenzwert"
+BloomClampLevelDescription: "Begrenze die Helligkeit einzelner Pixel auf diesen Wert, bevor Bloom in die Szene gemischt wird."
+# "Bloom Threshold Level"
+BloomThresholdLevelName: "Unterer Schwellenwert"
+BloomThresholdLevelDescription: "Ignoriere Pixel, deren Helligkeit geringer als dieser Wert ist, bei der Berechnung der Bloom-Unschärfe. Dies wirkt sich nicht auf den Himmel aus."
+# "Gamma Level"
+# (see above)
+# "Radius Level"
+RadiusLevelName: "Radius"
+RadiusLevelDescription: "Radius des Effektes"
+# "Sky Factor Level"
+SkyFactorLevelName: "Himmel-Faktor"
+SkyFactorLevelDescription: "Multiplikator für Licht, das direkt vom Himmel kommt."
+# "Strength Level"
+StrengthLevelName: "Strength"
+StrengthLevelDescription: "Stärke des Effektes"
+
+
+# Debug
+# <Meta>
+DebugDescription: "Debug-Shader"
+# "Display Depth"
+DebugHeaderDepth: "Tiefenpuffer (Z-Buffer)"
+DisplayDepthName: "Visualisiere den Tiefenpuffer (Z-Puffer)"
+# "Depth Factor"
+DisplayDepthFactorName: "Faktor für Tiefenfärbung"
+DisplayDepthFactorDescription: "Verknüpfungsfaktor zwischen dem Tiefenwert eines Pixels und der ausgegebenen Farbe. Größere Werte führen zu einem helleren Bild."
+# "Display Normals"
+DebugHeaderNormals: "Normalenvektoren"
+DisplayNormalsName: "Visualisiere Normalenvektoren"
+NormalsInWorldSpace: "Zeige Normalenvektoren in Spielwelt-Koordinaten"
\ No newline at end of file
diff --git a/files/data/l10n/OMWShaders/en.yaml b/files/data/l10n/OMWShaders/en.yaml
index 8221be933f..3d1be625c0 100644
--- a/files/data/l10n/OMWShaders/en.yaml
+++ b/files/data/l10n/OMWShaders/en.yaml
@@ -14,7 +14,7 @@ KeyboardControls: |
     Shift+Left-Arrow > Deactive shader
     Shift+Up-Arrow > Move shader up
     Shift+Down-Arrow > Move shader down
-PostProcessHUD: "Postprocess HUD"
+PostProcessHUD: "Post Processor HUD"
 ResetShader: "Reset shader to default state"
 ShaderLocked: "Locked"
 ShaderLockedDescription: "Cannot be toggled or moved, controlled by external Lua script"
@@ -30,12 +30,13 @@ BloomDescription: "Bloom shader performing its calculations in (approximately) l
 DebugDescription: "Debug shader."
 DebugHeaderDepth: "Depth Buffer"
 DebugHeaderNormals: "Normals"
-DisplayDepthFactorName: "Depth colour factor"
+DisplayDepthFactorName: "Depth Colour Factor"
 DisplayDepthFactorDescription: "Determines correlation between pixel depth value and its output colour. High values lead to brighter image."
-DisplayDepthName: "Visualize depth buffer"
-DisplayNormalsName: "Visualize pass normals"
-ContrastLevelDescription: "Constrast level."
-ContrastLevelName: "Constrast"
+DisplayDepthName: "Visualize Depth Buffer"
+DisplayNormalsName: "Visualize Pass Normals"
+NormalsInWorldSpace: "Show Normals in World Space"
+ContrastLevelDescription: "Contrast level."
+ContrastLevelName: "Contrast"
 GammaLevelDescription: "Gamma level."
 GammaLevelName: "Gamma"
 StrengthLevelName: "Strength"
diff --git a/files/data/l10n/OMWShaders/fr.yaml b/files/data/l10n/OMWShaders/fr.yaml
index 3b4e47370e..45513589eb 100644
--- a/files/data/l10n/OMWShaders/fr.yaml
+++ b/files/data/l10n/OMWShaders/fr.yaml
@@ -34,6 +34,7 @@ DisplayDepthFactorName: "Rapport couleur/profondeur"
 DisplayDepthFactorDescription: "Détermine la corrélation entre la valeur de profondeur d'un pixel et sa couleur de sortie. Une valeur élevée mène à une image plus lumineuse."
 DisplayDepthName: "Visualise le Z-buffer (tampon de profondeur)."
 DisplayNormalsName: "Visualise le G-buffer de normales (normals pass)"
+NormalsInWorldSpace: "Affiche la normale de la surface de chaque objet"
 ContrastLevelDescription: "Niveau de contraste"
 ContrastLevelName: "Contraste"
 GammaLevelDescription: "Correction Gamma"
diff --git a/files/data/l10n/OMWShaders/ru.yaml b/files/data/l10n/OMWShaders/ru.yaml
index b886f72b54..7a2bcfe80d 100644
--- a/files/data/l10n/OMWShaders/ru.yaml
+++ b/files/data/l10n/OMWShaders/ru.yaml
@@ -33,6 +33,7 @@ DisplayDepthName: "Визуализация буфера глубины"
 DisplayDepthFactorDescription: "Определяет соотношение между значением глубины пикселя и его цветом. Чем выше значение, тем ярче будет изображение."
 DisplayDepthFactorName: "Соотношение цвета"
 DisplayNormalsName: "Визуализация нормалей"
+NormalsInWorldSpace: "Показывать нормали мирового пространства"
 ContrastLevelDescription: "Контрастность изображения"
 ContrastLevelName: "Контрастность"
 GammaLevelDescription: "Яркость изображения"
diff --git a/files/data/l10n/OMWShaders/sv.yaml b/files/data/l10n/OMWShaders/sv.yaml
index c1f1a5a333..f7876b9ee3 100644
--- a/files/data/l10n/OMWShaders/sv.yaml
+++ b/files/data/l10n/OMWShaders/sv.yaml
@@ -34,6 +34,7 @@ DisplayDepthFactorName: "Färgfaktor"
 DisplayDepthFactorDescription: "Avgör korrelation mellan djupvärdet på pixeln och dess producerade färg. Högre värden ger ljusare bild."
 DisplayDepthName: "Visualisera djupbufferten."
 DisplayNormalsName: "Visualisera normalvektorer" # på engelska står det "pass normals", finns bättre översättning?
+NormalsInWorldSpace: "Visa normalvektorer enligt världens koordinatsystem"
 ContrastLevelDescription: "Kontrastnivå"
 ContrastLevelName: "Kontrast"
 GammaLevelDescription: "Gammanivå"
diff --git a/files/data/mygui/openmw_layers.xml b/files/data/mygui/openmw_layers.xml
index 045fb1cdc2..459db3fcb9 100644
--- a/files/data/mygui/openmw_layers.xml
+++ b/files/data/mygui/openmw_layers.xml
@@ -13,6 +13,7 @@
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
     <Layer name="MainMenuBackground" overlapped="true" pick="true"/>
     <Layer name="MainMenu" overlapped="true" pick="true"/>
+    <Layer name="Settings" overlapped="true" pick="true"/>
     <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
     <Layer name="Debug" overlapped="true" pick="true"/>
diff --git a/files/data/mygui/openmw_list.skin.xml b/files/data/mygui/openmw_list.skin.xml
index 75f4b9e850..d17b258b80 100644
--- a/files/data/mygui/openmw_list.skin.xml
+++ b/files/data/mygui/openmw_list.skin.xml
@@ -124,6 +124,28 @@
         </BasisSkin>
     </Resource>
 
+    <Resource type="ResourceSkin" name="MW_ListLine_Specific" size="5 5">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left VCenter"/>
+
+        <BasisSkin type="SimpleText" offset="2 0 1 5" align="Stretch">
+            <State name="normal" colour="#{setting=GUI,color topic specific}"/>
+            <State name="highlighted" colour="#{setting=GUI,color topic specific over}"/>
+            <State name="pushed" colour="#{setting=GUI,color topic specific pressed}"/>
+        </BasisSkin>
+    </Resource>
+
+    <Resource type="ResourceSkin" name="MW_ListLine_Exhausted" size="5 5">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left VCenter"/>
+
+        <BasisSkin type="SimpleText" offset="2 0 1 5" align="Stretch">
+            <State name="normal" colour="#{setting=GUI,color topic exhausted}"/>
+            <State name="highlighted" colour="#{setting=GUI,color topic exhausted over}"/>
+            <State name="pushed" colour="#{setting=GUI,color topic exhausted pressed}"/>
+        </BasisSkin>
+    </Resource>
+
     <Resource type="ResourceLayout" name="MW_List" size="516 516" align="Left Top">
         <Widget type="Widget" position="0 0 516 516" name="Root">
             <Property key="NeedKey" value="true"/>
diff --git a/files/data/mygui/openmw_postprocessor_hud.skin.xml b/files/data/mygui/openmw_postprocessor_hud.skin.xml
index 8da8df2050..f6c6522a41 100644
--- a/files/data/mygui/openmw_postprocessor_hud.skin.xml
+++ b/files/data/mygui/openmw_postprocessor_hud.skin.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
 
+	<Resource type="ResourceLayout" name="MW_ValueEditChoice" version="3.2.0">
+		<Widget type="Widget" skin="" position="0 0 100 50" align="Stretch" name="Root">
+            <Widget type="ComboBox" skin="MW_ComboBox" position_real="0 0 1 1"  align="Stretch" name="Choices">
+                <Property key="Caption" value=""/>
+                <UserString key="HStretch" value="true"/>
+                <UserString key="VStretch" value="true"/>
+            </Widget>
+		</Widget>
+	</Resource>
+
 	<Resource type="ResourceLayout" name="MW_ValueEditNumber" version="3.2.0">
 		<Widget type="Widget" skin="" position="0 0 100 50" align="Stretch" name="Root">
             <Widget type="Widget" skin="BlackBG" position="0 0 100 50" name="Fill" align="Stretch">
diff --git a/files/data/mygui/openmw_settings_window.layout b/files/data/mygui/openmw_settings_window.layout
index e912ababfd..58f9ad3d75 100644
--- a/files/data/mygui/openmw_settings_window.layout
+++ b/files/data/mygui/openmw_settings_window.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
-    <Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="MainMenu" name="_Main">
+    <Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="Settings" name="_Main">
         <Property key="MinSize" value="640 490"/>
         <Widget type="TabControl" skin="TabControl" position="8 8 368 405" align="Stretch" name="SettingsTab">
             <Property key="ButtonAutoWidth" value="true"/>
@@ -98,27 +98,27 @@
                         <Property key="TextAlign" value="Right"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" position="4 250 260 28">
+                <Widget type="HBox" position="4 250 340 28">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Saves"/>
                         <UserString key="SettingName" value="autosave"/>
                         <UserString key="SettingType" value="CheckButton"/>
                     </Widget>
                     <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 95 16" align="Left Top">
-                        <Property key="Caption" value="#{sQuick_Save}"/>
+                        <Property key="Caption" value="#{OMWEngine:AutoSaveOnResting}"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" position="4 280 260 28">
+                <Widget type="HBox" position="4 280 340 28">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Game"/>
                         <UserString key="SettingName" value="best attack"/>
                         <UserString key="SettingType" value="CheckButton"/>
                     </Widget>
                     <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 89 16" align="Left Top">
-                        <Property key="Caption" value="#{sBestAttack}"/>
+                        <Property key="Caption" value="#{OMWEngine:BestAttack}"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" position="4 310 260 28">
+                <Widget type="HBox" position="4 310 340 28">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="GUI"/>
                         <UserString key="SettingName" value="subtitles"/>
@@ -128,14 +128,14 @@
                         <Property key="Caption" value="#{OMWEngine:Subtitles}"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" position="4 340 260 28">
+                <Widget type="HBox" position="4 340 340 28">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="HUD"/>
                         <UserString key="SettingName" value="crosshair"/>
                         <UserString key="SettingType" value="CheckButton"/>
                     </Widget>
                     <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 80 16" align="Left Top">
-                        <Property key="Caption" value="#{sCursorOff}"/>
+                        <Property key="Caption" value="#{OMWEngine:Crosshair}"/>
                     </Widget>
                 </Widget>
             </Widget>
@@ -457,7 +457,7 @@
                                 <UserString key="HStretch" value="true"/>
                                 <UserString key="VStretch" value="false"/>
 
-                                <Widget type="AutoSizedButton" skin="MW_Button">
+                                <Widget type="AutoSizedButton" skin="MW_Button" name="WaterRefractionButton">
                                     <UserString key="SettingCategory" value="Water"/>
                                     <UserString key="SettingName" value="refraction"/>
                                     <UserString key="SettingType" value="CheckButton"/>
@@ -467,6 +467,34 @@
                                 </Widget>
                             </Widget>
 
+                            <Widget type="HBox" align="Stretch">
+                                <UserString key="HStretch" value="true"/>
+                                <UserString key="VStretch" value="false"/>
+
+                                <Widget type="AutoSizedButton" skin="MW_Button" name="SunlightScatteringButton">
+                                    <UserString key="SettingCategory" value="Water"/>
+                                    <UserString key="SettingName" value="sunlight scattering"/>
+                                    <UserString key="SettingType" value="CheckButton"/>
+                                </Widget>
+                                <Widget type="AutoSizedTextBox" skin="SandText">
+                                    <Property key="Caption" value="#{OMWEngine:SunlightScattering}"/>
+                                </Widget>
+                            </Widget>
+
+                            <Widget type="HBox" align="Stretch">
+                                <UserString key="HStretch" value="true"/>
+                                <UserString key="VStretch" value="false"/>
+
+                                <Widget type="AutoSizedButton" skin="MW_Button" name="WobblyShoresButton">
+                                    <UserString key="SettingCategory" value="Water"/>
+                                    <UserString key="SettingName" value="wobbly shores"/>
+                                    <UserString key="SettingType" value="CheckButton"/>
+                                </Widget>
+                                <Widget type="AutoSizedTextBox" skin="SandText">
+                                    <Property key="Caption" value="#{OMWEngine:WobblyShores}"/>
+                                </Widget>
+                            </Widget>
+
                             <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
                                 <UserString key="HStretch" value="true"/>
                                 <Widget type="AutoSizedTextBox" skin="NormalText">
@@ -536,6 +564,9 @@
                         <!-- Lighting Method -->
                         <Widget type="TextBox" skin="NormalText" position="0 4 250 18" align="Left Top">
                             <Property key="Caption" value="#{OMWEngine:LightingMethod}"/>
+                            <UserString key="ToolTipType" value="Layout"/>
+                            <UserString key="ToolTipLayout" value="TextToolTip"/>
+                            <UserString key="Caption_Text" value="#{OMWEngine:LightsLightingMethodTooltip}"/>
                         </Widget>
                         <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 250 24" align="Left Top" name="LightingMethodButton">
                             <Property key="AddItem" value="legacy"/>
@@ -561,16 +592,50 @@
                             <Property key="AddItem" value="16"/>
                             <Property key="AddItem" value="24"/>
                             <Property key="AddItem" value="32"/>
+                            <Property key="AddItem" value="40"/>
+                            <Property key="AddItem" value="48"/>
+                            <Property key="AddItem" value="56"/>
+                            <Property key="AddItem" value="64"/>
                         </Widget>
-                        <Widget type="ImageBox" skin="MW_HLine" position="0 54 360 18" align="Top HStretch"/>
+
+                        <Widget type="HBox" position="0 60 600 24">
+                            <!-- Per-Pixel Lighting -->
+                            <Widget type="AutoSizedButton" skin="MW_Button" align="Left Top">
+                                <UserString key="SettingCategory" value="Shaders"/>
+                                <UserString key="SettingName" value="force per pixel lighting"/>
+                                <UserString key="SettingType" value="CheckButton"/>
+                            </Widget>
+                            <Widget type="AutoSizedTextBox" skin="SandText" align="Left Top">
+                                <!-- Deliberate padding -->
+                                <Property key="Caption" value="#{OMWEngine:ForcePerPixelLighting}  "/>
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="#{OMWEngine:ForcePerPixelLightingTooltip}"/>
+                            </Widget>
+                            <!-- Classic Falloff -->
+                            <Widget type="AutoSizedButton" skin="MW_Button" align="Left Top">
+                                <UserString key="SettingCategory" value="Shaders"/>
+                                <UserString key="SettingName" value="classic falloff"/>
+                                <UserString key="SettingType" value="CheckButton"/>
+                            </Widget>
+                            <Widget type="AutoSizedTextBox" skin="SandText" align="Left Top">
+                                <Property key="Caption" value="#{OMWEngine:ClassicFalloff}"/>
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="#{OMWEngine:ClassicFalloffTooltip}"/>
+                            </Widget>
+                        </Widget>
+
+                        <Widget type="ImageBox" skin="MW_HLine" position="0 84 360 18" align="Top HStretch"/>
+
                         <!-- Light Fade Start -->
-                        <Widget type="TextBox" skin="NormalText" position="0 78 500 18" align="Left Top" name="MaxLightDistanceText">
+                        <Widget type="TextBox" skin="NormalText" position="0 104 500 18" align="Left Top" name="MaxLightDistanceText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
                             <UserString key="Caption_Text" value="#{OMWEngine:LightsMaximumDistanceTooltip}"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
-                            <Property key="Range" value="8192"/>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 128 352 18" align="HStretch Top">
+                            <Property key="Range" value="8193"/>
                             <Property key="Page" value="128"/>
                             <UserString key="SettingType" value="Slider"/>
                             <UserString key="SettingMin" value="0"/>
@@ -582,12 +647,12 @@
                             <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsMaximumDistance} (%s)"/>
                         </Widget>
                         <!-- Light Fade Multiplier -->
-                        <Widget type="TextBox" skin="NormalText" position="0 128 500 18" align="Left Top" name="LightFadeMultiplierText">
+                        <Widget type="TextBox" skin="NormalText" position="0 152 500 18" align="Left Top" name="LightFadeMultiplierText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
                             <UserString key="Caption_Text" value="#{OMWEngine:LightsFadeStartMultiplierTooltip}"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 176 352 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="100"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -600,12 +665,12 @@
                             <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsFadeStartMultiplier} (%s)"/>
                         </Widget>
                         <!-- Bounding Sphere Multiplier -->
-                        <Widget type="TextBox" skin="NormalText" position="0 176 500 18" align="Left Top" name="BoundingSphereMultText">
+                        <Widget type="TextBox" skin="NormalText" position="0 200 500 18" align="Left Top" name="BoundingSphereMultText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
                             <UserString key="Caption_Text" value="#{OMWEngine:LightsBoundingSphereMultiplierTooltip}"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 224 352 18" align="HStretch Top">
                             <Property key="Range" value="500000"/>
                             <Property key="Page" value="1000"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -618,12 +683,12 @@
                             <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsBoundingSphereMultiplier} (%s)"/>
                         </Widget>
                         <!-- Minimum Ambient Brightness -->
-                        <Widget type="TextBox" skin="NormalText" position="0 224 500 18" align="Left Top" name="MinimumBrightnessText">
+                        <Widget type="TextBox" skin="NormalText" position="0 248 500 18" align="Left Top" name="MinimumBrightnessText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
                             <UserString key="Caption_Text" value="#{OMWEngine:LightsMinimumInteriorBrightnessTooltip}"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 272 352 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="100"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -633,7 +698,7 @@
                             <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
                             <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsMinimumInteriorBrightness} (%s)"/>
                         </Widget>
-                        <Widget type="AutoSizedButton" skin="MW_Button" position="0 290 0 0" align="Top Left" name="LightsResetButton">
+                        <Widget type="AutoSizedButton" skin="MW_Button" position="0 306 0 0" align="Top Left" name="LightsResetButton">
                             <Property key="Caption" value="#{Interface:Reset}"/>
                         </Widget>
                     </Widget>
diff --git a/files/data/mygui/openmw_windows.skin.xml b/files/data/mygui/openmw_windows.skin.xml
index 14f6930b3c..9491862b34 100644
--- a/files/data/mygui/openmw_windows.skin.xml
+++ b/files/data/mygui/openmw_windows.skin.xml
@@ -457,7 +457,6 @@
 
     <Resource type="ResourceSkin" name="MW_Window" size="256 256">
         <Property key="TextAlign" value="Center"/>
-        <Property key="Snap" value="true"/>
         <Property key="MinSize" value="64 64"/>
 
         <Child type="Widget" skin="BlackBG" offset="0 0 256 256" align="Stretch"/>
@@ -592,7 +591,6 @@
 
     <Resource type="ResourceSkin" name="MW_Window_NoCaption" size="256 256">
         <Property key="TextAlign" value="Center"/>
-        <Property key="Snap" value="true"/>
         <Property key="MinSize" value="64 64"/>
 
         <Child type="Widget" skin="BlackBG" offset=" 0 0 256 256" align="Stretch"/>
@@ -729,7 +727,6 @@
 
     <Resource type="ResourceSkin" name="MW_Window_Pinnable" size="256 256">
         <Property key="TextAlign" value="Center"/>
-        <Property key="Snap" value="true"/>
         <Property key="MinSize" value="64 64"/>
 
         <Child type="Widget" skin="BlackBG" offset=" 0 0 256 256" align="Stretch"/>
diff --git a/files/data/openmw_aux/ui.lua b/files/data/openmw_aux/ui.lua
index 44e1029b4b..cadae2a033 100644
--- a/files/data/openmw_aux/ui.lua
+++ b/files/data/openmw_aux/ui.lua
@@ -24,7 +24,7 @@ function aux_ui.deepLayoutCopy(layout)
     for k, v in pairs(layout) do
         if k == 'content' then
             result[k] = deepContentCopy(v)
-        elseif type(v) == 'table' then
+        elseif type(v) == 'table' and getmetatable(v) == nil then
             result[k] = aux_ui.deepLayoutCopy(v)
         else
             result[k] = v
@@ -33,4 +33,47 @@ function aux_ui.deepLayoutCopy(layout)
     return result
 end
 
+local function isUiElement(v)
+    return v.__type and v.__type.name == 'LuaUi::Element'
+end
+
+local function deepElementCallback(layout, callback)
+    if not layout.content then return end
+    for i = 1, #layout.content do
+        local child = layout.content[i]
+        if isUiElement(child) then
+            callback(child)
+            deepElementCallback(child.layout, callback)
+        else
+            deepElementCallback(child, callback)
+        end
+    end
+end
+
+---
+-- Recursively updates all elements in the passed layout or element
+-- @function [parent=#ui] deepUpdate
+-- @param #any elementOrLayout  @{openmw.ui#Layout} or  @{openmw.ui#Element}
+function aux_ui.deepUpdate(elementOrLayout)
+    local layout = elementOrLayout
+    if elementOrLayout.update then
+        elementOrLayout:update()
+        layout = elementOrLayout.layout
+    end
+    deepElementCallback(layout, function (e) e:update() end)
+end
+
+---
+-- Recursively destroys all elements in the passed layout or element
+-- @function [parent=#ui] deepDestroy
+-- @param #any elementOrLayout  @{openmw.ui#Layout} or  @{openmw.ui#Element}
+function aux_ui.deepDestroy(elementOrLayout)
+    local layout = elementOrLayout
+    if elementOrLayout.destroy then
+        elementOrLayout:destroy()
+        layout = elementOrLayout.layout
+    end
+    deepElementCallback(layout, function (e) e:destroy() end)
+end
+
 return aux_ui
diff --git a/files/data/scripts/omw/activationhandlers.lua b/files/data/scripts/omw/activationhandlers.lua
index ea69777582..a70696824f 100644
--- a/files/data/scripts/omw/activationhandlers.lua
+++ b/files/data/scripts/omw/activationhandlers.lua
@@ -17,13 +17,25 @@ local function ESM4DoorActivation(door, actor)
     return false -- disable activation handling in C++ mwmechanics code
 end
 
+local function ESM4BookActivation(book, actor)
+    if actor.type == types.Player then
+        actor:sendEvent('AddUiMode', { mode = 'Book', target = book })
+    end
+end
+
 local handlersPerObject = {}
 local handlersPerType = {}
 
+handlersPerType[types.ESM4Book] = { ESM4BookActivation }
 handlersPerType[types.ESM4Door] = { ESM4DoorActivation }
 
 local function onActivate(obj, actor)
-    types.Actor.activeEffects(actor):remove('invisibility')
+    if world.isWorldPaused() then
+        return
+    end
+    if obj.parentContainer then
+        return
+    end
     local handlers = handlersPerObject[obj.id]
     if handlers then
         for i = #handlers, 1, -1 do
@@ -40,6 +52,7 @@ local function onActivate(obj, actor)
             end
         end
     end
+    types.Actor.activeEffects(actor):remove('invisibility')
     world._runStandardActivationAction(obj, actor)
 end
 
diff --git a/files/data/scripts/omw/ai.lua b/files/data/scripts/omw/ai.lua
index 0bf9e1bbec..16a420cca1 100644
--- a/files/data/scripts/omw/ai.lua
+++ b/files/data/scripts/omw/ai.lua
@@ -1,5 +1,7 @@
 local self = require('openmw.self')
 local interfaces = require('openmw.interfaces')
+local types = require('openmw.types')
+local util = require('openmw.util')
 
 local function startPackage(args)
     local cancelOther = args.cancelOther
@@ -9,19 +11,40 @@ local function startPackage(args)
         self:_startAiCombat(args.target, cancelOther)
     elseif args.type == 'Pursue' then
         if not args.target then error("target required") end
+        if not types.Player.objectIsInstance(args.target) then error("target must be a player") end
         self:_startAiPursue(args.target, cancelOther)
     elseif args.type == 'Follow' then
         if not args.target then error("target required") end
-        self:_startAiFollow(args.target, cancelOther)
+        self:_startAiFollow(args.target, args.cellId, args.duration or 0, args.destPosition or util.vector3(0, 0, 0), args.isRepeat or false, cancelOther)
     elseif args.type == 'Escort' then
         if not args.target then error("target required") end
         if not args.destPosition then error("destPosition required") end
         self:_startAiEscort(args.target, args.destCell or self.cell, args.duration or 0, args.destPosition, cancelOther)
     elseif args.type == 'Wander' then
-        self:_startAiWander(args.distance or 0, args.duration or 0, cancelOther)
+        local key = "idle"
+        local idle = {}
+        local duration = 0
+        if args.idle then
+            for i = 2, 9 do
+                local val = args.idle[key .. i]
+                if val == nil then
+                    idle[i-1] = 0
+                else
+                    local v = tonumber(val) or 0
+                    if v < 0 or v > 100 then
+                        error("idle values cannot exceed 100")
+                    end
+                    idle[i-1] = v
+                end
+            end
+        end
+        if args.duration then
+            duration = args.duration / 3600
+        end
+        self:_startAiWander(args.distance or 0, duration, idle, args.isRepeat or false, cancelOther)
     elseif args.type == 'Travel' then
         if not args.destPosition then error("destPosition required") end
-        self:_startAiTravel(args.destPosition, cancelOther)
+        self:_startAiTravel(args.destPosition, args.isRepeat or false, cancelOther)
     else
         error('Unsupported AI Package: ' .. args.type)
     end
@@ -47,12 +70,21 @@ return {
         -- @field openmw.core#GameObject target Target (usually an actor) of the AI package (can be nil).
         -- @field #boolean sideWithTarget Whether to help the target in combat (true or false).
         -- @field openmw.util#Vector3 destPosition Destination point of the AI package.
+        -- @field #number distance Distance value (can be nil).
+        -- @field #number duration Duration value (can be nil).
+        -- @field #table idle Idle value (can be nil).
+        -- @field #boolean isRepeat Should this package be repeated (true or false).
 
         --- Return the currently active AI package (or `nil` if there are no AI packages).
         -- @function [parent=#AI] getActivePackage
         -- @return #Package
         getActivePackage = function() return self:_getActiveAiPackage() end,
 
+        --- Return whether the actor is fleeing.
+        -- @function [parent=#AI] isFleeing
+        -- @return #boolean
+        isFleeing = function() return self:_isFleeing() end,
+
         --- Start new AI package.
         -- @function [parent=#AI] startPackage
         -- @param #table options See the "Built-in AI packages" page.
diff --git a/files/data/scripts/omw/camera/camera.lua b/files/data/scripts/omw/camera/camera.lua
index 6fcb46bb2f..5cd04239f7 100644
--- a/files/data/scripts/omw/camera/camera.lua
+++ b/files/data/scripts/omw/camera/camera.lua
@@ -1,14 +1,36 @@
 local camera = require('openmw.camera')
 local core = require('openmw.core')
+local debug = require('openmw.debug')
 local input = require('openmw.input')
 local util = require('openmw.util')
 local self = require('openmw.self')
 local nearby = require('openmw.nearby')
 local async = require('openmw.async')
+local storage = require('openmw.storage')
+local I = require('openmw.interfaces')
 
 local Actor = require('openmw.types').Actor
+local Player = require('openmw.types').Player
 
-local settings = require('scripts.omw.camera.settings').thirdPerson
+input.registerAction {
+    key = 'TogglePOV',
+    l10n = 'OMWControls',
+    name = 'TogglePOV_name',
+    description = 'TogglePOV_description',
+    type = input.ACTION_TYPE.Boolean,
+    defaultValue = false,
+}
+
+input.registerAction {
+    key = 'Zoom3rdPerson',
+    l10n = 'OMWControls',
+    name = 'Zoom3rdPerson_name',
+    description = 'Zoom3rdPerson_description',
+    type = input.ACTION_TYPE.Number,
+    defaultValue = 0,
+}
+
+local settings = storage.playerSection('SettingsOMWCameraThirdPerson')
 local head_bobbing = require('scripts.omw.camera.head_bobbing')
 local third_person = require('scripts.omw.camera.third_person')
 local pov_auto_switch = require('scripts.omw.camera.first_person_auto_switch')
@@ -38,10 +60,10 @@ end
 
 local primaryMode
 
-local noModeControl = 0
-local noStandingPreview = 0
-local noHeadBobbing = 0
-local noZoom = 0
+local noModeControl = {}
+local noStandingPreview = {}
+local noHeadBobbing = {}
+local noZoom = {}
 
 local function init()
     camera.setFieldOfView(camera.getBaseFieldOfView())
@@ -61,7 +83,7 @@ local previewTimer = 0
 
 local function updatePOV(dt)
     local switchLimit = 0.25
-    if input.isActionPressed(input.ACTION.TogglePOV) and input.getControlSwitch(input.CONTROL_SWITCH.ViewMode) then
+    if input.getBooleanActionValue('TogglePOV') and Player.getControlSwitch(self, Player.CONTROL_SWITCH.ViewMode) then
         previewTimer = previewTimer + dt
         if primaryMode == MODE.ThirdPerson or previewTimer >= switchLimit then
             third_person.standingPreview = false
@@ -90,7 +112,7 @@ local idleTimer = 0
 local vanityDelay = core.getGMST('fVanityDelay')
 
 local function updateVanity(dt)
-    local vanityAllowed = input.getControlSwitch(input.CONTROL_SWITCH.VanityMode)
+    local vanityAllowed = Player.getControlSwitch(self, Player.CONTROL_SWITCH.VanityMode)
     if vanityAllowed and idleTimer > vanityDelay and camera.getMode() ~= MODE.Vanity then
         camera.setMode(MODE.Vanity)
     end
@@ -114,42 +136,32 @@ local minDistance = 30
 local maxDistance = 800
 
 local function zoom(delta)
-    if not input.getControlSwitch(input.CONTROL_SWITCH.ViewMode) or
-       not input.getControlSwitch(input.CONTROL_SWITCH.Controls) or
-       camera.getMode() == MODE.Static or noZoom > 0 then
+    if not Player.getControlSwitch(self, Player.CONTROL_SWITCH.ViewMode) or
+        not Player.getControlSwitch(self, Player.CONTROL_SWITCH.Controls) or
+        camera.getMode() == MODE.Static or next(noZoom) then
         return
     end
     if camera.getMode() ~= MODE.FirstPerson then
         local obstacleDelta = third_person.preferredDistance - camera.getThirdPersonDistance()
         if delta > 0 and third_person.baseDistance == minDistance and
-           (camera.getMode() ~= MODE.Preview or third_person.standingPreview) and noModeControl == 0 then
+            (camera.getMode() ~= MODE.Preview or third_person.standingPreview) and not next(noModeControl) then
             primaryMode = MODE.FirstPerson
             camera.setMode(primaryMode)
         elseif delta > 0 or obstacleDelta < -delta then
-            third_person.baseDistance = util.clamp(third_person.baseDistance - delta - obstacleDelta, minDistance, maxDistance)
+            third_person.baseDistance = util.clamp(third_person.baseDistance - delta - obstacleDelta, minDistance,
+                maxDistance)
         end
-    elseif delta < 0 and noModeControl == 0 then
+    elseif delta < 0 and not next(noModeControl) then
         primaryMode = MODE.ThirdPerson
         camera.setMode(primaryMode)
         third_person.baseDistance = minDistance
     end
 end
 
-local function applyControllerZoom(dt)
-    if input.isActionPressed(input.ACTION.TogglePOV) then
-        local triggerLeft = input.getAxisValue(input.CONTROLLER_AXIS.TriggerLeft)
-        local triggerRight = input.getAxisValue(input.CONTROLLER_AXIS.TriggerRight)
-        local controllerZoom = (triggerRight - triggerLeft) * 100 * dt
-        if controllerZoom ~= 0 then
-            zoom(controllerZoom)
-        end
-    end
-end
-
 local function updateStandingPreview()
     local mode = camera.getMode()
-    if not previewIfStandStill or noStandingPreview > 0
-       or mode == MODE.FirstPerson or mode == MODE.Static or mode == MODE.Vanity then
+    if not previewIfStandStill or next(noStandingPreview)
+        or mode == MODE.FirstPerson or mode == MODE.Static or mode == MODE.Vanity then
         third_person.standingPreview = false
         return
     end
@@ -182,30 +194,39 @@ local function updateIdleTimer(dt)
     if not input.isIdle() then
         idleTimer = 0
     elseif self.controls.movement ~= 0 or self.controls.sideMovement ~= 0 or self.controls.jump or self.controls.use ~= 0 then
-        idleTimer = 0  -- also reset the timer in case of a scripted movement
+        idleTimer = 0 -- also reset the timer in case of a scripted movement
     else
         idleTimer = idleTimer + dt
     end
 end
 
 local function onFrame(dt)
-    if core.isWorldPaused() then return end
+    if core.isWorldPaused() or I.UI.getMode() then return end
     updateIdleTimer(dt)
     local mode = camera.getMode()
     if (mode == MODE.FirstPerson or mode == MODE.ThirdPerson) and not camera.getQueuedMode() then
         primaryMode = mode
     end
     if mode ~= MODE.Static then
-        if noModeControl == 0 then
+        local paralysis = Actor.activeEffects(self):getEffect(core.magic.EFFECT_TYPE.Paralyze)
+        local paralyzed = not debug.isGodMode() and paralysis.magnitude > 0
+        if not next(noModeControl) and not paralyzed then
             updatePOV(dt)
             updateVanity(dt)
         end
         updateStandingPreview()
         updateCrosshair()
     end
-    applyControllerZoom(dt)
+
+    do
+        local Zoom3rdPerson = input.getNumberActionValue('Zoom3rdPerson')
+        if Zoom3rdPerson ~= 0 then
+            zoom(Zoom3rdPerson)
+        end
+    end
+
     third_person.update(dt, smoothedSpeed)
-    if noHeadBobbing == 0 then head_bobbing.update(dt, smoothedSpeed) end
+    if not next(noHeadBobbing) then head_bobbing.update(dt, smoothedSpeed) end
     if slowViewChange then
         local maxIncrease = dt * (100 + third_person.baseDistance)
         camera.setPreferredThirdPersonDistance(
@@ -220,67 +241,96 @@ return {
     -- @module Camera
     -- @usage require('openmw.interfaces').Camera
     interface = {
-        --- Interface version
+        --- Interface version is 1
         -- @field [parent=#Camera] #number version
-        version = 0,
+        version = 1,
 
         --- Return primary mode (MODE.FirstPerson or MODE.ThirdPerson).
         -- @function [parent=#Camera] getPrimaryMode
+        -- @return #number @{openmw.camera#MODE}
         getPrimaryMode = function() return primaryMode end,
-        --- @function [parent=#Camera] getBaseThirdPersonDistance
+
+        --- Get base third person distance (without applying angle and speed modifiers).
+        -- @function [parent=#Camera] getBaseThirdPersonDistance
+        -- @return #number
         getBaseThirdPersonDistance = function() return third_person.baseDistance end,
-        --- @function [parent=#Camera] setBaseThirdPersonDistance
+        --- Set base third person distance
+        -- @function [parent=#Camera] setBaseThirdPersonDistance
+        -- @param #number value
         setBaseThirdPersonDistance = function(v) third_person.baseDistance = v end,
-        --- @function [parent=#Camera] getTargetThirdPersonDistance
+        --- Get the desired third person distance if there would be no obstacles (with angle and speed modifiers)
+        -- @function [parent=#Camera] getTargetThirdPersonDistance
+        -- @return #number
         getTargetThirdPersonDistance = function() return third_person.preferredDistance end,
 
-        --- @function [parent=#Camera] isModeControlEnabled
-        isModeControlEnabled = function() return noModeControl == 0 end,
-        --- @function [parent=#Camera] disableModeControl
-        disableModeControl = function() noModeControl = noModeControl + 1 end,
-        --- @function [parent=#Camera] enableModeControl
-        enableModeControl = function() noModeControl = math.max(0, noModeControl - 1) end,
+        --- Whether the built-in mode control logic is enabled.
+        -- @function [parent=#Camera] isModeControlEnabled
+        -- @return #boolean
+        isModeControlEnabled = function() return not next(noModeControl) end,
+        --- Disable with (optional) tag until the corresponding enable function is called with the same tag.
+        -- @function [parent=#Camera] disableModeControl
+        -- @param #string tag (optional, empty string by default) Will be disabled until the enabling function is called with the same tag
+        disableModeControl = function(tag) noModeControl[tag or ''] = true end,
+        --- Undo disableModeControl
+        -- @function [parent=#Camera] enableModeControl
+        -- @param #string tag (optional, empty string by default)
+        enableModeControl = function(tag) noModeControl[tag or ''] = nil end,
 
-        --- @function [parent=#Camera] isStandingPreviewEnabled
-        isStandingPreviewEnabled = function() return previewIfStandStill and noStandingPreview == 0 end,
-        --- @function [parent=#Camera] disableStandingPreview
-        disableStandingPreview = function() noStandingPreview = noStandingPreview + 1 end,
-        --- @function [parent=#Camera] enableStandingPreview
-        enableStandingPreview = function() noStandingPreview = math.max(0, noStandingPreview - 1) end,
+        --- Whether the built-in standing preview logic is enabled.
+        -- @function [parent=#Camera] isStandingPreviewEnabled
+        -- @return #boolean
+        isStandingPreviewEnabled = function() return previewIfStandStill and not next(noStandingPreview) end,
+        --- Disable with (optional) tag until the corresponding enable function is called with the same tag.
+        -- @function [parent=#Camera] disableStandingPreview
+        -- @param #string tag (optional, empty string by default) Will be disabled until the enabling function is called with the same tag
+        disableStandingPreview = function(tag) noStandingPreview[tag or ''] = true end,
+        --- Undo disableStandingPreview
+        -- @function [parent=#Camera] enableStandingPreview
+        -- @param #string tag (optional, empty string by default)
+        enableStandingPreview = function(tag) noStandingPreview[tag or ''] = nil end,
 
-        --- @function [parent=#Camera] isHeadBobbingEnabled
-        isHeadBobbingEnabled = function() return head_bobbing.enabled and noHeadBobbing == 0 end,
-        --- @function [parent=#Camera] disableHeadBobbing
-        disableHeadBobbing = function() noHeadBobbing = noHeadBobbing + 1 end,
-        --- @function [parent=#Camera] enableHeadBobbing
-        enableHeadBobbing = function() noHeadBobbing = math.max(0, noHeadBobbing - 1) end,
+        --- Whether head bobbing is enabled.
+        -- @function [parent=#Camera] isHeadBobbingEnabled
+        -- @return #boolean
+        isHeadBobbingEnabled = function() return head_bobbing.enabled and not next(noHeadBobbing) end,
+        --- Disable with (optional) tag until the corresponding enable function is called with the same tag.
+        -- @function [parent=#Camera] disableHeadBobbing
+        -- @param #string tag (optional, empty string by default) Will be disabled until the enabling function is called with the same tag
+        disableHeadBobbing = function(tag) noHeadBobbing[tag or ''] = true end,
+        --- Undo disableHeadBobbing
+        -- @function [parent=#Camera] enableHeadBobbing
+        -- @param #string tag (optional, empty string by default)
+        enableHeadBobbing = function(tag) noHeadBobbing[tag or ''] = nil end,
 
-        --- @function [parent=#Camera] isZoomEnabled
-        isZoomEnabled = function() return noZoom == 0 end,
-        --- @function [parent=#Camera] disableZoom
-        disableZoom = function() noZoom = noZoom + 1 end,
-        --- @function [parent=#Camera] enableZoom
-        enableZoom = function() noZoom = math.max(0, noZoom - 1) end,
+        --- Whether the built-in zooming is enabled.
+        -- @function [parent=#Camera] isZoomEnabled
+        -- @return #boolean
+        isZoomEnabled = function() return not next(noZoom) end,
+        --- Disable with (optional) tag until the corresponding enable function is called with the same tag.
+        -- @function [parent=#Camera] disableZoom
+        -- @param #string tag (optional, empty string by default) Will be disabled until the enabling function is called with the same tag
+        disableZoom = function(tag) noZoom[tag or ''] = true end,
+        --- Undo disableZoom
+        -- @function [parent=#Camera] enableZoom
+        -- @param #string tag (optional, empty string by default)
+        enableZoom = function(tag) noZoom[tag or ''] = nil end,
 
-        --- @function [parent=#Camera] isThirdPersonOffsetControlEnabled
-        isThirdPersonOffsetControlEnabled = function() return third_person.noOffsetControl == 0 end,
-        --- @function [parent=#Camera] disableThirdPersonOffsetControl
-        disableThirdPersonOffsetControl = function() third_person.noOffsetControl = third_person.noOffsetControl + 1 end,
-        --- @function [parent=#Camera] enableThirdPersonOffsetControl
-        enableThirdPersonOffsetControl = function() third_person.noOffsetControl = math.max(0, third_person.noOffsetControl - 1) end,
+        --- Whether the the third person offset can be changed by the built-in camera script.
+        -- @function [parent=#Camera] isThirdPersonOffsetControlEnabled
+        -- @return #boolean
+        isThirdPersonOffsetControlEnabled = function() return not next(third_person.noOffsetControl) end,
+        --- Disable with (optional) tag until the corresponding enable function is called with the same tag.
+        -- @function [parent=#Camera] disableThirdPersonOffsetControl
+        -- @param #string tag (optional, empty string by default) Will be disabled until the enabling function is called with the same tag
+        disableThirdPersonOffsetControl = function(tag) third_person.noOffsetControl[tag or ''] = true end,
+        --- Undo disableThirdPersonOffsetControl
+        -- @function [parent=#Camera] enableThirdPersonOffsetControl
+        -- @param #string tag (optional, empty string by default)
+        enableThirdPersonOffsetControl = function(tag) third_person.noOffsetControl[tag or ''] = nil end,
     },
     engineHandlers = {
         onUpdate = onUpdate,
         onFrame = onFrame,
-        onInputAction = function(action)
-            if core.isWorldPaused() then return end
-            if action == input.ACTION.ZoomIn then
-                zoom(10)
-            elseif action == input.ACTION.ZoomOut then
-                zoom(-10)
-            end
-            move360.onInputAction(action)
-        end,
         onTeleported = function()
             camera.instantTransition()
         end,
@@ -289,7 +339,7 @@ return {
             if data and data.distance then third_person.baseDistance = data.distance end
         end,
         onSave = function()
-            return {version = 0, distance = third_person.baseDistance}
+            return { version = 0, distance = third_person.baseDistance }
         end,
     },
 }
diff --git a/files/data/scripts/omw/camera/head_bobbing.lua b/files/data/scripts/omw/camera/head_bobbing.lua
index 8972364ebb..c5402ee3dc 100644
--- a/files/data/scripts/omw/camera/head_bobbing.lua
+++ b/files/data/scripts/omw/camera/head_bobbing.lua
@@ -2,12 +2,13 @@ local camera = require('openmw.camera')
 local self = require('openmw.self')
 local util = require('openmw.util')
 local async = require('openmw.async')
+local storage = require('openmw.storage')
 
 local Actor = require('openmw.types').Actor
 
 local M = {}
 
-local settings = require('scripts.omw.camera.settings').headBobbing
+local settings = storage.playerSection('SettingsOMWCameraHeadBobbing')
 
 local doubleStepLength, stepHeight, maxRoll
 
@@ -31,7 +32,7 @@ local arcHeight = sampleArc(1)
 
 function M.update(dt, smoothedSpeed)
     local speed = Actor.getCurrentSpeed(self)
-    speed = speed / (1 + speed / 500)  -- limit bobbing frequency if the speed is very high
+    speed = speed / (1 + speed / 500) -- limit bobbing frequency if the speed is very high
     totalMovement = totalMovement + speed * dt
     if not M.enabled or camera.getMode() ~= camera.MODE.FirstPerson then
         effectWeight = 0
@@ -44,18 +45,17 @@ function M.update(dt, smoothedSpeed)
     end
 
     local doubleStepState = totalMovement / doubleStepLength
-    doubleStepState = doubleStepState - math.floor(doubleStepState)  -- from 0 to 1 during 2 steps
-    local stepState = math.abs(doubleStepState * 4 - 2) - 1  -- from -1 to 1 on even steps and from 1 to -1 on odd steps
-    local effect = sampleArc(stepState) / arcHeight  -- range from 0 to 1
+    doubleStepState = doubleStepState - math.floor(doubleStepState) -- from 0 to 1 during 2 steps
+    local stepState = math.abs(doubleStepState * 4 - 2) - 1         -- from -1 to 1 on even steps and from 1 to -1 on odd steps
+    local effect = sampleArc(stepState) / arcHeight                 -- range from 0 to 1
 
     -- Smoothly reduce the effect to zero when the player stops
     local coef = math.min(smoothedSpeed / 300, 1) * effectWeight
 
-    local zOffset = (0.5 - effect) * coef * stepHeight  -- range from -stepHeight/2 to stepHeight/2
-    local roll = ((stepState > 0 and 1) or -1) * effect * coef * maxRoll  -- range from -maxRoll to maxRoll
+    local zOffset = (0.5 - effect) * coef * stepHeight                   -- range from -stepHeight/2 to stepHeight/2
+    local roll = ((stepState > 0 and 1) or -1) * effect * coef * maxRoll -- range from -maxRoll to maxRoll
     camera.setFirstPersonOffset(camera.getFirstPersonOffset() + util.vector3(0, 0, zOffset))
     camera.setExtraRoll(camera.getExtraRoll() + roll)
 end
 
 return M
-
diff --git a/files/data/scripts/omw/camera/move360.lua b/files/data/scripts/omw/camera/move360.lua
index 76ee3be9d6..aec171d102 100644
--- a/files/data/scripts/omw/camera/move360.lua
+++ b/files/data/scripts/omw/camera/move360.lua
@@ -6,6 +6,7 @@ local util = require('openmw.util')
 local I = require('openmw.interfaces')
 
 local Actor = require('openmw.types').Actor
+local Player = require('openmw.types').Player
 
 local MODE = camera.MODE
 
@@ -29,6 +30,27 @@ local function turnOff()
     end
 end
 
+local function processZoom3rdPerson()
+    if
+        not Player.getControlSwitch(self, Player.CONTROL_SWITCH.ViewMode) or
+        not Player.getControlSwitch(self, Player.CONTROL_SWITCH.Controls) or
+        input.getBooleanActionValue('TogglePOV') or
+        not I.Camera.isModeControlEnabled() or
+        not I.Camera.isZoomEnabled()
+    then
+        return
+    end
+    local Zoom3rdPerson = input.getNumberActionValue('Zoom3rdPerson')
+    if Zoom3rdPerson > 0 and camera.getMode() == MODE.Preview
+        and I.Camera.getBaseThirdPersonDistance() == 30 then
+        self.controls.yawChange = camera.getYaw() - self.rotation:getYaw()
+        camera.setMode(MODE.FirstPerson)
+    elseif Zoom3rdPerson < 0 and camera.getMode() == MODE.FirstPerson then
+        camera.setMode(MODE.Preview)
+        I.Camera.setBaseThirdPersonDistance(30)
+    end
+end
+
 function M.onFrame(dt)
     if core.isWorldPaused() then return end
     local newActive = M.enabled and Actor.getStance(self) == Actor.STANCE.Nothing
@@ -38,9 +60,10 @@ function M.onFrame(dt)
         turnOff()
     end
     if not active then return end
+    processZoom3rdPerson()
     if camera.getMode() == MODE.Static then return end
     if camera.getMode() == MODE.ThirdPerson then camera.setMode(MODE.Preview) end
-    if camera.getMode() == MODE.Preview and not input.isActionPressed(input.ACTION.TogglePOV) then
+    if camera.getMode() == MODE.Preview and not input.getBooleanActionValue('TogglePOV') then
         camera.showCrosshair(camera.getFocalPreferredOffset():length() > 5)
         local move = util.vector2(self.controls.sideMovement, self.controls.movement)
         local yawDelta = camera.getYaw() - self.rotation:getYaw()
@@ -58,22 +81,4 @@ function M.onFrame(dt)
     end
 end
 
-function M.onInputAction(action)
-    if not active or core.isWorldPaused() or
-       not input.getControlSwitch(input.CONTROL_SWITCH.ViewMode) or
-       not input.getControlSwitch(input.CONTROL_SWITCH.Controls) or
-       input.isActionPressed(input.ACTION.TogglePOV) or
-       not I.Camera.isModeControlEnabled() then
-        return
-    end
-    if action == input.ACTION.ZoomIn and camera.getMode() == MODE.Preview
-       and I.Camera.getBaseThirdPersonDistance() == 30 then
-        self.controls.yawChange = camera.getYaw() - self.rotation:getYaw()
-        camera.setMode(MODE.FirstPerson)
-    elseif action == input.ACTION.ZoomOut and camera.getMode() == MODE.FirstPerson then
-        camera.setMode(MODE.Preview)
-        I.Camera.setBaseThirdPersonDistance(30)
-    end
-end
-
 return M
diff --git a/files/data/scripts/omw/camera/settings.lua b/files/data/scripts/omw/camera/settings.lua
index be95ce586c..8d1d51f4a8 100644
--- a/files/data/scripts/omw/camera/settings.lua
+++ b/files/data/scripts/omw/camera/settings.lua
@@ -3,10 +3,10 @@ local async = require('openmw.async')
 local I = require('openmw.interfaces')
 
 I.Settings.registerPage({
-  key = 'OMWCamera',
-  l10n = 'OMWCamera',
-  name = 'Camera',
-  description = 'settingsPageDescription',
+    key = 'OMWCamera',
+    l10n = 'OMWCamera',
+    name = 'Camera',
+    description = 'settingsPageDescription',
 })
 
 local thirdPersonGroup = 'SettingsOMWCameraThirdPerson'
@@ -16,8 +16,8 @@ local function boolSetting(prefix, key, default)
     return {
         key = key,
         renderer = 'checkbox',
-        name = prefix..key,
-        description = prefix..key..'Description',
+        name = prefix .. key,
+        description = prefix .. key .. 'Description',
         default = default,
     }
 end
@@ -26,8 +26,8 @@ local function floatSetting(prefix, key, default)
     return {
         key = key,
         renderer = 'number',
-        name = prefix..key,
-        description = prefix..key..'Description',
+        name = prefix .. key,
+        description = prefix .. key .. 'Description',
         default = default,
     }
 end
@@ -70,33 +70,29 @@ I.Settings.registerGroup({
     },
 })
 
-local settings = {
-    thirdPerson = storage.playerSection(thirdPersonGroup),
-    headBobbing = storage.playerSection(headBobbingGroup),
-}
+local thirdPerson = storage.playerSection(thirdPersonGroup)
+local headBobbing = storage.playerSection(headBobbingGroup)
 
 local function updateViewOverShoulderDisabled()
-    local shoulderDisabled = not settings.thirdPerson:get('viewOverShoulder')
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetX', {disabled = shoulderDisabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetY', {disabled = shoulderDisabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'autoSwitchShoulder', {disabled = shoulderDisabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'zoomOutWhenMoveCoef', {disabled = shoulderDisabled})
+    local shoulderDisabled = not thirdPerson:get('viewOverShoulder')
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetX', { disabled = shoulderDisabled })
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetY', { disabled = shoulderDisabled })
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'autoSwitchShoulder', { disabled = shoulderDisabled })
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'zoomOutWhenMoveCoef', { disabled = shoulderDisabled })
 
-    local move360Disabled = not settings.thirdPerson:get('move360')
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'move360TurnSpeed', {disabled = move360Disabled})
+    local move360Disabled = not thirdPerson:get('move360')
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'move360TurnSpeed', { disabled = move360Disabled })
 end
 
 local function updateHeadBobbingDisabled()
-    local disabled = not settings.headBobbing:get('enabled')
-    I.Settings.updateRendererArgument(headBobbingGroup, 'step', {disabled = disabled, min = 1})
-    I.Settings.updateRendererArgument(headBobbingGroup, 'height', {disabled = disabled})
-    I.Settings.updateRendererArgument(headBobbingGroup, 'roll', {disabled = disabled, min = 0, max = 90})
+    local disabled = not headBobbing:get('enabled')
+    I.Settings.updateRendererArgument(headBobbingGroup, 'step', { disabled = disabled, min = 1 })
+    I.Settings.updateRendererArgument(headBobbingGroup, 'height', { disabled = disabled })
+    I.Settings.updateRendererArgument(headBobbingGroup, 'roll', { disabled = disabled, min = 0, max = 90 })
 end
 
 updateViewOverShoulderDisabled()
 updateHeadBobbingDisabled()
 
-settings.thirdPerson:subscribe(async:callback(updateViewOverShoulderDisabled))
-settings.headBobbing:subscribe(async:callback(updateHeadBobbingDisabled))
-
-return settings
+thirdPerson:subscribe(async:callback(updateViewOverShoulderDisabled))
+headBobbing:subscribe(async:callback(updateHeadBobbingDisabled))
diff --git a/files/data/scripts/omw/camera/third_person.lua b/files/data/scripts/omw/camera/third_person.lua
index 66fdef7bf4..9d5004349a 100644
--- a/files/data/scripts/omw/camera/third_person.lua
+++ b/files/data/scripts/omw/camera/third_person.lua
@@ -3,10 +3,11 @@ local util = require('openmw.util')
 local self = require('openmw.self')
 local nearby = require('openmw.nearby')
 local async = require('openmw.async')
+local storage = require('openmw.storage')
 
 local Actor = require('openmw.types').Actor
 
-local settings = require('scripts.omw.camera.settings').thirdPerson
+local settings = storage.playerSection('SettingsOMWCameraThirdPerson')
 
 local MODE = camera.MODE
 local STATE = { RightShoulder = 0, LeftShoulder = 1, Combat = 2, Swimming = 3 }
@@ -15,7 +16,7 @@ local M = {
     baseDistance = 192,
     preferredDistance = 0,
     standingPreview = false,
-    noOffsetControl = 0,
+    noOffsetControl = {},
 }
 
 local viewOverShoulder, autoSwitchShoulder
@@ -31,7 +32,7 @@ local function updateSettings()
     viewOverShoulder = settings:get('viewOverShoulder')
     autoSwitchShoulder = settings:get('autoSwitchShoulder')
     shoulderOffset = util.vector2(settings:get('shoulderOffsetX'),
-                                  settings:get('shoulderOffsetY'))
+        settings:get('shoulderOffsetY'))
     zoomOutWhenMoveCoef = settings:get('zoomOutWhenMoveCoef')
 
     defaultShoulder = (shoulderOffset.x > 0 and STATE.RightShoulder) or STATE.LeftShoulder
@@ -46,7 +47,7 @@ local state = defaultShoulder
 
 local function ray(from, angle, limit)
     local to = from + util.transform.rotateZ(angle) * util.vector3(0, limit, 0)
-    local res = nearby.castRay(from, to, {collisionType = camera.getCollisionType()})
+    local res = nearby.castRay(from, to, { collisionType = camera.getCollisionType() })
     if res.hit then
         return (res.hitPos - from):length()
     else
@@ -55,8 +56,8 @@ local function ray(from, angle, limit)
 end
 
 local function trySwitchShoulder()
-    local limitToSwitch = 120  -- switch to other shoulder if wall is closer than this limit
-    local limitToSwitchBack = 300  -- switch back to default shoulder if there is no walls at this distance
+    local limitToSwitch = 120     -- switch to other shoulder if wall is closer than this limit
+    local limitToSwitchBack = 300 -- switch back to default shoulder if there is no walls at this distance
 
     local pos = camera.getTrackedPosition()
     local rayRight = ray(pos, camera.getYaw() + math.rad(90), limitToSwitchBack + 1)
@@ -79,7 +80,7 @@ end
 local function calculateDistance(smoothedSpeed)
     local smoothedSpeedSqr = smoothedSpeed * smoothedSpeed
     return (M.baseDistance + math.max(camera.getPitch(), 0) * 50
-            + smoothedSpeedSqr / (smoothedSpeedSqr + 300*300) * zoomOutWhenMoveCoef)
+        + smoothedSpeedSqr / (smoothedSpeedSqr + 300 * 300) * zoomOutWhenMoveCoef)
 end
 
 local function updateState()
@@ -95,7 +96,7 @@ local function updateState()
         state = defaultShoulder
     end
     if (mode == MODE.ThirdPerson or Actor.getCurrentSpeed(self) > 0 or state ~= oldState or noThirdPersonLastFrame)
-       and (state == STATE.LeftShoulder or state == STATE.RightShoulder) then
+        and (state == STATE.LeftShoulder or state == STATE.RightShoulder) then
         if autoSwitchShoulder then
             trySwitchShoulder()
         else
@@ -108,11 +109,11 @@ local function updateState()
             -- Player doesn't touch controls for a long time. Transition should be very slow.
             camera.setFocalTransitionSpeed(0.2)
         elseif (oldState == STATE.Combat or state == STATE.Combat) and
-               (mode ~= MODE.Preview or M.standingPreview) then
+            (mode ~= MODE.Preview or M.standingPreview) then
             -- Transition to/from combat mode and we are not in preview mode. Should be fast.
             camera.setFocalTransitionSpeed(5.0)
         else
-            camera.setFocalTransitionSpeed(1.0)  -- Default transition speed.
+            camera.setFocalTransitionSpeed(1.0) -- Default transition speed.
         end
 
         if state == STATE.RightShoulder then
@@ -142,14 +143,14 @@ function M.update(dt, smoothedSpeed)
         return
     end
 
-    if M.noOffsetControl == 0 then
+    if not next(M.noOffsetControl) then
         updateState()
     else
         state = nil
     end
 
     M.preferredDistance = calculateDistance(smoothedSpeed)
-    if noThirdPersonLastFrame then  -- just switched to third person view
+    if noThirdPersonLastFrame then -- just switched to third person view
         camera.setPreferredThirdPersonDistance(M.preferredDistance)
         camera.instantTransition()
         noThirdPersonLastFrame = false
@@ -161,4 +162,3 @@ function M.update(dt, smoothedSpeed)
 end
 
 return M
-
diff --git a/files/data/scripts/omw/console/global.lua b/files/data/scripts/omw/console/global.lua
index e3b4375b1e..0ec557b376 100644
--- a/files/data/scripts/omw/console/global.lua
+++ b/files/data/scripts/omw/console/global.lua
@@ -22,9 +22,14 @@ local env = {
     storage = require('openmw.storage'),
     core = require('openmw.core'),
     types = require('openmw.types'),
+    vfs = require('openmw.vfs'),
+    markup = require('openmw.markup'),
     async = require('openmw.async'),
     world = require('openmw.world'),
     aux_util = require('openmw_aux.util'),
+    calendar = require('openmw_aux.calendar'),
+    time = require('openmw_aux.time'),
+    anim = require('openmw.animation'),
     view = require('openmw_aux.util').deepToString,
     print = printToConsole,
     exit = function() player:sendEvent('OMWConsoleExit') end,
diff --git a/files/data/scripts/omw/console/local.lua b/files/data/scripts/omw/console/local.lua
index adcad3d6cb..050535f6ef 100644
--- a/files/data/scripts/omw/console/local.lua
+++ b/files/data/scripts/omw/console/local.lua
@@ -24,10 +24,15 @@ local env = {
     storage = require('openmw.storage'),
     core = require('openmw.core'),
     types = require('openmw.types'),
+    vfs = require('openmw.vfs'),
+    markup = require('openmw.markup'),
     async = require('openmw.async'),
     nearby = require('openmw.nearby'),
     self = require('openmw.self'),
     aux_util = require('openmw_aux.util'),
+    anim = require('openmw.animation'),
+    calendar = require('openmw_aux.calendar'),
+    time = require('openmw_aux.time'),
     view = require('openmw_aux.util').deepToString,
     print = printToConsole,
     exit = function() player:sendEvent('OMWConsoleExit') end,
diff --git a/files/data/scripts/omw/console/menu.lua b/files/data/scripts/omw/console/menu.lua
new file mode 100644
index 0000000000..eacf7f8b6c
--- /dev/null
+++ b/files/data/scripts/omw/console/menu.lua
@@ -0,0 +1,118 @@
+local menu = require('openmw.menu')
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+
+local menuModeName = 'Lua[Menu]'
+
+local function printHelp()
+    local msg = [[
+This is the built-in Lua interpreter.
+help() - print this message
+exit() - exit Lua mode
+view(_G) - print content of the table `_G` (current environment)
+    standard libraries (math, string, etc.) are loaded by default but not visible in `_G`
+view(menu, 2) - print table `menu` (i.e. `openmw.menu`) and its subtables (2 - traversal depth)]]
+    ui.printToConsole(msg, ui.CONSOLE_COLOR.Info)
+end
+
+local function printToConsole(...)
+    local strs = {}
+    for i = 1, select('#', ...) do
+        strs[i] = tostring(select(i, ...))
+    end
+    return ui.printToConsole(table.concat(strs, '\t'), ui.CONSOLE_COLOR.Info)
+end
+
+local function printRes(...)
+    if select('#', ...) >= 0 then
+        printToConsole(...)
+    end
+end
+
+local function exitLuaMenuMode()
+    ui.setConsoleMode('')
+    ui.printToConsole('Lua mode OFF', ui.CONSOLE_COLOR.Success)
+end
+
+local function enterLuaMenuMode()
+    ui.printToConsole('Lua mode ON, use exit() to return, help() for more info', ui.CONSOLE_COLOR.Success)
+    ui.printToConsole('Context: Menu', ui.CONSOLE_COLOR.Success)
+    ui.setConsoleMode(menuModeName)
+end
+
+local env = {
+    I = require('openmw.interfaces'),
+    menu = require('openmw.menu'),
+    util = require('openmw.util'),
+    core = require('openmw.core'),
+    storage = require('openmw.storage'),
+    vfs = require('openmw.vfs'),
+    markup = require('openmw.markup'),
+    ambient = require('openmw.ambient'),
+    async = require('openmw.async'),
+    ui = require('openmw.ui'),
+    input = require('openmw.input'),
+    aux_util = require('openmw_aux.util'),
+    calendar = require('openmw_aux.calendar'),
+    time = require('openmw_aux.time'),
+    view = require('openmw_aux.util').deepToString,
+    print = printToConsole,
+    exit = exitLuaMenuMode,
+    help = printHelp,
+}
+env._G = env
+setmetatable(env, {__index = _G, __metatable = false})
+_G = nil
+
+local function executeLuaCode(code)
+    local fn
+    local ok, err = pcall(function() fn = util.loadCode('return ' .. code, env) end)
+    if ok then
+        ok, err = pcall(function() printRes(fn()) end)
+    else
+        ok, err = pcall(function() util.loadCode(code, env)() end)
+    end
+    if not ok then
+        ui.printToConsole(err, ui.CONSOLE_COLOR.Error)
+    end
+end
+
+local usageInfo = [[
+Usage: 'lua menu' or 'luam' - enter menu context
+Other contexts are available only when the game is started:
+       'lua player' or 'luap' - enter player context
+       'lua global' or 'luag' - enter global context
+       'lua selected' or 'luas' - enter local context on the selected object]]
+
+local function onConsoleCommand(mode, cmd)
+    if mode == '' then
+        cmd, arg = cmd:lower():match('(%w+) *(%w*)')
+        if (cmd == 'lua' and arg == 'menu') or cmd == 'luam' then
+            enterLuaMenuMode()
+        elseif menu.getState() == menu.STATE.NoGame and (cmd == 'lua' or cmd == 'luap' or cmd == 'luas' or cmd == 'luag') then
+            ui.printToConsole(usageInfo, ui.CONSOLE_COLOR.Info)
+        end
+    elseif mode == menuModeName then
+        if cmd == 'exit()' then
+            exitLuaMenuMode()
+        else
+            executeLuaCode(cmd)
+        end
+    end
+end
+
+local function onStateChanged()
+    local mode = ui.getConsoleMode()
+    if menu.getState() ~= menu.STATE.Ended and mode ~= menuModeName then
+        -- When a new game started or loaded reset console mode (except of `luam`) because
+        -- other modes become invalid after restarting Lua scripts.
+        ui.setConsoleMode('')
+    end
+end
+
+return {
+    engineHandlers = {
+        onConsoleCommand = onConsoleCommand,
+        onStateChanged = onStateChanged,
+    },
+}
diff --git a/files/data/scripts/omw/console/player.lua b/files/data/scripts/omw/console/player.lua
index 464482e7ad..fff9c6d4d3 100644
--- a/files/data/scripts/omw/console/player.lua
+++ b/files/data/scripts/omw/console/player.lua
@@ -71,14 +71,21 @@ local env = {
     storage = require('openmw.storage'),
     core = require('openmw.core'),
     types = require('openmw.types'),
+    vfs = require('openmw.vfs'),
+    markup = require('openmw.markup'),
+    ambient = require('openmw.ambient'),
     async = require('openmw.async'),
     nearby = require('openmw.nearby'),
     self = require('openmw.self'),
     input = require('openmw.input'),
+    postprocessing = require('openmw.postprocessing'),
+    anim = require('openmw.animation'),
     ui = require('openmw.ui'),
     camera = require('openmw.camera'),
     aux_util = require('openmw_aux.util'),
     debug = require('openmw.debug'),
+    calendar = require('openmw_aux.calendar'),
+    time = require('openmw_aux.time'),
     view = require('openmw_aux.util').deepToString,
     print = printToConsole,
     exit = exitLuaMode,
@@ -112,9 +119,12 @@ local function onConsoleCommand(mode, cmd, selectedObject)
                 cmd = 'luag'
             elseif arg == 'selected' then
                 cmd = 'luas'
+            elseif arg == 'menu' then
+                -- handled in menu.lua
             else
                 local msg = [[
-Usage: 'lua player' or 'luap' - enter player context
+Usage: 'lua menu' or 'luam' - enter menu context
+       'lua player' or 'luap' - enter player context
        'lua global' or 'luag' - enter global context
        'lua selected' or 'luas' - enter local context on the selected object]]
                 ui.printToConsole(msg, ui.CONSOLE_COLOR.Info)
@@ -156,4 +166,3 @@ return {
         OMWConsoleHelp = printHelp,
     }
 }
-
diff --git a/files/data/scripts/omw/crimes.lua b/files/data/scripts/omw/crimes.lua
new file mode 100644
index 0000000000..58e043964b
--- /dev/null
+++ b/files/data/scripts/omw/crimes.lua
@@ -0,0 +1,63 @@
+local types = require('openmw.types')
+local I = require('openmw.interfaces')
+
+---
+-- Table with information needed to commit crimes.
+-- @type CommitCrimeInputs
+-- @field openmw.core#GameObject victim The victim of the crime (optional)
+-- @field openmw.types#OFFENSE_TYPE type The type of the crime to commit. See @{openmw.types#OFFENSE_TYPE} (required)
+-- @field #string faction ID of the faction the crime is committed against (optional)
+-- @field #number arg The amount to increase the player bounty by, if the crime type is theft. Ignored otherwise (optional, defaults to 0)
+-- @field #boolean victimAware Whether the victim is aware of the crime (optional, defaults to false)
+
+---
+-- Table containing information returned by the engine after committing a crime
+-- @type CommitCrimeOutputs
+-- @field #boolean wasCrimeSeen Whether the crime was seen
+
+return {
+    interfaceName = 'Crimes',
+    ---
+    -- Allows to utilize built-in crime mechanics.
+    -- @module Crimes
+    -- @usage require('openmw.interfaces').Crimes
+    interface = {
+        --- Interface version
+        -- @field [parent=#Crimes] #number version
+        version = 1,
+
+        ---
+        -- Commits a crime as if done through an in-game action. Can only be used in global context.
+        -- @function [parent=#Crimes] commitCrime
+        -- @param openmw.core#GameObject player The player committing the crime
+        -- @param CommitCrimeInputs options A table of parameters describing the committed crime
+        -- @return CommitCrimeOutputs A table containing information about the committed crime
+        commitCrime = function(player, options)
+            assert(types.Player.objectIsInstance(player), "commitCrime requires a player game object")
+
+            local returnTable = {}
+            local options = options or {}
+
+            assert(type(options.faction) == "string" or options.faction == nil,
+                "faction id passed to commitCrime must be a string or nil")
+            assert(type(options.arg) == "number" or options.arg == nil,
+                "arg value passed to commitCrime must be a number or nil")
+            assert(type(options.victimAware) == "number" or options.victimAware == nil,
+                "victimAware value passed to commitCrime must be a boolean or nil")
+
+            assert(options.type ~= nil, "crime type passed to commitCrime cannot be nil")
+            assert(type(options.type) == "number", "crime type passed to commitCrime must be a number")
+
+            assert(options.victim == nil or types.NPC.objectIsInstance(options.victim),
+                "victim passed to commitCrime must be an NPC or nil")
+
+            returnTable.wasCrimeSeen = types.Player._runStandardCommitCrime(player, options.victim, options.type,
+                options.faction or "",
+                options.arg or 0, options.victimAware or false)
+            return returnTable
+        end,
+    },
+    eventHandlers = {
+        CommitCrime = function(data) I.Crimes.commitCrime(data.player, data) end,
+    }
+}
diff --git a/files/data/scripts/omw/input/actionbindings.lua b/files/data/scripts/omw/input/actionbindings.lua
new file mode 100644
index 0000000000..741376bc75
--- /dev/null
+++ b/files/data/scripts/omw/input/actionbindings.lua
@@ -0,0 +1,261 @@
+local input = require('openmw.input')
+local util = require('openmw.util')
+local async = require('openmw.async')
+local storage = require('openmw.storage')
+
+local actionPressHandlers = {}
+local function onActionPress(id, handler)
+    actionPressHandlers[id] = actionPressHandlers[id] or {}
+    table.insert(actionPressHandlers[id], handler)
+end
+
+local function bindHold(key, actionId)
+    input.bindAction(key, async:callback(function()
+        return input.isActionPressed(actionId)
+    end), {})
+end
+
+local function bindMovement(key, actionId, axisId, direction)
+    input.bindAction(key, async:callback(function()
+        local actionActive = input.isActionPressed(actionId)
+        local axisActive = input.getAxisValue(axisId) * direction > 0
+        return (actionActive or axisActive) and 1 or 0
+    end), {})
+end
+
+local function bindTrigger(key, actionid)
+    onActionPress(actionid, function()
+        input.activateTrigger(key)
+    end)
+end
+
+do -- Actions and Triggers currently unused by builtin scripts
+    -- TODO: as more mechanics are dehardcoded, move these declarations to relevant files
+    local triggers = {
+        Activate = input.ACTION.Activate,
+        Console = input.ACTION.Console,
+        CycleSpellLeft = input.ACTION.CycleSpellLeft,
+        CycleSpellRight = input.ACTION.CycleSpellRight,
+        CycleWeaponLeft = input.ACTION.CycleWeaponLeft,
+        CycleWeaponRight = input.ACTION.CycleWeaponRight,
+        GameMenu = input.ACTION.GameMenu,
+        QuickLoad = input.ACTION.QuickLoad,
+        QuickSave = input.ACTION.QuickSave,
+        Screenshot = input.ACTION.Screenshot,
+        ToggleDebug = input.ACTION.ToggleDebug,
+        ToggleHUD = input.ACTION.ToggleHUD,
+        TogglePostProcessorHUD = input.ACTION.ToggleHUD,
+    }
+    for i = 1, 9 do
+        local key = string.format('QuickKey%s', i)
+        triggers[key] = input.ACTION[key]
+    end
+    for  key, action in pairs(triggers) do
+        input.registerTrigger {
+            key = key,
+            l10n = 'OMWControls',
+            name = key .. '_name',
+            description = key .. '_description',
+        }
+        bindTrigger(key, action)
+    end
+end
+
+bindTrigger('AlwaysRun', input.ACTION.AlwaysRun)
+bindTrigger('ToggleSneak', input.ACTION.Sneak)
+bindTrigger('ToggleWeapon', input.ACTION.ToggleWeapon)
+bindTrigger('ToggleSpell', input.ACTION.ToggleSpell)
+bindTrigger('Jump', input.ACTION.Jump)
+bindTrigger('AutoMove', input.ACTION.AutoMove)
+bindTrigger('Inventory', input.ACTION.Inventory)
+bindTrigger('Journal', input.ACTION.Journal)
+bindTrigger('QuickKeysMenu', input.ACTION.QuickKeysMenu)
+
+bindHold('TogglePOV', input.ACTION.TogglePOV)
+bindHold('Sneak', input.ACTION.Sneak)
+
+bindHold('Run', input.ACTION.Run)
+input.bindAction('Run', async:callback(function(_, value)
+    local controllerInput = util.vector2(
+        input.getAxisValue(input.CONTROLLER_AXIS.MoveForwardBackward),
+        input.getAxisValue(input.CONTROLLER_AXIS.MoveLeftRight)
+    ):length2()
+    return value or controllerInput > 0.25
+end), {})
+
+input.bindAction('Use', async:callback(function()
+    -- The value "0.6" shouldn't exceed the triggering threshold in BindingsManager::actionValueChanged.
+    -- TODO: Move more logic from BindingsManager to Lua and consider to make this threshold configurable.
+    return input.isActionPressed(input.ACTION.Use) or input.getAxisValue(input.CONTROLLER_AXIS.TriggerRight) >= 0.6
+end), {})
+
+bindMovement('MoveBackward', input.ACTION.MoveBackward, input.CONTROLLER_AXIS.MoveForwardBackward, 1)
+bindMovement('MoveForward', input.ACTION.MoveForward, input.CONTROLLER_AXIS.MoveForwardBackward, -1)
+bindMovement('MoveRight', input.ACTION.MoveRight, input.CONTROLLER_AXIS.MoveLeftRight, 1)
+bindMovement('MoveLeft', input.ACTION.MoveLeft, input.CONTROLLER_AXIS.MoveLeftRight, -1)
+
+do
+    local zoomInOut = 0
+    onActionPress(input.ACTION.ZoomIn, function()
+        zoomInOut = zoomInOut + 1
+    end)
+    onActionPress(input.ACTION.ZoomOut, function()
+        zoomInOut = zoomInOut - 1
+    end)
+    input.bindAction('Zoom3rdPerson', async:callback(function(dt, _, togglePOV)
+        local Zoom3rdPerson = zoomInOut * 10
+        if togglePOV then
+            local triggerLeft = input.getAxisValue(input.CONTROLLER_AXIS.TriggerLeft)
+            local triggerRight = input.getAxisValue(input.CONTROLLER_AXIS.TriggerRight)
+            local controllerZoom = (triggerRight - triggerLeft) * 100 * dt
+            Zoom3rdPerson = Zoom3rdPerson + controllerZoom
+        end
+        zoomInOut = 0
+        return Zoom3rdPerson
+    end), { 'TogglePOV' })
+end
+
+local bindingSection = storage.playerSection('OMWInputBindings')
+
+local devices = {
+    keyboard = true,
+    mouse = true,
+    controller = true
+}
+
+local function invalidBinding(binding)
+    if not binding.key then
+        return 'has no key'
+    elseif binding.type ~= 'action' and binding.type ~= 'trigger' then
+        return string.format('has invalid type', binding.type)
+    elseif binding.type == 'action' and not input.actions[binding.key] then
+        return string.format("action %s doesn't exist", binding.key)
+    elseif binding.type == 'trigger' and not input.triggers[binding.key] then
+        return string.format("trigger %s doesn't exist", binding.key)
+    elseif not binding.device or not devices[binding.device] then
+        return string.format("invalid device %s", binding.device)
+    elseif not binding.button then
+        return 'has no button'
+    end
+end
+
+local boundActions = {}
+local actionBindings = {}
+
+local function bindAction(binding, id)
+    local action = binding.key
+    actionBindings[action] = actionBindings[action] or {}
+    actionBindings[action][id] = binding
+    if not boundActions[action] then
+        boundActions[binding.key] = true
+        input.bindAction(action, async:callback(function()
+            for _, binding in pairs(actionBindings[action] or {}) do
+                if binding.device == 'keyboard' then
+                    if input.isKeyPressed(binding.button) then
+                        return true
+                    end
+                elseif binding.device == 'mouse' then
+                    if input.isMouseButtonPressed(binding.button) then
+                        return true
+                    end
+                elseif binding.device == 'controller' then
+                    if input.isControllerButtonPressed(binding.button) then
+                        return true
+                    end
+                end
+            end
+            return false
+        end), {})
+    end
+end
+
+local triggerBindings = {}
+for device in pairs(devices) do triggerBindings[device] = {} end
+
+local function bindTrigger(binding, id)
+    local deviceBindings = triggerBindings[binding.device]
+    deviceBindings[binding.button] = deviceBindings[binding.button] or {}
+    deviceBindings[binding.button][id] = binding
+end
+
+local function registerBinding(binding, id)
+    local invalid = invalidBinding(binding)
+    if invalid then
+        print(string.format('Skipping invalid binding %s: %s', id, invalid))
+    elseif binding.type == 'action' then
+        bindAction(binding, id)
+    elseif binding.type == 'trigger' then
+        bindTrigger(binding, id)
+    end
+end
+
+function clearBinding(id)
+    for _, deviceBindings in pairs(triggerBindings) do
+        for _, buttonBindings in pairs(deviceBindings) do
+            buttonBindings[id] = nil
+        end
+    end
+
+    for _, bindings in pairs(actionBindings) do
+        bindings[id] = nil
+    end
+end
+
+bindingSection:subscribe(async:callback(function(_, id)
+    if not id then return end
+    local binding = bindingSection:get(id)
+    clearBinding(id)
+    if binding ~= nil then
+        registerBinding(binding, id)
+    end
+    return id
+end))
+
+
+local initiated = false
+
+local function init()
+    for id, binding in pairs(bindingSection:asTable()) do
+        registerBinding(binding, id)
+    end
+end
+
+return {
+    engineHandlers = {
+        onFrame = function()
+            if not initiated then
+                initiated = true
+                init()
+            end
+        end,
+        onInputAction = function(id)
+            if not actionPressHandlers[id] then
+                return
+            end
+            for _, handler in ipairs(actionPressHandlers[id]) do
+                handler()
+            end
+        end,
+        onKeyPress = function(e)
+            local buttonTriggers = triggerBindings.keyboard[e.code]
+            if not buttonTriggers then return end
+            for _, binding in pairs(buttonTriggers) do
+                input.activateTrigger(binding.key)
+            end
+        end,
+        onMouseButtonPress = function(button)
+            local buttonTriggers = triggerBindings.mouse[button]
+            if not buttonTriggers then return end
+            for _, binding in pairs(buttonTriggers) do
+                input.activateTrigger(binding.key)
+            end
+        end,
+        onControllerButtonPress = function(id)
+            local buttonTriggers = triggerBindings.controller[id]
+            if not buttonTriggers then return end
+            for _, binding in pairs(buttonTriggers) do
+                input.activateTrigger(binding.key)
+            end
+        end,
+    }
+}
diff --git a/files/data/scripts/omw/input/gamepadcontrols.lua b/files/data/scripts/omw/input/gamepadcontrols.lua
new file mode 100644
index 0000000000..b55b806b4a
--- /dev/null
+++ b/files/data/scripts/omw/input/gamepadcontrols.lua
@@ -0,0 +1,29 @@
+local input = require('openmw.input')
+
+return {
+
+    interfaceName = 'GamepadControls',
+    ---
+    -- Gamepad control interface
+    -- @module GamepadControls
+
+    interface = {
+        --- Interface version
+        -- @field [parent=#GamepadControls] #number version
+        version = 0,
+
+        --- Checks if the gamepad cursor is active. If it is active, the left stick can move the cursor, and A will be interpreted as a mouse click.
+        -- @function [parent=#GamepadControls] isGamepadCursorActive
+        -- @return #boolean
+        isGamepadCursorActive = function()
+            return input._isGamepadCursorActive()
+        end,
+
+        --- Sets if the gamepad cursor is active. If it is active, the left stick can move the cursor, and A will be interpreted as a mouse click.
+        -- @function [parent=#GamepadControls] setGamepadCursorActive
+        -- @param #boolean value
+        setGamepadCursorActive = function(state)
+            input._setGamepadCursorActive(state)
+        end,
+    }
+}
diff --git a/files/data/scripts/omw/input/playercontrols.lua b/files/data/scripts/omw/input/playercontrols.lua
new file mode 100644
index 0000000000..32a6f404c1
--- /dev/null
+++ b/files/data/scripts/omw/input/playercontrols.lua
@@ -0,0 +1,276 @@
+local core = require('openmw.core')
+local input = require('openmw.input')
+local self = require('openmw.self')
+local storage = require('openmw.storage')
+local ui = require('openmw.ui')
+local async = require('openmw.async')
+local Actor = require('openmw.types').Actor
+local Player = require('openmw.types').Player
+
+local I = require('openmw.interfaces')
+
+local settings = storage.playerSection('SettingsOMWControls')
+
+do
+    local rangeActions = {
+        'MoveForward',
+        'MoveBackward',
+        'MoveLeft',
+        'MoveRight'
+    }
+    for _, key in ipairs(rangeActions) do
+        input.registerAction {
+            key = key,
+            l10n = 'OMWControls',
+            name = key .. '_name',
+            description = key .. '_description',
+            type = input.ACTION_TYPE.Range,
+            defaultValue = 0,
+        }
+    end
+
+    local booleanActions = {
+        'Use',
+        'Run',
+        'Sneak',
+    }
+    for _, key in ipairs(booleanActions) do
+        input.registerAction {
+            key = key,
+            l10n = 'OMWControls',
+            name = key .. '_name',
+            description = key .. '_description',
+            type = input.ACTION_TYPE.Boolean,
+            defaultValue = false,
+        }
+    end
+
+    local triggers = {
+        'Jump',
+        'AutoMove',
+        'ToggleWeapon',
+        'ToggleSpell',
+        'AlwaysRun',
+        'ToggleSneak',
+        'Inventory',
+        'Journal',
+        'QuickKeysMenu',
+    }
+    for _, key in ipairs(triggers) do
+        input.registerTrigger {
+            key = key,
+            l10n = 'OMWControls',
+            name = key .. '_name',
+            description = key .. '_description',
+        }
+    end
+end
+
+local function checkNotWerewolf()
+    if Player.isWerewolf(self) then
+        ui.showMessage(core.getGMST('sWerewolfRefusal'))
+        return false
+    else
+        return true
+    end
+end
+
+local function isJournalAllowed()
+    -- During chargen journal is not allowed until magic window is allowed
+    return I.UI.getWindowsForMode(I.UI.MODE.Interface)[I.UI.WINDOW.Magic]
+end
+
+local movementControlsOverridden = false
+
+local autoMove = false
+local attemptToJump = false
+local function processMovement()
+    local movement = input.getRangeActionValue('MoveForward') - input.getRangeActionValue('MoveBackward')
+    local sideMovement = input.getRangeActionValue('MoveRight') - input.getRangeActionValue('MoveLeft')
+    local run = input.getBooleanActionValue('Run') ~= settings:get('alwaysRun')
+
+    if movement ~= 0 or not Actor.canMove(self) then
+        autoMove = false
+    elseif autoMove then
+        movement = 1
+    end
+
+    self.controls.movement = movement
+    self.controls.sideMovement = sideMovement
+    self.controls.run = run
+    self.controls.jump = attemptToJump
+
+    if not settings:get('toggleSneak') then
+        self.controls.sneak = input.getBooleanActionValue('Sneak')
+    end
+end
+
+local function controlsAllowed()
+    return not core.isWorldPaused()
+        and Player.getControlSwitch(self, Player.CONTROL_SWITCH.Controls)
+        and not I.UI.getMode()
+end
+
+local function movementAllowed()
+    return controlsAllowed() and not movementControlsOverridden
+end
+
+input.registerTriggerHandler('Jump', async:callback(function()
+    if not movementAllowed() then return end
+    attemptToJump = Player.getControlSwitch(self, Player.CONTROL_SWITCH.Jumping)
+end))
+
+input.registerTriggerHandler('ToggleSneak', async:callback(function()
+    if not movementAllowed() then return end
+    if settings:get('toggleSneak') then
+        self.controls.sneak = not self.controls.sneak
+    end
+end))
+
+input.registerTriggerHandler('AlwaysRun', async:callback(function()
+    if not movementAllowed() then return end
+    settings:set('alwaysRun', not settings:get('alwaysRun'))
+end))
+
+input.registerTriggerHandler('AutoMove', async:callback(function()
+    if not movementAllowed() then return end
+    autoMove = not autoMove
+end))
+
+local combatControlsOverridden = false
+
+local function combatAllowed()
+    return controlsAllowed() and not combatControlsOverridden
+end
+
+input.registerTriggerHandler('ToggleSpell', async:callback(function()
+    if not combatAllowed() then return end
+    if Actor.getStance(self) == Actor.STANCE.Spell then
+        Actor.setStance(self, Actor.STANCE.Nothing)
+    elseif Player.getControlSwitch(self, Player.CONTROL_SWITCH.Magic) then
+        if checkNotWerewolf() then
+            Actor.setStance(self, Actor.STANCE.Spell)
+        end
+    end
+end))
+
+input.registerTriggerHandler('ToggleWeapon', async:callback(function()
+    if not combatAllowed() then return end
+    if Actor.getStance(self) == Actor.STANCE.Weapon then
+        Actor.setStance(self, Actor.STANCE.Nothing)
+    elseif Player.getControlSwitch(self, Player.CONTROL_SWITCH.Fighting) then
+        Actor.setStance(self, Actor.STANCE.Weapon)
+    end
+end))
+
+local startUse = false
+input.registerActionHandler('Use', async:callback(function(value)
+    if value and combatAllowed() then startUse = true end
+end))
+local function processAttacking()
+    -- for spell-casting, set controls.use to true for exactly one frame
+    -- otherwise spell casting is attempted every frame while Use is true
+    if Actor.getStance(self) == Actor.STANCE.Spell then
+        self.controls.use = startUse and 1 or 0
+    elseif Actor.getStance(self) == Actor.STANCE.Weapon and input.getBooleanActionValue('Use') then
+        self.controls.use = 1
+    else
+        self.controls.use = 0
+    end
+    startUse = false
+end
+
+local uiControlsOverridden = false
+
+local function uiAllowed()
+    return Player.getControlSwitch(self, Player.CONTROL_SWITCH.Controls) and not uiControlsOverridden
+end
+
+input.registerTriggerHandler('Inventory', async:callback(function()
+    if not uiAllowed() then return end
+
+    if I.UI.getMode() == nil then
+        I.UI.setMode(I.UI.MODE.Interface)
+    elseif I.UI.getMode() == I.UI.MODE.Interface or I.UI.getMode() == I.UI.MODE.Container then
+        I.UI.removeMode(I.UI.getMode())
+    end
+end))
+
+input.registerTriggerHandler('Journal', async:callback(function()
+    if not uiAllowed() then return end
+
+    if I.UI.getMode() == I.UI.MODE.Journal then
+        I.UI.removeMode(I.UI.MODE.Journal)
+    elseif isJournalAllowed() then
+        I.UI.addMode(I.UI.MODE.Journal)
+    end
+end))
+
+input.registerTriggerHandler('QuickKeysMenu', async:callback(function()
+    if not uiAllowed() then return end
+
+    if I.UI.getMode() == I.UI.MODE.QuickKeysMenu then
+        I.UI.removeMode(I.UI.MODE.QuickKeysMenu)
+    elseif checkNotWerewolf() and Player.isCharGenFinished(self) then
+        I.UI.addMode(I.UI.MODE.QuickKeysMenu)
+    end
+end))
+
+local function onFrame(_)
+    if movementAllowed() then
+        processMovement()
+    elseif not movementControlsOverridden then
+        self.controls.movement = 0
+        self.controls.sideMovement = 0
+        self.controls.jump = false
+    end
+    if combatAllowed() then
+        processAttacking()
+    end
+    attemptToJump = false
+end
+
+local function onSave()
+    return {
+        sneaking = self.controls.sneak
+    }
+end
+
+local function onLoad(data)
+    if not data then return end
+    self.controls.sneak = data.sneaking or false
+end
+
+return {
+    engineHandlers = {
+        onFrame = onFrame,
+        onSave = onSave,
+        onLoad = onLoad,
+    },
+    interfaceName = 'Controls',
+    ---
+    -- @module Controls
+    -- @usage require('openmw.interfaces').Controls
+    interface = {
+        --- Interface version
+        -- @field [parent=#Controls] #number version
+        version = 1,
+
+        --- When set to true then the movement controls including jump and sneak are not processed and can be handled by another script.
+        -- If movement should be disallowed completely, consider to use `types.Player.setControlSwitch` instead.
+        -- @function [parent=#Controls] overrideMovementControls
+        -- @param #boolean value
+        overrideMovementControls = function(v) movementControlsOverridden = v end,
+
+        --- When set to true then the controls "attack", "toggle spell", "toggle weapon" are not processed and can be handled by another script.
+        -- If combat should be disallowed completely, consider to use `types.Player.setControlSwitch` instead.
+        -- @function [parent=#Controls] overrideCombatControls
+        -- @param #boolean value
+        overrideCombatControls = function(v) combatControlsOverridden = v end,
+
+        --- When set to true then the controls "open inventory", "open journal" and so on are not processed and can be handled by another script.
+        -- @function [parent=#Controls] overrideUiControls
+        -- @param #boolean value
+        overrideUiControls = function(v) uiControlsOverridden = v end,
+    }
+}
diff --git a/files/data/scripts/omw/input/settings.lua b/files/data/scripts/omw/input/settings.lua
new file mode 100644
index 0000000000..83a862b2d2
--- /dev/null
+++ b/files/data/scripts/omw/input/settings.lua
@@ -0,0 +1,191 @@
+local core = require('openmw.core')
+local input = require('openmw.input')
+local storage = require('openmw.storage')
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+local async = require('openmw.async')
+local I = require('openmw.interfaces')
+
+local settingsGroup = 'SettingsOMWControls'
+
+local function boolSetting(key, default)
+    return {
+        key = key,
+        renderer = 'checkbox',
+        name = key,
+        description = key .. 'Description',
+        default = default,
+    }
+end
+
+I.Settings.registerPage({
+    key = 'OMWControls',
+    l10n = 'OMWControls',
+    name = 'ControlsPage',
+    description = 'ControlsPageDescription',
+})
+
+I.Settings.registerGroup({
+    key = settingsGroup,
+    page = 'OMWControls',
+    l10n = 'OMWControls',
+    name = 'MovementSettings',
+    permanentStorage = true,
+    settings = {
+        boolSetting('alwaysRun', false),
+        boolSetting('toggleSneak', false), -- TODO: consider removing this setting when we have the advanced binding UI
+        boolSetting('smoothControllerMovement', true),
+    },
+})
+
+local interfaceL10n = core.l10n('interface')
+
+local bindingSection = storage.playerSection('OMWInputBindings')
+
+local recording = nil
+
+local mouseButtonNames = {
+    [1] = 'Left',
+    [2] = 'Middle',
+    [3] = 'Right',
+    [4] = '4',
+    [5] = '5',
+}
+
+-- TODO: support different controllers, use icons to render controller buttons
+local controllerButtonNames = {
+    [-1] = 'Invalid',
+    [input.CONTROLLER_BUTTON.A] = "A",
+    [input.CONTROLLER_BUTTON.B] = "B",
+    [input.CONTROLLER_BUTTON.X] = "X",
+    [input.CONTROLLER_BUTTON.Y] = "Y",
+    [input.CONTROLLER_BUTTON.Back] = "Back",
+    [input.CONTROLLER_BUTTON.Guide] = "Guide",
+    [input.CONTROLLER_BUTTON.Start] = "Start",
+    [input.CONTROLLER_BUTTON.LeftStick] = "Left Stick",
+    [input.CONTROLLER_BUTTON.RightStick] = "Right Stick",
+    [input.CONTROLLER_BUTTON.LeftShoulder] = "LB",
+    [input.CONTROLLER_BUTTON.RightShoulder] = "RB",
+    [input.CONTROLLER_BUTTON.DPadUp] = "D-pad Up",
+    [input.CONTROLLER_BUTTON.DPadDown] = "D-pad Down",
+    [input.CONTROLLER_BUTTON.DPadLeft] = "D-pad Left",
+    [input.CONTROLLER_BUTTON.DPadRight] = "D-pad Right",
+}
+
+local function bindingLabel(recording, binding)
+    if recording then
+        return interfaceL10n('N/A')
+    elseif not binding or not binding.button then
+        return interfaceL10n('None')
+    elseif binding.device == 'keyboard' then
+        return input.getKeyName(binding.button)
+    elseif binding.device == 'mouse' then
+        return string.format('Mouse %s', mouseButtonNames[binding.button] or 'Unknown')
+    elseif binding.device == 'controller' then
+        return string.format('Controller %s', controllerButtonNames[binding.button] or 'Unknown')
+    else
+        return 'Unknown'
+    end
+end
+
+local inputTypes = {
+    action = input.actions,
+    trigger = input.triggers,
+}
+
+I.Settings.registerRenderer('inputBinding', function(id, set, arg)
+    if type(id) ~= 'string' then error('inputBinding: must have a string default value') end
+    if not arg then error('inputBinding: argument with "key" and "type" is required') end
+    if not arg.type then error('inputBinding: type argument is required') end
+    if not inputTypes[arg.type] then error('inputBinding: type must be "action" or "trigger"') end
+    if not arg.key then error('inputBinding: key argument is required') end
+    local info = inputTypes[arg.type][arg.key]
+    if not info then print(string.format('inputBinding: %s %s not found', arg.type, arg.key)) return end
+
+    local l10n = core.l10n(info.l10n)
+
+    local name = {
+        template = I.MWUI.templates.textNormal,
+        props = {
+            text = l10n(info.name),
+        },
+    }
+
+    local description = {
+        template = I.MWUI.templates.textNormal,
+        props = {
+            text = l10n(info.description),
+        },
+    }
+
+    local binding = bindingSection:get(id)
+    local label = bindingLabel(recording and recording.id == id, binding)
+
+    local recorder = {
+        template = I.MWUI.templates.textNormal,
+        props = {
+            text = label,
+        },
+        events = {
+            mouseClick = async:callback(function()
+                if recording ~= nil then return end
+                if binding ~= nil then bindingSection:set(id, nil) end
+                recording = {
+                    id = id,
+                    arg = arg,
+                    refresh = function() set(id) end,
+                }
+                recording.refresh()
+            end),
+        },
+    }
+
+    local row = {
+        type = ui.TYPE.Flex,
+        props = {
+            horizontal = true,
+        },
+        content = ui.content {
+            name,
+            { props = { size = util.vector2(10, 0) } },
+            recorder,
+        },
+    }
+    local column = {
+        type = ui.TYPE.Flex,
+        content = ui.content {
+            row,
+            description,
+        },
+    }
+
+    return column
+end)
+
+local function bindButton(device, button)
+    if recording == nil then return end
+    local binding = {
+        device = device,
+        button = button,
+        type = recording.arg.type,
+        key = recording.arg.key,
+    }
+    bindingSection:set(recording.id, binding)
+    local refresh = recording.refresh
+    recording = nil
+    refresh()
+end
+
+return {
+    engineHandlers = {
+        onKeyPress = function(key)
+            bindButton(key.code ~= input.KEY.Escape and 'keyboard' or nil, key.code)
+        end,
+        onMouseButtonPress = function(button)
+            bindButton('mouse', button)
+        end,
+        onControllerButtonPress = function(id)
+            bindButton('controller', id)
+        end,
+    }
+}
diff --git a/files/data/scripts/omw/input/smoothmovement.lua b/files/data/scripts/omw/input/smoothmovement.lua
new file mode 100644
index 0000000000..ebd322f25d
--- /dev/null
+++ b/files/data/scripts/omw/input/smoothmovement.lua
@@ -0,0 +1,92 @@
+local input = require('openmw.input')
+local util = require('openmw.util')
+local async = require('openmw.async')
+local storage = require('openmw.storage')
+local types = require('openmw.types')
+local self = require('openmw.self')
+
+local NPC = types.NPC
+
+local moveActions = {
+    'MoveForward',
+    'MoveBackward',
+    'MoveLeft',
+    'MoveRight'
+}
+for _, key in ipairs(moveActions) do
+    local smoothKey = 'Smooth' .. key
+    input.registerAction {
+        key = smoothKey,
+        l10n = 'OMWControls',
+        name = smoothKey .. '_name',
+        description = smoothKey .. '_description',
+        type = input.ACTION_TYPE.Range,
+        defaultValue = 0,
+    }
+end
+
+local settings = storage.playerSection('SettingsOMWControls')
+
+local function shouldAlwaysRun(actor)
+    return actor.controls.sneak or not NPC.isOnGround(actor) or NPC.isSwimming(actor)
+end
+
+local function remapToWalkRun(actor, inputMovement)
+    if shouldAlwaysRun(actor) then
+        return true, inputMovement
+    end
+    local normalizedInput, inputSpeed = inputMovement:normalize()
+    local switchPoint = 0.5
+    if inputSpeed < switchPoint then
+        return false, inputMovement * 2
+    else
+        local matchWalkingSpeed = NPC.getWalkSpeed(actor) / NPC.getRunSpeed(actor)
+        local runSpeedRatio = 2 * (inputSpeed - switchPoint) * (1 - matchWalkingSpeed) + matchWalkingSpeed
+        return true, normalizedInput * math.min(1, runSpeedRatio)
+    end
+end
+
+local function computeSmoothMovement()
+    local controllerInput = util.vector2(
+        input.getAxisValue(input.CONTROLLER_AXIS.MoveForwardBackward),
+        input.getAxisValue(input.CONTROLLER_AXIS.MoveLeftRight)
+    )
+    return remapToWalkRun(self, controllerInput)
+end
+
+local function bindSmoothMove(key, axis, direction)
+    local smoothKey = 'Smooth' .. key
+    input.bindAction(smoothKey, async:callback(function()
+        local _, movement = computeSmoothMovement()
+        return math.max(direction * movement[axis], 0)
+    end), {})
+    input.bindAction(key, async:callback(function(_, standardMovement, smoothMovement)
+        if not settings:get('smoothControllerMovement') then
+            return standardMovement
+        end
+
+        if smoothMovement > 0 then
+            return smoothMovement
+        else
+            return standardMovement
+        end
+    end), { smoothKey })
+end
+
+bindSmoothMove('MoveForward', 'x', -1)
+bindSmoothMove('MoveBackward', 'x', 1)
+bindSmoothMove('MoveRight', 'y', 1)
+bindSmoothMove('MoveLeft', 'y', -1)
+
+input.bindAction('Run', async:callback(function(_, run)
+    if not settings:get('smoothControllerMovement') then
+        return run
+    end
+    local smoothRun, movement = computeSmoothMovement()
+    if movement:length2() > 0 then
+        -- ignore always run
+        return smoothRun ~= settings:get('alwaysRun')
+    else
+        return run
+    end
+end), {})
diff --git a/files/data/scripts/omw/mechanics/animationcontroller.lua b/files/data/scripts/omw/mechanics/animationcontroller.lua
new file mode 100644
index 0000000000..c7a9182a8e
--- /dev/null
+++ b/files/data/scripts/omw/mechanics/animationcontroller.lua
@@ -0,0 +1,151 @@
+local anim = require('openmw.animation')
+local self = require('openmw.self')
+
+local playBlendedHandlers = {}
+local function onPlayBlendedAnimation(groupname, options)    
+    for i = #playBlendedHandlers, 1, -1 do
+        if playBlendedHandlers[i](groupname, options) == false then
+            return
+        end
+    end
+end
+
+local function playBlendedAnimation(groupname, options)
+    onPlayBlendedAnimation(groupname, options)
+    if options.skip then
+        return
+    end
+    anim.playBlended(self, groupname, options)
+end
+
+local textKeyHandlers = {}
+local function onAnimationTextKey(groupname, key)
+    local handlers = textKeyHandlers[groupname]
+    if handlers then
+        for i = #handlers, 1, -1 do
+            if handlers[i](groupname, key) == false then
+                return
+            end
+        end
+    end
+    handlers = textKeyHandlers['']
+    if handlers then
+        for i = #handlers, 1, -1 do
+            if handlers[i](groupname, key) == false then
+                return
+            end
+        end
+    end
+end
+
+local initialized = false
+
+local function onUpdate(dt)
+    -- The script is loaded before the actor's CharacterController object is initialized, therefore
+    -- we have to delay this initialization step or the call won't have any effect.
+    if not initialized then
+        self:_enableLuaAnimations(true)
+        initialized = true
+    end
+end
+
+return {
+    engineHandlers = { 
+        _onPlayAnimation = playBlendedAnimation,
+        _onAnimationTextKey = onAnimationTextKey,
+        onUpdate = onUpdate,
+    },
+    
+    interfaceName = 'AnimationController',
+    --- 
+    -- Animation controller interface
+    -- @module AnimationController
+    -- @usage local anim = require('openmw.animation')
+    -- local I = require('openmw.interfaces')
+    --
+    -- -- play spellcast animation 
+    -- I.AnimationController.playBlendedAnimation('spellcast', { startkey = 'self start', stopkey = 'self stop', priority = {
+    --      [anim.BONE_GROUP.RightArm] = anim.PRIORITY.Weapon,
+    --      [anim.BONE_GROUP.LeftArm] = anim.PRIORITY.Weapon,
+    --      [anim.BONE_GROUP.Torso] = anim.PRIORITY.Weapon,
+    --      [anim.BONE_GROUP.LowerBody] = anim.PRIORITY.WeaponLowerBody
+    --      } })
+    -- 
+    -- @usage -- react to the spellcast release textkey
+    -- I.AnimationController.addTextKeyHandler('spellcast', function(groupname, key)
+    --     -- Note, Lua is 1-indexed so have to subtract 1 less than the length of 'release'
+    --     if key.sub(key, #key - 6) == 'release' then
+    --         print('Abra kadabra!')
+    --     end
+    -- end)
+    --
+    -- @usage -- Add a text key handler that will react to all keys
+    -- I.AnimationController.addTextKeyHandler('', function(groupname, key)
+    --     if key.sub(key, #key - 2) == 'hit' and not key.sub(key, #key - 7) == ' min hit' then
+    --         print('Hit!')
+    --     end
+    -- end)
+    -- 
+    -- @usage -- Make a handler that changes player attack speed based on current fatigue
+    -- I.AnimationController.addPlayBlendedAnimationHandler(function (groupname, options)
+    --     local stop = options.stopkey
+    --     if #stop > 10 and stop.sub(stop, #stop - 10) == ' max attack' then
+    --         -- This is an attack wind up animation, scale its speed by attack 
+    --         local fatigue = Actor.stats.dynamic.fatigue(self)
+    --         local factor = 1 - fatigue.current / fatigue.base
+    --         speed = 1 - factor * 0.8
+    --         options.speed = speed
+    --     end
+    -- end)
+    -- 
+    
+    interface = {
+        --- Interface version
+        -- @field [parent=#AnimationController] #number version
+        version = 0,
+        
+        --- AnimationController Package
+        -- @type Package
+        
+        --- Make this actor play an animation. Makes a call to @{openmw.animation#playBlended}, after invoking handlers added through addPlayBlendedAnimationHandler
+        -- @function [parent=#AnimationController] playBlendedAnimation
+        -- @param #string groupname The animation group to be played
+        -- @param #table options The table of play options that will be passed to @{openmw.animation#playBlended}
+        playBlendedAnimation = playBlendedAnimation,
+
+        --- Add new playBlendedAnimation handler for this actor
+        -- If `handler(groupname, options)` returns false, other handlers for
+        -- the call will be skipped.
+        -- @function [parent=#AnimationController] addPlayBlendedAnimationHandler
+        -- @param #function handler The handler.
+        addPlayBlendedAnimationHandler = function(handler)
+            playBlendedHandlers[#playBlendedHandlers + 1] = handler
+        end,
+
+        --- Add new text key handler for this actor
+        -- While playing, some animations emit text key events. Register a handle to listen for all
+        -- text key events associated with this actor's animations.
+        -- If `handler(groupname, key)` returns false, other handlers for
+        -- the call will be skipped.
+        -- @function [parent=#AnimationController] addTextKeyHandler
+        -- @param #string groupname Name of the animation group to listen to keys for. If the empty string or nil, all keys will be received
+        -- @param #function handler The handler.
+        addTextKeyHandler = function(groupname, handler)
+            if not groupname then
+                groupname = ""
+            end
+            local handlers = textKeyHandlers[groupname]
+            if handlers == nil then
+                handlers = {}
+                textKeyHandlers[groupname] = handlers
+            end
+            handlers[#handlers + 1] = handler
+        end,
+    },
+
+    eventHandlers = {
+        AddVfx = function(data)
+            anim.addVfx(self, data.model, data.options)
+        end,
+    }
+}
diff --git a/files/data/scripts/omw/mechanics/playercontroller.lua b/files/data/scripts/omw/mechanics/playercontroller.lua
index 19e62d02c7..870f24415c 100644
--- a/files/data/scripts/omw/mechanics/playercontroller.lua
+++ b/files/data/scripts/omw/mechanics/playercontroller.lua
@@ -1,7 +1,13 @@
+local ambient = require('openmw.ambient')
 local core = require('openmw.core')
+local Skill = core.stats.Skill
+local I = require('openmw.interfaces')
 local nearby = require('openmw.nearby')
 local self = require('openmw.self')
 local types = require('openmw.types')
+local NPC = types.NPC
+local Actor = types.Actor
+local ui = require('openmw.ui')
 
 local cell = nil
 local autodoors = {}
@@ -31,6 +37,65 @@ local function processAutomaticDoors()
     end
 end
 
+local function skillLevelUpHandler(skillid, source, params)
+    local skillStat = NPC.stats.skills[skillid](self)
+    if skillStat.base >= 100 then 
+        return false 
+    end
+
+    if params.skillIncreaseValue then
+        skillStat.base = skillStat.base + params.skillIncreaseValue
+    end
+    
+    local levelStat = Actor.stats.level(self)
+    if params.levelUpProgress then
+        levelStat.progress = levelStat.progress + params.levelUpProgress
+    end
+
+    if params.levelUpAttribute and params.levelUpAttributeIncreaseValue then
+        levelStat.skillIncreasesForAttribute[params.levelUpAttribute]
+            = levelStat.skillIncreasesForAttribute[params.levelUpAttribute] + params.levelUpAttributeIncreaseValue
+    end
+
+    if params.levelUpSpecialization and params.levelUpSpecializationIncreaseValue then
+        levelStat.skillIncreasesForSpecialization[params.levelUpSpecialization]
+            = levelStat.skillIncreasesForSpecialization[params.levelUpSpecialization] + params.levelUpSpecializationIncreaseValue;
+    end
+
+    local skillRecord = Skill.record(skillid)
+    local npcRecord = NPC.record(self)
+    local class = NPC.classes.record(npcRecord.class)
+
+    ambient.playSound("skillraise")
+
+    local message = string.format(core.getGMST('sNotifyMessage39'),skillRecord.name,skillStat.base)
+
+    if source == I.SkillProgression.SKILL_INCREASE_SOURCES.Book then
+        message = '#{sBookSkillMessage}\n'..message
+    end
+
+    ui.showMessage(message, { showInDialogue = false })
+    
+    if levelStat.progress >= core.getGMST('iLevelUpTotal') then
+        ui.showMessage('#{sLevelUpMsg}', { showInDialogue = false })
+    end
+
+    if not source or source == I.SkillProgression.SKILL_INCREASE_SOURCES.Usage then skillStat.progress = 0 end
+end
+
+local function skillUsedHandler(skillid, params)
+    if NPC.isWerewolf(self) then
+        return false
+    end
+
+    local skillStat = NPC.stats.skills[skillid](self)
+    skillStat.progress = skillStat.progress + params.skillGain / I.SkillProgression.getSkillProgressRequirement(skillid)
+
+    if skillStat.progress >= 1 then
+        I.SkillProgression.skillLevelUp(skillid, I.SkillProgression.SKILL_INCREASE_SOURCES.Usage)
+    end
+end
+
 local function onUpdate()
     if self.cell ~= cell then
         cell = self.cell
@@ -39,6 +104,9 @@ local function onUpdate()
     processAutomaticDoors()
 end
 
+I.SkillProgression.addSkillUsedHandler(skillUsedHandler)
+I.SkillProgression.addSkillLevelUpHandler(skillLevelUpHandler)
+
 return {
     engineHandlers = {
         onUpdate = onUpdate,
diff --git a/files/data/scripts/omw/music/actor.lua b/files/data/scripts/omw/music/actor.lua
new file mode 100755
index 0000000000..8f3ac7915a
--- /dev/null
+++ b/files/data/scripts/omw/music/actor.lua
@@ -0,0 +1,63 @@
+local AI = require("openmw.interfaces").AI
+local self = require("openmw.self")
+local types = require("openmw.types")
+local nearby = require("openmw.nearby")
+
+local targets = {}
+
+local function emitTargetsChanged()
+    for _, actor in ipairs(nearby.players) do
+        actor:sendEvent("OMWMusicCombatTargetsChanged", { actor = self, targets = targets })
+    end
+end
+
+local function onUpdate()
+    if types.Actor.isDeathFinished(self) or not types.Actor.isInActorsProcessingRange(self) then
+        if next(targets) ~= nil then
+            targets = {}
+            emitTargetsChanged()
+        end
+
+        return
+    end
+
+    -- Early-out for actors without targets and without combat state
+    -- TODO: use events or engine handlers to detect when targets change
+    local isStanceNothing = types.Actor.getStance(self) == types.Actor.STANCE.Nothing
+    if isStanceNothing and next(targets) == nil and not AI.isFleeing() then
+        return
+    end
+
+    local newTargets = AI.getTargets("Combat")
+
+    local changed = false
+    if #newTargets ~= #targets then
+        changed = true
+    else
+        for i, target in ipairs(targets) do
+            if target ~= newTargets[i] then
+                changed = true
+                break
+            end
+        end
+    end
+
+    targets = newTargets
+    if changed then
+        emitTargetsChanged()
+    end
+end
+
+local function onInactive()
+    if next(targets) ~= nil then
+        targets = {}
+        emitTargetsChanged()
+    end
+end
+
+return {
+    engineHandlers = {
+        onUpdate = onUpdate,
+        onInactive = onInactive,
+    },
+}
diff --git a/files/data/scripts/omw/music/helpers.lua b/files/data/scripts/omw/music/helpers.lua
new file mode 100755
index 0000000000..752c63a68e
--- /dev/null
+++ b/files/data/scripts/omw/music/helpers.lua
@@ -0,0 +1,106 @@
+local debug = require('openmw.debug')
+local storage = require('openmw.storage')
+local vfs = require('openmw.vfs')
+
+local playlistsSection = storage.playerSection('OMWMusicPlaylistsTrackOrder')
+playlistsSection:setLifeTime(storage.LIFE_TIME.GameSession)
+
+local function getTracksFromDirectory(path)
+    local result = {}
+    for fileName in vfs.pathsWithPrefix(path) do
+        table.insert(result, fileName)
+    end
+
+    return result
+end
+
+local function initMissingPlaylistFields(playlist)
+    if playlist.id == nil or playlist.priority == nil then
+        error("Can not register playlist: 'id' and 'priority' are mandatory fields")
+    end
+
+    if playlist.tracks == nil then
+        playlist.tracks = getTracksFromDirectory(string.format("music/%s/", playlist.id))
+    end
+
+    if playlist.active == nil then
+        playlist.active = false
+    end
+
+    if playlist.randomize == nil then
+        playlist.randomize = false
+    end
+
+    if playlist.cycleTracks == nil then
+        playlist.cycleTracks = true
+    end
+
+    if playlist.playOneTrack == nil then
+        playlist.playOneTrack = false
+    end
+end
+
+local function shuffle(data)
+    for i = #data, 1, -1 do
+        local j = math.random(i)
+        data[i], data[j] = data[j], data[i]
+    end
+    return data
+end
+
+local function initTracksOrder(tracks, randomize)
+    local tracksOrder = {}
+    for i, track in ipairs(tracks) do
+        tracksOrder[i] = i
+    end
+
+    if randomize then
+        shuffle(tracksOrder)
+    end
+
+    return tracksOrder
+end
+
+local function isPlaylistActive(playlist)
+    return playlist.active and next(playlist.tracks) ~= nil
+end
+
+local function getStoredTracksOrder()
+    -- We need a writeable playlists table here.
+    return playlistsSection:asTable()
+end
+
+local function setStoredTracksOrder(playlistId, playlistTracksOrder)
+    playlistsSection:set(playlistId, playlistTracksOrder)
+end
+
+local function getActivePlaylistByPriority(playlists)
+    local newPlaylist = nil
+    for _, playlist in pairs(playlists) do
+        if isPlaylistActive(playlist) then
+            if newPlaylist == nil or playlist.priority < newPlaylist.priority or
+                (playlist.priority == newPlaylist.priority and playlist.registrationOrder > newPlaylist.registrationOrder) then
+                newPlaylist = playlist
+            end
+        end
+    end
+
+    return newPlaylist
+end
+
+local function isInCombat(fightingActors)
+    return next(fightingActors) ~= nil and debug.isAIEnabled()
+end
+
+local functions = {
+    getActivePlaylistByPriority = getActivePlaylistByPriority,
+    getStoredTracksOrder = getStoredTracksOrder,
+    getTracksFromDirectory = getTracksFromDirectory,
+    initMissingPlaylistFields = initMissingPlaylistFields,
+    initTracksOrder = initTracksOrder,
+    isInCombat = isInCombat,
+    isPlaylistActive = isPlaylistActive,
+    setStoredTracksOrder = setStoredTracksOrder
+}
+
+return functions
diff --git a/files/data/scripts/omw/music/music.lua b/files/data/scripts/omw/music/music.lua
new file mode 100755
index 0000000000..2a6249a3c1
--- /dev/null
+++ b/files/data/scripts/omw/music/music.lua
@@ -0,0 +1,160 @@
+local ambient = require('openmw.ambient')
+local core = require('openmw.core')
+local self = require('openmw.self')
+local storage = require('openmw.storage')
+local types = require('openmw.types')
+
+local musicSettings = storage.playerSection('SettingsOMWMusic')
+
+local helpers = require('scripts.omw.music.helpers')
+
+local registeredPlaylists = {}
+local playlistsTracksOrder = helpers.getStoredTracksOrder()
+local fightingActors = {}
+local registrationOrder = 0
+
+local currentPlaylist = nil
+local skippedOneFrame = false
+
+local battlePriority = 10
+local explorePriority = 100
+
+local function registerPlaylist(playlist)
+    helpers.initMissingPlaylistFields(playlist)
+
+    local existingOrder = playlistsTracksOrder[playlist.id]
+    if not existingOrder or next(existingOrder) == nil or math.max(unpack(existingOrder)) > #playlist.tracks then
+        local newPlaylistOrder = helpers.initTracksOrder(playlist.tracks, playlist.randomize)
+        playlistsTracksOrder[playlist.id] = newPlaylistOrder
+        helpers.setStoredTracksOrder(playlist.id, newPlaylistOrder)
+    else
+        playlistsTracksOrder[playlist.id] = existingOrder
+    end
+
+    if registeredPlaylists[playlist.id] == nil then
+        playlist.registrationOrder = registrationOrder
+        registrationOrder = registrationOrder + 1
+    end
+
+    registeredPlaylists[playlist.id] = playlist
+end
+
+local function setPlaylistActive(id, state)
+    if id == nil then
+        error("Playlist ID is nil")
+    end
+
+    local playlist = registeredPlaylists[id]
+    if playlist then
+        playlist.active = state
+    else
+        error(string.format("Playlist '%s' is not registered.", id))
+    end
+end
+
+local function onCombatTargetsChanged(eventData)
+    if eventData.actor == nil then return end
+
+    if next(eventData.targets) ~= nil then
+        fightingActors[eventData.actor.id] = true
+    else
+        fightingActors[eventData.actor.id] = nil
+    end
+end
+
+local function playerDied()
+    ambient.streamMusic("music/special/mw_death.mp3")
+end
+
+local function switchPlaylist(newPlaylist)
+    local newPlaylistOrder = playlistsTracksOrder[newPlaylist.id]
+    local nextTrackIndex = table.remove(newPlaylistOrder)
+
+    if nextTrackIndex == nil then
+        error("Can not fetch track: nextTrackIndex is nil")
+    end
+
+    -- If there are no tracks left, fill playlist again.
+    if next(newPlaylistOrder) == nil then
+        newPlaylistOrder = helpers.initTracksOrder(newPlaylist.tracks, newPlaylist.randomize)
+
+        if not newPlaylist.cycleTracks then
+            newPlaylist.deactivateAfterEnd = true
+        end
+
+        -- If next track for randomized playist will be the same as one we want to play, swap it with random track.
+        if newPlaylist.randomize and #newPlaylistOrder > 1 and newPlaylistOrder[1] == nextTrackIndex then
+            local index = math.random(2, #newPlaylistOrder)
+            newPlaylistOrder[1], newPlaylistOrder[index] = newPlaylistOrder[index], newPlaylistOrder[1]
+        end
+
+        playlistsTracksOrder[newPlaylist.id] = newPlaylistOrder
+    end
+
+    helpers.setStoredTracksOrder(newPlaylist.id, newPlaylistOrder)
+
+    local trackPath = newPlaylist.tracks[nextTrackIndex]
+    if trackPath == nil then
+        error(string.format("Can not fetch track with index %s from playlist '%s'.", nextTrackIndex, newPlaylist.id))
+    else
+        ambient.streamMusic(trackPath, newPlaylist.fadeOut)
+        if newPlaylist.playOneTrack then
+            newPlaylist.deactivateAfterEnd = true
+        end
+    end
+
+    currentPlaylist = newPlaylist
+end
+
+local function onFrame(dt)
+    -- Skip a first frame to allow other scripts to update playlists state.
+    if not skippedOneFrame then
+        skippedOneFrame = true
+        return
+    end
+
+    if not core.sound.isEnabled() then return end
+	
+	-- Do not allow to switch playlists when player is dead
+	local musicPlaying = ambient.isMusicPlaying()
+	if types.Actor.isDead(self) and musicPlaying then return end
+
+    local combatMusicEnabled = musicSettings:get("CombatMusicEnabled") and helpers.isInCombat(fightingActors)
+    setPlaylistActive("battle", combatMusicEnabled)
+
+    local newPlaylist = helpers.getActivePlaylistByPriority(registeredPlaylists)
+
+    if not newPlaylist then
+        ambient.stopMusic()
+
+        if currentPlaylist ~= nil then
+            currentPlaylist.deactivateAfterEnd = nil
+        end
+
+        currentPlaylist = nil
+        return
+    end
+
+    if newPlaylist == currentPlaylist and musicPlaying then return end
+
+    if newPlaylist and newPlaylist.deactivateAfterEnd then
+        newPlaylist.deactivateAfterEnd = nil
+        newPlaylist.active = false
+        return
+    end
+
+    switchPlaylist(newPlaylist)
+end
+
+registerPlaylist({ id = "battle", priority = battlePriority, randomize = true })
+registerPlaylist({ id = "explore", priority = explorePriority, randomize = true, active = true })
+
+return {
+    engineHandlers = {
+        onFrame = onFrame
+    },
+    eventHandlers = {
+        Died = playerDied,
+        OMWMusicCombatTargetsChanged = onCombatTargetsChanged
+    }
+}
diff --git a/files/data/scripts/omw/music/settings.lua b/files/data/scripts/omw/music/settings.lua
new file mode 100755
index 0000000000..5a03af05c8
--- /dev/null
+++ b/files/data/scripts/omw/music/settings.lua
@@ -0,0 +1,27 @@
+local I = require('openmw.interfaces')
+local storage = require('openmw.storage')
+
+I.Settings.registerPage({
+    key = 'OMWMusic',
+    l10n = 'OMWMusic',
+    name = 'Music',
+    description = 'settingsPageDescription',
+})
+
+I.Settings.registerGroup({
+    key = "SettingsOMWMusic",
+    page = 'OMWMusic',
+    l10n = 'OMWMusic',
+    name = 'musicSettings',
+    permanentStorage = true,
+    order = 0,
+    settings = {
+        {
+            key = 'CombatMusicEnabled',
+            renderer = 'checkbox',
+            name = 'CombatMusicEnabled',
+            description = 'CombatMusicEnabledDescription',
+            default = true,
+        }
+    },
+})
diff --git a/files/data/scripts/omw/mwui/borders.lua b/files/data/scripts/omw/mwui/borders.lua
index 5d056254fc..624ea8b54e 100644
--- a/files/data/scripts/omw/mwui/borders.lua
+++ b/files/data/scripts/omw/mwui/borders.lua
@@ -22,49 +22,52 @@ local cornerParts = {
     bottom_right = v2(1, 1),
 }
 
-local borderSidePattern = 'textures/menu_thin_border_%s.dds'
-local borderCornerPattern = 'textures/menu_thin_border_%s_corner.dds'
+local borderSidePattern = 'textures/menu_%s_border_%s.dds'
+local borderCornerPattern = 'textures/menu_%s_border_%s_corner.dds'
 
 local borderResources = {}
-do
+local borderPieces = {}
+for _, thickness in ipairs{'thin', 'thick'} do
+    borderResources[thickness] = {}
     for k in pairs(sideParts) do
-        borderResources[k] = ui.texture{ path = borderSidePattern:format(k) }
+        borderResources[thickness][k] = ui.texture{ path = borderSidePattern:format(thickness, k) }
     end
     for k in pairs(cornerParts) do
-        borderResources[k] = ui.texture{ path = borderCornerPattern:format(k) }
+        borderResources[thickness][k] = ui.texture{ path = borderCornerPattern:format(thickness, k) }
+    end
+
+    borderPieces[thickness] = {}
+    for k in pairs(sideParts) do
+        local horizontal = k == 'top' or k == 'bottom'
+        borderPieces[thickness][k] = {
+            type = ui.TYPE.Image,
+            props = {
+                resource = borderResources[thickness][k],
+                tileH = horizontal,
+                tileV = not horizontal,
+            },
+        }
+    end
+    for k in pairs(cornerParts) do
+        borderPieces[thickness][k] = {
+            type = ui.TYPE.Image,
+            props = {
+                resource = borderResources[thickness][k],
+            },
+        }
     end
 end
 
-local borderPieces = {}
-for k in pairs(sideParts) do
-    local horizontal = k == 'top' or k == 'bottom'
-    borderPieces[k] = {
-        type = ui.TYPE.Image,
-        props = {
-            resource = borderResources[k],
-            tileH = horizontal,
-            tileV = not horizontal,
-        },
-    }
-end
-for k in pairs(cornerParts) do
-    borderPieces[k] = {
-        type = ui.TYPE.Image,
-        props = {
-            resource = borderResources[k],
-        },
-    }
-end
 
 
-
-local function borderTemplates(borderSize)
+local function borderTemplates(thickness)
+    local borderSize = (thickness == 'thin') and constants.border or constants.thickBorder
     local borderV = v2(1, 1) * borderSize
     local result = {}
     result.horizontalLine = {
         type = ui.TYPE.Image,
         props = {
-            resource = borderResources.top,
+            resource = borderResources[thickness].top,
             tileH = true,
             tileV = false,
             size = v2(0, borderSize),
@@ -75,7 +78,7 @@ local function borderTemplates(borderSize)
     result.verticalLine = {
         type = ui.TYPE.Image,
         props = {
-            resource = borderResources.left,
+            resource = borderResources[thickness].left,
             tileH = false,
             tileV = true,
             size = v2(borderSize, 0),
@@ -90,7 +93,7 @@ local function borderTemplates(borderSize)
         local horizontal = k == 'top' or k == 'bottom'
         local direction = horizontal and v2(1, 0) or v2(0, 1)
         result.borders.content:add {
-            template = borderPieces[k],
+            template = borderPieces[thickness][k],
             props = {
                 position = (direction - v) * borderSize,
                 relativePosition = v,
@@ -101,7 +104,7 @@ local function borderTemplates(borderSize)
     end
     for k, v in pairs(cornerParts) do
         result.borders.content:add {
-            template = borderPieces[k],
+            template = borderPieces[thickness][k],
             props = {
                 position = -v * borderSize,
                 relativePosition = v,
@@ -126,7 +129,7 @@ local function borderTemplates(borderSize)
         local horizontal = k == 'top' or k == 'bottom'
         local direction = horizontal and v2(1, 0) or v2(0, 1)
         result.box.content:add {
-            template = borderPieces[k],
+            template = borderPieces[thickness][k],
             props = {
                 position = (direction + v) * borderSize,
                 relativePosition = v,
@@ -137,7 +140,7 @@ local function borderTemplates(borderSize)
     end
     for k, v in pairs(cornerParts) do
         result.box.content:add {
-            template = borderPieces[k],
+            template = borderPieces[thickness][k],
             props = {
                 position = v * borderSize,
                 relativePosition = v,
@@ -190,8 +193,8 @@ local function borderTemplates(borderSize)
     return result
 end
 
-local thinBorders = borderTemplates(constants.border)
-local thickBorders = borderTemplates(constants.thickBorder)
+local thinBorders = borderTemplates('thin')
+local thickBorders = borderTemplates('thick')
 
 return function(templates)
     for k, t in pairs(thinBorders) do
@@ -200,4 +203,4 @@ return function(templates)
     for k, t in pairs(thickBorders) do
         templates[k .. 'Thick'] = t
     end
-end
\ No newline at end of file
+end
diff --git a/files/data/scripts/omw/mwui/init.lua b/files/data/scripts/omw/mwui/init.lua
index 560d8af704..5ab2d3cb23 100644
--- a/files/data/scripts/omw/mwui/init.lua
+++ b/files/data/scripts/omw/mwui/init.lua
@@ -77,6 +77,7 @@ require('scripts.omw.mwui.space')(templates)
 ---
 -- Same as box, but with a semi-transparent background
 -- @field [parent=#Templates] openmw.ui#Template boxTransparent
+
 ---
 -- Same as box, but with a solid background
 -- @field [parent=#Templates] openmw.ui#Template boxSolid
@@ -100,6 +101,7 @@ require('scripts.omw.mwui.space')(templates)
 ---
 -- Same as box, but with a semi-transparent background
 -- @field [parent=#Templates] openmw.ui#Template boxTransparentThick
+
 ---
 -- Same as box, but with a solid background
 -- @field [parent=#Templates] openmw.ui#Template boxSolidThick
diff --git a/files/data/scripts/omw/playercontrols.lua b/files/data/scripts/omw/playercontrols.lua
deleted file mode 100644
index 56a0b962e6..0000000000
--- a/files/data/scripts/omw/playercontrols.lua
+++ /dev/null
@@ -1,233 +0,0 @@
-local core = require('openmw.core')
-local input = require('openmw.input')
-local self = require('openmw.self')
-local util = require('openmw.util')
-local ui = require('openmw.ui')
-local Actor = require('openmw.types').Actor
-local Player = require('openmw.types').Player
-
-local storage = require('openmw.storage')
-local I = require('openmw.interfaces')
-
-local settingsGroup = 'SettingsOMWControls'
-
-local function boolSetting(key, default)
-    return {
-        key = key,
-        renderer = 'checkbox',
-        name = key,
-        description = key..'Description',
-        default = default,
-    }
-end
-
-I.Settings.registerPage({
-  key = 'OMWControls',
-  l10n = 'OMWControls',
-  name = 'ControlsPage',
-  description = 'ControlsPageDescription',
-})
-
-I.Settings.registerGroup({
-    key = settingsGroup,
-    page = 'OMWControls',
-    l10n = 'OMWControls',
-    name = 'MovementSettings',
-    permanentStorage = true,
-    settings = {
-        boolSetting('alwaysRun', false),
-        boolSetting('toggleSneak', false),
-    },
-})
-
-local settings = storage.playerSection(settingsGroup)
-
-local attemptJump = false
-local startAttack = false
-local autoMove = false
-local movementControlsOverridden = false
-local combatControlsOverridden = false
-local uiControlsOverridden = false
-
-local function processMovement()
-    local controllerMovement = -input.getAxisValue(input.CONTROLLER_AXIS.MoveForwardBackward)
-    local controllerSideMovement = input.getAxisValue(input.CONTROLLER_AXIS.MoveLeftRight)
-    if controllerMovement ~= 0 or controllerSideMovement ~= 0 then
-        -- controller movement
-        if util.vector2(controllerMovement, controllerSideMovement):length2() < 0.25
-           and not self.controls.sneak and Actor.isOnGround(self) and not Actor.isSwimming(self) then
-            self.controls.run = false
-            self.controls.movement = controllerMovement * 2
-            self.controls.sideMovement = controllerSideMovement * 2
-        else
-            self.controls.run = true
-            self.controls.movement = controllerMovement
-            self.controls.sideMovement = controllerSideMovement
-        end
-    else
-        -- keyboard movement
-        self.controls.movement = 0
-        self.controls.sideMovement = 0
-        if input.isActionPressed(input.ACTION.MoveLeft) then
-            self.controls.sideMovement = self.controls.sideMovement - 1
-        end
-        if input.isActionPressed(input.ACTION.MoveRight) then
-            self.controls.sideMovement = self.controls.sideMovement + 1
-        end
-        if input.isActionPressed(input.ACTION.MoveBackward) then
-            self.controls.movement = self.controls.movement - 1
-        end
-        if input.isActionPressed(input.ACTION.MoveForward) then
-            self.controls.movement = self.controls.movement + 1
-        end
-        self.controls.run = input.isActionPressed(input.ACTION.Run) ~= settings:get('alwaysRun')
-    end
-    if self.controls.movement ~= 0 or not Actor.canMove(self) then
-        autoMove = false
-    elseif autoMove then
-        self.controls.movement = 1
-    end
-    self.controls.jump = attemptJump and input.getControlSwitch(input.CONTROL_SWITCH.Jumping)
-    if not settings:get('toggleSneak') then
-        self.controls.sneak = input.isActionPressed(input.ACTION.Sneak)
-    end
-end
-
-local function processAttacking()
-    if startAttack then
-        self.controls.use = 1
-    elseif Actor.stance(self) == Actor.STANCE.Spell then
-        self.controls.use = 0
-    elseif input.getAxisValue(input.CONTROLLER_AXIS.TriggerRight) < 0.6
-           and not input.isActionPressed(input.ACTION.Use) then
-        -- The value "0.6" shouldn't exceed the triggering threshold in BindingsManager::actionValueChanged.
-        -- TODO: Move more logic from BindingsManager to Lua and consider to make this threshold configurable.
-        self.controls.use = 0
-    end
-end
-
-local function onFrame(dt)
-    local controlsAllowed = input.getControlSwitch(input.CONTROL_SWITCH.Controls) and not core.isWorldPaused()
-    if not movementControlsOverridden then
-        if controlsAllowed then
-            processMovement()
-        else
-            self.controls.movement = 0
-            self.controls.sideMovement = 0
-            self.controls.jump = false
-        end
-    end
-    if controlsAllowed and not combatControlsOverridden then
-        processAttacking()
-    end
-    attemptJump = false
-    startAttack = false
-end
-
-local function checkNotWerewolf()
-    if Player.isWerewolf(self) then
-        ui.showMessage(core.getGMST('sWerewolfRefusal'))
-        return false
-    else
-        return true
-    end
-end
-
-local function isJournalAllowed()
-    -- During chargen journal is not allowed until magic window is allowed
-    return I.UI.getWindowsForMode(I.UI.MODE.Interface)[I.UI.WINDOW.Magic]
-end
-
-local function onInputAction(action)
-    if not input.getControlSwitch(input.CONTROL_SWITCH.Controls) then
-        return
-    end
-
-    if not uiControlsOverridden then
-        if action == input.ACTION.Inventory then
-            if I.UI.getMode() == nil then
-                I.UI.setMode(I.UI.MODE.Interface)
-            elseif I.UI.getMode() == I.UI.MODE.Interface or I.UI.getMode() == I.UI.MODE.Container then
-                I.UI.removeMode(I.UI.getMode())
-            end
-        elseif action == input.ACTION.Journal then
-            if I.UI.getMode() == I.UI.MODE.Journal then
-                I.UI.removeMode(I.UI.MODE.Journal)
-            elseif isJournalAllowed() then
-                I.UI.addMode(I.UI.MODE.Journal)
-            end
-        elseif action == input.ACTION.QuickKeysMenu then
-            if I.UI.getMode() == I.UI.MODE.QuickKeysMenu then
-                I.UI.removeMode(I.UI.MODE.QuickKeysMenu)
-            elseif checkNotWerewolf() and Player.isCharGenFinished(self) then
-                I.UI.addMode(I.UI.MODE.QuickKeysMenu)
-            end
-        end
-    end
-
-    if core.isWorldPaused() then
-        return
-    end
-
-    if action == input.ACTION.Jump then
-        attemptJump = true
-    elseif action == input.ACTION.Use then
-        startAttack = Actor.stance(self) ~= Actor.STANCE.Nothing
-    elseif action == input.ACTION.AutoMove and not movementControlsOverridden then
-        autoMove = not autoMove
-    elseif action == input.ACTION.AlwaysRun and not movementControlsOverridden then
-        settings:set('alwaysRun', not settings:get('alwaysRun'))
-    elseif action == input.ACTION.Sneak and not movementControlsOverridden then
-        if settings:get('toggleSneak') then
-            self.controls.sneak = not self.controls.sneak
-        end
-    elseif action == input.ACTION.ToggleSpell and not combatControlsOverridden then
-        if Actor.stance(self) == Actor.STANCE.Spell then
-            Actor.setStance(self, Actor.STANCE.Nothing)
-        elseif input.getControlSwitch(input.CONTROL_SWITCH.Magic) then
-            if checkNotWerewolf() then
-                Actor.setStance(self, Actor.STANCE.Spell)
-            end
-        end
-    elseif action == input.ACTION.ToggleWeapon and not combatControlsOverridden then
-        if Actor.stance(self) == Actor.STANCE.Weapon then
-            Actor.setStance(self, Actor.STANCE.Nothing)
-        elseif input.getControlSwitch(input.CONTROL_SWITCH.Fighting) then
-            Actor.setStance(self, Actor.STANCE.Weapon)
-        end
-    end
-end
-
-return {
-    engineHandlers = {
-        onFrame = onFrame,
-        onInputAction = onInputAction,
-    },
-    interfaceName = 'Controls',
-    ---
-    -- @module Controls
-    -- @usage require('openmw.interfaces').Controls
-    interface = {
-        --- Interface version
-        -- @field [parent=#Controls] #number version
-        version = 1,
-
-        --- When set to true then the movement controls including jump and sneak are not processed and can be handled by another script.
-        -- If movement should be disallowed completely, consider to use `input.setControlSwitch` instead.
-        -- @function [parent=#Controls] overrideMovementControls
-        -- @param #boolean value
-        overrideMovementControls = function(v) movementControlsOverridden = v end,
-
-        --- When set to true then the controls "attack", "toggle spell", "toggle weapon" are not processed and can be handled by another script.
-        -- If combat should be disallowed completely, consider to use `input.setControlSwitch` instead.
-        -- @function [parent=#Controls] overrideCombatControls
-        -- @param #boolean value
-        overrideCombatControls = function(v) combatControlsOverridden = v end,
-
-        --- When set to true then the controls "open inventory", "open journal" and so on are not processed and can be handled by another script.
-        -- @function [parent=#Controls] overrideUiControls
-        -- @param #boolean value
-        overrideUiControls = function(v) uiControlsOverridden = v end,
-    }
-}
-
diff --git a/files/data/scripts/omw/settings/common.lua b/files/data/scripts/omw/settings/common.lua
index cb83b4223b..7ca6628b08 100644
--- a/files/data/scripts/omw/settings/common.lua
+++ b/files/data/scripts/omw/settings/common.lua
@@ -6,8 +6,6 @@ local argumentSectionPostfix = 'Arguments'
 
 local contextSection = storage.playerSection or storage.globalSection
 local groupSection = contextSection(groupSectionKey)
-groupSection:reset()
-groupSection:removeOnExit()
 
 local function validateSettingOptions(options)
     if type(options) ~= 'table' then
@@ -92,7 +90,6 @@ local function registerGroup(options)
     }
     local valueSection = contextSection(options.key)
     local argumentSection = contextSection(options.key .. argumentSectionPostfix)
-    argumentSection:removeOnExit()
     for i, opt in ipairs(options.settings) do
         local setting = registerSetting(opt)
         setting.order = i
@@ -120,6 +117,7 @@ return {
         argumentSection:set(settingKey, argument)
     end,
     setGlobalEvent = 'OMWSettingsGlobalSet',
+    registerPageEvent = 'OmWSettingsRegisterPage',
     groupSectionKey = groupSectionKey,
     onLoad = function(saved)
         if not saved then return end
diff --git a/files/data/scripts/omw/settings/global.lua b/files/data/scripts/omw/settings/global.lua
index d84794f61d..15a9614636 100644
--- a/files/data/scripts/omw/settings/global.lua
+++ b/files/data/scripts/omw/settings/global.lua
@@ -1,10 +1,12 @@
 local storage = require('openmw.storage')
 
 local common = require('scripts.omw.settings.common')
+common.getSection(true, common.groupSectionKey):setLifeTime(storage.LIFE_TIME.Temporary)
 
 return {
     interfaceName = 'Settings',
     interface = {
+        version = 1,
         registerGroup = common.registerGroup,
         updateRendererArgument = common.updateRendererArgument,
     },
@@ -17,4 +19,4 @@ return {
             storage.globalSection(e.groupKey):set(e.settingKey, e.value)
         end,
     },
-}
\ No newline at end of file
+}
diff --git a/files/data/scripts/omw/settings/render.lua b/files/data/scripts/omw/settings/menu.lua
similarity index 59%
rename from files/data/scripts/omw/settings/render.lua
rename to files/data/scripts/omw/settings/menu.lua
index d4de143b02..3cb56f40e4 100644
--- a/files/data/scripts/omw/settings/render.lua
+++ b/files/data/scripts/omw/settings/menu.lua
@@ -1,3 +1,4 @@
+local menu = require('openmw.menu')
 local ui = require('openmw.ui')
 local util = require('openmw.util')
 local async = require('openmw.async')
@@ -5,18 +6,25 @@ local core = require('openmw.core')
 local storage = require('openmw.storage')
 local I = require('openmw.interfaces')
 
+local auxUi = require('openmw_aux.ui')
+
 local common = require('scripts.omw.settings.common')
+common.getSection(false, common.groupSectionKey):setLifeTime(storage.LIFE_TIME.GameSession)
+-- need to :reset() on reloadlua as well as game session end
+common.getSection(false, common.groupSectionKey):reset()
 
 local renderers = {}
 local function registerRenderer(name, renderFunction)
     renderers[name] = renderFunction
 end
+require('scripts.omw.settings.renderers')(registerRenderer)
 
 local interfaceL10n = core.l10n('Interface')
 
 local pages = {}
 local groups = {}
 local pageOptions = {}
+local groupElements = {}
 
 local interval = { template = I.MWUI.templates.interval }
 local growingIntreval = {
@@ -25,12 +33,12 @@ local growingIntreval = {
         grow = 1,
     },
 }
-local spacer =  {
+local spacer = {
     props = {
         size = util.vector2(0, 10),
     },
 }
-local bigSpacer =  {
+local bigSpacer = {
     props = {
         size = util.vector2(0, 50),
     },
@@ -45,7 +53,7 @@ local spacedLines = function(count)
     local content = {}
     table.insert(content, spacer)
     table.insert(content, stretchingLine)
-    for i = 2, count do
+    for _ = 2, count do
         table.insert(content, interval)
         table.insert(content, stretchingLine)
     end
@@ -112,6 +120,11 @@ local function renderSetting(group, setting, value, global)
         }
     end
     local argument = common.getArgumentSection(global, group.key):get(setting.key)
+    local ok, rendererResult = pcall(renderFunction, value, set, argument)
+    if not ok then
+        print(string.format('Setting %s renderer "%s" error: %s', setting.key, setting.renderer, rendererResult))
+    end
+
     return {
         name = setting.key,
         type = ui.TYPE.Flex,
@@ -125,7 +138,7 @@ local function renderSetting(group, setting, value, global)
         content = ui.content {
             titleLayout,
             growingIntreval,
-            renderFunction(value, set, argument),
+            ok and rendererResult or {}, -- TODO: display error?
         },
     }
 end
@@ -144,7 +157,7 @@ local function renderGroup(group, global)
         sortedSettings[setting.order] = setting
     end
     for _, setting in ipairs(sortedSettings) do
-        table.insert(settingLayouts, renderSetting(group, setting, valueSection:get(setting.key), global))
+        table.insert(settingLayouts, renderSetting(group, setting, valueSection:getCopy(setting.key), global))
     end
     local settingsContent = ui.content(interlaceSeparator(settingLayouts, spacedLines(1)))
 
@@ -241,10 +254,12 @@ end
 
 local function generateSearchHints(page)
     local hints = {}
-    local l10n = core.l10n(page.l10n)
-    table.insert(hints, l10n(page.name))
-    if page.description then
-        table.insert(hints, l10n(page.description))
+    do
+        local l10n = core.l10n(page.l10n)
+        table.insert(hints, l10n(page.name))
+        if page.description then
+            table.insert(hints, l10n(page.description))
+        end
     end
     local pageGroups = groups[page.key]
     for _, pageGroup in pairs(pageGroups) do
@@ -264,15 +279,28 @@ local function generateSearchHints(page)
     return table.concat(hints, ' ')
 end
 
-local function renderPage(page)
+local function renderPage(page, options)
     local l10n = core.l10n(page.l10n)
     local sortedGroups = {}
-    for i, v in ipairs(groups[page.key]) do sortedGroups[i] = v end
+    for _, group in pairs(groups[page.key]) do
+        table.insert(sortedGroups, group)
+    end
     table.sort(sortedGroups, pageGroupComparator)
     local groupLayouts = {}
     for _, pageGroup in ipairs(sortedGroups) do
-        local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key)
-        table.insert(groupLayouts, renderGroup(group, pageGroup.global))
+        local group = common.getSection(pageGroup.global, common.groupSectionKey):getCopy(pageGroup.key)
+        if not group then
+            error(string.format('%s group "%s" was not found', pageGroup.global and 'Global' or 'Player', pageGroup.key))
+        end
+        local groupElement = groupElements[page.key][group.key]
+        if not groupElement or not groupElement.layout then
+            groupElement = ui.create(renderGroup(group, pageGroup.global))
+        end
+        if groupElement.layout == nil then
+            error(string.format('Destroyed group element for %s %s', page.key, group.key))
+        end
+        groupElements[page.key][group.key] = groupElement
+        table.insert(groupLayouts, groupElement)
     end
     local groupsLayout = {
         name = 'groups',
@@ -320,74 +348,127 @@ local function renderPage(page)
             bigSpacer,
         },
     }
-    return {
-        name = l10n(page.name),
-        element = ui.create(layout),
-        searchHints = generateSearchHints(page),
-    }
+    options.name = l10n(page.name)
+    options.searchHints = generateSearchHints(page)
+    if options.element then
+        options.element.layout = layout
+        options.element:update()
+    else
+        options.element = ui.create(layout)
+    end
 end
 
 local function onSettingChanged(global)
     return async:callback(function(groupKey, settingKey)
-        local group = common.getSection(global, common.groupSectionKey):get(groupKey)
+        local group = common.getSection(global, common.groupSectionKey):getCopy(groupKey)
         if not group or not pageOptions[group.page] then return end
 
-        local value = common.getSection(global, group.key):get(settingKey)
+        local groupElement = groupElements[group.page][group.key]
 
-        local element = pageOptions[group.page].element
-        local groupsLayout = element.layout.content.groups
-        local groupLayout = groupsLayout.content[groupLayoutName(group.key, global)]
-        local settingsContent = groupLayout.content.settings.content
+        if not settingKey then
+            if groupElement then
+                groupElement.layout = renderGroup(group)
+                groupElement:update()
+            else
+                renderPage(pages[group.page], pageOptions[group.page])
+            end
+            return
+        end
+
+        local value = common.getSection(global, group.key):getCopy(settingKey)
+        local settingsContent = groupElement.layout.content.settings.content
+        auxUi.deepDestroy(settingsContent[settingKey]) -- support setting renderers which return UI elements
         settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
-        element:update()
+        groupElement:update()
     end)
 end
+
 local function onGroupRegistered(global, key)
     local group = common.getSection(global, common.groupSectionKey):get(key)
+    if not group then return end
+
     groups[group.page] = groups[group.page] or {}
-    local pageGroup =  {
+    groupElements[group.page] = groupElements[group.page] or {}
+
+    local pageGroup = {
         key = group.key,
         global = global,
         order = group.order,
     }
-    table.insert(groups[group.page], pageGroup)
-    common.getSection(global, group.key):subscribe(onSettingChanged(global))
-    common.getArgumentSection(global, group.key):subscribe(async:callback(function(_, settingKey)
-        local groupKey = group.key
-        local group = common.getSection(global, common.groupSectionKey):get(groupKey)
-        if not group or not pageOptions[group.page] then return end
 
-        local value = common.getSection(global, group.key):get(settingKey)
+    if not groups[group.page][pageGroup.key] then
+        common.getSection(global, group.key):subscribe(onSettingChanged(global))
+        common.getArgumentSection(global, group.key):subscribe(async:callback(function(_, settingKey)
+            if settingKey == nil then return end
 
-        local element = pageOptions[group.page].element
-        local groupsLayout = element.layout.content.groups
-        local groupLayout = groupsLayout.content[groupLayoutName(group.key, global)]
-        local settingsContent = groupLayout.content.settings.content
-        settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
-        element:update()
-    end))
+            local group = common.getSection(global, common.groupSectionKey):get(group.key)
+            if not group or not pageOptions[group.page] then return end
+
+            local value = common.getSection(global, group.key):getCopy(settingKey)
+
+            local element = groupElements[group.page][group.key]
+            local settingsContent = element.layout.content.settings.content
+            settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
+            element:update()
+        end))
+    end
+
+    groups[group.page][pageGroup.key] = pageGroup
 
     if not pages[group.page] then return end
-    local options = renderPage(pages[group.page])
-    if pageOptions[group.page] then
-        pageOptions[group.page].element:destroy()
-    else
-        pageOptions[group.page] = {}
+    pageOptions[group.page] = pageOptions[group.page] or {}
+    renderPage(pages[group.page], pageOptions[group.page])
+end
+
+local function updateGroups(global)
+    local groupSection = common.getSection(global, common.groupSectionKey)
+    for groupKey in pairs(groupSection:asTable()) do
+        onGroupRegistered(global, groupKey)
     end
-    for k, v in pairs(options) do
-        pageOptions[group.page][k] = v
+    groupSection:subscribe(async:callback(function(_, key)
+        if key then
+            onGroupRegistered(global, key)
+        else
+            for groupKey in pairs(groupSection:asTable()) do
+                onGroupRegistered(global, groupKey)
+            end
+        end
+    end))
+end
+local updatePlayerGroups = function() updateGroups(false) end
+local updateGlobalGroups = function() updateGroups(true) end
+
+local menuGroups = {}
+local menuPages = {}
+
+local function resetPlayerGroups()
+    local playerGroupsSection = storage.playerSection(common.groupSectionKey)
+    for pageKey, page in pairs(groups) do
+        for groupKey in pairs(page) do
+            if not menuGroups[groupKey] then
+                if groupElements[pageKey][groupKey] then
+                    groupElements[pageKey][groupKey]:destroy()
+                    groupElements[pageKey][groupKey] = nil
+                end
+                page[groupKey] = nil
+                playerGroupsSection:set(groupKey, nil)
+            end
+        end
+        local options = pageOptions[pageKey]
+        if options then
+            if not menuPages[pageKey] then
+                if options.element then
+                    auxUi.deepDestroy(options.element)
+                    options.element = nil
+                end
+                ui.removeSettingsPage(options)
+                pageOptions[pageKey] = nil
+            else
+                renderPage(pages[pageKey], options)
+            end
+        end
     end
 end
-local globalGroups = storage.globalSection(common.groupSectionKey)
-for groupKey in pairs(globalGroups:asTable()) do
-    onGroupRegistered(true, groupKey)
-end
-globalGroups:subscribe(async:callback(function(_, key)
-    if key then onGroupRegistered(true, key) end
-end))
-storage.playerSection(common.groupSectionKey):subscribe(async:callback(function(_, key)
-    if key then onGroupRegistered(false, key) end
-end))
 
 local function registerPage(options)
     if type(options) ~= 'table' then
@@ -413,11 +494,47 @@ local function registerPage(options)
     }
     pages[page.key] = page
     groups[page.key] = groups[page.key] or {}
-    pageOptions[page.key] = renderPage(page)
+    pageOptions[page.key] = pageOptions[page.key] or {}
+    renderPage(page, pageOptions[page.key])
     ui.registerSettingsPage(pageOptions[page.key])
 end
 
+updatePlayerGroups()
+if menu.getState() == menu.STATE.Running then -- handle reloadlua correctly
+    updateGlobalGroups()
+end
+
 return {
-    registerPage = registerPage,
-    registerRenderer = registerRenderer,
-}
\ No newline at end of file
+    interfaceName = 'Settings',
+    interface = {
+        version = 1,
+        registerPage = function(options)
+            registerPage(options)
+            menuPages[options.key] = true
+        end,
+        registerRenderer = registerRenderer,
+        registerGroup = function(options)
+            if not options.permanentStorage then
+                error('Menu scripts are only allowed to register setting groups with permanentStorage = true')
+            end
+            common.registerGroup(options)
+            menuGroups[options.key] = true
+        end,
+        updateRendererArgument = common.updateRendererArgument,
+    },
+    engineHandlers = {
+        onStateChanged = function()
+            if menu.getState() == menu.STATE.Running then
+                updatePlayerGroups()
+                updateGlobalGroups()
+            elseif menu.getState() == menu.STATE.NoGame then
+                resetPlayerGroups()
+            end
+        end,
+    },
+    eventHandlers = {
+        [common.registerPageEvent] = function(options)
+            registerPage(options)
+        end,
+    }
+}
diff --git a/files/data/scripts/omw/settings/player.lua b/files/data/scripts/omw/settings/player.lua
index ae483935d5..4ec61a73c7 100644
--- a/files/data/scripts/omw/settings/player.lua
+++ b/files/data/scripts/omw/settings/player.lua
@@ -1,7 +1,11 @@
-local common = require('scripts.omw.settings.common')
-local render = require('scripts.omw.settings.render')
+local types = require('openmw.types')
+local self = require('openmw.self')
 
-require('scripts.omw.settings.renderers')(render.registerRenderer)
+local common = require('scripts.omw.settings.common')
+
+local function registerPage(options)
+    types.Player.sendMenuEvent(self, common.registerPageEvent, options)
+end
 
 ---
 -- @type PageOptions
@@ -71,11 +75,11 @@ return {
     -- local globalSettings = storage.globalSection('SettingsGlobalMyMod')
     interface = {
         ---
-        -- @field [parent=#Settings] #string version
-        version = 0,
+        -- @field [parent=#Settings] #number version
+        version = 1,
         ---
         -- @function [parent=#Settings] registerPage Register a page to be displayed in the settings menu,
-        --   only available in player scripts
+        --   available in player and menu scripts
         -- @param #PageOptions options
         -- @usage
         -- I.Settings.registerPage({
@@ -84,10 +88,10 @@ return {
         --   name = 'MyModName',
         --   description = 'MyModDescription',
         -- })---
-        registerPage = render.registerPage,
+        registerPage = registerPage,
         ---
         -- @function [parent=#Settings] registerRenderer Register a renderer,
-        --   only avaialable in player scripts
+        --   only available in menu scripts (DEPRECATED in player scripts)
         -- @param #string key
         -- @param #function renderer A renderer function, receives setting's value,
         --   a function to change it and an argument from the setting options
@@ -107,10 +111,14 @@ return {
         --     },
         --   }
         -- end)
-        registerRenderer = render.registerRenderer,
+        registerRenderer = function(name)
+            print(([[Can't register setting renderer "%s". registerRenderer and moved to Menu context Settings interface]])
+                :format(name))
+        end,
         ---
         -- @function [parent=#Settings] registerGroup Register a group to be attached to a page,
-        --   available both in player and global scripts
+        --   available in player, menu and global scripts
+        --   Note: menu scripts only allow group with permanentStorage = true, but can render the page before a game is loaded!
         -- @param #GroupOptions options
         -- @usage
         -- I.Settings.registerGroup {
@@ -140,7 +148,7 @@ return {
         registerGroup = common.registerGroup,
         ---
         -- @function [parent=#Settings] updateRendererArgument Change the renderer argument of a setting
-        --   available both in player and global scripts
+        --   available both in player, menu and global scripts
         -- @param #string groupKey A settings group key
         -- @param #string settingKey A setting key
         -- @param argument A renderer argument
diff --git a/files/data/scripts/omw/settings/renderers.lua b/files/data/scripts/omw/settings/renderers.lua
index 82005916de..fd9ab0b743 100644
--- a/files/data/scripts/omw/settings/renderers.lua
+++ b/files/data/scripts/omw/settings/renderers.lua
@@ -151,17 +151,26 @@ return function(registerRenderer)
             if not argument.l10n then
                 error('"select" renderer requires a "l10n" argument')
             end
+            if not pcall(function()
+                    local _ = ipairs(argument.items)
+                    assert(#argument.items > 0)
+                end)
+            then
+                error('"select" renderer requires an "items" array as an argument')
+            end
             local l10n = core.l10n(argument.l10n)
             local index = nil
-            local itemCount = 0
+            local itemCount = #argument.items
             for i, item in ipairs(argument.items) do
-                itemCount = itemCount + 1
                 if item == value then
                     index = i
                 end
             end
-            if not index then return {} end
-            local label = l10n(value)
+            local label = l10n(tostring(value))
+            local labelColor = nil
+            if index == nil then
+                labelColor = util.color.rgb(1, 0, 0)
+            end
             local body = {
                 type = ui.TYPE.Flex,
                 props = {
@@ -177,6 +186,10 @@ return function(registerRenderer)
                         },
                         events = {
                             mouseClick = async:callback(function()
+                                if not index then
+                                    set(argument.items[#argument.items])
+                                    return
+                                end
                                 index = (index - 2) % itemCount + 1
                                 set(argument.items[index])
                             end),
@@ -187,6 +200,7 @@ return function(registerRenderer)
                         template = I.MWUI.templates.textNormal,
                         props = {
                             text = label,
+                            textColor = labelColor,
                         },
                         external = {
                             grow = 1,
@@ -201,6 +215,10 @@ return function(registerRenderer)
                         },
                         events = {
                             mouseClick = async:callback(function()
+                                if not index then
+                                    set(argument.items[1])
+                                    return
+                                end
                                 index = (index) % itemCount + 1
                                 set(argument.items[index])
                             end),
@@ -246,7 +264,9 @@ return function(registerRenderer)
                     focusLoss = async:callback(function()
                         if not lastInput then return end
                         if not pcall(function() set(util.color.hex(lastInput)) end)
-                        then set(value) end
+                        then
+                            set(value)
+                        end
                     end),
                 },
             }
diff --git a/files/data/scripts/omw/skillhandlers.lua b/files/data/scripts/omw/skillhandlers.lua
new file mode 100644
index 0000000000..26fff6e799
--- /dev/null
+++ b/files/data/scripts/omw/skillhandlers.lua
@@ -0,0 +1,290 @@
+local self = require('openmw.self')
+local I = require('openmw.interfaces')
+local types = require('openmw.types')
+local core = require('openmw.core')
+local NPC = require('openmw.types').NPC
+local Skill = core.stats.Skill
+
+---
+-- Table of skill use types defined by morrowind.
+-- Each entry corresponds to an index into the available skill gain values
+-- of a @{openmw.core#SkillRecord}
+-- @type SkillUseType
+-- @field #number Armor_HitByOpponent 0
+-- @field #number Block_Success 0
+-- @field #number Spellcast_Success 0
+-- @field #number Weapon_SuccessfulHit 0
+-- @field #number Alchemy_CreatePotion 0
+-- @field #number Alchemy_UseIngredient 1
+-- @field #number Enchant_Recharge 0
+-- @field #number Enchant_UseMagicItem 1
+-- @field #number Enchant_CreateMagicItem 2
+-- @field #number Enchant_CastOnStrike 3
+-- @field #number Acrobatics_Jump 0
+-- @field #number Acrobatics_Fall 1
+-- @field #number Mercantile_Success 0
+-- @field #number Mercantile_Bribe 1
+-- @field #number Security_DisarmTrap 0
+-- @field #number Security_PickLock 1
+-- @field #number Sneak_AvoidNotice 0
+-- @field #number Sneak_PickPocket 1
+-- @field #number Speechcraft_Success 0
+-- @field #number Speechcraft_Fail 1
+-- @field #number Armorer_Repair 0
+-- @field #number Athletics_RunOneSecond 0
+-- @field #number Athletics_SwimOneSecond 1
+
+---
+-- Table of all existing sources for skill increases. Any sources not listed below will be treated as equal to Trainer.
+-- @type SkillLevelUpSource
+-- @field #string Book book
+-- @field #string Trainer trainer
+-- @field #string Usage usage
+
+
+local skillUsedHandlers = {}
+local skillLevelUpHandlers = {}
+
+local function tableHasValue(table, value)
+    for _, v in pairs(table) do 
+        if v == value then return true end 
+    end
+    return false
+end
+
+local function shallowCopy(t1)
+    local t2 = {}
+    for key, value in pairs(t1) do t2[key] = value end
+    return t2
+end
+
+local function getSkillProgressRequirement(skillid)
+    local npcRecord = NPC.record(self)
+    local class = NPC.classes.record(npcRecord.class)
+    local skillStat = NPC.stats.skills[skillid](self)
+    local skillRecord = Skill.record(skillid)
+    
+    local factor = core.getGMST('fMiscSkillBonus')
+    if tableHasValue(class.majorSkills, skillid) then 
+        factor = core.getGMST('fMajorSkillBonus')
+    elseif tableHasValue(class.minorSkills, skillid) then 
+        factor = core.getGMST('fMinorSkillBonus')
+    end
+
+    if skillRecord.specialization == class.specialization then
+        factor = factor * core.getGMST('fSpecialSkillBonus')
+    end
+
+    return (skillStat.base + 1) * factor
+end
+
+
+local function skillUsed(skillid, options)
+    if #skillUsedHandlers == 0 then
+        -- If there are no handlers, then there won't be any effect, so skip calculations
+        return
+    end
+    
+    -- Make a copy so we don't change the caller's table
+    options = shallowCopy(options)
+    
+    -- Compute use value if it was not supplied directly
+    if not options.skillGain then
+        if not options.useType or options.useType > 3 or options.useType < 0 then
+            print('Error: Unknown useType: '..tostring(options.useType))
+            return
+        end
+        local skillStat = NPC.stats.skills[skillid](self)
+        local skillRecord = Skill.record(skillid)
+        options.skillGain = skillRecord.skillGain[options.useType + 1]
+
+        if options.scale then 
+            options.skillGain = options.skillGain * options.scale
+        end
+    end
+
+    for i = #skillUsedHandlers, 1, -1 do
+        if skillUsedHandlers[i](skillid, options) == false then
+            return
+        end
+    end
+end
+
+local function skillLevelUp(skillid, source)
+    if #skillLevelUpHandlers == 0 then
+        -- If there are no handlers, then there won't be any effect, so skip calculations
+        return
+    end
+
+    local skillRecord = Skill.record(skillid)
+    local npcRecord = NPC.record(self)
+    local class = NPC.classes.record(npcRecord.class)
+    
+    local levelUpProgress = 0
+    local levelUpAttributeIncreaseValue = core.getGMST('iLevelupMiscMultAttriubte')
+
+    if tableHasValue(class.minorSkills, skillid) then 
+        levelUpProgress = core.getGMST('iLevelUpMinorMult')
+        levelUpAttributeIncreaseValue = core.getGMST('iLevelUpMinorMultAttribute')
+    elseif tableHasValue(class.majorSkills, skillid) then 
+        levelUpProgress = core.getGMST('iLevelUpMajorMult')
+        levelUpAttributeIncreaseValue = core.getGMST('iLevelUpMajorMultAttribute')
+    end
+
+    local options = 
+    {
+        skillIncreaseValue = 1,
+        levelUpProgress = levelUpProgress,
+        levelUpAttribute = skillRecord.attribute,
+        levelUpAttributeIncreaseValue = levelUpAttributeIncreaseValue,
+        levelUpSpecialization = skillRecord.specialization,
+        levelUpSpecializationIncreaseValue = core.getGMST('iLevelupSpecialization'),
+    }
+
+    for i = #skillLevelUpHandlers, 1, -1 do
+        if skillLevelUpHandlers[i](skillid, source, options) == false then
+            return
+        end
+    end
+end
+
+return {
+    interfaceName = 'SkillProgression',
+    ---
+    -- Allows to extend or override built-in skill progression mechanics.
+    -- @module SkillProgression
+    -- @usage local I = require('openmw.interfaces')
+    --
+    -- -- Forbid increasing destruction skill past 50
+    -- I.SkillProgression.addSkillLevelUpHandler(function(skillid, options) 
+    --     if skillid == 'destruction' and types.NPC.stats.skills.destruction(self).base >= 50 then
+    --         return false
+    --     end
+    -- end)
+    --
+    -- -- Scale sneak skill progression based on active invisibility effects
+    -- I.SkillProgression.addSkillUsedHandler(function(skillid, params)
+    --     if skillid == 'sneak' and params.useType == I.SkillProgression.SKILL_USE_TYPES.Sneak_AvoidNotice then
+    --         local activeEffects = Actor.activeEffects(self)
+    --         local visibility = activeEffects:getEffect(core.magic.EFFECT_TYPE.Chameleon).magnitude / 100
+    --         visibility = visibility + activeEffects:getEffect(core.magic.EFFECT_TYPE.Invisibility).magnitude
+    --         visibility = 1 - math.min(1, math.max(0, visibility))
+    --         local oldSkillGain = params.skillGain
+    --         params.skillGain = oldSkillGain * visibility
+    --     end
+    -- end)
+    -- 
+    interface = {
+        --- Interface version
+        -- @field [parent=#SkillProgression] #number version
+        version = 1,
+
+        --- Add new skill level up handler for this actor.
+        -- For load order consistency, handlers should be added in the body if your script.
+        -- If `handler(skillid, source, options)` returns false, other handlers (including the default skill level up handler) 
+        -- will be skipped. Where skillid and source are the parameters passed to @{#SkillProgression.skillLevelUp}, and options is
+        -- a modifiable table of skill level up values, and can be modified to change the behavior of later handlers. 
+        -- These values are calculated based on vanilla mechanics. Setting any value to nil will cause that mechanic to be skipped. By default contains these values:
+        --
+        --   * `skillIncreaseValue` - The numeric amount of skill levels gained.
+        --   * `levelUpProgress` - The numeric amount of level up progress gained.
+        --   * `levelUpAttribute` - The string identifying the attribute that should receive points from this skill level up.
+        --   * `levelUpAttributeIncreaseValue` - The numeric amount of attribute increase points received. This contributes to the amount of each attribute the character receives during a vanilla level up.
+        --   * `levelUpSpecialization` - The string identifying the specialization that should receive points from this skill level up.
+        --   * `levelUpSpecializationIncreaseValue` - The numeric amount of specialization increase points received. This contributes to the icon displayed at the level up screen during a vanilla level up.
+        --
+        -- @function [parent=#SkillProgression] addSkillLevelUpHandler
+        -- @param #function handler The handler.
+        addSkillLevelUpHandler = function(handler)
+            skillLevelUpHandlers[#skillLevelUpHandlers + 1] = handler
+        end,
+
+        --- Add new skillUsed handler for this actor.
+        -- For load order consistency, handlers should be added in the body of your script.
+        -- If `handler(skillid, options)` returns false, other handlers (including the default skill progress handler) 
+        -- will be skipped. Where options is a modifiable table of skill progression values, and can be modified to change the behavior of later handlers. 
+        -- Contains a `skillGain` value as well as a shallow copy of the options passed to @{#SkillProgression.skillUsed}.
+        -- @function [parent=#SkillProgression] addSkillUsedHandler
+        -- @param #function handler The handler.
+        addSkillUsedHandler = function(handler)
+            skillUsedHandlers[#skillUsedHandlers + 1] = handler
+        end,
+        
+        --- Trigger a skill use, activating relevant handlers
+        -- @function [parent=#SkillProgression] skillUsed
+        -- @param #string skillid The if of the skill that was used
+        -- @param options A table of parameters. Must contain one of `skillGain` or `useType`. It's best to always include `useType` if applicable, even if you set `skillGain`, as it may be used
+        -- by handlers to make decisions. See the addSkillUsedHandler example at the top of this page.
+        --
+        --   * `skillGain` - The numeric amount of skill to be gained.
+        --   * `useType` - #SkillUseType, A number from 0 to 3 (inclusive) representing the way the skill was used, with each use type having a different skill progression rate. Available use types and its effect is skill specific. See @{#SkillUseType}
+        --
+        -- And may contain the following optional parameter:
+        --
+        --   * `scale` - A numeric value used to scale the skill gain. Ignored if the `skillGain` parameter is set.
+        --
+        -- Note that a copy of this table is passed to skill used handlers, so any parameters passed to this method will also be passed to the handlers. This can be used to provide additional information to
+        -- custom handlers when making custom skill progressions.
+        --
+        skillUsed = skillUsed,
+
+        --- @{#SkillUseType}
+        -- @field [parent=#SkillProgression] #SkillUseType SKILL_USE_TYPES Available skill usage types
+        SKILL_USE_TYPES = {
+            -- These are shared by multiple skills
+            Armor_HitByOpponent = 0,
+            Block_Success = 0,
+            Spellcast_Success = 0,
+            Weapon_SuccessfulHit = 0,
+
+            -- Skill-specific use types
+            Alchemy_CreatePotion = 0,
+            Alchemy_UseIngredient = 1,
+            Enchant_Recharge = 0,
+            Enchant_UseMagicItem = 1,
+            Enchant_CreateMagicItem = 2,
+            Enchant_CastOnStrike = 3,
+            Acrobatics_Jump = 0,
+            Acrobatics_Fall = 1,
+            Mercantile_Success = 0,
+            Mercantile_Bribe = 1, -- Note: This is bugged in vanilla and is not actually in use.
+            Security_DisarmTrap = 0,
+            Security_PickLock = 1,
+            Sneak_AvoidNotice = 0,
+            Sneak_PickPocket = 1,
+            Speechcraft_Success = 0,
+            Speechcraft_Fail = 1,
+            Armorer_Repair = 0,
+            Athletics_RunOneSecond = 0,
+            Athletics_SwimOneSecond = 1,
+        },
+        
+        --- Trigger a skill level up, activating relevant handlers
+        -- @function [parent=#SkillProgression] skillLevelUp
+        -- @param #string skillid The id of the skill to level up.
+        -- @param #SkillLevelUpSource source The source of the skill increase.
+        skillLevelUp = skillLevelUp,
+        
+        --- @{#SkillLevelUpSource}
+        -- @field [parent=#SkillProgression] #SkillLevelUpSource SKILL_INCREASE_SOURCES
+        SKILL_INCREASE_SOURCES = {
+            Book = 'book',
+            Usage = 'usage',
+            Trainer = 'trainer',
+        },
+        
+        --- Compute the total skill gain required to level up a skill based on its current level, and other modifying factors such as major skills and specialization.
+        -- @function [parent=#SkillProgression] getSkillProgressRequirement
+        -- @param #string skillid The id of the skill to compute skill progress requirement for
+        getSkillProgressRequirement = getSkillProgressRequirement
+    },
+    engineHandlers = { 
+        -- Use the interface in these handlers so any overrides will receive the calls.
+        _onSkillUse = function (skillid, useType, scale)
+            I.SkillProgression.skillUsed(skillid, {useType = useType, scale = scale})
+        end,
+        _onSkillLevelUp = function (skillid, source)
+            I.SkillProgression.skillLevelUp(skillid, source)
+        end,
+    },
+}
diff --git a/files/data/scripts/omw/ui.lua b/files/data/scripts/omw/ui.lua
index 0c15e53bc3..1e76b8e141 100644
--- a/files/data/scripts/omw/ui.lua
+++ b/files/data/scripts/omw/ui.lua
@@ -1,6 +1,7 @@
 local ui = require('openmw.ui')
 local util = require('openmw.util')
 local self = require('openmw.self')
+local core = require('openmw.core')
 local ambient = require('openmw.ambient')
 
 local MODE = ui._getAllUiModes()
@@ -10,6 +11,11 @@ local replacedWindows = {}
 local hiddenWindows = {}
 local modeStack = {}
 
+local modePause = {}
+for _, mode in pairs(MODE) do
+    modePause[mode] = true
+end
+
 local function registerWindow(window, showFn, hideFn)
     if not WINDOW[window] then
         error('At the moment it is only possible to override existing windows. Window "'..
@@ -93,7 +99,7 @@ local function removeMode(mode)
 end
 
 local oldMode = nil
-local function onUiModeChanged(arg)
+local function onUiModeChanged(changedByLua, arg)
     local newStack = ui._getUiModeStack()
     for i = 1, math.max(#modeStack, #newStack) do
         modeStack[i] = newStack[i]
@@ -106,6 +112,9 @@ local function onUiModeChanged(arg)
     end
     local mode = newStack[#newStack]
     if mode then
+        if not changedByLua then
+            updateHidden(mode)
+        end
         for _, w in pairs(ui._getAllowedWindows(mode)) do
             local state = replacedWindows[w]
             if state and not hiddenWindows[w] then
@@ -114,6 +123,15 @@ local function onUiModeChanged(arg)
             end
         end
     end
+    local shouldPause = false
+    for _, m in pairs(modeStack) do
+        shouldPause = shouldPause or modePause[m]
+    end
+    if shouldPause then
+        core.sendGlobalEvent('Pause', 'ui')
+    else
+        core.sendGlobalEvent('Unpause', 'ui')
+    end
     self:sendEvent('UiModeChanged', {oldMode = oldMode, newMode = mode, arg = arg})
     oldMode = mode
 end
@@ -145,7 +163,7 @@ return {
     interface = {
         --- Interface version
         -- @field [parent=#UI] #number version
-        version = 0,
+        version = 1,
 
         --- All available UI modes.
         -- Use `view(I.UI.MODE)` in `luap` console mode to see the list.
@@ -204,10 +222,25 @@ return {
         -- @param #string mode Mode to drop
         removeMode = removeMode,
 
+        --- Set whether the mode should pause the game.
+        -- @function [parent=#UI] setPauseOnMode
+        -- @param #string mode Mode to configure
+        -- @param #boolean shouldPause
+        setPauseOnMode = function(mode, shouldPause) modePause[mode] = shouldPause end,
+
+        --- Set whether the UI should be visible.
+        -- @function [parent=#UI] setHudVisibility
+        -- @param #boolean showHud
+        setHudVisibility = function(showHud) ui._setHudVisibility(showHud) end,
+
+        ---
+        -- Returns if the player HUD is visible or not
+        -- @function [parent=#UI] isHudVisible
+        -- @return #boolean
+        isHudVisible = function() return ui._isHudVisible() end,
+
         -- TODO
         -- registerHudElement = function(name, showFn, hideFn) end,
-        -- showHud = function(bool) end,
-        -- isHudVisible = function() end,
         -- showHudElement = function(name, bool) end,
         -- hudElements,  -- map from element name to its visibility
     },
@@ -216,5 +249,7 @@ return {
     },
     eventHandlers = {
         UiModeChanged = onUiModeChangedEvent,
+        AddUiMode = function(options) addMode(options.mode, options) end,
+        SetUiMode = function(options) setMode(options.mode, options) end,
     },
 }
diff --git a/files/data/scripts/omw/usehandlers.lua b/files/data/scripts/omw/usehandlers.lua
new file mode 100644
index 0000000000..563e31b3b7
--- /dev/null
+++ b/files/data/scripts/omw/usehandlers.lua
@@ -0,0 +1,98 @@
+local types = require('openmw.types')
+local world = require('openmw.world')
+
+local handlersPerObject = {}
+local handlersPerType = {}
+
+local function useItem(obj, actor, force)
+    local options = { force = force or false }
+    local handlers = handlersPerObject[obj.id]
+    if handlers then
+        for i = #handlers, 1, -1 do
+            if handlers[i](obj, actor, options) == false then
+                return -- skip other handlers
+            end
+        end
+    end
+    handlers = handlersPerType[obj.type]
+    if handlers then
+        for i = #handlers, 1, -1 do
+            if handlers[i](obj, actor, options) == false then
+                return -- skip other handlers
+            end
+        end
+    end
+    world._runStandardUseAction(obj, actor, options.force)
+end
+
+return {
+    interfaceName = 'ItemUsage',
+    ---
+    -- Allows to extend or override built-in item usage mechanics.
+    -- Note: at the moment it can override item usage in inventory
+    -- (dragging an item on the character's model), but
+    --
+    -- * can't intercept actions performed by mwscripts;
+    -- * can't intercept actions performed by the AI (i.e. drinking a potion in combat);
+    -- * can't intercept actions performed via quick keys menu.
+    -- @module ItemUsage
+    -- @usage local I = require('openmw.interfaces')
+    --
+    -- -- Override Use action (global script).
+    -- -- Forbid equipping armor with weight > 5
+    -- I.ItemUsage.addHandlerForType(types.Armor, function(armor, actor)
+    --     if types.Armor.record(armor).weight > 5 then
+    --         return false -- disable other handlers
+    --     end
+    -- end)
+    --
+    -- -- Call Use action (any script).
+    -- core.sendGlobalEvent('UseItem', {object = armor, actor = player})
+    interface = {
+        --- Interface version
+        -- @field [parent=#ItemUsage] #number version
+        version = 0,
+
+        --- Add new use action handler for a specific object.
+        -- If `handler(object, actor, options)` returns false, other handlers for
+        -- the same object (including type handlers) will be skipped.
+        -- @function [parent=#ItemUsage] addHandlerForObject
+        -- @param openmw.core#GameObject obj The object.
+        -- @param #function handler The handler.
+        addHandlerForObject = function(obj, handler)
+            local handlers = handlersPerObject[obj.id]
+            if handlers == nil then
+                handlers = {}
+                handlersPerObject[obj.id] = handlers
+            end
+            handlers[#handlers + 1] = handler
+        end,
+
+        --- Add new use action handler for a type of objects.
+        -- If `handler(object, actor, options)` returns false, other handlers for
+        -- the same object (including type handlers) will be skipped.
+        -- @function [parent=#ItemUsage] addHandlerForType
+        -- @param #any type A type from the `openmw.types` package.
+        -- @param #function handler The handler.
+        addHandlerForType = function(type, handler)
+            local handlers = handlersPerType[type]
+            if handlers == nil then
+                handlers = {}
+                handlersPerType[type] = handlers
+            end
+            handlers[#handlers + 1] = handler
+        end,
+    },
+    engineHandlers = { _onUseItem = useItem },
+    eventHandlers = {
+        UseItem = function(data)
+            if not data.object then
+                error('UseItem: missing argument "object"')
+            end
+            if not data.actor or not types.Actor.objectIsInstance(data.actor) then
+                error('UseItem: invalid argument "actor"')
+            end
+            useItem(data.object, data.actor, data.force)
+        end
+    }
+}
diff --git a/files/data/scripts/omw/worldeventhandlers.lua b/files/data/scripts/omw/worldeventhandlers.lua
new file mode 100644
index 0000000000..4e7f96fcb7
--- /dev/null
+++ b/files/data/scripts/omw/worldeventhandlers.lua
@@ -0,0 +1,11 @@
+local world = require('openmw.world')
+
+return {
+    eventHandlers = {
+        Pause = function(tag) world.pause(tag) end,
+        Unpause = function(tag) world.unpause(tag) end,
+        SetGameTimeScale = function(scale) world.setGameTimeScale(scale) end,
+        SetSimulationTimeScale = function(scale) world.setSimulationTimeScale(scale) end,
+        SpawnVfx = function(data) world.vfx.spawn(data.model, data.position, data.options) end,
+    },
+}
diff --git a/files/data/shaders/bloomlinear.omwfx b/files/data/shaders/bloomlinear.omwfx
index 3de7139f39..4c583a9a89 100644
--- a/files/data/shaders/bloomlinear.omwfx
+++ b/files/data/shaders/bloomlinear.omwfx
@@ -80,8 +80,8 @@ shared {
         radius = max(radius, 0.1);
         // hack: make the radius wider on the screen edges
         // (makes things in the corner of the screen look less "wrong" with not-extremely-low FOVs)
-        radius *= pow(texcoord.x*2.0-1.0, 2)+1.0;
-        radius *= pow(texcoord.y*2.0-1.0, 2)+1.0;
+        radius *= pow(texcoord.x*2.0-1.0, 2.0)+1.0;
+        radius *= pow(texcoord.y*2.0-1.0, 2.0)+1.0;
         return radius;
     }
     vec3 powv(vec3 a, float x)
@@ -94,7 +94,7 @@ render_target RT_NoMipmap {
     width_ratio = 0.25;
     height_ratio = 0.25;
     internal_format = rgb16f;
-    source_type = float;
+    source_type = half_float;
     source_format = rgb;
     mipmaps = false;
     min_filter = nearest;
@@ -105,7 +105,7 @@ render_target RT_Horizontal {
     width_ratio = 0.25;
     height_ratio = 0.25;
     internal_format = rgb16f;
-    source_type = float;
+    source_type = half_float;
     source_format = rgb;
     mipmaps = false;
     min_filter = nearest;
@@ -116,7 +116,7 @@ render_target RT_Vertical {
     width_ratio = 0.25;
     height_ratio = 0.25;
     internal_format = rgb16f;
-    source_type = float;
+    source_type = half_float;
     source_format = rgb;
     mipmaps = false;
     min_filter = linear;
diff --git a/files/data/shaders/debug.omwfx b/files/data/shaders/debug.omwfx
index 360dfa26cd..a0c8754ec4 100644
--- a/files/data/shaders/debug.omwfx
+++ b/files/data/shaders/debug.omwfx
@@ -19,6 +19,11 @@ uniform_bool uDisplayNormals {
     display_name = "#{OMWShaders:DisplayNormalsName}";
 }
 
+uniform_bool uNormalsInWorldSpace {
+    default = false;
+    display_name = "#{OMWShaders:NormalsInWorldSpace}";
+}
+
 fragment main {
 
     omw_In vec2 omw_TexCoord;
@@ -30,8 +35,12 @@ fragment main {
         if (uDisplayDepth)
             omw_FragColor = vec4(vec3(omw_GetLinearDepth(omw_TexCoord) / omw.far * uDepthFactor), 1.0);
 #if OMW_NORMALS
-        if (uDisplayNormals && (!uDisplayDepth || omw_TexCoord.x < 0.5))
-            omw_FragColor.rgb = omw_GetNormals(omw_TexCoord) * 0.5 + 0.5;
+        if (uDisplayNormals && (!uDisplayDepth || omw_TexCoord.x < 0.5)) {
+            if (uNormalsInWorldSpace)
+                omw_FragColor.rgb = omw_GetNormalsWorldSpace(omw_TexCoord) * 0.5 + 0.5;
+            else
+                omw_FragColor.rgb = omw_GetNormals(omw_TexCoord) * 0.5 + 0.5;
+        }
 #endif
     }
 }
diff --git a/files/data/shaders/internal_distortion.omwfx b/files/data/shaders/internal_distortion.omwfx
new file mode 100644
index 0000000000..b641bb6711
--- /dev/null
+++ b/files/data/shaders/internal_distortion.omwfx
@@ -0,0 +1,25 @@
+fragment main {
+
+    omw_In vec2 omw_TexCoord;
+
+    void main()
+    {
+        const float multiplier = 0.14;
+
+        vec2 offset = omw_Texture2D(omw_SamplerDistortion, omw_TexCoord).rg;
+        offset *= multiplier;
+        offset = clamp(offset, vec2(-1.0), vec2(1.0));
+
+        float occlusionFactor = omw_Texture2D(omw_SamplerDistortion, omw_TexCoord+offset).b;
+
+        omw_FragColor = mix(omw_GetLastShader(omw_TexCoord + offset), omw_GetLastShader(omw_TexCoord), occlusionFactor);
+    }
+}
+
+technique {
+    description = "Internal refraction shader for OpenMW";
+    version = "1.0";
+    author = "OpenMW";
+    passes = main;
+    flags = hidden;
+}
diff --git a/files/gamecontrollerdb.txt b/files/gamecontrollerdb.txt
index bdc2108f67..ccdea73f6d 100644
--- a/files/gamecontrollerdb.txt
+++ b/files/gamecontrollerdb.txt
@@ -1,17 +1,95 @@
-# Game Controller DB for SDL in post 2.0.6 format
+# Game Controller DB for SDL in 2.0.16 format
 # Source: https://github.com/gabomdq/SDL_GameControllerDB
+
 # Windows
-03000000fa2d00000100000000000000,3DRUDDER,leftx:a0,lefty:a1,rightx:a5,righty:a2,platform:Windows,
-03000000c82d00002038000000000000,8bitdo,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-03000000022000000090000000000000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-03000000203800000900000000000000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-03000000c82d00000060000000000000,8Bitdo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-03000000c82d00000061000000000000,8Bitdo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-03000000102800000900000000000000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
-03000000c82d00003028000000000000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
-03000000a00500003232000000000000,8Bitdo Zero GamePad,a:b0,b:b1,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
-030000008f0e00001200000000000000,Acme GA-02,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
-03000000fa190000f0ff000000000000,Acteck AGJ-3200,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000300f00000a01000000000000,3 In 1 Conversion Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
+03000000fa190000918d000000000000,3 In 1 Conversion Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
+03000000fa2d00000100000000000000,3dRudder Foot Motion Controller,leftx:a0,lefty:a1,rightx:a5,righty:a2,platform:Windows,
+03000000d0160000040d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000050d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000060d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000070d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000600a000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000c82d00000031000000000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000531000000000000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000951000000000000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightx:a3,righty:a5,start:b11,platform:Windows,
+03000000008000000210000000000000,8BitDo F30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000003512000011ab000000000000,8BitDo F30 Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000c82d00001028000000000000,8BitDo F30 Arcade Joystick,a:b0,b:b1,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d000011ab000000000000,8BitDo F30 Arcade Joystick,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000801000000900000000000000,8BitDo F30 Arcade Stick,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001038000000000000,8BitDo F30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000090000000000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+05000000c82d00006a28000000000000,8BitDo GameCube,a:b0,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b9,paddle2:b8,rightshoulder:b10,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b1,y:b4,platform:Windows,
+03000000c82d00001251000000000000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001151000000000000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000150000000000000,8BitDo M30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000151000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000650000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00005106000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,guide:b2,leftshoulder:b8,lefttrigger:b9,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00002090000000000000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000310000000000000,8BitDo N30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000451000000000000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightx:a3,righty:a5,start:b11,platform:Windows,
+03000000c82d00002028000000000000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00008010000000000000,8BitDo N30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d0000e002000000000000,8BitDo N30,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,start:b6,platform:Windows,
+03000000c82d00000190000000000000,8BitDo N30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001590000000000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00006528000000000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000290000000000000,8BitDo N64,+rightx:b9,+righty:b3,-rightx:b4,-righty:b8,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,platform:Windows,
+03000000c82d00003038000000000000,8BitDo N64,+rightx:b9,+righty:b3,-rightx:b4,-righty:b8,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,platform:Windows,
+03000000c82d00006928000000000000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b11,platform:Windows,
+03000000c82d00002590000000000000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000003512000012ab000000000000,8BitDo NES30,a:b2,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Windows,
+03000000c82d000012ab000000000000,8BitDo NES30,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000022000000090000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000203800000900000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00002038000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000751000000000000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000851000000000000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000360000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000361000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000660000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000131000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000231000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000331000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000431000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00002867000000000000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a2,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b10,x:b3,y:b4,platform:Windows,
+03000000c82d00000130000000000000,8BitDo SF30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000060000000000000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000061000000000000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000102800000900000000000000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d000021ab000000000000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00003028000000000000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+030000003512000020ab000000000000,8BitDo SN30,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000030000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000351000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a2,rightshoulder:b7,rightx:a3,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001290000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d000020ab000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00004028000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00006228000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000021000000000000,8BitDo SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000160000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000161000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000260000000000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000261000000000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001230000000000000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001b30000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001d30000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001530000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001630000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001730000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001130000000000000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b26,paddle1:b24,paddle2:b25,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001330000000000000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000121000000000000,8BitDo Xbox One SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000a00500003232000000000000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001890000000000000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00003032000000000000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+030000008f0e00001200000000000000,Acme GA02,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000c01100000355000000000000,Acrux,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000fa190000f0ff000000000000,Acteck AGJ 3200,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d1180000402c000000000000,ADT1,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a3,rightx:a2,righty:a5,x:b3,y:b4,platform:Windows,
+030000006f0e00008801000000000000,Afterglow Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000341a00003608000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00000263000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00001101000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
@@ -19,600 +97,1982 @@
 030000006f0e00001402000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00001901000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00001a01000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000d62000001d57000000000000,Airflo PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000d6200000e557000000000000,Batarang,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001301000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00001302000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00001304000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00001413000000000000,Afterglow Xbox Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00003901000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ab1200000103000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000000f9000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000100000008200000000000000,Akishop Customs PS360,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000007c1800000006000000000000,Alienware Dual Compatible PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000491900001904000000000000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000710100001904000000000000,Amazon Luna Controller,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b8,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b4,rightstick:b7,rightx:a3,righty:a4,start:b6,x:b3,y:b2,platform:Windows,
+0300000008100000e501000000000000,Anbernic Game Pad,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000830500000160000000000000,Arcade,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b3,x:b4,y:b4,platform:Windows,
+03000000120c0000100e000000000000,Armor 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000490b00004406000000000000,ASCII Seamic Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000869800002500000000000000,Astro C40 TR PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000a30c00002700000000000000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000a30c00002800000000000000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a3,lefty:a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000050b00000579000000000000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000050b00000679000000000000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000503200000110000000000000,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,start:b3,platform:Windows,
+03000000503200000210000000000000,Atari VCS Modern Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
+03000000380800001889000000000000,AtGames Legends Gamer Pro,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b13,lefttrigger:b14,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000008a3500000102000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+030000008a3500000201000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+030000008a3500000302000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+030000008a3500000402000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+03000000e4150000103f000000000000,Batarang,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d6200000e557000000000000,Batarang PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000c01100001352000000000000,Battalife Joystick,a:b6,b:b7,back:b2,leftshoulder:b0,leftx:a0,lefty:a1,rightshoulder:b1,start:b3,x:b4,y:b5,platform:Windows,
 030000006f0e00003201000000000000,Battlefield 4 PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ad1b000001f9000000000000,BB 070,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d62000002a79000000000000,BDA PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000bc2000005250000000000000,Beitong G3,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:b9,rightx:a3,righty:a4,start:b15,x:b3,y:b4,platform:Windows,
+030000000d0500000208000000000000,Belkin Nostromo N40,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
 03000000bc2000006012000000000000,Betop 2126F,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000bc2000000055000000000000,Betop BFM Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000bc2000000055000000000000,Betop BFM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000bc2000006312000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000bc2000006321000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000bc2000006412000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000c01100000555000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000c01100000655000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000790000000700000000000000,Betop Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
 03000000808300000300000000000000,Betop Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+030000006f0e00006401000000000000,BF One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000300f00000202000000000000,Bigben,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a5,righty:a2,start:b7,x:b2,y:b3,platform:Windows,
+030000006b1400000209000000000000,Bigben,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006b1400000055000000000000,Bigben PS3 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000006b1400000103000000000000,Bigben PS3 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
-0300000066f700000500000000000000,BrutalLegendTest,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
-03000000d81d00000b00000000000000,BUFFALO BSGP1601 Series ,a:b5,b:b3,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b13,x:b4,y:b2,platform:Windows,
+03000000120c0000200e000000000000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000210e000000000000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000f10e000000000000,Brook PS2 Adapter,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000310c000000000000,Brook Super Converter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000d81d00000b00000000000000,Buffalo BSGP1601 Series,a:b5,b:b3,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b13,x:b4,y:b2,platform:Windows,
+030000005b1c00002400000000000000,Capcom Home Arcade Controller,a:b3,b:b4,back:b7,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b6,x:b0,y:b1,platform:Windows,
+030000005b1c00002500000000000000,Capcom Home Arcade Controller,a:b3,b:b4,back:b7,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b6,x:b0,y:b1,platform:Windows,
+030000006d04000042c2000000000000,ChillStream,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000e82000006058000000000000,Cideko AK08b,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-030000005e0400008e02000000000000,Controller (XBOX 360 For Windows),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-030000005e040000a102000000000000,Controller (Xbox 360 Wireless Receiver for Windows),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-030000005e040000ff02000000000000,Controller (Xbox One For Windows) - Wired,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-030000005e040000ea02000000000000,Controller (Xbox One For Windows) - Wireless,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000457500000401000000000000,Cobra,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000b0400003365000000000000,Competition Pro,a:b0,b:b1,back:b2,leftx:a0,lefty:a1,start:b3,platform:Windows,
+030000004c050000c505000000000000,CronusMax Adapter,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000d814000007cd000000000000,Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000d8140000cefa000000000000,Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000260900008888000000000000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a4,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Windows,
-03000000a306000022f6000000000000,Cyborg V.3 Rumble Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+030000003807000002cb000000000000,Cyborg,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000a306000022f6000000000000,Cyborg V.3 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000f806000000a3000000000000,DA Leader,a:b7,b:b6,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b0,leftstick:b8,lefttrigger:b1,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:b3,rightx:a2,righty:a3,start:b12,x:b4,y:b5,platform:Windows,
+030000001a1c00000001000000000000,Datel Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000451300000830000000000000,Defender Game Racer X7,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-03000000791d00000103000000000000,Dual Box WII,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000bd12000002e0000000000000,Dual USB Vibration Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
-030000006f0e00003001000000000000,EA SPORTS PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000791d00000103000000000000,Dual Box Wii,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000c0160000e105000000000000,Dual Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+030000004f040000070f000000000000,Dual Power,a:b8,b:b9,back:b4,dpdown:b1,dpleft:b2,dpright:b3,dpup:b0,leftshoulder:b13,leftstick:b6,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b12,rightstick:b7,righttrigger:b15,start:b5,x:b10,y:b11,platform:Windows,
+030000004f04000012b3000000000000,Dual Power 3,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+030000004f04000020b3000000000000,Dual Trigger,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+03000000bd12000002e0000000000000,Dual Vibration Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
+03000000ff1100003133000000000000,DualForce,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b1,platform:Windows,
+030000008f0e00000910000000000000,DualShock 2,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
+03000000317300000100000000000000,DualShock 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000006f0e00003001000000000000,EA Sports PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000fc0400000250000000000000,Easy Grip,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000bc2000000091000000000000,EasySMX Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000006e0500000a20000000000000,Elecom DUX60 MMO,a:b2,b:b3,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b14,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b15,righttrigger:b13,rightx:a3,righty:a4,start:b20,x:b0,y:b1,platform:Windows,
 03000000b80500000410000000000000,Elecom Gamepad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
 03000000b80500000610000000000000,Elecom Gamepad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+030000006e0500000520000000000000,Elecom P301U PlayStation Controller Adapter,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+03000000411200004450000000000000,Elecom U1012,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000320000000000000,Elecom U3613M,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000e20000000000000,Elecom U3912T,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000f20000000000000,Elecom U4013S,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500001320000000000000,Elecom U4113,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006e0500001020000000000000,Elecom U4113S,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000720000000000000,Elecom W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+030000007d0400000640000000000000,Eliminator AfterShock,a:b1,b:b2,back:b9,dpdown:+a3,dpleft:-a5,dpright:+a5,dpup:-a3,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a4,righty:a2,start:b8,x:b0,y:b3,platform:Windows,
+03000000120c0000f61c000000000000,Elite,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000430b00000300000000000000,EMS Production PS2 Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000242f000000b7000000000000,ESM 9110,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Windows,
+03000000101c0000181c000000000000,Essential,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b4,leftx:a1,lefty:a0,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
 030000008f0e00000f31000000000000,EXEQ,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
-03000000341a00000108000000000000,EXEQ RF USB Gamepad 8206,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-03000000852100000201000000000000,FF-GP1,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008500000000000000,Fighting Commander 2016 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008400000000000000,Fighting Commander 5,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008700000000000000,Fighting Stick mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008800000000000000,Fighting Stick mini 4,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
-030000000d0f00002700000000000000,FIGHTING STICK V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-78696e70757403000000000000000000,Fightstick TES,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b2,y:b3,platform:Windows,
-03000000790000000600000000000000,G-Shark GS-GP702,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
-03000000790000002201000000000000,Game Controller for PC,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000341a00000108000000000000,EXEQ RF Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006f0e00008401000000000000,Faceoff Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00008101000000000000,Faceoff Deluxe Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00008001000000000000,Faceoff Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000021000000090000000000000,FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+0300000011040000c600000000000000,FC801,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000852100000201000000000000,FF GP1,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ad1b000028f0000000000000,Fightpad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b00002ef0000000000000,Fightpad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000038f0000000000000,Fightpad TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+03005036852100000000000000000000,Final Fantasy XIV Online Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000f806000001a3000000000000,Firestorm,a:b9,b:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b0,leftstick:b10,lefttrigger:b1,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,start:b12,x:b8,y:b4,platform:Windows,
+03000000b50700000399000000000000,Firestorm 2,a:b2,b:b4,back:b10,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b8,righttrigger:b9,start:b11,x:b3,y:b5,platform:Windows,
+03000000b50700001302000000000000,Firestorm D3,a:b0,b:b2,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,x:b1,y:b3,platform:Windows,
+03000000b40400001024000000000000,Flydigi Apex,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000151900004000000000000000,Flydigi Vader 2,a:b27,b:b26,back:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b23,leftstick:b17,lefttrigger:b21,leftx:a0,lefty:a1,misc1:b15,paddle1:b11,paddle2:b10,paddle3:b13,paddle4:b12,rightshoulder:b22,rightstick:b16,righttrigger:b20,rightx:a3,righty:a4,start:b18,x:b25,y:b24,platform:Windows,
+03000000b40400001124000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b14,paddle1:b4,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b2,y:b3,platform:Windows,
+03000000b40400001224000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000008305000000a0000000000000,G08XU,a:b0,b:b1,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b5,x:b2,y:b3,platform:Windows,
 0300000066f700000100000000000000,Game VIB Joystick,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Windows,
-03000000260900002625000000000000,Gamecube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,lefttrigger:a4,leftx:a0,lefty:a1,righttrigger:a5,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Windows,
-030000008f0e00000d31000000000000,GAMEPAD 3 TURBO,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000280400000140000000000000,GamePad Pro USB,a:b1,b:b2,back:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-03000000ac0500003d03000000000000,GameSir,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000ac0500004d04000000000000,GameSir,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000ffff00000000000000000000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000260900002625000000000000,GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,lefttrigger:a4,leftx:a0,lefty:a1,righttrigger:a5,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Windows,
+03000000341a000005f7000000000000,GameCube Controller,a:b2,b:b3,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b1,y:b0,platform:Windows,
+03000000430b00000500000000000000,GameCube Controller,a:b0,b:b2,dpdown:b10,dpleft:b8,dpright:b9,dpup:b11,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a3,rightx:a5,righty:a2,start:b7,x:b1,y:b3,platform:Windows,
+03000000790000004718000000000000,GameCube Controller,a:b1,b:b0,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000790000004618000000000000,GameCube Controller Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+030000008f0e00000d31000000000000,Gamepad 3 Turbo,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ac0500003d03000000000000,GameSir G3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000ac0500005b05000000000000,GameSir G3w,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000ac0500002d02000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000ac0500004d04000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000ac0500001a06000000000000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000004c0e00001035000000000000,Gamester,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00001110000000000000,GameStick Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+0300000047530000616d000000000000,GameStop,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000c01100000140000000000000,GameStop PS4 Fun Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000b62500000100000000000000,Gametel GT004 01,a:b3,b:b0,dpdown:b10,dpleft:b9,dpright:b8,dpup:b11,leftshoulder:b4,rightshoulder:b5,start:b7,x:b1,y:b2,platform:Windows,
+030000008f0e00001411000000000000,Gamo2 Divaller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000a857000000000000,Gator Claw,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000c9110000f055000000000000,GC100XF,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000008305000009a0000000000000,Genius,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000008305000031b0000000000000,Genius Maxfire Blaze 3,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 03000000451300000010000000000000,Genius Maxfire Grandias 12,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000005c1a00003330000000000000,Genius MaxFire Grandias 12V,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
-03000000300f00000b01000000000000,GGE909 Recoil Pad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
-03000000f0250000c283000000000000,Gioteck,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000300f00000b01000000000000,GGE909 Recoil,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000f0250000c283000000000000,Gioteck PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000f025000021c1000000000000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000f0250000c383000000000000,Gioteck VX2 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000f0250000c483000000000000,Gioteck VX2 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000f025000031c1000000000000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000f0250000c383000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000f0250000c483000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000004f04000026b3000000000000,GP XID,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+0300000079000000d418000000000000,GPD Win,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000025b000000000000,GPX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000007d0400000840000000000000,Gravis Destroyer Tilt,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,x:b0,y:b3,platform:Windows,
+030000007d0400000540000000000000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000280400000140000000000000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a3,dpup:-a4,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000008f0e00000610000000000000,GreenAsia,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a5,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
+03000000ac0500006b05000000000000,GT2a,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000341a00000302000000000000,Hama Scorpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00004900000000000000,Hatsune Miku Sho Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000d81400000862000000000000,HitBox Edition Cthulhu+,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b4,rightshoulder:b7,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
-03000000632500002605000000000000,HJD-X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-030000000d0f00005f00000000000000,Hori Fighting Commander 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00005e00000000000000,Hori Fighting Commander 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00004000000000000000,Hori Fighting Stick Mini 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b4,rightshoulder:b7,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00004900000000000000,Hatsune Miku Sho PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000001008000001e1000000000000,Havit HV G60,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b0,platform:Windows,
+030000000d0f00000c00000000000000,HEXT,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d81400000862000000000000,HitBox Edition Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b4,rightshoulder:b7,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
+03000000632500002605000000000000,HJD X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000000d0f00000a00000000000000,Hori DOA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00008500000000000000,Hori Fighting Commander 2016 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002500000000000000,Hori Fighting Commander 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002d00000000000000,Hori Fighting Commander 3 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005f00000000000000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005e00000000000000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000000d0f00008400000000000000,Hori Fighting Commander 5,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006201000000000000,Hori Fighting Commander Octa,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006401000000000000,Hori Fighting Commander Octa,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00005100000000000000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00008600000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000ba00000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00008800000000000000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
+030000000d0f00008700000000000000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000000d0f00001000000000000000,Hori Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00003200000000000000,Hori Fightstick 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000c000000000000000,Hori Fightstick 4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00000d00000000000000,Hori Fightstick EX2,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00003701000000000000,Hori Fightstick Mini,a:b1,b:b0,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Windows,
+030000000d0f00004000000000000000,Hori Fightstick Mini 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b4,rightshoulder:b7,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002100000000000000,Hori Fightstick V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002700000000000000,Hori Fightstick V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000a000000000000000,Hori Grip TAC4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b13,x:b0,y:b3,platform:Windows,
+030000000d0f0000a500000000000000,Hori Miku Project Diva X HD PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000000d0f0000a600000000000000,Hori Miku Project Diva X HD PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000000d0f00000101000000000000,Hori Mini Hatsune Miku FT,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00005400000000000000,Hori Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00000900000000000000,Hori Pad 3 Turbo,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00004d00000000000000,Hori Pad A,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f0000c100000000000000,Horipad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00006e00000000000000,HORIPAD 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00006600000000000000,HORIPAD 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f0000ee00000000000000,HORIPAD mini4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-03000000250900000017000000000000,HRAP2 on PS/SS/N64 Joypad to USB BOX,a:b2,b:b1,back:b9,leftshoulder:b5,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b6,start:b8,x:b3,y:b0,platform:Windows,
-030000008f0e00001330000000000000,HuiJia SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b9,x:b3,y:b0,platform:Windows,
-03000000d81d00000f00000000000000,iBUFFALO BSGP1204 Series,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000d81d00001000000000000000,iBUFFALO BSGP1204P Series,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000830500006020000000000000,iBuffalo SNES Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Windows,
+030000000d0f00003801000000000000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Windows,
+030000000d0f00009200000000000000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002301000000000000,Hori PS4 Controller Light,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000000d0f00001100000000000000,Hori Real Arcade Pro 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002600000000000000,Hori Real Arcade Pro 3P,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00004b00000000000000,Hori Real Arcade Pro 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006a00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006b00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00008a00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00008b00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006f00000000000000,Hori Real Arcade Pro 4 VLX,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00007000000000000000,Hori Real Arcade Pro 4 VLX,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00003d00000000000000,Hori Real Arcade Pro N3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b10,leftstick:b4,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b6,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000ae00000000000000,Hori Real Arcade Pro N4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00008c00000000000000,Hori Real Arcade Pro P4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000aa00000000000000,Hori Real Arcade Pro S,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000d800000000000000,Hori Real Arcade Pro S,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00002200000000000000,Hori Real Arcade Pro V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005b00000000000000,Hori Real Arcade Pro V4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005c00000000000000,Hori Real Arcade Pro V4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000af00000000000000,Hori Real Arcade Pro VHS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00001b00000000000000,Hori Real Arcade Pro VX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000002f5000000000000,Hori Real Arcade Pro VX,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00009c00000000000000,Hori TAC Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000c900000000000000,Hori Taiko Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006400000000000000,Horipad 3TP,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00001300000000000000,Horipad 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005500000000000000,Horipad 4 FPS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006e00000000000000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006600000000000000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000000d0f00004200000000000000,Horipad A,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000ad1b000001f5000000000000,Horipad EXT2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000ee00000000000000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000c100000000000000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000f600000000000000,Horipad Nintendo Switch Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000000d0f00006700000000000000,Horipad One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000dc00000000000000,Horipad Switch,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000242e00000b20000000000000,Hyperkin Admiral N64 Controller,+rightx:b11,+righty:b13,-rightx:b8,-righty:b12,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,platform:Windows,
+03000000242e0000ff0b000000000000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,platform:Windows,
+03000000790000004e95000000000000,Hyperkin N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a5,righty:a2,start:b9,platform:Windows,
+03000000242e00006a48000000000000,Hyperkin RetroN Sq,a:b3,b:b7,back:b5,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b0,rightshoulder:b1,start:b4,x:b2,y:b6,platform:Windows,
+03000000242f00000a20000000000000,Hyperkin Scout,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
+03000000242e00006a38000000000000,Hyperkin Trooper 2,a:b0,b:b1,back:b4,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b3,start:b5,platform:Windows,
+03000000d81d00000e00000000000000,iBuffalo AC02 Arcade Joystick,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,rightx:a2,righty:a5,start:b8,x:b4,y:b5,platform:Windows,
+03000000d81d00000f00000000000000,iBuffalo BSGP1204 Series,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d81d00001000000000000000,iBuffalo BSGP1204P Series,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000005c0a00000285000000000000,iDroidCon,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b6,platform:Windows,
+03000000696400006964000000000000,iDroidCon Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000511d00000230000000000000,iGUGU Gamecore,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b1,leftstick:b4,lefttrigger:b3,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b2,platform:Windows,
 03000000b50700001403000000000000,Impact Black,a:b2,b:b3,back:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
-030000006f0e00002401000000000000,INJUSTICE FightStick PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-03000000ac0500002c02000000000000,IPEGA,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000491900000204000000000000,Ipega PG-9023,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-030000006e0500000a20000000000000,JC-DUX60 ELECOM MMO Gamepad,a:b2,b:b3,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b14,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b15,righttrigger:b13,rightx:a3,righty:a4,start:b20,x:b0,y:b1,platform:Windows,
-030000006e0500000520000000000000,JC-P301U,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
-030000006e0500000320000000000000,JC-U3613M (DInput),a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
-030000006e0500000720000000000000,JC-W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+030000006f0e00002401000000000000,Injustice Fightstick PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000830500005130000000000000,InterAct ActionPad,a:b0,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000ef0500000300000000000000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Windows,
+03000000fd0500000230000000000000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a5,start:b11,x:b0,y:b1,platform:Windows,
+03000000fd0500000030000000000000,Interact GoPad,a:b3,b:b4,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Windows,
+03000000fd0500003902000000000000,InterAct Hammerhead,a:b3,b:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b2,lefttrigger:b8,rightshoulder:b7,rightstick:b5,righttrigger:b9,start:b10,x:b0,y:b1,platform:Windows,
+03000000fd0500002a26000000000000,InterAct Hammerhead FX,a:b3,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b0,y:b1,platform:Windows,
+03000000fd0500002f26000000000000,InterAct Hammerhead FX,a:b4,b:b5,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b1,y:b2,platform:Windows,
+03000000fd0500005302000000000000,InterAct ProPad,a:b3,b:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Windows,
+03000000ac0500002c02000000000000,Ipega Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000491900000204000000000000,Ipega PG9023,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000491900000304000000000000,Ipega PG9087,+righty:+a5,-righty:-a4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,start:b11,x:b3,y:b4,platform:Windows,
 030000007e0500000620000000000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Windows,
-030000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Windows,
 030000007e0500000720000000000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
-030000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
-03000000bd12000003c0000000000000,JY-P70UR,a:b1,b:b0,back:b5,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b8,rightstick:b11,righttrigger:b9,rightx:a3,righty:a2,start:b4,x:b3,y:b2,platform:Windows,
+03000000250900000017000000000000,Joypad Adapter,a:b2,b:b1,back:b9,leftshoulder:b5,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b6,start:b8,x:b3,y:b0,platform:Windows,
+03000000bd12000003c0000000000000,Joypad Alpha Shock,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ff1100004033000000000000,JPD FFB,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a2,start:b15,x:b3,y:b0,platform:Windows,
+03000000242f00002d00000000000000,JYS Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000242f00008a00000000000000,JYS Adapter,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b0,y:b3,platform:Windows,
+03000000c4100000c082000000000000,KADE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000828200000180000000000000,Keio,a:b4,b:b5,back:b8,leftshoulder:b2,lefttrigger:b3,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b9,x:b0,y:b1,platform:Windows,
 03000000790000000200000000000000,King PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+03000000bd12000001e0000000000000,Leadership,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+030000006f0e00000103000000000000,Logic3,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00000104000000000000,Logic3,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000008f0e00001300000000000000,Logic3,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 030000006d040000d1ca000000000000,Logitech ChillStream,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006d040000d2ca000000000000,Logitech Cordless Precision,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006d04000011c2000000000000,Logitech Cordless Wingman,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b5,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b2,righttrigger:b7,rightx:a3,righty:a4,x:b4,platform:Windows,
 030000006d04000016c2000000000000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000006d04000018c2000000000000,Logitech F510 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000006d04000019c2000000000000,Logitech F710 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700006652000000000000,Mad Catz C.T.R.L.R,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700005032000000000000,Mad Catz FightPad PRO (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700005082000000000000,Mad Catz FightPad PRO (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700008433000000000000,Mad Catz FightStick TE S+ (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700008483000000000000,Mad Catz FightStick TE S+ (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700008134000000000000,Mad Catz FightStick TE2+ PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b7,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b4,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700008184000000000000,Mad Catz FightStick TE2+ PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,leftstick:b10,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700006252000000000000,Mad Catz Micro C.T.R.L.R,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+030000006d0400001dc2000000000000,Logitech F310,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006d04000018c2000000000000,Logitech F510,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d0400001ec2000000000000,Logitech F510,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006d04000019c2000000000000,Logitech F710,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d0400001fc2000000000000,Logitech F710,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006d0400001ac2000000000000,Logitech Precision,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000006d04000009c2000000000000,Logitech WingMan,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000006d0400000bc2000000000000,Logitech WingMan Action Pad,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b8,lefttrigger:a5~,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:a2~,start:b8,x:b3,y:b4,platform:Windows,
+030000006d0400000ac2000000000000,Logitech WingMan RumblePad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,rightx:a3,righty:a4,x:b3,y:b4,platform:Windows,
+03000000380700005645000000000000,Lynx,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000222200006000000000000000,Macally,a:b1,b:b2,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b33,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700003888000000000000,Mad Catz Arcade Fightstick TE S Plus PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008532000000000000,Mad Catz Arcade Fightstick TE S PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700006352000000000000,Mad Catz CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700006652000000000000,Mad Catz CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700005032000000000000,Mad Catz Fightpad Pro PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700005082000000000000,Mad Catz Fightpad Pro PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000380700008031000000000000,Mad Catz FightStick Alpha PS3	,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000003807000038b7000000000000,Mad Catz Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700008433000000000000,Mad Catz Fightstick TE S PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008483000000000000,Mad Catz Fightstick TE S PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000380700008134000000000000,Mad Catz Fightstick TE2 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b7,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b4,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008184000000000000,Mad Catz Fightstick TE2 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,leftstick:b10,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000380700006252000000000000,Mad Catz Micro CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008232000000000000,Mad Catz PlayStation Brawlpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008731000000000000,Mad Catz PlayStation Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000003807000056a8000000000000,Mad Catz PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700001888000000000000,Mad Catz SFIV Fightstick PS3,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b6,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000380700008081000000000000,Mad Catz SFV Arcade Fightstick Alpha PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000380700001847000000000000,Mad Catz Street Fighter 4 Xbox 360 FightStick,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
 03000000380700008034000000000000,Mad Catz TE2 PS3 Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700008084000000000000,Mad Catz TE2 PS4 Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700008532000000000000,Madcatz Arcade Fightstick TE S PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700003888000000000000,Madcatz Arcade Fightstick TE S+ PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700001888000000000000,MadCatz SFIV FightStick PS3,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b6,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-03000000380700008081000000000000,MADCATZ SFV Arcade FightStick Alpha PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008084000000000000,Mad Catz TE2 PS4 Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 030000002a0600001024000000000000,Matricom,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
+030000009f000000adbb000000000000,MaxJoypad Virtual Controller,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
 03000000250900000128000000000000,Mayflash Arcade Stick,a:b1,b:b2,back:b8,leftshoulder:b0,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b7,start:b9,x:b5,y:b6,platform:Windows,
+030000008f0e00001330000000000000,Mayflash Controller Adapter,a:b1,b:b2,back:b8,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3~,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000242f00003700000000000000,Mayflash F101,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000003018000000000000,Mayflash F300 Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000242f00003900000000000000,Mayflash F300 Elite Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000790000004418000000000000,Mayflash GameCube Controller,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
-03000000790000004318000000000000,Mayflash GameCube Controller Adapter,a:b1,b:b2,back:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b0,leftshoulder:b4,leftstick:b0,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b0,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
-030000008f0e00001030000000000000,Mayflash USB Adapter for original Sega Saturn controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b5,rightshoulder:b2,righttrigger:b7,start:b9,x:b3,y:b4,platform:Windows,
-0300000025090000e803000000000000,Mayflash Wii Classic Controller,a:b1,b:b0,back:b8,dpdown:b13,dpleft:b12,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
-03000000790000000018000000000000,Mayflash WiiU Pro Game Controller Adapter (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000380700006382000000000000,MLG GamePad PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000efbe0000edfe000000000000,Monect Virtual Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+03000000790000004318000000000000,Mayflash GameCube Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000242f00007300000000000000,Mayflash Magic NS,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b0,y:b3,platform:Windows,
+0300000079000000d218000000000000,Mayflash Magic NS,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d620000010a7000000000000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000242e0000f500000000000000,Mayflash N64 Adapter,a:b2,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a5,start:b9,platform:Windows,
+03000000242f0000f400000000000000,Mayflash N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a5,start:b9,platform:Windows,
+03000000790000007918000000000000,Mayflash N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,righttrigger:b7,rightx:a3,righty:a2,start:b8,platform:Windows,
+030000008f0e00001030000000000000,Mayflash Saturn Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+0300000025090000e803000000000000,Mayflash Wii Classic Adapter,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:a4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:a5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
+03000000790000000318000000000000,Mayflash Wii DolphinBar,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+03000000790000000018000000000000,Mayflash Wii U Pro Adapter,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000002418000000000000,Mega Drive Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,rightshoulder:b2,start:b9,x:b3,y:b4,platform:Windows,
+0300000079000000ae18000000000000,Mega Drive Controller,a:b0,b:b1,back:b7,dpdown:b14,dpleft:b15,dpright:b13,dpup:b2,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000c0160000990a000000000000,Mega Drive Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,righttrigger:b2,start:b3,platform:Windows,
+030000005e0400002800000000000000,Microsoft Dual Strike,a:b3,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,rightx:a0,righty:a1~,start:b5,x:b1,y:b0,platform:Windows,
+030000005e0400000300000000000000,Microsoft SideWinder,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000005e0400000700000000000000,Microsoft SideWinder,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+030000005e0400000e00000000000000,Microsoft SideWinder Freestyle Pro,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,start:b8,x:b3,y:b4,platform:Windows,
+030000005e0400002700000000000000,Microsoft SideWinder Plug and Play,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b4,righttrigger:b5,x:b2,y:b3,platform:Windows,
+03000000280d00000202000000000000,Miller Lite Cantroller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,start:b5,x:b2,y:b3,platform:Windows,
+03000000ad1b000023f0000000000000,MLG,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a6,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000ad1b00003ef0000000000000,MLG Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700006382000000000000,MLG PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000004523000015e0000000000000,Mobapad Chitu HD,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000491900000904000000000000,Mobapad Chitu HD,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000ffff00000000000000000000,Mocute M053,a:b3,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b11,leftstick:b7,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b6,righttrigger:b4,rightx:a3,righty:a4,start:b8,x:b1,y:b0,platform:Windows,
+03000000d6200000e589000000000000,Moga 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000d62000007162000000000000,Moga Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000d6200000ad0d000000000000,Moga Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c62400002a89000000000000,Moga XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c62400002b89000000000000,Moga XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c62400001a89000000000000,Moga XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c62400001b89000000000000,Moga XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000250900006688000000000000,MP-8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
-030000001008000001e5000000000000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b6,start:b9,x:b3,y:b0,platform:Windows,
+03000000091200004488000000000000,MUSIA PlayStation 2 Input Display,a:b0,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b7,righttrigger:b11,rightx:a2,righty:a3,start:b5,x:b1,y:b3,platform:Windows,
+03000000f70600000100000000000000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Windows,
+030000006f0e00001311000000000000,N64 Controller,+rightx:b10,+righty:b3,-rightx:b0,-righty:b11,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,platform:Windows,
+030000006b140000010c000000000000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006b1400001106000000000000,Nacon Revolution 3 PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+0300000085320000170d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+0300000085320000190d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000006b140000100d000000000000,Nacon Revolution Infinity PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000006b140000080d000000000000,Nacon Revolution Unlimited Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000bd12000001c0000000000000,Nebular,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000eb0300000000000000000000,NeGcon Adapter,a:a2,b:b13,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,lefttrigger:a4,leftx:a1,righttrigger:b11,start:b3,x:a3,y:b12,platform:Windows,
+0300000038070000efbe000000000000,NEO SE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+0300000092120000474e000000000000,NeoGeo X Arcade Stick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b3,y:b2,platform:Windows,
+03000000921200004b46000000000000,NES 2 port Adapter,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b11,platform:Windows,
+03000000000f00000100000000000000,NES Controller,a:b1,b:b0,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Windows,
+03000000921200004346000000000000,NES Controller,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Windows,
+03000000790000004518000000000000,NEXILUX GameCube Controller Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+030000001008000001e5000000000000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Windows,
+03000000050b00000045000000000000,Nexus,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b10,x:b2,y:b3,platform:Windows,
 03000000152000000182000000000000,NGDS,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
-03000000bd12000015d0000000000000,Nintendo Retrolink USB Super SNES Classic Controller,a:b2,b:b1,back:b8,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
-030000007e0500000920000000000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000007e0500000920000000000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000000d0500000308000000000000,Nostromo N45,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b12,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b2,y:b3,platform:Windows,
-03000000550900001472000000000000,NVIDIA Controller v01.04,a:b11,b:b10,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b7,leftstick:b5,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b4,righttrigger:a5,rightx:a3,righty:a6,start:b3,x:b9,y:b8,platform:Windows,
-030000004b120000014d000000000000,NYKO AIRFLO,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:a3,leftstick:a0,lefttrigger:b6,rightshoulder:b5,rightstick:a2,righttrigger:b7,start:b9,x:b2,y:b3,platform:Windows,
-03000000782300000a10000000000000,Onlive Wireless Controller,a:b15,b:b14,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b11,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b13,y:b12,platform:Windows,
+030000007e0500001920000000000000,NSO N64 Controller,+rightx:b8,+righty:b2,-rightx:b3,-righty:b7,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,righttrigger:b10,start:b9,platform:Windows,
+030000007e0500001720000000000000,NSO SNES Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b15,start:b9,x:b2,y:b3,platform:Windows,
+03000000550900001472000000000000,NVIDIA Controller,a:b11,b:b10,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b7,leftstick:b5,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b4,righttrigger:a5,rightx:a3,righty:a6,start:b3,x:b9,y:b8,platform:Windows,
+03000000550900001072000000000000,NVIDIA Shield,a:b9,b:b8,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b3,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b2,righttrigger:a4,rightx:a2,righty:a5,start:b0,x:b7,y:b6,platform:Windows,
+030000005509000000b4000000000000,NVIDIA Virtual,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000120c00000288000000000000,Nyko Air Flo Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000004b120000014d000000000000,NYKO Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000d62000001d57000000000000,Nyko Airflo PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000791d00000900000000000000,Nyko Playpad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000782300000a10000000000000,Onlive Controller,a:b15,b:b14,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b11,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b13,y:b12,platform:Windows,
+030000000d0f00000401000000000000,Onyx,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000008916000001fd000000000000,Onza CE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a3,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000008916000000fd000000000000,Onza TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000d62000006d57000000000000,OPP PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006b14000001a1000000000000,Orange Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
-03000000362800000100000000000000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b13,rightx:a3,righty:a4,x:b1,y:b2,platform:Windows,
-03000000120c0000f60e000000000000,P4 Wired Gamepad,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b5,lefttrigger:b7,rightshoulder:b4,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
-030000008f0e00000300000000000000,Piranha xtreme,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000362800000100000000000000,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Windows,
+03000000120c0000f60e000000000000,P4 Gamepad,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b5,lefttrigger:b7,rightshoulder:b4,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000002201000000000000,PC Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000006f0e00008501000000000000,PDP Fightpad Pro GameCube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006f0e00000901000000000000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00008901000000000000,PDP Realmz Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000008f0e00004100000000000000,PlaySega,a:b1,b:b0,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b4,y:b3,platform:Windows,
+03000000666600006706000000000000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Windows,
+03000000e30500009605000000000000,PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000004c050000da0c000000000000,PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000632500002306000000000000,PlayStation Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000f0250000c183000000000000,PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d9040000160f000000000000,PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+030000004c0500003713000000000000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000011a7000000000000,PowerA Core Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000dd62000015a7000000000000,PowerA Fusion Nintendo Switch Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000012a7000000000000,PowerA Fusion Nintendo Switch Fight Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000dd62000016a7000000000000,PowerA Fusion Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000013a7000000000000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d62000006dca000000000000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+0300000062060000d570000000000000,PowerA PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000014a7000000000000,PowerA Spectra Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d04000084ca000000000000,Precision,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 03000000d62000009557000000000000,Pro Elite PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000c62400001a53000000000000,Pro Ex Mini,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000d62000009f31000000000000,Pro Ex mini PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d6200000c757000000000000,Pro Ex mini PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000632500002306000000000000,PS Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
-03000000e30500009605000000000000,PS to USB convert cable,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000120c0000110e000000000000,Pro5,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000100800000100000000000000,PS1 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
 030000008f0e00007530000000000000,PS1 Controller,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b1,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000100800000300000000000000,PS2 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000250900000088000000000000,PS2 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000250900006888000000000000,PS2 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b6,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
 03000000250900008888000000000000,PS2 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
-03000000666600006706000000000000,PS2 Controller,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Windows,
 030000006b1400000303000000000000,PS2 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000009d0d00001330000000000000,PS2 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000151a00006222000000000000,PS2 Dual Plus Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000120a00000100000000000000,PS3 Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000120c00001307000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c00001cf1000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f90e000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000250900000118000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000250900000218000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
 03000000250900000500000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,platform:Windows,
 030000004c0500006802000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b10,lefttrigger:a3~,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:a4~,rightx:a2,righty:a5,start:b8,x:b3,y:b0,platform:Windows,
+030000004f1f00000800000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 03000000632500007505000000000000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000888800000803000000000000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b9,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b0,y:b3,platform:Windows,
+03000000888800000803000000000000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b9,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Windows,
+03000000888800000804000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Windows,
+030000008f0e00000300000000000000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
 030000008f0e00001431000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000003807000056a8000000000000,PS3 RF pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000100000008200000000000000,PS360+ v1.66,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:h0.4,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-030000004c050000a00b000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000004c050000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000004c050000cc09000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-03000000300f00000011000000000000,QanBa Arcade JoyStick 1008,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b10,x:b0,y:b3,platform:Windows,
-03000000300f00001611000000000000,QanBa Arcade JoyStick 4018,a:b1,b:b2,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
-03000000222c00000020000000000000,QANBA DRONE ARCADE JOYSTICK,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,rightshoulder:b5,righttrigger:a4,start:b9,x:b0,y:b3,platform:Windows,
-03000000300f00001210000000000000,QanBa Joystick Plus,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
-03000000341a00000104000000000000,QanBa Joystick Q4RAF,a:b5,b:b6,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b0,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b7,start:b9,x:b1,y:b2,platform:Windows,
-03000000222c00000223000000000000,Qanba Obsidian Arcade Joystick PS3 Mode,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000222c00000023000000000000,Qanba Obsidian Arcade Joystick PS4 Mode,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000ba2200002010000000000000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b2,platform:Windows,
+03000000120c00000807000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000111e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000121e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000130e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000150e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000180e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000181e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000191e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c00001e0e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000a957000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000aa57000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000f21c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000f31c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000f41c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000f51c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120c0000f70e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000120e0000120c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000160e0000120c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000001a1e0000120c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000a00b000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000cc09000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c0500005f0e000000000000,PS5 Access Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000e60c000000000000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000f20d000000000000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000830500005020000000000000,PSX,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b2,y:b3,platform:Windows,
+03000000300f00000111000000000000,Qanba 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00000211000000000000,Qanba 2P,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000300f00000011000000000000,Qanba Arcade Stick 1008,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b10,x:b0,y:b3,platform:Windows,
+03000000300f00001611000000000000,Qanba Arcade Stick 4018,a:b1,b:b2,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
+03000000222c00000025000000000000,Qanba Dragon Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000222c00000020000000000000,Qanba Drone Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,rightshoulder:b5,righttrigger:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001211000000000000,Qanba Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001210000000000000,Qanba Joystick Plus,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
+03000000341a00000104000000000000,Qanba Joystick Q4RAF,a:b5,b:b6,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b0,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b7,start:b9,x:b1,y:b2,platform:Windows,
+03000000222c00000223000000000000,Qanba Obsidian Arcade Stick PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000222c00000023000000000000,Qanba Obsidian Arcade Stick PS4,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000008a2400006682000000000000,R1 Mobile Controller,a:b3,b:b1,back:b7,leftx:a0,lefty:a1,start:b6,x:b4,y:b0,platform:Windows,
+03000000086700006626000000000000,RadioShack,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000ff1100004733000000000000,Ramox FPS Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b0,platform:Windows,
+030000009b2800002300000000000000,Raphnet 3DO Adapter,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b2,start:b3,platform:Windows,
+030000009b2800006900000000000000,Raphnet 3DO Adapter,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b2,start:b3,platform:Windows,
+030000009b2800000800000000000000,Raphnet Dreamcast Adapter,a:b2,b:b1,dpdown:b5,dpleft:b6,dpright:b7,dpup:b4,lefttrigger:a2,leftx:a0,righttrigger:a3,righty:a1,start:b3,x:b10,y:b9,platform:Windows,
+030000009b280000d000000000000000,Raphnet Dreamcast Adapter,a:b1,b:b0,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,lefttrigger:+a5,leftx:a0,lefty:a1,righttrigger:+a2,start:b3,x:b5,y:b4,platform:Windows,
+030000009b2800006200000000000000,Raphnet GameCube Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Windows,
+030000009b2800003200000000000000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:+a2,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Windows,
+030000009b2800006000000000000000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:+a2,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Windows,
+030000009b2800001800000000000000,Raphnet Jaguar Adapter,a:b2,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b10,start:b3,x:b11,y:b12,platform:Windows,
+030000009b2800006100000000000000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Windows,
+030000009b2800006300000000000000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Windows,
+030000009b2800000200000000000000,Raphnet NES Adapter,a:b7,b:b6,back:b5,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,start:b4,platform:Windows,
+030000009b2800004400000000000000,Raphnet PS1 and PS2 Adapter,a:b1,b:b2,back:b5,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b9,rightx:a3,righty:a4,start:b4,x:b0,y:b3,platform:Windows,
+030000009b2800004300000000000000,Raphnet Saturn,a:b0,b:b1,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000009b2800000500000000000000,Raphnet Saturn Adapter 2.0,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
+030000009b2800000300000000000000,Raphnet SNES Adapter,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+030000009b2800002600000000000000,Raphnet SNES Adapter,a:b1,b:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800002e00000000000000,Raphnet SNES Adapter,a:b1,b:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800002f00000000000000,Raphnet SNES Adapter,a:b1,b:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800005600000000000000,Raphnet SNES Adapter,a:b1,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800005700000000000000,Raphnet SNES Adapter,a:b1,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800001e00000000000000,Raphnet Vectrex Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a1,lefty:a2,x:b2,y:b3,platform:Windows,
+030000009b2800002b00000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800002c00000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800008000000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
+03000000790000008f18000000000000,Rapoo Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
 03000000321500000003000000000000,Razer Hydra,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-03000000321500000204000000000000,Razer Panthera (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000321500000104000000000000,Razer Panthera (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00001100000000000000,REAL ARCADE PRO.3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00006a00000000000000,Real Arcade Pro.4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00006b00000000000000,Real Arcade Pro.4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008a00000000000000,Real Arcade Pro.4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008b00000000000000,Real Arcade Pro.4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00007000000000000000,REAL ARCADE PRO.4 VLX,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00002200000000000000,REAL ARCADE Pro.V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00005b00000000000000,Real Arcade Pro.V4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00005c00000000000000,Real Arcade Pro.V4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000790000001100000000000000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
-0300000000f000000300000000000000,RetroUSB.com RetroPad,a:b1,b:b5,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
-0300000000f00000f100000000000000,RetroUSB.com Super RetroPort,a:b1,b:b5,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
+03000000f8270000bf0b000000000000,Razer Kishi,a:b6,b:b7,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b18,leftshoulder:b12,leftstick:b19,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b13,rightstick:b20,righttrigger:b15,rightx:a3,righty:a4,start:b17,x:b9,y:b10,platform:Windows,
+03000000321500000204000000000000,Razer Panthera PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000104000000000000,Razer Panthera PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000321500000010000000000000,Razer Raiju,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000507000000000000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000321500000707000000000000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000321500000710000000000000,Razer Raiju TE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000a10000000000000,Razer Raiju TE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000410000000000000,Razer Raiju UE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000910000000000000,Razer Raiju UE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000011000000000000,Razer Raion PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000321500000009000000000000,Razer Serval,+lefty:+a2,-lefty:-a1,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,leftx:a0,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000921200004547000000000000,Retro Bit Sega Genesis Controller Adapter,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b6,x:b3,y:b4,platform:Windows,
+03000000790000001100000000000000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
+03000000830500006020000000000000,Retro Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b8,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+0300000003040000c197000000000000,Retrode Adapter,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+03000000bd12000013d0000000000000,Retrolink Sega Saturn Classic Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b5,lefttrigger:b6,rightshoulder:b2,righttrigger:b7,start:b8,x:b3,y:b4,platform:Windows,
+03000000bd12000015d0000000000000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000341200000400000000000000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Windows,
+0300000000f000000300000000000000,RetroUSB RetroPad,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
+0300000000f00000f100000000000000,RetroUSB Super RetroPort,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
+03000000830500000960000000000000,Revenger,a:b0,b:b1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b3,x:b4,y:b5,platform:Windows,
 030000006b140000010d000000000000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-030000006b140000020d000000000000,Revolution Pro Controller 2(1/2),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000006b140000020d000000000000,Revolution Pro Controller 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000006b140000130d000000000000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001f01000000000000,Rock Candy,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00004601000000000000,Rock Candy,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000fefa000000000000,Rock Candy Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00008701000000000000,Rock Candy Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00001e01000000000000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00002801000000000000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00002f01000000000000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000004f04000003d0000000000000,run'n'drive,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:a3,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:a4,rightstick:b11,righttrigger:b5,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000050b0000e318000000000000,ROG Chakram,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b0000e518000000000000,ROG Chakram,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b00005819000000000000,ROG Chakram Core,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b0000181a000000000000,ROG Chakram X,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b00001a1a000000000000,ROG Chakram X,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b00001c1a000000000000,ROG Chakram X,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+030000004f04000001d0000000000000,Rumble Force,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+030000000d0f0000ad00000000000000,RX Gamepad,a:b0,b:b4,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,rightshoulder:b6,start:b9,x:b2,y:b1,platform:Windows,
+030000008916000000fe000000000000,Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000045d000000000000,Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000a30600001af5000000000000,Saitek Cyborg,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
-03000000a306000023f6000000000000,Saitek Cyborg V.1 Game pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
-03000000300f00001201000000000000,Saitek Dual Analog Pad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
-03000000a30600000701000000000000,Saitek P220,a:b2,b:b3,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b5,x:b0,y:b1,platform:Windows,
-03000000a30600000cff000000000000,Saitek P2500 Force Rumble Pad,a:b2,b:b3,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,x:b0,y:b1,platform:Windows,
+03000000a306000023f6000000000000,Saitek Cyborg V.1 Game,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001201000000000000,Saitek Dual Analog,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000a30600000701000000000000,Saitek P220,a:b2,b:b3,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,x:b0,y:b1,platform:Windows,
+03000000a30600000cff000000000000,Saitek P2500 Force Rumble,a:b2,b:b3,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b0,y:b1,platform:Windows,
+03000000a30600000d5f000000000000,Saitek P2600,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b8,x:b0,y:b3,platform:Windows,
+03000000a30600000dff000000000000,Saitek P2600,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b8,x:b0,y:b3,platform:Windows,
 03000000a30600000c04000000000000,Saitek P2900,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
-03000000300f00001001000000000000,Saitek P480 Rumble Pad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000a306000018f5000000000000,Saitek P3200,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001001000000000000,Saitek P480 Rumble,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000a30600000901000000000000,Saitek P880,a:b2,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b8,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b5,rightx:a3,righty:a2,x:b0,y:b1,platform:Windows,
 03000000a30600000b04000000000000,Saitek P990,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
-03000000a30600000b04000000010000,Saitek P990 Dual Analog Pad,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b8,x:b0,y:b3,platform:Windows,
-03000000a30600002106000000000000,Saitek PS1000,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
-03000000a306000020f6000000000000,Saitek PS2700,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
-03000000300f00001101000000000000,Saitek Rumble Pad,a:b2,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
-0300000000050000289b000000000000,Saturn_Adapter_2.0,a:b1,b:b2,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
-030000009b2800000500000000000000,Saturn_Adapter_2.0,a:b1,b:b2,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
-03000000341a00000208000000000000,SL-6555-SBK,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:-a4,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a3,righty:a2,start:b7,x:b2,y:b3,platform:Windows,
-03000000341a00000908000000000000,SL-6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-030000008f0e00000800000000000000,SpeedLink Strike FX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000a30600002106000000000000,Saitek PS1000 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000a306000020f6000000000000,Saitek PS2700 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001101000000000000,Saitek Rumble,a:b2,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000e804000000a0000000000000,Samsung EIGP20,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c01100000252000000000000,Sanwa Easy Grip,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000c01100004350000000000000,Sanwa Micro Grip P3,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,x:b3,y:b2,platform:Windows,
+03000000411200004550000000000000,Sanwa Micro Grip Pro,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a1,righty:a2,start:b9,x:b1,y:b3,platform:Windows,
+03000000c01100004150000000000000,Sanwa Micro Grip Pro,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+03000000c01100004450000000000000,Sanwa Online Grip,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b8,rightstick:b11,righttrigger:b9,rightx:a3,righty:a2,start:b14,x:b3,y:b4,platform:Windows,
+03000000730700000401000000000000,Sanwa PlayOnline Mobile,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Windows,
+03000000830500006120000000000000,Sanwa Smart Grip II,a:b0,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,x:b1,y:b3,platform:Windows,
+03000000c01100000051000000000000,Satechi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000004f04000028b3000000000000,Score A,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000952e00002577000000000000,Scuf PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000a30c00002500000000000000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Windows,
+03000000a30c00002400000000000000,Sega Mega Drive Mini 6B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000d804000086e6000000000000,Sega Multi Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+0300000000050000289b000000000000,Sega Saturn Adapter,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
+0300000000f000000800000000000000,Sega Saturn Controller,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b7,righttrigger:b3,start:b0,x:b5,y:b6,platform:Windows,
+03000000730700000601000000000000,Sega Saturn Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000b40400000a01000000000000,Sega Saturn Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000003b07000004a1000000000000,SFX,a:b0,b:b2,back:b7,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b5,start:b8,x:b1,y:b3,platform:Windows,
+03000000f82100001900000000000000,Shogun Bros Chameleon X1,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000120c00001c1e000000000000,SnakeByte 4S PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000140300000918000000000000,SNES Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+0300000081170000960a000000000000,SNES Controller,a:b4,b:b0,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b5,y:b1,platform:Windows,
+03000000811700009d0a000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+030000008b2800000300000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+03000000921200004653000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+03000000ff000000cb01000000000000,Sony PlayStation Portable,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000341a00000208000000000000,Speedlink 6555,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:-a4,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a3,righty:a2,start:b7,x:b2,y:b3,platform:Windows,
+03000000341a00000908000000000000,Speedlink 6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000380700001722000000000000,Speedlink Competition Pro,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,x:b2,y:b3,platform:Windows,
+030000008f0e00000800000000000000,Speedlink Strike FX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000c01100000591000000000000,Speedlink Torid,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d11800000094000000000000,Stadia Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b11,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
+03000000de280000fc11000000000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000de280000ff11000000000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000120c0000160e000000000000,Steel Play Metaltech PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 03000000110100001914000000000000,SteelSeries,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000381000001214000000000000,SteelSeries Free,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000110100003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000381000003014000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000381000003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000381000001814000000000000,SteelSeries Stratus XL,a:b0,b:b1,back:b18,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b19,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b2,y:b3,platform:Windows,
-03000000790000001c18000000000000,STK-7024X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000ff1100003133000000000000,SVEN X-PAD,a:b2,b:b3,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a4,start:b5,x:b0,y:b1,platform:Windows,
-03000000d620000011a7000000000000,Switch,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000004f04000007d0000000000000,T Mini Wireless,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-030000004f0400000ab1000000000000,T.16000M,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b10,x:b2,y:b3,platform:Windows,
+03000000790000001c18000000000000,STK 7024X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000380700003847000000000000,Street Fighter Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,start:b7,x:b2,y:b3,platform:Windows,
+030000001f08000001e4000000000000,Super Famicom Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000790000000418000000000000,Super Famicom Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b33,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000341200001300000000000000,Super Racer,a:b2,b:b3,back:b8,leftshoulder:b5,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b7,x:b0,y:b1,platform:Windows,
+03000000457500002211000000000000,Szmy Power PC Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000004f0400000ab1000000000000,T16000M,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b10,x:b2,y:b3,platform:Windows,
+030000000d0f00007b00000000000000,TAC GEAR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000e40a00000307000000000000,Taito Egret II Mini Control Panel,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Windows,
+03000000e40a00000207000000000000,Taito Egret II Mini Controller,a:b4,b:b2,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b9,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Windows,
+03000000d814000001a0000000000000,TE Kitty,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000fa1900000706000000000000,Team 5,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000b50700001203000000000000,Techmobility X6-38V,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000ba2200000701000000000000,Technology Innovation PS2 Adapter,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b2,platform:Windows,
+03000000c61100001000000000000000,Tencent Xianyou Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,x:b3,y:b4,platform:Windows,
+03000000790000002601000000000000,TGZ,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000591c00002400000000000000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000591c00002600000000000000,THEGamepad,a:b2,b:b1,back:b6,leftx:a0,lefty:a1,start:b7,x:b3,y:b0,platform:Windows,
 030000004f04000015b3000000000000,Thrustmaster Dual Analog 4,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
-030000004f04000023b3000000000000,Thrustmaster Dual Trigger 3-in-1,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000023b3000000000000,Thrustmaster Dual Trigger PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f0400000ed0000000000000,ThrustMaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000008d0000000000000,ThrustMaster Ferrari 150 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000004f04000000b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Windows,
-030000004f04000004b3000000000000,Thrustmaster Firestorm Dual Power 3,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
-03000000666600000488000000000000,TigerGame PS/PS2 Game Controller Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000004f04000004b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+030000004f04000003d0000000000000,ThrustMaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:a3,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:a4,rightstick:b11,righttrigger:b5,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000009d0000000000000,ThrustMaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d04000088ca000000000000,Thunderpad,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000666600000288000000000000,TigerGame PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000666600000488000000000000,TigerGame PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000004f04000007d0000000000000,TMini,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000571d00002100000000000000,Tomee NES Controller Adapter,a:b1,b:b0,back:b2,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,start:b3,platform:Windows,
+03000000571d00002000000000000000,Tomee SNES Controller Adapter,a:b0,b:b1,back:b6,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
 03000000d62000006000000000000000,Tournament PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000c01100000055000000000000,Tronsmart,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 030000005f140000c501000000000000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000b80500000210000000000000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 030000004f04000087b6000000000000,TWCS Throttle,dpdown:b8,dpleft:b9,dpright:b7,dpup:b6,leftstick:b5,lefttrigger:-a5,leftx:a0,lefty:a1,righttrigger:+a5,platform:Windows,
-03000000d90400000200000000000000,TwinShock PS2,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000411200000450000000000000,Twin Shock,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Windows,
+03000000d90400000200000000000000,TwinShock PS2 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000151900005678000000000000,Uniplay U6,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000101c0000171c000000000000,uRage Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000300f00000701000000000000,USB 4-Axis 12-Button Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
-03000000341a00002308000000000000,USB gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-030000005509000000b4000000000000,USB gamepad,a:b10,b:b11,back:b5,dpdown:b1,dpleft:b2,dpright:b3,dpup:b0,guide:b14,leftshoulder:b8,leftstick:b6,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b7,righttrigger:a5,rightx:a2,righty:a3,start:b4,x:b12,y:b13,platform:Windows,
-030000006b1400000203000000000000,USB gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-03000000790000000a00000000000000,USB gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
-03000000f0250000c183000000000000,USB gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-03000000ff1100004133000000000000,USB gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
-03000000632500002305000000000000,USB Vibration Joystick (BM),a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000000b0400003065000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000242f00006e00000000000000,USB Controller,a:b1,b:b4,back:b10,leftshoulder:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b7,rightx:a2,righty:a5,start:b11,x:b0,y:b3,platform:Windows,
+03000000300f00000701000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000341a00002308000000000000,USB Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000666600000188000000000000,USB Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000006b1400000203000000000000,USB Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000790000000a00000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+03000000b404000081c6000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000b50700001503000000000000,USB Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000bd12000012d0000000000000,USB Controller,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000ff1100004133000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000632500002305000000000000,USB Vibration Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000790000001a18000000000000,Venom,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000790000001b18000000000000,Venom Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00000302000000000000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000006f0e00000702000000000000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+0300000034120000adbe000000000000,vJoy Device,a:b0,b:b1,back:b15,dpdown:b6,dpleft:b7,dpright:b8,dpup:b5,guide:b16,leftshoulder:b9,leftstick:b13,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b14,righttrigger:b12,rightx:a3,righty:a4,start:b4,x:b2,y:b3,platform:Windows,
+03000000120c0000ab57000000000000,Warrior Joypad JS083,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000007e0500003003000000000000,Wii U Pro,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,leftshoulder:b6,leftstick:b11,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b12,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
+0300000032150000030a000000000000,Wildcat,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+0300000032150000140a000000000000,Wolverine,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000002e160000efbe000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,rightshoulder:b5,righttrigger:b11,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700001647000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700002045000000000000,Xbox 360 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700002644000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a2,righty:a5,start:b8,x:b2,y:b3,platform:Windows,
+03000000380700002647000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000003807000026b7000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700003647000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a7,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400001907000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400008e02000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400009102000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000000fd000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000001fd000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000016f0000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b00008e02000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c62400000053000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000fdfa000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700002847000000000000,Xbox 360 Fightpad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000a102000000000000,Xbox 360 Wireless Receiver,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400000a0b000000000000,Xbox Adaptive Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000120c00000a88000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a2,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000120c00001088000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2~,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5~,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000002a0600002000000000000000,Xbox Controller,a:b0,b:b1,back:b13,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b5,leftstick:b14,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b15,righttrigger:b7,rightx:a2,righty:a5,start:b12,x:b2,y:b3,platform:Windows,
+03000000380700001645000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000380700002645000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700003645000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000380700008645000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400000202000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000005e0400008502000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400008702000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000005e0400008902000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b10,leftstick:b8,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b9,righttrigger:b4,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000005e0400000c0b000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000e002000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000e302000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000fd02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000ff02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e0000a802000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e0000c802000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c62400003a54000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000130b000000000000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000341a00000608000000000000,Xeox,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-03000000450c00002043000000000000,XEOX Gamepad SL-6556-BK,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-03000000172700004431000000000000,XiaoMi Game Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a7,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
-030000005e0400008e02000000007801,ShanWan PS3/PC Wired GamePad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-03000000786901006e70000000000000,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000450c00002043000000000000,Xeox SL6556BK,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006f0e00000300000000000000,XGear,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a5,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000e0ff00000201000000000000,Xiaomi Black Shark (L),back:b0,dpdown:b11,dpleft:b9,dpright:b10,dpup:b8,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,platform:Windows,
+03000000172700004431000000000000,Xiaomi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a7,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000172700003350000000000000,Xiaomi XMGP01YM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000bc2000005060000000000000,Xiaomi XMGP01YM,+lefty:+a2,+righty:+a5,-lefty:-a1,-righty:-a4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,start:b11,x:b3,y:b4,platform:Windows,
 xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-03000000790000004f18000000000000,ZD-T Android,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000007d0400000340000000000000,Xterminator Digital Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:-a4,lefttrigger:+a4,leftx:a0,lefty:a1,paddle1:b7,paddle2:b6,rightshoulder:b5,rightstick:b9,righttrigger:b2,rightx:a3,righty:a5,start:b8,x:b3,y:b4,platform:Windows,
+030000002c3600000100000000000000,Yawman Arrow,+rightx:h0.2,+righty:h0.4,-rightx:h0.8,-righty:h0.1,a:b4,b:b5,back:b6,dpdown:b15,dpleft:b14,dpright:b16,dpup:b13,leftshoulder:b10,leftstick:b0,lefttrigger:-a4,leftx:a0,lefty:a1,paddle1:b11,paddle2:b12,rightshoulder:b8,rightstick:b9,righttrigger:+a4,start:b3,x:b1,y:b2,platform:Windows,
+03000000790000004f18000000000000,ZDT Android Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000120c00000500000000000000,Zeroplus Adapter,a:b2,b:b1,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b0,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
+03000000120c0000101e000000000000,Zeroplus P4 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000882800000305000000000000,V5 GAME PAD,a:b0,b:b1,x:b2,y:b3,guide:b8,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Windows
 
 # Mac OS X
-030000008f0e00000300000009010000,2In1 USB Joystick,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
-03000000022000000090000001000000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
-03000000203800000900000000010000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
-03000000c82d00000190000001000000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
-03000000102800000900000000000000,8Bitdo SFC30 GamePad Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
-03000000a00500003232000008010000,8Bitdo Zero GamePad,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
-03000000a00500003232000009010000,8Bitdo Zero GamePad,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000008f0e00000300000009010000,2 In 1 Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000c82d00000031000001000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000531000000020000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
+03000000c82d00000090000001000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00006a28000000010000,8BitDo GameCube,a:b0,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b9,paddle2:b8,rightshoulder:b10,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b1,y:b4,platform:Mac OS X,
+03000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001251000000020000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001151000000020000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000a30c00002400000006020000,8BitDo M30,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,guide:b9,leftshoulder:b6,lefttrigger:b5,rightshoulder:b4,righttrigger:b7,start:b8,x:b3,y:b0,platform:Mac OS X,
+03000000c82d00000151000000010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000650000001000000,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00005106000000010000,8BitDo M30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b2,leftshoulder:b6,lefttrigger:a5,rightshoulder:b7,righttrigger:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00002090000000010000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000451000000010000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
+03000000c82d00001590000001000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00006528000000010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00006928000000010000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
+03000000c82d00002590000000010000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00002590000001000000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00002690000000010000,8BitDo NEOGEO,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b10,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000003512000012ab000001000000,8BitDo NES30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d000012ab000001000000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00002028000000010000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000022000000090000001000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000203800000900000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000190000001000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000751000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000660000000020000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000131000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000231000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000331000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000431000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00002867000000010000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00003028000000010000,8Bitdo SFC30 Gamepad,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000102800000900000000000000,8BitDo SFC30 Joystick,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000351000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001290000001000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00004028000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000160000001000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000161000000010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000260000001000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001230000000010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001b30000001000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001d30000001000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001530000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001630000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001730000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001130000000020000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b24,paddle2:b25,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001330000001000000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001330000000020000,8BitDo Ultimate Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000a00500003232000008010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000a00500003232000009010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001890000001000000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00003032000000010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a31,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000491900001904000001010000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Mac OS X,
+03000000710100001904000000010000,Amazon Luna Controller,a:b0,b:b1,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Mac OS X,
+0300000008100000e501000019040000,Anbernic Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000a30c00002700000003030000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000a30c00002800000003030000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a3,lefty:a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
 03000000050b00000045000031000000,ASUS Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000050b00000579000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b42,paddle1:b9,paddle2:b11,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
+03000000050b00000679000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b23,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
+03000000503200000110000045010000,Atari VCS Classic,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b3,start:b2,platform:Mac OS X,
+03000000503200000110000047010000,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b3,start:b2,platform:Mac OS X,
+03000000503200000210000047010000,Atari VCS Modern Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a4,rightx:a2,righty:a3,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000008a3500000102000000010000,Backbone One,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
+030000008a3500000201000000010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000008a3500000202000000010000,Backbone One,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
+030000008a3500000402000000010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000008a3500000302000000010000,Backbone One PlayStationÆ Edition,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
+03000000c62400001a89000000010000,BDA MOGA XP5-X Plus,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
+03000000c62400001b89000000010000,BDA MOGA XP5-X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000d62000002a79000000010000,BDA PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+03000000120c0000200e000000010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+03000000120c0000210e000000010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 030000008305000031b0000000000000,Cideko AK08b,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000d8140000cecf000000000000,Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000260900008888000088020000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Mac OS X,
-03000000a306000022f6000001030000,Cyborg V.3 Rumble Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000790000000600000000000000,G-Shark GP-702,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Mac OS X,
-03000000ad1b000001f9000000000000,Gamestop BB-070 X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000a306000022f6000001030000,Cyborg V3 Rumble Pad PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000791d00000103000009010000,Dual Box Wii Classic Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000006e0500000720000010020000,Elecom JC-W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Mac OS X,
+030000006f0e00008401000003010000,Faceoff Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b13,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000151900004000000001000000,Flydigi Vader 2,a:b14,b:b15,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Mac OS X,
+03000000b40400001124000001040000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000b40400001224000003030000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000790000004618000000010000,GameCube Controller Adapter,a:b4,b:b0,dpdown:b56,dpleft:b60,dpright:b52,dpup:b48,lefttrigger:a12,leftx:a0,lefty:a4,rightshoulder:b28,righttrigger:a16,rightx:a20,righty:a8,start:b36,x:b8,y:b12,platform:Mac OS X,
+03000000ac0500001a06000002020000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000ad1b000001f9000000000000,Gamestop BB070 X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
-030000000d0f00005f00000000010000,Hori Fighting Commander 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00005e00000000010000,Hori Fighting Commander 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00005f00000000000000,HORI Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00005e00000000000000,HORI Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00004d00000000000000,HORI Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00006e00000000010000,HORIPAD 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00006600000000010000,HORIPAD 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f00006600000000000000,HORIPAD FPS PLUS 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000000d0f0000ee00000000010000,HORIPAD mini4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000008f0e00001330000011010000,HuiJia SNES Controller,a:b4,b:b2,back:b16,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,leftshoulder:b12,rightshoulder:b14,start:b18,x:b6,y:b0,platform:Mac OS X,
-03000000830500006020000000010000,iBuffalo SNES Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Mac OS X,
-03000000830500006020000000000000,iBuffalo USB 2-axis 8-button Gamepad,a:b1,b:b0,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Mac OS X,
+03000000c01100000140000000010000,GameStop PS4 Fun Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000006f0e00000102000000000000,GameStop Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000ff1100003133000007010000,GameWare PC Control Pad,a:b2,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Mac OS X,
+030000007d0400000540000001010000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000280400000140000000020000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000008f0e00000300000007010000,GreenAsia Joystick,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Mac OS X,
+030000000d0f00002d00000000100000,Hori Fighting Commander 3 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005f00000000000000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005f00000000010000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005e00000000000000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005e00000000010000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008400000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008500000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000341a00000302000014010000,Hori Fighting Stick Mini,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008800000000010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008700000000010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00004d00000000000000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00003801000008010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Mac OS X,
+030000000d0f00009200000000010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f0000aa00000072050000,Hori Real Arcade Pro for Nintendo Switch,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000000d0f00000002000017010000,Hori Split Pad Fit,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00000002000015010000,Hori Switch Split Pad Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00006e00000000010000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00006600000000010000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00006600000000000000,Horipad FPS Plus 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f0000ee00000000010000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f0000c100000072050000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000242e0000ff0b000000010000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,platform:Mac OS X,
+03000000790000004e95000000010000,Hyperkin N64 Controller Adapter,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a5,righty:a2,start:b9,platform:Mac OS X,
+03000000830500006020000000000000,iBuffalo Super Famicom Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Mac OS X,
+03000000ef0500000300000000020000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Mac OS X,
+03000000fd0500000030000010010000,Interact GoPad,a:b3,b:b4,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Mac OS X,
 030000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000242f00002d00000007010000,JYS Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000006d04000019c2000000000000,Logitech Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000006d04000016c2000000020000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000006d04000016c2000000030000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000006d04000016c2000014040000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000006d04000016c2000000000000,Logitech F310 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000006d04000018c2000000000000,Logitech F510 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000006d0400001fc2000000000000,Logitech F710 Gamepad (XInput),a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-030000006d04000018c2000000010000,Logitech RumblePad 2 USB,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3~,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000006d04000019c2000000000000,Logitech Wireless Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000380700005032000000010000,Mad Catz FightPad PRO (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000380700005082000000010000,Mad Catz FightPad PRO (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000380700008433000000010000,Mad Catz FightStick TE S+ (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000380700008483000000010000,Mad Catz FightStick TE S+ (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000016c2000000000000,Logitech F310,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000018c2000000000000,Logitech F510,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000019c2000005030000,Logitech F710,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d0400001fc2000000000000,Logitech F710,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000006d04000018c2000000010000,Logitech RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3~,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000380700005032000000010000,Mad Catz PS3 Fightpad Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000380700008433000000010000,Mad Catz PS3 Fightstick TE S Plus,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000380700005082000000010000,Mad Catz PS4 Fightpad Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+03000000380700008483000000010000,Mad Catz PS4 Fightstick TE S Plus,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+03000000790000000600000007010000,Marvo GT-004,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000008f0e00001330000011010000,Mayflash Controller Adapter,a:b2,b:b4,back:b16,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b12,lefttrigger:b16,leftx:a0,lefty:a2,rightshoulder:b14,rightx:a6~,righty:a4,start:b18,x:b0,y:b6,platform:Mac OS X,
+03000000790000004318000000010000,Mayflash GameCube Adapter,a:b4,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a12,leftx:a0,lefty:a4,rightshoulder:b28,righttrigger:a16,rightx:a20,righty:a8,start:b36,x:b8,y:b12,platform:Mac OS X,
 03000000790000004418000000010000,Mayflash GameCube Controller,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Mac OS X,
-0300000025090000e803000000000000,Mayflash Wii Classic Controller,a:b1,b:b0,back:b8,dpdown:b13,dpleft:b12,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Mac OS X,
-03000000790000000018000000000000,Mayflash WiiU Pro Game Controller Adapter (DInput),a:b4,b:b8,back:b32,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b16,leftstick:b40,lefttrigger:b24,leftx:a0,lefty:a4,rightshoulder:b20,rightstick:b44,righttrigger:b28,rightx:a8,righty:a12,start:b36,x:b0,y:b12,platform:Mac OS X,
-03000000d8140000cecf000000000000,MC Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000d62000007162000001000000,Moga Pro 2 HID,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Mac OS X,
-030000001008000001e5000006010000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b6,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000242f00007300000000020000,Mayflash Magic NS,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b3,platform:Mac OS X,
+0300000079000000d218000026010000,Mayflash Magic NS,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000d620000010a7000003010000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000008f0e00001030000011010000,Mayflash Saturn Adapter,a:b0,b:b2,dpdown:b28,dpleft:b30,dpright:b26,dpup:b24,leftshoulder:b10,lefttrigger:b14,rightshoulder:b12,righttrigger:b4,start:b18,x:b6,y:b8,platform:Mac OS X,
+0300000025090000e803000000000000,Mayflash Wii Classic Adapter,a:b1,b:b0,back:b8,dpdown:b13,dpleft:b12,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Mac OS X,
+03000000790000000318000000010000,Mayflash Wii DolphinBar,a:b8,b:b12,back:b32,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b44,leftshoulder:b16,lefttrigger:b24,leftx:a0,lefty:a4,rightshoulder:b20,righttrigger:b28,rightx:a8,righty:a12,start:b36,x:b0,y:b4,platform:Mac OS X,
+03000000790000000018000000000000,Mayflash Wii U Pro Adapter,a:b4,b:b8,back:b32,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b16,leftstick:b40,lefttrigger:b24,leftx:a0,lefty:a4,rightshoulder:b20,rightstick:b44,righttrigger:b28,rightx:a8,righty:a12,start:b36,x:b0,y:b12,platform:Mac OS X,
+03000000790000000018000000010000,Mayflash Wii U Pro Adapter,a:b4,b:b8,back:b32,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b16,leftstick:b40,lefttrigger:b24,leftx:a0,lefty:a4,rightshoulder:b20,rightstick:b44,righttrigger:b28,rightx:a8,righty:a12,start:b36,x:b0,y:b12,platform:Mac OS X,
+030000005e0400002800000002010000,Microsoft Dual Strike,a:b3,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,rightx:a0,righty:a1~,start:b5,x:b1,y:b0,platform:Mac OS X,
+030000005e0400000300000006010000,Microsoft SideWinder,a:b0,b:b1,back:b9,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Mac OS X,
+030000005e0400000700000006010000,Microsoft SideWinder,a:b0,b:b1,back:b8,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Mac OS X,
+030000005e0400002700000001010000,Microsoft SideWinder Plug and Play,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b4,righttrigger:b5,x:b2,y:b3,platform:Mac OS X,
+030000004523000015e0000072050000,Mobapad Chitu HD,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000d62000007162000001000000,Moga Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Mac OS X,
+03000000c62400002a89000000010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c62400002b89000000010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000632500007505000000020000,NeoGeo mini PAD Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000921200004b46000003020000,NES 2-port Adapter,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b11,platform:Mac OS X,
+030000001008000001e5000006010000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Mac OS X,
 030000007e0500000920000000000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
 030000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
-030000008f0e00000300000000000000,Piranha xtreme,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000007e0500000920000010020000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:Mac OS X,
+050000007e05000009200000ff070000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:Mac OS X,
+030000007e0500001920000001000000,NSO N64 Controller,+rightx:b8,+righty:b7,-rightx:b3,-righty:b2,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,righttrigger:b10,start:b9,platform:Mac OS X,
+030000007e0500001720000001000000,NSO SNES Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b15,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000550900001472000025050000,NVIDIA Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Mac OS X,
+030000004b120000014d000000010000,Nyko Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Mac OS X,
+030000006f0e00000901000002010000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000008f0e00000300000000000000,Piranha Xtreme PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000666600006706000088020000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Mac OS X,
+030000004c050000da0c000000010000,PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000004c0500003713000000010000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000d620000011a7000000020000,PowerA Core Plus Gamecube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000d620000011a7000010050000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000d62000006dca000000010000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000100800000300000006010000,PS2 Adapter,a:b2,b:b1,back:b8,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
 030000004c0500006802000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Mac OS X,
 030000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Mac OS X,
-030000004c050000a00b000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000004c050000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004c0500006802000072050000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Mac OS X,
+030000004c050000a00b000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+0300004b4c0500005f0e000000010000,PS5 Access Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+050000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+050000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000005e040000e002000001000000,PXN P30 Pro Mobile,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
+03000000222c00000225000000010000,Qanba Dragon Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000222c00000020000000010000,Qanba Drone Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000009b2800005600000020020000,Raphnet SNES Adapter,a:b1,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Mac OS X,
+030000009b2800008000000022020000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Mac OS X,
 030000008916000000fd000000000000,Razer Onza TE,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-03000000321500000204000000010000,Razer Panthera (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000321500000104000000010000,Razer Panthera (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000321500000010000000010000,Razer RAIJU,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000321500000204000000010000,Razer Panthera PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000321500000104000000010000,Razer Panthera PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+03000000321500000010000000010000,Razer Raiju,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000321500000507000001010000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000321500000011000000010000,Razer Raion PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 03000000321500000009000000020000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
 030000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
 0300000032150000030a000000000000,Razer Wildcat,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-03000000790000001100000000000000,Retrolink Classic Controller,a:b2,b:b1,back:b8,leftshoulder:b4,leftx:a3,lefty:a4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000632500008005000000010000,Redgear,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000921200004547000000020000,Retro Bit Sega Genesis Controller Adapter,a:b0,b:b2,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,lefttrigger:b14,rightshoulder:b10,righttrigger:b4,start:b12,x:b6,y:b8,platform:Mac OS X,
+03000000790000001100000000000000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000790000001100000005010000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000830500006020000000010000,Retro Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b8,righttrigger:b9,start:b7,x:b2,y:b3,platform:Mac OS X,
+0300000003040000c197000000000000,Retrode Adapter,a:b0,b:b4,back:b2,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Mac OS X,
 03000000790000001100000006010000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000341200000400000000000000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Mac OS X,
 030000006b140000010d000000010000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-03000000c6240000fefa000000000000,Rock Candy Gamepad for PS3,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000006b140000130d000000010000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004c0500006802000002100000,Rii RK707,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b2,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b3,righttrigger:b9,rightx:a2,righty:a3,start:b1,x:b15,y:b12,platform:Mac OS X,
+030000006f0e00008701000005010000,Rock Candy Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000c6240000fefa000000000000,Rock Candy PS3,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000e804000000a000001b010000,Samsung EIGP20,a:b1,b:b3,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b11,leftx:a1,lefty:a3,rightshoulder:b12,rightx:a4,righty:a5,start:b16,x:b7,y:b9,platform:Mac OS X,
+03000000730700000401000000010000,Sanwa PlayOnline Mobile,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Mac OS X,
+03000000a30c00002500000006020000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Mac OS X,
 03000000811700007e05000000000000,Sega Saturn,a:b2,b:b4,dpdown:b16,dpleft:b15,dpright:b14,dpup:b17,leftshoulder:b8,lefttrigger:a5,leftx:a0,lefty:a2,rightshoulder:b9,righttrigger:a4,start:b13,x:b0,y:b6,platform:Mac OS X,
-03000000b40400000a01000000000000,Sega Saturn USB Gamepad,a:b0,b:b1,back:b5,guide:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Mac OS X,
-030000003512000021ab000000000000,SFC30 Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
-030000004c050000cc09000000000000,Sony DualShock 4 V2,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
-030000004c050000a00b000000000000,Sony DualShock 4 Wireless Adaptor,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000b40400000a01000000000000,Sega Saturn,a:b0,b:b1,back:b5,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b2,leftshoulder:b6,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Mac OS X,
+030000003512000021ab000000000000,SFC30 Joystick,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+0300000000f00000f100000000000000,SNES RetroPort,a:b2,b:b3,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b5,rightshoulder:b7,start:b6,x:b0,y:b1,platform:Mac OS X,
+030000004c050000a00b000000000000,Sony DualShock 4 Adapter,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000cc09000000000000,Sony DualShock 4 V2,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+03000000d11800000094000000010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
 030000005e0400008e02000001000000,Steam Virtual Gamepad,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-03000000110100002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,platform:Mac OS X,
+03000000110100002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
 03000000110100002014000001000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
 03000000381000002014000001000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
+05000000484944204465766963650000,SteelSeries Nimbus Plus,a:b0,b:b1,back:b15,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b16,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b14,x:b2,y:b3,platform:Mac OS X,
+050000004e696d6275732b0000000000,SteelSeries Nimbus Plus,a:b0,b:b1,back:b15,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b16,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b14,x:b2,y:b3,platform:Mac OS X,
+03000000381000003014000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000381000003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 03000000110100001714000000000000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,start:b12,x:b2,y:b3,platform:Mac OS X,
 03000000110100001714000020010000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,start:b12,x:b2,y:b3,platform:Mac OS X,
+030000000d0f0000f600000000010000,Switch Hori Pad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000457500002211000000010000,SZMY Power PC Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000e40a00000307000001000000,Taito Egret II Mini Control Panel,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Mac OS X,
+03000000e40a00000207000001000000,Taito Egret II Mini Controller,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Mac OS X,
+03000000790000001c18000003100000,TGZ Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000591c00002400000021000000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Mac OS X,
+03000000591c00002600000021000000,THEGamepad,a:b2,b:b1,back:b6,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Mac OS X,
 030000004f04000015b3000000000000,Thrustmaster Dual Analog 3.2,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Mac OS X,
+030000004f0400000ed0000000020000,ThrustMaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000004f04000000b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Mac OS X,
-03000000bd12000015d0000000000000,Tomee SNES USB Controller,a:b2,b:b1,back:b8,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
-03000000bd12000015d0000000010000,Tomee SNES USB Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000571d00002100000021000000,Tomee NES Controller Adapter,a:b1,b:b0,back:b2,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,start:b3,platform:Mac OS X,
+03000000bd12000015d0000000010000,Tomee Retro Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000bd12000015d0000000000000,Tomee SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000571d00002000000021000000,Tomee SNES Controller Adapter,a:b0,b:b1,back:b6,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000005f140000c501000000020000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
 03000000100800000100000000000000,Twin USB Joystick,a:b4,b:b2,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b12,leftstick:b20,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b14,rightstick:b22,righttrigger:b10,rightx:a6,righty:a4,start:b18,x:b6,y:b0,platform:Mac OS X,
+03000000632500002605000000010000,Uberwith Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000151900005678000010010000,Uniplay U6,a:b3,b:b6,back:b25,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,leftstick:b31,lefttrigger:b21,leftx:a1,lefty:a3,rightshoulder:b19,rightstick:b33,righttrigger:b23,rightx:a4,righty:a5,start:b27,x:b11,y:b13,platform:Mac OS X,
+030000006f0e00000302000025040000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000006f0e00000702000003060000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 050000005769696d6f74652028303000,Wii Remote,a:b4,b:b5,back:b7,dpdown:b3,dpleft:b0,dpright:b1,dpup:b2,guide:b8,leftshoulder:b11,lefttrigger:b12,leftx:a0,lefty:a1,start:b6,x:b10,y:b9,platform:Mac OS X,
 050000005769696d6f74652028313800,Wii U Pro Controller,a:b16,b:b15,back:b7,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b8,leftshoulder:b19,leftstick:b23,lefttrigger:b21,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b24,righttrigger:b22,rightx:a2,righty:a3,start:b6,x:b18,y:b17,platform:Mac OS X,
-030000005e0400008e02000000000000,X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-03000000c6240000045d000000000000,Xbox 360 Wired Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-030000005e040000d102000000000000,Xbox One Wired Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-030000005e040000dd02000000000000,Xbox One Wired Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-030000005e040000e302000000000000,Xbox One Wired Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-030000005e040000e002000000000000,Xbox Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
-030000005e040000e002000003090000,Xbox Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
-030000005e040000ea02000000000000,Xbox Wireless Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
-030000005e040000fd02000003090000,Xbox Wireless Controller,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
-03000000172700004431000029010000,XiaoMi Game Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Mac OS X,
-03000000120c0000100e000000010000,ZEROPLUS P4 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000005e0400008e02000000000000,Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000006f0e00000104000000000000,Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000c6240000045d000000000000,Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e0400000a0b000000000000,Xbox Adaptive Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000050b000003090000,Xbox Elite Controller Series 2,a:b0,b:b1,back:b31,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b53,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000200b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000200b000013050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000200b000015050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000e002000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000005e040000e002000003090000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000005e040000e302000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000fd02000003090000,Xbox One Controller,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c62400003a54000000000000,Xbox One PowerA Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000130b000001050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000005050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000009050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000013050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000015050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000007050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000220b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000022050000,Xbox Wireless Controller,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Mac OS X,
+03000000172700004431000029010000,XiaoMi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000120c0000100e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000120c0000101e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 
 # Linux
-03000000022000000090000011010000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
-05000000203800000900000000010000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
-05000000c82d00002038000000010000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
-03000000c82d00000190000011010000,8Bitdo NES30 Pro 8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
-05000000c82d00000061000000010000,8Bitdo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
-05000000102800000900000000010000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
-05000000c82d00003028000000010000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
-05000000a00500003232000001000000,8Bitdo Zero GamePad,a:b0,b:b1,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
-05000000a00500003232000008010000,8Bitdo Zero GamePad,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
-030000006f0e00001302000000010000,Afterglow,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006f0e00003901000020060000,Afterglow Controller for Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000031000011010000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
+03000000021000000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00006a28000000010000,8BitDo GameCube,a:b0,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b9,paddle2:b8,rightshoulder:b10,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b1,y:b4,platform:Linux,
+03000000c82d00001251000011010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001151000011010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000151000000010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000650000011010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00005106000000010000,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000a20000000020000,8BitDo M30 Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00002090000011010000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00002090000000010000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000451000000010000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
+03000000c82d00001590000011010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00006528000000010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00006928000011010000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Linux,
+05000000c82d00006928000000010000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Linux,
+05000000c82d00002590000001000000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000008000000210000011010000,8BitDo NES30,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000c82d00000310000011010000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b9,righttrigger:b8,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00008010000000010000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b9,righttrigger:b8,start:b11,x:b3,y:b4,platform:Linux,
+03000000022000000090000011010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000190000011010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000203800000900000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00002038000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000751000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000660000011010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001030000011010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000020000000000000,8BitDo Pro 2 for Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+06000000c82d00000020000006010000,8BitDo Pro 2 for Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000131000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000231000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000331000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000431000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00002867000000010000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b3,y:b4,platform:Linux,
+03000000c82d00000060000011010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000060000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000061000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+030000003512000012ab000010010000,8BitDo SFC30,a:b2,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Linux,
+030000003512000021ab000010010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d000021ab000010010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000102800000900000000010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00003028000000010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000351000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000160000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000160000011010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000161000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001290000011010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000161000000010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00006228000000010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000260000011010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000202800000900000000010000,8BitDo SNES30,a:b1,b:b0,back:b10,dpdown:b122,dpleft:b119,dpright:b120,dpup:b117,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001230000000010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000a31000014010000,8BitDo Ultimate 2C,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00001d30000011010000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00001b30000001000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001530000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001630000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001730000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001130000011010000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b24,paddle2:b25,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000631000010010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000760000011010000,8BitDo Ultimate Wireless,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001230000011010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001330000011010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000631000014010000,8BitDo Ultimate Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000121000011010000,8BitDo Xbox One SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00000121000000010000,8BitDo Xbox One SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000a00500003232000001000000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
+05000000a00500003232000008010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001890000011010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00003032000000010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c01100000355000011010000,Acrux Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00008801000011010000,Afterglow Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006f0e00003901000000430000,Afterglow Prismatic Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000100000008200000011010000,Akishop Customs PS360+ v1.66,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
-05000000491900000204000021000000,Amazon Fire Game Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000006f0e00003901000013020000,Afterglow Prismatic Controller 048-007-NA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00001302000000010000,Afterglow Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00003901000020060000,Afterglow Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000100000008200000011010000,Akishop Customs PS360,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000007c1800000006000010010000,Alienware Dual Compatible Game PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
+05000000491900000204000021000000,Amazon Fire Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b17,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000491900001904000011010000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+05000000710100001904000000010000,Amazon Luna Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+0300000008100000e501000001010000,Anbernic Gamepad,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b3,y:b4,platform:Linux,
+03000000790000003018000011010000,Arcade Fightstick F300,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000a30c00002700000011010000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000a30c00002800000011010000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
 05000000050b00000045000031000000,ASUS Gamepad,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b10,x:b2,y:b3,platform:Linux,
 05000000050b00000045000040000000,ASUS Gamepad,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b10,x:b2,y:b3,platform:Linux,
-03000000120c00000500000010010000,AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Linux,
-03000000666600006706000000010000,boom PSX to PC Converter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Linux,
+03000000050b00000579000011010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b36,paddle1:b52,paddle2:b53,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000050b00000679000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b21,paddle1:b22,paddle2:b23,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000503200000110000000000000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+03000000503200000110000011010000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+05000000503200000110000000000000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+05000000503200000110000044010000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+05000000503200000110000046010000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+03000000503200000210000000000000,Atari VCS Modern Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a4,rightx:a2,righty:a3,start:b8,x:b2,y:b3,platform:Linux,
+03000000503200000210000011010000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000000000000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000045010000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000046010000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000047010000,Atari VCS Modern Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:-a4,rightx:a2,righty:a3,start:b8,x:b2,y:b3,platform:Linux,
+030000008a3500000201000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000008a3500000202000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000008a3500000302000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000008a3500000402000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c62400001b89000011010000,BDA MOGA XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000d62000002a79000011010000,BDA PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000c21100000791000011010000,Be1 GC101 Controller 1.03,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000c31100000791000011010000,Be1 GC101 Controller 1.03,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000005e0400008e02000003030000,Be1 GC101 Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000bc2000004d50000011010000,Beitong A1T2 BFM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000bc2000000055000001000000,Betop AX1 BFM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000bc2000006412000011010000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b30,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000006b1400000209000011010000,Bigben,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000200e000011010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000120c0000210e000011010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000120c0000f70e000011010000,Brook Universal Fighting Board,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 03000000e82000006058000001010000,Cideko AK08b,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000af1e00002400000010010000,Clockwork Pi DevTerm,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b9,x:b3,y:b0,platform:Linux,
+030000000b0400003365000000010000,Competition Pro,a:b0,b:b1,back:b2,leftx:a0,lefty:a1,start:b3,platform:Linux,
 03000000260900008888000000010000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Linux,
-03000000a306000022f6000011010000,Cyborg V.3 Rumble Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
-03000000b40400000a01000000010000,CYPRESS USB Gamepad,a:b0,b:b1,back:b5,guide:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Linux,
-03000000790000000600000010010000,DragonRise Inc. Generic USB Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Linux,
+03000000a306000022f6000011010000,Cyborg V3 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000791d00000103000010010000,Dual Box Wii Classic Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 030000006f0e00003001000001010000,EA Sports PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000341a000005f7000010010000,GameCube {HuiJia USB box},a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
+03000000c11100000191000011010000,EasySMX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000242f00009100000000010000,EasySMX ESM-9101,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006e0500000320000010010000,Elecom U3613M,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Linux,
+030000006e0500000720000010010000,Elecom W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Linux,
+030000007d0400000640000010010000,Eliminator AfterShock,a:b1,b:b2,back:b9,dpdown:+a3,dpleft:-a5,dpright:+a5,dpup:-a3,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a4,righty:a2,start:b8,x:b0,y:b3,platform:Linux,
+03000000430b00000300000000010000,EMS Production PS2 Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a5,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000006f0e00008401000011010000,Faceoff Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00008101000011010000,Faceoff Deluxe Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00008001000011010000,Faceoff Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03005036852100000201000010010000,Final Fantasy XIV Online Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000b40400001124000011010000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000b40400001224000011010000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000151900004000000001000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000007e0500003703000000000000,GameCube Adapter,a:b0,b:b1,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+19000000030000000300000002030000,GameForce Controller,a:b1,b:b0,back:b8,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,guide:b16,leftshoulder:b4,leftstick:b14,lefttrigger:b6,leftx:a1,lefty:a0,rightshoulder:b5,rightstick:b15,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000ac0500005b05000010010000,GameSir G3w,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000bc2000000055000011010000,GameSir G3w,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000558500001b06000010010000,GameSir G4 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000ac0500002d0200001b010000,GameSir G4s,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b33,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000ac0500007a05000011010000,GameSir G5,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b16,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000bc2000005656000011010000,GameSir T4w,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000ac0500001a06000011010000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 030000006f0e00000104000000010000,Gamestop Logic3 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000008f0e00000800000010010000,Gasia Co. Ltd PS(R) Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
-030000006f0e00001304000000010000,Generic X-Box pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:a0,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:a3,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000f0250000c183000010010000,Goodbetterbest Ltd USB Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000008f0e00000800000010010000,Gasia PlayStation Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000451300000010000010010000,Genius Maxfire Grandias 12,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+190000004b4800000010000000010000,GO-Advance Controller,a:b1,b:b0,back:b10,dpdown:b7,dpleft:b8,dpright:b9,dpup:b6,leftshoulder:b4,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b13,start:b15,x:b2,y:b3,platform:Linux,
+190000004b4800000010000001010000,GO-Advance Controller,a:b1,b:b0,back:b12,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b4,leftstick:b13,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b16,righttrigger:b15,start:b17,x:b2,y:b3,platform:Linux,
+190000004b4800000011000000010000,GO-Super Controller,a:b1,b:b0,back:b12,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b16,leftshoulder:b4,leftstick:b14,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b15,righttrigger:b7,rightx:a2,righty:a3,start:b13,x:b2,y:b3,platform:Linux,
+03000000f0250000c183000010010000,Goodbetterbest Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 0300000079000000d418000000010000,GPD Win 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000280400000140000000010000,Gravis GamePad Pro USB ,a:b1,b:b2,back:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
-030000008f0e00000610000000010000,GreenAsia Electronics 4Axes 12Keys GamePad ,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Linux,
-030000008f0e00001200000010010000,GreenAsia Inc. USB Joystick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000001010000,GPD Win Max 2 (6800U) Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000007d0400000540000000010000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000280400000140000000010000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000008f0e00000610000000010000,GreenAsia Electronics Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Linux,
+030000008f0e00001200000010010000,GreenAsia Joystick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
 0500000047532067616d657061640000,GS gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-06000000adde0000efbe000002010000,Hidromancer Game Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000d81400000862000011010000,HitBox (PS3/PC) Analog Mode,a:b1,b:b2,back:b8,guide:b9,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b12,x:b0,y:b3,platform:Linux,
-03000000c9110000f055000011010000,HJC Game GAMEPAD,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-030000000d0f00000d00000000010000,hori,a:b0,b:b6,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b3,leftx:b4,lefty:b5,rightshoulder:b7,start:b9,x:b1,y:b2,platform:Linux,
-030000000d0f00001000000011010000,HORI CO. LTD. FIGHTING STICK 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00006a00000011010000,HORI CO. LTD. Real Arcade Pro.4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00006b00000011010000,HORI CO. LTD. Real Arcade Pro.4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00002200000011010000,HORI CO. LTD. REAL ARCADE Pro.V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00005f00000011010000,Hori Fighting Commander 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00005e00000011010000,Hori Fighting Commander 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000f0250000c383000010010000,GT VX2,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+06000000adde0000efbe000002010000,Hidromancer Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d81400000862000011010000,HitBox PS3 PC Analog Mode,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b12,x:b0,y:b3,platform:Linux,
+03000000c9110000f055000011010000,HJC Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f00006d00000020010000,Hori EDGE 301,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:+a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00008400000011010000,Hori Fighting Commander,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00005f00000011010000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00005e00000011010000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000000d0f00005001000009040000,Hori Fighting Commander OCTA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00008500000010010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00008600000002010000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f00003701000013010000,Hori Fighting Stick Mini,a:b1,b:b0,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b3,y:b2,platform:Linux,
+030000000d0f00008800000011010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00008700000011010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,rightstick:b11,righttrigger:a4,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000000d0f00001000000011010000,Hori Fightstick 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000ad1b000003f5000033050000,Hori Fightstick VX,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b8,guide:b10,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f00004d00000011010000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000ad1b000001f5000033050000,Hori Pad EX Turbo 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000000d0f00006e00000011010000,HORIPAD 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00006600000011010000,HORIPAD 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f0000ee00000011010000,HORIPAD mini4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-030000000d0f00006700000001010000,HORIPAD ONE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000008f0e00001330000010010000,HuiJia SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b9,x:b3,y:b0,platform:Linux,
-03000000830500006020000010010000,iBuffalo SNES Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
-050000006964726f69643a636f6e0000,idroid:con,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000b50700001503000010010000,impact,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
-03000000fd0500000030000000010000,InterAct GoPad I-73000 (Fighting Game Layout),a:b3,b:b4,back:b6,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,start:b7,x:b0,y:b1,platform:Linux,
-0500000049190000020400001b010000,Ipega PG-9069 - Bluetooth Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b161,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-030000006e0500000320000010010000,JC-U3613M - DirectInput Mode,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Linux,
-03000000300f00001001000010010000,Jess Tech Dual Analog Rumble Pad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
-03000000ba2200002010000001010000,Jess Technology USB Game Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000000d0f00003801000011010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Linux,
+030000000d0f00009200000011010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00001100000011010000,Hori Real Arcade Pro 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00002200000011010000,Hori Real Arcade Pro 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006a00000011010000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006b00000011010000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00001600000000010000,Hori Real Arcade Pro EXSE,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f0000aa00000011010000,Hori Real Arcade Pro for Nintendo Switch,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000000d0f00008501000017010000,Hori Split Pad Fit,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00008501000015010000,Hori Switch Split Pad Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00006e00000011010000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006600000011010000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000000d0f0000ee00000011010000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f0000c100000011010000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006700000001010000,Horipad One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000000d0f0000f600000001000000,Horipad Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000341a000005f7000010010000,HuiJia GameCube Controller Adapter,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
+05000000242e00000b20000001000000,Hyperkin Admiral N64 Controller,+rightx:b11,+righty:b13,-rightx:b8,-righty:b12,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,platform:Linux,
+03000000242e0000ff0b000011010000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,platform:Linux,
+03000000242e00006a38000010010000,Hyperkin Trooper 2,a:b0,b:b1,back:b4,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b3,start:b5,platform:Linux,
+03000000242e00008816000001010000,Hyperkin X91,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000f00300008d03000011010000,HyperX Clutch,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000830500006020000010010000,iBuffalo Super Famicom Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
+030000008f0e00001330000001010000,iCode Retro Adapter,b:b3,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b9,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b1,start:b7,x:b2,y:b0,platform:Linux,
+050000006964726f69643a636f6e0000,idroidcon Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000b50700001503000010010000,Impact,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
+03000000d80400008200000003000000,IMS PCU0,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b5,x:b3,y:b2,platform:Linux,
+03000000120c00000500000010010000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Linux,
+03000000ef0500000300000000010000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Linux,
+03000000fd0500000030000000010000,InterAct GoPad,a:b3,b:b4,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Linux,
+03000000fd0500002a26000000010000,InterAct HammerHead FX,a:b3,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b2,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Linux,
+0500000049190000020400001b010000,Ipega PG 9069,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b161,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000632500007505000011010000,Ipega PG 9099,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+0500000049190000030400001b010000,Ipega PG9099,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000491900000204000000000000,Ipega PG9118,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000300f00001001000010010000,Jess Tech Dual Analog Rumble,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
+03000000300f00000b01000010010000,Jess Tech GGE909 PC Recoil,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+03000000ba2200002010000001010000,Jess Technology Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
 030000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Linux,
 050000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Linux,
 030000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Linux,
 050000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Linux,
+03000000bd12000003c0000010010000,Joypad Alpha Shock,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000242f00002d00000011010000,JYS Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000242f00008a00000011010000,JYS Adapter,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b3,platform:Linux,
 030000006f0e00000103000000020000,Logic3 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d040000d1ca000000000000,Logitech Chillstream,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d040000d1ca000011010000,Logitech Chillstream,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d04000019c2000010010000,Logitech Cordless RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d04000016c2000010010000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d04000016c2000011010000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000006d0400001dc2000014400000,Logitech F310 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006d0400001ec2000020200000,Logitech F510 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006d04000019c2000011010000,Logitech F710 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000006d0400001fc2000005030000,Logitech F710 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006d0400000ac2000010010000,Logitech Inc. WingMan RumblePad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b2,rightx:a3,righty:a4,x:b3,y:b4,platform:Linux,
-030000006d04000015c2000010010000,Logitech Logitech Extreme 3D,a:b0,b:b4,back:b6,guide:b8,leftshoulder:b9,leftstick:h0.8,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:h0.2,start:b7,x:b2,y:b5,platform:Linux,
+030000006d0400001dc2000014400000,Logitech F310,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d0400001ec2000019200000,Logitech F510,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d0400001ec2000020200000,Logitech F510,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d04000019c2000011010000,Logitech F710,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d0400001fc2000005030000,Logitech F710,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006d04000018c2000010010000,Logitech RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d04000011c2000010010000,Logitech WingMan Cordless RumblePad,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b10,rightx:a3,righty:a4,start:b8,x:b3,y:b4,platform:Linux,
-05000000380700006652000025010000,Mad Catz C.T.R.L.R ,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000380700005032000011010000,Mad Catz FightPad PRO (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000380700005082000011010000,Mad Catz FightPad PRO (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000006d0400000ac2000010010000,Logitech WingMan RumblePad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,rightx:a3,righty:a4,x:b3,y:b4,platform:Linux,
+05000000380700006652000025010000,Mad Catz CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700008532000010010000,Mad Catz Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700005032000011010000,Mad Catz Fightpad Pro PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700005082000011010000,Mad Catz Fightpad Pro PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 03000000ad1b00002ef0000090040000,Mad Catz Fightpad SFxT,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b2,y:b3,platform:Linux,
-03000000380700008034000011010000,Mad Catz fightstick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000380700008084000011010000,Mad Catz fightstick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-03000000380700008433000011010000,Mad Catz FightStick TE S+ (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000380700008483000011010000,Mad Catz FightStick TE S+ (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-03000000380700001647000010040000,Mad Catz Wired Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000380700003847000090040000,Mad Catz Wired Xbox 360 Controller (SFIV),a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000380700008034000011010000,Mad Catz Fightstick PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700008084000011010000,Mad Catz Fightstick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000380700008433000011010000,Mad Catz Fightstick TE S PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700008483000011010000,Mad Catz Fightstick TE S PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000380700001888000010010000,Mad Catz Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700003888000010010000,Mad Catz Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:a0,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700001647000010040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000380700003847000090040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 03000000ad1b000016f0000090040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000380700001888000010010000,MadCatz PC USB Wired Stick 8818,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000380700003888000010010000,MadCatz PC USB Wired Stick 8838,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:a0,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-0300000079000000d218000011010000,MAGIC-NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000120c00000500000000010000,Manta Dualshock 2,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
-03000000790000004418000010010000,Mayflash GameCube Controller,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
-0300000025090000e803000001010000,Mayflash Wii Classic Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:a4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:a5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
-03000000780000000600000010010000,Microntek USB Joystick,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
-030000005e0400000e00000000010000,Microsoft SideWinder,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Linux,
-030000005e0400008e02000004010000,Microsoft X-Box 360 pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000062230000,Microsoft X-Box 360 pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000e302000003020000,Microsoft X-Box One Elite pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000d102000001010000,Microsoft X-Box One pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000dd02000003020000,Microsoft X-Box One pad (Firmware 2015),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000d102000003020000,Microsoft X-Box One pad v2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008502000000010000,Microsoft X-Box pad (Japan),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
-030000005e0400008902000021010000,Microsoft X-Box pad v2 (US),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
-05000000d6200000e589000001000000,Moga 2 HID,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+030000008f0e00001330000010010000,Mayflash Controller Adapter,a:b1,b:b2,back:b8,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3~,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
+03000000790000004318000010010000,Mayflash GameCube Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000790000004418000010010000,Mayflash GameCube Controller,a:b1,b:b0,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000242f00007300000011010000,Mayflash Magic NS,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b3,platform:Linux,
+0300000079000000d218000011010000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d620000010a7000011010000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000242f0000f700000001010000,Mayflash Magic S Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000008f0e00001030000010010000,Mayflash Saturn Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Linux,
+0300000025090000e803000001010000,Mayflash Wii Classic Adapter,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:a4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:a5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+03000000790000000318000011010000,Mayflash Wii DolphinBar,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Linux,
+03000000790000000018000011010000,Mayflash Wii U Pro Adapter,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000b50700001203000010010000,Mega World Logic 3 Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
+03000000b50700004f00000000010000,Mega World Logic 3 Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Linux,
+03000000780000000600000010010000,Microntek Joystick,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+030000005e0400002800000000010000,Microsoft Dual Strike,a:b3,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,rightx:a0,righty:a1~,start:b5,x:b1,y:b0,platform:Linux,
+030000005e0400000300000000010000,Microsoft SideWinder,a:b0,b:b1,back:b9,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Linux,
+030000005e0400000700000000010000,Microsoft SideWinder,a:b0,b:b1,back:b8,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Linux,
+030000005e0400000e00000000010000,Microsoft SideWinder Freestyle Pro,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Linux,
+030000005e0400002700000000010000,Microsoft SideWinder Plug and Play,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b4,righttrigger:b5,x:b2,y:b3,platform:Linux,
+030000005e0400008502000000010000,Microsoft Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+030000005e0400008902000021010000,Microsoft Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+030000005e0400008e02000001000000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.1,dpleft:h0.2,dpright:h0.8,dpup:h0.4,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000004010000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000056210000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000062230000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000d102000001010000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000d102000003020000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000dd02000003020000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000ea02000008040000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b000009050000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000e302000003020000,Microsoft Xbox One Elite,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000000b000007040000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b12,paddle2:b14,paddle3:b13,paddle4:b15,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000000b000008040000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b12,paddle2:b14,paddle3:b13,paddle4:b15,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000050b000003090000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e0400008e02000030110000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b13,paddle3:b12,paddle4:b14,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b00000b050000,Microsoft Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b000001050000,Microsoft Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000030000000300000002000000,Miroof,a:b1,b:b0,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
+03000000790000001c18000010010000,Mobapad Chitu HD,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000004d4f435554452d3035335800,Mocute 053X,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+05000000e80400006e0400001b010000,Mocute 053X M59,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000004d4f435554452d3035305800,Mocute 054X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000d6200000e589000001000000,Moga 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
 05000000d6200000ad0d000001000000,Moga Pro,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
-05000000d62000007162000001000000,Moga Pro 2 HID,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
-03000000250900006688000000010000,MP-8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
+05000000d62000007162000001000000,Moga Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+03000000c62400002b89000011010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c62400002a89000000010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b22,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c62400001a89000000010000,MOGA XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000250900006688000000010000,MP8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
+030000005e0400008e02000010020000,MSI GC20 V2,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00001311000011010000,N64 Controller,+rightx:b10,+righty:b3,-rightx:b0,-righty:b11,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,platform:Linux,
+030000006b1400000906000014010000,Nacon Asymmetric Wireless PS4 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006b140000010c000010010000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000853200000706000012010000,Nacon GC-100,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000000d0f00000900000010010000,Natec Genesis P44,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000001008000001e5000010010000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b6,start:b9,x:b3,y:b0,platform:Linux,
-050000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-050000007e0500003003000001000000,Nintendo Wii Remote Pro Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
-05000000010000000100000003000000,Nintendo Wiimote,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-030000000d0500000308000010010000,Nostromo n45 Dual Analog Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b12,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b2,y:b3,platform:Linux,
+030000004f1f00000800000011010000,NeoGeo PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+0300000092120000474e000000010000,NeoGeo X Arcade Stick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b3,y:b2,platform:Linux,
+03000000790000004518000010010000,Nexilux GameCube Controller Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+030000001008000001e5000010010000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Linux,
+060000007e0500003713000000000000,Nintendo 3DS,a:b0,b:b1,back:b8,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+030000007e0500003703000000016800,Nintendo GameCube Controller,a:b0,b:b2,dpdown:b6,dpleft:b4,dpright:b5,dpup:b7,lefttrigger:a4,leftx:a0,lefty:a1~,rightshoulder:b9,righttrigger:a5,rightx:a2,righty:a3~,start:b8,x:b1,y:b3,platform:Linux,
+03000000790000004618000010010000,Nintendo GameCube Controller Adapter,a:b1,b:b0,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a5~,righty:a2~,start:b9,x:b2,y:b3,platform:Linux,
+060000004e696e74656e646f20537700,Nintendo Switch Combined Joy-Cons,a:b0,b:b1,back:b9,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+060000007e0500000620000000000000,Nintendo Switch Combined Joy-Cons,a:b0,b:b1,back:b9,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+060000007e0500000820000000000000,Nintendo Switch Combined Joy-Cons,a:b0,b:b1,back:b9,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000004c69632050726f20436f6e00,Nintendo Switch Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000007e0500000620000001800000,Nintendo Switch Left Joy-Con,a:b16,b:b15,back:b4,leftshoulder:b6,leftstick:b12,leftx:a1,lefty:a0~,rightshoulder:b8,start:b9,x:b14,y:b17,platform:Linux,
+030000007e0500000920000000026803,Nintendo Switch Pro Controller,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Linux,
+030000007e0500000920000011810000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000007e0500000920000001800000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500000720000001800000,Nintendo Switch Right Joy-Con,a:b1,b:b2,back:b9,leftshoulder:b4,leftstick:b10,leftx:a1~,lefty:a0,rightshoulder:b6,start:b8,x:b0,y:b3,platform:Linux,
+05000000010000000100000003000000,Nintendo Wii Remote,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000007e0500003003000001000000,Nintendo Wii U Pro Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+030000000d0500000308000010010000,Nostromo n45 Dual Analog,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b12,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b2,y:b3,platform:Linux,
+030000007e0500001920000011810000,NSO N64 Controller,+rightx:b10,+righty:b8,-rightx:b9,-righty:b7,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b3,lefttrigger:b2,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b4,righttrigger:b5,start:b6,platform:Linux,
+050000007e0500001920000001000000,NSO N64 Controller,+rightx:b8,+righty:b7,-rightx:b3,-righty:b2,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,righttrigger:b10,start:b9,platform:Linux,
+050000007e0500001920000001800000,NSO N64 Controller,+rightx:b10,+righty:b8,-rightx:b9,-righty:b7,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b3,lefttrigger:b2,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b4,righttrigger:b5,start:b6,platform:Linux,
+030000007e0500001720000011810000,NSO SNES Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
+050000007e0500001720000001000000,NSO SNES Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b8,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500001720000001800000,NSO SNES Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
 03000000550900001072000011010000,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 03000000550900001472000011010000,NVIDIA Controller v01.04,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
 05000000550900001472000001000000,NVIDIA Controller v01.04,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
+030000004b120000014d000000010000,NYKO Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
 03000000451300000830000010010000,NYKO CORE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-030000005e0400000202000000010000,Old Xbox pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
-05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Linux,
-05000000362800000100000003010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Linux,
-03000000ff1100003133000010010000,PC Game Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+19000000010000000100000001010000,ODROID Go 2,a:b1,b:b0,dpdown:b7,dpleft:b8,dpright:b9,dpup:b6,guide:b10,leftshoulder:b4,leftstick:b12,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b13,righttrigger:b14,start:b15,x:b2,y:b3,platform:Linux,
+19000000010000000200000011000000,ODROID Go 2,a:b1,b:b0,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b12,leftshoulder:b4,leftstick:b14,lefttrigger:b13,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b15,righttrigger:b16,start:b17,x:b2,y:b3,platform:Linux,
+05000000362800000100000002010000,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Linux,
+05000000362800000100000003010000,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Linux,
+05000000362800000100000004010000,OUYA Controller,a:b0,b:b3,back:b14,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b13,rightx:a3,righty:a4,start:b16,x:b1,y:b2,platform:Linux,
+03000000830500005020000010010000,Padix Rockfire PlayStation Bridge,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b2,y:b3,platform:Linux,
+03000000ff1100003133000010010000,PC Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000006f0e0000b802000001010000,PDP Afterglow Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000b802000013020000,PDP Afterglow Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e00006401000001010000,PDP Battlefield One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000d702000006640000,PDP Black Camo Wired Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b13,dpup:b14,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00003101000000010000,PDP EA Sports Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00008501000011010000,PDP Fightpad Pro Gamecube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000006f0e0000c802000012010000,PDP Kingdom Hearts Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00002801000011010000,PDP PS3 Rock Candy Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00000901000011010000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00002f01000011010000,PDP Wired PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000ad1b000004f9000000010000,PDP Xbox 360 Versus Fighting,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000a802000023020000,PDP Xbox One Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000006f0e0000a702000023020000,PDP Xbox One Raven Black,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000d802000006640000,PDP Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000ef02000007640000,PDP Xbox Series Kinetic Wired Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000666600006706000000010000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Linux,
+030000004c050000da0c000011010000,PlayStation Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000d9040000160f000000010000,PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000004c0500003713000011010000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
 03000000c62400000053000000010000,PowerA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c62400003a54000001010000,PowerA 1428124-01,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d620000011a7000011010000,PowerA Core Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000dd62000015a7000011010000,PowerA Fusion Nintendo Switch Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d620000012a7000011010000,PowerA Fusion Nintendo Switch Fight Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d62000000140000001010000,PowerA Fusion Pro 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000dd62000016a7000000000000,PowerA Fusion Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000c62400001a53000000010000,PowerA Mini Pro Ex,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d620000013a7000011010000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000d62000006dca000011010000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d620000014a7000011010000,PowerA Spectra Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000c62400001a58000001010000,PowerA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d62000000220000001010000,PowerA Xbox One Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Linux,
+03000000d62000000228000001010000,PowerA Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c62400001a54000001010000,PowerA Xbox One Mini Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d62000000240000001010000,PowerA Xbox One Spectra Infinity,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d62000000f20000001010000,PowerA Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d62000000b20000001010000,PowerA Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d040000d2ca000011010000,Precision Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000250900000017000010010000,PS/SS/N64 Adapter,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b5,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2~,righty:a3,start:b8,platform:Linux,
 03000000ff1100004133000010010000,PS2 Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
 03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000004c0500006802000010010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
 030000004c0500006802000010810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
 030000004c0500006802000011810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+030000005f1400003102000010010000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 030000006f0e00001402000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000008f0e00000300000010010000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+050000004c0500006802000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
 050000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:a12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:a13,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
-050000004c0500006802000000800000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c0500006802000000800000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 050000004c0500006802000000810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 05000000504c415953544154494f4e00,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
 060000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
-030000004c050000a00b000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000a00b000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000004c050000a00b000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
-030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000004c050000c405000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
-030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-030000004c050000cc09000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000004c050000cc09000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000004c050000cc09000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
-050000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000c01100000140000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+050000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 050000004c050000c405000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
-050000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+050000004c050000c405000001800000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 050000004c050000cc09000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
 050000004c050000cc09000001800000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
-03000000300f00001211000011010000,QanBa Arcade JoyStick,a:b2,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b5,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b6,start:b9,x:b1,y:b3,platform:Linux,
-030000009b2800000300000001010000,raphnet.net 4nes4snes v1.5,a:b0,b:b4,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Linux,
+0300004b4c0500005f0e000011010000,PS5 Access Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000004c050000e60c000011010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000004c050000e60c000011810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+030000004c050000f20d000011010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+050000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+050000004c050000e60c000000810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000300f00001211000011010000,Qanba Arcade Joystick,a:b2,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b5,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b6,start:b9,x:b1,y:b3,platform:Linux,
+03000000222c00000225000011010000,Qanba Dragon Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000025000011010000,Qanba Dragon Arcade Joystick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000222c00001220000011010000,Qanba Drone 2 Arcade Joystick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00001020000011010000,Qanba Drone 2 Arcade Joystick (PS5),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000020000011010000,Qanba Drone Arcade PS4 Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,righttrigger:a4,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000300f00001210000010010000,Qanba Joystick Plus,a:b0,b:b1,back:b8,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b6,start:b9,x:b2,y:b3,platform:Linux,
+03000000222c00000223000011010000,Qanba Obsidian Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000023000011010000,Qanba Obsidian Arcade Joystick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000009b2800000300000001010000,Raphnet 4nes4snes,a:b0,b:b4,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Linux,
+030000009b2800004200000001010000,Raphnet Dual NES Adapter,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Linux,
+0300132d9b2800006500000000000000,Raphnet GameCube Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
+0300132d9b2800006500000001010000,Raphnet GameCube Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
+030000009b2800003200000001010000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
+030000009b2800006000000001010000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
+030000009b2800008000000020020000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Linux,
+03000000f8270000bf0b000011010000,Razer Kishi,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 030000008916000001fd000024010000,Razer Onza Classic Edition,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000008916000000fd000024010000,Razer Onza Tournament Edition,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000321500000204000011010000,Razer Panthera (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-03000000321500000104000011010000,Razer Panthera (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-03000000321500000010000011010000,Razer RAIJU,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000204000011010000,Razer Panthera PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000104000011010000,Razer Panthera PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000321500000810000011010000,Razer Panthera PS4 Evo Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000321500000010000011010000,Razer Raiju,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000507000000010000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000321500000a10000001000000,Razer Raiju Tournament Edition,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000011000011010000,Razer Raion PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 030000008916000000fe000024010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c6240000045d000024010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c6240000045d000025010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000321500000009000011010000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 0300000032150000030a000001010000,Razer Wildcat,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000790000001100000010010000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000321500000b10000011010000,Razer Wolverine PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000790000001100000010010000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Linux,
+0300000003040000c197000011010000,Retrode Adapter,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Linux,
+190000004b4800000111000000010000,RetroGame Joypad,a:b1,b:b0,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+0300000081170000990a000001010000,Retronic Adapter,a:b0,leftx:a0,lefty:a1,platform:Linux,
 0300000000f000000300000000010000,RetroPad,a:b1,b:b5,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Linux,
+00000000526574726f53746f6e653200,RetroStone 2 Controller,a:b1,b:b0,back:b10,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,righttrigger:b9,start:b11,x:b4,y:b3,platform:Linux,
+03000000341200000400000000010000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Linux,
 030000006b140000010d000011010000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000006b140000130d000011010000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 030000006f0e00001f01000000010000,Rock Candy,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00008701000011010000,Rock Candy Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006f0e00001e01000011010000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000c6240000fefa000000010000,Rock Candy Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e00004601000001010000,Rock Candy Xbox One Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000a306000023f6000011010000,Saitek Cyborg V.1 Game Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
-03000000a30600000cff000010010000,Saitek P2500 Force Rumble Pad,a:b2,b:b3,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,x:b0,y:b1,platform:Linux,
-03000000a30600000c04000011010000,Saitek P2900 Wireless Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b12,x:b0,y:b3,platform:Linux,
+03000000a306000023f6000011010000,Saitek Cyborg V1 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000a30600001005000000010000,Saitek P150,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b2,righttrigger:b5,x:b3,y:b4,platform:Linux,
+03000000a30600000701000000010000,Saitek P220,a:b2,b:b3,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,x:b0,y:b1,platform:Linux,
+03000000a30600000cff000010010000,Saitek P2500 Force Rumble,a:b2,b:b3,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b0,y:b1,platform:Linux,
+03000000a30600000c04000011010000,Saitek P2900,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b12,x:b0,y:b3,platform:Linux,
+03000000a306000018f5000010010000,Saitek P3200 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000300f00001201000010010000,Saitek P380,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
 03000000a30600000901000000010000,Saitek P880,a:b2,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,x:b0,y:b1,platform:Linux,
-03000000a30600000b04000000010000,Saitek P990 Dual Analog Pad,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b8,x:b0,y:b3,platform:Linux,
-03000000a306000018f5000010010000,Saitek PLC Saitek P3200 Rumble Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
-03000000c01600008704000011010000,Serial/Keyboard/Mouse/Joystick,a:b12,b:b10,back:b4,dpdown:b2,dpleft:b3,dpright:b1,dpup:b0,leftshoulder:b9,leftstick:b14,lefttrigger:b6,leftx:a1,lefty:a0,rightshoulder:b8,rightstick:b15,righttrigger:b7,rightx:a2,righty:a3,start:b5,x:b13,y:b11,platform:Linux,
-03000000f025000021c1000010010000,ShanWan Gioteck PS3 Wired Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
-03000000632500007505000010010000,SHANWAN PS3/PC Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
-03000000bc2000000055000010010000,ShanWan PS3/PC Wired GamePad,a:b0,b:b1,x:b3,y:b4,back:b10,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Linux,
-03000000632500002305000010010000,ShanWan USB Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
-03000000341a00000908000010010000,SL-6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-03000000250900000500000000010000,Sony PS2 pad with SmartJoy adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
-030000005e0400008e02000073050000,Speedlink TORID Wireless Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000020200000,SpeedLink XEOX Pro Analog Gamepad pad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000de2800000112000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
-03000000de2800000211000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
-03000000de2800004211000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000a30600000b04000000010000,Saitek P990 Dual Analog,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b8,x:b0,y:b3,platform:Linux,
+03000000a306000020f6000011010000,Saitek PS2700 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+05000000e804000000a000001b010000,Samsung EIGP20,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000d81d00000e00000010010000,Savior,a:b0,b:b1,back:b8,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,start:b9,x:b4,y:b5,platform:Linux,
+03000000952e00004b43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000952e00004d43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000952e00004e43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000a30c00002500000011010000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Linux,
+03000000790000001100000011010000,Sega Saturn,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Linux,
+03000000790000002201000011010000,Sega Saturn,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
+03000000b40400000a01000000010000,Sega Saturn,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Linux,
+030000001f08000001e4000010010000,SFC Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000632500002305000010010000,ShanWan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000632500002605000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000632500007505000010010000,Shanwan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000bc2000000055000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000f025000021c1000010010000,Shanwan Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000341a00000908000010010000,SL6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000004b2900000430000011000000,Snakebyte Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000004c050000cc09000001000000,Sony DualShock 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000ff000000cb01000010010000,Sony PlayStation Portable,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
+03000000250900000500000000010000,Sony PS2 pad with SmartJoy Adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
+030000005e0400008e02000073050000,Speedlink Torid,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000020200000,SpeedLink Xeox Pro Analog,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d11800000094000011010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000d11800000094000000010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000112000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000112000011010000,Steam Controller,a:b2,b:b3,back:b10,dpdown:+a5,dpleft:-a4,dpright:+a4,dpup:-a5,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,paddle1:b15,paddle2:b16,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a3,start:b11,x:b4,y:b5,platform:Linux,
+03000000de2800000211000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000211000011010000,Steam Controller,a:b2,b:b3,back:b10,dpdown:b18,dpleft:b19,dpright:b20,dpup:b17,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b16,paddle2:b15,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b5,platform:Linux,
+03000000de2800004211000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800004211000011010000,Steam Controller,a:b2,b:b3,back:b10,dpdown:b18,dpleft:b19,dpright:b20,dpup:b17,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,paddle1:b16,paddle2:b15,rightshoulder:b7,righttrigger:a6,rightx:a2,righty:a3,start:b11,x:b4,y:b5,platform:Linux,
 03000000de280000fc11000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-05000000de2800000212000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
-05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
-05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000de2800000212000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000512000010010000,Steam Deck,a:b3,b:b4,back:b11,dpdown:b17,dpleft:b18,dpright:b19,dpup:b16,guide:b13,leftshoulder:b7,leftstick:b14,lefttrigger:a9,leftx:a0,lefty:a1,rightshoulder:b8,rightstick:b15,righttrigger:a8,rightx:a2,righty:a3,start:b12,x:b5,y:b6,platform:Linux,
+03000000de2800000512000011010000,Steam Deck,a:b3,b:b4,back:b11,dpdown:b17,dpleft:b18,dpright:b19,dpup:b16,guide:b13,leftshoulder:b7,leftstick:b14,lefttrigger:a9,leftx:a0,lefty:a1,misc1:b2,paddle1:b21,paddle2:b20,paddle3:b23,paddle4:b22,rightshoulder:b8,rightstick:b15,righttrigger:a8,rightx:a2,righty:a3,start:b12,x:b5,y:b6,platform:Linux,
 03000000de280000ff11000001000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000ad1b000038f0000090040000,Street Fighter IV FightStick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000004e696d6275732b0000000000,SteelSeries Nimbus Plus,a:b0,b:b1,back:b10,guide:b11,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,platform:Linux,
+03000000381000003014000075010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000381000003114000075010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+0500000011010000311400001b010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b32,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000110100001914000009010000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000ad1b000038f0000090040000,Street Fighter IV Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000003b07000004a1000000010000,Suncom SFX Plus,a:b0,b:b2,back:b7,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b9,righttrigger:b5,start:b8,x:b1,y:b3,platform:Linux,
 03000000666600000488000000010000,Super Joy Box 5 Pro,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
-0300000000f00000f100000000010000,Super RetroPort,a:b1,b:b5,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Linux,
-030000004f04000020b3000010010000,Thrustmaster 2 in 1 DT,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+0300000000f00000f100000000010000,Super RetroPort,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Linux,
+030000008f0e00000d31000010010000,SZMY Power 3 Turbo,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000457500000401000011010000,SZMY Power DS4 Wired Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000457500002211000010010000,SZMY Power Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000008f0e00001431000010010000,SZMY Power PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000e40a00000307000011010000,Taito Egret II Mini Control Panel,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Linux,
+03000000e40a00000207000011010000,Taito Egret II Mini Controller,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Linux,
+03000000ba2200000701000001010000,Technology Innovation PS2 Adapter,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b2,platform:Linux,
+03000000790000001c18000011010000,TGZ Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000591c00002400000010010000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
+03000000591c00002600000010010000,THEGamepad,a:b2,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Linux,
+030000004f04000015b3000001010000,Thrustmaster Dual Analog 3.2,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
 030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
-030000004f04000023b3000000010000,Thrustmaster Dual Trigger 3-in-1,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004f04000020b3000010010000,Thrustmaster Dual Trigger,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+030000004f04000023b3000000010000,Thrustmaster Dual Trigger PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004f0400000ed0000011010000,Thrustmaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000b50700000399000000010000,Thrustmaster Firestorm Digital 2,a:b2,b:b4,back:b11,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b8,rightstick:b0,righttrigger:b9,start:b1,x:b3,y:b5,platform:Linux,
+030000004f04000003b3000010010000,Thrustmaster Firestorm Dual Analog 2,a:b0,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b9,rightx:a2,righty:a3,x:b1,y:b3,platform:Linux,
 030000004f04000000b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Linux,
-030000004f04000026b3000002040000,Thrustmaster Gamepad GP XID,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000c6240000025b000002020000,Thrustmaster GPX Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000004f04000008d0000000010000,Thrustmaster Run N Drive Wireless,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
-030000004f04000009d0000000010000,Thrustmaster Run N Drive Wireless PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000004f04000012b3000010010000,Thrustmaster vibrating gamepad,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
-03000000bd12000015d0000010010000,Tomee SNES USB Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Linux,
-03000000d814000007cd000011010000,Toodles 2008 Chimp PC/PS3,a:b0,b:b1,back:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
-03000000100800000100000010010000,Twin USB PS2 Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000004f04000004b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+030000004f04000026b3000002040000,Thrustmaster GP XID,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c6240000025b000002020000,Thrustmaster GPX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000004f04000008d0000000010000,Thrustmaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004f04000009d0000000010000,Thrustmaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000004f04000007d0000000010000,Thrustmaster T Mini,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000004f04000012b3000010010000,Thrustmaster Vibrating Gamepad,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+03000000571d00002000000010010000,Tomee SNES Adapter,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
+03000000bd12000015d0000010010000,Tomee SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000d814000007cd000011010000,Toodles 2008 Chimp PC PS3,a:b0,b:b1,back:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
+030000005e0400008e02000070050000,Torid,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c01100000591000011010000,Torid,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000680a00000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+03000000780300000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+03000000e00d00000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+03000000f00600000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+030000005f140000c501000010010000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+06000000f51000000870000003010000,Turtle Beach Recon,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000100800000100000010010000,Twin PS2 Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+03000000151900005678000010010000,Uniplay U6,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000100800000300000010010000,USB Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
 03000000790000000600000007010000,USB gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Linux,
-03000000790000001100000000010000,USB Gamepad1,a:b2,b:b1,back:b8,dpdown:a0,dpleft:a1,dpright:a2,dpup:a4,start:b9,platform:Linux,
-05000000ac0500003232000001000000,VR-BOX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000010010000,X360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000014010000,X360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400001907000000010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400009102000007010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000a102000000010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000a102000007010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-0000000058626f782033363020576900,Xbox 360 Wireless Controller,a:b0,b:b1,back:b14,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,guide:b7,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Linux,
-030000005e040000a102000014010000,Xbox 360 Wireless Receiver (XBOX),a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-0000000058626f782047616d65706100,Xbox Gamepad (userspace driver),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
-030000005e040000ea02000001030000,Xbox One Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-050000005e040000e002000003090000,Xbox One Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-050000005e040000fd02000003090000,Xbox One Wireless Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-03000000450c00002043000010010000,XEOX Gamepad SL-6556-BK,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-05000000172700004431000029010000,XiaoMi Game Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Linux,
-03000000c0160000e105000001010000,Xin-Mo Xin-Mo Dual Arcade,a:b4,b:b3,back:b6,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b9,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b1,y:b0,platform:Linux,
+03000000790000001100000000010000,USB Gamepad,a:b2,b:b1,back:b8,dpdown:a0,dpleft:a1,dpright:a2,dpup:a4,start:b9,platform:Linux,
+030000006f0e00000302000011010000,Victrix Pro Fightstick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000006f0e00000702000011010000,Victrix Pro Fightstick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+05000000ac0500003232000001000000,VR Box Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+05000000434f4d4d414e440000000000,VX Gaming Command Series,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+0000000058626f782033363020576900,Xbox 360 Controller,a:b0,b:b1,back:b14,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,guide:b7,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Linux,
+030000005e0400001907000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000010010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000014010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400009102000007010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000007010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000030060000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00001503000000020000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000000010000,Xbox 360 EasySMX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000014010000,Xbox 360 Receiver,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400000202000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+030000006f0e00001304000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000ffff0000ffff000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+0000000058626f782047616d65706100,Xbox Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400000a0b000005040000,Xbox One Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+030000005e040000d102000002010000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000ea02000001030000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000e002000003090000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000fd02000003090000,Xbox One Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000fd02000030110000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000e302000002090000,Xbox One Elite,a:b0,b:b1,back:b136,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000220b000013050000,Xbox One Elite 2 Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000050b000002090000,Xbox One Elite Series 2,a:b0,b:b1,back:b136,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000005e040000ea02000011050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000ea0200000b050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000ea0200000d050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000001050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000005050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000007050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000009050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b00000d050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b00000f050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000015050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000130b000005050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000001050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000005050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000007050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000009050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000011050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000013050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000015050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+060000005e040000120b000007050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b00000b050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b00000f050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000011050000,Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000014050000,Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000130b000017050000,Xbox Series X Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+060000005e040000120b00000d050000,Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000200b000013050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000200b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000220b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000450c00002043000010010000,XEOX SL6556 BK,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+05000000172700004431000029010000,XiaoMi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Linux,
+03000000c0160000e105000001010000,XinMo Dual Arcade,a:b4,b:b3,back:b6,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b9,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b1,y:b0,platform:Linux,
+030000005e0400008e02000020010000,XInput Adapter,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000120c0000100e000011010000,ZEROPLUS P4 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000100e000011010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000101e000011010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 
 # Android
+38653964633230666463343334313533,8BitDo Adapter,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+36666264316630653965636634386234,8BitDo Adapter 2,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f20417263616465205374,8BitDo Arcade Stick,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b5,leftshoulder:b9,lefttrigger:a4,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61393962646434393836356631636132,8BitDo Arcade Stick,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+64323139346131306233636562663738,8BitDo Arcade Stick,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+64643565386136613265663236636564,8BitDo Arcade Stick,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+33313433353539306634656436353432,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f20446f67626f6e65204d,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
+34343439373236623466343934376233,8BitDo FC30 Pro,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b28,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b29,righttrigger:b7,start:b5,x:b30,y:b2,platform:Android,
+38426974446f204e4743204d6f646b69,8BitDo GameCube,a:b0,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b18,paddle2:b17,rightshoulder:b15,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b1,y:b3,platform:Android,
+38426974446f2038426974446f204c69,8BitDo Lite,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+30643332373663313263316637356631,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f204c6974652032000000,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+62656331626461363634633735353032,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38393936616436383062666232653338,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f204c6974652053450000,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+39356430616562366466646636643435,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000006500000ffff3f00,8BitDo M30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b17,leftshoulder:b9,lefttrigger:a5,rightshoulder:b10,righttrigger:a4,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000051060000ffff3f00,8BitDo M30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b17,leftshoulder:b9,lefttrigger:a4,rightshoulder:b10,righttrigger:a5,start:b6,x:b3,y:b2,platform:Android,
+32323161363037623637326438643634,8BitDo M30,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+33656266353630643966653238646264,8BitDo M30,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,start:b10,x:b19,y:b2,platform:Android,
+38426974446f204d3330204d6f646b69,8BitDo M30,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39366630663062373237616566353437,8BitDo M30,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,start:b6,x:b2,y:b3,platform:Android,
+64653533313537373934323436343563,8BitDo M30,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,start:b6,x:b2,y:b3,platform:Android,
+66356438346136366337386437653934,8BitDo M30,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,start:b18,x:b19,y:b2,platform:Android,
+66393064393162303732356665666366,8BitDo M30,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,start:b6,x:b2,y:b3,platform:Android,
+38426974446f204d6963726f2067616d,8BitDo Micro,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,lefttrigger:a4,leftx:b0,lefty:b1,rightshoulder:b10,righttrigger:a5,rightx:b2,righty:b3,start:b6,x:b3,y:b2,platform:Android,
+61653365323561356263373333643266,8BitDo Micro,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,lefttrigger:a4,leftx:b0,lefty:b1,rightshoulder:b10,righttrigger:a5,rightx:b2,righty:b3,start:b6,x:b3,y:b2,platform:Android,
+62613137616239666338343866326336,8BitDo Micro,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,lefttrigger:a4,leftx:b0,lefty:b1,rightshoulder:b10,righttrigger:a5,rightx:b2,righty:b3,start:b6,x:b3,y:b2,platform:Android,
+33663431326134333366393233616633,8BitDo N30,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
+38426974446f204e3330204d6f646b69,8BitDo N30,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
+05000000c82d000015900000ffff3f00,8BitDo N30 Pro 2,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000065280000ffff3f00,8BitDo N30 Pro 2,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b17,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38323035343766666239373834336637,8BitDo N64,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,platform:Android,
+38426974446f204e3634204d6f646b69,8BitDo N64,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,platform:Android,
+32363135613966656338666638666237,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35363534633333373639386466346631,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f204e454f47454f204750,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39383963623932353561633733306334,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000000220000000900000ffff3f00,8BitDo NES30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+050000002038000009000000ffff3f00,8BitDo NES30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38313433643131656262306631373166,8BitDo P30,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38326536643339353865323063616339,8BitDo P30,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f2050333020636c617373,8BitDo P30,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35376664343164386333616535333434,8BitDo Pro 2,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,start:b10,x:b19,y:b2,platform:Android,
+38426974446f2038426974446f205072,8BitDo Pro 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f2050726f203200000000,8BitDo Pro 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+61333362366131643730353063616330,8BitDo Pro 2,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+62373739366537363166326238653463,8BitDo Pro 2,a:b1,b:b0,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b3,y:b2,platform:Android,
+38386464613034326435626130396565,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f2038426974446f205265,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+66303230343038613365623964393766,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20533330204d6f646b69,8BitDo S30,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66316462353561376330346462316137,8BitDo S30,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000c82d000000600000ffff3f00,8BitDo SF30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b15,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b16,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000000610000ffff3f00,8BitDo SF30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974646f20534633302050726f00,8BitDo SF30 Pro,a:b1,b:b0,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b17,platform:Android,
+61623334636338643233383735326439,8BitDo SFC30,a:b0,b:b1,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b31,start:b5,x:b30,y:b2,platform:Android,
+05000000c82d000012900000ffff3f00,8BitDo SN30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000062280000ffff3f00,8BitDo SN30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+38316230613931613964356666353839,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20534e3330204d6f646b,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+65323563303231646531383162646335,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+35383531346263653330306238353131,8BitDo SN30 PP,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000c82d000001600000ffff3f00,8BitDo SN30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000002600000ffff0f00,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b17,leftshoulder:b9,leftstick:b7,lefttrigger:b15,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b16,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+36653638656632326235346264663661,8BitDo SN30 Pro Plus,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+38303232393133383836366330346462,8BitDo SN30 Pro Plus,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+38346630346135363335366265656666,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20534e33302050726f2b,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+536f6e7920436f6d707574657220456e,8BitDo SN30 Pro Plus,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66306331643531333230306437353936,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+050000002028000009000000ffff3f00,8BitDo SNES30,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+050000003512000020ab000000780f00,8BitDo SNES30,a:b21,b:b20,back:b30,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b26,rightshoulder:b27,start:b31,x:b24,y:b23,platform:Android,
+33666663316164653937326237613331,8BitDo Zero,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+38426974646f205a65726f2047616d65,8BitDo Zero,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+05000000c82d000018900000ffff0f00,8BitDo Zero 2,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000030320000ffff0f00,8BitDo Zero 2,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+33663434393362303033616630346337,8BitDo Zero 2,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftx:a0,lefty:a1,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+34656330626361666438323266633963,8BitDo Zero 2,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
+63396666386564393334393236386630,8BitDo Zero 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+63633435623263373466343461646430,8BitDo Zero 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+32333634613735616163326165323731,Amazon Luna Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
+4c696e757820342e31392e3137322077,Anbernic Gamepad,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+417374726f2063697479206d696e6920,Astro City Mini,a:b23,b:b22,back:b29,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
+35643263313264386134376362363435,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,start:b6,platform:Android,
+32353831643566306563643065356239,Atari VCS Modern Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4f64696e20436f6e74726f6c6c657200,AYN Odin,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b14,dpright:b13,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:+a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+32303165626138343962363666346165,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+38383337343564366131323064613561,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+34313430343161653665353737323365,Elecom JC-W01U,a:b23,b:b24,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+4875694a6961204a432d573031550000,Elecom JC-W01U,a:b23,b:b24,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+30363230653635633863366338623265,Evo VR,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,x:b2,y:b3,platform:Android,
+05000000b404000011240000dfff3f00,Flydigi Vader 2,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000bc20000000550000ffff3f00,GameSir G3w,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+34323662653333636330306631326233,Google Nexus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35383633353935396534393230616564,Google Stadia Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000d6020000e5890000dfff3f00,GPD XD Plus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Android,
-64633436313965656664373634323364,Microsoft X-Box 360 pad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
+05000000d6020000e5890000dfff3f80,GPD XD Plus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a3,rightx:a4,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+66633030656131663837396562323935,Hori Battle,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+35623466343433653739346434636330,Hori Fighting Commander 3 Pro,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+484f524920434f2e2c4c54442e203130,Hori Fighting Commander 3 Pro,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b20,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b9,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+484f524920434f2e2c4c544420205041,Hori Gem Pad 3,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b0,y:b2,platform:Android,
+65656436646661313232656661616130,Hori PC Engine Mini Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,start:b18,platform:Android,
+31303433326562636431653534636633,Hori Real Arcade Pro 3,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+32656664353964393561366362333636,Hori Switch Split Pad Pro,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+30306539356238653637313730656134,HORIPAD Switch Pro Controller,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+48797065726b696e2050616400000000,Hyperkin Admiral N64 Controller,+rightx:b6,+righty:b7,-rightx:b17,-righty:b5,a:b1,b:b0,leftshoulder:b3,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b20,start:b18,platform:Android,
+62333331353131353034386136626636,Hyperkin Admiral N64 Controller,+rightx:b6,+righty:b7,-rightx:b17,-righty:b5,a:b1,b:b0,leftshoulder:b3,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b20,start:b18,platform:Android,
+31306635363562663834633739396333,Hyperkin N64 Adapter,a:b1,b:b19,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+5368616e57616e202020202048797065,Hyperkin N64 Adapter,a:b1,b:b19,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+0500000083050000602000000ffe0000,iBuffalo SNES Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b15,rightshoulder:b16,start:b10,x:b2,y:b3,platform:Android,
+5553422c322d6178697320382d627574,iBuffalo Super Famicom Controller,a:b1,b:b0,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b17,rightshoulder:b18,start:b10,x:b3,y:b2,platform:Android,
+64306137363261396266353433303531,InterAct GoPad,a:b24,b:b25,leftshoulder:b23,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,x:b21,y:b22,platform:Android,
+532e542e442e20496e74657261637420,InterAct HammerHead FX,a:b23,b:b24,back:b30,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b26,leftstick:b22,lefttrigger:b28,leftx:a0,lefty:a1,rightshoulder:b27,rightstick:b25,righttrigger:b29,rightx:a2,righty:a3,start:b31,x:b20,y:b21,platform:Android,
+65346535636333663931613264643164,Joy-Con,a:b21,b:b22,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b23,y:b24,platform:Android,
+33346566643039343630376565326335,Joy-Con (L),a:b0,b:b1,back:b7,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b17,x:b19,y:b2,platform:Android,
+35313531613435623366313835326238,Joy-Con (L),a:b0,b:b1,back:b7,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b17,x:b19,y:b2,platform:Android,
+4a6f792d436f6e20284c290000000000,Joy-Con (L),a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,rightshoulder:b20,start:b17,x:b19,y:b2,platform:Android,
+38383665633039363066383334653465,Joy-Con (R),a:b0,b:b1,back:b5,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+39363561613936303237333537383931,Joy-Con (R),a:b0,b:b1,back:b5,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+4a6f792d436f6e202852290000000000,Joy-Con (R),a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+39656136363638323036303865326464,JYS Aapter,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+63316564383539663166353034616434,JYS Adapter,a:b1,b:b3,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b0,y:b2,platform:Android,
+64623163333561643339623235373232,Logitech F310,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35623364393661626231343866613337,Logitech F710,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4c6f6769746563682047616d65706164,Logitech F710,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+64396331333230326333313330336533,Logitech F710,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39653365373864633935383236363438,Logitech G Cloud,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+416d617a6f6e2047616d6520436f6e74,Luna Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+4c756e612047616d6570616400000000,Luna Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30363066623539323534363639323363,Magic NS,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+31353762393935386662336365626334,Magic NS,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+39623565346366623931666633323530,Magic NS,a:b1,b:b3,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b0,y:b2,platform:Android,
+6d6179666c617368206c696d69746564,Mayflash GameCube Adapter,a:b22,b:b21,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a5,righty:a2,start:b30,x:b23,y:b24,platform:Android,
+436f6e74726f6c6c6572000000000000,Mayflash N64 Adapter,a:b1,b:b19,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+65666330633838383061313633326461,Mayflash N64 Adapter,a:b1,b:b19,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+37316565396364386635383230353365,Mayflash Saturn Adapter,a:b21,b:b22,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b26,lefttrigger:b28,rightshoulder:b27,righttrigger:b23,start:b30,x:b24,y:b25,platform:Android,
+4875694a696120205553422047616d65,Mayflash Saturn Adapter,a:b21,b:b22,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b26,lefttrigger:b28,rightshoulder:b27,righttrigger:b23,start:b30,x:b24,y:b25,platform:Android,
+535a4d792d706f776572204c54442043,Mayflash Wii Classic Adapter,a:b23,b:b22,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b31,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a2,righty:a3,start:b30,x:b24,y:b21,platform:Android,
+30653962643666303631376438373532,Mayflash Wii DolphinBar,a:b23,b:b24,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b0,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+39346131396233376535393665363161,Mayflash Wii U Pro Adapter,a:b22,b:b23,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,leftstick:b31,lefttrigger:b27,rightshoulder:b26,rightstick:b0,righttrigger:b28,rightx:a0,righty:a1,start:b30,x:b21,y:b24,platform:Android,
+31323564663862633234646330373138,Mega Drive,a:b23,b:b22,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
+37333564393261653735306132613061,Mega Drive,a:b21,b:b22,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b26,lefttrigger:b28,rightshoulder:b27,righttrigger:b23,start:b30,x:b24,y:b25,platform:Android,
+64363363336633363736393038313464,Mega Drive,a:b1,b:b0,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,start:b9,x:b2,y:b3,platform:Android,
+33323763323132376537376266393366,Microsoft Dual Strike,a:b24,b:b23,back:b25,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b27,lefttrigger:b29,rightshoulder:b78,rightx:a0,righty:a1~,start:b26,x:b22,y:b21,platform:Android,
+30306461613834333439303734316539,Microsoft SideWinder Pro,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b20,lefttrigger:b9,rightshoulder:b19,righttrigger:b10,start:b17,x:b2,y:b3,platform:Android,
+32386235353630393033393135613831,Microsoft Xbox Series Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4d4f42415041442050726f2d48440000,Mobapad Chitu HD,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4d4f435554452d303533582d4d35312d,Mocute 053X,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+33343361376163623438613466616531,Mocute M053,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39306635663061636563316166303966,Mocute M053,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+7573622067616d657061642020202020,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Android,
 050000007e05000009200000ffff0f00,Nintendo Switch Pro Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b17,y:b2,platform:Android,
-37336435666338653565313731303834,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-4e564944494120436f72706f72617469,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-61363931656135336130663561616264,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-050000005509000003720000cf7f3f00,NVIDIA Controller v01.01,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-050000005509000010720000ffff3f00,NVIDIA Controller v01.03,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+34323437396534643531326161633738,Nintendo Switch Pro Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,misc1:b5,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+50726f20436f6e74726f6c6c65720000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b2,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b10,rightx:a2,righty:a3,start:b18,y:b3,platform:Android,
+36326533353166323965623661303933,NSO N64 Controller,+rightx:b17,+righty:b10,-rightx:b2,-righty:b19,a:b1,b:b0,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b7,rightshoulder:b20,righttrigger:b15,start:b18,platform:Android,
+4e363420436f6e74726f6c6c65720000,NSO N64 Controller,+rightx:b17,+righty:b10,-rightx:b2,-righty:b19,a:b1,b:b0,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b7,rightshoulder:b20,righttrigger:b15,start:b18,platform:Android,
+534e455320436f6e74726f6c6c657200,NSO SNES Controller,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+64623863346133633561626136366634,NSO SNES Controller,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+050000005509000003720000cf7f3f00,NVIDIA Controller,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005509000010720000ffff3f00,NVIDIA Controller,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005509000014720000df7f3f00,NVIDIA Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+050000005509000014720000df7f3f80,NVIDIA Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a3,rightx:a4,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+37336435666338653565313731303834,NVIDIA Controller,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4e564944494120436f72706f72617469,NVIDIA Controller,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61363931656135336130663561616264,NVIDIA Controller,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39383335313438623439373538343266,OUYA Controller,a:b0,b:b2,dpdown:b18,dpleft:b15,dpright:b16,dpup:b17,leftshoulder:b3,leftstick:b9,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,x:b1,y:b19,platform:Android,
+4f5559412047616d6520436f6e74726f,OUYA Controller,a:b0,b:b2,dpdown:b18,dpleft:b15,dpright:b6,dpup:b17,leftshoulder:b3,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b19,platform:Android,
+506572666f726d616e63652044657369,PDP PS3 Rock Candy Controller,a:b1,b:b17,back:h0.2,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b0,y:b2,platform:Android,
+62653335326261303663356263626339,PlayStation Classic Controller,a:b19,b:b1,back:b17,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,lefttrigger:b3,rightshoulder:b10,righttrigger:b20,start:b18,x:b2,y:b0,platform:Android,
+536f6e7920496e746572616374697665,PlayStation Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+576972656c65737320436f6e74726f6c,PlayStation Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61653962353232366130326530363061,Pokken,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,rightshoulder:b20,righttrigger:b10,start:b18,x:b0,y:b2,platform:Android,
+32666633663735353234363064386132,PS2,a:b23,b:b22,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a3,righty:a2,start:b30,x:b24,y:b21,platform:Android,
 050000004c05000068020000dfff3f00,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+536f6e7920504c415953544154494f4e,PS3 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61363034663839376638653463633865,PS3 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66366539656564653432353139356536,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66383132326164626636313737373037,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004c050000c405000000783f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 050000004c050000c4050000fffe3f00,PS4 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:+a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
-050000004c050000cc090000fffe3f00,PS4 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
-35643031303033326130316330353564,PS4 Controller,a:b1,b:b17,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:+a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000c4050000fffe3f80,PS4 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:+a3,rightx:a4,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000c4050000ffff3f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004c050000cc090000fffe3f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004c050000cc090000ffff3f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30303839663330346632363232623138,PS4 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+31326235383662333266633463653332,PS4 Controller,a:b1,b:b16,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b17,x:b0,y:b2,platform:Android,
+31373231336561636235613666323035,PS4 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+31663838336334393132303338353963,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+34613139376634626133336530386430,PS4 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35643031303033326130316330353564,PS4 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:+a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+37626233336235343937333961353732,PS4 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+37626464343430636562316661643863,PS4 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38393161636261653636653532386639,PS4 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+63313733393535663339656564343962,PS4 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+63393662363836383439353064663939,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65366465656364636137653363376531,PS4 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+66613532303965383534396638613230,PS4 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+050000004c050000e60c0000fffe3f00,PS5 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000e60c0000fffe3f80,PS5 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a3,rightx:a4,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000e60c0000ffff3f00,PS5 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+32346465346533616263386539323932,PS5 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+32633532643734376632656664383733,PS5 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+37363764353731323963323639666565,PS5 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+61303162353165316365336436343139,PS5 Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+64336263393933626535303339616332,Qanba 4RAF,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b20,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b9,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+36626666353861663864336130363137,Razer Junglecat,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000f8270000bf0b0000ffff3f00,Razer Kishi,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+62653861643333663663383332396665,Razer Kishi,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000003215000005070000ffff3f00,Razer Raiju Mobile,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000003215000007070000ffff3f00,Razer Raiju Mobile,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 050000003215000000090000bf7f3f00,Razer Serval,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
+5a6869587520526574726f2042697420,Retro Bit Saturn Controller,a:b21,b:b22,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,lefttrigger:b26,rightshoulder:b27,righttrigger:b28,start:b30,x:b23,y:b24,platform:Android,
+32417865732031314b6579732047616d,Retro Bit SNES Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+36313938306539326233393732613361,Retro Bit SNES Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+526574726f466c616720576972656420,Retro Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b17,rightshoulder:b18,start:b10,x:b2,y:b3,platform:Android,
+61343739353764363165343237303336,Retro Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b17,lefttrigger:b18,leftx:a0,lefty:a1,start:b10,x:b2,y:b3,platform:Android,
+526574726f696420506f636b65742043,Retroid Pocket,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+582d426f7820436f6e74726f6c6c6572,Retroid Pocket,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38653130373365613538333235303036,Retroid Pocket 2,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+64363363336633363736393038313463,Retrolink,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,start:b6,platform:Android,
+37393234373533633333323633646531,RetroUSB N64 RetroPort,+rightx:b17,+righty:b15,-rightx:b18,-righty:b6,a:b10,b:b9,dpdown:b19,dpleft:b1,dpright:b0,dpup:b2,leftshoulder:b7,lefttrigger:b20,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Android,
+5365616c6965436f6d707574696e6720,RetroUSB N64 RetroPort,+rightx:b17,+righty:b15,-rightx:b18,-righty:b6,a:b10,b:b9,dpdown:b19,dpleft:b1,dpright:b0,dpup:b2,leftshoulder:b7,lefttrigger:b20,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Android,
+526574726f5553422e636f6d20534e45,RetroUSB SNES RetroPort,a:b1,b:b20,back:b19,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b2,x:b0,y:b3,platform:Android,
+64643037633038386238303966376137,RetroUSB SNES RetroPort,a:b1,b:b20,back:b19,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b2,x:b0,y:b3,platform:Android,
+37656564346533643138636436356230,Rock Candy Switch Controller,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b7,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+33373336396634316434323337666361,RumblePad 2,a:b22,b:b23,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b24,platform:Android,
+36363537303435333566386638366333,Samsung EIGP20,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+53616d73756e672047616d6520506164,Samsung EIGP20,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66386565396238363534313863353065,Sanwa PlayOnline Mobile,a:b21,b:b22,back:b23,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b24,platform:Android,
+32383165316333383766336338373261,Saturn,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:a4,righttrigger:a5,x:b2,y:b3,platform:Android,
+38613865396530353338373763623431,Saturn,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,lefttrigger:b10,rightshoulder:b20,righttrigger:b19,start:b17,x:b2,y:b3,platform:Android,
+61316232336262373631343137633631,Saturn,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:a4,righttrigger:a5,x:b2,y:b3,platform:Android,
+30353835333338613130373363646337,SG H510,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+66386262366536653765333235343634,SG H510,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
+66633132393363353531373465633064,SG H510,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+62653761636366393366613135366338,SN30 PP,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38376662666661636265313264613039,SNES,a:b0,b:b1,back:b9,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
+5346432f555342205061640000000000,SNES Adapter,a:b0,b:b1,back:b9,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
+5553422047616d657061642000000000,SNES Controller,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+63303964303462366136616266653561,Sony PSP,a:b21,b:b22,back:b27,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b28,x:b23,y:b24,platform:Android,
+63376637643462343766333462383235,Sony Vita,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a3,righty:a4,start:b18,x:b0,y:b2,platform:Android,
+476f6f676c65204c4c43205374616469,Stadia Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+5374616469614e3848532d6532633400,Stadia Controller,a:b0,b:b1,back:b15,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Android,
 05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Android,
-5477696e20555342204a6f7973746963,Twin USB Joystick,a:b22,b:b21,back:b28,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b26,leftstick:b30,lefttrigger:b24,leftx:a0,lefty:a1,rightshoulder:b27,rightstick:b31,righttrigger:b25,rightx:a3,righty:a2,start:b29,x:b23,y:b20,platform:Android,
-050000005e040000e00200000ffe3f00,Xbox One Wireless Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b17,y:b2,platform:Android,
-050000005e040000fd020000ffff3f00,Xbox One Wireless Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-050000005e04000091020000ff073f00,Xbox Wireless Controller,a:b0,b:b1,back:b4,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
-34356136633366613530316338376136,Xbox Wireless Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,x:b17,y:b2,platform:Android,
+0500000011010000201400000f7e0f00,SteelSeries Nimbus,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,x:b19,y:b2,platform:Android,
+35306436396437373135383665646464,SteelSeries Nimbus Plus,a:b0,b:b1,leftshoulder:b3,leftstick:b17,lefttrigger:b9,leftx:a0,rightshoulder:b20,rightstick:b18,righttrigger:b10,rightx:a2,x:b19,y:b2,platform:Android,
+33313930373536613937326534303931,Taito Egret II Mini Control Panel,a:b25,b:b23,back:b27,guide:b30,leftx:a0,lefty:a1,rightshoulder:b21,righttrigger:b22,start:b28,x:b29,y:b24,platform:Android,
+54475a20436f6e74726f6c6c65720000,TGZ Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+62363434353532386238336663643836,TGZ Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+37323236633763666465316365313236,THEC64 Joystick,a:b21,b:b22,back:b27,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b27,x:b23,y:b24,platform:Android,
+38346162326232346533316164363336,THEGamepad,a:b23,b:b22,back:b27,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b28,x:b24,y:b21,platform:Android,
+050000004f0400000ed00000fffe3f00,ThrustMaster eSwap Pro Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+5477696e20555342204a6f7973746963,Twin Joystick,a:b22,b:b21,back:b28,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b26,leftstick:b30,lefttrigger:b24,leftx:a0,lefty:a1,rightshoulder:b27,rightstick:b31,righttrigger:b25,rightx:a3,righty:a2,start:b29,x:b23,y:b20,platform:Android,
+30623739343039643830333266346439,Valve Steam Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,paddle1:b24,paddle2:b23,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+31643365666432386133346639383937,Valve Steam Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,paddle1:b24,paddle2:b23,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30386438313564306161393537333663,Wii Classic Adapter,a:b23,b:b22,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a2,righty:a3,start:b30,x:b24,y:b21,platform:Android,
+33333034646336346339646538643633,Wii Classic Adapter,a:b23,b:b22,back:b29,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a2,righty:a3,start:b30,x:b24,y:b21,platform:Android,
+050000005e0400008e02000000783f00,Xbox 360 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30396232393162346330326334636566,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38313038323730383864666463383533,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+58626f782033363020576972656c6573,Xbox 360 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65353331386662343338643939643636,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65613532386633373963616462363038,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+47656e6572696320582d426f78207061,Xbox Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4d6963726f736f667420582d426f7820,Xbox Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+64633436313965656664373634323364,Xbox Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e04000091020000ff073f00,Xbox One Controller,a:b0,b:b1,back:b4,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+050000005e04000091020000ff073f80,Xbox One Controller,a:b0,b:b1,back:b4,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000e00200000ffe3f00,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000e00200000ffe3f80,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a2,righty:a3,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000e0020000ffff3f00,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b4,leftshoulder:b3,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000e0020000ffff3f80,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b4,leftshoulder:b3,leftstick:b8,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b7,righttrigger:a5,rightx:a2,righty:a3,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000fd020000ffff3f00,Xbox One Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+33356661323266333733373865656366,Xbox One Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+34356136633366613530316338376136,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,x:b17,y:b2,platform:Android,
+35623965373264386238353433656138,Xbox One Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+36616131643361333337396261666433,Xbox One Controller,a:b0,b:b1,back:b15,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+58626f7820576972656c65737320436f,Xbox One Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000000b000000783f00,Xbox One Elite 2 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000000b000000783f80,Xbox One Elite 2 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000050b0000ffff3f00,Xbox One Elite 2 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a6,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000e002000000783f00,Xbox One S Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000ea02000000783f00,Xbox One S Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000fd020000ff7f3f00,Xbox One S Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000120b000000783f00,Xbox Series Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000120b000000783f80,Xbox Series Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000130b0000ffff3f00,Xbox Series Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65633038363832353634653836396239,Xbox Series Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000001727000044310000ffff3f00,XiaoMi Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a7,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a6,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Android,
 
 # iOS
 05000000ac0500000100000000006d01,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,x:b2,y:b3,platform:iOS,
+05000000ac050000010000004f066d01,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,x:b2,y:b3,platform:iOS,
+05000000ac05000001000000cf076d01,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b2,y:b3,platform:iOS,
+05000000ac05000001000000df076d01,*,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+05000000ac05000001000000ff076d01,*,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
 05000000ac0500000200000000006d02,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b2,y:b3,platform:iOS,
+05000000ac050000020000004f066d02,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b2,y:b3,platform:iOS,
+050000008a35000003010000ff070000,Backbone One,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000008a35000004010000ff070000,Backbone One,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
 4d466947616d65706164010000000000,MFi Extended Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:iOS,
 4d466947616d65706164020000000000,MFi Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b6,x:b2,y:b3,platform:iOS,
+050000007e050000062000000f060000,Nintendo Switch Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b2,leftshoulder:b4,rightshoulder:b5,x:b1,y:b3,platform:iOS,
+050000007e050000062000004f060000,Nintendo Switch Joy-Con (L),+leftx:h0.1,+lefty:h0.2,-leftx:h0.4,-lefty:h0.8,dpdown:b2,dpleft:b0,dpright:b3,dpup:b1,leftshoulder:b4,misc1:b6,rightshoulder:b5,platform:iOS,
+050000007e05000008200000df070000,Nintendo Switch Joy-Con (L/R),a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000007e0500000e200000df070000,Nintendo Switch Joy-Con (L/R),a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:iOS,
+050000007e050000072000004f060000,Nintendo Switch Joy-Con (R),+rightx:h0.4,+righty:h0.8,-rightx:h0.1,-righty:h0.2,a:b1,b:b0,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b3,y:b2,platform:iOS,
+050000007e05000009200000df870000,Nintendo Switch Pro Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b10,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:iOS,
+050000007e05000009200000ff870000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000df070000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000df870001,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000ff070000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000ff870001,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,touchpad:b11,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000ff876d01,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000004c050000e60c0000df870000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,touchpad:b10,x:b2,y:b3,platform:iOS,
+050000004c050000e60c0000ff870000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,touchpad:b11,x:b2,y:b3,platform:iOS,
 05000000ac0500000300000000006d03,Remote,a:b0,b:b2,leftx:a0,lefty:a1,platform:iOS,
+05000000ac0500000300000043006d03,Remote,a:b0,b:b2,leftx:a0,lefty:a1,platform:iOS,
 05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:iOS,
 05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:iOS,
+050000005e040000050b0000df070001,Xbox Elite Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b10,paddle2:b12,paddle3:b11,paddle4:b13,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000005e040000050b0000ff070001,Xbox Elite Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b13,paddle3:b12,paddle4:b14,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000005e040000e0020000df070000,Xbox One Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000005e040000e0020000ff070000,Xbox One Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000005e040000130b0000df870001,Xbox Series X Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b10,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000005e040000130b0000ff870001,Xbox Series X Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
diff --git a/files/lang/components_de.ts b/files/lang/components_de.ts
new file mode 100644
index 0000000000..f17f27e25a
--- /dev/null
+++ b/files/lang/components_de.ts
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+<context>
+    <name>ContentSelector</name>
+    <message>
+        <source>Select language used by ESM/ESP content files to allow OpenMW to detect their encoding. </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::ContentModel</name>
+    <message>
+        <source>Unable to find dependent file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dependent file needs to be active: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This file needs to load after %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::EsmFile</name>
+    <message>
+        <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Format version:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Modified:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Path:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Description:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Dependencies: &lt;/b&gt;%6&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is part of OpenMW.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is enabled in a config file other than the user one.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;This file is specified in a non-user config file, but does not exist in the VFS.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Diese Datei ist in einer Nicht-Benutzerkonfigurationsdatei angegeben, existiert aber nicht im VFS.&lt;/b&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorView::ContentSelector</name>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;No game file&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Process::ProcessInvoker</name>
+    <message>
+        <source>Error starting executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error running executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Arguments:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not find %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not found.&lt;/p&gt;&lt;p&gt;Please make sure OpenMW is installed correctly and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not executable.&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while starting %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Executable %1 returned an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while running %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/components_en.ts b/files/lang/components_en.ts
new file mode 100644
index 0000000000..1cfd61398b
--- /dev/null
+++ b/files/lang/components_en.ts
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+<context>
+    <name>ContentSelector</name>
+    <message>
+        <source>Select language used by ESM/ESP content files to allow OpenMW to detect their encoding. </source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::ContentModel</name>
+    <message>
+        <source>Unable to find dependent file: %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Dependent file needs to be active: %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>This file needs to load after %1</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::EsmFile</name>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is part of OpenMW.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is enabled in a config file other than the user one.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Format version:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Modified:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Path:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Description:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Dependencies: &lt;/b&gt;%6&lt;br/&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;This file is specified in a non-user config file, but does not exist in the VFS.&lt;/b&gt;</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorView::ContentSelector</name>
+    <message>
+        <source>&lt;No game file&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Process::ProcessInvoker</name>
+    <message>
+        <source>Error starting executable</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not find %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not found.&lt;/p&gt;&lt;p&gt;Please make sure OpenMW is installed correctly and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not executable.&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while starting %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error running executable</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Executable %1 returned an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while running %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>
+Arguments:
+</source>
+        <translation></translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/components_fr.ts b/files/lang/components_fr.ts
new file mode 100644
index 0000000000..9b8f575f8a
--- /dev/null
+++ b/files/lang/components_fr.ts
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
+<context>
+    <name>ContentSelector</name>
+    <message>
+        <source>Select language used by ESM/ESP content files to allow OpenMW to detect their encoding. </source>
+        <translation>Sélectionnez la langue utilisée dans les fichiers ESM/ESP afin qu&apos;OpenMW détecte leur encodage.</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::ContentModel</name>
+    <message>
+        <source>Unable to find dependent file: %1</source>
+        <translation>Impossible de trouver le fichier de dépendance : %1</translation>
+    </message>
+    <message>
+        <source>Dependent file needs to be active: %1</source>
+        <translation>Le fichier de dépendance doit être activé : %1</translation>
+    </message>
+    <message>
+        <source>This file needs to load after %1</source>
+        <translation>Ce fichier doit être chargé après %1</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::EsmFile</name>
+    <message>
+        <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Format version:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Modified:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Path:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Description:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Dependencies: &lt;/b&gt;%6&lt;br/&gt;</source>
+        <translation>&lt;b&gt;Auteur :&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Version du format :&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Modifié le :&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Emplacement :&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Description :&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Dépendences : &lt;/b&gt;%6&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is part of OpenMW.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Ce fichier de contenu ne peut être désactivé, car il fait partie intégrante d&apos;OpenMW.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is enabled in a config file other than the user one.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Ce fichier de contenu ne peut être désactivé, car il est activé par un fichier de configuration non contrôlé par l&apos;utilisateur.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;This file is specified in a non-user config file, but does not exist in the VFS.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Ce fichier est spécifié dans un ficher de configuration non contrôlé par l&apos;utilisateur, mais ne semble pas exister.&lt;/b&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorView::ContentSelector</name>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Activer la sélection</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Désactiver la sélection</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation>&amp;Copier l&apos;emplacement dans le presse papier</translation>
+    </message>
+    <message>
+        <source>&lt;No game file&gt;</source>
+        <translation>&lt;Pas de fichier de jeu&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Process::ProcessInvoker</name>
+    <message>
+        <source>Error starting executable</source>
+        <translation>Erreur au démarrage de l&apos;application</translation>
+    </message>
+    <message>
+        <source>Error running executable</source>
+        <translation>Erreur lors de l&apos;exécution de l&apos;application</translation>
+    </message>
+    <message>
+        <source>
+Arguments:
+</source>
+        <translation>
+Arguments :
+</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not find %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not found.&lt;/p&gt;&lt;p&gt;Please make sure OpenMW is installed correctly and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible de trouver %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;L&apos;application est manquante.&lt;/p&gt;&lt;p&gt;Assurez-vous qu&apos;OpenMW est installé correctement puis réessayez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not executable.&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible de démarrer %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;L&apos;application n&apos;est pas exécutable.&lt;/p&gt;&lt;p&gt;Assurez-vous d&apos;avoir les bons droits d&apos;accès puis réessayez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while starting %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible de démarrer %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Une erreur est apparue au lancement de  %1.&lt;/p&gt;&lt;p&gt;Cliquez sur &quot;Montrer les détails...&quot; pour plus d&apos;informations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Executable %1 returned an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while running %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Le programme %1 a envoyé une erreur.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Une erreur est apparue durant l&apos;exécution de %1.&lt;/p&gt;&lt;p&gt;Cliquez sur &quot;Montrer les détails...&quot; pour plus d&apos;informations&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/components_ru.ts b/files/lang/components_ru.ts
new file mode 100644
index 0000000000..7a9b04db37
--- /dev/null
+++ b/files/lang/components_ru.ts
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>ContentSelector</name>
+    <message>
+        <source>Select language used by ESM/ESP content files to allow OpenMW to detect their encoding. </source>
+        <translation>Выберите язык, используемый вашими файлами данных ESM/ESP, чтобы позволить OpenMW определить их кодировку. </translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::ContentModel</name>
+    <message>
+        <source>Unable to find dependent file: %1</source>
+        <translation>Зависимый файл не найден: %1</translation>
+    </message>
+    <message>
+        <source>Dependent file needs to be active: %1</source>
+        <translation>Зависимый файл должен быть включен: %1</translation>
+    </message>
+    <message>
+        <source>This file needs to load after %1</source>
+        <translation>Этот файл должен быть загружен после %1</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::EsmFile</name>
+    <message>
+        <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Format version:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Modified:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Path:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Description:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Dependencies: &lt;/b&gt;%6&lt;br/&gt;</source>
+        <translation>&lt;b&gt;Автор:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Версия формата данных:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Дата изменения:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Путь к файлу:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Описание:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Зависимости: &lt;/b&gt;%6&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is part of OpenMW.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Этот файл данных не может быть отключен, потому что он является частью OpenMW.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is enabled in a config file other than the user one.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Этот файл данных не может быть отключен, потому что он включен в файле с настройками, не являющемся пользовательским.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;This file is specified in a non-user config file, but does not exist in the VFS.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Этот файл указан в непользовательском файле настроек, но не существует в виртуальной файловой системе.&lt;/b&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorView::ContentSelector</name>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Включить выбранное</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Отключить выбранное</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation>&amp;Скопировать пути в буфер обмена</translation>
+    </message>
+    <message>
+        <source>&lt;No game file&gt;</source>
+        <translation>&lt;Без файла игры&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Process::ProcessInvoker</name>
+    <message>
+        <source>Error starting executable</source>
+        <translation>Не удалось запустить исполняемый файл</translation>
+    </message>
+    <message>
+        <source>Error running executable</source>
+        <translation>При исполнении приложения произошла ошибка</translation>
+    </message>
+    <message>
+        <source>
+Arguments:
+</source>
+        <translation>
+Параметры:
+</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not find %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not found.&lt;/p&gt;&lt;p&gt;Please make sure OpenMW is installed correctly and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось найти %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Приложение не найдено.&lt;/p&gt;&lt;p&gt;Пожалуйста, убедитесь, что OpenMW установлен правильно, и повторите попытку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not executable.&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось запустить %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;У приложения нет прав на исполнение.&lt;/p&gt;&lt;p&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while starting %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось запустить %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Возникла ошибка при запуске %1.&lt;/p&gt;&lt;p&gt;Нажмите &quot;Показать детали...&quot; для получения дополнительной информации.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Executable %1 returned an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while running %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Исполнение файла %1 завершилось с ошибкой&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Возникла ошибка при выполнении %1.&lt;/p&gt;&lt;p&gt;Нажмите &quot;Показать детали...&quot; для получения дополнительной информации.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/components_sv.ts b/files/lang/components_sv.ts
new file mode 100644
index 0000000000..5ccf0e7fa6
--- /dev/null
+++ b/files/lang/components_sv.ts
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv_SE">
+<context>
+    <name>ContentSelector</name>
+    <message>
+        <source>Select language used by ESM/ESP content files to allow OpenMW to detect their encoding. </source>
+        <translation>Välj språk som används av ESM/ESP-innehållsfiler så att OpenMW kan hitta deras kodning. </translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::ContentModel</name>
+    <message>
+        <source>Unable to find dependent file: %1</source>
+        <translation>Kunde inte hitta beroende fil: %1</translation>
+    </message>
+    <message>
+        <source>Dependent file needs to be active: %1</source>
+        <translation>Beroende fil måste vara aktiv: %1</translation>
+    </message>
+    <message>
+        <source>This file needs to load after %1</source>
+        <translation>Denna fil måste laddas efter %1</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::EsmFile</name>
+    <message>
+        <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Format version:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Modified:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Path:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Description:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Dependencies: &lt;/b&gt;%6&lt;br/&gt;</source>
+        <translation>&lt;b&gt;Skapare:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Formatversion:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Ändrad:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Sökväg:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Beskrivning:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Beroenden: &lt;/b&gt;%6&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is part of OpenMW.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Denna innehållsfil kan inte inaktiveras då den är en del av OpenMW.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is enabled in a config file other than the user one.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Denna innehållsfil kan inte inaktiveras då den är en aktiverad i en annan konfigurationsfil än användarens.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;This file is specified in a non-user config file, but does not exist in the VFS.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Den här filen anges i en konfigfil som inte är avsedd för användare, men den finns inte i det virtuella filsystemet.&lt;/b&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorView::ContentSelector</name>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Bocka i markerade</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Bocka ur markerade</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation>&amp;Kopiera sökväg(ar) till klippbordet</translation>
+    </message>
+    <message>
+        <source>&lt;No game file&gt;</source>
+        <translation>&lt;Ingen spelfil&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Process::ProcessInvoker</name>
+    <message>
+        <source>Error starting executable</source>
+        <translation>Kunde inte starta körbara filen</translation>
+    </message>
+    <message>
+        <source>Error running executable</source>
+        <translation>Fel när körbara filen skulle köras</translation>
+    </message>
+    <message>
+        <source>
+Arguments:
+</source>
+        <translation>
+Argument:
+</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not find %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not found.&lt;/p&gt;&lt;p&gt;Please make sure OpenMW is installed correctly and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte hitta %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Applikationen hittas inte.&lt;/p&gt;&lt;p&gt;Se till att OpenMW är korrekt installerat och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not executable.&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte starta %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Applikationen är inte körbar.&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while starting %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte starta %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Ett fel uppstod när %1 skulle startas.&lt;/p&gt;&lt;p&gt;Tryck på &quot;Visa detaljer...&quot; för mer information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Executable %1 returned an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while running %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Körbara filen %1 gav ett felmeddelande&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Ett fel uppstod när %1 kördes.&lt;/p&gt;&lt;p&gt;Tryck på &quot;Visa detaljer...&quot; för mer information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/launcher_de.ts b/files/lang/launcher_de.ts
new file mode 100644
index 0000000000..86773e5a54
--- /dev/null
+++ b/files/lang/launcher_de.ts
@@ -0,0 +1,1451 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+<context>
+    <name>DataFilesPage</name>
+    <message>
+        <source>Content Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and append them at the end of the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Append</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and insert them above the selected position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selected directory one position up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selected directory one position down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Archive Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selected archive one position up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selected archive one position down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation Mesh Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate navigation mesh cache for all content. Will be used by the engine to make cell loading faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel navigation mesh generation. Already processed data will be saved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a content list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uncheck Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh Data Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: content files that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: directories that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: archives that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Unused Tiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GraphicsPage</name>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Windowed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adaptive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> FPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> × </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resolution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Window Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Framerate Limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Window Border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anti-Aliasing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical Synchronization</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind Installation Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind Settings Importer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run &amp;Settings Importer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File to Import Settings From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::DataFilesPage</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Content List name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contains content file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Will be added to the current profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resolved as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is the data-local directory and cannot be disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This directory is part of OpenMW and cannot be disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This directory is enabled in an openmw.cfg other than the user one</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This archive is enabled in an openmw.cfg other than the user one</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Path in File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::GraphicsPage</name>
+    <message>
+        <source>Error receiving number of screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screen </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error receiving resolutions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::ImportPage</name>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Importer finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to import settings from INI file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open or create %1 for writing &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::MainDialog</name>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch OpenMW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpenMW %1 release</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpenMW development (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compiled on %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error reading OpenMW configuration files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error writing user settings file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error writing Launcher configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No game file selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Welcome to OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;It is recommended to run the Installation Wizard.&lt;/p&gt;&lt;p&gt;The Wizard will let you select an existing Morrowind installation, or install Morrowind for OpenMW to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find the Data Files location&lt;/b&gt;&lt;br&gt;&lt;br&gt;The directory containing the data files was not found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;The problem may be due to an incomplete installation of OpenMW.&lt;br&gt;Reinstalling OpenMW may resolve the problem.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open or create %0 for writing&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;You do not have a game file selected.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW will not start without a game file selected.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory: code %0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not create directory %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::SettingsPage</name>
+    <message>
+        <source>Text file (*.txt)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OpenMW Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpenMW version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>toolBar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows to setup data files and directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows to tweak engine settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows to import data from original engine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows to change display settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Select configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select script file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectSubdirs</name>
+    <message>
+        <source>Select directories you wish to add</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uncapped Damage Fatigue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;When enabled, a navigation mesh is built in the background for world geometry to be used for pathfinding. When disabled only the path grid is used to build paths. Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn&apos;t know where to go when you stand behind that stone and cast a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don&apos;t use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor&apos;s script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Visuals</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Animations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled - makes transitions between different animations/poses much smoother. Also allows to load animation blending config YAML files that can be bundled with animations in order to customise blending styles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smooth Animation Transitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character&apos;s body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shaders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see &apos;normal map pattern&apos;, e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See &apos;auto use object normal maps&apos;. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see &apos;specular map pattern&apos;, e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern &apos;terrain specular map pattern&apos; exists, use that file as a &apos;diffuse specular&apos; map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren&apos;t affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terrain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your preferred audio device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls HRTF, which simulates 3D sound on stereo systems.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HRTF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your preferred HRTF profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you&apos;re talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size of characters in game texts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saves</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>JPG</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PNG</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TGA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>These settings are intended for testing mods and will cause issues if used for normal gameplay.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency between available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gameplay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shadows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> unit(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1024</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2048</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4096</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind&apos;s data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tooltip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Crosshair</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screenshots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Give actors an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
+&lt;p&gt; &quot;Legacy&quot; always uses 8 lights per object. It provides results most similar to Morrowind&apos;s lighting.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (compatibility)&quot; removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shaders (compatibility)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In third-person view, use the camera as the sound listener instead of the player character.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Permanent Barter Disposition Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Classic Calm Spells Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NPCs Avoid Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Soulgem Values Rebalance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day Night Switch Nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Followers Defend Immediately</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only Magical Ammo Bypass Resistance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphic Herbalism</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swim Upward Correction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enchanted Weapons Are Magical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Merchant Equipping Fix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can Loot During Death Animation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Classic Reflected Absorb Spells Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unarmed Creature Attacks Damage Armor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Affect Werewolves</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Not Affect Werewolves</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Background Physics Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actor Collision Shape Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Axis-Aligned Bounding Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotating Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smooth Movement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Additional Animation Sources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weapon Sheathing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shield Sheathing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player Movement Ignores Animation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Magic Item Animation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Use Object Normal Maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Soft Particles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Use Object Specular Maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Normal Maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Specular Maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Anti-Aliased Alpha Testing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bump/Reflect Map Local Lighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weather Particle Occlusion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exponential Fog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Radial Fog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sky Blending Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sky Blending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Object Paging Min Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Viewing Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distant Land</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active Grid Object Paging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transparent Postpass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Exposure Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Post Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shadow Planes Computation Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Actor Shadows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade Start Multiplier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Player Shadows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shadow Map Resolution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shadow Distance Limit:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Object Shadows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Indoor Shadows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Terrain Shadows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lighting Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HRTF Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tooltip and Crosshair</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GUI Scaling Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Effect Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Dialogue Topic Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Projectile Damage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Melee Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stretch Menu Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Owned Objects</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Enchant Chance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximum Quicksaves</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screenshot Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Grab Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bounds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Primitives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Allow Actors to Follow over Water</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Racial Variation in Speed Fix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Navigation Mesh for Pathfinding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trainers Choose Offered Skills by Base Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steal from Knocked out Actors in Combat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Factor Strength into Hand-to-Hand Combat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls the behavior of factoring of Strength attribute into hand-to-hand damage: damage is multiplied by Strength value divided by 40.&lt;/p&gt;&lt;p&gt;Can apply to all actors or only to non-werewolf actors.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn to Movement Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adjust Coverage for Alpha Test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use the Camera as the Sound Listener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can Zoom on Maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notify on Saved Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skip Menu and Generate Default Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Default Character at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script After Startup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/launcher_en.ts b/files/lang/launcher_en.ts
new file mode 100644
index 0000000000..a0319318e8
--- /dev/null
+++ b/files/lang/launcher_en.ts
@@ -0,0 +1,1451 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+<context>
+    <name>DataFilesPage</name>
+    <message>
+        <source>Content Files</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: content files that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Data Directories</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and append them at the end of the list.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Append</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and insert them above the selected position</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Insert Above</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Move selected directory one position up</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Move selected directory one position down</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Remove selected directory</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: directories that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Archive Files</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Move selected archive one position up</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Move selected archive one position down</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: archives that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Navigation Mesh Cache</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Generate navigation mesh cache for all content. Will be used by the engine to make cell loading faster.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Cancel navigation mesh generation. Already processed data will be saved.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Remove Unused Tiles</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Max Size</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select a content list</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;New Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Ctrl+G</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Ctrl+D</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Check Selection</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Uncheck Selection</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Refresh Data Files</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Ctrl+R</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>GraphicsPage</name>
+    <message>
+        <source>Screen</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Window Mode</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source> × </source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Standard:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Framerate Limit</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Window Border</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Adaptive</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Windowed</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Resolution</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source> FPS</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Anti-Aliasing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Vertical Synchronization</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind Installation Wizard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind Settings Importer</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>File to Import Settings From:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Run &amp;Settings Importer</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::DataFilesPage</name>
+    <message>
+        <source>English</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Content List name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Resolved as %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Will be added to the current profile</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>This is the data-local directory and cannot be disabled</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>This directory is part of OpenMW and cannot be disabled</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>This directory is enabled in an openmw.cfg other than the user one</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Contains content file(s)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>This archive is enabled in an openmw.cfg other than the user one</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Open Path in File Explorer</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::GraphicsPage</name>
+    <message>
+        <source>Error receiving number of screens</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Screen </source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error receiving resolutions</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::ImportPage</name>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open or create %1 for writing &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Importer finished</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to import settings from INI file.</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::MainDialog</name>
+    <message>
+        <source>Close</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Launch OpenMW</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory: code %0</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not create directory %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>First run</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Welcome to OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;It is recommended to run the Installation Wizard.&lt;/p&gt;&lt;p&gt;The Wizard will let you select an existing Morrowind installation, or install Morrowind for OpenMW to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>OpenMW %1 release</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>OpenMW development (%1)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Compiled on %1 %2</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind installation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find the Data Files location&lt;/b&gt;&lt;br&gt;&lt;br&gt;The directory containing the data files was not found.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error reading OpenMW configuration files</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;The problem may be due to an incomplete installation of OpenMW.&lt;br&gt;Reinstalling OpenMW may resolve the problem.&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open or create %0 for writing&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error writing user settings file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error writing Launcher configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>No game file selected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;You do not have a game file selected.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW will not start without a game file selected.&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::SettingsPage</name>
+    <message>
+        <source>Text file (*.txt)</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OpenMW Launcher</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>OpenMW version</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>toolBar</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Data Files</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Allows to setup data files and directories</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Allows to change display settings</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Allows to tweak engine settings</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Allows to import data from original engine</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Select configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select script file</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>SelectSubdirs</name>
+    <message>
+        <source>Select directories you wish to add</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>Gameplay</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Uncapped Damage Fatigue</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Give actors an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Always Allow Actors to Follow over Water</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Permanent Barter Disposition Changes</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don&apos;t use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Racial Variation in Speed Fix</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Classic Calm Spells Behavior</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>NPCs Avoid Collisions</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Soulgem Values Rebalance</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Day Night Switch Nodes</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Followers Defend Immediately</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;When enabled, a navigation mesh is built in the background for world geometry to be used for pathfinding. When disabled only the path grid is used to build paths. Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn&apos;t know where to go when you stand behind that stone and cast a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Use Navigation Mesh for Pathfinding</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Only Magical Ammo Bypass Resistance</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Graphic Herbalism</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Swim Upward Correction</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enchanted Weapons Are Magical</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Merchant Equipping Fix</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Trainers Choose Offered Skills by Base Value</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor&apos;s script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Can Loot During Death Animation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Steal from Knocked out Actors in Combat</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Classic Reflected Absorb Spells Behavior</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Unarmed Creature Attacks Damage Armor</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Factor Strength into Hand-to-Hand Combat</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls the behavior of factoring of Strength attribute into hand-to-hand damage: damage is multiplied by Strength value divided by 40.&lt;/p&gt;&lt;p&gt;Can apply to all actors or only to non-werewolf actors.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Affect Werewolves</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Do Not Affect Werewolves</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Background Physics Threads</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Actor Collision Shape Type</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency between available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Axis-Aligned Bounding Box</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Rotating Box</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Cylinder</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Visuals</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Animations</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Smooth Movement</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Use Additional Animation Sources</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character&apos;s body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Turn to Movement Direction</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Weapon Sheathing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Shield Sheathing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Player Movement Ignores Animation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Use Magic Item Animation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Shaders</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see &apos;normal map pattern&apos;, e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Auto Use Object Normal Maps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Soft Particles</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see &apos;specular map pattern&apos;, e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Auto Use Object Specular Maps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See &apos;auto use object normal maps&apos;. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Normal Maps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern &apos;terrain specular map pattern&apos; exists, use that file as a &apos;diffuse specular&apos; map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Specular Maps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Adjust Coverage for Alpha Test</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Use Anti-Aliased Alpha Testing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren&apos;t affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Bump/Reflect Map Local Lighting</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Weather Particle Occlusion</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Fog</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Exponential Fog</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Radial Fog</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Sky Blending Start</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Sky Blending</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Terrain</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Object Paging Min Size</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Viewing Distance</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source> cells</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Distant Land</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Active Grid Object Paging</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Post Processing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Transparent Postpass</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Auto Exposure Speed</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enable Post Processing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Shadows</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Bounds</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Primitives</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Shadow Planes Computation Method</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source> unit(s)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enable Actor Shadows</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>512</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>1024</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>2048</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>4096</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Fade Start Multiplier</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enable Player Shadows</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Shadow Map Resolution</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Shadow Distance Limit:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enable Object Shadows</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind&apos;s data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enable Indoor Shadows</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Enable Terrain Shadows</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Lighting</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
+&lt;p&gt; &quot;Legacy&quot; always uses 8 lights per object. It provides results most similar to Morrowind&apos;s lighting.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (compatibility)&quot; removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Lighting Method</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Shaders (compatibility)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select your preferred audio device.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Audio Device</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>This setting controls HRTF, which simulates 3D sound on stereo systems.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>HRTF</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>On</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select your preferred HRTF profile.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>HRTF Profile</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>In third-person view, use the camera as the sound listener instead of the player character.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Use the Camera as the Sound Listener</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Tooltip</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Crosshair</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Tooltip and Crosshair</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>GUI Scaling Factor</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Show Effect Duration</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you&apos;re talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Change Dialogue Topic Color</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Size of characters in game texts.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Font Size</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Can Zoom on Maps</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Show Projectile Damage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Show Melee Info</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Stretch Menu Background</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Show Owned Objects</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Show Enchant Chance</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Saves</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Maximum Quicksaves</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Screenshots</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Screenshot Format</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>JPG</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>PNG</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>TGA</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Notify on Saved Screenshot</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>These settings are intended for testing mods and will cause issues if used for normal gameplay.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Grab Cursor</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Skip Menu and Generate Default Character</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Start Default Character at</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Default Cell</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Run Script After Startup:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Smooth Animation Transitions</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled - makes transitions between different animations/poses much smoother. Also allows to load animation blending config YAML files that can be bundled with animations in order to customise blending styles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/launcher_fr.ts b/files/lang/launcher_fr.ts
new file mode 100644
index 0000000000..569a460cd0
--- /dev/null
+++ b/files/lang/launcher_fr.ts
@@ -0,0 +1,1454 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
+<context>
+    <name>DataFilesPage</name>
+    <message>
+        <source>Content Files</source>
+        <translation>Fichiers de données</translation>
+    </message>
+    <message>
+        <source>Data Directories</source>
+        <translation>Dossiers de données</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and append them at the end of the list.</source>
+        <translation>Parcours les dossiers afin de trouver des &lt;em&gt;dossiers de données&lt;/em&gt; et ajoute ceux-ci à la fin de la liste.</translation>
+    </message>
+    <message>
+        <source>Append</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and insert them above the selected position</source>
+        <translation>Parcours les dossiers afin de trouver des &lt;em&gt;dossiers de données&lt;/em&gt; et ajoute ceux-ci au dessus de la position actuellement sélectionnée.</translation>
+    </message>
+    <message>
+        <source>Insert Above</source>
+        <translation>Insérer au dessus</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position up</source>
+        <translation>Déplace le(s) dossier(s) sélectionné(s) d&apos;une position vers le haut.</translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation>Monter</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position down</source>
+        <translation>Déplace le(s) dossier(s) sélectionné(s) d&apos;une position vers le bas.</translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation>Descendre</translation>
+    </message>
+    <message>
+        <source>Remove selected directory</source>
+        <translation>Supprime le(s) dossier(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Archive Files</source>
+        <translation>Fichiers archive</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position up</source>
+        <translation>Déplace les archives sélectionnées d&apos;une position vers le haut</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position down</source>
+        <translation>Déplace les archives sélectionnées d&apos;une position vers le bas</translation>
+    </message>
+    <message>
+        <source>Navigation Mesh Cache</source>
+        <translation>Mise en cache des mesh de navigation</translation>
+    </message>
+    <message>
+        <source>Generate navigation mesh cache for all content. Will be used by the engine to make cell loading faster.</source>
+        <translation>Génère un cache de mesh de navigation pour tout le contenu du jeu. Celui-ci sera utilisé par le moteur de jeu afin d&apos;accélérer la transition entre les différentes zones de jeu.</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation>Mettre à jour</translation>
+    </message>
+    <message>
+        <source>Cancel navigation mesh generation. Already processed data will be saved.</source>
+        <translation>Annule la génération de mesh de navigation. Les données déjà sauvegardées seront sauvegardées.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>Mio</translation>
+    </message>
+    <message>
+        <source>Content List</source>
+        <translation>Liste de contenu</translation>
+    </message>
+    <message>
+        <source>Select a content list</source>
+        <translation>Sélectionne une Liste de contenu.</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Nouvelle Liste de contenu</translation>
+    </message>
+    <message>
+        <source>&amp;New Content List</source>
+        <translation>&amp;Nouvelle Liste de contenu</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Cloner une Liste de contenu</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Supprimer une Liste de contenu</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <source>Check Selection</source>
+        <translation>Activer la sélection</translation>
+    </message>
+    <message>
+        <source>Uncheck Selection</source>
+        <translation>Désactiver la sélection</translation>
+    </message>
+    <message>
+        <source>Refresh Data Files</source>
+        <translation>Rafraîchir la liste des fichiers</translation>
+    </message>
+    <message>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: content files that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note : Les fichiers de contenu qui ne font pas partie de la &lt;em&gt;Liste de contenu&lt;/em&gt; actuelle sont &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;surlignés&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: directories that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note : Les dossiers de données qui ne font pas partie de la &lt;em&gt;Liste de contenu&lt;/em&gt; actuelle sont &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;surlignés&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: archives that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note : Les archives qui ne font pas partie de la &lt;em&gt;Liste de contenu&lt;/em&gt; actuelle sont &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;surlignées&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Remove Unused Tiles</source>
+        <translation>Ignorer les tuiles inutilisées</translation>
+    </message>
+    <message>
+        <source>Max Size</source>
+        <translation>Taille maximale</translation>
+    </message>
+</context>
+<context>
+    <name>GraphicsPage</name>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Personnalisé :</translation>
+    </message>
+    <message>
+        <source>Standard:</source>
+        <translation>Standard :</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Plein écran</translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen</source>
+        <translation>Fenêtré plein écran</translation>
+    </message>
+    <message>
+        <source>Windowed</source>
+        <translation>Fenêtré</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Désactivé</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Activé</translation>
+    </message>
+    <message>
+        <source>Adaptive</source>
+        <translation>Adaptatif</translation>
+    </message>
+    <message>
+        <source> FPS</source>
+        <translation>FPS</translation>
+    </message>
+    <message>
+        <source> × </source>
+        <translation> × </translation>
+    </message>
+    <message>
+        <source>Screen</source>
+        <translation>Écran</translation>
+    </message>
+    <message>
+        <source>Resolution</source>
+        <translation>Résolution</translation>
+    </message>
+    <message>
+        <source>Window Mode</source>
+        <translation>Mode d&apos;affichage</translation>
+    </message>
+    <message>
+        <source>Framerate Limit</source>
+        <translation>Limite de framerate</translation>
+    </message>
+    <message>
+        <source>Window Border</source>
+        <translation>Bordure de fenêtre</translation>
+    </message>
+    <message>
+        <source>Anti-Aliasing</source>
+        <translation>Antialiasing</translation>
+    </message>
+    <message>
+        <source>Vertical Synchronization</source>
+        <translation>Synchronisation verticale</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Morrowind Installation Wizard</source>
+        <translation>Assistant d&apos;installation de Morrowind</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Lancer &amp;l&apos;Assistant d&apos;installation</translation>
+    </message>
+    <message>
+        <source>Morrowind Settings Importer</source>
+        <translation>Import des paramètres de Morrowind</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Parcourir...</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Les polices fournies avec le moteur de jeu original sont floues lorsque l&apos;interface utilisateur est agrandie. De plus, elles ne supportent qu&apos;un faible nombre de caractères. Afin d&apos;éviter ces désagréments, OpenMW propose son propre ensemble de polices. Ces polices sont encodées au format TrueType et ressemblent aux polices originales. Sélectionnez cette option si vous préférez utiliser les polices originales - à la place de celles fournies par OpenMW - ou si vous utilisez vos propres polices au format bitmap.</translation>
+    </message>
+    <message>
+        <source>Run &amp;Settings Importer</source>
+        <translation>Lancer &amp;l&apos;import des paramètres</translation>
+    </message>
+    <message>
+        <source>File to Import Settings From:</source>
+        <translation>Ficher depuis lequel les paramètres seront importés :</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts</source>
+        <translation>Importer les paramètres des polices en bitmap</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Importer les extensions et la sélection des modules complémentaires (crée une nouvelle Liste de contenu)</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::DataFilesPage</name>
+    <message>
+        <source>English</source>
+        <translation>Anglais</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Français</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Allemand</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Italien</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Polonais</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Russe</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Espagnol</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Créer une Liste de contenu</translation>
+    </message>
+    <message>
+        <source>Content List name:</source>
+        <translation>Nom de la Liste de contenu :</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Cloner la Liste de contenu</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation>Sélectionnez un dossier</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Supprimer la Liste de contenu</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation>Êtes-vous sûre de vouloir supprimer &lt;b&gt;%1&lt;/b&gt; ?</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Contains content file(s)</source>
+        <translation>Contient les fichiers de contenu</translation>
+    </message>
+    <message>
+        <source>Will be added to the current profile</source>
+        <translation>Sera ajouté au profil actuel</translation>
+    </message>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Active la sélection</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Désctive la sélection</translation>
+    </message>
+    <message>
+        <source>Resolved as %1</source>
+        <translation>Localisation : %1</translation>
+    </message>
+    <message>
+        <source>This is the data-local directory and cannot be disabled</source>
+        <translation>Ceci est le dossier data-local, il ne peut être désactivé.</translation>
+    </message>
+    <message>
+        <source>This directory is part of OpenMW and cannot be disabled</source>
+        <translation>Ce dossier ne peut être désactivé, car il fait partie intégrante d&apos;OpenMW.</translation>
+    </message>
+    <message>
+        <source>This directory is enabled in an openmw.cfg other than the user one</source>
+        <translation>Ce dossier est activé dans un fichier openmw.cfg qui n&apos;est pas celui de l&apos;utilisateur.</translation>
+    </message>
+    <message>
+        <source>This archive is enabled in an openmw.cfg other than the user one</source>
+        <translation>Cette archive est activée dans un fichier openmw.cfg qui n&apos;est pas celui de l&apos;utilisateur.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation>&amp;Copier l&apos;emplacement dans le presse papier</translation>
+    </message>
+    <message>
+        <source>&amp;Open Path in File Explorer</source>
+        <translation>&amp;Ouvrir l&apos;emplacement dans l&apos;explorateur de fichiers</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::GraphicsPage</name>
+    <message>
+        <source>Error receiving number of screens</source>
+        <translation>Erreur lors de l&apos;obtention du nombre d&apos;écrans</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Screen </source>
+        <translation>Écran </translation>
+    </message>
+    <message>
+        <source>Error receiving resolutions</source>
+        <translation>Erreur lors de l&apos;obtention des résolutions</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::ImportPage</name>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Erreur lors de l&apos;écriture du fichier de configuration</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Fichier de configuration de Morrowind (*.ini)</translation>
+    </message>
+    <message>
+        <source>Importer finished</source>
+        <translation>Importation terminée</translation>
+    </message>
+    <message>
+        <source>Failed to import settings from INI file.</source>
+        <translation>Échec lors de l&apos;importation du fichier INI.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open or create %1 for writing &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible d&apos;ouvrir ou de créer %1 en écriture &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Veuillez vous assurer que vous avez les bons droits d&apos;accès puis réessayez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::MainDialog</name>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>Launch OpenMW</source>
+        <translation>Lancer OpenMW</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Aide</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Erreur lors de l&apos;ouverture du fichier de configuration d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>First run</source>
+        <translation>Premier lancement</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Lancer l&apos;Assistant d&apos;installation</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation>Passer</translation>
+    </message>
+    <message>
+        <source>OpenMW %1 release</source>
+        <translation>OpenMW %1 release</translation>
+    </message>
+    <message>
+        <source>OpenMW development (%1)</source>
+        <translation>OpenMW development (%1)</translation>
+    </message>
+    <message>
+        <source>Compiled on %1 %2</source>
+        <translation>Compilé le %1 %2</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind installation</source>
+        <translation>Erreur lors de la détection de l&apos;installation de Morrowind</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard...</source>
+        <translation>Lancer l&apos;Assistant d&apos;installation</translation>
+    </message>
+    <message>
+        <source>Error reading OpenMW configuration files</source>
+        <translation>Erreur lors de la lecture du fichier de configuration d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Erreur lors de l&apos;écriture dans le fichier de configuration d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Error writing user settings file</source>
+        <translation>Erreur lors de l&apos;écriture du fichier de paramètres utilisateur</translation>
+    </message>
+    <message>
+        <source>Error writing Launcher configuration file</source>
+        <translation>Erreur lors de l&apos;écriture dans le fichier de paramètres du Lanceur</translation>
+    </message>
+    <message>
+        <source>No game file selected</source>
+        <translation>Aucun fichier de jeu sélectionné</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Welcome to OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;It is recommended to run the Installation Wizard.&lt;/p&gt;&lt;p&gt;The Wizard will let you select an existing Morrowind installation, or install Morrowind for OpenMW to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Bienvenue sur OpenMW !&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Il est recommandé de lancer l&apos;Assistant d&apos;installation .&lt;/p&gt;&lt;p&gt;L&apos;assistant vous permettra de sélectionner une installation de Morrowind existante, ou d&apos;installer Morrowind pour son utilisation dans OpenMW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Impossible d&apos;ouvrir %0 en lecture :&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Assurez vous d&apos;avoir les bons droits d&apos;accès puis réessayez.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Impossible d&apos;ouvrir %0 en lecture :&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Assurez vous d&apos;avoir les bons droits d&apos;accès puis réessayez.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find the Data Files location&lt;/b&gt;&lt;br&gt;&lt;br&gt;The directory containing the data files was not found.</source>
+        <translation>&lt;br&gt;&lt;b&gt;Impossible de trouver l&apos;emmplacement de Data Files&lt;/b&gt;&lt;br&gt;&lt;br&gt;Le dossier contenant les fichiers de données n&apos;a pas été trouvé.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;The problem may be due to an incomplete installation of OpenMW.&lt;br&gt;Reinstalling OpenMW may resolve the problem.&lt;br&gt;</source>
+        <translation>&lt;br&gt;Ce problème peut survenir lors d&apos;une installation incomplète d&apos;OpenMW.&lt;br&gt;Réinstaller OpenMW pourrait résoudre le problème.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open or create %0 for writing&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Impossible d&apos;ouvrir ou de créer %0 en écriture :&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Assurez vous d&apos;avoir les bons droits d&apos;accès puis réessayez.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;You do not have a game file selected.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW will not start without a game file selected.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Vous n&apos;avez pas sélectionné de fichier de jeu.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW ne peut démarrer sans qu&apos;un fichier de jeu soit sélectionné.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory: code %0</source>
+        <translation>Erreur lors de la création du dossier de configuration d&apos;OpenMW : code %0</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not create directory %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Impossible de créer le dossier %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::SettingsPage</name>
+    <message>
+        <source>Text file (*.txt)</source>
+        <translation>Fichier texte (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OpenMW Launcher</source>
+        <translation>Lanceur d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>OpenMW version</source>
+        <translation>Version d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>toolBar</source>
+        <translation>toolBar</translation>
+    </message>
+    <message>
+        <source>Data Files</source>
+        <translation>Données de jeu</translation>
+    </message>
+    <message>
+        <source>Allows to setup data files and directories</source>
+        <translation>Configurez et sélectionnez les fichiers, dossiers et archives de jeu</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>Allows to tweak engine settings</source>
+        <translation>Modifiez les options du moteur de jeu</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Importer</translation>
+    </message>
+    <message>
+        <source>Allows to import data from original engine</source>
+        <translation>Importez des données depuis le moteur de jeu original</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation>Affichage</translation>
+    </message>
+    <message>
+        <source>Allows to change display settings</source>
+        <translation>Modifiez les paramètres d&apos;affichage</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Sélectionnez un fichier de configuration</translation>
+    </message>
+    <message>
+        <source>Select script file</source>
+        <translation>Sélectionnez un fichier de script</translation>
+    </message>
+</context>
+<context>
+    <name>SelectSubdirs</name>
+    <message>
+        <source>Select directories you wish to add</source>
+        <translation>Sélectionnez le dossier que vous désirez ajouter</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rends le changement de disposition des marchands due au Marchandage permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Permets aux compagnons et aux escortes de démarrer le combat avec des ennemis entrés en combat avec eux ou avec le joueur. Si l&apos;option est désactivée, ils attendent que les ennemis les attaquent en premier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option retire le plafond sur l&apos;effet magique Atténuation de Fatigue, comme c&apos;est le cas avec Absorption de Fatigue. Cette option vous permet d&apos;assommer des personnages en utilisant cet effet magique.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Uncapped Damage Fatigue</source>
+        <translation>Domages de fatique déplafonnés</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si cette option est activée, le jeu interrompt le combat avec les PNJ affectés par l&apos;effet magique Apaisement à chaque frame.  Ce comportement similaire à celui du moteur d&apos;origine, sans MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est cochée, la valeur des gemmes sprirituelles dépend uniquement de la puissance de l&apos;âme contenue.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option fait que le joueur nage légèrement au-dessus de la ligne de visée. S&apos;applique uniquement dans le mode Vue à la troisième personne. Ceci facilite la nage, hors plongée.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option rend possible le vol d&apos;objets à un PNJ tombé à terre durant un combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;When enabled, a navigation mesh is built in the background for world geometry to be used for pathfinding. When disabled only the path grid is used to build paths. Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn&apos;t know where to go when you stand behind that stone and cast a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;Lorsque cette option est activée, un mesh de navigation est construit en arrière-plan à partir de la géométrie de l&apos;environnement. Celui-ci est alors utilisé pour la recherche d&apos;itinéraire.&lt;/p&gt;&lt;p&gt;Lorsqu&apos;elle est désactivée, seule la grille des chemins est utilisée pour tracer les itinéraires.&lt;/p&gt;&lt;p&gt;Cette option peut affecter de façon significative les systèmes à simple cœur, lorsque le joueur passe d&apos;un environnement intérieur à l&apos;environnement extérieur. Ce paramètre peut aussi affecter, dans une moindre mesure, les systèmes multicœurs. La lenteur due à la génération de mesh de navigation des systèmes multicœurs peut dépendre des autres options ainsi que de la puissance du système. Se déplacer au sein de l&apos;environnement extérieur, entrer et sortir d&apos;un lieu génère un mesh de navigation. Les PNJ et les créatures peuvent ne pas trouver les mesh de navigation générés autour d&apos;eux. Désactivez cette option si vous désirez avoir une intelligence artificielle à l&apos;ancienne où les ennemis ne savent pas quoi faire lorsque le joueur se tient derrière un rocher et lance des boules de feu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée, les PNJ tentent des manœuvres d&apos;évitement afin d&apos;éviter d&apos;entrer en collision les uns avec les autres.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don&apos;t use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;N&apos;utilise pas le poids de la race du PNJ pour calculer sa vitesse de mouvement.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor&apos;s script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, le joueur est autorisé à piller créatures et PNJ (p. ex. les créatures invoquées) durant leur animation de mort, si elles ne sont pas en combat. Dans ce cas, le jeu incrémente le conteur de mort et lance son script instantanément.&lt;/p&gt;&lt;p&gt;Lorsque cette option est désactivée, le joueur doit attendre la fin de l&apos;animation de mort. Dans ce cas, l&apos;utilisation de l&apos;exploit des créatures invoquées (piller des créatures invoquées telles que des Drémoras ou des Saintes Dorées afin d&apos;obtenir des armes de grandes valeurs) est rendu beaucoup plus ardu. Cette option entre en confit avec les Mods de mannequin. En effet, ceux-ci utilisent SkipAnim afin d&apos;éviter la fin de l&apos;animation de mort.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L&apos;option donne aux créatures non armées la capacité d&apos;endommager les pièces d&apos;armure, comme le font les PNJ et les créatures armées.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>Inactif</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Détermine le nombre de thread qui seront générés en arrière-plan pour mettre à jour la physique du jeu. La valeur 0 signifie que ces mises à jour seront calculées par le thread principal.&lt;/p&gt;&lt;p&gt;Une valeur supérieure à 1 requière que la librairie Bullet soit compilée avec le support multithread.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Cylinder</source>
+        <translation>Cylindrique</translation>
+    </message>
+    <message>
+        <source>Visuals</source>
+        <translation>Visuels</translation>
+    </message>
+    <message>
+        <source>Animations</source>
+        <translation>Animations</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anime l&apos;utilisation d&apos;objet magique, de façon similaire à l&apos;utilisation des sorts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled - makes transitions between different animations/poses much smoother. Also allows to load animation blending config YAML files that can be bundled with animations in order to customise blending styles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est désactivée, le moteur de jeu n&apos;effectue aucune transition entre les différentes poses/animations.&lt;/p&gt;&lt;p&gt;Lorsque cette option est activée, le moteur de jeu adoucit la transition entre les différentes poses/animations.&lt;/p&gt;&lt;p&gt;Cette option prend en charge les fichiers de configuration YAML pour les transitions entre animations, ceux-ci peuvent être inclus avec les lots d&apos;animations afin de configurer le type de transition entre les diverses animations fournies.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Smooth Animation Transitions</source>
+        <translation>Adoucir la transition entre animations</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option rend les mouvements des PNJ et du joueur plus souple. Recommandé si l&apos;option &quot;Se tourner en direction du mouvement&quot; est activée.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Charge les fichiers d&apos;animation groupée KF et les fichiers de structure de squelettes depuis le dossier Animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character&apos;s body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affecte les mouvements latéraux et diagonaux. Activer cette option rend les mouvements plus réalistes.&lt;/p&gt;&lt;p&gt;Si elle est désactivée, le corps entier du personnage joueur est pointé dans la direction de visée. Les mouvements diagonaux n&apos;ont pas d&apos;animation spécifique et glissent sur le sol.&lt;/p&gt;&lt;p&gt;Si elle est activée, le bas du corps du personnage joueur est orienté suivant la direction du mouvement, le haut du corps est orienté partiellement, et la tête est alignée avec la direction de visée. En mode combat, cet effet n&apos;est appliqué qu&apos;aux mouvements diagonaux. Hors mode combat, cet effet est aussi appliqué aux mouvements purement latéraux. Cette option affecte aussi la nage, le moteur de jeu oriente alors tout le corps dans la direction du mouvement.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option permet d&apos;afficher les armes rengainées dans leur étui (p. ex. carquois et fourreau). Elle nécessite des modèles 3D fournis pas un mod.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option permet d&apos;afficher les boucliers rengainés. Elle nécessite des modèles 3D fournis pas un mod.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;En vue à la troisième personne, la caméra se balance avec mouvement d&apos;animation du joueur. Activer cette option désactive ce balancement de sorte que le personnage joueur se déplace indépendamment de son animation. Ce comportement était activé par défaut dans les versions d&apos;OpenMW 0.48 et antérieures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shaders</source>
+        <translation>Shaders</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see &apos;normal map pattern&apos;, e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, les normal maps (textures d&apos;orientation de la surface) sont automatiquement reconnues et utilisées, lorsque le fichier est nommé correctement.&lt;/p&gt;&lt;p&gt;Par exemple, si une texture de base est nommée foo.dds, la texture de normal maps devrait être nommée foo_n.dds (voir &apos;normal map pattern&apos; dans la documentation pour plus d&apos;informations).&lt;/p&gt;&lt;p&gt;Si l&apos;option est désactivée, les normal maps sont utilisées uniquement si elles sont listées explicitement dans le fichier de mesh (fichiers .nif ou .osg). Cette option affecte les objets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See &apos;auto use object normal maps&apos;. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Voir &quot;Utilisation auto des normal maps pour les objets&quot;. Affecte le terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see &apos;specular map pattern&apos;, e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si cette option est activée, les specular maps (textures indiquant si un objet est brillant ou mat) sont automatiquement reconnues et utilisées, lorsque le fichier est nommé correctement.&lt;/p&gt;&lt;p&gt;Par exemple, si une texture de base est nommée foo.dds, la texture de specular maps devrait être nommée foo_spec.dds (voir &apos;specular map pattern&apos; dans la documentation pour plus d&apos;informations, en anglais).&lt;/p&gt;&lt;p&gt;Si le paramètre est désactivé, les specular maps sont utilisées uniquement si elles sont listées explicitement dans le fichier de mesh (fichiers .osg, non supporté par le format nif). Cette option affecte les objets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern &apos;terrain specular map pattern&apos; exists, use that file as a &apos;diffuse specular&apos; map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée et qu&apos;un fichier dont le nom respecte la structure des specular maps (voir Utilisation auto des specular maps pour les objets), le moteur de jeu utilise cette texture comme  &quot;diffuse specular map&quot; : Cette texture doit contenir une couche (habituelle) de couleur RVB et un facteur de spécularité (≃brillance) dans le canal alpha.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren&apos;t affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;En temps normal, les réflexions dues au placage d&apos;environnement (environment map) ne sont pas affectées par l&apos;éclairage de la scène. En conséquence, les objets affectés par le placage d&apos;environnement (et de relief) ont tendance à briller dans le noir. Le &quot;Morrowind Code Patch&quot; a, pour remédier à ça, inclus une option qui applique le placage d&apos;environnement (et de relief) avant d&apos;appliquer l&apos;éclairage. Cette option est son équivalent. Les objets affectés utilisent toujours les shaders.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option permet à l&apos;antialiasing à multiéchantillonnage (MSAA) de fonctionner avec le test alpha des mesh. Ceci produit un meilleur rendu des bords, sans pixélisation. Cette option peut affecter négativement les performances.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option active la génération douce des effets de particules. Cette technique adoucit l&apos;intersection entre chaque particule et les éléments de géométrie opaque à l&apos;aide d&apos;un fondu progressif entre les deux.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, le moteur réalise une simulation de couverture préservée des mipmaps (coverage-preserving mipmaps). Ceci empêche les mesh testés en transparence (alpha test) de diminuer en taille lorsqu&apos;ils s&apos;éloignent. En contrepartie, cette option tend à agrandir les mesh ayant déjà une couverture préservée des mipmaps. Référez-vous à l&apos;installation du contenu additionnel (mod) pour savoir quelle option est la mieux adaptée à celui-ci.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Expérimental ! Cette option empêche la pluie et la neige de tomber au travers des promontoires et des toits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Fog</source>
+        <translation>Brouillard</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si cette option est désactivée, le brouillard s&apos;épaissit linéairement avec la distance jusqu&apos;à atteindre le plan de coupure perpendiculaire à la caméra (clipping plane) à la distance de coupure. Ceci cause des distorsions sur les bords de l&apos;écran.&lt;/p&gt;&lt;p&gt;Si elle est activée, le brouillard utilise la distance de chaque objet avec la caméra (appelée distance euclidienne) pour calculer la densité de brouillard. Cette option rend le brouillard moins artificiel, particulièrement pour les larges champs de vision.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée, le moteur de jeu utilise une décroissance exponentielle de la visibilité due au brouillard.&lt;/p&gt;&lt;p&gt;Si elle est désactivée, il utilise une décroissance linéaire de la visibilité due au brouillard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée, le moteur de jeu réduit la visibilité du plan de coupure du brouillard en effectuant un fondu avec le ciel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fraction de la distance d&apos;affichage maximale à partir de laquelle le fondu avec le ciel commence.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Terrain</source>
+        <translation>Terrain</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option contrôle la taille apparente minimale que les objets doivent avoir pour être visibles à l&apos;écran. Le rapport entre la taille de l&apos;objet et sa distance à la caméra est comparé à cette valeur seuil. Plus cette valeur est faible, plus le nombre d&apos;objets visibles à l&apos;écran sera élevé.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée, le moteur utilise la pagination et différents niveau de détails (LOD) afin d&apos;afficher le terrain entier.&lt;/p&gt;&lt;p&gt;Si elle est désactivée, seul le terrain de jeu actif est affiché.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée, utilise la pagination des objets pour rendre l&apos;espace de jeu actif.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si cette option est activée, le moteur prend en charge les &quot;day night switch nodes&quot; des modèles 3D. Ceci permet de sélectionner entre jour et nuit l&apos;apparence de ces modèles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Post Processing</source>
+        <translation>Post-processing</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si cette option est activée, le post-traitement est lui aussi activé (les shaders de post-traitement sont configurables en jeu).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée, le moteur réalise une seconde passe de rendu des objets transparents, en forçant leur découpe par le canal alpha de leurs textures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option contrôle la vitesse selon laquelle l&apos;adaptation visuelle change d&apos;une image à la suivante. Une valeur faible correspond à une adaptation lente.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <source>Select your preferred audio device.</source>
+        <translation>Sélectionnez votre périphérique audio principal.</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Par défaut</translation>
+    </message>
+    <message>
+        <source>This setting controls HRTF, which simulates 3D sound on stereo systems.</source>
+        <translation>Cette option contrôle l&apos;HRTF, qui émule la spatialisation 3D du son pour un système stéréo.</translation>
+    </message>
+    <message>
+        <source>HRTF</source>
+        <translation>HRTF</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatique</translation>
+    </message>
+    <message>
+        <source>On</source>
+        <translation>Actif</translation>
+    </message>
+    <message>
+        <source>Select your preferred HRTF profile.</source>
+        <translation>Sélectionnez le profil HRTF qui vous convient le mieux.</translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation>Interface</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option agrandit ou diminue l&apos;interface utilisateur. Une valeur de 1 correspond à sa taille nominale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option permet d&apos;activer la durée de vie restante des effets magiques et des lampes. Cette durée restante s&apos;affiche en passant la souris au-dessus de l&apos;icône de l&apos;effet magique.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you&apos;re talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, les sujets de conversation de la fenêtre de dialogue auront des couleurs différentes si ceux-ci sont spécifiques au PNJ ou qu&apos;ils ont déjà été lus autre part. Ces couleurs peuvent être changées dans le fichier settings.cfg.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Size of characters in game texts.</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Taille des caractères des textes du jeu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option permet de zoomer en jeu sur la carte (carte locale et carte du monde).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si cette option est activée, les contenants compatibles avec &quot;Graphic Herbalism&quot; l&apos;utilisent, au lieu d&apos;ouvrir le menu de son contenu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, les bonus de dommages des flèches et des carreaux apparaissent dans l&apos;infobulle de l&apos;objet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, la portée et la rapidité d&apos;attaque des armes de mêlées apparaissent dans l&apos;infobulle de l&apos;objet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Étends les menus, les écrans de chargement et autres éléments d&apos;interface aux formats d&apos;image du jeu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque l&apos;option est activée, affiche les chances de succès d&apos;un enchantement dans le menu des enchantements.&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Empêche les marchands d&apos;équiper les objets qui leur sont vendus.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque l&apos;option est activée, les entraîneurs choisissent les compétences à entraîner en utilisant uniquement les points de compétences de base. Ceci permet d&apos;améliorer les compétences de marchandages de l&apos;entraîneur, sans que le marchandage devienne une compétence proposée.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation>Divers</translation>
+    </message>
+    <message>
+        <source>Saves</source>
+        <translation>Sauvegardes</translation>
+    </message>
+    <message>
+        <source>JPG</source>
+        <translation>JPG</translation>
+    </message>
+    <message>
+        <source>PNG</source>
+        <translation>PNG</translation>
+    </message>
+    <message>
+        <source>TGA</source>
+        <translation>TGA</translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation>Testeurs</translation>
+    </message>
+    <message>
+        <source>These settings are intended for testing mods and will cause issues if used for normal gameplay.</source>
+        <translation>Ces options sont destinées aux testeurs de contenus additionnels (mods). Ils poseront problème lors d&apos;une partie normale.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, OpenMW capture le curseur de la souris.&lt;/p&gt;&lt;p&gt;Lorsque le jeu est en mode &quot;Regard/Déplacement&quot;, OpenMW centre le curseur au milieu de l&apos;écran; sans tenir compte de cette option (le curseur/viseur est toujours au centre de la fenêtre d&apos;OpenMW).  Néanmoins, lorsqu&apos;un menu est ouvert, cette option permet de récupérer le contrôle de la souris. En effet, lorsque l&apos;option est active, le mouvement du curseur s&apos;arrête aux bords de la fenêtre et empêche d&apos;accéder à d&apos;autres applications. Tandis que, lorsque l&apos;option est désactivée, le curseur peut sortir librement de la fenêtre et accéder au bureau.&lt;/p&gt;&lt;p&gt;Cette option ne s&apos;applique pas à l&apos;écran lorsque la touche Échap a été enfoncée, dans ce cas, le curseur n&apos;est jamais capturé. Cette option n&apos;agit pas non plus sur &quot;Atl-Tab&quot; ou toute autre séquence de touches utilisée par le système d&apos;exploitation pour récupérer le contrôle du curseur de la souris. &lt;/p&gt;&lt;p&gt;Cette option interagit avec l&apos;option de minimisation de la fenêtre lors de la perte de focus en modifiant ce qui est considéré comme une perte de focus. Par exemple, avec une configuration à doubles écrans, il peut être plus agréable d&apos;accéder au second écran avec cette option désactivée.&lt;/p&gt;&lt;p&gt;Note aux développeurs : Il est préférable de désactiver cette option lorsque le jeu tourne dans un débogueur, ceci afin d&apos;empêcher le curseur de la souris de devenir inutilisable lorsque le jeu s&apos;arrête sur un breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Parcourir...</translation>
+    </message>
+    <message>
+        <source>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency between available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</source>
+        <translation>Les volumes de collision sont utilisés à la fois par la simulation de la physique du jeu et par la génération de mesh de navigation utilisé pour les choix d&apos;itinéraires. Les collisions cylindriques donnent la meilleure correspondance entre l&apos;itinéraire choisi et la capacité à les emprunter. Changer la valeur de cette option affecte la génération de mesh de navigation, dès lors les mesh de navigation précédemment mis en cache ne seront plus compatibles.</translation>
+    </message>
+    <message>
+        <source>Gameplay</source>
+        <translation>Jouabilité</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Si l&apos;option est activée, une munition magique est requise pour contourner la résistance ou la faiblesse normale d&apos;une arme.&lt;/p&gt;&lt;p&gt;Si l&apos;option est désactivée, une arme à distance magique ou une munition magique est requise.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Lorsque cette option est activée, elle permet aussi aux armes enchantées, non indiquées comme étant magique, de contourner la résistance de l&apos;arme, comme c&apos;est le cas dans le moteur original.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source> cells</source>
+        <translation>cellules</translation>
+    </message>
+    <message>
+        <source>Shadows</source>
+        <translation>Ombres</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Type de méthode utilisée pour calculer de &quot;compute scene bound&quot; (limite de scène). Le choix &quot;bordures&quot; (par défaut) donne un bon équilibre entre qualité des ombres et performances, &quot;primitives&quot; pour un meilleur rendu ou &quot;aucun&quot; pour éviter ce calcul.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;64 unités de jeu correspondent à 1 yard, c&apos;est-à-dire environ 0.9 m.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source> unit(s)</source>
+        <translation> unité(s)</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option affiche l&apos;ombre des PNJ et des créatures. Elle peut avoir un impact faible sur les performances.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>512</source>
+        <translation>512</translation>
+    </message>
+    <message>
+        <source>1024</source>
+        <translation>1024</translation>
+    </message>
+    <message>
+        <source>2048</source>
+        <translation>2048</translation>
+    </message>
+    <message>
+        <source>4096</source>
+        <translation>4096</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Fraction de la limite ci-dessus à partir de laquelle les ombres commencent à disparaître.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option affiche l&apos;ombre du personnage joueur. Elle pourrait avoir un impact très faible sur les performances.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;La résolution de chaque carte d&apos;ombre. Augmenter cette valeur, de façon importante, augmente la qualité des ombres, mais peut impliquer un impact mineur sur les performances.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Distance à la caméra à partir de laquelle les ombres disparaissent entièrement.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option affiche l&apos;ombre des objets. Elle peut avoir un impact significative sur les performances.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind&apos;s data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;À cause de certaines limitations avec les données de Morrowind, seuls les personnages et les créatures peuvent projeter une ombre en intérieur, ceci peut déconcerter certains joueurs.&lt;/p&gt;&lt;p&gt;Cette option n&apos;a aucun effet si les ombres des PNJ/créature et du personnage joueur n&apos;ont pas été activées.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option affiche l&apos;ombre des terrains. Elle peut avoir un impact faible sur les performances et la qualité des ombres.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Lighting</source>
+        <translation>Éclairage</translation>
+    </message>
+    <message>
+        <source>Tooltip</source>
+        <translation>Infobulles</translation>
+    </message>
+    <message>
+        <source>Crosshair</source>
+        <translation>Réticule de visée</translation>
+    </message>
+    <message>
+        <source>Screenshots</source>
+        <translation>Captures d&apos;écran</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Give actors an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option donne aux PNJ/créatures la capacité de nager en surface lorsqu&apos;ils suivent un autre acteur, indépendamment de leur capacité à nager. Elle fonctionne uniquement lorsque l&apos;utilisation des mesh de navigation pour le choix d&apos;itinéraire est activée.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;L&apos;effet réfléchi des sorts d&apos;absorption n&apos;est pas appliqué, comme dans le moteur original.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
+&lt;p&gt; &quot;Legacy&quot; always uses 8 lights per object. It provides results most similar to Morrowind&apos;s lighting.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (compatibility)&quot; removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Définit la gestion des sources lumineuses :&lt;/p&gt;
+&lt;p&gt;&quot;Traditionnelle&quot; Chaque objet est éclairé par 8 sources lumineuses. Cet méthode est la plus proche du jeu original.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (mode de compatibilité)&quot; supprime la limite des 8 sources lumineuses. Cette méthode permet d&apos;éclairer la végétation au sol. Ce choix est recommandé pour les ordinateurs plus anciens avec un nombre de sources lumineuses proche de 8.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders&quot; offre tous les bénéfices apportés par &quot;Shaders (mode de compatibilité)&quot;, mais utilise une approche moderne. Celle-ci permet, sur du matériel moderne, d&apos;augmenter le nombre de sources lumineuses par objet sans perte de performance.&quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <translation>Traditionnelle</translation>
+    </message>
+    <message>
+        <source>Shaders (compatibility)</source>
+        <translation>Shaders (mode de compatibilité)</translation>
+    </message>
+    <message>
+        <source>In third-person view, use the camera as the sound listener instead of the player character.</source>
+        <translation>En vue à la troisième personne, le jeu reproduit le son reçu par la caméra au lieu de celui reçu par tête du personnage joueur.</translation>
+    </message>
+    <message>
+        <source>Permanent Barter Disposition Changes</source>
+        <translation>Disposition au Marchandage permanente</translation>
+    </message>
+    <message>
+        <source>Classic Calm Spells Behavior</source>
+        <translation>Comportement d&apos;origine pour le sort d&apos;Apaisement</translation>
+    </message>
+    <message>
+        <source>NPCs Avoid Collisions</source>
+        <translation>Les PNJ évitent les collisions</translation>
+    </message>
+    <message>
+        <source>Soulgem Values Rebalance</source>
+        <translation>Rééquilibrage de la valeur des gemmes sprirituelles</translation>
+    </message>
+    <message>
+        <source>Day Night Switch Nodes</source>
+        <translation>Support des noeuds jour/nuit</translation>
+    </message>
+    <message>
+        <source>Followers Defend Immediately</source>
+        <translation>Les compagnons se défendent immédiatement</translation>
+    </message>
+    <message>
+        <source>Only Magical Ammo Bypass Resistance</source>
+        <translation>Seules les munitions contournent la résistance</translation>
+    </message>
+    <message>
+        <source>Graphic Herbalism</source>
+        <translation>Support de Graphic herbalism</translation>
+    </message>
+    <message>
+        <source>Swim Upward Correction</source>
+        <translation>Correction verticale de la nage</translation>
+    </message>
+    <message>
+        <source>Enchanted Weapons Are Magical</source>
+        <translation>Rendre magiques les armes enchantées</translation>
+    </message>
+    <message>
+        <source>Merchant Equipping Fix</source>
+        <translation>Correctif :  équipement des marchands</translation>
+    </message>
+    <message>
+        <source>Can Loot During Death Animation</source>
+        <translation>Pillage possible durant l&apos;animation de mort</translation>
+    </message>
+    <message>
+        <source>Classic Reflected Absorb Spells Behavior</source>
+        <translation>Comportement traditionnel de la réflexion des sorts d&apos;absorbtion</translation>
+    </message>
+    <message>
+        <source>Unarmed Creature Attacks Damage Armor</source>
+        <translation>L&apos;attaque des créatures non armées endomage les armures</translation>
+    </message>
+    <message>
+        <source>Affect Werewolves</source>
+        <translation>S&apos;applique aux loups garoux</translation>
+    </message>
+    <message>
+        <source>Do Not Affect Werewolves</source>
+        <translation>Ne s&apos;applique pas aux loups garoux</translation>
+    </message>
+    <message>
+        <source>Background Physics Threads</source>
+        <translation>Thread(s) d&apos;arrière plan dédié(s) à la physique</translation>
+    </message>
+    <message>
+        <source>Actor Collision Shape Type</source>
+        <translation>Volume de collison pour les personnages</translation>
+    </message>
+    <message>
+        <source>Axis-Aligned Bounding Box</source>
+        <translation>Volume englobant aligné à l&apos;axe</translation>
+    </message>
+    <message>
+        <source>Rotating Box</source>
+        <translation>Boite tournante</translation>
+    </message>
+    <message>
+        <source>Smooth Movement</source>
+        <translation>Mouvements lissés</translation>
+    </message>
+    <message>
+        <source>Use Additional Animation Sources</source>
+        <translation>Utiliser des sources d&apos;animations additionnelles</translation>
+    </message>
+    <message>
+        <source>Weapon Sheathing</source>
+        <translation>Arme rengainée</translation>
+    </message>
+    <message>
+        <source>Shield Sheathing</source>
+        <translation>Bouclier rengainé</translation>
+    </message>
+    <message>
+        <source>Player Movement Ignores Animation</source>
+        <translation>Le mouvement du personnage joueur ignore son animation</translation>
+    </message>
+    <message>
+        <source>Use Magic Item Animation</source>
+        <translation>Anime l&apos;utilisation d&apos;objets magique</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Normal Maps</source>
+        <translation>Utilisation auto des normal maps pour les objets</translation>
+    </message>
+    <message>
+        <source>Soft Particles</source>
+        <translation>Apparition douce des particules</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Specular Maps</source>
+        <translation>Utilisation auto des specular maps pour les objets</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Normal Maps</source>
+        <translation>Utilisation auto des normal maps pour le terrain</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Specular Maps</source>
+        <translation>Utilisation auto des specular maps pour le terrain</translation>
+    </message>
+    <message>
+        <source>Use Anti-Aliased Alpha Testing</source>
+        <translation>Utiliser l&apos;alpha testing pour l&apos;anti-aliasing</translation>
+    </message>
+    <message>
+        <source>Bump/Reflect Map Local Lighting</source>
+        <translation>Plaquage de rugosité/environnement sous lumière locale</translation>
+    </message>
+    <message>
+        <source>Weather Particle Occlusion</source>
+        <translation>Occlusion des particules liées à la météo</translation>
+    </message>
+    <message>
+        <source>Exponential Fog</source>
+        <translation>Brouillard exponentiel</translation>
+    </message>
+    <message>
+        <source>Radial Fog</source>
+        <translation>Brouillard radial</translation>
+    </message>
+    <message>
+        <source>Sky Blending Start</source>
+        <translation>Début du fondu du ciel</translation>
+    </message>
+    <message>
+        <source>Sky Blending</source>
+        <translation>Fondu du ciel</translation>
+    </message>
+    <message>
+        <source>Object Paging Min Size</source>
+        <translation>Taille min des objets pour leur pagination</translation>
+    </message>
+    <message>
+        <source>Viewing Distance</source>
+        <translation>Distance d&apos;affichage</translation>
+    </message>
+    <message>
+        <source>Distant Land</source>
+        <translation>Terrain distant</translation>
+    </message>
+    <message>
+        <source>Active Grid Object Paging</source>
+        <translation>Pagination pour l&apos;espace actif</translation>
+    </message>
+    <message>
+        <source>Transparent Postpass</source>
+        <translation>Passe de transparence différée</translation>
+    </message>
+    <message>
+        <source>Auto Exposure Speed</source>
+        <translation>Vitesse d&apos;auto-exposition</translation>
+    </message>
+    <message>
+        <source>Enable Post Processing</source>
+        <translation>Activer le post-traitement</translation>
+    </message>
+    <message>
+        <source>Shadow Planes Computation Method</source>
+        <translation>Méthode de calcul pour les plans d&apos;ombre</translation>
+    </message>
+    <message>
+        <source>Enable Actor Shadows</source>
+        <translation>Ombre des PNJ/créatures</translation>
+    </message>
+    <message>
+        <source>Fade Start Multiplier</source>
+        <translation>Début de l&apos;atténuation (multiplicateur)</translation>
+    </message>
+    <message>
+        <source>Enable Player Shadows</source>
+        <translation>Ombre du personnage joueur</translation>
+    </message>
+    <message>
+        <source>Shadow Map Resolution</source>
+        <translation>Résolution des crates d&apos;ombres</translation>
+    </message>
+    <message>
+        <source>Shadow Distance Limit:</source>
+        <translation>Limite de distance des ombres</translation>
+    </message>
+    <message>
+        <source>Enable Object Shadows</source>
+        <translation>Ombre des objets</translation>
+    </message>
+    <message>
+        <source>Enable Indoor Shadows</source>
+        <translation>Ombres en intérieur</translation>
+    </message>
+    <message>
+        <source>Enable Terrain Shadows</source>
+        <translation>Ombre des terrains</translation>
+    </message>
+    <message>
+        <source>Lighting Method</source>
+        <translation>Méthode d&apos;illumination</translation>
+    </message>
+    <message>
+        <source>Audio Device</source>
+        <translation>Périphérique audio</translation>
+    </message>
+    <message>
+        <source>HRTF Profile</source>
+        <translation>Profil HRTF</translation>
+    </message>
+    <message>
+        <source>Tooltip and Crosshair</source>
+        <translation>Infobulles et réticule de visée</translation>
+    </message>
+    <message>
+        <source>GUI Scaling Factor</source>
+        <translation>Échelle de l&apos;interface</translation>
+    </message>
+    <message>
+        <source>Show Effect Duration</source>
+        <translation>Afficher la durée des effets</translation>
+    </message>
+    <message>
+        <source>Change Dialogue Topic Color</source>
+        <translation>Changer la couleur des sujets de conversation</translation>
+    </message>
+    <message>
+        <source>Font Size</source>
+        <translation>Taille des polices</translation>
+    </message>
+    <message>
+        <source>Show Projectile Damage</source>
+        <translation>Afficher les dommages des projectiles</translation>
+    </message>
+    <message>
+        <source>Show Melee Info</source>
+        <translation>Afficher les infos de mêlée</translation>
+    </message>
+    <message>
+        <source>Stretch Menu Background</source>
+        <translation>Étendre les arrière-plans</translation>
+    </message>
+    <message>
+        <source>Show Owned Objects</source>
+        <translation>Afficher la possession des objets</translation>
+    </message>
+    <message>
+        <source>Show Enchant Chance</source>
+        <translation>Afficher les chances d&apos;enchantement</translation>
+    </message>
+    <message>
+        <source>Maximum Quicksaves</source>
+        <translation>Nombre maximum de sauvegardes rapides</translation>
+    </message>
+    <message>
+        <source>Screenshot Format</source>
+        <translation>Format des captures</translation>
+    </message>
+    <message>
+        <source>Grab Cursor</source>
+        <translation>Capturer le curseur</translation>
+    </message>
+    <message>
+        <source>Default Cell</source>
+        <translation>la cellule par défaut</translation>
+    </message>
+    <message>
+        <source>Bounds</source>
+        <translation>bordures</translation>
+    </message>
+    <message>
+        <source>Primitives</source>
+        <translation>primitives</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>aucune</translation>
+    </message>
+    <message>
+        <source>Always Allow Actors to Follow over Water</source>
+        <translation>Toujours permettre aux PNJ/créatures à vous suivre sur l&apos;eau</translation>
+    </message>
+    <message>
+        <source>Racial Variation in Speed Fix</source>
+        <translation>Correction de la variation raciale pour la vitesse</translation>
+    </message>
+    <message>
+        <source>Use Navigation Mesh for Pathfinding</source>
+        <translation>Utiliser les mesh de navigation pour la recherche d&apos;itinéraires</translation>
+    </message>
+    <message>
+        <source>Trainers Choose Offered Skills by Base Value</source>
+        <translation>Entraîneurs : choix de compétences à partir des valeurs de base</translation>
+    </message>
+    <message>
+        <source>Steal from Knocked out Actors in Combat</source>
+        <translation>Vol possible aux PNJ/créatures évanouies en combat</translation>
+    </message>
+    <message>
+        <source>Factor Strength into Hand-to-Hand Combat</source>
+        <translation>Multiplicateur de force pour le combat à mains nues</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls the behavior of factoring of Strength attribute into hand-to-hand damage: damage is multiplied by Strength value divided by 40.&lt;/p&gt;&lt;p&gt;Can apply to all actors or only to non-werewolf actors.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ce paramètre contrôle le comportement de l&apos;attribut Force pour les dommages en combat à main nue: les dommages sont multipliés par la Force puis divisés par 40.&lt;/p&gt;&lt;p&gt;Il peut s&apos;appliquer à tous les acteurs, ou uniquement aux acteurs non-loups-garous.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Turn to Movement Direction</source>
+        <translation>Se tourner en direction du mouvement</translation>
+    </message>
+    <message>
+        <source>Adjust Coverage for Alpha Test</source>
+        <translation>Ajuster la couverture pour l&apos;alpha test</translation>
+    </message>
+    <message>
+        <source>Use the Camera as the Sound Listener</source>
+        <translation>Utiliser le son arrivant à la caméra</translation>
+    </message>
+    <message>
+        <source>Can Zoom on Maps</source>
+        <translation>Permettre le zoom sur la carte</translation>
+    </message>
+    <message>
+        <source>Notify on Saved Screenshot</source>
+        <translation>Notifier l&apos;enregistrement des captures d&apos;écran</translation>
+    </message>
+    <message>
+        <source>Skip Menu and Generate Default Character</source>
+        <translation>Passer le menu principal et générer un personnage standard</translation>
+    </message>
+    <message>
+        <source>Start Default Character at</source>
+        <translation>Placer le personnage par défaut dans</translation>
+    </message>
+    <message>
+        <source>Run Script After Startup:</source>
+        <translation>Script à lancer après démarrage :</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/launcher_ru.ts b/files/lang/launcher_ru.ts
new file mode 100644
index 0000000000..879f24dc76
--- /dev/null
+++ b/files/lang/launcher_ru.ts
@@ -0,0 +1,1466 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>DataFilesPage</name>
+    <message>
+        <source>Content Files</source>
+        <translation>Файлы данных</translation>
+    </message>
+    <message>
+        <source>Data Directories</source>
+        <translation>Директории данных</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and append them at the end of the list.</source>
+        <translation>Автоматически определить в директории потенциальные директории данных и добавить их в конец списка.</translation>
+    </message>
+    <message>
+        <source>Append</source>
+        <translation>Добавить</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and insert them above the selected position</source>
+        <translation>Автоматически определить в директории потенциальные директории данных и вставить их выше выбранной позиции</translation>
+    </message>
+    <message>
+        <source>Insert Above</source>
+        <translation>Вставить выше</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position up</source>
+        <translation>Переместить выбранную директорию на одну позицию вверх</translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation>Переместить выше</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position down</source>
+        <translation>Переместить выбранную директорию на одну позицию вниз</translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation>Переместить ниже</translation>
+    </message>
+    <message>
+        <source>Remove selected directory</source>
+        <translation>Удалить выбранную директорию</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Archive Files</source>
+        <translation>Архивы</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position up</source>
+        <translation>Переместить выбранный архив на одну позицию вверх</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position down</source>
+        <translation>Переместить выбранный архив на одну позицию вниз</translation>
+    </message>
+    <message>
+        <source>Navigation Mesh Cache</source>
+        <translation>Кэш навигационной сетки</translation>
+    </message>
+    <message>
+        <source>Generate navigation mesh cache for all content. Will be used by the engine to make cell loading faster.</source>
+        <translation>Создать кэш навигационной сетки для всего текущего контента. Кэш будет использован движком для ускорения загрузки локаций.</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation>Обновить</translation>
+    </message>
+    <message>
+        <source>Cancel navigation mesh generation. Already processed data will be saved.</source>
+        <translation>Отменить создание кэша навигационной сетки. Уже обработанные данные будут сохранены.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Отменить</translation>
+    </message>
+    <message>
+        <source>Remove Unused Tiles</source>
+        <translation>Удалить неиспользуемые тайлы</translation>
+    </message>
+    <message>
+        <source>Max Size</source>
+        <translation>Максимальный размер</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> МБ</translation>
+    </message>
+    <message>
+        <source>Content List</source>
+        <translation>Список плагинов</translation>
+    </message>
+    <message>
+        <source>Select a content list</source>
+        <translation>Выбрать список плагинов</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Новый список плагинов</translation>
+    </message>
+    <message>
+        <source>&amp;New Content List</source>
+        <translation>&amp;Новый список плагинов</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Создать копию списка плагинов</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Удалить список плагинов</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <source>Check Selection</source>
+        <translation>Включить выбранное</translation>
+    </message>
+    <message>
+        <source>Uncheck Selection</source>
+        <translation>Отключить выбранное</translation>
+    </message>
+    <message>
+        <source>Refresh Data Files</source>
+        <translation>Обновить файлы данных</translation>
+    </message>
+    <message>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: content files that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Подсказка: файлы данных, не включенные в текущий список, &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;выделены&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: directories that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Подсказка: директории, не включенные в текущий список, &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;выделены&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: archives that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Подсказка: архивы, не включенные в текущий список, &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;выделены&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>GraphicsPage</name>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Особое:</translation>
+    </message>
+    <message>
+        <source>Standard:</source>
+        <translation>Стандартное:</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Полный экран</translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen</source>
+        <translation>Оконный без полей</translation>
+    </message>
+    <message>
+        <source>Windowed</source>
+        <translation>Оконный</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Отключена</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Включена</translation>
+    </message>
+    <message>
+        <source>Adaptive</source>
+        <translation>Адаптивная</translation>
+    </message>
+    <message>
+        <source> FPS</source>
+        <translation> кадров в секунду</translation>
+    </message>
+    <message>
+        <source> × </source>
+        <translation> × </translation>
+    </message>
+    <message>
+        <source>Screen</source>
+        <translation>Экран</translation>
+    </message>
+    <message>
+        <source>Window Mode</source>
+        <translation>Режим окна</translation>
+    </message>
+    <message>
+        <source>Framerate Limit</source>
+        <translation>Максимум кадров в секунду</translation>
+    </message>
+    <message>
+        <source>Window Border</source>
+        <translation>Рамка окна</translation>
+    </message>
+    <message>
+        <source>Resolution</source>
+        <translation>Разрешение экрана</translation>
+    </message>
+    <message>
+        <source>Anti-Aliasing</source>
+        <translation>Сглаживание</translation>
+    </message>
+    <message>
+        <source>Vertical Synchronization</source>
+        <translation>Вертикальная синхронизация</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Morrowind Installation Wizard</source>
+        <translation>Мастер установки Morrowind</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Запустить &amp;Мастер установки Morrowind</translation>
+    </message>
+    <message>
+        <source>Morrowind Settings Importer</source>
+        <translation>Импорт настроек из Morrowind</translation>
+    </message>
+    <message>
+        <source>File to Import Settings From:</source>
+        <translation>Импортировать настройки из файла:</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Выбрать...</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Импортировать список подключенных аддонов и плагинов</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Шрифты, поставляемые с оригинальной игрой, становятся размытыми при масштабировании интерфейса и поддерживают ограниченное количество символов,
+поэтому в комплекте с OpenMW идет набор шрифтов, не имеющих этих проблем. Они используют технологию TrueType и весьма похожи на шрифты Morrowind.
+Включите эту опцию, если вы все равно хотите использовать оригинальные шрифты вместо шрифтов OpenMW, или если вы используете сторонние растровые шрифты.</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts</source>
+        <translation>Импортировать растровые шрифты</translation>
+    </message>
+    <message>
+        <source>Run &amp;Settings Importer</source>
+        <translation>Запустить &amp;импорт настроек</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::DataFilesPage</name>
+    <message>
+        <source>Select Directory</source>
+        <translation>Выбор директории</translation>
+    </message>
+    <message>
+        <source>English</source>
+        <translation>Английский</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Французский</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Немецкий</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Итальянский</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Польский</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Русский</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Испанский</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Новый список плагинов</translation>
+    </message>
+    <message>
+        <source>Content List name:</source>
+        <translation>Название списка плагинов:</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Создать копию списка</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Удалить список плагинов</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation>Вы уверены, что хотите удалить &lt;b&gt;%1&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Will be added to the current profile</source>
+        <translation>Будет добавлена в текущий профиль</translation>
+    </message>
+    <message>
+        <source>Contains content file(s)</source>
+        <translation>Содержит файл(ы) данных</translation>
+    </message>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Включить выбранные</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Отключить выбранные</translation>
+    </message>
+    <message>
+        <source>Resolved as %1</source>
+        <translation>Путь разрешен как %1</translation>
+    </message>
+    <message>
+        <source>This is the data-local directory and cannot be disabled</source>
+        <translation>Это директория data-loсal, и она не может быть отключена</translation>
+    </message>
+    <message>
+        <source>This directory is part of OpenMW and cannot be disabled</source>
+        <translation>Это директория является частью OpenMW и не может быть отключена</translation>
+    </message>
+    <message>
+        <source>This directory is enabled in an openmw.cfg other than the user one</source>
+        <translation>Это директория включена в openmw.cfg, не являющемся пользовательским</translation>
+    </message>
+    <message>
+        <source>This archive is enabled in an openmw.cfg other than the user one</source>
+        <translation>Этот архив включен в openmw.cfg, не являющемся пользовательским</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation>&amp;Скопировать пути в буфер обмена</translation>
+    </message>
+    <message>
+        <source>&amp;Open Path in File Explorer</source>
+        <translation>&amp;Открыть путь в диспетчере файлов</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::GraphicsPage</name>
+    <message>
+        <source>Error receiving number of screens</source>
+        <translation>Не удалось получить количество экранов</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Вызов SDL_GetNumVideoDisplays завершился с ошибкой:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Screen </source>
+        <translation>Экран </translation>
+    </message>
+    <message>
+        <source>Error receiving resolutions</source>
+        <translation>Не удалось получить доступные разрешения экрана</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Вызов SDL_GetDisplayMode завершился с ошибкой:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::ImportPage</name>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Не удалось записать данные в файл с настройками OpenMW</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Файл с настройками Morrowind (*.ini)</translation>
+    </message>
+    <message>
+        <source>Importer finished</source>
+        <translation>Импорт завершен</translation>
+    </message>
+    <message>
+        <source>Failed to import settings from INI file.</source>
+        <translation>Не удалось импортировать настройки из INI-файла.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open or create %1 for writing &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось открыть %1 для записи &lt;/b&gt;&lt;/p&gt; &lt;p&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::MainDialog</name>
+    <message>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <source>Launch OpenMW</source>
+        <translation>Запустить OpenMW</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Справка</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Не удалось открыть файл с настройками OpenMW</translation>
+    </message>
+    <message>
+        <source>First run</source>
+        <translation>Первый запуск</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Запустить &amp;Мастер установки</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation>Пропустить</translation>
+    </message>
+    <message>
+        <source>OpenMW %1 release</source>
+        <translation>OpenMW версии %1</translation>
+    </message>
+    <message>
+        <source>OpenMW development (%1)</source>
+        <translation>OpenMW ревизии %1</translation>
+    </message>
+    <message>
+        <source>Compiled on %1 %2</source>
+        <translation>Дата сборки: %1 %2</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind installation</source>
+        <translation>Не удалось найти установленный Morrowind</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard...</source>
+        <translation>Запустить &amp;Мастер установки...</translation>
+    </message>
+    <message>
+        <source>Error reading OpenMW configuration files</source>
+        <translation>Не удалось открыть файлы с настройками OpenMW</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Не удалось записать данные в файл с настройками OpenMW</translation>
+    </message>
+    <message>
+        <source>Error writing user settings file</source>
+        <translation>Не удалось сохранить данные в файл с пользовательскими настройками</translation>
+    </message>
+    <message>
+        <source>Error writing Launcher configuration file</source>
+        <translation>Не удалось сохранить данные в файл с настройками лаунчера</translation>
+    </message>
+    <message>
+        <source>No game file selected</source>
+        <translation>Файл игры не выбран</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Welcome to OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;It is recommended to run the Installation Wizard.&lt;/p&gt;&lt;p&gt;The Wizard will let you select an existing Morrowind installation, or install Morrowind for OpenMW to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Добро пожаловать в OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Рекомендуется запустить Мастер установки.&lt;/p&gt;&lt;p&gt;Мастер позволит вам выбрать существующую установку Morrowind или же установить Morrowind для использования его OpenMW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Не удалось открыть %0 для чтения:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Не удалось открыть %0 для чтения&lt;/b&gt;&lt;br&gt;&lt;br&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find the Data Files location&lt;/b&gt;&lt;br&gt;&lt;br&gt;The directory containing the data files was not found.</source>
+        <translation>&lt;br&gt;&lt;b&gt;Не удалось определить местоположение Data Files&lt;/b&gt;&lt;br&gt;&lt;br&gt;Не удалось найти директорию с файлами данных.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;The problem may be due to an incomplete installation of OpenMW.&lt;br&gt;Reinstalling OpenMW may resolve the problem.&lt;br&gt;</source>
+        <translation>&lt;br&gt;Проблема могла возникнуть из-за неполной установки OpenMW.&lt;br&gt;Возможно, переустановка OpenMW поможет решить проблему.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open or create %0 for writing&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Не удалось создать %0 или открыть его для записи&lt;/b&gt;&lt;br&gt;&lt;br&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;You do not have a game file selected.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW will not start without a game file selected.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;У вас не выбрана игра.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW не может быть запущен без файла игры.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory: code %0</source>
+        <translation>Не удалось создать директорию для настроек OpenMW: код ошибки %0</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not create directory %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Не удалось создать директорию %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::SettingsPage</name>
+    <message>
+        <source>Text file (*.txt)</source>
+        <translation>Текстовый файл (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OpenMW Launcher</source>
+        <translation>Лаунчер OpenMW</translation>
+    </message>
+    <message>
+        <source>OpenMW version</source>
+        <translation>Версия OpenMW</translation>
+    </message>
+    <message>
+        <source>toolBar</source>
+        <translation>toolBar</translation>
+    </message>
+    <message>
+        <source>Data Files</source>
+        <translation>Файлы</translation>
+    </message>
+    <message>
+        <source>Allows to setup data files and directories</source>
+        <translation>Позволяет выбрать файлы и директории с данными</translation>
+    </message>
+    <message>
+        <source>Allows to change display settings</source>
+        <translation>Позволяет настроить экран</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <source>Allows to tweak engine settings</source>
+        <translation>Позволяет настроить движок</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Импорт</translation>
+    </message>
+    <message>
+        <source>Allows to import data from original engine</source>
+        <translation>Позволяет импортировать данные из оригинального движка</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation>Экран</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Выбор файла с настройками</translation>
+    </message>
+    <message>
+        <source>Select script file</source>
+        <translation>Выбор файла скрипта</translation>
+    </message>
+</context>
+<context>
+    <name>SelectSubdirs</name>
+    <message>
+        <source>Select directories you wish to add</source>
+        <translation>Выберите директории, которые хотите добавить</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Делает изменение отношения торговцев к персонажу игрока из-за торговли постоянным.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Permanent Barter Disposition Changes</source>
+        <translation>Постоянная смена отношения торговцев</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Немедленно вводить спутников персонажа игрока в бой с противниками, начавшими бой с ними или персонажем игрока. Если настройка отключена, они не вступят в бой до первой атаки от противников или игрока.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Followers Defend Immediately</source>
+        <translation>Спутники защищаются сразу</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Позволяет эффекту Отнять запас сил снижать запас сил до отрицательных значений, по аналогии с эффектом Уменьшить запас сил.&lt;/p&gt;&lt;p&gt;Это означает, что в отличие от Morrowind с помощью этого эффекта можно заставить персонажа потерять сознание.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Uncapped Damage Fatigue</source>
+        <translation>Отнять запас сил без ограничений</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Предотвращает вступление в бой персонажей, подвергнутых эффектам Усмирения, каждый кадр - как в Morrowind без MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Classic Calm Spells Behavior</source>
+        <translation>Классическое поведение Усмирения</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Делает стоимость заполненных камней душ зависимой только от силы души.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Soulgem Values Rebalance</source>
+        <translation>Ребаланс стоимости камней душ</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Делает так, чтобы персонаж плыл немного вверх относительно камеры в режиме от третьего лица. Предназначено для того, чтобы было проще плыть по поверхности воды без погружения в нее.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Swim Upward Correction</source>
+        <translation>Коррекция при плавании вверх</translation>
+    </message>
+    <message>
+        <source>Enchanted Weapons Are Magical</source>
+        <translation>Зачарованное оружие - магическое</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Разрешает карманные кражи у персонажей без сознания в бою.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Эффекты отраженных заклинаний Поглощения не отзеркаливаются - как в Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Classic Reflected Absorb Spells Behavior</source>
+        <translation>Классическое поведение Поглощения</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когда включено, NPC пытаются избегать столкновения с другими персонажами.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>NPCs Avoid Collisions</source>
+        <translation>Персонажи избегают столкновения</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don&apos;t use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Не учитывать множитель веса расы при вычислении скорости перемещения.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Racial Variation in Speed Fix</source>
+        <translation>Фикс влияния веса рас на Скорость</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor&apos;s script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когда эта настройка включена, игрок может обыскивать тела персонажей (например, призванных существ) во время анимации их смерти, если они не находятся в бою. Если при этом игрок убрал тело, то нам приходится сразу увеличивать счетчик количества погибших и запускать скрипт удаленного персонажа.&lt;/p&gt;&lt;p&gt;Когда эта настройка отключена, игроку всегда придется ждать завершения анимации смерти. В основном предотвращает эксплойт с призванными существами (сбор дорогого оружия с дремор и золотых святых). Конфликтует с модами на манекены, которые используют команду SkipAnim для предотвращения завершения анимации смерти.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Can Loot During Death Animation</source>
+        <translation>Обыск тел во время анимации смерти</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Give actors an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Позволяет любым персонажам плыть возле поверхности воды, чтобы следовать за другим персонажем, вне зависимости от того, могут они плыть, или нет. Работает только с навигационной сеткой.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Позволяет атакам существ без оружия повреждать броню цели, по аналогии с атаками оружием.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Unarmed Creature Attacks Damage Armor</source>
+        <translation>Атаки существ повреждают броню</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>Отключено</translation>
+    </message>
+    <message>
+        <source>Affect Werewolves</source>
+        <translation>Включая оборотней</translation>
+    </message>
+    <message>
+        <source>Do Not Affect Werewolves</source>
+        <translation>Не включая оборотней</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Определяет, сколько фоновых потоков будет создано для физических вычислений. При значении 0 все вычисления будут происходить в основном потоке.&lt;/p&gt;&lt;p&gt;Для значений больше 1 нужно, чтобы библиотека Bullet была скомпилирована с поддержкой многопоточности.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency between available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</source>
+        <translation>Форма объектов столкновений, используемых для физики и поиска путей с помощью навигационной сетки. Цилиндры дают лучшую совместимость между поиском путей и возможностью двигаться по ним. Изменение значения этой настройки влияет на создание навигационной сетки, поэтому сетка, сгенерированная с одним значением, не может быть использована для другого.</translation>
+    </message>
+    <message>
+        <source>Axis-Aligned Bounding Box</source>
+        <translation>Параллелепипед</translation>
+    </message>
+    <message>
+        <source>Rotating Box</source>
+        <translation>Вращающийся параллелепипед</translation>
+    </message>
+    <message>
+        <source>Cylinder</source>
+        <translation>Цилиндр</translation>
+    </message>
+    <message>
+        <source>Visuals</source>
+        <translation>Графика</translation>
+    </message>
+    <message>
+        <source>Animations</source>
+        <translation>Анимации</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Использовать анимации сотворения заклинаний для магических предметов, по аналогии с заклинаниями.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Use Magic Item Animation</source>
+        <translation>Анимации магических предметов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled - makes transitions between different animations/poses much smoother. Also allows to load animation blending config YAML files that can be bundled with animations in order to customise blending styles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если настройка включена, она делает переходы между различными анимациями/позами намного глаже. Кроме того, она позволяет загружать YAML-файлы конфигураций смешивания анимаций, которые могут быть включены с анимациями, чтобы настроить стили смешивания.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Smooth Animation Transitions</source>
+        <translation>Плавные переходы между анимациями</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Делает перемещение персонажей более плавным. Рекомендуется использовать совместно с настройкой &quot;Поворот в направлении движения&quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Smooth Movement</source>
+        <translation>Плавное перемещение</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Загружать KF-файлы и файлы скелетов из директории Animations&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Use Additional Animation Sources</source>
+        <translation>Использовать источники анимаций</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character&apos;s body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Влияет на перемещение по диагонали и в сторону. Включение этой настройки делает перемещение более реалистичным.&lt;/p&gt;&lt;p&gt;При ее выключении тело персонажа всегда целиком направлено в направлении движения. Так как в игре нет анимаций для движения по диагонали, из-за этого получается скольжение.&lt;/p&gt;&lt;p&gt;Когда настройка включена, только ноги персонажа поворачиваются в направлении движения. Верхняя часть тела поворачивается частично. Голова всегда смотрит в одном направлении с камерой. В бою этот режим работает только для движения по диагонали, вне боя он также влияет на движение влево и вправо. Также во время плавания тело персонажа поворачивается в направлении движения.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Turn to Movement Direction</source>
+        <translation>Поворот в направлении движения</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Отображать зачехленное оружие (с колчанами и ножнами). Требует ресурсы из модов.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Weapon Sheathing</source>
+        <translation>Зачехление оружия</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Отображать щиты на спине. Требует ресурсы из модов.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shield Sheathing</source>
+        <translation>Зачехление щитов</translation>
+    </message>
+    <message>
+        <source>Shaders</source>
+        <translation>Шейдеры</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see &apos;normal map pattern&apos;, e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когда эта настройка включена, карты нормалей автоматически распознаются и используются, если у них правильное название
+                  (см. настройку &apos;normal map pattern&apos;, например, для базовой текстуры foo.dds, карта нормалей должна иметь название foo_n.dds).
+                  Когда настройка отключена, карты используются, только если они явно заданы в модели (.nif или .osg). Влияет на объекты.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Normal Maps</source>
+        <translation>Карты нормалей объектов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See &apos;auto use object normal maps&apos;. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;См. &apos;Карты нормалей объектов&apos;. Влияет на ландшафт.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Normal Maps</source>
+        <translation>Карты нормалей ландшафта</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see &apos;specular map pattern&apos;, e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когда эта настройка включена, спекулярные карты автоматически распознаются и используются, если у них правильное название
+                  (см. настройку &apos;specular map pattern&apos;, например, для базовой текстуры foo.dds,
+                  спекулярная карта должна иметь название foo_spec.dds).
+                  Когда настройка отключена, карты используются, только если они явно заданы в модели
+                  (.osg-моделях, они не поддерживаются в .nif-моделях). Влияет на объекты.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Specular Maps</source>
+        <translation>Спекулярные карты объектов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern &apos;terrain specular map pattern&apos; exists, use that file as a &apos;diffuse specular&apos; map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если существует файл с маской, заданной с помощью настройки &apos;terrain specular map pattern&apos; то он будет использоваться в качестве спекулярной карты. Он должен представлять собой текстуру, содержащую цвет слоя в RGB-канале и мощность спекулярного освещения в альфа-канале.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Specular Maps</source>
+        <translation>Спекулярные карты ландшафта</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren&apos;t affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Обычно освещение не должно влиять на карты окружения, из-за чего объекты с картами окружения (в том числе объекты с рельефными текстурами) светятся в темноте.
+                  Morrowind Code Patch предоставляет способ обойти эту проблему, применяя карты окружения перед применением освещения, аналогично этой опции.
+                  Объекты с картами окружения будут использовать шейдеры.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Bump/Reflect Map Local Lighting</source>
+        <translation>Локальное освещение карт отражений</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Позволяет MSAA работать с моделями с альфа-тестированием, что позволяет улучшить отображение граней и избежать их пикселизации. Может снизить производительность.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Use Anti-Aliased Alpha Testing</source>
+        <translation>Сглаживание альфа-тестирования</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Смягчение систем частиц. Эта техника смягчает пересечения между отдельными частицами и непрозрачными объектами с помощью их смешения.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Эмуляция сохранения покрытия в MIP-картах, чтобы модели с альфа-тестированием не усыхали по мере удаления от камеры. Однако если MIP-карты на уровне самих текстур уже созданы с сохранением покрытия, покрытие будет расти по мере удаления от камеры, так что читайте инструкции к вашим модам.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Adjust Coverage for Alpha Test</source>
+        <translation>Покрытие альфа-тестирования</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ЭКСПЕРИМЕНТАЛЬНАЯ НАСТРОЙКА: Предотвращает отображение падающих капель дождя и снежинок под крышами.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Fog</source>
+        <translation>Туман</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;По умолчанию туман становится плотнее по мере удаления от плоскости отсечения (которая находится на расстоянии дистанции обзора от камеры), из-за чего могут быть графические артефакты возле края экрана.
+                    С этой настройкой плотность тумана для объекта зависит от расстояния от камеры до объекта (т.н. евклидово расстояние), благодаря чему туман выглядит не так искусственно, особенно при большом поле зрения.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Radial Fog</source>
+        <translation>Радиальный туман</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Использование экспоненциальной формулы для тумана. По умолчанию используется линейный туман.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Exponential Fog</source>
+        <translation>Экспоненциальный туман</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Снизить видимость плоскости отсечения с помощью смешения объектов с небом.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Sky Blending</source>
+        <translation>Смешивать с небом</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>Множитель расстояния обзора, определяющий начало смешения.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Sky Blending Start</source>
+        <translation>Минимальное расстояние смешения</translation>
+    </message>
+    <message>
+        <source>Terrain</source>
+        <translation>Ландшафт</translation>
+    </message>
+    <message>
+        <source>Viewing Distance</source>
+        <translation>Расстояние обзора</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Определяет, насколько большим должен быть объект, чтобы отображаться на удаленном ландшафте. Для этого размер объекта делится на его расстояние до камеры, и результат сравнивается со значением этой настройки. Чем меньше значение, тем больше объектов будет отображаться в сцене.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Object Paging Min Size</source>
+        <translation>Минимальный размер склеиваемых объектов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когда включено, на удаленном ландшафте будут отображаться объекты, склеенные вместе с помощью специального алгоритма. Когда выключено, будет отображаться только сам ландшафт.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Distant Land</source>
+        <translation>Удаленный ландшафт</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Склеивать объекты в активных ячейках.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Active Grid Object Paging</source>
+        <translation>Склеивание в активных ячейках</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если эта настройка включена, модели с поддержкой переключения в зависимости от времени суток будут ее использовать.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Day Night Switch Nodes</source>
+        <translation>Переключение узлов дня и ночи</translation>
+    </message>
+    <message>
+        <source>Post Processing</source>
+        <translation>Постобработка</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если эта настройка включена, то будет включена постобработка графики.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Enable Post Processing</source>
+        <translation>Включить постобработку</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Отрисовывать прозрачные объекты заново - со строгой границей прозрачности.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Transparent Postpass</source>
+        <translation>Дополнительный проход для прозрачных объектов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Определяет, насколько быстро может меняться эффект аккомодации глаза от кадра к кадру. Более низкие значения означают более медленные преобразования.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Auto Exposure Speed</source>
+        <translation>Скорость автоматической экспозиции</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Звук</translation>
+    </message>
+    <message>
+        <source>Select your preferred audio device.</source>
+        <translation>Выберите предпочитаемое звуковое устройство.</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>По умолчанию</translation>
+    </message>
+    <message>
+        <source>This setting controls HRTF, which simulates 3D sound on stereo systems.</source>
+        <translation>Эта настройка отвечает за HRTF, симулирующий объемный звук в стереосистемах.</translation>
+    </message>
+    <message>
+        <source>HRTF</source>
+        <translation>HRTF</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Автоматически</translation>
+    </message>
+    <message>
+        <source>On</source>
+        <translation>Включено</translation>
+    </message>
+    <message>
+        <source>Select your preferred HRTF profile.</source>
+        <translation>Выберите предпочитаемый вами профиль HRTF.</translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation>Интерфейс</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Эта настройка отвечает за масштабирование окон внутриигрового интерфейса. Значение 1.0 соответствует нормальному размеру интерфейса.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>GUI Scaling Factor</source>
+        <translation>Масштаб интерфейса</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когда настройка включена, в подсказке, всплывающей при наведении курсора на иконку магического эффекта, будет отображаться оставшаяся длительность магического эффекта или источника света.&lt;/p&gt;&lt;p&gt;По умолчанию настройка отключена.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Show Effect Duration</source>
+        <translation>Показывать длительность эффектов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you&apos;re talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если эта настройка включена, у тем диалогов будет другой цвет, если у вашего собеседника есть уникальная реплика по заданной теме, или же если вы уже видели текст темы. Цвета могут быть настроены через settings.cfg.&lt;/p&gt;&lt;p&gt;По умолчанию настройка отключена.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Change Dialogue Topic Color</source>
+        <translation>Смена цвета тем для диалогов</translation>
+    </message>
+    <message>
+        <source>Size of characters in game texts.</source>
+        <translation>Размер символов в текстах.</translation>
+    </message>
+    <message>
+        <source>Font Size</source>
+        <translation>Размер шрифтов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Включить возможность масштабирования на локальной и глобальной картах.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Can Zoom on Maps</source>
+        <translation>Включить масштабирование карты</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если эта настройка включена, контейнеры, поддерживающие графический гербализм, будут использовать его вместо открытия меню контейнера.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если эта настройка включена, на всплывающих подсказках стрел и болтов будет показан их бонус к урону.&lt;/p&gt;&lt;p&gt;По умолчанию настройка выключена.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Show Projectile Damage</source>
+        <translation>Показывать урон снарядов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если эта настройка включена, на всплывающих подсказках оружия ближнего боя будут показаны его дальность и скорость атаки.&lt;/p&gt;&lt;p&gt;По умолчанию настройка выключена.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Show Melee Info</source>
+        <translation>Показывать информацию об оружии</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Растягивать фон меню, экранов загрузки и т.д., чтобы изображение соответствовало соотношению сторон выбранного разрешения экрана.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Stretch Menu Background</source>
+        <translation>Растягивать фон меню</translation>
+    </message>
+    <message>
+        <source>Show Owned Objects</source>
+        <translation>Выделять объекты с владельцами</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Показывать шанс успеха в меню зачарования, или же нет.&lt;/p&gt;&lt;p&gt;По умолчанию настройка выключена.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Show Enchant Chance</source>
+        <translation>Показывать шанс успеха зачарования</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Предотвращает экипировку торговцами предметов, которые им проданы.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Merchant Equipping Fix</source>
+        <translation>Фикс экипировки предметов торговцами</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Учителя выбирают навыки, которым учат, по базовым значениям навыка, благодаря чему моды могут использовать эффекты на усиление навыка торговли, не делая его предлагаемым навыком.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation>Разное</translation>
+    </message>
+    <message>
+        <source>Saves</source>
+        <translation>Сохранения</translation>
+    </message>
+    <message>
+        <source>JPG</source>
+        <translation>JPG</translation>
+    </message>
+    <message>
+        <source>PNG</source>
+        <translation>PNG</translation>
+    </message>
+    <message>
+        <source>TGA</source>
+        <translation>TGA</translation>
+    </message>
+    <message>
+        <source>Notify on Saved Screenshot</source>
+        <translation>Уведомление при сохранении снимка</translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation>Отладка</translation>
+    </message>
+    <message>
+        <source>These settings are intended for testing mods and will cause issues if used for normal gameplay.</source>
+        <translation>Эти настройки предназначены для отладки модов, и при их использовании для нормального игрового процесса возникнут проблемы.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когда эта настройка включена, OpenMW будет управлять курсором мыши.&lt;/p&gt;&lt;p&gt;В “режиме обзора”, OpenMW будет захватывать курсор в центре экрана вне зависимости от значения этой настройки (потому что курсор всегда расположен по центру в окне OpenMW). Однако в режиме меню эта настройка определяет поведение выхода курсора за пределы окна OpenMW. Если настройка включена, курсор остановится на краю окна, предотвращая доступ к другим приложениям. Если выключена, курсор может свободно перемещаться по рабочему столу.&lt;/p&gt;&lt;p&gt;Эта настройка не применяется к экрану, на котором нажата клавиша “Escape” (там курсор никогда не захватывается). Вне зависимости от значения этой настройки “Alt-Tab” и некоторые другие зависимые от операционной системы комбинации клавиш могут быть использованы, чтобы вернуть управление курсором операционной системе. Эта настройка также взаимодействует с настройкой &quot;minimize on focus loss&quot;, определяя, что именно считать потерей фокуса. На системах с двумя экранами может быть проще получить доступ ко второму экрану, если настройка выключена.&lt;/p&gt;&lt;p&gt;Замечание для разработчиков: лучше запускать игру с отключенной настройкой при запуске игры через отладчик, чтобы курсор не становился недоступен, когда игра останавливается на точке останова.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Grab Cursor</source>
+        <translation>Захватывать курсор</translation>
+    </message>
+    <message>
+        <source>Skip Menu and Generate Default Character</source>
+        <translation>Пропустить меню и создать персонажа по умолчанию</translation>
+    </message>
+    <message>
+        <source>Start Default Character at</source>
+        <translation>Запустить с персонажем по умолчанию в локации</translation>
+    </message>
+    <message>
+        <source>Default Cell</source>
+        <translation>по умолчанию</translation>
+    </message>
+    <message>
+        <source>Run Script After Startup:</source>
+        <translation>Запустить скрипт после запуска:</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Выбрать…</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;When enabled, a navigation mesh is built in the background for world geometry to be used for pathfinding. When disabled only the path grid is used to build paths. Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn&apos;t know where to go when you stand behind that stone and cast a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;Когда настройка включена, в фоне создаются навигационные меши для геометрии игрового мира. Когда она отключена, то используются только путевые точки из игровых файлов. На однопоточных системах включенный навигатор может значительно снизить скорость смены локаций. На многопоточных системах влияние на производительность незначительное. Также на многопоточных системах задержки могут зависеть от других настроек или производительности системы. Передвижение по открытому миру, а также вход в локации и выход из них могут привести к обновлению кэша. Персонажи могут не иметь возможности найти путь вокруг них, пока обновление не будет завершено. Можете попробовать отключить навигатор, если вы предпочитаете старомодный ИИ, который не знает, как до вас добраться, пока вы стоите за камнем и колдуете огненные стрелы.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Use Navigation Mesh for Pathfinding</source>
+        <translation>Использовать навигационную сетку</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;В режиме вида от третьего лица камера перемещается согласно анимациям движения персонажа игрока. Включение этой настройки отключает это поведение, убирая зависимость движения персонажа игрока от состояния его анимаций. Такое поведение было в OpenMW версии 0.48 и ранее.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Player Movement Ignores Animation</source>
+        <translation>Движение игрока обходит анимации</translation>
+    </message>
+    <message>
+        <source>Gameplay</source>
+        <translation>Игровой процесс</translation>
+    </message>
+    <message>
+        <source>Always Allow Actors to Follow over Water</source>
+        <translation>Позволить всем следовать по воде</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если настройка включена, для обхода сопротивления или уязвимости к обычному оружию необходимо, чтобы снаряд был магическим. Если выключена, то магическим для этого может быть как снаряд, так и оружие дальнего боя.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Only Magical Ammo Bypass Resistance</source>
+        <translation>Обычные снаряды не обходят сопротивление</translation>
+    </message>
+    <message>
+        <source>Graphic Herbalism</source>
+        <translation>Графический гербализм</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Разрешает зачарованному оружию без флага Магическое обходить сопротивление обычному оружию, как в Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Trainers Choose Offered Skills by Base Value</source>
+        <translation>Учителя выбирают базовые навыки</translation>
+    </message>
+    <message>
+        <source>Steal from Knocked out Actors in Combat</source>
+        <translation>Кража у персонажей без сознания в бою</translation>
+    </message>
+    <message>
+        <source>Factor Strength into Hand-to-Hand Combat</source>
+        <translation>Учет Силы в рукопашном бою</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls the behavior of factoring of Strength attribute into hand-to-hand damage: damage is multiplied by Strength value divided by 40.&lt;/p&gt;&lt;p&gt;Can apply to all actors or only to non-werewolf actors.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Настройка определяет поведение учета атрибута Сила в рукопашном уроне: урон умножается на его значение, разделенное на 40.&lt;/p&gt;&lt;p&gt;Может быть применено ко всем персонажам или же только персонажам, не являющимся оборотнями.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Background Physics Threads</source>
+        <translation>Количество фоновых потоков для физики</translation>
+    </message>
+    <message>
+        <source>Actor Collision Shape Type</source>
+        <translation>Форма объекта столкновений для персонажей</translation>
+    </message>
+    <message>
+        <source>Soft Particles</source>
+        <translation>Мягкие частицы</translation>
+    </message>
+    <message>
+        <source>Weather Particle Occlusion</source>
+        <translation>Окклюзия погодных частиц</translation>
+    </message>
+    <message>
+        <source> cells</source>
+        <translation> ячеек</translation>
+    </message>
+    <message>
+        <source>Shadows</source>
+        <translation>Тени</translation>
+    </message>
+    <message>
+        <source>Bounds</source>
+        <translation>По границам объектов</translation>
+    </message>
+    <message>
+        <source>Primitives</source>
+        <translation>По примитивам</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Отключено</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Определяет используемый тип вычисления границ сцены. Вычисление по границам объектов (по умолчанию) дает хороший баланс между производительностью и качеством теней, вычисление по примитивам улучшает качество теней, а еще можно полностью отключить вычисление.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shadow Planes Computation Method</source>
+        <translation>Метод определения границ для теней</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 игровых единицы соответствуют одному ярду (примерно 0.9 м)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source> unit(s)</source>
+        <translation> единиц(ы)</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Включить тени от NPC и существ, кроме персонажа игрока. Может незначительно снизить производительность.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Enable Actor Shadows</source>
+        <translation>Включить тени от персонажей</translation>
+    </message>
+    <message>
+        <source>512</source>
+        <translation>512</translation>
+    </message>
+    <message>
+        <source>1024</source>
+        <translation>1024</translation>
+    </message>
+    <message>
+        <source>2048</source>
+        <translation>2048</translation>
+    </message>
+    <message>
+        <source>4096</source>
+        <translation>4096</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Множитель от расстояния выше, при котором тени начнут плавно угасать.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Fade Start Multiplier</source>
+        <translation>Множитель начала угасания теней</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Включить тени от персонажа игрока. Может очень незначительно снизить производительность.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Enable Player Shadows</source>
+        <translation>Включить тени от персонажа игрока</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Разрешение отдельных теневых карт. Увеличение значения улучшает качество теней, но может незначительно снизить производительность.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shadow Map Resolution</source>
+        <translation>Разрешение теневой карты</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Расстояние от камеры, при достижении которого тени полностью исчезают.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shadow Distance Limit:</source>
+        <translation>Максимальная дистанция теней:</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Включить тени от объектов. Может значительно снизить производительность.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Enable Object Shadows</source>
+        <translation>Включить тени от объектов</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind&apos;s data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Из-за ограничений в файлах Morrowind, только персонажи могут отбрасывать тени в интерьерах, что может раздражать.&lt;/p&gt;&lt;p&gt;Не имеет эффекта, если тени от персонажей отключены.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Enable Indoor Shadows</source>
+        <translation>Включить тени в интерьерах</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Включить тени от ландшафта (включая удаленный ландшафт). Может значительно снизить производительность и качество теней.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Enable Terrain Shadows</source>
+        <translation>Включить тени от ландшафта</translation>
+    </message>
+    <message>
+        <source>Lighting</source>
+        <translation>Освещение</translation>
+    </message>
+    <message>
+        <source>Lighting Method</source>
+        <translation>Способ освещения</translation>
+    </message>
+    <message>
+        <source>Audio Device</source>
+        <translation>Звуковое устройство</translation>
+    </message>
+    <message>
+        <source>HRTF Profile</source>
+        <translation>Профиль HRTF</translation>
+    </message>
+    <message>
+        <source>Tooltip</source>
+        <translation>Всплывающая подсказка</translation>
+    </message>
+    <message>
+        <source>Crosshair</source>
+        <translation>Прицел</translation>
+    </message>
+    <message>
+        <source>Tooltip and Crosshair</source>
+        <translation>Всплывающая подсказка и прицел</translation>
+    </message>
+    <message>
+        <source>Maximum Quicksaves</source>
+        <translation>Количество быстрых сохранений</translation>
+    </message>
+    <message>
+        <source>Screenshots</source>
+        <translation>Снимки экрана</translation>
+    </message>
+    <message>
+        <source>Screenshot Format</source>
+        <translation>Формат снимков экрана</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
+&lt;p&gt; &quot;Legacy&quot; always uses 8 lights per object. It provides results most similar to Morrowind&apos;s lighting.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (compatibility)&quot; removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Задает способ обработки источников света.&lt;/p&gt;
+&lt;p&gt; &quot;Устаревший&quot; всегда использует 8 источников света на объект и выдает освещение, наиболее близкое к таковому в оригинальной игре.&lt;/p&gt;
+&lt;p&gt;&quot;Шейдеры (режим совместимости)&quot; убирает ограничение в 8 источников света. Этот режим также позволяет освещению влиять на анимированную траву. Рекомендуется использовать этот режим на устаревшем аппаратном обеспечении и с количеством источников света на объект около 8.&lt;/p&gt;
+&lt;p&gt; &quot;Шейдеры&quot; работает аналогично режиму &quot;Шейдеры (режим совместимости)&quot; но использует более современный подход, позволяющий использовать большее количество источников света с минимальным влиянием на производительность на современном аппаратном обеспечении.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <translation>Устаревший</translation>
+    </message>
+    <message>
+        <source>Shaders (compatibility)</source>
+        <translation>Шейдеры (режим совместимости)</translation>
+    </message>
+    <message>
+        <source>In third-person view, use the camera as the sound listener instead of the player character.</source>
+        <translation>Использовать в виде от третьего лица положение камеры, а не персонажа игрока для прослушивания звуков.</translation>
+    </message>
+    <message>
+        <source>Use the Camera as the Sound Listener</source>
+        <translation>Использовать камеру как слушателя</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/launcher_sv.ts b/files/lang/launcher_sv.ts
new file mode 100644
index 0000000000..f2cca2346c
--- /dev/null
+++ b/files/lang/launcher_sv.ts
@@ -0,0 +1,1470 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv_SE">
+<context>
+    <name>DataFilesPage</name>
+    <message>
+        <source>Content Files</source>
+        <translation>Innehållsfiler</translation>
+    </message>
+    <message>
+        <source>Data Directories</source>
+        <translation>Datakataloger</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and append them at the end of the list.</source>
+        <translation>Skanna kataloger för troliga datakataloger och lägg till dem i slutet på listan.</translation>
+    </message>
+    <message>
+        <source>Append</source>
+        <translation>Lägg till</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and insert them above the selected position</source>
+        <translation>Skanna kataloger för troliga datakataloger och lägg till dem ovanför den markerade positionen</translation>
+    </message>
+    <message>
+        <source>Insert Above</source>
+        <translation>Lägg till ovanför</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position up</source>
+        <translation>Flytta markerad katalog en position upp</translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation>Flytta upp</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position down</source>
+        <translation>Flytta markerad katalog en position ner</translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation>Flytta ner</translation>
+    </message>
+    <message>
+        <source>Remove selected directory</source>
+        <translation>Ta bort markerad katalog</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Ta bort</translation>
+    </message>
+    <message>
+        <source>Archive Files</source>
+        <translation>Arkivfiler</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position up</source>
+        <translation>Flytta markerat arkiv en position upp</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position down</source>
+        <translation>Flytta markerat arkiv en position ner</translation>
+    </message>
+    <message>
+        <source>Navigation Mesh Cache</source>
+        <translation>Cache för navigeringsmesh</translation>
+    </message>
+    <message>
+        <source>Generate navigation mesh cache for all content. Will be used by the engine to make cell loading faster.</source>
+        <translation>Generera navigeringsmesh för allt innehåll. Kommer användas av motorn för att ladda celler snabbare.</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation>Uppdatera</translation>
+    </message>
+    <message>
+        <source>Cancel navigation mesh generation. Already processed data will be saved.</source>
+        <translation>Avbryt generering av navigationsmesh. Redan processad data kommer sparas.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Content List</source>
+        <translation>Innehållslista</translation>
+    </message>
+    <message>
+        <source>Select a content list</source>
+        <translation>Välj en innehållslista</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Ny innehållslista</translation>
+    </message>
+    <message>
+        <source>&amp;New Content List</source>
+        <translation>&amp;Ny innehållslista</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Klona innehållslista</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Radera innehållslista</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <source>Check Selection</source>
+        <translation>Kryssa markering</translation>
+    </message>
+    <message>
+        <source>Uncheck Selection</source>
+        <translation>Avkryssa markering</translation>
+    </message>
+    <message>
+        <source>Refresh Data Files</source>
+        <translation>Uppdatera datafiler</translation>
+    </message>
+    <message>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: content files that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Notera: innehållsfiler som inte är del av aktuell innehållslista är &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;markerade&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: directories that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Notera: kataloger som inte är del av aktuell innehållslista är &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;markerade&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: archives that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Notera: arkiv som inte är del av aktuell innehållslista är &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;markerade&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Remove Unused Tiles</source>
+        <translation>Ta bort oanvända celler</translation>
+    </message>
+    <message>
+        <source>Max Size</source>
+        <translation>Maximal storlek</translation>
+    </message>
+</context>
+<context>
+    <name>GraphicsPage</name>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Egen:</translation>
+    </message>
+    <message>
+        <source>Standard:</source>
+        <translation>Standard:</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Helskärm</translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen</source>
+        <translation>Helskärm i fönsterläge</translation>
+    </message>
+    <message>
+        <source>Windowed</source>
+        <translation>Fönster</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Inaktiverad</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Aktiverad</translation>
+    </message>
+    <message>
+        <source>Adaptive</source>
+        <translation>Adaptiv</translation>
+    </message>
+    <message>
+        <source> FPS</source>
+        <translation> FPS</translation>
+    </message>
+    <message>
+        <source> × </source>
+        <translation> × </translation>
+    </message>
+    <message>
+        <source>Screen</source>
+        <translation>Skärm</translation>
+    </message>
+    <message>
+        <source>Resolution</source>
+        <translation>Upplösning</translation>
+    </message>
+    <message>
+        <source>Window Mode</source>
+        <translation>Fönsterläge</translation>
+    </message>
+    <message>
+        <source>Framerate Limit</source>
+        <translation>Gränsvärde bilduppdateringsfrekvens</translation>
+    </message>
+    <message>
+        <source>Window Border</source>
+        <translation>Fönster, ram</translation>
+    </message>
+    <message>
+        <source>Anti-Aliasing</source>
+        <translation>Kantutjämning</translation>
+    </message>
+    <message>
+        <source>Vertical Synchronization</source>
+        <translation>Vertikal synkronisering</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>Form</source>
+        <translatorcomment>Can be translated in different ways depending on context. Will return to later.</translatorcomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind Installation Wizard</source>
+        <translation>Installationsguide för Morrowind</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Kör &amp;Installationsguide</translation>
+    </message>
+    <message>
+        <source>Morrowind Settings Importer</source>
+        <translation>Inställningsimporterare för Morrowind</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Fonter som kommer med ordinarie spelmotor är suddiga med gränssnittsuppskalning och stödjer bara ett litet antal tecken,
+så OpenMW tillhandahåller andra fonter för att undvika dessa problem. Dessa fonter använder TrueType-teknologi och är ganska lika
+de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordinarie fonter istället för OpenMWs, alternativt om du använder egna bitmapfonter.</translation>
+    </message>
+    <message>
+        <source>Run &amp;Settings Importer</source>
+        <translation>Kör &amp;Inställningsimporterare</translation>
+    </message>
+    <message>
+        <source>File to Import Settings From:</source>
+        <translation>Fil att importera inställningar från:</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts</source>
+        <translation>Importera bitmapfonter</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Importera tillägg- och pluginmarkeringar</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::DataFilesPage</name>
+    <message>
+        <source>English</source>
+        <translation>Engelska</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Franska</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Tyska</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Italienska</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Polska</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Ryska</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Spanska</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Ny innehållslista</translation>
+    </message>
+    <message>
+        <source>Content List name:</source>
+        <translation>Namn på innehållslista:</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Klona innehållslista</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation>Välj katalog</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Radera innehållslista</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation>Är du säker på att du vill radera &lt;b&gt;%1&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Radera</translation>
+    </message>
+    <message>
+        <source>Contains content file(s)</source>
+        <translation>Innehåller innehållsfil(er)</translation>
+    </message>
+    <message>
+        <source>Will be added to the current profile</source>
+        <translation>Kommer läggas till nuvarande profil</translation>
+    </message>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Kryssa markerade</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Avkryssa markerade</translation>
+    </message>
+    <message>
+        <source>Resolved as %1</source>
+        <translation>Löst som %1</translation>
+    </message>
+    <message>
+        <source>This is the data-local directory and cannot be disabled</source>
+        <translation>Det här är den data-lokala katalogen och kan inte inaktiveras</translation>
+    </message>
+    <message>
+        <source>This directory is part of OpenMW and cannot be disabled</source>
+        <translation>Denna katalog är en del av OpenMW och kan inte inaktiveras</translation>
+    </message>
+    <message>
+        <source>This directory is enabled in an openmw.cfg other than the user one</source>
+        <translation>Denna katalog är aktiverad i en annan openmw.cfg än användarens</translation>
+    </message>
+    <message>
+        <source>This archive is enabled in an openmw.cfg other than the user one</source>
+        <translation>Detta arkiv är aktiverat i en annan openmw.cfg än användarens</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation>&amp;Kopiera sökväg(ar) till klippbordet</translation>
+    </message>
+    <message>
+        <source>&amp;Open Path in File Explorer</source>
+        <translation>Öppna katalogen i filutforskaren</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::GraphicsPage</name>
+    <message>
+        <source>Error receiving number of screens</source>
+        <translation>Det gick inte att ta emot antalet skärmar</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays misslyckades:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Screen </source>
+        <translation>Skärm </translation>
+    </message>
+    <message>
+        <source>Error receiving resolutions</source>
+        <translation>Det gick inte att ta emot upplösningar</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes misslyckades:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode misslyckades:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::ImportPage</name>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Det gick inte att skriva en OpenMW-konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Morrowind konfigurationsfil (*.ini)</translation>
+    </message>
+    <message>
+        <source>Importer finished</source>
+        <translation>Importeraren klar</translation>
+    </message>
+    <message>
+        <source>Failed to import settings from INI file.</source>
+        <translation>Misslyckades att importera inställningar från INI-fil.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open or create %1 for writing &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte öppna eller skapa %1 för att skriva &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Kontrollera att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::MainDialog</name>
+    <message>
+        <source>Close</source>
+        <translation>Stäng</translation>
+    </message>
+    <message>
+        <source>Launch OpenMW</source>
+        <translation>Starta OpenMW</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Hjälp</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle öppnas</translation>
+    </message>
+    <message>
+        <source>First run</source>
+        <translation>Första körning</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Kör &amp;Installationsguide</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation>Hoppa över</translation>
+    </message>
+    <message>
+        <source>OpenMW %1 release</source>
+        <translation>OpenMW version %1</translation>
+    </message>
+    <message>
+        <source>OpenMW development (%1)</source>
+        <translation>OpenMW utvecklarversion (%1)</translation>
+    </message>
+    <message>
+        <source>Compiled on %1 %2</source>
+        <translation>Kompilerad den %1 %2</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind installation</source>
+        <translation>Kunde inte hitta Morrowindinstallation</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard...</source>
+        <translation>Kör &amp;Installationsguide...</translation>
+    </message>
+    <message>
+        <source>Error reading OpenMW configuration files</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle läsas</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle skrivas&gt;</translation>
+    </message>
+    <message>
+        <source>Error writing user settings file</source>
+        <translation>Fel när användarinställningsfil skulle skrivas</translation>
+    </message>
+    <message>
+        <source>Error writing Launcher configuration file</source>
+        <translation>Fel när Startarens-konfigurationsfil skulle skrivas</translation>
+    </message>
+    <message>
+        <source>No game file selected</source>
+        <translation>Ingen spelfil vald</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Welcome to OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;It is recommended to run the Installation Wizard.&lt;/p&gt;&lt;p&gt;The Wizard will let you select an existing Morrowind installation, or install Morrowind for OpenMW to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Välkommen till OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Det är rekommenderat att du kör Installationsguiden.&lt;/p&gt;&lt;p&gt;Installationsguiden låter dig välja en befintlig Morrowindinstallation eller installera Morrowind för OpenMW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte öppna %0 för läsning:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Se till att du har rätt behörigheter och försök igen.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte öppna %0 för läsning&lt;/b&gt;&lt;br&gt;&lt;br&gt;Se till att du har rätt behörigheter och försök igen.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find the Data Files location&lt;/b&gt;&lt;br&gt;&lt;br&gt;The directory containing the data files was not found.</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte hitta Data Files-platsen&lt;/b&gt;&lt;br&gt;&lt;br&gt;Katalogen som innehåller datafilerna hittades inte.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;The problem may be due to an incomplete installation of OpenMW.&lt;br&gt;Reinstalling OpenMW may resolve the problem.&lt;br&gt;</source>
+        <translation>&lt;br&gt;Problemet kan bero på en ofullständig installation av OpenMW.&lt;br&gt;Ominstallation av OpenMW kan lösa problemet.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open or create %0 for writing&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte öppna eller skapa %0 för att skriva&lt;/b&gt;&lt;br&gt;&lt;br&gt;Se till att du har rätt behörigheter och försök igen.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;You do not have a game file selected.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW will not start without a game file selected.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Du har ingen spelfil markerad.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW kan inte starta utan en spelfil markerad.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory: code %0</source>
+        <translation>Kunde inte skapa konfigurationskatalog för OpenMW: kod %0</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not create directory %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte skapa katalog %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::SettingsPage</name>
+    <message>
+        <source>Text file (*.txt)</source>
+        <translation>Textfil (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OpenMW Launcher</source>
+        <translation>OpenMW Startare</translation>
+    </message>
+    <message>
+        <source>OpenMW version</source>
+        <translation>OpenMW version</translation>
+    </message>
+    <message>
+        <source>toolBar</source>
+        <translation>toolBar</translation>
+    </message>
+    <message>
+        <source>Data Files</source>
+        <translation>Datafiler</translation>
+    </message>
+    <message>
+        <source>Allows to setup data files and directories</source>
+        <translation>Låter dig ställa in datafiler och kataloger</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Inställningar</translation>
+    </message>
+    <message>
+        <source>Allows to tweak engine settings</source>
+        <translation>Låter dig justera spelmotorinställningar</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Importera</translation>
+    </message>
+    <message>
+        <source>Allows to import data from original engine</source>
+        <translation>Låter dig importera data från originalmotorn</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation>Bild</translation>
+    </message>
+    <message>
+        <source>Allows to change display settings</source>
+        <translation>Låter dig ändra bildinställningar</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Välj konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>Select script file</source>
+        <translation>Välj skriptfil</translation>
+    </message>
+</context>
+<context>
+    <name>SelectSubdirs</name>
+    <message>
+        <source>Select directories you wish to add</source>
+        <translation>Välj kataloger du vill lägga till</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör dispositionsändring av handlare orsakad av handel permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att följare och eskorter till spelaren själva påbörjar strid med fiender som påbörjat strid med dem eller spelaren. Annars kommer de vänta tills fienden eller spelaren har attackerat dem först.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att &quot;Damage Fatigue&quot;-magieffekten blir obegränsad såsom &quot;Drain Fatigue&quot;-effekten.&lt;/p&gt;&lt;p&gt;Det innebär att du, till skillnad från i Morrowind, kommer kunna slå ner figurer till marken med denna effekt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Uncapped Damage Fatigue</source>
+        <translation>Obegränsad &quot;Damage Fatigue&quot;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avbryter strid med icke-spelbara figurer påverkade av &quot;Calm&quot;-besvjärjelser varje bildruta – såsom i Morrowind utan MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör värderingen av fyllda &quot;Soulgems&quot; endast baserad på själens magnitud.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Får spelaren att simma något uppåt från siktlinjen. Endast applicerat på tredjepersonsperspektivet. Avsett att göra simning enklare.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör det möjligt att stjäla föremål från icke-spelbara figurer som är avsvimmade.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;When enabled, a navigation mesh is built in the background for world geometry to be used for pathfinding. When disabled only the path grid is used to build paths. Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn&apos;t know where to go when you stand behind that stone and cast a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;Om aktiv kommer en en navigeringsmesh av världsgeometrin byggas i bakgrunden som används för pathfinding. Om inaktiv kommer endast pathgrid användas för att bygga vägar. Enkelkärnade processorer kan få kraftigt försämrad prestanda. Kan påverka prestandan på flerkärniga processorer något. Flerkärniga processorer kan ha olika fördröjning för att uppdatera navigeringsmesh. Förflyttning mellan externa världar och att gå in eller ut ur en plats producerar en uppdatering av navigeringsmesh. Icke-spelbara figurer kan inte hitta vägar innan navigeringsmesh har skapats runt om dem. Testa att inaktivera denna funktion om du vill ha en mer gammaldags AI som inte vet var den ska gå när du står bakom den där stenen och skjuter ett eldklot.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om aktiverat kommer icke-spelbara figurer göra undanmanövrar för att undvika kollisioner med andra.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don&apos;t use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ta inte med varelsers vikt i beräkningen av hastighet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor&apos;s script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är aktiv tillåts spelaren plundra figurer (exempelvis tillkallade varelser) under deras dödsanimation, om de inte är i strid.&lt;/p&gt;&lt;p&gt;Om inställningen är inaktiv måste spelaren vänta tills dödsanimationen är slut. Detta gör det mycket svårare att exploatera tillkallade varelser (exempelvis plundra Draemoror eller Golden Saints för att få dyrbara vapen). Inställningen är i konflikt med skyltdocks-moddar som använder SkipAnim för att förhindra avslutning av dödsanimationer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att obeväpnade varelseattacker kan reducera rustningars skick, precis som attacker från icke-spelbara figurer och beväpnade varelser.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>Av</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Antalet exekveringstrådar som kommer användas för att beräkna fysikuppdateringar i bakgrunden.&lt;/p&gt;&lt;p&gt;Ett värde högre än 1 kräver att Bullet-biblioteket är kompilerat med multithreading-stöd.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Cylinder</source>
+        <translation>Cylinder</translation>
+    </message>
+    <message>
+        <source>Visuals</source>
+        <translation>Visuellt</translation>
+    </message>
+    <message>
+        <source>Animations</source>
+        <translation>Animationer</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Använd animationer för magiska föremål, precis som för besvärjelser.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör spelarens och icke-spelbara figurers rörelser mjukare. Rekommenderas att användas tillsammans med &quot;vänd mot rörelseriktningen&quot; aktiverad.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ladda per-grupp KF-filer och skelettfiler från Animations-katalogen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character&apos;s body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Påverkar sido- och diagonalförflyttningar. Förflyttningar blir mer realistiska om aktiv.&lt;/p&gt;&lt;p&gt;Om aktiv kommer spelarrollfiguren vända underkroppen i rikting mot förflyttningen. Överkroppen vänds delvis. Huvudet pekar alltid dit kameran ser. I stidsläge fungerar det bara för diagonal förflyttning. Utanför strid ändrar inställningen förflyttningar rakt höger och vänster också. Inställningen vänder också hela kroppen upp eller ner vid simning enligt förflyttningsriktningen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rendera hölstrade vapen (med koger och vapenslidor), kräver moddat innehåll.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rendera hölstrade sköldar, kräver moddat innehåll.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;I tredjepersonsperspektiv kommer kameran svänga efter spelarens förflyttningsanimationer. Detta var det förvalda beteendet i OpenMW 0.48.0 och tidigare.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shaders</source>
+        <translation>Shader</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see &apos;normal map pattern&apos;, e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om funktionen är aktiv kommer normalkartor (normal maps) att hittas och användas automatiskt om de har korrekt namn
+                  (se &apos;normal map pattern&apos;, t.ex. för en bastextur foo.dds ska normalkartan heta foo_n.dds).
+                  Om funktionen är inaktiverad kommer normalkartor bara användas om texturerna är explicit listade i 3D-modell-filen (.nif eller .osg fil). Påverkar objekt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See &apos;auto use object normal maps&apos;. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Se &apos;autoanvänd normalkartor (normal maps) på objekt&apos;. Påverkar terräng.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see &apos;specular map pattern&apos;, e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om den här funktionen är aktiverad kommer spekularitetskartor (specular maps) att hittas och användas 
+                  (see &apos;specular map pattern&apos;, t.ex. för en bastextur foo.dds,
+                  ska spekularitetskartan heta foo_spec.dds).
+                  Om funktionen är inaktiverad kommer normalkartor bara användas om texturerna är explicit listade i 3D-modell-filen 
+                  (.nif eller .osg fil). Påverkar objekt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern &apos;terrain specular map pattern&apos; exists, use that file as a &apos;diffuse specular&apos; map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om en fil med mönstret &apos;terrain specular map pattern&apos; finns, använd den filen som en &apos;diffuse specular&apos;-karta. Texturen måste innehålla färglagren i RGB-kanalerna (som vanligt) och spekularitet i alfakanalen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren&apos;t affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normalt sett påverkas omgivningskartors reflektioner inte av ljus, vilket gör att omgivningskartor (och således så kallade bump mappade objekt) glöder i mörkret.
+                  Morrowind Code Patch inkluderar en inställning att kringå detta genom att lägga omgivningskartor före ljussättningen. Det här är motsvarigheten till den inställningen.
+                  Påverkade objekt kommer använda shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att MSAA fungerar med alfa-testade modeller, vilket ger snyggare kanter utan synliga pixlar. Kan påverka prestandan negativt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktiverar mjuka partiklar på partikeleffekter. Denna teknik mjukar upp övergången mellan individuella partiklar och annan ogenomskinlig geometri genom att smälta samman dem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulerar mip maps med coverage-preserving för att förhindra att alfa-testade modeller krymper när de kommer längre bort. Kommer göra att dessa modeller växer istället; se instruktioner i modinstallationen för hur detta ska ställas in.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTELLT: Förhindra att regn och snö faller genom tak och överhäng.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Fog</source>
+        <translation>Dimma</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Som standard blir dimman tätare proportionellt med ditt avstånd till avklippningsdistansen, vilket ger distortion vid skärmens kanter.
+                    Denna inställning gör att dimman använder det faktiska ögonpunktsavståndet (så kallat euklidiskt avstånd) för att beräkna dimman, vilket får dimman att se mindre artificiell ut, särskilt vid hög FoV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Använd exponentiell formel för dimma. Som standard används linjär dimma.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reducera synligheten av avklippsplanet genom att smälta samman objekt med himmelen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fraktionen av det maximala avståndet där utsmetning mellan himmel och horisont påbörjas.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Terrain</source>
+        <translation>Terräng</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bestämmer hur stort ett objekt måste vara för att vara synligt på skärmen. Objektets storlek divideras med sitt avstånd till kameran. Resultatet av denna division jämförs med detta värde. Ju mindre värdet är, desto fler objekt kommer du se i scenen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om aktiverat används paging och LOD-algoritmer för att rita upp all terräng. Om inaktiverat visas endast terrängen i den laddade cellen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Använd objekt-paging för aktiva cellers rutnät.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om den här inställningen är aktiv kommer modeller med stöd för det att använda dag- och natt-bytesnoder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Post Processing</source>
+        <translation>Efterbehandling</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer efterbehandling (post processing) att vara aktiverat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Återrendera transparenta objekt med forcerad alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bestämmer hur mycket ögonanpassningen kan förändras från bildruta till bildruta. Lägre värden ger långsammare övergångar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Ljud</translation>
+    </message>
+    <message>
+        <source>Select your preferred audio device.</source>
+        <translation>Välj din föredragna ljudenhet.</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Förvalt</translation>
+    </message>
+    <message>
+        <source>This setting controls HRTF, which simulates 3D sound on stereo systems.</source>
+        <translation>Denna inställning kontrollerar HRTF, vilket simulerar 3D-ljud på stereosystem.</translation>
+    </message>
+    <message>
+        <source>HRTF</source>
+        <translation>HRTF</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatisk</translation>
+    </message>
+    <message>
+        <source>On</source>
+        <translation>På</translation>
+    </message>
+    <message>
+        <source>Select your preferred HRTF profile.</source>
+        <translation>Välj din föredragna HRTF-profil.</translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation>Gränssnitt</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Denna inställning skalar grafiska fönster i gränssnittet. Ett värde på 1.0 ger den normala skalan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Visar den återstående tiden för magiska effekter och ljus om denna inställning är på. Den återstående tiden visas som en inforuta när muspekaren befinner sig över den magiska effekten. &lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you&apos;re talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer dialogämnen ha en annan färg om ämnet är specifikt till den icke-spelbara figur du pratar med eller om ämnet redan har setts. Färger kan ändras i settings.cfg.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Size of characters in game texts.</source>
+        <translation>Storlek på tecken i speltext.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera zoomning på lokala och globala kartor.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer behållare som stödjer grafisk örtplockning (graphic herbalism) använda den funktionen istället för att öppna menyn.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer skadebonus från pilar visas på föremålens inforuta.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer närstridsvapens räckvidd och hastighet att visas på föremåls inforuta.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sträck ut menyer, laddskärmar o.s.v. till fönstrets aspektratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Huruvida chansen att lyckas kommer visas i förtrollningsmenyn.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Förhindrar att handlare tar på sig föremål som säljs till dem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tränare väljer nu endast de färdigheter som kan tränas genom att använda deras basfärdighetsvärde, vilket tillåter förbättring av merkantil utan att göra merkantil till en erbjuden färdighet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation>Diverse</translation>
+    </message>
+    <message>
+        <source>Saves</source>
+        <translation>Sparfiler</translation>
+    </message>
+    <message>
+        <source>JPG</source>
+        <translation>JPG</translation>
+    </message>
+    <message>
+        <source>PNG</source>
+        <translation>PNG</translation>
+    </message>
+    <message>
+        <source>TGA</source>
+        <translation>TGA</translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation>Testning</translation>
+    </message>
+    <message>
+        <source>These settings are intended for testing mods and will cause issues if used for normal gameplay.</source>
+        <translation>Dessa inställningar är avsedda för att testa moddar och kommer orsaka problem vid normalt spelande.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW kommer ta kontroll av muspekaren om denna inställning är aktiverad.&lt;/p&gt;&lt;p&gt;I ”tittläge” kommer OpenMW centrera muspekaren oavsett värdet på denna inställning (eftersom muspekaren/hårkorset alltid är centrerat i OpenMW-fönstret). I gränssnittsläge däremot kommer denna inställning bedöma beteendet när muspekaren flyttas utanför OpenMW-fönstret. Om på kommer muspekarrörelsen stanna vid kanten av fönstret, vilket förhindrar tillgång till  andra applikationer. Om av tillåts muspekaren att röras fritt över skrivbordet.&lt;/p&gt;&lt;p&gt;Denna inställning appliceras inte på skärmen där Escape har blivit tryckt, då muspekaren aldrig tas över. Oavsett denna inställning kan ”Alt-Tab” eller annan operativsystemberoende knappsekvens användas för att ge operativsystemet åter tillgång till muspekaren. Denna inställning interagerar med minimera vid fokusförlust-inställningen genom att påverka vad som räknas som en fokusförlust. Specifikt på en tvåskärmskonfiguration kan det vara mer smidigt att få tillgång till den andra skärmen med inställningen inaktiverad.&lt;/p&gt;&lt;p&gt;Notis för utvecklare: det är önskvärt att ha denna inställning inaktiverad när OpenMW körs i debug-läge för att förhindra att musen blir oanvändbar när spelet pausar vid en brytpunkt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Bläddra…</translation>
+    </message>
+    <message>
+        <source>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency between available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</source>
+        <translation>Kollision används för både fysiksimulering och navigationsmeshgenerering för pathfinding. Cylinder ger bäst förenlighet mellan tillgängliga navigeringsvägar och möjlighet att förflytta förbi dem. Ändring av detta värde påverkar navigeringsmeshgenereringen – därför kommer inte navigeringsmesh disk cache för ett värde vara användbart för ett annat.</translation>
+    </message>
+    <message>
+        <source>Gameplay</source>
+        <translation>Spelmekanik</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om aktiverad kommer magisk ammunition krävas för att förbigå normal vapenmotståndskraft eller -svaghet. Om inaktiverad krävs ett magiskt avståndsvapen eller en magisk ammunition.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Få förtrollade vapen utan Magisk-flagga att förbigå normal vapenmotståndskraft, såsom i Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source> cells</source>
+        <translation> celler</translation>
+    </message>
+    <message>
+        <source>Shadows</source>
+        <translation>Skuggor</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Typ av &quot;compute scene bounds&quot; beräkningsmetod att använda. Bounds (förvalt) för en bra balans mellan prestanda och skuggkvalitet, primitives för snyggare skuggor eller none för ingen beräkning alls.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 spelenheter är 1 yard eller ungefär 0,9 meter i verkligheten&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source> unit(s)</source>
+        <translation> enhet(er)</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktiverar skuggor för icke-spelbara figurer och varelser bortsett från spelarrollfiguren. Kan ha en liten negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>512</source>
+        <translation>512</translation>
+    </message>
+    <message>
+        <source>1024</source>
+        <translation>1024</translation>
+    </message>
+    <message>
+        <source>2048</source>
+        <translation>2048</translation>
+    </message>
+    <message>
+        <source>4096</source>
+        <translation>4096</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Den fraktion av gränsen ovan vid vilken skuggor gradvis börjar blekna bort.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera skuggor exklusivt för spelarrollfiguren. Kan ha en mycket liten negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Upplösningen för varje individuell skuggkarta. Ökning av den ökar skuggkvalitén signifikant, men kan ha en lättare negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avståndet från kameran vid vilken skuggor helt försvinner.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera skuggor för huvudsakligen icke-rörliga objekt. Kan ha en signifikant negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind&apos;s data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;På grund av begränsningar med Morrowinds data kan endast figurer ge ifrån sig skuggor inomhus, vilket vissa kan tycka vara distraherande.&lt;/p&gt;&lt;p&gt;Har ingen effekt om figur/spelarskuggor inte är aktiverat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera skuggor för terräng, inklusive avlägsen terräng. Kan ha en signifikant negativ påverkan på prestanda och skuggkvalité.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Lighting</source>
+        <translation>Ljussättning</translation>
+    </message>
+    <message>
+        <source>Tooltip</source>
+        <translation>Inforuta</translation>
+    </message>
+    <message>
+        <source>Crosshair</source>
+        <translation>Hårkors</translation>
+    </message>
+    <message>
+        <source>Screenshots</source>
+        <translation>Skärmdumpar</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Give actors an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ge figurer en möjlighet att simma över vattenytan när de följer andra figurer, oberoende av deras förmåga att simma. Har endast effekt när navigeringsmesh är aktiverat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effekter av reflekterade &quot;Absorb&quot;-besvärjelser speglas inte – såsom i Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
+&lt;p&gt; &quot;Legacy&quot; always uses 8 lights per object. It provides results most similar to Morrowind&apos;s lighting.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (compatibility)&quot; removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Välj intern hantering av ljuskällor.&lt;/p&gt;
+&lt;p&gt; &quot;Gammaldags&quot; använder alltid max 8 ljuskällor per objekt och ger ljussättning likt ett gammaldags spel.&lt;/p&gt;
+&lt;p&gt;&quot;Shader (kompatibilitet)&quot; tar bort begränsningen med max 8 ljuskällor per objekt. Detta läge aktiverar också ljus på marktäckning. Rekommenderas för äldre hårdvara tillsammans med en ljusbegränsning nära 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shader&quot; har alla fördelar som &quot;Shader (kompatibilitet)&quot; har, men med ett modernt förhållningssätt som möjliggör fler maximalt antal ljuskällor med liten eller ingen prestandaförlust på modern hårdvara.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <translation>Gammaldags</translation>
+    </message>
+    <message>
+        <source>Shaders (compatibility)</source>
+        <translation>Shader (kompatibilitet)</translation>
+    </message>
+    <message>
+        <source>In third-person view, use the camera as the sound listener instead of the player character.</source>
+        <translation>Använd kameran som ljudlyssnare istället för spelarrollfiguren i tredjepersonsperspektivet.</translation>
+    </message>
+    <message>
+        <source>Permanent Barter Disposition Changes</source>
+        <translation>Permanenta handelsförändringar</translation>
+    </message>
+    <message>
+        <source>Classic Calm Spells Behavior</source>
+        <translation>Klassiskt beteende för &quot;Calm&quot;-besvärjelser</translation>
+    </message>
+    <message>
+        <source>NPCs Avoid Collisions</source>
+        <translation>Icke-spelbara figurer undviker kollisioner</translation>
+    </message>
+    <message>
+        <source>Soulgem Values Rebalance</source>
+        <translation>Ombalansering av &quot;Soulgems&quot; värdering</translation>
+    </message>
+    <message>
+        <source>Day Night Switch Nodes</source>
+        <translation>Dag/natt-bytesnoder</translation>
+    </message>
+    <message>
+        <source>Followers Defend Immediately</source>
+        <translation>Följare försvarar omedelbart</translation>
+    </message>
+    <message>
+        <source>Only Magical Ammo Bypass Resistance</source>
+        <translation>Bara magisk ammunition förbigår motstånd</translation>
+    </message>
+    <message>
+        <source>Graphic Herbalism</source>
+        <translation>Grafisk örtplockning</translation>
+    </message>
+    <message>
+        <source>Swim Upward Correction</source>
+        <translation>Simma uppåt korrigering</translation>
+    </message>
+    <message>
+        <source>Enchanted Weapons Are Magical</source>
+        <translation>Förtrollade vapen är magiska</translation>
+    </message>
+    <message>
+        <source>Merchant Equipping Fix</source>
+        <translation>Handlare klär inte på sig</translation>
+    </message>
+    <message>
+        <source>Can Loot During Death Animation</source>
+        <translation>Kan plundra under dödsanimation</translation>
+    </message>
+    <message>
+        <source>Classic Reflected Absorb Spells Behavior</source>
+        <translation>Klassiskt beteende för reflekterade &quot;Absorb&quot;-besvärjelser</translation>
+    </message>
+    <message>
+        <source>Unarmed Creature Attacks Damage Armor</source>
+        <translation>Obeväpnad attack från varelser skadar rustning</translation>
+    </message>
+    <message>
+        <source>Affect Werewolves</source>
+        <translation>Påverka varulvar</translation>
+    </message>
+    <message>
+        <source>Do Not Affect Werewolves</source>
+        <translation>Påverka inte varulvar</translation>
+    </message>
+    <message>
+        <source>Background Physics Threads</source>
+        <translation>Fysiktrådar i bakgrunden</translation>
+    </message>
+    <message>
+        <source>Actor Collision Shape Type</source>
+        <translation>Figurers kollisionsformtyp</translation>
+    </message>
+    <message>
+        <source>Axis-Aligned Bounding Box</source>
+        <translation>Axeljusterad begränsningslåda</translation>
+    </message>
+    <message>
+        <source>Rotating Box</source>
+        <translation>Roterande låda</translation>
+    </message>
+    <message>
+        <source>Smooth Movement</source>
+        <translation>Mjuka rörelser</translation>
+    </message>
+    <message>
+        <source>Use Additional Animation Sources</source>
+        <translation>Använd extra animationskällor</translation>
+    </message>
+    <message>
+        <source>Weapon Sheathing</source>
+        <translation>Vapenhölstring</translation>
+    </message>
+    <message>
+        <source>Shield Sheathing</source>
+        <translation>Sköldhölstring</translation>
+    </message>
+    <message>
+        <source>Player Movement Ignores Animation</source>
+        <translation>Spelarförflyttningar ignorerar animation</translation>
+    </message>
+    <message>
+        <source>Use Magic Item Animation</source>
+        <translation>Animationer för magiska föremål</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Normal Maps</source>
+        <translation>Använd automatiskt normalkartor på objekt</translation>
+    </message>
+    <message>
+        <source>Soft Particles</source>
+        <translation>Mjuka partiklar</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Specular Maps</source>
+        <translation>Använd automatiskt spekularitetskartor på objekt</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Normal Maps</source>
+        <translation>Använd automatiskt normalkartor på terräng</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Specular Maps</source>
+        <translation>Använd automatiskt spekularitetskartor på terräng</translation>
+    </message>
+    <message>
+        <source>Use Anti-Aliased Alpha Testing</source>
+        <translation>Använd kantutjämnad alfa-testning</translation>
+    </message>
+    <message>
+        <source>Bump/Reflect Map Local Lighting</source>
+        <translation>Bump/Reflektionskartor lokalt ljus</translation>
+    </message>
+    <message>
+        <source>Weather Particle Occlusion</source>
+        <translation>Regn/snö blockeras av tak</translation>
+    </message>
+    <message>
+        <source>Exponential Fog</source>
+        <translation>Exponentiell dimma</translation>
+    </message>
+    <message>
+        <source>Radial Fog</source>
+        <translation>Radiell dimma</translation>
+    </message>
+    <message>
+        <source>Sky Blending Start</source>
+        <translation>Smeta ut horisont/himmel, start</translation>
+    </message>
+    <message>
+        <source>Sky Blending</source>
+        <translation>Smeta ut horisont/himmel</translation>
+    </message>
+    <message>
+        <source>Object Paging Min Size</source>
+        <translatorcomment>Object paging needs a better translation</translatorcomment>
+        <translation>Minsta storlek för objektpaging</translation>
+    </message>
+    <message>
+        <source>Viewing Distance</source>
+        <translation>Siktavstånd</translation>
+    </message>
+    <message>
+        <source>Distant Land</source>
+        <translation>Avlägsen terräng</translation>
+    </message>
+    <message>
+        <source>Active Grid Object Paging</source>
+        <translatorcomment>Object paging needs a better translation</translatorcomment>
+        <translation>Objektpaging i aktivt rutnät</translation>
+    </message>
+    <message>
+        <source>Transparent Postpass</source>
+        <translatorcomment>Will return to later</translatorcomment>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Auto Exposure Speed</source>
+        <translation>Autoexponeringshastighet</translation>
+    </message>
+    <message>
+        <source>Enable Post Processing</source>
+        <translation>Aktivera efterbehandling (post processing)</translation>
+    </message>
+    <message>
+        <source>Shadow Planes Computation Method</source>
+        <translation>Skuggplaner beräkningsmetod</translation>
+    </message>
+    <message>
+        <source>Enable Actor Shadows</source>
+        <translation>Aktivera rollfigurskuggor</translation>
+    </message>
+    <message>
+        <source>Fade Start Multiplier</source>
+        <translation>Blekningsstartmultiplikator</translation>
+    </message>
+    <message>
+        <source>Enable Player Shadows</source>
+        <translation>Aktivera spelarskuggor</translation>
+    </message>
+    <message>
+        <source>Shadow Map Resolution</source>
+        <translation>Skuggkartsupplösning</translation>
+    </message>
+    <message>
+        <source>Shadow Distance Limit:</source>
+        <translation>Skuggavståndsgräns:</translation>
+    </message>
+    <message>
+        <source>Enable Object Shadows</source>
+        <translation>Aktivera objektskuggor</translation>
+    </message>
+    <message>
+        <source>Enable Indoor Shadows</source>
+        <translation>Aktivera interiöra skuggor</translation>
+    </message>
+    <message>
+        <source>Enable Terrain Shadows</source>
+        <translation>Aktivera terrängskuggor</translation>
+    </message>
+    <message>
+        <source>Lighting Method</source>
+        <translation>Ljussättningsmetod</translation>
+    </message>
+    <message>
+        <source>Audio Device</source>
+        <translation>Ljudenhet</translation>
+    </message>
+    <message>
+        <source>HRTF Profile</source>
+        <translation>HRTF-profil</translation>
+    </message>
+    <message>
+        <source>Tooltip and Crosshair</source>
+        <translation>Inforuta och hårkors</translation>
+    </message>
+    <message>
+        <source>GUI Scaling Factor</source>
+        <translation>Skalningsfaktor för gränssnitt</translation>
+    </message>
+    <message>
+        <source>Show Effect Duration</source>
+        <translation>Visa effektvaraktighet</translation>
+    </message>
+    <message>
+        <source>Change Dialogue Topic Color</source>
+        <translation>Ändra färg på dialogämnen</translation>
+    </message>
+    <message>
+        <source>Font Size</source>
+        <translation>Fontstorlek</translation>
+    </message>
+    <message>
+        <source>Show Projectile Damage</source>
+        <translation>Visa projektilskada</translation>
+    </message>
+    <message>
+        <source>Show Melee Info</source>
+        <translation>Visa närstridsinfo</translation>
+    </message>
+    <message>
+        <source>Stretch Menu Background</source>
+        <translation>Sträck ut menybakgrund</translation>
+    </message>
+    <message>
+        <source>Show Owned Objects</source>
+        <translation>Visa ägda objekt</translation>
+    </message>
+    <message>
+        <source>Show Enchant Chance</source>
+        <translation>Visa chans för &quot;Enchant&quot;</translation>
+    </message>
+    <message>
+        <source>Maximum Quicksaves</source>
+        <translation>Max snabbsparfiler</translation>
+    </message>
+    <message>
+        <source>Screenshot Format</source>
+        <translation>Skärmdumpformat</translation>
+    </message>
+    <message>
+        <source>Grab Cursor</source>
+        <translation>Ta över muspekaren</translation>
+    </message>
+    <message>
+        <source>Default Cell</source>
+        <translation>Förinställd cell</translation>
+    </message>
+    <message>
+        <source>Bounds</source>
+        <translation>Bounds</translation>
+    </message>
+    <message>
+        <source>Primitives</source>
+        <translation>Primitives</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>None</translation>
+    </message>
+    <message>
+        <source>Always Allow Actors to Follow over Water</source>
+        <translation>Tillåt alltid figurer att följa över vatten</translation>
+    </message>
+    <message>
+        <source>Racial Variation in Speed Fix</source>
+        <translation>Fix för varelsers hastighetsvariation</translation>
+    </message>
+    <message>
+        <source>Use Navigation Mesh for Pathfinding</source>
+        <translation>Använd navigeringsmesh för pathfinding</translation>
+    </message>
+    <message>
+        <source>Trainers Choose Offered Skills by Base Value</source>
+        <translation>Tränare väljer erbjudna färdigheter efter grundvärde</translation>
+    </message>
+    <message>
+        <source>Steal from Knocked out Actors in Combat</source>
+        <translation>Stjäl från avsvimmade rollfigurer i strid</translation>
+    </message>
+    <message>
+        <source>Factor Strength into Hand-to-Hand Combat</source>
+        <translation>Räkna in styrka i obeväpnad strid</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls the behavior of factoring of Strength attribute into hand-to-hand damage: damage is multiplied by Strength value divided by 40.&lt;/p&gt;&lt;p&gt;Can apply to all actors or only to non-werewolf actors.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Denna inställning styr om basegenskapen Strength (styrka) ska räknas in i skador från obeväpnade attacker: skadan multipliceras med värdet på Strength dividerat med 40.&lt;/p&gt;&lt;p&gt;Kan tillämpas på alla rollfigurer eller endast för rollfigurer som inte är varulvar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Turn to Movement Direction</source>
+        <translation>Vänd mot rörelseriktningen</translation>
+    </message>
+    <message>
+        <source>Adjust Coverage for Alpha Test</source>
+        <translation>Justera täckning för alfa-testning</translation>
+    </message>
+    <message>
+        <source>Use the Camera as the Sound Listener</source>
+        <translation>Använd kameran som ljudlyssnaren</translation>
+    </message>
+    <message>
+        <source>Can Zoom on Maps</source>
+        <translation>Kan zooma på kartor</translation>
+    </message>
+    <message>
+        <source>Notify on Saved Screenshot</source>
+        <translation>Ge notis vid sparad skärmdump</translation>
+    </message>
+    <message>
+        <source>Skip Menu and Generate Default Character</source>
+        <translation>Hoppa över meny och generera förinställd rollfigur</translation>
+    </message>
+    <message>
+        <source>Start Default Character at</source>
+        <translation>Starta förinställd rollfigur vid</translation>
+    </message>
+    <message>
+        <source>Run Script After Startup:</source>
+        <translation>Kör skript efter uppstart:</translation>
+    </message>
+    <message>
+        <source>Smooth Animation Transitions</source>
+        <translation>Mjuka animationsövergångar</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled - makes transitions between different animations/poses much smoother. Also allows to load animation blending config YAML files that can be bundled with animations in order to customise blending styles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vid aktivering gör denna funktion att övergångarna mellan olika animationer och poser blir mycket mjukare. Funktionen gör det också möjligt att konfigurera animationsövergångarna i YAML-filer. Dessa filer kan buntas ihop tillsammans med nya animationsfiler.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/wizard_de.ts b/files/lang/wizard_de.ts
new file mode 100644
index 0000000000..c3ef55b04a
--- /dev/null
+++ b/files/lang/wizard_de.ts
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+<context>
+    <name>ComponentSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which components should be installed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select which official Morrowind expansions should be installed. For best results, it is recommended to have both expansions installed.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to install expansions later by re-running this Wizard.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completing the OpenMW Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Placeholder</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExistingInstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Existing Installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select an existing installation for OpenMW to use or modify.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Detected installations:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import settings from the Morrowind installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW needs to import settings from the Morrowind configuration file in order to function properly.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to import settings later by re-running this Wizard.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Settings From Morrowind.ini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait while Morrowind is installed on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstallationTargetPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Installation Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Where should Morrowind be installed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind will be installed to the following location. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to the OpenMW Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This Wizard will help you install Morrowind and its add-ons for OpenMW to use.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Morrowind Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What is the language of the Morrowind installation?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the language of the Morrowind installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MethodSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Installation Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select how you would like to install &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Retail CD/DVD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install from a retail disc to a new location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Existing Installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select an existing installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t have a copy?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buy the game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;The Wizard needs to update settings in this file.&lt;br&gt;&lt;br&gt;Press &quot;Browse...&quot; to specify the location manually.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B&amp;rowse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Morrowind.bsa&lt;/b&gt; is missing!&lt;br&gt;Make sure your Morrowind installation is complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;There may be a more recent version of Morrowind available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most recent Morrowind not detected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a valid %1 installation media.&lt;br&gt;&lt;b&gt;Hint&lt;/b&gt;: make sure that it contains at least one &lt;b&gt;.cab&lt;/b&gt; file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There may be a more recent version of Morrowind available.&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ComponentSelectionPage</name>
+    <message>
+        <source>&amp;Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Skip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind		(installed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tribunal		(installed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tribunal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bloodmoon		(installed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bloodmoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About to install Tribunal after Bloodmoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;You are about to install Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon is already installed on your computer.&lt;/p&gt;&lt;p&gt;However, it is recommended that you install Tribunal before Bloodmoon.&lt;/p&gt;&lt;p&gt;Would you like to re-install Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-install &amp;Bloodmoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ConclusionPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully installed Morrowind on your computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully modified your existing Morrowind installation.&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard failed to install Morrowind on your computer.&lt;/p&gt;&lt;p&gt;Please report any bugs you might have encountered to our &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Make sure to include the installation log.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ExistingInstallationPage</name>
+    <message>
+        <source>No existing installations detected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Morrowind.esm (located in Data Files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind master file (Morrowind.esm)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationPage</name>
+    <message>
+        <source>&lt;p&gt;Attempting to install component %1.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attempting to install component %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select %1 installation media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: The installation was aborted by the user&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Detected old version of component Morrowind.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Detected old version of component Morrowind.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind Installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installation finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installation completed successfully!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: %1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The Wizard has encountered an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The error reported was:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Press &amp;quot;Show Details...&amp;quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An error occurred</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationTargetPage</name>
+    <message>
+        <source>Error creating destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not write to the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The destination directory is not empty&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An existing Morrowind installation is present in the specified location.&lt;/p&gt;&lt;p&gt;Please specify a different location, or go back and select the location as an existing installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insufficient permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination not empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select where to install Morrowind</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::LanguageSelectionPage</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::MainWizard</name>
+    <message>
+        <source>OpenMW Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error opening Wizard log file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for writing&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for reading&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to exit the Wizard?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::UnshieldWorker</name>
+    <message>
+        <source>Failed to open Morrowind configuration file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opening %1 failed: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write Morrowind configuration file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Writing to %1 failed: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing: %1 directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installation finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Component parameter is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An invalid component parameter was supplied.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to find a valid archive containing %1.bsa! Retrying.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installation media path not set!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The source path for %1 was not set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot create temporary directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot move into temporary directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to move into %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Moving installation files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not install directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing %1 to %2 failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not install translation file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to install *%1 files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind data file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to install %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind configuration file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing: Sound directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal data file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to find %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal patch file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not find Bloodmoon data file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Updating Morrowind configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 installation finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Extracting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open InstallShield Cabinet File.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opening %1 failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to extract %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete path: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/wizard_en.ts b/files/lang/wizard_en.ts
new file mode 100644
index 0000000000..790d8e0589
--- /dev/null
+++ b/files/lang/wizard_en.ts
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_EN">
+<context>
+    <name>ComponentSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select Components</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Which components should be installed?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select which official Morrowind expansions should be installed. For best results, it is recommended to have both expansions installed.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to install expansions later by re-running this Wizard.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Selected components:</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Completing the OpenMW Wizard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Placeholder</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ExistingInstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select Existing Installation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select an existing installation for OpenMW to use or modify.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Detected installations:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import Settings</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import settings from the Morrowind installation.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW needs to import settings from the Morrowind configuration file in order to function properly.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to import settings later by re-running this Wizard.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import Settings From Morrowind.ini</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>InstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Please wait while Morrowind is installed on your computer.</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>InstallationTargetPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select Installation Destination</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Where should Morrowind be installed?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind will be installed to the following location. </source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Welcome to the OpenMW Wizard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>This Wizard will help you install Morrowind and its add-ons for OpenMW to use.</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select Morrowind Language</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>What is the language of the Morrowind installation?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select the language of the Morrowind installation.</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>MethodSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select Installation Method</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select how you would like to install &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Retail CD/DVD</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Install from a retail disc to a new location.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Existing Installation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select an existing installation.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Don&apos;t have a copy?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Buy the game</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;The Wizard needs to update settings in this file.&lt;br&gt;&lt;br&gt;Press &quot;Browse...&quot; to specify the location manually.&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>B&amp;rowse...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Morrowind.bsa&lt;/b&gt; is missing!&lt;br&gt;Make sure your Morrowind installation is complete.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Most recent Morrowind not detected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;There may be a more recent version of Morrowind available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?&lt;br&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select a valid %1 installation media.&lt;br&gt;&lt;b&gt;Hint&lt;/b&gt;: make sure that it contains at least one &lt;b&gt;.cab&lt;/b&gt; file.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>There may be a more recent version of Morrowind available.&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ComponentSelectionPage</name>
+    <message>
+        <source>&amp;Install</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&amp;Skip</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind		(installed)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Tribunal		(installed)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Tribunal</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Bloodmoon		(installed)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Bloodmoon</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>About to install Tribunal after Bloodmoon</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;You are about to install Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon is already installed on your computer.&lt;/p&gt;&lt;p&gt;However, it is recommended that you install Tribunal before Bloodmoon.&lt;/p&gt;&lt;p&gt;Would you like to re-install Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Re-install &amp;Bloodmoon</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ConclusionPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully installed Morrowind on your computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully modified your existing Morrowind installation.&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard failed to install Morrowind on your computer.&lt;/p&gt;&lt;p&gt;Please report any bugs you might have encountered to our &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Make sure to include the installation log.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ExistingInstallationPage</name>
+    <message>
+        <source>No existing installations detected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind configuration</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select Morrowind.esm (located in Data Files)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind master file (Morrowind.esm)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind files</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationPage</name>
+    <message>
+        <source>&lt;p&gt;Attempting to install component %1.&lt;/p&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Attempting to install component %1.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>%1 Installation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select %1 installation media</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: The installation was aborted by the user&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Detected old version of component Morrowind.&lt;/p&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Detected old version of component Morrowind.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Morrowind Installation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installation finished</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installation completed successfully!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installation failed!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: %1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>An error occurred</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The Wizard has encountered an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The error reported was:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Press &amp;quot;Show Details...&amp;quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationTargetPage</name>
+    <message>
+        <source>Error creating destination</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Insufficient permissions</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not write to the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Destination not empty</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The destination directory is not empty&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An existing Morrowind installation is present in the specified location.&lt;/p&gt;&lt;p&gt;Please specify a different location, or go back and select the location as an existing installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Select where to install Morrowind</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::LanguageSelectionPage</name>
+    <message>
+        <source>English</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::MainWizard</name>
+    <message>
+        <source>OpenMW Wizard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for writing&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error opening Wizard log file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for reading&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Quit Wizard</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to exit the Wizard?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::UnshieldWorker</name>
+    <message>
+        <source>Failed to open Morrowind configuration file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Opening %1 failed: %2.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to write Morrowind configuration file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Writing to %1 failed: %2.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installing: %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installing: %1 directory</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installation finished!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Component parameter is invalid!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>An invalid component parameter was supplied.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to find a valid archive containing %1.bsa! Retrying.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installing %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installation media path not set!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>The source path for %1 was not set.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Cannot create temporary directory!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to create %1.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Cannot move into temporary directory!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to move into %1.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Moving installation files</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not install directory!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installing %1 to %2 failed.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not install translation file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to install *%1 files.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind data file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to install %1.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind configuration file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Installing: Sound directory</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal data file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to find %1.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal patch file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not find Bloodmoon data file!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Updating Morrowind configuration file</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>%1 installation finished!</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Extracting: %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to open InstallShield Cabinet File.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Opening %1 failed.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Failed to extract %1.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Complete path: %1</source>
+        <translation></translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/wizard_fr.ts b/files/lang/wizard_fr.ts
new file mode 100644
index 0000000000..010883d0c4
--- /dev/null
+++ b/files/lang/wizard_fr.ts
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
+<context>
+    <name>ComponentSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Select Components</source>
+        <translation>Sélection des composantes de jeu</translation>
+    </message>
+    <message>
+        <source>Which components should be installed?</source>
+        <translation>Quelles composantes du jeu doivent être installées ?</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select which official Morrowind expansions should be installed. For best results, it is recommended to have both expansions installed.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to install expansions later by re-running this Wizard.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sélectionnez quelle(s) extension(s) officielle(s) doivent être installée(s). Pour une meilleure expérience de jeu, il est recommandé d&apos;installer toutes les extensions.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note :&lt;/span&gt; Il est possible d&apos;installer les extensions plus tard en relançant l&apos;Assistant d&apos;installation.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Selected components:</source>
+        <translation>Composantes sélectionnées :</translation>
+    </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Completing the OpenMW Wizard</source>
+        <translation>Fin de l&apos;Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Placeholder</source>
+        <translation>Placeholder</translation>
+    </message>
+</context>
+<context>
+    <name>ExistingInstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Select Existing Installation</source>
+        <translation>Sélection d&apos;une installation existante</translation>
+    </message>
+    <message>
+        <source>Select an existing installation for OpenMW to use or modify.</source>
+        <translation>Sélectionnez une installation existante pour l&apos;utiliser ou la modifier avec OpenMW</translation>
+    </message>
+    <message>
+        <source>Detected installations:</source>
+        <translation>Installation(s) détectée(s) :</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Parcourir...</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Import Settings</source>
+        <translation>Import des paramètres</translation>
+    </message>
+    <message>
+        <source>Import settings from the Morrowind installation.</source>
+        <translation>Importe les paramètres depuis une installation de Morrowind.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW needs to import settings from the Morrowind configuration file in order to function properly.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to import settings later by re-running this Wizard.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Afin de fonctionner correctement, OpenMW nécessite d&apos;importer les paramètres depuis le fichier de configuration de Morrowind.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note :&lt;/span&gt; Il est possible d&apos;importer les paramètres plus tard en relançant l&apos;Assistant d&apos;installation.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Import Settings From Morrowind.ini</source>
+        <translation>Importer les paramètres depuis le fichier Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Importer les extensions et la sélection de modules complémentaires</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
+        <translation>Importer les paramètres des polices en bitmap depuis Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Les polices fournies avec le moteur de jeu original sont floues lorsque l&apos;interface utilisateur est agrandie. De plus, elles ne supportent qu&apos;un faible nombre de caractères. Afin d&apos;éviter ces désagréments, OpenMW propose son propre ensemble de polices. Ces polices sont encodées au format TrueType et sont fort similaires aux polices originales. Sélectionnez cette option si vous préférez utiliser les polices originales - à la place de celles fournies par OpenMW - ou si vous utilisez vos propres polices au format bitmap.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation>Installation en cours</translation>
+    </message>
+    <message>
+        <source>Please wait while Morrowind is installed on your computer.</source>
+        <translation>Veuillez patienter pendant l&apos;installation de Morrowind sur votre ordinateur.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationTargetPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Select Installation Destination</source>
+        <translation>Sélection de l&apos;emplacement de l&apos;installation</translation>
+    </message>
+    <message>
+        <source>Where should Morrowind be installed?</source>
+        <translation>À quel emplacement Morrowind doit-il être installé ?</translation>
+    </message>
+    <message>
+        <source>Morrowind will be installed to the following location. </source>
+        <translation>Morrowind sera installé à l&apos;emplacement suivant :</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Parcourir...</translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Welcome to the OpenMW Wizard</source>
+        <translation>Bienvenue sur l&apos;assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>This Wizard will help you install Morrowind and its add-ons for OpenMW to use.</source>
+        <translation>Cet assistant vous aidera à installer Morrowind et ses extensions afin que vous lanciez le jeu avec OpenMW.</translation>
+    </message>
+</context>
+<context>
+    <name>LanguageSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Select Morrowind Language</source>
+        <translation>Sélection de la langue de Morrowind</translation>
+    </message>
+    <message>
+        <source>What is the language of the Morrowind installation?</source>
+        <translation>Dans quelle langue est cette installation de Morrowind ?</translation>
+    </message>
+    <message>
+        <source>Select the language of the Morrowind installation.</source>
+        <translation>Sélectionnez la langue de cette installation de Morrowind.</translation>
+    </message>
+</context>
+<context>
+    <name>MethodSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Select Installation Method</source>
+        <translation>Méthode d&apos;installation</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select how you would like to install &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sélectionnez une méthode d&apos;installation de &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Retail CD/DVD</source>
+        <translation>Copie CD/DVD physique</translation>
+    </message>
+    <message>
+        <source>Install from a retail disc to a new location.</source>
+        <translation>Installer depuis un CD/DVD et choisir la destination sur l&apos;ordinateur.</translation>
+    </message>
+    <message>
+        <source>Existing Installation</source>
+        <translation>Installation existante</translation>
+    </message>
+    <message>
+        <source>Select an existing installation.</source>
+        <translation>Sélectionnez une installation existante.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t have a copy?</source>
+        <translation>Vous n&apos;avez pas de copie du jeu ?</translation>
+    </message>
+    <message>
+        <source>Buy the game</source>
+        <translation>Achetez le jeu.</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;The Wizard needs to update settings in this file.&lt;br&gt;&lt;br&gt;Press &quot;Browse...&quot; to specify the location manually.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Impossible de trouver Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;L&apos;assistant d&apos;installation requière de mettre à jour les paramètres de ce fichier.&lt;br&gt;&lt;br&gt;Cliquez sur &quot;Parcourir...&quot; afin de spécifier manuellement son emplacement.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>B&amp;rowse...</source>
+        <translation>P&amp;arcourir...</translation>
+    </message>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Sélectionnez le fichier de configuration</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Morrowind.bsa&lt;/b&gt; is missing!&lt;br&gt;Make sure your Morrowind installation is complete.</source>
+        <translation>L&apos;archive &lt;b&gt;Morrowind.bsa&lt;/b&gt; est manquante !&lt;br&gt;Assurez-vous que votre installation de Morrowind est complète.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;There may be a more recent version of Morrowind available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Il semble qu&apos;une version plus à jour de Morrowind soit disponible.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Voulez-vous continuer malgré tout ?&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Most recent Morrowind not detected</source>
+        <translation>Version la plus à jour de Morrowind non détectée</translation>
+    </message>
+    <message>
+        <source>Select a valid %1 installation media.&lt;br&gt;&lt;b&gt;Hint&lt;/b&gt;: make sure that it contains at least one &lt;b&gt;.cab&lt;/b&gt; file.</source>
+        <translation>Sélectionnez un support %1 d&apos;installation valide.&lt;br&gt;&lt;b&gt;Aide&lt;/b&gt; : Assurez-vous qu&apos;il contienne au moins un fichier &lt;b&gt;.cab&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>There may be a more recent version of Morrowind available.&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?</source>
+        <translation>Il semble qu&apos;une version plus à jour de Morrowind soit disponible.&lt;br&gt;&lt;br&gt;Voulez-vous continuer malgré tout ?</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ComponentSelectionPage</name>
+    <message>
+        <source>&amp;Install</source>
+        <translation>&amp;Installer</translation>
+    </message>
+    <message>
+        <source>&amp;Skip</source>
+        <translation>&amp;Passer</translation>
+    </message>
+    <message>
+        <source>Morrowind		(installed)</source>
+        <translation>Morrowind		(installé)</translation>
+    </message>
+    <message>
+        <source>Morrowind</source>
+        <translation>Morrowind</translation>
+    </message>
+    <message>
+        <source>Tribunal		(installed)</source>
+        <translation>Tribunal		(installé)</translation>
+    </message>
+    <message>
+        <source>Tribunal</source>
+        <translation>Tribunal</translation>
+    </message>
+    <message>
+        <source>Bloodmoon		(installed)</source>
+        <translation>Bloodmoon		(installé)</translation>
+    </message>
+    <message>
+        <source>Bloodmoon</source>
+        <translation>Bloodmoon</translation>
+    </message>
+    <message>
+        <source>About to install Tribunal after Bloodmoon</source>
+        <translation>À propos de l&apos;installation de Tribunal après Bloodmoon</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;You are about to install Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon is already installed on your computer.&lt;/p&gt;&lt;p&gt;However, it is recommended that you install Tribunal before Bloodmoon.&lt;/p&gt;&lt;p&gt;Would you like to re-install Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Vous vous apprêtez à installer l&apos;extension Tribunal.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;L&apos;extension Bloodmoon est déjà installée sur votre ordinateur.&lt;/p&gt;&lt;p&gt;Néanmoins, il est recommandé d&apos;installer Tribunal avant Bloodmoon.&lt;/p&gt;&lt;p&gt;Désirez-vous réinstaller Bloodmoon ?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Re-install &amp;Bloodmoon</source>
+        <translation>Réinstaller &amp;Bloodmoon</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ConclusionPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully installed Morrowind on your computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L&apos;Assistant d&apos;installation d&apos;OpenMW a installé Morrowind sur votre ordinateur avec succès !&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully modified your existing Morrowind installation.&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L&apos;Assistant d&apos;installation d&apos;OpenMW a modifié votre installation de Morrowind avec succès !&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard failed to install Morrowind on your computer.&lt;/p&gt;&lt;p&gt;Please report any bugs you might have encountered to our &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Make sure to include the installation log.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L&apos;assistant d&apos;installation d&apos;OpenMW a échoué l&apos;installation de Morrowind.&lt;/p&gt;&lt;p&gt;Veuillez signaler les bogues que vous avez pu rencontrer sur notre. &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt; (en anglais).&lt;br/&gt;Assurez-vous d&apos;inclure le journal (log) d&apos;installation.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ExistingInstallationPage</name>
+    <message>
+        <source>No existing installations detected</source>
+        <translation>Aucune installation existante détectée</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind configuration</source>
+        <translation>Erreur lors de la détection du fichier de configuration de Morrowind</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Fichier de configuration de Morrowind (*.ini)</translation>
+    </message>
+    <message>
+        <source>Select Morrowind.esm (located in Data Files)</source>
+        <translation>Sélectionnez Morrowind.esm (situé dans Data Files)</translation>
+    </message>
+    <message>
+        <source>Morrowind master file (Morrowind.esm)</source>
+        <translation>Fichier principal de Morrowind (Morrowind.esm)</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind files</source>
+        <translation>Erreur lors de la détection des fichiers de Morrowind</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationPage</name>
+    <message>
+        <source>&lt;p&gt;Attempting to install component %1.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Tentative d&apos;installation de la composante %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Attempting to install component %1.</source>
+        <translation>Tentative d&apos;installation de la composante %1.</translation>
+    </message>
+    <message>
+        <source>%1 Installation</source>
+        <translation>Installation de %1</translation>
+    </message>
+    <message>
+        <source>Select %1 installation media</source>
+        <translation>Sélectionnez le support d&apos;installation de %1</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: The installation was aborted by the user&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Erreur : L&apos;installation a été annulée par l&apos;utilisateur.&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Detected old version of component Morrowind.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Ancienne version de la composante Morrowind détectée.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Detected old version of component Morrowind.</source>
+        <translation>Ancienne version de la composante Morrowind détectée.</translation>
+    </message>
+    <message>
+        <source>Morrowind Installation</source>
+        <translation>Installation de Morrowind</translation>
+    </message>
+    <message>
+        <source>Installation finished</source>
+        <translation>Installation terminée</translation>
+    </message>
+    <message>
+        <source>Installation completed successfully!</source>
+        <translation>Installation complétée avec succès !</translation>
+    </message>
+    <message>
+        <source>Installation failed!</source>
+        <translation>Échec de l&apos;installation !</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: %1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Erreur : %1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The Wizard has encountered an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The error reported was:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Press &amp;quot;Show Details...&amp;quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;L&apos;assistant d&apos;installation a rencontré une erreur.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;L&apos;erreur reportée est :&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Cliquez sur &quot;Montrer les détails...&quot; pour plus d&apos;informations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>An error occurred</source>
+        <translation>Une erreur est survenue</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationTargetPage</name>
+    <message>
+        <source>Error creating destination</source>
+        <translation>Erreur lors de la création de l&apos;emplacement de l&apos;installation</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible de créer le dossier d&apos;installation&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Veuillez vous assurer que vous avez les bons droits d&apos;accès puis réessayez, ou spécifiez une autre destination.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not write to the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible d&apos;écrire dans le dossier d&apos;installation&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Veuillez vous assurer que vous avez les bons droits d&apos;accès puis réessayez, ou spécifiez une autre destination.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The destination directory is not empty&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An existing Morrowind installation is present in the specified location.&lt;/p&gt;&lt;p&gt;Please specify a different location, or go back and select the location as an existing installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Le dossier d&apos;installation n&apos;est pas vide.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Une installation de Morrowind est déjà présente dans ce dossier.&lt;/p&gt;&lt;p&gt;Veuillez spécifier un autre enmplacement pour l&apos;installation, ou revenez en arrière et spécifiez que l&apos;emplacement contient déjà une installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Insufficient permissions</source>
+        <translation>Droits d&apos;accès insuffisants</translation>
+    </message>
+    <message>
+        <source>Destination not empty</source>
+        <translation>Emplacement non vide</translation>
+    </message>
+    <message>
+        <source>Select where to install Morrowind</source>
+        <translation>Sélectionnez où installer Morrowind</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::LanguageSelectionPage</name>
+    <message>
+        <source>English</source>
+        <translation>Anglais</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Français</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Allemand</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Italien</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Polonais</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Russe</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Espagnol</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::MainWizard</name>
+    <message>
+        <source>OpenMW Wizard</source>
+        <translation>Assistant d&apos;installation d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>Error opening Wizard log file</source>
+        <translation>Erreur lors de l&apos;ouverture du journal de l&apos;Assistant d&apos;installation</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for writing&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible d&apos;ouvrir %1 en écriture.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Assurez-vous d&apos;avoir les bons droits d&apos;accès puis réessayez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for reading&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible d&apos;ouvrir %1 en lecture.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Assurez-vous d&apos;avoir les bons droits d&apos;accès puis réessayez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Erreur lors de l&apos;ouverture du fichier de configuration.</translation>
+    </message>
+    <message>
+        <source>Quit Wizard</source>
+        <translation>Quitter l&apos;Assistant</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to exit the Wizard?</source>
+        <translation>Êtes-vous sûr de vouloir quitter l&apos;Assistant d&apos;installation ?</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory</source>
+        <translation>Erreur lors de la création du dossier de configuration d&apos;OpenMW</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Impossible de créer %1.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Assurez-vous d&apos;avoir les bons droits d&apos;accès puis réessayez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Erreur lors de l&apos;écriture dans le fichier de configuration d&apos;OpenMW.</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::UnshieldWorker</name>
+    <message>
+        <source>Failed to open Morrowind configuration file!</source>
+        <translation>Échec de l&apos;ouverture du fichier de configuration de Morrowind !</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed: %2.</source>
+        <translation>Échec lors de l&apos;ouverture de %1 : %2.</translation>
+    </message>
+    <message>
+        <source>Failed to write Morrowind configuration file!</source>
+        <translation>Échec de l&apos;ouverture du fichier de configuration de Morrowind !</translation>
+    </message>
+    <message>
+        <source>Writing to %1 failed: %2.</source>
+        <translation>Échec lors de l&apos;écriture dans %1 : %2.</translation>
+    </message>
+    <message>
+        <source>Installing: %1</source>
+        <translation>Installation : %1</translation>
+    </message>
+    <message>
+        <source>Installing: %1 directory</source>
+        <translation>Installation : dossier %1</translation>
+    </message>
+    <message>
+        <source>Installation finished!</source>
+        <translation>Installation terminée !</translation>
+    </message>
+    <message>
+        <source>Component parameter is invalid!</source>
+        <translation>Le paramètre d&apos;une des composantes est invalide !</translation>
+    </message>
+    <message>
+        <source>An invalid component parameter was supplied.</source>
+        <translation>Un paramètre invalide d&apos;une composante a été fournis.</translation>
+    </message>
+    <message>
+        <source>Failed to find a valid archive containing %1.bsa! Retrying.</source>
+        <translation>Impossible de trouver une archive contenant %1.bsa ! Nouvel essai.</translation>
+    </message>
+    <message>
+        <source>Installing %1</source>
+        <translation>Installation de %1</translation>
+    </message>
+    <message>
+        <source>Installation media path not set!</source>
+        <translation>Support d&apos;installation non défini !</translation>
+    </message>
+    <message>
+        <source>The source path for %1 was not set.</source>
+        <translation>L&apos;emplacement de %1 n&apos;a pas été défini.</translation>
+    </message>
+    <message>
+        <source>Cannot create temporary directory!</source>
+        <translation>Impossible de créer un dossier temporaire !</translation>
+    </message>
+    <message>
+        <source>Failed to create %1.</source>
+        <translation>Impossible de créer %1.</translation>
+    </message>
+    <message>
+        <source>Cannot move into temporary directory!</source>
+        <translation>Impossible d&apos;accéder au dossier temporaire !</translation>
+    </message>
+    <message>
+        <source>Failed to move into %1.</source>
+        <translation>Impossible d&apos;accéder à %1.</translation>
+    </message>
+    <message>
+        <source>Moving installation files</source>
+        <translation>Déplacement des fichiers d&apos;installation.</translation>
+    </message>
+    <message>
+        <source>Could not install directory!</source>
+        <translation>Impossible d&apos;installer le dossier !</translation>
+    </message>
+    <message>
+        <source>Installing %1 to %2 failed.</source>
+        <translation>Échec de l&apos;installation de %1 dans %2.</translation>
+    </message>
+    <message>
+        <source>Could not install translation file!</source>
+        <translation>Impossible d&apos;installer le fichier de localisation !</translation>
+    </message>
+    <message>
+        <source>Failed to install *%1 files.</source>
+        <translation>Échec lors de l&apos;installation du fichier %1.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind data file!</source>
+        <translation>Impossible d&apos;installer le fichier de données de Morrowind !</translation>
+    </message>
+    <message>
+        <source>Failed to install %1.</source>
+        <translation>Échec lors de l&apos;installation de %1.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind configuration file!</source>
+        <translation>Impossible d&apos;installer le fichier de configuration de Morrowind !</translation>
+    </message>
+    <message>
+        <source>Installing: Sound directory</source>
+        <translation>Installation : Dossier des sons.</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal data file!</source>
+        <translation>Impossible d&apos;installer le fichier de données de Tribunal !</translation>
+    </message>
+    <message>
+        <source>Failed to find %1.</source>
+        <translation>Impossible de trouver %1.</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal patch file!</source>
+        <translation>Impossible de trouver le fichier de correctifs de Tribunal !</translation>
+    </message>
+    <message>
+        <source>Could not find Bloodmoon data file!</source>
+        <translation>Impossible d&apos;installer le fichier de données de Bloodmoon !</translation>
+    </message>
+    <message>
+        <source>Updating Morrowind configuration file</source>
+        <translation>Mise à jour du fichier de configuration de Morrowind.</translation>
+    </message>
+    <message>
+        <source>%1 installation finished!</source>
+        <translation>Installation de %1 terminée !</translation>
+    </message>
+    <message>
+        <source>Extracting: %1</source>
+        <translation>Extraction : %1</translation>
+    </message>
+    <message>
+        <source>Failed to open InstallShield Cabinet File.</source>
+        <translation>Impossible d&apos;ouvrir le fichier InstallShield Cabinet.</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed.</source>
+        <translation>Échec lors de l&apos;ouverture de %1.</translation>
+    </message>
+    <message>
+        <source>Failed to extract %1.</source>
+        <translation>Échec lors de l&apos;extraction de %1.</translation>
+    </message>
+    <message>
+        <source>Complete path: %1</source>
+        <translation>Emplacement complet : %1.</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/wizard_ru.ts b/files/lang/wizard_ru.ts
new file mode 100644
index 0000000000..c467b5d33e
--- /dev/null
+++ b/files/lang/wizard_ru.ts
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>ComponentSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Components</source>
+        <translation>Выбор компонентов</translation>
+    </message>
+    <message>
+        <source>Which components should be installed?</source>
+        <translation>Какие компоненты должны быть установлены?</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select which official Morrowind expansions should be installed. For best results, it is recommended to have both expansions installed.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to install expansions later by re-running this Wizard.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Выберите, какие дополнения для Morrowind нужно установить. Для достижения наилучших результатов рекомендуется установить оба дополнения.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Подсказка:&lt;/span&gt; Можно установить дополнения позже, запустив этот Мастер установки заново.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Selected components:</source>
+        <translation>Выбранные компоненты:</translation>
+    </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Completing the OpenMW Wizard</source>
+        <translation>Завершение работы Мастера установки OpenMW</translation>
+    </message>
+    <message>
+        <source>Placeholder</source>
+        <translation>Placeholder</translation>
+    </message>
+</context>
+<context>
+    <name>ExistingInstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Existing Installation</source>
+        <translation>Выбрать установленную копию игры</translation>
+    </message>
+    <message>
+        <source>Select an existing installation for OpenMW to use or modify.</source>
+        <translation>Выбрать установленную копию игры для использования или изменения через OpenMW.</translation>
+    </message>
+    <message>
+        <source>Detected installations:</source>
+        <translation>Обнаруженные установленные копии:</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Выбрать...</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Import Settings</source>
+        <translation>Импортировать настройки</translation>
+    </message>
+    <message>
+        <source>Import settings from the Morrowind installation.</source>
+        <translation>Импортировать настройки из установленной копии Morrowind.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW needs to import settings from the Morrowind configuration file in order to function properly.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to import settings later by re-running this Wizard.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Чтобы OpenMW мог работать правильно, ему нужно импортировать настройки из файла с настройками Morrowind.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Подсказка:&lt;/span&gt; Также можно импортировать настройки позже, запустив Мастер импорта заново.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Import Settings From Morrowind.ini</source>
+        <translation>Импортировать настройки из Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Импортировать список подключенных аддонов и плагинов</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
+        <translation>Импортировать растровые шрифты из Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Шрифты, поставляемые с оригинальной игрой, становятся размытыми при масштабировании интерфейса и поддерживают ограниченное количество символов,
+поэтому в комплекте с OpenMW идет набор шрифтов, не имеющих этих проблем. Они используют технологию TrueType и весьма похожи на шрифты Morrowind.
+Включите эту опцию, если вы все равно хотите использовать оригинальные шрифты вместо шрифтов OpenMW, или если вы используете сторонние растровые шрифты.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation>Установка</translation>
+    </message>
+    <message>
+        <source>Please wait while Morrowind is installed on your computer.</source>
+        <translation>Пожалуйста, подождите, пока Morrowind устанавливается на ваш компьютер.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationTargetPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Installation Destination</source>
+        <translation>Выберите путь для установки</translation>
+    </message>
+    <message>
+        <source>Where should Morrowind be installed?</source>
+        <translation>Куда нужно установить Morrowind?</translation>
+    </message>
+    <message>
+        <source>Morrowind will be installed to the following location. </source>
+        <translation>Morrowind будет установлен в следующее место. </translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Выбрать...</translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Welcome to the OpenMW Wizard</source>
+        <translation>Добро пожаловать в Мастер установки</translation>
+    </message>
+    <message>
+        <source>This Wizard will help you install Morrowind and its add-ons for OpenMW to use.</source>
+        <translation>Этот Мастер поможет вам установить Morrowind и его дополнения, чтобы OpenMW мог их использовать.</translation>
+    </message>
+</context>
+<context>
+    <name>LanguageSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Morrowind Language</source>
+        <translation>Выберите язык вашей копии Morrowind</translation>
+    </message>
+    <message>
+        <source>What is the language of the Morrowind installation?</source>
+        <translation>Какой язык использует ваша копия Morrowind?</translation>
+    </message>
+    <message>
+        <source>Select the language of the Morrowind installation.</source>
+        <translation>Выберите язык, используемый вашей копией Morrowind.</translation>
+    </message>
+</context>
+<context>
+    <name>MethodSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Installation Method</source>
+        <translation>Выберите способ установки</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select how you would like to install &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Выберите способ установки &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Retail CD/DVD</source>
+        <translation>CD/DVD-диск</translation>
+    </message>
+    <message>
+        <source>Install from a retail disc to a new location.</source>
+        <translation>Установить игру с диска.</translation>
+    </message>
+    <message>
+        <source>Existing Installation</source>
+        <translation>Установленная копия игры</translation>
+    </message>
+    <message>
+        <source>Select an existing installation.</source>
+        <translation>Выбрать установленную копию игры.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t have a copy?</source>
+        <translation>Нет копии игры?</translation>
+    </message>
+    <message>
+        <source>Buy the game</source>
+        <translation>Купить игру</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;The Wizard needs to update settings in this file.&lt;br&gt;&lt;br&gt;Press &quot;Browse...&quot; to specify the location manually.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Не удалось найти Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;Мастеру требуется обновить настройки в этом файле.&lt;br&gt;&lt;br&gt;Нажмите &quot;Выбрать...&quot;, чтобы задать местоположение файла вручную.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>B&amp;rowse...</source>
+        <translation>&amp;Выбрать...</translation>
+    </message>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Выберите файл с настройками</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Morrowind.bsa&lt;/b&gt; is missing!&lt;br&gt;Make sure your Morrowind installation is complete.</source>
+        <translation>&lt;b&gt;Morrowind.bsa&lt;/b&gt; не найден!&lt;br&gt;Убедитесь, что Morrowind был установлен правильно.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;There may be a more recent version of Morrowind available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Может существовать более свежая версия Morrowind.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Все равно продолжить?&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Most recent Morrowind not detected</source>
+        <translation>Актуальная версия Morrowind не найдена</translation>
+    </message>
+    <message>
+        <source>Select a valid %1 installation media.&lt;br&gt;&lt;b&gt;Hint&lt;/b&gt;: make sure that it contains at least one &lt;b&gt;.cab&lt;/b&gt; file.</source>
+        <translation>Выберите корректный установочный дистрибутив %1.&lt;br&gt;&lt;b&gt;Подсказка&lt;/b&gt;: он должен содержать как минимум один &lt;b&gt;.cab&lt;/b&gt;-файл.</translation>
+    </message>
+    <message>
+        <source>There may be a more recent version of Morrowind available.&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?</source>
+        <translation>Может существовать более свежая версия Morrowind.&lt;br&gt;&lt;br&gt;Все равно продолжить?</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ComponentSelectionPage</name>
+    <message>
+        <source>&amp;Install</source>
+        <translation>&amp;Установить</translation>
+    </message>
+    <message>
+        <source>&amp;Skip</source>
+        <translation>&amp;Пропустить</translation>
+    </message>
+    <message>
+        <source>Morrowind		(installed)</source>
+        <translation>Morrowind		(установлен)</translation>
+    </message>
+    <message>
+        <source>Morrowind</source>
+        <translation>Morrowind</translation>
+    </message>
+    <message>
+        <source>Tribunal		(installed)</source>
+        <translation>Tribunal		(установлен)</translation>
+    </message>
+    <message>
+        <source>Tribunal</source>
+        <translation>Tribunal</translation>
+    </message>
+    <message>
+        <source>Bloodmoon		(installed)</source>
+        <translation>Bloodmoon		(установлен)</translation>
+    </message>
+    <message>
+        <source>Bloodmoon</source>
+        <translation>Bloodmoon</translation>
+    </message>
+    <message>
+        <source>About to install Tribunal after Bloodmoon</source>
+        <translation>Попытка установить Tribunal после Bloodmoon</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;You are about to install Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon is already installed on your computer.&lt;/p&gt;&lt;p&gt;However, it is recommended that you install Tribunal before Bloodmoon.&lt;/p&gt;&lt;p&gt;Would you like to re-install Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Вы собираетесь установить Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon уже установлен на ваш компьютер.&lt;/p&gt;&lt;p&gt;Tribunal рекомендуется устанавлить перед установкой Bloodmoon.&lt;/p&gt;&lt;p&gt;Желаете ли вы переустановить Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Re-install &amp;Bloodmoon</source>
+        <translation>Переустановить &amp;Bloodmoon</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ConclusionPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully installed Morrowind on your computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Мастер OpenMW успешно установил Morrowind на ваш компьютер.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully modified your existing Morrowind installation.&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Мастер OpenMW успешно завершил изменение вашей установленной копии Morrowind.&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard failed to install Morrowind on your computer.&lt;/p&gt;&lt;p&gt;Please report any bugs you might have encountered to our &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Make sure to include the installation log.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Мастеру OpenMW не удалось установить Morrowind на ваш компьютер.&lt;/p&gt;&lt;p&gt;Пожалуйста, сообщите о встреченных вами ошибках на наш &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;багтрекер&lt;/a&gt;.&lt;br/&gt;Не забудьте включить туда лог установки.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ExistingInstallationPage</name>
+    <message>
+        <source>No existing installations detected</source>
+        <translation>Установленные копии игры не найдены</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind configuration</source>
+        <translation>Попытка найти настройки Morrowind завершилась ошибкой</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Файл с настройками Morrowind (*.ini)</translation>
+    </message>
+    <message>
+        <source>Select Morrowind.esm (located in Data Files)</source>
+        <translation>Выберите Morrowind.esm (расположен в Data Files)</translation>
+    </message>
+    <message>
+        <source>Morrowind master file (Morrowind.esm)</source>
+        <translation>Мастер-файл Morrowind (Morrowind.esm)</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind files</source>
+        <translation>Не удалось обнаружить файлы Morrowind</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationPage</name>
+    <message>
+        <source>&lt;p&gt;Attempting to install component %1.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Попытка установить компонент %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Attempting to install component %1.</source>
+        <translation>Попытка установить компонент %1.</translation>
+    </message>
+    <message>
+        <source>%1 Installation</source>
+        <translation>Установка %1</translation>
+    </message>
+    <message>
+        <source>Select %1 installation media</source>
+        <translation>Выберите установочный дистрибутив %1</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: The installation was aborted by the user&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Ошибка: Установка была прервана пользователем&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Detected old version of component Morrowind.&lt;/p&gt;</source>
+        <translation>lt;p&gt;Обнаружена устаревшая версия компонента Morrowind.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Detected old version of component Morrowind.</source>
+        <translation>Обнаружена устаревшая версия компонента Morrowind.</translation>
+    </message>
+    <message>
+        <source>Morrowind Installation</source>
+        <translation>Установка Morrowind</translation>
+    </message>
+    <message>
+        <source>Installation finished</source>
+        <translation>Установка завершена</translation>
+    </message>
+    <message>
+        <source>Installation completed successfully!</source>
+        <translation>Установка успешно завершена!</translation>
+    </message>
+    <message>
+        <source>Installation failed!</source>
+        <translation>Установка не удалась!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: %1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Ошибка: %1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The Wizard has encountered an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The error reported was:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Press &amp;quot;Show Details...&amp;quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;При работе Мастера возникла ошибка&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Обнаруженная ошибка:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Нажмите &amp;quot;Показать детали...&amp;quot; для получения дополнительной информации.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>An error occurred</source>
+        <translation>Произошла ошибка</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationTargetPage</name>
+    <message>
+        <source>Error creating destination</source>
+        <translation>Не удалось создать директорию назначения</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось создать директорию назначения&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Пожалуйста, проверьте права доступа и повторите попытку, или же выберите другую директорию.&lt;/p&gt;&lt;/body&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not write to the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось записать данные в директорию назначения&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Пожалуйста, проверьте права доступа и повторите попытку, или же выберите другую директорию.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The destination directory is not empty&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An existing Morrowind installation is present in the specified location.&lt;/p&gt;&lt;p&gt;Please specify a different location, or go back and select the location as an existing installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Директория назначения содержит файлы&lt;/b&gt;&lt;/p&gt;&lt;p&gt;В указанной директории найдена установленная копия Morrowind.&lt;/p&gt;&lt;p&gt;Пожалуйста, выберите другую директорию, или же вернитесь на предыдущий шаг и выберите подключение установленной копии игры.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Insufficient permissions</source>
+        <translation>Не хватает прав доступа</translation>
+    </message>
+    <message>
+        <source>Destination not empty</source>
+        <translation>Выбранная директория не пустая</translation>
+    </message>
+    <message>
+        <source>Select where to install Morrowind</source>
+        <translation>Выберите, куда установить Morrowind</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::LanguageSelectionPage</name>
+    <message>
+        <source>English</source>
+        <translation>Английский</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Французский</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Немецкий</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Итальянский</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Польский</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Русский</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Испанский</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::MainWizard</name>
+    <message>
+        <source>OpenMW Wizard</source>
+        <translation>Мастер OpenMW</translation>
+    </message>
+    <message>
+        <source>Error opening Wizard log file</source>
+        <translation>Не удалось открыть лог-файл Мастера</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for writing&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось открыть %1 для записи&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for reading&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось открыть %1 для чтения&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Не удалось открыть файл с настройками OpenMW</translation>
+    </message>
+    <message>
+        <source>Quit Wizard</source>
+        <translation>Завершить работу Мастера</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to exit the Wizard?</source>
+        <translation>Вы уверены, что хотите завершить работу Мастера?</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory</source>
+        <translation>Не удалось создать директорию для настроек OpenMW</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Не удалось создать %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Пожалуйста, проверьте права доступа и повторите попытку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Не удалось записать данные в файл с настройками OpenMW</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::UnshieldWorker</name>
+    <message>
+        <source>Failed to open Morrowind configuration file!</source>
+        <translation>Не удалось открыть файл с настройками Morrowind!</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed: %2.</source>
+        <translation>Попытка открыть %1 не удалась: %2.</translation>
+    </message>
+    <message>
+        <source>Failed to write Morrowind configuration file!</source>
+        <translation>Не удалось записать данные в файл с настройками Morrowind!</translation>
+    </message>
+    <message>
+        <source>Writing to %1 failed: %2.</source>
+        <translation>Запись в %1 завершилась с ошибкой: %2.</translation>
+    </message>
+    <message>
+        <source>Installing: %1</source>
+        <translation>Установка: %1</translation>
+    </message>
+    <message>
+        <source>Installing: %1 directory</source>
+        <translation>Установка: директория %1</translation>
+    </message>
+    <message>
+        <source>Installation finished!</source>
+        <translation>Установка завершена!</translation>
+    </message>
+    <message>
+        <source>Component parameter is invalid!</source>
+        <translation>Некорректный параметр для компонента!</translation>
+    </message>
+    <message>
+        <source>An invalid component parameter was supplied.</source>
+        <translation>Задан некорректный параметр для компонента.</translation>
+    </message>
+    <message>
+        <source>Failed to find a valid archive containing %1.bsa! Retrying.</source>
+        <translation>Не удалось найти архив, содержащий %1.bsa! Повторная попытка.</translation>
+    </message>
+    <message>
+        <source>Installing %1</source>
+        <translation>Установка %1</translation>
+    </message>
+    <message>
+        <source>Installation media path not set!</source>
+        <translation>путь к установочному дистрибутиву не задан!</translation>
+    </message>
+    <message>
+        <source>The source path for %1 was not set.</source>
+        <translation>Исходный пусть для %1 не задан.</translation>
+    </message>
+    <message>
+        <source>Cannot create temporary directory!</source>
+        <translation>Не удалось создать временную директорию!</translation>
+    </message>
+    <message>
+        <source>Failed to create %1.</source>
+        <translation>Не удалось создать %1.</translation>
+    </message>
+    <message>
+        <source>Cannot move into temporary directory!</source>
+        <translation>Не удалось переместить во временную директорию!</translation>
+    </message>
+    <message>
+        <source>Failed to move into %1.</source>
+        <translation>Не удалось переместить в %1.</translation>
+    </message>
+    <message>
+        <source>Moving installation files</source>
+        <translation>Перемещение файлов установки</translation>
+    </message>
+    <message>
+        <source>Could not install directory!</source>
+        <translation>Не удалось установить директорию!</translation>
+    </message>
+    <message>
+        <source>Installing %1 to %2 failed.</source>
+        <translation>Не удалось установить %1 в %2.</translation>
+    </message>
+    <message>
+        <source>Could not install translation file!</source>
+        <translation>Не удалось установить файл с переводом!</translation>
+    </message>
+    <message>
+        <source>Failed to install *%1 files.</source>
+        <translation>Не удалось установить файлы *%1.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind data file!</source>
+        <translation>Не удалось установить файл с данными Morrowind!</translation>
+    </message>
+    <message>
+        <source>Failed to install %1.</source>
+        <translation>Не удалось установить %1.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind configuration file!</source>
+        <translation>Не удалось установить файл с настройками Morrowind!</translation>
+    </message>
+    <message>
+        <source>Installing: Sound directory</source>
+        <translation>Установка: директория Sound</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal data file!</source>
+        <translation>Не удалось найти файл с данными Tribunal!</translation>
+    </message>
+    <message>
+        <source>Failed to find %1.</source>
+        <translation>Не удалось найти %1.</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal patch file!</source>
+        <translation>Не удалось найти файл с патчем для Tribunal!</translation>
+    </message>
+    <message>
+        <source>Could not find Bloodmoon data file!</source>
+        <translation>Не удалось найти файл с данными Bloodmoon!</translation>
+    </message>
+    <message>
+        <source>Updating Morrowind configuration file</source>
+        <translation>Обновление файла с настройками Morrowind</translation>
+    </message>
+    <message>
+        <source>%1 installation finished!</source>
+        <translation>Установка %1 завершена!</translation>
+    </message>
+    <message>
+        <source>Extracting: %1</source>
+        <translation>Извлечение: %1</translation>
+    </message>
+    <message>
+        <source>Failed to open InstallShield Cabinet File.</source>
+        <translation>Не удалось открыть файл InstallShield Cabinet.</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed.</source>
+        <translation>Не удалось открыть %1.</translation>
+    </message>
+    <message>
+        <source>Failed to extract %1.</source>
+        <translation>Не удалось извлечь %1.</translation>
+    </message>
+    <message>
+        <source>Complete path: %1</source>
+        <translation>Полный путь: %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/wizard_sv.ts b/files/lang/wizard_sv.ts
new file mode 100644
index 0000000000..099a95d128
--- /dev/null
+++ b/files/lang/wizard_sv.ts
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv_SE">
+<context>
+    <name>ComponentSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Components</source>
+        <translation>Välj komponenter</translation>
+    </message>
+    <message>
+        <source>Which components should be installed?</source>
+        <translation>Vilka komponenter ska installeras?</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select which official Morrowind expansions should be installed. For best results, it is recommended to have both expansions installed.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to install expansions later by re-running this Wizard.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Välj vilka officiella Morrowindexpansioner som ska installeras. För bäst resultat rekommenderas att båda expansionerna installeras.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; Det är möjligt att installera expansioner senare genom att köra denna guide igen.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Selected components:</source>
+        <translation>Valda komponenter:</translation>
+    </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Completing the OpenMW Wizard</source>
+        <translation>Färdigställer OpenMWs installationsguide</translation>
+    </message>
+    <message>
+        <source>Placeholder</source>
+        <translation>Placeholder</translation>
+    </message>
+</context>
+<context>
+    <name>ExistingInstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Existing Installation</source>
+        <translation>Välj befintlig installation</translation>
+    </message>
+    <message>
+        <source>Select an existing installation for OpenMW to use or modify.</source>
+        <translation>Välj en befintlig installation som OpenMW kan använda eller modifiera.</translation>
+    </message>
+    <message>
+        <source>Detected installations:</source>
+        <translation>Hittade installationer:</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Import Settings</source>
+        <translation>Importera inställningar</translation>
+    </message>
+    <message>
+        <source>Import settings from the Morrowind installation.</source>
+        <translation>Importera inställningar från Morrowindinstallationen.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW needs to import settings from the Morrowind configuration file in order to function properly.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to import settings later by re-running this Wizard.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW behöver importera inställningar från Morrowinds konfigurationsfil för att fungera korrekt.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Notera:&lt;/span&gt; Det är möjligt att importera inställningarna senare genom att köra denna guide igen.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Import Settings From Morrowind.ini</source>
+        <translation>Importera inställningar från Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Importera tillägg- och pluginmarkering</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
+        <translation>Importera bitmapfonter från Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Fonter som kommer med ordinarie spelmotor är suddiga med gränssnittsuppskalning och stödjer bara ett litet antal tecken,
+så OpenMW tillhandahåller därför andra fonter för att undvika dessa problem. Dessa fonter använder TrueType-teknologi och är ganska lika
+de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ordinarie fonter istället för OpenMWs, alternativt om du använder egna bitmapfonter.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation>Installerar</translation>
+    </message>
+    <message>
+        <source>Please wait while Morrowind is installed on your computer.</source>
+        <translation>Vänta medan Morrowind installeras på din dator.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationTargetPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Installation Destination</source>
+        <translation>Välj installationsplats</translation>
+    </message>
+    <message>
+        <source>Where should Morrowind be installed?</source>
+        <translation>Var ska Morrowind installeras?</translation>
+    </message>
+    <message>
+        <source>Morrowind will be installed to the following location. </source>
+        <translation>Morrowind kommer installeras på följande plats. </translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Welcome to the OpenMW Wizard</source>
+        <translation>Välkommen till OpenMWs installationsguide</translation>
+    </message>
+    <message>
+        <source>This Wizard will help you install Morrowind and its add-ons for OpenMW to use.</source>
+        <translation>Denna guide hjälper dig att installera Morrowind och expansionerna för OpenMW.</translation>
+    </message>
+</context>
+<context>
+    <name>LanguageSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Morrowind Language</source>
+        <translation>Välj Morrowinds språk</translation>
+    </message>
+    <message>
+        <source>What is the language of the Morrowind installation?</source>
+        <translation>Vad är språket på Morrowindinstallationen?</translation>
+    </message>
+    <message>
+        <source>Select the language of the Morrowind installation.</source>
+        <translation>Välj språket på Morrowindinstallationen.</translation>
+    </message>
+</context>
+<context>
+    <name>MethodSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Installation Method</source>
+        <translation>Välj installationsmetod</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select how you would like to install &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Välj hur du vill installera &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Retail CD/DVD</source>
+        <translation>Köpt CD/DVD</translation>
+    </message>
+    <message>
+        <source>Install from a retail disc to a new location.</source>
+        <translation>Installera från en köpt skiva till en ny plats.</translation>
+    </message>
+    <message>
+        <source>Existing Installation</source>
+        <translation>Befintlig installation</translation>
+    </message>
+    <message>
+        <source>Select an existing installation.</source>
+        <translation>Välj en befintlig installation.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t have a copy?</source>
+        <translation>Äger du inte spelet?</translation>
+    </message>
+    <message>
+        <source>Buy the game</source>
+        <translation>Köp spelet</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;The Wizard needs to update settings in this file.&lt;br&gt;&lt;br&gt;Press &quot;Browse...&quot; to specify the location manually.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte hitta Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;Guiden behöver uppdatera inställningarna i denna fil.&lt;br&gt;&lt;br&gt;Tryck på &quot;Bläddra...&quot; för att specificera filens plats manuellt.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>B&amp;rowse...</source>
+        <translation>B&amp;läddra...</translation>
+    </message>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Välj konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Morrowind.bsa&lt;/b&gt; is missing!&lt;br&gt;Make sure your Morrowind installation is complete.</source>
+        <translation>&lt;b&gt;Morrowind.bsa&lt;/b&gt; saknas!&lt;br&gt;Se till att din Morrowindinstallation är komplett.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;There may be a more recent version of Morrowind available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Det kan finnas nyare version av Morrowind tillgänglig.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vill du fortsätta ändå?&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Most recent Morrowind not detected</source>
+        <translation>Senaste versionen av Morrowind hittades inte</translation>
+    </message>
+    <message>
+        <source>Select a valid %1 installation media.&lt;br&gt;&lt;b&gt;Hint&lt;/b&gt;: make sure that it contains at least one &lt;b&gt;.cab&lt;/b&gt; file.</source>
+        <translation>Välj ett giltigt %1 installationsmedium.&lt;br&gt;&lt;b&gt;Tips&lt;/b&gt;: säkerställ att det finns åtminstone en &lt;b&gt;.cab&lt;/b&gt;-fil.</translation>
+    </message>
+    <message>
+        <source>There may be a more recent version of Morrowind available.&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?</source>
+        <translation>Det kan finnas en mer uppdaterad version av Morrowind tillgänglig.&lt;br&gt;&lt;br&gt;Vill du fortsätta ändå?</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ComponentSelectionPage</name>
+    <message>
+        <source>&amp;Install</source>
+        <translation>&amp;Installera</translation>
+    </message>
+    <message>
+        <source>&amp;Skip</source>
+        <translation>&amp;Hoppa över</translation>
+    </message>
+    <message>
+        <source>Morrowind		(installed)</source>
+        <translation>Morrowind		(installerat)</translation>
+    </message>
+    <message>
+        <source>Morrowind</source>
+        <translation>Morrowind</translation>
+    </message>
+    <message>
+        <source>Tribunal		(installed)</source>
+        <translation>Tribunal		(installerat)</translation>
+    </message>
+    <message>
+        <source>Tribunal</source>
+        <translation>Tribunal</translation>
+    </message>
+    <message>
+        <source>Bloodmoon		(installed)</source>
+        <translation>Bloodmoon		(installerat)</translation>
+    </message>
+    <message>
+        <source>Bloodmoon</source>
+        <translation>Bloodmoon</translation>
+    </message>
+    <message>
+        <source>About to install Tribunal after Bloodmoon</source>
+        <translation>På väg att installera Tribunal efter Bloodmoon</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;You are about to install Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon is already installed on your computer.&lt;/p&gt;&lt;p&gt;However, it is recommended that you install Tribunal before Bloodmoon.&lt;/p&gt;&lt;p&gt;Would you like to re-install Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Du håller på att installera Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon finns redan installerat på din dator.&lt;/p&gt;&lt;p&gt;Det är dock rekommenderat att du installerar Tribunal före Bloodmoon.&lt;/p&gt;&lt;p&gt;Vill du ominstallera Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Re-install &amp;Bloodmoon</source>
+        <translation>Ominstallera &amp;Bloodmoon</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ConclusionPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully installed Morrowind on your computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMWs Installationsguide har installerat Morrowind på din dator.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully modified your existing Morrowind installation.&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMWs installationsguide har justerat din befintliga Morrowindinstallation.&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard failed to install Morrowind on your computer.&lt;/p&gt;&lt;p&gt;Please report any bugs you might have encountered to our &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Make sure to include the installation log.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMWs installationsguide misslyckades med att installera Morrowind på din dator.&lt;/p&gt;&lt;p&gt;Vänligen rapportera eventuella buggar på vår &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Se till att du inkluderar installationsloggen.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ExistingInstallationPage</name>
+    <message>
+        <source>No existing installations detected</source>
+        <translation>Inga befintliga installationer hittades</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind configuration</source>
+        <translation>Kunde inte hitta Morrowind-konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Morrowind konfigurationsfil (*.ini)</translation>
+    </message>
+    <message>
+        <source>Select Morrowind.esm (located in Data Files)</source>
+        <translation>Markera Morrowind.esm (hittas i Data Files)</translation>
+    </message>
+    <message>
+        <source>Morrowind master file (Morrowind.esm)</source>
+        <translation>Morrowind masterfil (Morrowind.esm)</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind files</source>
+        <translation>Kunde inte hitta Morrowindfiler</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationPage</name>
+    <message>
+        <source>&lt;p&gt;Attempting to install component %1.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Försöker installera komponent %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Attempting to install component %1.</source>
+        <translation>Försöker installera komponent %1.</translation>
+    </message>
+    <message>
+        <source>%1 Installation</source>
+        <translation>%1 Installation</translation>
+    </message>
+    <message>
+        <source>Select %1 installation media</source>
+        <translation>Välj %1 installationsmedia</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: The installation was aborted by the user&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Fel: Installationen avbröts av användaren&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Detected old version of component Morrowind.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Hittade gammal version av Morrowind.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Detected old version of component Morrowind.</source>
+        <translation>Hittade gammal version av komponenten Morrowind.</translation>
+    </message>
+    <message>
+        <source>Morrowind Installation</source>
+        <translation>Installation av Morrowind</translation>
+    </message>
+    <message>
+        <source>Installation finished</source>
+        <translation>Installationen klar</translation>
+    </message>
+    <message>
+        <source>Installation completed successfully!</source>
+        <translation>Installationen slutfördes!</translation>
+    </message>
+    <message>
+        <source>Installation failed!</source>
+        <translation>Installationen misslyckades!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: %1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Fel: %1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The Wizard has encountered an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The error reported was:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Press &amp;quot;Show Details...&amp;quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Guiden har stött på ett fel&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Felet som rapporterades var:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Tryck på &amp;quot;Visa detaljer...&amp;quot; för mer information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>An error occurred</source>
+        <translation>Ett fel uppstod</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationTargetPage</name>
+    <message>
+        <source>Error creating destination</source>
+        <translation>Fel när målkatalogen skulle skapas</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte skapa målkatalogen&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen, eller specificera en annan katalog.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not write to the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte skriva till målkatalogen&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen, eller specificera en annan katalog.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The destination directory is not empty&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An existing Morrowind installation is present in the specified location.&lt;/p&gt;&lt;p&gt;Please specify a different location, or go back and select the location as an existing installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Målkatalogen är inte tom&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Det finns en befintlig Morrowindinstallation i den specificerade katalogen.&lt;/p&gt;&lt;p&gt;Välj en annan katalog eller gå tillbaka och välj katalogen som en befintlig installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Insufficient permissions</source>
+        <translation>Otillräckliga behörigheter</translation>
+    </message>
+    <message>
+        <source>Destination not empty</source>
+        <translation>Platsen är inte tom</translation>
+    </message>
+    <message>
+        <source>Select where to install Morrowind</source>
+        <translation>Välj där Morrowind ska installeras</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::LanguageSelectionPage</name>
+    <message>
+        <source>English</source>
+        <translation>Engelska</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Franska</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Tyska</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Italienska</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Polska</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Ryska</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Spanska</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::MainWizard</name>
+    <message>
+        <source>OpenMW Wizard</source>
+        <translation>OpenMW installationsguide</translation>
+    </message>
+    <message>
+        <source>Error opening Wizard log file</source>
+        <translation>Kunde inte öppna guidens loggfil</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for writing&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte öppna %1 för att skriva&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for reading&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte öppna %1 för läsning&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle öppnas</translation>
+    </message>
+    <message>
+        <source>Quit Wizard</source>
+        <translation>Avsluta guiden</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to exit the Wizard?</source>
+        <translation>Är du säker på att du vill avsluta guiden?</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory</source>
+        <translation>Fel vid skapande av OpenMW-konfigurationskatalog</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte skapa %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Kunde inte skriva OpenMW-konfigurationsfil</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::UnshieldWorker</name>
+    <message>
+        <source>Failed to open Morrowind configuration file!</source>
+        <translation>Kunde inte öppna en Morrowind-konfigurationsfil!</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed: %2.</source>
+        <translation>Öppnar %1 misslyckad: %2.</translation>
+    </message>
+    <message>
+        <source>Failed to write Morrowind configuration file!</source>
+        <translation>Kunde inte skriva en Morrowind-konfigurationsfil!</translation>
+    </message>
+    <message>
+        <source>Writing to %1 failed: %2.</source>
+        <translation>Skriver till %1 misslyckad: %2.</translation>
+    </message>
+    <message>
+        <source>Installing: %1</source>
+        <translation>Installerar: %1</translation>
+    </message>
+    <message>
+        <source>Installing: %1 directory</source>
+        <translation>Installerar: %1 katalog</translation>
+    </message>
+    <message>
+        <source>Installation finished!</source>
+        <translation>Installationen slutförd!</translation>
+    </message>
+    <message>
+        <source>Component parameter is invalid!</source>
+        <translation>Komponentparametern är ogiltig!</translation>
+    </message>
+    <message>
+        <source>An invalid component parameter was supplied.</source>
+        <translation>En ogiltig komponentparameter angavs.</translation>
+    </message>
+    <message>
+        <source>Failed to find a valid archive containing %1.bsa! Retrying.</source>
+        <translation>Misslyckades att hitta ett giltigt arkiv som innehåller %1.bsa! Försöker igen.</translation>
+    </message>
+    <message>
+        <source>Installing %1</source>
+        <translation>Installerar %1</translation>
+    </message>
+    <message>
+        <source>Installation media path not set!</source>
+        <translation>Sökväg till installationsmedia inte inställd!</translation>
+    </message>
+    <message>
+        <source>The source path for %1 was not set.</source>
+        <translation>Källsökvägen för %1 ställdes inte in.</translation>
+    </message>
+    <message>
+        <source>Cannot create temporary directory!</source>
+        <translation>Kan inte skapa temporär katalog!</translation>
+    </message>
+    <message>
+        <source>Failed to create %1.</source>
+        <translation>Kunde inte skapa %1.</translation>
+    </message>
+    <message>
+        <source>Cannot move into temporary directory!</source>
+        <translation>Kan inte flytta till temporär katalog!</translation>
+    </message>
+    <message>
+        <source>Failed to move into %1.</source>
+        <translation>Misslyckades att flytta till %1.</translation>
+    </message>
+    <message>
+        <source>Moving installation files</source>
+        <translation>Flyttar installationsfiler</translation>
+    </message>
+    <message>
+        <source>Could not install directory!</source>
+        <translation>Kunde inte installera katalog!</translation>
+    </message>
+    <message>
+        <source>Installing %1 to %2 failed.</source>
+        <translation>Installation %1 till %2 misslyckades.</translation>
+    </message>
+    <message>
+        <source>Could not install translation file!</source>
+        <translation>Kunde inte installera översättningsfil!</translation>
+    </message>
+    <message>
+        <source>Failed to install *%1 files.</source>
+        <translation>Kunde inte installera *%1 filer.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind data file!</source>
+        <translation>Kunde inte installera Morrowind-datafil!</translation>
+    </message>
+    <message>
+        <source>Failed to install %1.</source>
+        <translation>Misslyckades att installera %1.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind configuration file!</source>
+        <translation>Kunde inte installera Morrowind-konfigurationsfil!</translation>
+    </message>
+    <message>
+        <source>Installing: Sound directory</source>
+        <translation>Installerar: Ljudkatalog</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal data file!</source>
+        <translation>Tribunal-datafil hittades inte!</translation>
+    </message>
+    <message>
+        <source>Failed to find %1.</source>
+        <translation>Misslyckades att hitta %1.</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal patch file!</source>
+        <translation>Tribunal-patchfil hittades inte!</translation>
+    </message>
+    <message>
+        <source>Could not find Bloodmoon data file!</source>
+        <translation>Bloodmoon-datafil hittades inte!</translation>
+    </message>
+    <message>
+        <source>Updating Morrowind configuration file</source>
+        <translation>Uppdaterar Morrowind-konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>%1 installation finished!</source>
+        <translation>%1 installation klar!</translation>
+    </message>
+    <message>
+        <source>Extracting: %1</source>
+        <translation>Extraherar: %1</translation>
+    </message>
+    <message>
+        <source>Failed to open InstallShield Cabinet File.</source>
+        <translation>Misslyckades att öppna en InstallShield Cabinet-fil.</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed.</source>
+        <translation>Misslyckades att öppna %1.</translation>
+    </message>
+    <message>
+        <source>Failed to extract %1.</source>
+        <translation>Misslyckades att extrahera %1.</translation>
+    </message>
+    <message>
+        <source>Complete path: %1</source>
+        <translation>Färdigställ sökväg: %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/launcher/icons/fallback/16x16/document-new.svg b/files/launcher/icons/fallback/16x16/document-new.svg
new file mode 100644
index 0000000000..a212e2e0c0
--- /dev/null
+++ b/files/launcher/icons/fallback/16x16/document-new.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2163"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2267857,0,0,0.24804749,6.7279756,5.1096472)"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.24568457,0,0,0.264584,4.1577377,1.8519562)" />
+  </defs>
+  <g
+     id="document-new"
+     transform="matrix(3.7795278,0,0,3.7795176,-128.00003,-187.99948)"
+     style="display:inline">
+    <path
+       id="rect2091"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.254959px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 34.131256,49.74166 v 4.233344 h 3.439583 V 49.74166 Z m 0.245683,0.264583 h 2.948216 v 3.704178 h -2.948216 z" />
+    <ellipse
+       style="display:inline;fill:#fdb433;fill-opacity:1;stroke:#000000;stroke-width:0"
+       id="path1"
+       cx="37.306255"
+       cy="51.329163"
+       rx="0.79374993"
+       ry="0.79375207" />
+  </g>
+</svg>
diff --git a/files/launcher/icons/fallback/16x16/edit-clear.svg b/files/launcher/icons/fallback/16x16/edit-clear.svg
new file mode 100644
index 0000000000..e1d10b86ef
--- /dev/null
+++ b/files/launcher/icons/fallback/16x16/edit-clear.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 0.48 0.48"
+   fill="none"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="edit-clear.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="45.254834"
+     inkscape:cx="2.662699"
+     inkscape:cy="5.469029"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M 0.13694139,0.11547994 C 0.15035255,0.09940317 0.1581558,0.09 0.18,0.09 h 0.21690957 c 0.0147981,0 0.0360025,-8.4375e-4 0.0457552,0.0093808 C 0.45235556,0.10954567 0.45,0.12998958 0.45,0.143625 v 0.22275 c 0,0.0136354 1.125e-5,0.0310325 -0.009679,0.0411983 C 0.43056805,0.41780145 0.4117077,0.42 0.3969096,0.42 H 0.18 C 0.1581558,0.42 0.15035255,0.410597 0.13694145,0.3945203 L 0.03745556,0.27 c -0.0099407,-0.0119167 -0.0099407,-0.0180843 0,-0.03 z m 0.0697293,0.057728 c 0.00691,-0.006444 0.0181144,-0.006444 0.0250269,0 l 0.0500536,0.0466693 0.0500536,-0.0466693 c 0.00691,-0.006444 0.0181162,-0.006444 0.0250269,0 l 0.0125134,0.0116673 c 0.006912,0.006444 0.006912,0.0168905 0,0.0233347 l -0.0500537,0.0466684 0.0500537,0.0466702 c 0.006912,0.006444 0.006912,0.0168914 0,0.0233347 l -0.0125134,0.0116673 c -0.00691,0.006444 -0.0181162,0.006444 -0.0250269,0 l -0.0500536,-0.0466684 -0.0500536,0.0466684 c -0.006912,0.006444 -0.0181162,0.006444 -0.0250269,0 L 0.1941564,0.32488327 c -0.006911,-0.006444 -0.006911,-0.0168914 0,-0.0233347 L 0.2442109,0.25487835 0.1941564,0.20820994 c -0.006911,-0.006444 -0.006911,-0.0168905 0,-0.0233347 z"
+     fill="#000000"
+     id="path1"
+     style="stroke-width:0.0170879"
+     sodipodi:nodetypes="csscsscssccccccccccccccccccccccccc" />
+</svg>
diff --git a/files/launcher/icons/fallback/16x16/edit-copy.svg b/files/launcher/icons/fallback/16x16/edit-copy.svg
new file mode 100644
index 0000000000..4933e2267e
--- /dev/null
+++ b/files/launcher/icons/fallback/16x16/edit-copy.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 0.32 0.32"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="edit-copy.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="4.105"
+     inkscape:cx="8.6479902"
+     inkscape:cy="45.188794"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 0,0 V 0.26 H 0.06 V 0.24 H 0.02 V 0.02 H 0.24 V 0.06 H 0.06 V 0.32 H 0.32 V 0.06 H 0.26 C 0.25987392,0.04344927 0.25978913,0.01654867 0.26,0 Z M 0.08,0.08 H 0.3 V 0.3 H 0.08 Z M 0.1,0.1 V 0.12 H 0.28 V 0.1 Z m 0,0.04 V 0.16 H 0.28 V 0.14 Z m 0,0.04 V 0.2 H 0.2 V 0.18 Z"
+     fill="#808080"
+     overflow="visible"
+     style="fill:#888a85;fill-opacity:1;stroke-width:0.0255795;marker:none"
+     color="#000000"
+     id="path1"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccc" />
+</svg>
diff --git a/files/launcher/icons/fallback/16x16/edit-delete.svg b/files/launcher/icons/fallback/16x16/edit-delete.svg
new file mode 100644
index 0000000000..ff86e2020e
--- /dev/null
+++ b/files/launcher/icons/fallback/16x16/edit-delete.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1" />
+  <title
+     id="title1">clear</title>
+  <style
+     type="text/css"
+     id="style1">* { fill: #dd3333 }</style>
+  <path
+     d="M 8,0 A 8,8 0 1 0 16,8 8,8 0 0 0 8,0 Z M 12.528,11.392 11.4,12.52 8,9.128 4.608,12.528 3.472,11.392 6.872,8 3.472,4.608 4.608,3.472 8,6.872 11.392,3.48 12.52,4.608 9.128,8 Z"
+     id="path1"
+     style="stroke-width:0.8" />
+  <metadata
+     id="metadata1">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>clear</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/files/launcher/icons/fallback/16x16/view-refresh.svg b/files/launcher/icons/fallback/16x16/view-refresh.svg
new file mode 100644
index 0000000000..8401259040
--- /dev/null
+++ b/files/launcher/icons/fallback/16x16/view-refresh.svg
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient3">
+      <stop
+         style="stop-color:#6990c0;stop-opacity:1;"
+         offset="0"
+         id="stop3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2">
+      <stop
+         style="stop-color:#6990c0;stop-opacity:1;"
+         offset="0"
+         id="stop2" />
+    </linearGradient>
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2146"
+       x1="61.899818"
+       y1="249"
+       x2="76.100182"
+       y2="249"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-61">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795278,0,0,3.7795278,-189.44141,-219.41797)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2096"
+       x1="50.281166"
+       y1="62.838539"
+       x2="52.926998"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098-8"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient2"
+       id="linearGradient2096-5"
+       x1="50.286324"
+       y1="62.972603"
+       x2="52.024643"
+       y2="62.967445"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.27492098,-0.52917219)" />
+    <linearGradient
+       xlink:href="#linearGradient3"
+       id="linearGradient2098-4"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.3228271,-0.79375592)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2092"
+       x1="45.243748"
+       y1="62.838539"
+       x2="47.88958"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.26458362)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2094"
+       x1="44.989498"
+       y1="61.780205"
+       x2="46.088139"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.79373763)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098-4-0"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.3228271,-0.79375592)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2096-5-4"
+       x1="50.286324"
+       y1="62.972603"
+       x2="52.024643"
+       y2="62.967445"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.27492098,-0.52917219)" />
+  </defs>
+  <g
+     id="view-refresh"
+     transform="matrix(0,3.779101,-3.7009417,0,239.09292,-187.97786)"
+     style="display:inline;fill:#6990e2;fill-opacity:1">
+    <path
+       d="m 50.270649,61.097671 v 2.728844 l -0.165515,-0.295618 c -0.200301,-0.215272 -0.487064,0.07114 -0.294515,0.303831 l 0.496163,0.701273 c 0.08277,0.08969 0.349994,0.08969 0.432762,0 l 0.502632,-0.682198 c 0.08345,-0.08895 0.08345,-0.233953 0,-0.322906 -0.08277,-0.08969 -0.217568,-0.08969 -0.300336,0 l -0.141964,0.295618 v -2.728788 c -0.0035,-0.195933 0.01021,-0.357832 0.192519,-0.361564 h 0.257917 c 0.281511,-6.47e-4 0.281511,-0.45415 0,-0.454797 h -0.522618 c -0.416012,0.0038 -0.460565,0.369203 -0.457045,0.816305 z m 2.205154,-0.06817 c -0.200301,0.215272 0.100035,0.538178 0.300336,0.322906 l 0.140712,-0.295615 v 2.728844 c 0.0035,0.195934 -0.0091,0.357776 -0.191449,0.361508 h -0.522618 c -0.281511,6.47e-4 -0.281511,0.45415 0,0.454797 h 0.522618 c 0.416013,-0.0038 0.724196,-0.369259 0.720675,-0.816363 v -2.728786 l 0.166901,0.295615 c 0.08277,0.08969 0.217568,0.08969 0.300336,0 0.08345,-0.08895 0.08345,-0.233953 0,-0.322906 l -0.50243,-0.682195 c -0.08277,-0.08968 -0.349876,-0.08968 -0.432643,0 z"
+       id="path1"
+       style="overflow:hidden;fill:#6890e2;fill-opacity:1;stroke-width:0.00514101" />
+  </g>
+</svg>
diff --git a/files/launcher/icons/tango/index.theme b/files/launcher/icons/fallback/index.theme
similarity index 67%
rename from files/launcher/icons/tango/index.theme
rename to files/launcher/icons/fallback/index.theme
index 1f54489ebb..ac524b79b5 100644
--- a/files/launcher/icons/tango/index.theme
+++ b/files/launcher/icons/fallback/index.theme
@@ -1,6 +1,5 @@
 [Icon Theme]
-Name=Tango
-Comment=Tango Theme
+Name=Fallback
 Inherits=default
 Directories=16x16
 
diff --git a/files/launcher/icons/tango/16x16/document-new.png b/files/launcher/icons/tango/16x16/document-new.png
deleted file mode 100644
index 4c3efdd6fa..0000000000
Binary files a/files/launcher/icons/tango/16x16/document-new.png and /dev/null differ
diff --git a/files/launcher/icons/tango/16x16/edit-clear.png b/files/launcher/icons/tango/16x16/edit-clear.png
deleted file mode 100644
index 74684bfb5d..0000000000
Binary files a/files/launcher/icons/tango/16x16/edit-clear.png and /dev/null differ
diff --git a/files/launcher/icons/tango/16x16/edit-copy.png b/files/launcher/icons/tango/16x16/edit-copy.png
deleted file mode 100644
index 8dd48c4949..0000000000
Binary files a/files/launcher/icons/tango/16x16/edit-copy.png and /dev/null differ
diff --git a/files/launcher/icons/tango/16x16/edit-delete.png b/files/launcher/icons/tango/16x16/edit-delete.png
deleted file mode 100644
index d7667c36b4..0000000000
Binary files a/files/launcher/icons/tango/16x16/edit-delete.png and /dev/null differ
diff --git a/files/launcher/icons/tango/16x16/view-refresh.png b/files/launcher/icons/tango/16x16/view-refresh.png
deleted file mode 100644
index 3fd71d6e59..0000000000
Binary files a/files/launcher/icons/tango/16x16/view-refresh.png and /dev/null differ
diff --git a/files/launcher/images/openmw-header.png b/files/launcher/images/openmw-header.png
index 6c88d8f549..81961c411e 100755
Binary files a/files/launcher/images/openmw-header.png and b/files/launcher/images/openmw-header.png differ
diff --git a/files/launcher/launcher.qrc b/files/launcher/launcher.qrc
index 766f636468..b7a7a19c16 100644
--- a/files/launcher/launcher.qrc
+++ b/files/launcher/launcher.qrc
@@ -7,12 +7,12 @@
     <file alias="preferences-advanced.png">images/preferences-advanced.png</file>
     <file alias="preferences-video.png">images/preferences-video.png</file>
 </qresource>
-<qresource prefix="icons/tango">
-    <file alias="index.theme">icons/tango/index.theme</file>
-    <file alias="16x16/document-new.png">icons/tango/16x16/document-new.png</file>
-    <file alias="16x16/edit-clear.png">icons/tango/16x16/edit-clear.png</file>
-    <file alias="16x16/edit-copy.png">icons/tango/16x16/edit-copy.png</file>
-    <file alias="16x16/edit-delete.png">icons/tango/16x16/edit-delete.png</file>
-    <file alias="16x16/view-refresh.png">icons/tango/16x16/view-refresh.png</file>
+<qresource prefix="icons/fallback">
+    <file alias="index.theme">icons/fallback/index.theme</file>
+    <file alias="16x16/document-new.svg">icons/fallback/16x16/document-new.svg</file>
+    <file alias="16x16/edit-clear.svg">icons/fallback/16x16/edit-clear.svg</file>
+    <file alias="16x16/edit-copy.svg">icons/fallback/16x16/edit-copy.svg</file>
+    <file alias="16x16/edit-delete.svg">icons/fallback/16x16/edit-delete.svg</file>
+    <file alias="16x16/view-refresh.svg">icons/fallback/16x16/view-refresh.svg</file>
 </qresource>
 </RCC>
diff --git a/files/lua_api/CMakeLists.txt b/files/lua_api/CMakeLists.txt
index 87f5bfe91b..526ee90955 100644
--- a/files/lua_api/CMakeLists.txt
+++ b/files/lua_api/CMakeLists.txt
@@ -10,16 +10,24 @@ set(LUA_API_FILES
     string.doclua
     table.doclua
     openmw/ambient.lua
+    openmw/animation.lua
     openmw/async.lua
+    openmw/camera.lua
     openmw/core.lua
+    openmw/debug.lua
+    openmw/input.lua
+    openmw/interfaces.lua
+    openmw/markup.lua
+    openmw/menu.lua
     openmw/nearby.lua
+    openmw/postprocessing.lua
     openmw/self.lua
+    openmw/storage.lua
+    openmw/types.lua
     openmw/ui.lua
     openmw/util.lua
+    openmw/vfs.lua
     openmw/world.lua
-    openmw/types.lua
-    openmw/postprocessing.lua
-    openmw/debug.lua
 )
 
 foreach (f ${LUA_API_FILES})
diff --git a/files/lua_api/openmw/ambient.lua b/files/lua_api/openmw/ambient.lua
index 3722cb8c0f..82d4dfdeee 100644
--- a/files/lua_api/openmw/ambient.lua
+++ b/files/lua_api/openmw/ambient.lua
@@ -1,6 +1,6 @@
 ---
--- `openmw.ambient` controls background sounds, specific to given player (2D-sounds).
--- Can be used only by local scripts, that are attached to a player.
+-- `openmw.ambient` controls background 2D sounds specific to a given player.
+-- Can be used only by menu scripts and local scripts that are attached to a player.
 -- @module ambient
 -- @usage local ambient = require('openmw.ambient')
 
@@ -12,11 +12,11 @@
 -- @param #string soundId ID of Sound record to play
 -- @param #table options An optional table with additional optional arguments. Can contain:
 --
---   * `timeOffset` - a floating point number >= 0, to some time (in second) from beginning of sound file (default: 0);
---   * `volume` - a floating point number >= 0, to set a sound volume (default: 1);
---   * `pitch` - a floating point number >= 0, to set a sound pitch (default: 1);
---   * `scale` - a boolean, to set if sound pitch should be scaled by simulation time scaling (default: true);
---   * `loop` - a boolean, to set if sound should be repeated when it ends (default: false);
+--   * `timeOffset` - a floating point number >= 0, to skip some time (in seconds) from the beginning of the sound (default: 0);
+--   * `volume` - a floating point number >= 0, to set the sound's volume (default: 1);
+--   * `pitch` - a floating point number >= 0, to set the sound's pitch (default: 1);
+--   * `scale` - a boolean, to set if the sound's pitch should be scaled by simulation time scaling (default: true);
+--   * `loop` - a boolean, to set if the sound should be repeated when it ends (default: false);
 -- @usage local params = {
 --    timeOffset=0.1
 --    volume=0.3,
@@ -29,14 +29,14 @@
 ---
 -- Play a 2D sound file
 -- @function [parent=#ambient] playSoundFile
--- @param #string fileName Path to sound file in VFS
+-- @param #string fileName Path to a sound file in VFS
 -- @param #table options An optional table with additional optional arguments. Can contain:
 --
---   * `timeOffset` - a floating point number >= 0, to some time (in second) from beginning of sound file (default: 0);
---   * `volume` - a floating point number >= 0, to set a sound volume (default: 1);
---   * `pitch` - a floating point number >= 0, to set a sound pitch (default: 1);
---   * `scale` - a boolean, to set if sound pitch should be scaled by simulation time scaling (default: true);
---   * `loop` - a boolean, to set if sound should be repeated when it ends (default: false);
+--   * `timeOffset` - a floating point number >= 0, to skip some time (in seconds) from the beginning of the sound file (default: 0);
+--   * `volume` - a floating point number >= 0, to set the sound's volume (default: 1);
+--   * `pitch` - a floating point number >= 0, to set the sound's pitch (default: 1);
+--   * `scale` - a boolean, to set if the sound's pitch should be scaled by simulation time scaling (default: true);
+--   * `loop` - a boolean, to set if the sound should be repeated when it ends (default: false);
 -- @usage local params = {
 --    timeOffset=0.1
 --    volume=0.3,
@@ -55,21 +55,66 @@
 ---
 -- Stop a sound file
 -- @function [parent=#ambient] stopSoundFile
--- @param #string fileName Path to sound file in VFS
+-- @param #string fileName Path to a sound file in VFS
 -- @usage ambient.stopSoundFile("Sound\\test.mp3");
 
 ---
--- Check if sound is playing
+-- Check if a sound is playing
 -- @function [parent=#ambient] isSoundPlaying
 -- @param #string soundId ID of Sound record to check
 -- @return #boolean
 -- @usage local isPlaying = ambient.isSoundPlaying("shock bolt");
 
 ---
--- Check if sound file is playing
+-- Check if a sound file is playing
 -- @function [parent=#ambient] isSoundFilePlaying
--- @param #string fileName Path to sound file in VFS
+-- @param #string fileName Path to a sound file in VFS
 -- @return #boolean
 -- @usage local isPlaying = ambient.isSoundFilePlaying("Sound\\test.mp3");
 
+---
+-- Play a sound file as a music track
+-- @function [parent=#ambient] streamMusic
+-- @param #string fileName Path to a file in VFS
+-- @param #table options An optional table with additional optional arguments. Can contain:
+--
+--   * `fadeOut` - a floating point number >= 0, time (in seconds) to fade out the current track before playing this one (default 1.0);
+-- @usage local params = {
+--    fadeOut=2.0
+-- };
+-- ambient.streamMusic("Music\\Test\\Test.mp3", params)
+
+---
+-- Stop the currently playing music
+-- @function [parent=#ambient] stopMusic
+-- @usage ambient.stopMusic();
+
+---
+-- Check if music is playing
+-- @function [parent=#ambient] isMusicPlaying
+-- @return #boolean
+-- @usage local isPlaying = ambient.isMusicPlaying();
+
+---
+-- Play an ambient voiceover.
+-- @function [parent=#ambient] say
+-- @param #string fileName Path to a sound file in VFS
+-- @param #string text Subtitle text (optional)
+-- @usage -- play voiceover and print messagebox
+-- ambient.say("Sound\\Vo\\Misc\\voice.mp3", "Subtitle text")
+-- @usage -- play voiceover, without messagebox
+-- ambient.say("Sound\\Vo\\Misc\\voice.mp3")
+
+---
+-- Stop an ambient voiceover
+-- @function [parent=#ambient] stopSay
+-- @param #string fileName Path to a sound file in VFS
+-- @usage ambient.stopSay();
+
+---
+-- Check if an ambient voiceover is playing
+-- @function [parent=#Sound] isSayActive
+-- @return #boolean
+-- @usage local isActive = isSayActive();
+
 return nil
diff --git a/files/lua_api/openmw/animation.lua b/files/lua_api/openmw/animation.lua
new file mode 100644
index 0000000000..065a150605
--- /dev/null
+++ b/files/lua_api/openmw/animation.lua
@@ -0,0 +1,267 @@
+---
+-- `openmw.animation` defines functions that allow control of character animations.
+-- Note that for some methods, such as @{openmw.animation#playBlended} you should use the associated methods on the 
+-- [AnimationController](interface_animation.html) interface rather than invoking this API directly.
+-- @module animation
+-- @usage local anim = require('openmw.animation')
+
+--- Possible @{#Priority} values
+-- @field [parent=#animation] #Priority PRIORITY
+
+--- `animation.PRIORITY`
+-- @type Priority
+-- @field #number Default "0"
+-- @field #number WeaponLowerBody "1"
+-- @field #number SneakIdleLowerBody "2"
+-- @field #number SwimIdle "3"
+-- @field #number Jump "4"
+-- @field #number Movement "5"
+-- @field #number Hit "6"
+-- @field #number Weapon "7"
+-- @field #number Block "8"
+-- @field #number Knockdown "9"
+-- @field #number Torch "10"
+-- @field #number Storm "11"
+-- @field #number Death "12" 
+-- @field #number Scripted "13" Special priority used by scripted animations. When any animation with this priority is present, all animations without this priority are paused.
+
+--- Possible @{#BlendMask} values
+-- @field [parent=#animation] #BlendMask BLEND_MASK
+
+--- `animation.BLEND_MASK`
+-- @type BlendMask
+-- @field #number LowerBody "1" All bones from 'Bip01 pelvis' and below
+-- @field #number Torso "2" All bones from 'Bip01 Spine1' and up, excluding arms
+-- @field #number LeftArm "4" All bones from 'Bip01 L Clavicle' and out
+-- @field #number RightArm "8" All bones from 'Bip01 R Clavicle' and out
+-- @field #number UpperBody "14" All bones from 'Bip01 Spine1' and up, including arms
+-- @field #number All "15" All bones
+
+--- Possible @{#BoneGroup} values
+-- @field [parent=#animation] #BoneGroup BONE_GROUP
+
+--- `animation.BONE_GROUP`
+-- @type BoneGroup
+-- @field #number LowerBody "1" All bones from 'Bip01 pelvis' and below
+-- @field #number Torso "2" All bones from 'Bip01 Spine1' and up, excluding arms
+-- @field #number LeftArm "3" All bones from 'Bip01 L Clavicle' and out
+-- @field #number RightArm "4" All bones from 'Bip01 R Clavicle' and out
+
+
+---
+-- Check if the object has an animation object or not
+-- @function [parent=#animation] hasAnimation
+-- @param openmw.core#GameObject actor
+-- @return #boolean
+
+---
+-- Skips animations for one frame, equivalent to mwscript's SkipAnim.
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] skipAnimationThisFrame
+-- @param openmw.core#GameObject actor
+
+---
+-- Get the absolute position within the animation track of the given text key
+-- @function [parent=#animation] getTextKeyTime
+-- @param openmw.core#GameObject actor
+-- @param #string text key
+-- @return #number
+
+---
+-- Check if the given animation group is currently playing
+-- @function [parent=#animation] isPlaying
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @return #boolean
+
+---
+-- Get the current absolute time of the given animation group if it is playing, or -1 if it is not playing.
+-- @function [parent=#animation] getCurrentTime
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @return #number
+
+---
+-- Check whether the animation is a looping animation or not. This is determined by a combination 
+-- of groupName, some of which are hardcoded to be looping, and the presence of loop start/stop keys.
+-- The groupNames that are hardcoded as looping are the following, as well as per-weapon-type suffixed variants of each.
+-- "walkforward", "walkback", "walkleft", "walkright", "swimwalkforward", "swimwalkback", "swimwalkleft", "swimwalkright", 
+-- "runforward", "runback", "runleft", "runright", "swimrunforward", "swimrunback", "swimrunleft", "swimrunright", 
+-- "sneakforward", "sneakback", "sneakleft", "sneakright", "turnleft", "turnright", "swimturnleft", "swimturnright",
+-- "spellturnleft", "spellturnright", "torch", "idle", "idle2", "idle3", "idle4", "idle5", "idle6", "idle7", "idle8", 
+-- "idle9", "idlesneak", "idlestorm", "idleswim", "jump", "inventoryhandtohand", "inventoryweapononehand", 
+-- "inventoryweapontwohand", "inventoryweapontwowide"
+-- @function [parent=#animation] isLoopingAnimation
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @return #boolean
+
+
+---
+-- Cancels and removes the animation group from the list of active animations.
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] cancel
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+
+---
+-- Enables or disables looping for the given animation group. Looping is enabled by default.
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] setLoopingEnabled
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @param #boolean enabled
+
+---
+-- Returns the completion of the animation, or nil if the animation group is not active.
+-- @function [parent=#animation] getCompletion
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @return #number, #nil
+
+---
+-- Returns the remaining number of loops, not counting the current loop, or nil if the animation group is not active.
+-- @function [parent=#animation] getLoopCount
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @return #number, #nil
+
+---
+-- Get the current playback speed of an animation group, or nil if the animation group is not active.
+-- @function [parent=#animation] getSpeed
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @return #number, #nil
+
+---
+-- Modifies the playback speed of an animation group.
+-- Note that this is not sticky and only affects the speed until the currently playing sequence ends.
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] setSpeed
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @param #number speed The new animation speed, where speed=1 is normal speed.
+
+---
+-- Clears all animations currently in the animation queue. This affects animations played by mwscript, @{openmw.animation#playQueued}, and ai packages, but does not affect animations played using @{openmw.animation#playBlended}.
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] clearAnimationQueue
+-- @param openmw.core#GameObject actor
+-- @param #boolean clearScripted whether to keep animation with priority Scripted or not.
+
+---
+-- Acts as a slightly extended version of MWScript's LoopGroup. Plays this animation exclusively
+-- until it ends, or the queue is cleared using #clearAnimationQueue. Use #clearAnimationQueue and the `startkey` option
+-- to imitate the behavior of LoopGroup's play modes.
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] playQueued
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @param #table options A table of play options.  Can contain:
+--
+--   * `loops` - a number >= 0, the number of times the animation should loop after the first play (default: infinite).
+--   * `speed` - a floating point number >= 0, the speed at which the animation should play (default: 1);
+--   * `startKey` - the animation key at which the animation should start (default: "start")
+--   * `stopKey` - the animation key at which the animation should end (default: "stop")
+--   * `forceLoop` - a boolean, to set if the animation should loop even if it's not a looping animation (default: false)
+-- 
+-- @usage -- Play death1 without waiting. Equivalent to playgroup, death1, 1
+-- anim.clearAnimationQueue(self, false)
+-- anim.playQueued(self, 'death1')
+-- 
+-- @usage -- Play an animation group with custom start/stop keys
+-- anim.clearAnimationQueue(self, false)
+-- anim.playQueued(self, 'spellcast', { startKey = 'self start', stopKey = 'self stop' })
+--
+
+---
+-- Play an animation directly. You probably want to use the [AnimationController](interface_animation.html) interface, which will trigger relevant handlers, 
+-- instead of calling this directly. Note that the still hardcoded character controller may at any time and for any reason alter
+-- or cancel currently playing animations, so making your own calls to this function either directly or through the [AnimationController](interface_animation.html)
+-- interface may be of limited utility. For now, use openmw.animation#playQueued to script your own animations.
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] playBlended
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @param #table options A table of play options. Can contain:
+--
+--   * `loops` - a number >= 0, the number of times the animation should loop after the first play (default: 0).
+--   * `priority` - Either a single #Priority value that will be assigned to all bone groups. Or a table mapping bone groups to its priority (default: PRIORITY.Default).
+--   * `blendMask` - A mask of which bone groups to include in the animation (Default: BLEND_MASK.All.
+--   * `autoDisable` - If true, the animation will be immediately  removed upon finishing, which means information will not be possible to query once completed. (Default: true)
+--   * `speed` - a floating point number >= 0, the speed at which the animation should play (default: 1)
+--   * `startKey` - the animation key at which the animation should start (default: "start")
+--   * `stopKey` - the animation key at which the animation should end (default: "stop")
+--   * `startPoint` - a floating point number 0 <= value <= 1, starting completion of the animation (default: 0)
+--   * `forceLoop` - a boolean, to set if the animation should loop even if it's not a looping animation (default: false)
+
+---
+-- Check if the actor's animation has the given animation group or not.
+-- @function [parent=#animation] hasGroup
+-- @param openmw.core#GameObject actor
+-- @param #string groupName
+-- @return #boolean 
+
+---
+-- Check if the actor's skeleton has the given bone or not
+-- @function [parent=#animation] hasBone
+-- @param openmw.core#GameObject actor
+-- @param #string boneName
+-- @return #boolean 
+
+---
+-- Get the current active animation for a bone group
+-- @function [parent=#animation] getActiveGroup
+-- @param openmw.core#GameObject actor
+-- @param #number boneGroup Bone group enum, see @{openmw.animation#BONE_GROUP}
+-- @return #string 
+
+---
+-- Plays a VFX on the actor.
+-- Can be used only in local scripts on self. Can also be evoked by sending an AddVfx event to the target actor.
+-- @function [parent=#animation] addVfx
+-- @param openmw.core#GameObject actor
+-- @param #string model #string model path (normally taken from a record such as @{openmw.types#StaticRecord.model} or similar)
+-- @param #table options optional table of parameters. Can contain:
+--
+--   * `loop` - boolean, if true the effect will loop until removed (default: 0).
+--   * `boneName` - name of the bone to attach the vfx to. (default: "")
+--   * `particleTextureOverride` - name of the particle texture to use. (default: "")
+--   * `vfxId` - a string ID that can be used to remove the effect later, using #removeVfx, and to avoid duplicate effects. The default value of "" can have duplicates. To avoid interaction with the engine, use unique identifiers unrelated to magic effect IDs. The engine uses this identifier to add and remove magic effects based on what effects are active on the actor. If this is set equal to the @{openmw.core#MagicEffectId} identifier of the magic effect being added, for example core.magic.EFFECT_TYPE.FireDamage, then the engine will remove it once the fire damage effect on the actor reaches 0. (Default: ""). 
+-- 
+-- @usage local mgef = core.magic.effects.records[myEffectName]
+-- anim.addVfx(self, 'VFX_Hands', {boneName = 'Bip01 L Hand', particleTextureOverride = mgef.particle, loop = mgef.continuousVfx, vfxId = mgef.id..'_myuniquenamehere'})
+-- -- later:
+-- anim.removeVfx(self, mgef.id..'_myuniquenamehere')
+-- 
+-- @usage -- Add vfx to another actor using an event
+-- local mgef = core.magic.effects.records[myEffectName]
+-- target:sendEvent('AddVfx', {
+--   model = types.Static.record(mgef.hitStatic).model,
+--   options = {
+--     vfxId = mgef.id,
+--     particuleTextureOverride = mgef.particle,
+--     loop = false,
+--   }
+-- })
+--
+
+
+---
+-- Removes a specific VFX
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] removeVfx
+-- @param openmw.core#GameObject actor
+-- @param #number vfxId an integer ID that uniquely identifies the VFX to remove
+
+---
+-- Removes all vfx from the actor
+-- Can be used only in local scripts on self.
+-- @function [parent=#animation] removeAllVfx
+-- @param openmw.core#GameObject actor
+
+
+
+
+return nil
+
diff --git a/files/lua_api/openmw/async.lua b/files/lua_api/openmw/async.lua
index 64080ed96a..7a410336c0 100644
--- a/files/lua_api/openmw/async.lua
+++ b/files/lua_api/openmw/async.lua
@@ -1,5 +1,5 @@
 ---
--- `openmw.async` contains timers and coroutine utils. All functions require
+-- `openmw.async` contains timers and coroutine utilities. All functions require
 -- the package itself as a first argument.
 -- @module async
 -- @usage local async = require('openmw.async')
@@ -16,7 +16,7 @@
 
 ---
 -- Calls callback(arg) in `delay` simulation seconds.
--- Callback must be registered in advance.
+-- The callback must be registered in advance.
 -- @function [parent=#async] newSimulationTimer
 -- @param self
 -- @param #number delay
@@ -25,7 +25,7 @@
 
 ---
 -- Calls callback(arg) in `delay` game seconds.
--- Callback must be registered in advance.
+-- The callback must be registered in advance.
 -- @function [parent=#async] newGameTimer
 -- @param self
 -- @param #number delay
@@ -49,7 +49,7 @@
 -- @param #function func
 
 ---
--- Wraps Lua function with `Callback` object that can be used in async API calls.
+-- Wraps a Lua function with a `Callback` object that can be used in async API calls.
 -- @function [parent=#async] callback
 -- @param self
 -- @param #function func
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 7a43cd2c3f..8a78a52441 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -1,13 +1,13 @@
 ---
--- `openmw.core` defines functions and types that are available in both local
--- and global scripts.
+-- `openmw.core` defines functions and types that are available in local,
+-- global and menu scripts.
 -- @module core
 -- @usage local core = require('openmw.core')
 
 
 
 ---
--- The revision of OpenMW Lua API. It is an integer that is incremented every time the API is changed.
+-- The revision of OpenMW Lua API. It is an integer that is incremented every time the API is changed. See the actual value at the top of the page.
 -- @field [parent=#core] #number API_REVISION
 
 ---
@@ -15,7 +15,7 @@
 -- @function [parent=#core] quit
 
 ---
--- Send an event to global scripts.
+-- Send an event to global scripts. Note: in menu scripts, errors if the game is not running (check @{openmw.menu#menu.getState})
 -- @function [parent=#core] sendGlobalEvent
 -- @param #string eventName
 -- @param eventData
@@ -51,6 +51,11 @@
 -- @function [parent=#core] getRealTime
 -- @return #number
 
+---
+-- Frame duration in seconds. Not available in global scripts.
+-- @function [parent=#core] getRealFrameDuration
+-- @return #number
+
 ---
 -- Get a GMST setting from content files.
 -- @function [parent=#core] getGMST
@@ -133,9 +138,9 @@
 -- @return #string
 -- @usage if obj.recordId == core.getFormId('Skyrim.esm', 0x4d7da) then ... end
 -- @usage -- In ESM3 content files (e.g. Morrowind) ids are human-readable strings
--- obj.ownerFactionId = 'blades'
+-- obj.owner.factionId = 'blades'
 -- -- In ESM4 (e.g. Skyrim) ids should be constructed using `core.getFormId`:
--- obj.ownerFactionId = core.getFormId('Skyrim.esm', 0x72834)
+-- obj.owner.factionId = core.getFormId('Skyrim.esm', 0x72834)
 -- @usage -- local scripts
 -- local obj = nearby.getObjectByFormId(core.getFormId('Morrowind.esm', 128964))
 -- @usage -- global scripts
@@ -155,13 +160,21 @@
 -- @field openmw.util#Transform rotation Object rotation.
 -- @field openmw.util#Vector3 startingPosition The object original position
 -- @field openmw.util#Transform startingRotation The object original rotation
--- @field #string ownerRecordId NPC who owns the object (nil if missing). Global and self scripts can set the value.
--- @field #string ownerFactionId Faction who owns the object (nil if missing). Global and self scripts can set the value.
--- @field #number ownerFactionRank Rank required to be allowed to pick up the object. Global and self scripts can set the value.
+-- @field #ObjectOwner owner Ownership information
 -- @field #Cell cell The cell where the object currently is. During loading a game and for objects in an inventory or a container `cell` is nil.
+-- @field #GameObject parentContainer Container or actor that contains (or has in inventory) this object. It is nil if the object is in a cell.
 -- @field #any type Type of the object (one of the tables from the package @{openmw.types#types}).
 -- @field #number count Count (>1 means a stack of objects).
 -- @field #string recordId Returns record ID of the object in lowercase.
+-- @field #string globalVariable Global Variable associated with this object(read only).
+
+
+---
+-- Object owner information
+-- @type ObjectOwner
+-- @field #string recordId NPC who owns the object (nil if missing). Global and self scripts can set the value.
+-- @field #string factionId Faction who owns the object (nil if missing). Global and self scripts can set the value.
+-- @field #number factionRank Rank required to be allowed to pick up the object (`nil` if any rank is allowed). Global and self scripts can set the value.
 
 ---
 -- Does the object still exist and is available.
@@ -259,11 +272,12 @@
 -- @function [parent=#GameObject] split
 -- @param self
 -- @param #number count The number of items to return.
+-- @return #GameObject
 -- @usage -- take 50 coins from `money` and put to the container `cont`
 -- money:split(50):moveInto(types.Container.content(cont))
 
 ---
--- The axis aligned bounding box in local coordinates.
+-- The axis aligned bounding box in world coordinates.
 -- @function [parent=#GameObject] getBoundingBox
 -- @param self
 -- @return openmw.util#Box
@@ -278,6 +292,7 @@
 -- A cell of the game world.
 -- @type Cell
 -- @field #string name Name of the cell (can be empty string).
+-- @field #string id Unique record ID of the cell, based on cell name for interiors and the worldspace for exteriors, or the formID of the cell for ESM4 cells.
 -- @field #string region Region of the cell.
 -- @field #boolean isExterior Whether the cell is an exterior cell. "Exterior" means grid of cells where the player can seamless walk from one cell to another without teleports. QuasiExterior (interior with sky) is not an exterior.
 -- @field #boolean isQuasiExterior (DEPRECATED, use `hasTag("QuasiExterior")`) Whether the cell is a quasi exterior (like interior but with the sky and the wheather).
@@ -285,6 +300,7 @@
 -- @field #number gridY Index of the cell by Y (only for exteriors).
 -- @field #string worldSpaceId Id of the world space.
 -- @field #boolean hasWater True if the cell contains water.
+-- @field #number waterLevel The water level of the cell. (nil if cell has no water).
 -- @field #boolean hasSky True if in this cell sky should be rendered.
 
 ---
@@ -324,12 +340,18 @@
 -- @field #string id Record id of the spell or item used to cast the spell
 -- @field #GameObject item The enchanted item used to cast the spell, or nil if the spell was not cast from an enchanted item. Note that if the spell was cast for a single-use enchantment such as a scroll, this will be nil.
 -- @field #GameObject caster The caster object, or nil if the spell has no defined caster
+-- @field #boolean fromEquipment If set, this spell is tied to an equipped item and can only be ended by unequipping the item.
+-- @field #boolean temporary If set, this spell effect is temporary and should end on its own. Either after a single application or after its duration has run out.
+-- @field #boolean affectsBaseValues If set, this spell affects the base values of affected stats, rather than modifying current values.
+-- @field #boolean stackable If set, this spell can be applied multiple times. If not set, the same spell can only be applied once from the same source (where source is determined by caster + item). In vanilla rules, consumables are stackable while spells and enchantments are not.
+-- @field #number activeSpellId A number uniquely identifying this active spell within the affected actor's list of active spells.
 -- @field #list<#ActiveSpellEffect> effects The active effects (@{#ActiveSpellEffect}) of this spell.
 
 ---
 -- @type ActiveSpellEffect
--- @field #string affectedSkill @{#SKILL} or nil
--- @field #string affectedAttribute @{#ATTRIBUTE} or nil
+-- @field #number index Index of this effect within the original list of @{#MagicEffectWithParams} of the spell/enchantment/potion this effect came from.
+-- @field #string affectedSkill Optional skill ID
+-- @field #string affectedAttribute Optional attribute ID
 -- @field #string id Magic effect id
 -- @field #string name Localized name of the effect
 -- @field #number magnitudeThisFrame The magnitude of the effect in the current frame. This will be a new random number between minMagnitude and maxMagnitude every frame. Or nil if the effect has no magnitude.
@@ -354,7 +376,7 @@
 -- @type Enchantment
 -- @field #string id Enchantment id
 -- @field #number type @{#EnchantmentType}
--- @field #number autocalcFlag If set, the casting cost should be computer rather than reading the cost field
+-- @field #boolean autocalcFlag If set, the casting cost should be computed based on the effect list rather than read from the cost field
 -- @field #number cost
 -- @field #number charge Charge capacity. Should not be confused with current charge.
 -- @field #list<#MagicEffectWithParams> effects The effects (@{#MagicEffectWithParams}) of the enchantment
@@ -368,7 +390,7 @@
 -- local function getEnchantment(item)
 --     local record = getRecord(item)
 --     if record and record.enchant then
---         return core.magic.enchantments[record.enchant]
+--         return core.magic.enchantments.records[record.enchant]
 --     end
 --     return nil
 -- end
@@ -428,55 +450,6 @@
 -- @usage for _, item in ipairs(inventory:findAll('common_shirt_01')) do ... end
 
 
---- Possible @{#ATTRIBUTE} values
--- @field [parent=#core] #ATTRIBUTE ATTRIBUTE
-
---- `core.ATTRIBUTE`
--- @type ATTRIBUTE
--- @field #string Strength "strength"
--- @field #string Intelligence "intelligence"
--- @field #string Willpower "willpower"
--- @field #string Agility "agility"
--- @field #string Speed "speed"
--- @field #string Endurance "endurance"
--- @field #string Personality "personality"
--- @field #string Luck "luck"
-
-
---- Possible @{#SKILL} values
--- @field [parent=#core] #SKILL SKILL
-
---- `core.SKILL`
--- @type SKILL
--- @field #string Acrobatics "acrobatics"
--- @field #string Alchemy "alchemy"
--- @field #string Alteration "alteration"
--- @field #string Armorer "armorer"
--- @field #string Athletics "athletics"
--- @field #string Axe "axe"
--- @field #string Block "block"
--- @field #string BluntWeapon "bluntweapon"
--- @field #string Conjuration "conjuration"
--- @field #string Destruction "destruction"
--- @field #string Enchant "enchant"
--- @field #string HandToHand "handtohand"
--- @field #string HeavyArmor "heavyarmor"
--- @field #string Illusion "illusion"
--- @field #string LightArmor "lightarmor"
--- @field #string LongBlade "longblade"
--- @field #string Marksman "marksman"
--- @field #string MediumArmor "mediumarmor"
--- @field #string Mercantile "mercantile"
--- @field #string Mysticism "mysticism"
--- @field #string Restoration "restoration"
--- @field #string Security "security"
--- @field #string ShortBlade "shortblade"
--- @field #string Sneak "sneak"
--- @field #string Spear "spear"
--- @field #string Speechcraft "speechcraft"
--- @field #string Unarmored "unarmored"
-
-
 --- @{#Magic}: spells and spell effects
 -- @field [parent=#core] #Magic magic
 
@@ -491,19 +464,6 @@
 -- @field #number Target Ranged spell
 
 
---- Possible @{#MagicSchool} values
--- @field [parent=#Magic] #MagicSchool SCHOOL
-
---- `core.magic.SCHOOL`
--- @type MagicSchool
--- @field #number Alteration Alteration
--- @field #number Conjuration Conjuration
--- @field #number Destruction Destruction
--- @field #number Illusion Illusion
--- @field #number Mysticism Mysticism
--- @field #number Restoration Restoration
-
-
 --- Possible @{#MagicEffectId} values
 -- @field [parent=#Magic] #MagicEffectId EFFECT_TYPE
 
@@ -665,41 +625,52 @@
 -- @field #number Curse Curse
 -- @field #number Power Power, can be used once a day
 
+--- @{#Spells}: Spells
+-- @field [parent=#Magic] #Spells spells
 
 --- List of all @{#Spell}s.
--- @field [parent=#Magic] #list<#Spell> spells
--- @usage local spell = core.magic.spells['thunder fist']  -- get by id
--- @usage local spell = core.magic.spells[1]  -- get by index
+-- @field [parent=#Spells] #list<#Spell> records A read-only list of all @{#Spell} records in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) of #Spell.
+-- @usage local spell = core.magic.spells.records['thunder fist']  -- get by id
+-- @usage local spell = core.magic.spells.records[1]  -- get by index
 -- @usage -- Print all powers
--- for _, spell in pairs(core.magic.spells) do
+-- for _, spell in pairs(core.magic.spells.records) do
 --     if spell.types == core.magic.SPELL_TYPE.Power then
 --         print(spell.name)
 --     end
 -- end
 
+--- @{#Effects}: Magic Effects
+-- @field [parent=#Magic] #Effects effects
+
 --- Map from @{#MagicEffectId} to @{#MagicEffect}
--- @field [parent=#Magic] #map<#number, #MagicEffect> effects
+-- @field [parent=#Effects] #map<#number, #MagicEffect> records
 -- @usage -- Print all harmful effects
--- for _, effect in pairs(core.magic.effects) do
+-- for _, effect in pairs(core.magic.effects.records) do
 --     if effect.harmful then
 --         print(effect.name)
 --     end
 -- end
 -- @usage -- Look up the record of a specific effect and print its icon
--- local mgef = core.magic.effects[core.magic.EFFECT_TYPE.Reflect]
+-- local mgef = core.magic.effects.records[core.magic.EFFECT_TYPE.Reflect]
 -- print('Reflect Icon: '..tostring(mgef.icon))
 
---- List of all @{#Enchantment}s.
--- @field [parent=#Magic] #list<#Enchantment> enchantments
--- @usage local enchantment = core.magic.enchantments['marara's boon']  -- get by id
--- @usage local enchantment = core.magic.enchantments[1]  -- get by index
+--- @{#Enchantments}: Enchantments
+-- @field [parent=#Magic] #Enchantments enchantments
+
+--- A read-only list of all @{#Enchantment} records in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) and [iterables#Map](iterables.html#map-iterable) of #Enchantment.
+-- @field [parent=#Enchantments] #list<#Enchantment> records
+-- @usage local enchantment = core.magic.enchantments.records['marara's boon']  -- get by id
+-- @usage local enchantment = core.magic.enchantments.records[1]  -- get by index
 -- @usage -- Print all enchantments with constant effect
--- for _, ench in pairs(core.magic.enchantments) do
+-- for _, ench in pairs(core.magic.enchantments.records) do
 --     if ench.type == core.magic.ENCHANTMENT_TYPE.ConstantEffect then
 --         print(ench.id)
 --     end
 -- end
 
+
 ---
 -- @type Spell
 -- @field #string id Spell id
@@ -707,43 +678,74 @@
 -- @field #number type @{#SpellType}
 -- @field #number cost
 -- @field #list<#MagicEffectWithParams> effects The effects (@{#MagicEffectWithParams}) of the spell
+-- @field #boolean alwaysSucceedFlag If set, the spell should ignore skill checks and always succeed.
+-- @field #boolean starterSpellFlag If set, the spell can be selected as a player's starting spell.
+-- @field #boolean autocalcFlag If set, the casting cost should be computed based on the effect list rather than read from the cost field
 
 ---
 -- @type MagicEffect
 -- @field #string id Effect ID
 -- @field #string icon Effect Icon Path
 -- @field #string name Localized name of the effect
--- @field #number school @{#MagicSchool}
+-- @field #string school Skill ID that is this effect's school
 -- @field #number baseCost
 -- @field openmw.util#Color color
--- @field #boolean harmful
+-- @field #boolean harmful If set, the effect is considered harmful and should elicit a hostile reaction from affected NPCs.
+-- @field #boolean continuousVfx Whether the magic effect's vfx should loop or not
+-- @field #boolean hasDuration If set, the magic effect has a duration. As an example, divine intervention has no duration while fire damage does.
+-- @field #boolean hasMagnitude If set, the magic effect depends on a magnitude. As an example, cure common disease has no magnitude while chameleon does.
+-- @field #boolean isAppliedOnce If set, the magic effect is applied fully on cast, rather than being continuously applied over the effect's duration. For example, chameleon is applied once, while fire damage is continuously applied for the duration.
+-- @field #boolean casterLinked If set, it is implied the magic effect links back to the caster in some way and should end immediately or never be applied if the caster dies or is not an actor.
+-- @field #boolean nonRecastable If set, this effect cannot be re-applied until it has ended. This is used by bound equipment spells.
+-- @field #string particle Identifier of the particle texture
+-- @field #string castStatic Identifier of the vfx static used for casting
+-- @field #string hitStatic Identifier of the vfx static used on hit
+-- @field #string areaStatic Identifier of the vfx static used for AOE spells
+-- @field #string bolt Identifier of the projectile used for ranged spells
+-- @field #string castSound Identifier of the sound used for casting
+-- @field #string hitSound Identifier of the sound used on hit
+-- @field #string areaSound Identifier of the sound used for AOE spells
+-- @field #string boltSound Identifier of the projectile sound used for ranged spells
+
 
 ---
 -- @type MagicEffectWithParams
 -- @field #MagicEffect effect @{#MagicEffect}
--- @field #string affectedSkill @{#SKILL} or nil
--- @field #string affectedAttribute @{#ATTRIBUTE} or nil
+-- @field #string id ID of the associated @{#MagicEffect}
+-- @field #string affectedSkill Optional skill ID
+-- @field #string affectedAttribute Optional attribute ID
 -- @field #number range
 -- @field #number area
 -- @field #number magnitudeMin
 -- @field #number magnitudeMax
 -- @field #number duration
+-- @field #number index Index of this effect within the original list of @{#MagicEffectWithParams} of the spell/enchantment/potion this effect came from.
 
 ---
 -- @type ActiveEffect
--- @field #string affectedSkill @{#SKILL} or nil
--- @field #string affectedAttribute @{#ATTRIBUTE} or nil
+-- Magic effect that is currently active on an actor.
+-- @field #string affectedSkill Optional skill ID
+-- @field #string affectedAttribute Optional attribute ID
 -- @field #string id Effect id string
 -- @field #string name Localized name of the effect
--- @field #number magnitude
+-- @field #number magnitude current magnitude of the effect. Will be set to 0 when effect is removed or expires.
 -- @field #number magnitudeBase
 -- @field #number magnitudeModifier
 
 --- @{#Sound}: Sounds and Speech
 -- @field [parent=#core] #Sound sound
 
+---
+-- Checks if sound system is enabled (any functions to play sounds are no-ops when it is disabled).
+-- It can not be enabled or disabled during runtime.
+-- @function [parent=#Sound] isEnabled
+-- @return #boolean
+-- @usage local enabled = core.sound.isEnabled();
+
 ---
 -- Play a 3D sound, attached to object
+--
+-- In local scripts can be used only on self.
 -- @function [parent=#Sound] playSound3d
 -- @param #string soundId ID of Sound record to play
 -- @param #GameObject object Object to which we attach the sound
@@ -763,6 +765,8 @@
 
 ---
 -- Play a 3D sound file, attached to object
+--
+-- In local scripts can be used only on self.
 -- @function [parent=#Sound] playSoundFile3d
 -- @param #string fileName Path to sound file in VFS
 -- @param #GameObject object Object to which we attach the sound
@@ -782,6 +786,8 @@
 
 ---
 -- Stop a 3D sound, attached to object
+--
+-- In local scripts can be used only on self.
 -- @function [parent=#Sound] stopSound3d
 -- @param #string soundId ID of Sound record to stop
 -- @param #GameObject object Object on which we want to stop sound
@@ -789,6 +795,8 @@
 
 ---
 -- Stop a 3D sound file, attached to object
+--
+-- In local scripts can be used only on self.
 -- @function [parent=#Sound] stopSoundFile3d
 -- @param #string fileName Path to sound file in VFS
 -- @param #GameObject object Object on which we want to stop sound
@@ -811,42 +819,32 @@
 -- @usage local isPlaying = core.sound.isSoundFilePlaying("Sound\\test.mp3", object);
 
 ---
--- Play an animated voiceover. Has two overloads:
---
---   * With an "object" argument: play sound for given object, with speaking animation if possible equipment slots.
---   * Without an "object" argument: play sound globally, without object
+-- Play an animated voiceover.
+-- In local scripts can be used only on self.
 -- @function [parent=#Sound] say
 -- @param #string fileName Path to sound file in VFS
--- @param #GameObject object Object on which we want to play an animated voiceover (optional)
+-- @param #GameObject object Object on which we want to play an animated voiceover
 -- @param #string text Subtitle text (optional)
 -- @usage -- play voiceover for object and print messagebox
 -- core.sound.say("Sound\\Vo\\Misc\\voice.mp3", object, "Subtitle text")
--- @usage -- play voiceover globally and print messagebox
--- core.sound.say("Sound\\Vo\\Misc\\voice.mp3", "Subtitle text")
--- @usage -- play voiceover for object without messagebox
+-- @usage -- play voiceover for object, without messagebox
 -- core.sound.say("Sound\\Vo\\Misc\\voice.mp3", object)
--- @usage -- play voiceover globally without messagebox
--- core.sound.say("Sound\\Vo\\Misc\\voice.mp3")
 
 ---
--- Stop animated voiceover
+-- Stop an animated voiceover
+--
+-- In local scripts can be used only on self.
 -- @function [parent=#Sound] stopSay
 -- @param #string fileName Path to sound file in VFS
--- @param #GameObject object Object on which we want to stop an animated voiceover (optional)
--- @usage -- stop voice for given object
--- core.sound.stopSay(object);
--- @usage -- stop global voice
--- core.sound.stopSay();
+-- @param #GameObject object Object on which we want to stop an animated voiceover
+-- @usage core.sound.stopSay(object);
 
 ---
--- Check if animated voiceover is playing
+-- Check if an animated voiceover is playing
 -- @function [parent=#Sound] isSayActive
--- @param #GameObject object Object on which we want to check an animated voiceover (optional)
+-- @param #GameObject object Object on which we want to check an animated voiceover
 -- @return #boolean
--- @usage -- check voice for given object
--- local isActive = isSayActive(object);
--- @usage -- check global voice
--- local isActive = isSayActive();
+-- @usage local isActive = isSayActive(object);
 
 ---
 -- @type SoundRecord
@@ -857,12 +855,292 @@
 -- @field #number maxRange Raw maximal range value, from 0 to 255
 
 --- List of all @{#SoundRecord}s.
--- @field [parent=#Sound] #list<#SoundRecord> sounds
--- @usage local sound = core.sound.sounds['Ashstorm']  -- get by id
--- @usage local sound = core.sound.sounds[1]  -- get by index
+-- @field [parent=#Sound] #list<#SoundRecord> records A read-only list of all @{#SoundRecord}s in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) of #SoundRecord.
+-- @usage local sound = core.sound.records['Ashstorm']  -- get by id
+-- @usage local sound = core.sound.records[1]  -- get by index
 -- @usage -- Print all sound files paths
--- for _, sound in pairs(core.sound.sounds) do
+-- for _, sound in pairs(core.sound.records) do
 --     print(sound.fileName)
 -- end
 
+--- @{#Stats}: stats
+-- @field [parent=#core] #Stats stats
+
+
+--- @{#Attribute} functions
+-- @field [parent=#Stats] #Attribute Attribute
+
+--- `core.stats.Attribute`
+-- @type Attribute
+-- @field #list<#AttributeRecord> records A read-only list of all @{#AttributeRecord}s in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) of #AttributeRecord.
+-- @usage local record = core.stats.Attribute.records['example_recordid']
+-- @usage local record = core.stats.Attribute.records[1]
+
+---
+-- Returns a read-only @{#AttributeRecord}
+-- @function [parent=#Attribute] record
+-- @param #string recordId
+-- @return #AttributeRecord
+
+--- @{#Skill} functions
+-- @field [parent=#Stats] #Skill Skill
+
+--- `core.stats.Skill`
+-- @type Skill
+-- @field #list<#SkillRecord> records A read-only list of all @{#SkillRecord}s in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) of #SkillRecord.
+-- @usage local record = core.stats.Skill.records['example_recordid']
+-- @usage local record = core.stats.Skill.records[1]
+
+---
+-- Returns a read-only @{#SkillRecord}
+-- @function [parent=#Skill] record
+-- @param #string recordId
+-- @return #SkillRecord
+
+---
+-- @type AttributeRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string description Human-readable description
+-- @field #string icon VFS path to the icon
+
+---
+-- @type SkillRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string description Human-readable description
+-- @field #string icon VFS path to the icon
+-- @field #string specialization Skill specialization. Either combat, magic, or stealth.
+-- @field #MagicSchoolData school Optional magic school
+-- @field #string attribute The id of the skill's governing attribute
+-- @field #table skillGain Table of the 4 possible skill gain values. See [SkillProgression#SkillUseType](interface_skill_progression.html#SkillUseType).
+
+---
+-- @type MagicSchoolData
+-- @field #string name Human-readable name
+-- @field #string areaSound VFS path to the area sound
+-- @field #string boltSound VFS path to the bolt sound
+-- @field #string castSound VFS path to the cast sound
+-- @field #string failureSound VFS path to the failure sound
+-- @field #string hitSound VFS path to the hit sound
+
+--- @{#Dialogue}: Dialogue
+-- @field [parent=#core] #Dialogue dialogue
+
+---
+-- @{#DialogueRecords} functions for journal (quest) read-only records.
+-- @field [parent=#Dialogue] journal
+-- @usage --print the name of the record, which is a capitalized version of its id
+-- print(core.dialogue.journal.records["ms_fargothring"].name) -- MS_FargothRing
+-- @usage --print ids of all journal records
+-- for _, journalRecord in pairs(core.dialogue.journal.records) do
+--     print(journalRecord.id)
+-- end
+-- @usage --print quest names for all quests the player has inside a player script
+-- for _, quest in pairs(types.Player.quests(self)) do
+--     print(quest.id, core.dialogue.journal.records[quest.id].questName)
+-- end
+
+---
+-- @{#DialogueRecords} functions for topic read-only records.
+-- @field [parent=#Dialogue] topic
+-- @usage --print ids of all topic records
+-- for _, topicRecord in pairs(core.dialogue.topic.records) do
+--     print(topicRecord.id)
+-- end
+-- @usage --print all NPC lines for "vivec"
+-- for idx, topicInfo in pairs(core.dialogue.topic.records["vivec"].infos) do
+--     print(idx, topicInfo.text)
+-- end
+
+---
+-- @{#DialogueRecords} functions for voice read-only records.
+-- @field [parent=#Dialogue] voice
+-- @usage --print ids of all voice records
+-- for _, voiceRecord in pairs(core.dialogue.voice.records) do
+--     print(voiceRecord.id)
+-- end
+-- @usage --print all NPC lines & sounds for "flee"
+-- for idx, voiceInfo in pairs(core.dialogue.voice.records["flee"].infos) do
+--     print(idx, voiceInfo.text, voiceInfo.sound)
+-- end
+
+---
+-- @{#DialogueRecords} functions for greeting read-only records.
+-- @field [parent=#Dialogue] greeting
+-- @usage --print ids of all greeting records
+-- for _, greetingRecord in pairs(core.dialogue.greeting.records) do
+--     print(greetingRecord.id)
+-- end
+-- @usage --print all NPC lines for "greeting 0"
+-- for idx, greetingInfo in pairs(core.dialogue.greeting.records["greeting 0"].infos) do
+--     print(idx, greetingInfo.text)
+-- end
+
+---
+-- @{#DialogueRecords} functions for persuasion read-only records.
+-- @field [parent=#Dialogue] persuasion
+-- @usage --print ids of all persuasion records
+-- for _, persuasionRecord in pairs(core.dialogue.persuasion.records) do
+--     print(persuasionRecord.id)
+-- end
+-- @usage --print all NPC lines for "admire success"
+-- for idx, persuasionInfo in pairs(core.dialogue.persuasion.records["admire success"].infos) do
+--     print(idx, persuasionInfo.text)
+-- end
+
+---
+-- A read-only list of all @{#DialogueRecord}s in the world database, may be indexed by recordId, which doesn't have to be lowercase.
+-- Implements [iterables#List](iterables.html#list-iterable) of #DialogueRecord.
+-- @field [parent=#DialogueRecords] #list<#DialogueRecord> records
+-- @usage local record = core.dialogue.journal.records['ms_fargothring']
+-- @usage local record = core.dialogue.journal.records['MS_FargothRing']
+-- @usage local record = core.dialogue.journal.records[1]
+-- @usage local record = core.dialogue.topic.records[1]
+-- @usage local record = core.dialogue.topic.records['background']
+-- @usage local record = core.dialogue.greeting.records[1]
+-- @usage local record = core.dialogue.greeting.records['greeting 0']
+-- @usage local record = core.dialogue.persuasion.records[1]
+-- @usage local record = core.dialogue.persuasion.records['admire success']
+-- @usage local record = core.dialogue.voice.records[1]
+-- @usage local record = core.dialogue.voice.records["flee"]
+
+---
+-- Depending on which store this read-only dialogue record is from, it may either be a journal, topic, greeting, persuasion or voice.
+-- @type DialogueRecord
+-- @field #string id Record identifier
+-- @field #string name Same as id, but with upper cases preserved.
+-- @field #string questName Non-nil only for journal records with available value. Holds the quest name for this journal entry. Same info may be available under `infos[1].text` as well, but this variable is made for convenience.
+-- @field #list<#DialogueRecordInfo> infos A read-only list containing all @{#DialogueRecordInfo}s for this record, in order.
+-- @usage local journalId = core.dialogue.journal.records['A2_4_MiloGone'].id -- "a2_4_milogone"
+-- @usage local journalName = core.dialogue.journal.records['A2_4_MiloGone'].name -- "A2_4_MiloGone"
+-- @usage local questName = core.dialogue.journal.records['A2_4_MiloGone'].questName -- "Mehra Milo and the Lost Prophecies"
+
+---
+-- Holds the read-only data for one of many info entries inside a dialogue record. Depending on the type of the dialogue record (journal, topic, greeting, persuasion or voice), it could be, for example, a single journal entry or a NPC dialogue line.
+-- @type DialogueRecordInfo
+-- @field #string id Identifier for this info entry. Is unique only within the @{#DialogueRecord} it belongs to.
+-- @field #string text Text associated with this info entry.
+-- @usage --Variable `aa` below is "Congratulations, %PCName. You are now %PCName the %NextPCRank." in vanilla MW:
+-- local aa = core.dialogue.topic.records['advancement'].infos[100].text
+-- @usage --Variable `bb` below is "sound/vo/a/f/fle_af003.mp3" in vanilla MW:
+-- local bb = core.dialogue.voice.records['flee'].infos[149].sound
+
+---
+-- Quest stage (same as in @{openmw_types#PlayerQuest.stage}) this info entry is associated with.
+-- Non-nil only for journal records.
+-- @field [parent=#DialogueRecordInfo] #number questStage
+
+---
+-- True if this info entry has the "Finished" flag checked.
+-- Non-nil only for journal records.
+-- @field [parent=#DialogueRecordInfo] #boolean isQuestFinished
+
+---
+-- True if this info entry has the "Restart" flag checked.
+-- Non-nil only for journal records.
+-- @field [parent=#DialogueRecordInfo] #boolean isQuestRestart
+
+---
+-- True if this info entry has the "Quest Name" flag checked.
+-- Non-nil only for journal records.
+-- If true, then the @{#DialogueRecord}, to which this info entry belongs, should have this info entry's @{#DialogueRecordInfo.text} value available in its @{#DialogueRecord.questName}.
+-- @field [parent=#DialogueRecordInfo] #boolean isQuestName
+
+---
+-- Faction of which the speaker must be a member for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- Can return an empty string - this means that the actor must not be a member of any faction for this filtering to apply.
+-- @field [parent=#DialogueRecordInfo] #string filterActorFaction
+
+---
+-- Speaker ID allowing for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- @field [parent=#DialogueRecordInfo] #string filterActorId
+
+---
+-- Speaker race allowing for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- @field [parent=#DialogueRecordInfo] #string filterActorRace
+
+---
+-- Speaker class allowing for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- @field [parent=#DialogueRecordInfo] #string filterActorClass
+
+---
+-- Minimum speaker's rank in their faction allowing for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- Rank index starts from 1, matching the value in @{openmw_types#NPC.getFactionRank}
+-- @field [parent=#DialogueRecordInfo] #number filterActorFactionRank
+
+---
+-- Cell name prefix of location where the player must be for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- "Prefix" means that the cell's name starting with this value shall pass the filtering. For example: `filterPlayerCell` being "Seyda Neen" does apply to the cell "Seyda Neen, Fargoth's House".
+-- @field [parent=#DialogueRecordInfo] #string filterPlayerCell
+
+---
+-- Minimum speaker disposition allowing for this info entry to appear.
+-- Always nil for journal records. Otherwise is a nonnegative number, with the zero value representing no conditions, i.e. no filtering applied using these criteria.
+-- @field [parent=#DialogueRecordInfo] #number filterActorDisposition
+
+---
+-- Speaker gender allowing for this info entry to appear: "male" or "female".
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- @field [parent=#DialogueRecordInfo] #string filterActorGender
+
+---
+-- Faction of which the player must be a member for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- @field [parent=#DialogueRecordInfo] #string filterPlayerFaction
+
+---
+-- Minimum player's rank in their faction allowing for this info entry to appear.
+-- Always nil for journal records. Otherwise the nil value represents no conditions, i.e. no filtering applied using these criteria.
+-- Rank index starts from 1, matching the value in @{openmw_types#NPC.getFactionRank}
+-- @field [parent=#DialogueRecordInfo] #number filterPlayerFactionRank
+
+---
+-- Sound file path for this info entry.
+-- Always nil for journal records or if there is no sound set.
+-- @field [parent=#DialogueRecordInfo] #string sound
+
+---
+-- MWScript (full script text) executed when this info is chosen.
+-- Always nil for journal records or if there is no value set.
+-- @field [parent=#DialogueRecordInfo] #string resultScript
+
+--- @{#Factions}: Factions
+-- @field [parent=#core] #Factions factions
+
+---
+-- A read-only list of all @{#FactionRecord}s in the world database.
+-- @field [parent=#Factions] #list<#FactionRecord> records
+-- @usage local record = core.factions.records['example_recordid']
+-- @usage local record = core.factions.records[1]
+
+---
+-- Faction data record
+-- @type FactionRecord
+-- @field #string id Faction id
+-- @field #string name Faction name
+-- @field #list<#FactionRank> ranks A read-only list containing data for all ranks in the faction, in order.
+-- @field #map<#string, #number> reactions A read-only map containing reactions of other factions to this faction.
+-- @field #list<#string> attributes A read-only list containing IDs of attributes to advance ranks in the faction.
+-- @field #list<#string> skills A read-only list containing IDs of skills to advance ranks in the faction.
+-- @field #boolean hidden If true, the faction won't show in the player's skills menu
+
+---
+-- Faction rank data record
+-- @type FactionRank
+-- @field #string name Faction name Rank display name
+-- @field #list<#number> attributeValues Attributes values required to get this rank.
+-- @field #number primarySkillValue Primary skill value required to get this rank.
+-- @field #number favouredSkillValue Secondary skill value required to get this rank.
+-- @field #number factionReaction Reaction of faction members if player is in this faction.
+
 return nil
diff --git a/files/lua_api/openmw/debug.lua b/files/lua_api/openmw/debug.lua
index fba649c16e..bde7071d1c 100644
--- a/files/lua_api/openmw/debug.lua
+++ b/files/lua_api/openmw/debug.lua
@@ -35,6 +35,15 @@
 -- @function [parent=#Debug] isGodMode
 -- @return #boolean
 
+---
+-- Toggles AI
+-- @function [parent=#Debug] toggleAI
+
+---
+-- Is AI enabled
+-- @function [parent=#Debug] isAIEnabled
+-- @return #boolean
+
 ---
 -- Toggles collisions
 -- @function [parent=#Debug] toggleCollision
@@ -44,6 +53,19 @@
 -- @function [parent=#Debug] isCollisionEnabled
 -- @return #boolean
 
+---
+-- Toggles MWScripts
+-- @function [parent=#Debug] toggleMWScript
+
+---
+-- Is MWScripts enabled
+-- @function [parent=#Debug] isMWScriptEnabled
+-- @return #boolean
+
+---
+-- Reloads all Lua scripts
+-- @function [parent=#Debug] reloadLua
+
 ---
 -- Navigation mesh rendering modes
 -- @type NAV_MESH_RENDER_MODE
@@ -62,7 +84,7 @@
 ---
 -- Enable/disable automatic reload of modified shaders
 -- @function [parent=#Debug] setShaderHotReloadEnabled
--- @param #bool value
+-- @param #boolean value
 
 ---
 -- To reload modified shaders
diff --git a/files/lua_api/openmw/input.lua b/files/lua_api/openmw/input.lua
index 3012c24e76..b8e5e51261 100644
--- a/files/lua_api/openmw/input.lua
+++ b/files/lua_api/openmw/input.lua
@@ -1,7 +1,34 @@
 ---
--- `openmw.input` can be used only in scripts attached to a player.
+-- `openmw.input` can be used only in menu scripts and scripts attached to a player.
+-- Most mods should prefer to use the actions/triggers API over the direct input device methods.
+-- Actions have one value on each frame (resolved just before the `onFrame` engine handler),
+--  while Triggers don't have a value, but can occur multiple times on each frame.
+-- Prefer to use built-in methods of binding actions, such as the [inputBinding setting renderer](setting_renderers.html#inputbinding)
 -- @module input
 -- @usage local input = require('openmw.input')
+-- -- Example of Action usage
+-- input.registerAction {
+--     key = 'MyAction',
+--     type = input.ACTION_TYPE.Boolean,
+--     l10n = 'MyLocalizationContext',
+--     name = 'MyAction_name',
+--     description = 'MyAction_full_description',
+--     defaultValue = false,
+-- }
+-- return {
+--     onFrame = function()
+--         local myAction = input.getBooleanActionValue('MyAction')
+--         if (myAction) then print('My action is active!') end
+--     end,
+-- }
+-- -- Example of Trigger usage
+-- input.registerTrigger {
+--     key = 'MyTrigger',
+--     l10n = 'MyLocalizationContext',
+--     name = 'MyTrigger_name',
+--     description = 'MyTrigger_full_description',
+-- }
+-- input.registerTriggerHandler('MyTrigger', async:callback(function() print('MyTrigger') end))
 
 
 
@@ -11,8 +38,7 @@
 -- @return #boolean
 
 ---
--- Is a specific control currently pressed.
--- Input bindings can be changed ingame using Options/Controls menu.
+-- (DEPRECATED, use getBooleanActionValue) Input bindings can be changed ingame using Options/Controls menu.
 -- @function [parent=#input] isActionPressed
 -- @param #number actionId One of @{openmw.input#ACTION}
 -- @return #boolean
@@ -72,23 +98,23 @@
 -- @return #number Value in range [-1, 1].
 
 ---
--- Get state of a control switch. I.e. is player able to move/fight/jump/etc.
+-- Returns a human readable name for the given key code
+-- @function [parent=#input] getKeyName
+-- @param #KeyCode code A key code (see @{openmw.input#KEY})
+-- @return #string
+
+---
+-- [Deprecated, moved to types.Player] Get state of a control switch. I.e. is player able to move/fight/jump/etc.
 -- @function [parent=#input] getControlSwitch
 -- @param #ControlSwitch key Control type (see @{openmw.input#CONTROL_SWITCH})
 -- @return #boolean
 
 ---
--- Set state of a control switch. I.e. forbid or allow player to move/fight/jump/etc.
+-- [Deprecated, moved to types.Player] Set state of a control switch. I.e. forbid or allow player to move/fight/jump/etc.
 -- @function [parent=#input] setControlSwitch
 -- @param #ControlSwitch key Control type (see @{openmw.input#CONTROL_SWITCH})
 -- @param #boolean value
 
----
--- Returns a human readable name for the given key code
--- @function [parent=#input] getKeyName
--- @param #KeyCode code A key code (see @{openmw.input#KEY})
--- @return #string
-
 ---
 -- String id of a @{#CONTROL_SWITCH}
 -- @type ControlSwitch
@@ -104,10 +130,11 @@
 -- @field [parent=#CONTROL_SWITCH] #ControlSwitch VanityMode Vanity view if player doesn't touch controls for a long time
 
 ---
--- Values that can be used with getControlSwitch/setControlSwitch.
+-- [Deprecated, moved to types.Player] Values that can be used with getControlSwitch/setControlSwitch.
 -- @field [parent=#input] #CONTROL_SWITCH CONTROL_SWITCH
 
 ---
+-- (DEPRECATED, use actions with matching keys)
 -- @type ACTION
 -- @field [parent=#ACTION] #number GameMenu
 -- @field [parent=#ACTION] #number Screenshot
@@ -153,7 +180,7 @@
 -- @field [parent=#ACTION] #number TogglePostProcessorHUD
 
 ---
--- Values that can be used with isActionPressed.
+-- (DEPRECATED, use getBooleanActionValue) Values that can be used with isActionPressed.
 -- @field [parent=#input] #ACTION ACTION
 
 ---
@@ -187,10 +214,10 @@
 -- @field [parent=#CONTROLLER_AXIS] #number RightY Right stick vertical axis (from -1 to 1)
 -- @field [parent=#CONTROLLER_AXIS] #number TriggerLeft Left trigger (from 0 to 1)
 -- @field [parent=#CONTROLLER_AXIS] #number TriggerRight Right trigger (from 0 to 1)
--- @field [parent=#CONTROLLER_AXIS] #number LookUpDown View direction vertical axis (RightY by default, can be mapped to another axis in Options/Controls menu)
--- @field [parent=#CONTROLLER_AXIS] #number LookLeftRight View direction horizontal axis (RightX by default, can be mapped to another axis in Options/Controls menu)
--- @field [parent=#CONTROLLER_AXIS] #number MoveForwardBackward Movement forward/backward (LeftY by default, can be mapped to another axis in Options/Controls menu)
--- @field [parent=#CONTROLLER_AXIS] #number MoveLeftRight Side movement (LeftX by default, can be mapped to another axis in Options/Controls menu)
+-- @field [parent=#CONTROLLER_AXIS] #number LookUpDown (DEPRECATED, use the LookUpDown action) View direction vertical axis (RightY by default, can be mapped to another axis in Options/Controls menu)
+-- @field [parent=#CONTROLLER_AXIS] #number LookLeftRight (DEPRECATED, use the LookLeftRight action) View direction horizontal axis (RightX by default, can be mapped to another axis in Options/Controls menu)
+-- @field [parent=#CONTROLLER_AXIS] #number MoveForwardBackward (DEPRECATED, use the MoveForwardBackward action) Movement forward/backward (LeftY by default, can be mapped to another axis in Options/Controls menu)
+-- @field [parent=#CONTROLLER_AXIS] #number MoveLeftRight (DEPRECATED, use the MoveLeftRight action) Side movement (LeftX by default, can be mapped to another axis in Options/Controls menu)
 
 ---
 -- Values that can be used with getAxisValue.
@@ -327,4 +354,105 @@
 -- @field [parent=#TouchEvent] openmw.util#Vector2 position Relative position on the touch device (0 to 1 from top left corner),
 -- @field [parent=#TouchEvent] #number pressure Pressure of the finger.
 
+---
+-- @type ActionType
+
+---
+-- @type ACTION_TYPE
+-- @field #ActionType Boolean Input action with value of true or false
+-- @field #ActionType Number Input action with a numeric value
+-- @field #ActionType Range Input action with a numeric value between 0 and 1 (inclusive)
+
+---
+-- Values that can be used in registerAction
+-- @field [parent=#input] #ACTION_TYPE ACTION_TYPE
+
+---
+-- @type ActionInfo
+-- @field [parent=#Actioninfo] #string key
+-- @field [parent=#Actioninfo] #ActionType type
+-- @field [parent=#Actioninfo] #string l10n Localization context containing the name and description keys
+-- @field [parent=#Actioninfo] #string name Localization key of the action's name
+-- @field [parent=#Actioninfo] #string description Localization key of the action's description
+-- @field [parent=#Actioninfo] defaultValue initial value of the action
+
+---
+-- Map of all currently registered actions
+-- @field [parent=#input] #map<#string,#ActionInfo> actions
+
+---
+-- Registers a new input action. The key must be unique
+-- @function [parent=#input] registerAction
+-- @param #ActionInfo info
+
+---
+-- Provides a function computing the value of given input action.
+--   The callback is called once a frame, after the values of dependency actions are resolved.
+--   Throws an error if a cyclic action dependency is detected.
+-- @function [parent=#input] bindAction
+-- @param #string key
+-- @param openmw.async#Callback callback returning the new value of the action, and taking as arguments:
+--   frame time in seconds,
+--   value of the function,
+--   value of the first dependency action,
+--   ...
+-- @param #list<#string> dependencies
+-- @usage
+--   input.bindAction('Activate', async:callback(function(dt, use, sneak, run)
+--       -- while sneaking, only activate things while holding the run binding
+--       return use and (run or not sneak)
+--   end), { 'Sneak', 'Run' })
+
+---
+-- Registers a function to be called whenever the action's value changes
+-- @function [parent=#input] registerActionHandler
+-- @param #string key
+-- @param openmw.async#Callback callback takes the new action value as the only argument
+
+---
+-- Returns the value of a Boolean action
+-- @function [parent=#input] getBooleanActionValue
+-- @param #string key
+-- @return #boolean
+
+---
+-- Returns the value of a Number action
+-- @function [parent=#input] getNumberActionValue
+-- @param #string key
+-- @return #number
+
+---
+-- Returns the value of a Range action
+-- @function [parent=#input] getRangeActionValue
+-- @param #string key
+-- @return #number
+
+---
+-- @type TriggerInfo
+-- @field [parent=#TriggerInfo] #string key
+-- @field [parent=#TriggerInfo] #string l10n Localization context containing the name and description keys
+-- @field [parent=#TriggerInfo] #string name Localization key of the trigger's name
+-- @field [parent=#TriggerInfo] #string description Localization key of the trigger's description
+
+---
+-- Map of all currently registered triggers
+-- @field [parent=#input] #map<#string,#TriggerInfo> triggers
+
+---
+-- Registers a new input trigger. The key must be unique
+-- @function [parent=#input] registerTrigger
+-- @param #TriggerInfo info
+
+---
+-- Registers a function to be called whenever the trigger activates
+-- @function [parent=#input] registerTriggerHandler
+-- @param #string key
+-- @param openmw.async#Callback callback takes the new action value as the only argument
+
+---
+-- Activates the trigger with the given key
+-- @function [parent=#input] activateTrigger
+-- @param #string key
+
+
 return nil
diff --git a/files/lua_api/openmw/interfaces.lua b/files/lua_api/openmw/interfaces.lua
index 5048fc2f3e..6f6e86be1e 100644
--- a/files/lua_api/openmw/interfaces.lua
+++ b/files/lua_api/openmw/interfaces.lua
@@ -5,6 +5,9 @@
 ---
 -- @field [parent=#interfaces] scripts.omw.activationhandlers#scripts.omw.activationhandlers Activation
 
+---
+-- @field [parent=#interfaces] scripts.omw.mechanics.animationcontroller#scripts.omw.mechanics.animationcontroller AnimationController
+
 ---
 -- @field [parent=#interfaces] scripts.omw.ai#scripts.omw.ai AI
 
@@ -20,6 +23,15 @@
 ---
 -- @field [parent=#interfaces] scripts.omw.ui#scripts.omw.ui UI
 
+---
+-- @field [parent=#interfaces] scripts.omw.usehandlers#scripts.omw.usehandlers ItemUsage
+
+---
+-- @field [parent=#interfaces] scripts.omw.skillhandlers#scripts.omw.skillhandlers SkillProgression
+
+---
+-- @field [parent=#interfaces] scripts.omw.crimes#scripts.omw.crimes Crimes
+
 ---
 -- @function [parent=#interfaces] __index
 -- @param #interfaces self
diff --git a/files/lua_api/openmw/markup.lua b/files/lua_api/openmw/markup.lua
new file mode 100644
index 0000000000..c8776281d3
--- /dev/null
+++ b/files/lua_api/openmw/markup.lua
@@ -0,0 +1,37 @@
+---
+-- `openmw.markup` allows to work with markup languages.
+-- @module markup
+-- @usage local markup = require('openmw.markup')
+
+
+
+---
+-- Convert YAML data to Lua object
+-- @function [parent=#markup] decodeYaml
+-- @param #string inputData Data to decode. It has such limitations:
+--
+--   1. YAML format of [version 1.2](https://yaml.org/spec/1.2.2) is used.
+--   2. Map keys should be scalar values (strings, booleans, numbers).
+--   3. YAML tag system is not supported.
+--   4. If scalar is quoted, it is treated like a string.
+-- Othewise type deduction works according to YAML 1.2 [Core Schema](https://yaml.org/spec/1.2.2/#103-core-schema).
+--   5. Circular dependencies between YAML nodes are not allowed.
+--   6. Lua 5.1 does not have integer numbers - all numeric scalars use a #number type (which use a floating point).
+--   7. Integer scalars numbers values are limited by the "int" range. Use floating point notation for larger number in YAML files.
+-- @return #any Lua object (can be table or scalar value).
+-- @usage local result = markup.decodeYaml('{ "x": 1 }');
+-- -- prints 1
+-- print(result["x"])
+
+---
+-- Load YAML file from VFS to Lua object. Conventions are the same as in @{#markup.decodeYaml}.
+-- @function [parent=#markup] loadYaml
+-- @param #string fileName YAML file path in VFS.
+-- @return #any Lua object (can be table or scalar value).
+-- @usage -- file contains '{ "x": 1 }' data
+-- local result = markup.loadYaml('test.yaml');
+-- -- prints 1
+-- print(result["x"])
+
+
+return nil
diff --git a/files/lua_api/openmw/menu.lua b/files/lua_api/openmw/menu.lua
new file mode 100644
index 0000000000..85ca28bb32
--- /dev/null
+++ b/files/lua_api/openmw/menu.lua
@@ -0,0 +1,72 @@
+---
+-- `openmw.menu` can be used only in menu scripts.
+-- @module menu
+-- @usage local menu = require('openmw.menu')
+
+---
+-- @type STATE
+-- @field [parent=#STATE] NoGame
+-- @field [parent=#STATE] Running
+-- @field [parent=#STATE] Ended
+
+---
+-- All possible game states returned by @{#menu.getState}
+-- @field [parent=#menu] #STATE STATE
+
+---
+-- Current game state
+-- @function [parent=#menu] getState
+-- @return #STATE
+
+---
+-- Start a new game
+-- @function [parent=#menu] newGame
+
+---
+-- Load the game from a save slot
+-- @function [parent=#menu] loadGame
+-- @param #string directory name of the save directory (e. g. character)
+-- @param #string slotName name of the save slot
+
+---
+-- Delete a saved game
+-- @function [parent=#menu] deleteGame
+-- @param #string directory name of the save directory (e. g. character)
+-- @param #string slotName name of the save slot
+
+---
+-- Current save directory
+-- @function [parent=#menu] getCurrentSaveDir
+-- @return #string
+
+---
+-- Save the game
+-- @function [parent=#menu] saveGame
+-- @param #string description human readable description of the save
+-- @param #string slotName name of the save slot
+
+---
+-- @type SaveInfo
+-- @field #string description
+-- @field #string playerName
+-- @field #string playerLevel
+-- @field #number timePlayed Gameplay time for this saved game. Note: available even with [time played](../modding/settings/saves.html#timeplayed) turned off
+-- @field #number creationTime Time at which the game was saved, as a timestamp in seconds. Can be passed as the second argument to `os.data`.
+-- @field #list<#string> contentFiles
+
+---
+-- All the saves for the given directory
+-- @function [parent=#menu] getSaves
+-- @param #string directory name of the save directory (e. g. character)
+-- @return #map<#string, #SaveInfo> map with save filenames as keys
+
+---
+-- List of all available saves, grouped by directory
+-- @function [parent=#menu] getAllSaves
+-- @return #map<#string, #map<#string, #SaveInfo>> map with directory names as keys, returning maps with save filenames as keys
+
+---
+-- Exit the game
+-- @function [parent=#menu] quit
+
+return nil
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
index 2ee44a6df6..ea1b8738bc 100644
--- a/files/lua_api/openmw/nearby.lua
+++ b/files/lua_api/openmw/nearby.lua
@@ -89,6 +89,11 @@
 --     radius = 10,
 -- })
 
+---
+-- A table of parameters for @{#nearby.castRenderingRay} and @{#nearby.asyncCastRenderingRay}
+-- @type CastRenderingRayOptions
+-- @field #table ignore A list of @{openmw.core#GameObject} to ignore while doing the ray cast
+
 ---
 -- Cast ray from one point to another and find the first visual intersection with anything in the scene.
 -- As opposite to `castRay` can find an intersection with an object without collisions.
@@ -97,6 +102,7 @@
 -- @function [parent=#nearby] castRenderingRay
 -- @param openmw.util#Vector3 from Start point of the ray.
 -- @param openmw.util#Vector3 to End point of the ray.
+-- @param #CastRenderingRayOptions
 -- @return #RayCastingResult
 
 ---
@@ -105,25 +111,26 @@
 -- @param openmw.async#Callback callback The callback to pass the result to (should accept a single argument @{openmw.nearby#RayCastingResult}).
 -- @param openmw.util#Vector3 from Start point of the ray.
 -- @param openmw.util#Vector3 to End point of the ray.
+-- @param #CastRenderingRayOptions
 
 ---
 -- @type NAVIGATOR_FLAGS
--- @field [parent=#NAVIGATOR_FLAGS] #number Walk allow agent to walk on the ground area;
--- @field [parent=#NAVIGATOR_FLAGS] #number Swim allow agent to swim on the water surface;
--- @field [parent=#NAVIGATOR_FLAGS] #number OpenDoor allow agent to open doors on the way;
--- @field [parent=#NAVIGATOR_FLAGS] #number UsePathgrid allow agent to use predefined pathgrid imported from ESM files.
+-- @field [parent=#NAVIGATOR_FLAGS] #number Walk Allow agent to walk on the ground area.
+-- @field [parent=#NAVIGATOR_FLAGS] #number Swim Allow agent to swim on the water surface.
+-- @field [parent=#NAVIGATOR_FLAGS] #number OpenDoor Allow agent to open doors on the way.
+-- @field [parent=#NAVIGATOR_FLAGS] #number UsePathgrid Allow agent to use predefined pathgrid imported from ESM files.
 
 ---
 -- @type COLLISION_SHAPE_TYPE
 -- @field [parent=#COLLISION_SHAPE_TYPE] #number Aabb Axis-Aligned Bounding Box is used for NPC and symmetric
--- Creatures;
+-- Creatures.
 -- @field [parent=#COLLISION_SHAPE_TYPE] #number RotatingBox is used for Creatures with big difference in width and
--- height;
+-- height.
 -- @field [parent=#COLLISION_SHAPE_TYPE] #number Cylinder is used for NPC and symmetric Creatures.
 
 ---
 -- @type FIND_PATH_STATUS
--- @field [parent=#FIND_PATH_STATUS] #number Success Path is found;
+-- @field [parent=#FIND_PATH_STATUS] #number Success Path is found.
 -- @field [parent=#FIND_PATH_STATUS] #number PartialPath Last path point is not a destination but a nearest position
 -- among found;
 -- @field [parent=#FIND_PATH_STATUS] #number NavMeshNotFound Provided `agentBounds` don't have corresponding navigation
@@ -135,16 +142,63 @@
 -- @field [parent=#FIND_PATH_STATUS] #number EndPolygonNotFound `destination` position is too far from available
 -- navigation mesh. The status may appear when navigation mesh is not fully generated or position is outside of covered
 -- area;
--- @field [parent=#FIND_PATH_STATUS] #number TargetPolygonNotFound adjusted `destination` position is too far from available
--- navigation mesh. The status may appear when navigation mesh is not fully generated or position is outside of covered
--- area;
+-- @field [parent=#FIND_PATH_STATUS] #number TargetPolygonNotFound adjusted `destination` position is too far from
+-- available navigation mesh. The status may appear when navigation mesh is not fully generated or position is outside
+-- of covered area;
 -- @field [parent=#FIND_PATH_STATUS] #number MoveAlongSurfaceFailed Found path couldn't be smoothed due to imperfect
 -- algorithm implementation or bad navigation mesh data;
 -- @field [parent=#FIND_PATH_STATUS] #number FindPathOverPolygonsFailed Path over navigation mesh from `source` to
 -- `destination` does not exist or navigation mesh is not fully generated to provide the path;
 -- @field [parent=#FIND_PATH_STATUS] #number InitNavMeshQueryFailed Couldn't initialize required data due to bad input
 -- or bad navigation mesh data.
--- @field [parent=#FIND_PATH_STATUS] #number FindStraightPathFailed Couldn't map path over polygons into world coordinates.
+-- @field [parent=#FIND_PATH_STATUS] #number FindStraightPathFailed Couldn't map path over polygons into world
+-- coordinates.
+
+---
+-- A table of parameters identifying navmesh
+-- @type AgentBounds
+-- @field [parent=#AgentBounds] #COLLISION_SHAPE_TYPE shapeType.
+-- @field [parent=#AgentBounds] openmw.util#Vector3 halfExtents.
+
+---
+-- A table of parameters to specify relative path cost per each area type
+-- @type AreaCosts
+-- @field [parent=#AreaCosts] #number ground Value >= 0, used in combination with @{#NAVIGATOR_FLAGS.Walk} (default: 1).
+-- @field [parent=#AreaCosts] #number water Value >= 0, used in combination with @{#NAVIGATOR_FLAGS.Swim} (default: 1).
+-- @field [parent=#AreaCosts] #number door Value >= 0, used in combination with @{#NAVIGATOR_FLAGS.OpenDoor}
+-- (default: 2).
+-- @field [parent=#AreaCosts] #number pathgrid Value >= 0, used in combination with @{#NAVIGATOR_FLAGS.UsePathgrid}
+-- (default: 1).
+
+---
+-- A table of parameters for @{#nearby.findPath}
+-- @type FindPathOptions
+-- @field [parent=#FindPathOptions] #AgentBounds agentBounds identifies which navmesh to use.
+-- @field [parent=#FindPathOptions] #number includeFlags allowed areas for agent to move, a sum of @{#NAVIGATOR_FLAGS}
+-- values (default: @{#NAVIGATOR_FLAGS.Walk} + @{#NAVIGATOR_FLAGS.Swim} + @{#NAVIGATOR_FLAGS.OpenDoor}
+-- + @{#NAVIGATOR_FLAGS.UsePathgrid}).
+-- @field [parent=#FindPathOptions] #AreaCosts areaCosts a table defining relative cost for each type of area.
+-- @field [parent=#FindPathOptions] #number destinationTolerance a floating point number representing maximum allowed
+-- distance between destination and a nearest point on the navigation mesh in addition to agent size (default: 1).
+
+---
+-- A table of parameters for @{#nearby.findRandomPointAroundCircle} and @{#nearby.castNavigationRay}
+-- @type NavMeshOptions
+-- @field [parent=#NavMeshOptions] #AgentBounds agentBounds Identifies which navmesh to use.
+-- @field [parent=#NavMeshOptions] #number includeFlags Allowed areas for agent to move, a sum of @{#NAVIGATOR_FLAGS}
+-- values (default: @{#NAVIGATOR_FLAGS.Walk} + @{#NAVIGATOR_FLAGS.Swim} + @{#NAVIGATOR_FLAGS.OpenDoor}
+-- + @{#NAVIGATOR_FLAGS.UsePathgrid}).
+
+---
+-- A table of parameters for @{#nearby.findNearestNavMeshPosition}
+-- @type FindNearestNavMeshPositionOptions
+-- @field [parent=#NavMeshOptions] #AgentBounds agentBounds Identifies which navmesh to use.
+-- @field [parent=#NavMeshOptions] #number includeFlags Allowed areas for agent to move, a sum of @{#NAVIGATOR_FLAGS}
+-- values (default: @{#NAVIGATOR_FLAGS.Walk} + @{#NAVIGATOR_FLAGS.Swim} + @{#NAVIGATOR_FLAGS.OpenDoor}
+-- + @{#NAVIGATOR_FLAGS.UsePathgrid}).
+-- @field [parent=#NavMeshOptions] openmw.util#Vector3 searchAreaHalfExtents Defines AABB like area half extents around
+-- given position (default: (1 + 2 * CellGridRadius) * CellSize * (1, 1, 1) where CellGridRadius and depends on cell
+-- type to cover the whole active grid).
 
 ---
 -- Find path over navigation mesh from source to destination with given options. Result is unstable since navigation
@@ -152,24 +206,7 @@
 -- @function [parent=#nearby] findPath
 -- @param openmw.util#Vector3 source Initial path position.
 -- @param openmw.util#Vector3 destination Final path position.
--- @param #table options An optional table with additional optional arguments. Can contain:
---
---   * `agentBounds` - a table identifying which navmesh to use, can contain:
---
---     * `shapeType` - one of @{#COLLISION_SHAPE_TYPE} values;
---     * `halfExtents` - @{openmw.util#Vector3} defining agent bounds size;
---   * `includeFlags` - allowed areas for agent to move, a sum of @{#NAVIGATOR_FLAGS} values
---     (default: @{#NAVIGATOR_FLAGS.Walk} + @{#NAVIGATOR_FLAGS.Swim} +
---     @{#NAVIGATOR_FLAGS.OpenDoor} + @{#NAVIGATOR_FLAGS.UsePathgrid});
---   * `areaCosts` - a table defining relative cost for each type of area, can contain:
---
---     * `ground` - a floating point number >= 0, used in combination with @{#NAVIGATOR_FLAGS.Walk} (default: 1);
---     * `water` - a floating point number >= 0, used in combination with @{#NAVIGATOR_FLAGS.Swim} (default: 1);
---     * `door` - a floating point number >= 0, used in combination with @{#NAVIGATOR_FLAGS.OpenDoor} (default: 2);
---     * `pathgrid` - a floating point number >= 0, used in combination with @{#NAVIGATOR_FLAGS.UsePathgrid}
---       (default: 1);
---   * `destinationTolerance` - a floating point number representing maximum allowed distance between destination and a
---     nearest point on the navigation mesh in addition to agent size (default: 1);
+-- @param #FindPathOptions options An optional table with additional optional arguments.
 -- @return #FIND_PATH_STATUS
 -- @return #list<openmw.util#Vector3>
 -- @usage local status, path = nearby.findPath(source, destination)
@@ -189,15 +226,7 @@
 -- @function [parent=#nearby] findRandomPointAroundCircle
 -- @param openmw.util#Vector3 position Center of the search circle.
 -- @param #number maxRadius Approximate maximum search distance.
--- @param #table options An optional table with additional optional arguments. Can contain:
---
---   * `agentBounds` - a table identifying which navmesh to use, can contain:
---
---     * `shapeType` - one of @{#COLLISION_SHAPE_TYPE} values;
---     * `halfExtents` - @{openmw.util#Vector3} defining agent bounds size;
---   * `includeFlags` - allowed areas for agent to move, a sum of @{#NAVIGATOR_FLAGS} values
---     (default: @{#NAVIGATOR_FLAGS.Walk} + @{#NAVIGATOR_FLAGS.Swim} +
---     @{#NAVIGATOR_FLAGS.OpenDoor} + @{#NAVIGATOR_FLAGS.UsePathgrid});
+-- @param #NavMeshOptions options An optional table with additional optional arguments.
 -- @return openmw.util#Vector3, #nil
 -- @usage local position = nearby.findRandomPointAroundCircle(position, maxRadius)
 -- @usage local position = nearby.findRandomPointAroundCircle(position, maxRadius, {
@@ -213,15 +242,7 @@
 -- @function [parent=#nearby] castNavigationRay
 -- @param openmw.util#Vector3 from Initial ray position.
 -- @param openmw.util#Vector3 to Target ray position.
--- @param #table options An optional table with additional optional arguments. Can contain:
---
---   * `agentBounds` - a table identifying which navmesh to use, can contain:
---
---     * `shapeType` - one of @{#COLLISION_SHAPE_TYPE} values;
---     * `halfExtents` - @{openmw.util#Vector3} defining agent bounds size;
---   * `includeFlags` - allowed areas for agent to move, a sum of @{#NAVIGATOR_FLAGS} values
---     (default: @{#NAVIGATOR_FLAGS.Walk} + @{#NAVIGATOR_FLAGS.Swim} +
---     @{#NAVIGATOR_FLAGS.OpenDoor} + @{#NAVIGATOR_FLAGS.UsePathgrid});
+-- @param #NavMeshOptions options An optional table with additional optional arguments.
 -- @return openmw.util#Vector3, #nil
 -- @usage local position = nearby.castNavigationRay(from, to)
 -- @usage local position = nearby.castNavigationRay(from, to, {
@@ -231,4 +252,22 @@
 --     agentBounds = Actor.getPathfindingAgentBounds(self),
 -- })
 
+---
+-- Finds a nearest position on navigation mesh to the given position within given search area.
+-- @function [parent=#nearby] findNearestNavMeshPosition
+-- @param openmw.util#Vector3 position Search area center.
+-- @param #FindNearestNavMeshPositionOptions options An optional table with additional optional arguments.
+-- @return openmw.util#Vector3, #nil
+-- @usage local navMeshPosition = nearby.findNearestNavMeshPosition(position)
+-- @usage local navMeshPosition = nearby.findNearestNavMeshPosition(position, {
+--     includeFlags = nearby.NAVIGATOR_FLAGS.Swim,
+-- })
+-- @usage local navMeshPosition = nearby.findNearestNavMeshPosition(position, {
+--     agentBounds = Actor.getPathfindingAgentBounds(self),
+-- })
+-- @usage local navMeshPosition = nearby.findNearestNavMeshPosition(position, {
+--     searchAreaHalfExtents = util.vector3(1000, 1000, 1000),
+--     includeFlags = nearby.NAVIGATOR_FLAGS.Walk,
+-- })
+
 return nil
diff --git a/files/lua_api/openmw/self.lua b/files/lua_api/openmw/self.lua
index 005017e5c3..4da5fa3ee9 100644
--- a/files/lua_api/openmw/self.lua
+++ b/files/lua_api/openmw/self.lua
@@ -1,7 +1,7 @@
 ---
 -- `openmw.self` provides full access to the object the script is attached to.
 -- Can be used only from local scripts. All fields and function of `GameObject` are also available for `openmw.self`.
--- @module self
+-- @module Self
 -- @extends openmw.core#GameObject
 -- @usage local self = require('openmw.self')
 -- local types = require('openmw.types')
@@ -14,27 +14,26 @@
 ---
 -- Returns true if the script isActive (the object it is attached to is in an active cell).
 -- If it is not active, then `openmw.nearby` can not be used.
--- @function [parent=#self] isActive
--- @param self
+-- @function [parent=#Self] isActive
+-- @param Self
 -- @return #boolean
 
 ---
 -- The object the script is attached to (readonly)
--- @field [parent=#self] openmw.core#GameObject object
-
---- NPC who owns the object or `nil` (mutable).
--- @field [parent=#self] #string ownerRecordId
-
---- Faction who owns the object or `nil` (mutable).
--- @field [parent=#self] #string ownerFactionId
-
---- Rank required to be allowed to pick up the object (mutable).
--- @field [parent=#self] #number ownerFactionRank
+-- @field [parent=#Self] openmw.core#GameObject object
 
 
 ---
 -- Movement controls (only for actors)
--- @field [parent=#self] #ActorControls controls
+-- @field [parent=#Self] #ActorControls controls
+
+---
+-- @type ATTACK_TYPE
+-- @field #number NoAttack
+-- @field #number Any
+-- @field #number Chop
+-- @field #number Slash
+-- @field #number Thrust
 
 ---
 -- Allows to view and/or modify controls of an actor. All fields are mutable.
@@ -46,12 +45,12 @@
 -- @field [parent=#ActorControls] #boolean run true - run, false - walk
 -- @field [parent=#ActorControls] #boolean sneak If true - sneak
 -- @field [parent=#ActorControls] #boolean jump If true - initiate a jump
--- @field [parent=#ActorControls] #number use if 1 - activates the readied weapon/spell. For weapons, keeping at 1 will charge the attack until set to 0.
+-- @field [parent=#ActorControls] #ATTACK_TYPE use Activates the readied weapon/spell according to a provided value. For weapons, keeping this value modified will charge the attack until set to @{#ATTACK_TYPE.NoAttack}. If an @#ATTACK_TYPE} not appropriate for a currently equipped weapon provided - an appropriate @{#ATTACK_TYPE} will be used instead.
 
 ---
 -- Enables or disables standard AI (enabled by default).
--- @function [parent=#self] enableAI
--- @param self
+-- @function [parent=#Self] enableAI
+-- @param Self
 -- @param #boolean v
 
 return nil
diff --git a/files/lua_api/openmw/storage.lua b/files/lua_api/openmw/storage.lua
index 303c674319..575b0f83d9 100644
--- a/files/lua_api/openmw/storage.lua
+++ b/files/lua_api/openmw/storage.lua
@@ -15,15 +15,25 @@
 --     end
 -- end))
 
+--- Possible @{#LifeTime} values
+-- @field [parent=#storage] #LifeTime LIFE_TIME
+
+--- `storage.LIFE_TIME`
+-- @type LifeTime
+-- @field #number Persistent "0" Data is stored for the whole game session and remains on disk after quitting the game
+-- @field #number GameSession "1" Data is stored for the whole game session
+-- @field #number Temporary "2" Data is stored until script context reset
+
 ---
 -- Get a section of the global storage; can be used by any script, but only global scripts can change values.
+-- Menu scripts can only access it when a game is running.
 -- Creates the section if it doesn't exist.
 -- @function [parent=#storage] globalSection
 -- @param #string sectionName
 -- @return #StorageSection
 
 ---
--- Get a section of the player storage; can be used by player scripts only.
+-- Get a section of the player storage; can only be used by player and menu scripts.
 -- Creates the section if it doesn't exist.
 -- @function [parent=#storage] playerSection
 -- @param #string sectionName
@@ -36,7 +46,7 @@
 -- @return #table
 
 ---
--- Get all global sections as a table; can be used by player scripts only.
+-- Get all player sections as a table; can only be used by player and menu scripts.
 -- Note that adding/removing items to the returned table doesn't create or remove sections.
 -- @function [parent=#storage] allPlayerSections
 -- @return #table
@@ -82,12 +92,28 @@
 -- @param #table values (optional) New values
 
 ---
--- Make the whole section temporary: will be removed on exit or when load a save.
+-- (DEPRECATED, use `setLifeTime(openmw.storage.LIFE_TIME.Temporary)`) Make the whole section temporary: will be removed on exit or when load a save.
 -- Temporary sections have the same interface to get/set values, the only difference is they will not
 -- be saved to the permanent storage on exit.
--- This function can not be used for a global storage section from a local script.
+-- This function can be used for a global storage section from a global script or for a player storage section from a player or menu script.
 -- @function [parent=#StorageSection] removeOnExit
 -- @param self
+-- @usage
+-- local storage = require('openmw.storage')
+-- local myModData = storage.globalSection('MyModExample')
+-- myModData:removeOnExit()
+
+---
+-- Set the life time of given storage section.
+-- New sections initially have a Persistent life time.
+-- This function can be used for a global storage section from a global script or for a player storage section from a player or menu script.
+-- @function [parent=#StorageSection] setLifeTime
+-- @param self
+-- @param #LifeTime lifeTime Section life time
+-- @usage
+-- local storage = require('openmw.storage')
+-- local myModData = storage.globalSection('MyModExample')
+-- myModData:setLifeTime(storage.LIFE_TIME.Temporary)
 
 ---
 -- Set value by a string key; can not be used for global storage from a local script.
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 0c4a87563b..e518723ea5 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -9,12 +9,36 @@
 --- Common functions for Creature, NPC, and Player.
 -- @type Actor
 
+---
+-- Get the total weight of everything the actor is carrying, plus modifications from magic effects.
+-- @function [parent=#Actor] getEncumbrance
+-- @param openmw.core#GameObject actor
+-- @return #number
+
+---
+-- Check if the given actor is dead (health reached 0, so death process started).
+-- @function [parent=#Actor] isDead
+-- @param openmw.core#GameObject actor
+-- @return #boolean
+
+---
+-- Check if the given actor's death process is finished.
+-- @function [parent=#Actor] isDeathFinished
+-- @param openmw.core#GameObject actor
+-- @return #boolean
+
 ---
 -- Agent bounds to be used for pathfinding functions.
 -- @function [parent=#Actor] getPathfindingAgentBounds
 -- @param openmw.core#GameObject actor
 -- @return #table with `shapeType` and `halfExtents`
 
+---
+-- Check if given actor is in the actors processing range.
+-- @function [parent=#Actor] isInActorsProcessingRange
+-- @param openmw.core#GameObject actor
+-- @return #boolean
+
 ---
 -- Whether the object is an actor.
 -- @function [parent=#Actor] objectIsInstance
@@ -50,7 +74,7 @@
 -- @field #number Ammunition
 
 ---
--- Available @{#EQUIPMENT_SLOT} values. Used in `Actor.equipment(obj)` and `Actor.setEquipment(obj, eqp)`.
+-- Available @{#EQUIPMENT_SLOT} values. Used in `Actor.getEquipment(obj)` and `Actor.setEquipment(obj, eqp)`.
 -- @field [parent=#Actor] #EQUIPMENT_SLOT EQUIPMENT_SLOT
 
 ---
@@ -161,6 +185,11 @@
 -- @param openmw.core#GameObject actor
 -- @param openmw.core#Spell spell Spell (can be nil)
 
+---
+-- Clears the actor's selected castable(spell or enchanted item)
+-- @function [parent=#Actor] clearSelectedCastable
+-- @param openmw.core#GameObject actor
+
 ---
 -- Get currently selected enchanted item
 -- @function [parent=#Actor] getSelectedEnchantedItem
@@ -187,14 +216,14 @@
 -- end
 -- @usage -- Check for a specific effect
 -- local effect = Actor.activeEffects(self):getEffect(core.magic.EFFECT_TYPE.Telekinesis)
--- if effect then
+-- if effect.magnitude ~= 0 then
 --     print(effect.id..', attribute='..tostring(effect.affectedAttribute)..', skill='..tostring(effect.affectedSkill)..', magnitude='..tostring(effect.magnitude))
 -- else
 --     print('No Telekinesis effect')
 -- end
 -- @usage -- Check for a specific effect targeting a specific attribute.
--- local effect = Actor.activeEffects(self):getEffect(core.magic.EFFECT_TYPE.FortifyAttribute, core.ATTRIBUTE.Luck)
--- if effect then
+-- local effect = Actor.activeEffects(self):getEffect(core.magic.EFFECT_TYPE.FortifyAttribute, 'luck')
+-- if effect.magnitude ~= 0 then
 --     print(effect.id..', attribute='..tostring(effect.affectedAttribute)..', skill='..tostring(effect.affectedSkill)..', magnitude='..tostring(effect.magnitude))
 -- else
 --     print('No Fortify Luck effect')
@@ -206,19 +235,19 @@
 -- @param self
 -- @param #string effectId effect ID
 -- @param #string extraParam Optional skill or attribute ID
--- @return openmw.core#ActiveEffect if such an effect is active, nil otherwise
+-- @return openmw.core#ActiveEffect
 
 ---
 -- Completely removes the active effect from the actor.
--- This removes both the effects incurred by active spells and effect added by console, mwscript, or luascript.
 -- @function [parent=#ActorActiveEffects] remove
 -- @param self
 -- @param #string effectId effect ID
 -- @param #string extraParam Optional skill or attribute ID
 
----
--- Permanently modifies the magnitude of an active effect to be exactly equal to the provided value. This adds the effect to the list of active effects if not already active.
+--- (Note that using this function will override and conflict with all other sources of this effect, you probably want to use @{#ActorActiveEffects.modify} instead, this function is provided for mwscript parity only)
+-- Permanently modifies the magnitude of an active effect to be exactly equal to the provided value.
 -- Note that although the modification is permanent, the magnitude will not stay equal to the value if any active spells with this effects are added/removed.
+-- Also see the notes on @{#ActorActiveEffects.modify}
 -- @function [parent=#ActorActiveEffects] set
 -- @param self
 -- @param #number value
@@ -226,7 +255,7 @@
 -- @param #string extraParam Optional skill or attribute ID
 
 ---
--- Permanently modifies the magnitude of an active effect by increasing it by the provided value. This adds the effect to the list of active effects if not already active.
+-- Permanently modifies the magnitude of an active effect by modifying it by the provided value. Note that some active effect values, such as fortify attribute effects, have no practical effect of their own, and must be paired with explicitly modifying the target stat to have any effect.
 -- @function [parent=#ActorActiveEffects] modify
 -- @param self
 -- @param #number value
@@ -274,17 +303,59 @@
 -- end
 
 ---
--- Get whether a specific spell is active on the actor.
+-- Get whether any instance of the specific spell is active on the actor.
 -- @function [parent=#ActorActiveSpells] isSpellActive
 -- @param self
--- @param #any recordOrId record or string record ID of the active spell's source. valid records are @{openmw.core#Spell}, @{openmw.core#Enchantment}, #IngredientRecord, or #PotionRecord
+-- @param #any recordOrId A record or string record ID. Valid records are @{openmw.core#Spell}, enchanted @{#Item}, @{#IngredientRecord}, or @{#PotionRecord}.
 -- @return true if spell is active, false otherwise
 
 ---
--- Remove the given spell and all its effects from the given actor's active spells.
+-- If true, the actor has not used this power in the last 24h. Will return true for powers the actor does not have.
+-- @function [parent=#ActorActiveSpells] canUsePower
+-- @param self
+-- @param #any spellOrId A @{openmw.core#Spell} or string record id.
+
+---
+-- Remove an active spell based on active spell ID (see @{openmw_core#ActiveSpell.activeSpellId}). Can only be used in global scripts or on self. Can only be used to remove spells with the temporary flag set (see @{openmw_core#ActiveSpell.temporary}).
 -- @function [parent=#ActorActiveSpells] remove
 -- @param self
--- @param #any spellOrId @{openmw.core#Spell} or string spell id
+-- @param #any id Active spell ID.
+
+---
+-- Adds a new spell to the list of active spells (only in global scripts or on self).
+-- Note that this does not play any related VFX or sounds.
+-- @function [parent=#ActorActiveSpells] add
+-- @param self
+-- @param #table options A table of parameters. Must contain the following required parameters:
+--
+--   * `id` - A string record ID. Valid records are @{openmw.core#Spell}, enchanted @{#Item}, @{#IngredientRecord}, or @{#PotionRecord}.
+--   * `effects` - A list of indexes of the effects to be applied. These indexes must be in range of the record's list of @{openmw.core#MagicEffectWithParams}. Note that for Ingredients, normal ingredient consumption rules will be applied to effects.
+--
+-- And may contain the following optional parameters:
+--
+--   * `name` - The name to show in the list of active effects in the UI. Default: Name of the record identified by the id.
+--   * `ignoreResistances` - If true, resistances will be ignored. Default: false
+--   * `ignoreSpellAbsorption` - If true, spell absorption will not be applied. Default: false.
+--   * `ignoreReflect` - If true, reflects will not be applied. Default: false.
+--   * `caster` - A game object that identifies the caster. Default: nil
+--   * `item` - A game object that identifies the specific enchanted item instance used to cast the spell. Default: nil
+--   * `stackable` - If true, the spell will be able to stack. If false, existing instances of spells with the same id from the same source (where source is caster + item)
+--   * `quiet` - If true, no messages will be printed if the spell is an Ingredient and it had no effect. Always true if the target is not the player.
+-- @usage
+-- -- Adds the effect of the chameleon spell to the character
+-- Actor.activeSpells(self):add({id = 'chameleon', effects = { 0 }})
+-- @usage
+-- -- Adds the effect of a standard potion of intelligence, without consuming any potions from the character's inventory.
+-- -- Note that stackable = true to let the effect stack like a potion should.
+-- Actor.activeSpells(self):add({id = 'p_fortify_intelligence_s', effects = { 0 }, stackable = true})
+-- @usage
+-- -- Adds the negative effect of Greef twice over, and renames it to Good Greef.
+-- Actor.activeSpells(self):add({id = 'potion_comberry_brandy_01', effects = { 1, 1 }, stackable = true, name = 'Good Greef'})
+-- @usage
+-- -- Has the same effect as if the actor ate a chokeweed. With the same variable effect based on skill / random chance.
+-- Actor.activeSpells(self):add({id = 'ingred_chokeweed_01', effects = { 0 }, stackable = true, name = 'Chokeweed'})
+-- -- Same as above, but uses a different index. Note that if multiple indexes are used, the randomicity is applied separately for each effect.
+-- Actor.activeSpells(self):add({id = 'ingred_chokeweed_01', effects = { 1 }, stackable = true, name = 'Chokeweed'})
 
 ---
 -- Return the spells (@{#ActorSpells}) of the given actor.
@@ -302,7 +373,7 @@
 -- for i = 1, #mySpells do print(mySpells[i].id) end
 -- @usage -- add ALL spells that exist in the world
 -- local mySpells = types.Actor.spells(self)
--- for _, spell in pairs(core.magic.spells) do
+-- for _, spell in pairs(core.magic.spells.records) do
 --     if spell.type == core.magic.SPELL_TYPE.Spell then
 --         mySpells:add(spell)
 --     end
@@ -330,10 +401,29 @@
 -- @function [parent=#ActorSpells] clear
 -- @param self
 
+--- Values affect how much each attribute can be increased at level up, and are all reset to 0 upon level up.
+-- @type SkillIncreasesForAttributeStats
+-- @field #number agility Number of contributions to agility for the next level up.
+-- @field #number endurance Number of contributions to endurance for the next level up.
+-- @field #number intelligence Number of contributions to intelligence for the next level up.
+-- @field #number luck Number of contributions to luck for the next level up.
+-- @field #number personality Number of contributions to personality for the next level up.
+-- @field #number speed Number of contributions to speed for the next level up.
+-- @field #number strength Number of contributions to strength for the next level up.
+-- @field #number willpower Number of contributions to willpower for the next level up.
+
+--- Values affect the graphic used on the level up screen, and are all reset to 0 upon level up.
+-- @type SkillIncreasesForSpecializationStats
+-- @field #number combat Number of contributions to combat specialization for the next level up.
+-- @field #number magic Number of contributions to magic specialization for the next level up.
+-- @field #number stealth Number of contributions to stealth specialization for the next level up.
+
 ---
 -- @type LevelStat
 -- @field #number current The actor's current level.
--- @field #number progress The NPC's level progress (read-only.)
+-- @field #number progress The NPC's level progress.
+-- @field #SkillIncreasesForAttributeStats skillIncreasesForAttribute The NPC's attribute contributions towards the next level up. Values affect how much each attribute can be increased at level up.
+-- @field #SkillIncreasesForSpecializationStats skillIncreasesForSpecialization The NPC's attribute contributions towards the next level up. Values affect the graphic used on the level up screen.
 
 ---
 -- @type DynamicStat
@@ -356,6 +446,12 @@
 -- @field #number modifier The skill's modifier.
 -- @field #number progress [0-1] The NPC's skill progress.
 
+---
+-- @type AIStat
+-- @field #number base The stat's base value.
+-- @field #number modifier The stat's modifier.
+-- @field #number modified The actor's current ai value (read-only.)
+
 ---
 -- @type DynamicStats
 
@@ -377,6 +473,33 @@
 -- @param openmw.core#GameObject actor
 -- @return #DynamicStat
 
+---
+-- @type AIStats
+
+---
+-- Alarm (returns @{#AIStat})
+-- @function [parent=#AIStats] alarm
+-- @param openmw.core#GameObject actor
+-- @return #AIStat
+
+---
+-- Fight (returns @{#AIStat})
+-- @function [parent=#AIStats] fight
+-- @param openmw.core#GameObject actor
+-- @return #AIStat
+
+---
+-- Flee (returns @{#AIStat})
+-- @function [parent=#AIStats] flee
+-- @param openmw.core#GameObject actor
+-- @return #AIStat
+
+---
+-- Hello (returns @{#AIStat})
+-- @function [parent=#AIStats] hello
+-- @param openmw.core#GameObject actor
+-- @return #AIStat
+
 ---
 -- @type AttributeStats
 
@@ -597,6 +720,7 @@
 -- @type ActorStats
 -- @field #DynamicStats dynamic
 -- @field #AttributeStats attributes
+-- @field #AIStats ai
 
 ---
 -- Level (returns @{#LevelStat})
@@ -627,16 +751,23 @@
 -- @return #boolean
 
 ---
--- Get this item's current enchantment charge.
+-- (DEPRECATED, use itemData(item).enchantmentCharge) Get this item's current enchantment charge.
 -- @function [parent=#Item] getEnchantmentCharge
 -- @param openmw.core#GameObject item
--- @return #number The charge remaining. -1 if the enchantment has never been used, implying the charge is full. Unenchanted items will always return a value of -1.
+-- @return #number The charge remaining. `nil` if the enchantment has never been used, implying the charge is full. Unenchanted items will always return a value of `nil`.
 
 ---
--- Set this item's enchantment charge.
+-- Checks if the item restocks.
+-- Returns true if the object restocks, and false otherwise.
+-- @function [parent=#Item] isRestocking
+-- @param openmw.core#GameObject item
+-- @return #boolean
+
+---
+-- (DEPRECATED, use itemData(item).enchantmentCharge) Set this item's enchantment charge.
 -- @function [parent=#Item] setEnchantmentCharge
 -- @param openmw.core#GameObject item
--- @param #number charge
+-- @param #number charge Can be `nil` to reset the unused state / full
 
 ---
 -- Whether the object is supposed to be carriable. It is true for all items except
@@ -646,6 +777,17 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Set of properties that differentiates one item from another of the same record type; can be used by any script, but only global and self scripts can change values.
+-- @function [parent=#Item] itemData
+-- @param openmw.core#GameObject item
+-- @return #ItemData
+
+---
+-- @type ItemData
+-- @field #number condition The item's current condition. Time remaining for lights. Uses left for repairs, lockpicks and probes. Current health for weapons and armor.
+-- @field #number enchantmentCharge The item's current enchantment charge. Unenchanted items will always return a value of `nil`. Setting this to `nil` will reset the charge of the item.
+-- @field #string soul The recordId of the item's current soul. Items without soul will always return a value of `nil`. Setting this to `nil` will remove the soul from the item.
 
 --------------------------------------------------------------------------------
 -- @{#Creature} functions
@@ -655,7 +797,13 @@
 -- @type Creature
 -- @extends #Actor
 -- @field #Actor baseType @{#Actor}
--- @field #list<#CreatureRecord> records A read-only list of all @{#CreatureRecord}s in the world database.
+
+---
+-- A read-only list of all @{#CreatureRecord}s in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) of #CreatureRecord.
+-- @field [parent=#Creature] #list<#CreatureRecord> records
+-- @usage local record = types.NPC.classes['example_recordid']
+-- @usage local record = types.NPC.classes[1]
 
 ---
 -- Whether the object is a creature.
@@ -679,16 +827,34 @@
 -- @param #any objectOrRecordId
 -- @return #CreatureRecord
 
+---
+-- @type CreatureAttack
+-- @field #number minDamage Minimum attack damage.
+-- @field #number maxDamage Maximum attack damage.
+
 ---
 -- @type CreatureRecord
 -- @field #string id The record ID of the creature
 -- @field #string name
 -- @field #string baseCreature Record id of a base creature, which was modified to create this one
 -- @field #string model VFS path to the creature's model
--- @field #string mwscript
+-- @field #string mwscript MWScript on this creature (can be nil)
 -- @field #number soulValue The soul value of the creature record
 -- @field #number type The @{#Creature.TYPE} of the creature
 -- @field #number baseGold The base barter gold of the creature
+-- @field #number combatSkill The base combat skill of the creature. This is the skill value used for all skills with a 'combat' specialization
+-- @field #number magicSkill The base magic skill of the creature. This is the skill value used for all skills with a 'magic' specialization
+-- @field #number stealthSkill The base stealth skill of the creature. This is the skill value used for all skills with a 'stealth' specialization
+-- @field #list<#number> attack A table of the 3 randomly selected attacks used by creatures that do not carry weapons. The table consists of 6 numbers split into groups of 2 values corresponding to minimum and maximum damage in that order.
+-- @field #map<#string, #boolean> servicesOffered The services of the creature, in a table. Value is if the service is provided or not, and they are indexed by: Spells, Spellmaking, Enchanting, Training, Repair, Barter, Weapon, Armor, Clothing, Books, Ingredients, Picks, Probes, Lights, Apparatus, RepairItems, Misc, Potions, MagicItems, Travel.
+-- @field #list<#TravelDestination> travelDestinations A list of @{#TravelDestination}s for this creature.
+-- @field #boolean canFly whether the creature can fly
+-- @field #boolean canSwim whether the creature can swim
+-- @field #boolean canWalk whether the creature can walk
+-- @field #boolean canUseWeapons whether the creature can use weapons and shields
+-- @field #boolean isBiped whether the creature is a biped
+-- @field #boolean isEssential whether the creature is essential
+-- @field #boolean isRespawning whether the creature respawns after death
 
 
 --- @{#NPC} functions
@@ -699,7 +865,13 @@
 -- @extends #Actor
 -- @field #Actor baseType @{#Actor}
 -- @field [parent=#NPC] #NpcStats stats
--- @field #list<#NpcRecord> records A read-only list of all @{#NpcRecord}s in the world database.
+
+---
+-- A read-only list of all @{#NpcRecord}s in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) of #NpcRecord.
+-- @field [parent=#NPC] #map<#NpcRecord> records
+-- @usage local record = types.NPC.classes['example_recordid']
+-- @usage local record = types.NPC.classes[1]
 
 ---
 -- Whether the object is an NPC or a Player.
@@ -707,6 +879,196 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Get all factions in which NPC has a membership.
+-- Note: this function does not take in account an expelling state.
+-- @function [parent=#NPC] getFactions
+-- @param openmw.core#GameObject actor NPC object
+-- @return #list<#string> factionIds List of faction IDs.
+-- @usage local NPC = require('openmw.types').NPC;
+-- for _, factionId in pairs(types.NPC.getFactions(actor)) do
+--     print(factionId);
+-- end
+
+---
+-- Get rank of given NPC in given faction.
+-- Throws an exception if there is no such faction.
+-- Note: this function does not take in account an expelling state.
+-- @function [parent=#NPC] getFactionRank
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @return #number rank Rank index (from 1), 0 if NPC is not in faction.
+-- @usage local NPC = require('openmw.types').NPC;
+-- print(NPC.getFactionRank(player, "mages guild");
+
+---
+-- Set rank of given NPC in given faction.
+-- Throws an exception if there is no such faction, target rank does not exist or actor is not a member of given faction.
+-- For NPCs faction also should be an NPC's primary faction.
+-- @function [parent=#NPC] setFactionRank
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @param #number value Rank index (from 1).
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.setFactionRank(player, "mages guild", 6);
+
+---
+-- Adjust rank of given NPC in given faction.
+-- Throws an exception if there is no such faction or actor is not a member of given faction.
+-- For NPCs faction also should be an NPC's primary faction.
+-- Notes:
+--
+--   * If rank should become <= 0 after modification, function set rank to lowest available rank.
+--   * If rank should become > 0 after modification, but target rank does not exist, function set rank to the highest valid rank.
+-- @function [parent=#NPC] modifyFactionRank
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @param #number value Rank index (from 1) modifier. If rank reaches 0 for player character, he leaves the faction.
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.modifyFactionRank(player, "mages guild", 1);
+
+---
+-- Add given actor to given faction.
+-- Throws an exception if there is no such faction or target actor is not player.
+-- Function does nothing if valid target actor is already a member of target faction.
+-- @function [parent=#NPC] joinFaction
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.joinFaction(player, "mages guild");
+
+---
+-- Remove given actor from given faction.
+-- Function removes rank data and expelling state, but keeps a reputation in target faction.
+-- Throws an exception if there is no such faction or target actor is not player.
+-- Function does nothing if valid target actor is already not member of target faction.
+-- @function [parent=#NPC] leaveFaction
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.leaveFaction(player, "mages guild");
+
+---
+-- Get reputation of given actor in given faction.
+-- Throws an exception if there is no such faction.
+-- @function [parent=#NPC] getFactionReputation
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @return #number reputation Reputation level, 0 if NPC is not in faction.
+-- @usage local NPC = require('openmw.types').NPC;
+-- print(NPC.getFactionReputation(player, "mages guild"));
+
+---
+-- Set reputation of given actor in given faction.
+-- Throws an exception if there is no such faction.
+-- @function [parent=#NPC] setFactionReputation
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @param #number value Reputation value
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.setFactionReputation(player, "mages guild", 100);
+
+---
+-- Adjust reputation of given actor in given faction.
+-- Throws an exception if there is no such faction.
+-- @function [parent=#NPC] modifyFactionReputation
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @param #number value Reputation modifier value
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.modifyFactionReputation(player, "mages guild", 5);
+
+---
+-- Expel NPC from given faction.
+-- Throws an exception if there is no such faction.
+-- Note: expelled NPC still keeps his rank and reputation in faction, he just get an additonal flag for given faction.
+-- @function [parent=#NPC] expel
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.expel(player, "mages guild");
+
+---
+-- Clear expelling of NPC from given faction.
+-- Throws an exception if there is no such faction.
+-- @function [parent=#NPC] clearExpelled
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @usage local NPC = require('openmw.types').NPC;
+-- NPC.clearExpell(player, "mages guild");
+
+---
+-- Check if NPC is expelled from given faction.
+-- Throws an exception if there is no such faction.
+-- @function [parent=#NPC] isExpelled
+-- @param openmw.core#GameObject actor NPC object
+-- @param #string faction Faction ID
+-- @return #boolean isExpelled True if NPC is expelled from the faction.
+-- @usage local NPC = require('openmw.types').NPC;
+-- local result = NPC.isExpelled(player, "mages guild");
+
+---
+-- Returns the current disposition of the provided NPC. This is their derived disposition, after modifiers such as personality and faction relations are taken into account.
+-- @function [parent=#NPC] getDisposition
+-- @param openmw.core#GameObject object
+-- @param openmw.core#GameObject player The player that you want to check the disposition for.
+-- @return #number
+
+---
+-- Returns the current base disposition of the provided NPC. This is their base disposition, before modifiers such as personality and faction relations are taken into account.
+-- @function [parent=#NPC] getBaseDisposition
+-- @param openmw.core#GameObject object
+-- @param openmw.core#GameObject player The player that you want to check the disposition for.
+-- @return #number
+
+---
+-- Set the base disposition of the provided NPC (only in global scripts or on self).
+-- @function [parent=#NPC] setBaseDisposition
+-- @param openmw.core#GameObject object
+-- @param openmw.core#GameObject player The player that you want to set the disposition for.
+-- @param #number value Base disposition is set to this value
+
+---
+-- Modify the base disposition of the provided NPC by a certain amount (only in global scripts or on self).
+-- @function [parent=#NPC] modifyBaseDisposition
+-- @param openmw.core#GameObject object
+-- @param openmw.core#GameObject player The player that you want to modify the disposition for.
+-- @param #number value Base disposition modification value
+
+---
+-- Get the total weight that the actor can carry.
+-- @function [parent=#NPC] getCapacity
+-- @param openmw.core#GameObject actor
+-- @return #number
+
+--- @{#Classes}: Class Data
+-- @field [parent=#NPC] #Classes classes
+
+---
+-- A read-only list of all @{#ClassRecord}s in the world database, may be indexed by recordId.
+-- Implements [iterables#List](iterables.html#List) of #ClassRecord.
+-- @field [parent=#Classes] #list<#ClassRecord> records
+-- @usage local record = types.NPC.classes['example_recordid']
+-- @usage local record = types.NPC.classes[1]
+
+---
+-- Returns a read-only @{#ClassRecord}
+-- @function [parent=#Classes] record
+-- @param #string recordId
+-- @return #ClassRecord
+
+---
+-- Class data record
+-- @type ClassRecord
+-- @field #string id Class id
+-- @field #string name Class name
+-- @field #list<#string> attributes A read-only list containing the specialized attributes of the class.
+-- @field #list<#string> majorSkills A read-only list containing the major skills of the class.
+-- @field #list<#string> minorSkills A read-only list containing the minor skills of the class.
+-- @field #string description Class description
+-- @field #boolean isPlayable True if the player can play as this class
+-- @field #string specialization Class specialization. Either combat, magic, or stealth.
+
 ---
 -- Whether the NPC or player is in the werewolf form at the moment.
 -- @function [parent=#NPC] isWerewolf
@@ -719,18 +1081,66 @@
 -- @param #any objectOrRecordId
 -- @return #NpcRecord
 
+--- @{#Races}: Race data
+-- @field [parent=#NPC] #Races races
+
+---
+-- A read-only list of all @{#RaceRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #RaceRecord.
+-- @field [parent=#Races] #list<#RaceRecord> records
+-- @usage local record = types.NPC.classes['example_recordid']
+-- @usage local record = types.NPC.classes[1]
+
+---
+-- Returns a read-only @{#RaceRecord}
+-- @function [parent=#Races] record
+-- @param #string recordId
+-- @return #RaceRecord
+
+---
+-- Race data record
+-- @type RaceRecord
+-- @field #string id Race id
+-- @field #string name Race name
+-- @field #string description Race description
+-- @field #map<#string, #number> skills A map of bonus skill points by skill ID
+-- @field #list<#string> spells A read-only list containing the ids of all spells inherent to the race
+-- @field #boolean isPlayable True if the player can pick this race in character generation
+-- @field #boolean isBeast True if this race is a beast race
+-- @field #GenderedNumber height Height values
+-- @field #GenderedNumber weight Weight values
+-- @field #map<#string, #GenderedNumber> attributes A read-only table of attribute ID to base value
+-- @usage -- Get base strength for men
+-- strength = types.NPC.races.records[1].attributes.strength.male
+
+---
+-- @type GenderedNumber
+-- @field #number male Male value
+-- @field #number female Female value
+
 ---
 -- @type NpcRecord
 -- @field #string id The record ID of the NPC
 -- @field #string name
 -- @field #string race
 -- @field #string class Name of the NPC's class (e. g. Acrobat)
--- @field #string mwscript MWScript that is attached to this NPC
+-- @field #string model Path to the model associated with this NPC, used for animations.
+-- @field #string mwscript MWScript on this NPC (can be nil)
 -- @field #string hair Path to the hair body part model
 -- @field #string head Path to the head body part model
 -- @field #number baseGold The base barter gold of the NPC
--- @field #bool isMale The gender setting of the NPC
+-- @field #number baseDisposition NPC's starting disposition
+-- @field #boolean isMale The gender setting of the NPC
+-- @field #map<#string, #boolean> servicesOffered The services of the NPC, in a table. Value is if the service is provided or not, and they are indexed by: Spells, Spellmaking, Enchanting, Training, Repair, Barter, Weapon, Armor, Clothing, Books, Ingredients, Picks, Probes, Lights, Apparatus, RepairItems, Misc, Potions, MagicItems, Travel.
+-- @field #list<#TravelDestination> travelDestinations A list of @{#TravelDestination}s for this NPC.
+-- @field #boolean isEssential whether the NPC is essential
+-- @field #boolean isRespawning whether the NPC respawns after death
 
+---
+-- @type TravelDestination
+-- @field #string cellId ID of the Destination cell for this TravelDestination, Can be used with @{openmw_world#(world).getCellById}.
+-- @field openmw.util#Vector3 position Destination position for this TravelDestination.
+-- @field openmw.util#Transform rotation Destination rotation for this TravelDestination.
 
 --------------------------------------------------------------------------------
 -- @{#Player} functions
@@ -753,12 +1163,43 @@
 -- @param openmw.core#GameObject player
 -- @return #number
 
+---
+-- Sets the bounty or crime level of the player, may only be used in global scripts
+-- @function [parent=#Player] setCrimeLevel
+-- @param openmw.core#GameObject player
+-- @param #number crimeLevel The requested crime level
+
+---
+-- @type OFFENSE_TYPE
+-- @field #number Theft
+-- @field #number Assault
+-- @field #number Murder
+-- @field #number Trespassing
+-- @field #number SleepingInOwnedBed
+-- @field #number Pickpocket
+
+---
+-- Available @{#OFFENSE_TYPE} values. Used in `I.Crimes.commitCrime`.
+-- @field [parent=#Player] #OFFENSE_TYPE OFFENSE_TYPE
+
 ---
 -- Whether the character generation for this player is finished.
 -- @function [parent=#Player] isCharGenFinished
 -- @param openmw.core#GameObject player
 -- @return #boolean
 
+---
+-- Whether teleportation for this player is enabled.
+-- @function [parent=#Player] isTeleportingEnabled
+-- @param openmw.core#GameObject player
+-- @return #boolean
+
+---
+-- Enables or disables teleportation for this player.
+-- @function [parent=#Player] setTeleportingEnabled
+-- @param openmw.core#GameObject player
+-- @param #boolean state True to enable teleporting, false to disable.
+
 ---
 -- Returns a list containing quests @{#PlayerQuest} for the specified player, indexed by quest ID.
 -- @function [parent=#Player] quests
@@ -773,8 +1214,8 @@
 -- @type PlayerQuest
 -- @field #string id The quest id.
 -- @field #number stage The quest stage (global and player scripts can change it). Changing the stage starts the quest if it wasn't started.
--- @field #bool started Whether the quest is started.
--- @field #bool finished Whether the quest is finished (global and player scripts can change it).
+-- @field #boolean started Whether the quest is started.
+-- @field #boolean finished Whether the quest is finished (global and player scripts can change it).
 
 ---
 -- Sets the quest stage for the given quest, on the given player, and adds the entry to the journal, if there is an entry at the specified stage. Can only be used in global or player scripts.
@@ -783,6 +1224,81 @@
 -- @param #number stage Quest stage
 -- @param openmw.core#GameObject actor (optional) The actor who is the source of the journal entry, it may be used in journal entries with variables such as `%name(The speaker's name)` or `%race(The speaker's race)`.
 
+---
+-- Get state of a control switch. I.e. is the player able to move/fight/jump/etc.
+-- @function [parent=#Player] getControlSwitch
+-- @param openmw.core#GameObject player
+-- @param #ControlSwitch key Control type (see @{openmw.types#CONTROL_SWITCH})
+-- @return #boolean
+
+---
+-- Set state of a control switch. I.e. forbid or allow the player to move/fight/jump/etc.
+-- Can be used only in global or player scripts.
+-- @function [parent=#Player] setControlSwitch
+-- @param openmw.core#GameObject player
+-- @param #ControlSwitch key Control type (see @{openmw.types#CONTROL_SWITCH})
+-- @param #boolean value
+
+---
+-- String id of a @{#CONTROL_SWITCH}
+-- @type ControlSwitch
+
+---
+-- @type CONTROL_SWITCH
+-- @field [parent=#CONTROL_SWITCH] #ControlSwitch Controls Ability to move
+-- @field [parent=#CONTROL_SWITCH] #ControlSwitch Fighting Ability to attack
+-- @field [parent=#CONTROL_SWITCH] #ControlSwitch Jumping Ability to jump
+-- @field [parent=#CONTROL_SWITCH] #ControlSwitch Looking Ability to change view direction
+-- @field [parent=#CONTROL_SWITCH] #ControlSwitch Magic Ability to use magic
+-- @field [parent=#CONTROL_SWITCH] #ControlSwitch ViewMode Ability to toggle 1st/3rd person view
+-- @field [parent=#CONTROL_SWITCH] #ControlSwitch VanityMode Vanity view if player doesn't touch controls for a long time
+
+---
+-- Values that can be used with getControlSwitch/setControlSwitch.
+-- @field [parent=#Player] #CONTROL_SWITCH CONTROL_SWITCH
+
+---
+-- @function [parent=#Player] getBirthSign
+-- @param openmw.core#GameObject player
+-- @return #string The player's birth sign
+
+---
+-- Can be used only in global scripts. Note that this does not update the player's spells.
+-- @function [parent=#Player] setBirthSign
+-- @param openmw.core#GameObject player
+-- @param #any recordOrId Record or string ID of the birth sign to assign
+
+--- @{#BirthSigns}: Birth Sign Data
+-- @field [parent=#Player] #BirthSigns birthSigns
+
+---
+-- A read-only list of all @{#BirthSignRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #BirthSignRecord.
+-- @field [parent=#BirthSigns] #list<#BirthSignRecord> records
+-- @usage local record = types.NPC.classes['example_recordid']
+-- @usage local record = types.NPC.classes[1]
+
+---
+-- Returns a read-only @{#BirthSignRecord}
+-- @function [parent=#BirthSigns] record
+-- @param #string recordId
+-- @return #BirthSignRecord
+
+---
+-- Birth sign data record
+-- @type BirthSignRecord
+-- @field #string id Birth sign id
+-- @field #string name Birth sign name
+-- @field #string description Birth sign description
+-- @field #string texture Birth sign texture
+-- @field #list<#string> spells A read-only list containing the ids of all spells gained from this sign.
+
+---
+-- Send an event to menu scripts.
+-- @function [parent=#Player] sendMenuEvent
+-- @param openmw.core#GameObject player
+-- @param #string eventName
+-- @param eventData
 
 --------------------------------------------------------------------------------
 -- @{#Armor} functions
@@ -792,7 +1308,6 @@
 -- @type Armor
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#ArmorRecord> records A read-only list of all @{#ArmorRecord}s in the world database.
 
 ---
 -- Whether the object is an Armor.
@@ -814,6 +1329,13 @@
 -- @field #number LBracer
 -- @field #number RBracer
 
+---
+-- A read-only list of all @{#ArmorRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ArmorRecord.
+-- @field [parent=#Armor] #list<#ArmorRecord> records
+-- @usage local record = types.Armor.records['example_recordid']
+-- @usage local record = types.Armor.records[1]
+
 --- @{#ArmorTYPE}
 -- @field [parent=#Armor] #ArmorTYPE TYPE
 
@@ -828,9 +1350,9 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this armor (can be empty)
+-- @field #string mwscript MWScript on this armor (can be nil)
 -- @field #string icon VFS path to the icon
--- @field #string enchant The enchantment ID of this armor (can be empty)
+-- @field #string enchant The enchantment ID of this armor (can be nil)
 -- @field #number weight
 -- @field #number value
 -- @field #number type See @{#Armor.TYPE}
@@ -839,11 +1361,17 @@
 -- @field #number enchantCapacity
 
 ---
--- Creates a @{#ArmorRecord} without adding it to the world database.
+-- Creates a @{#ArmorRecord} without adding it to the world database, for the armor to appear correctly on the body, make sure to use a template as described below.
 -- Use @{openmw_world#(world).createRecord} to add the record to the world.
 -- @function [parent=#Armor] createRecordDraft
--- @param #ArmorRecord armor A Lua table with the fields of a ArmorRecord.
+-- @param #ArmorRecord armor A Lua table with the fields of a ArmorRecord, with an additional field `template` that accepts a @{#ArmorRecord} as a base.
 -- @return #ArmorRecord A strongly typed Armor record.
+-- @usage local armorTemplate = types.Armor.record('orcish_cuirass')
+-- local armorTable = {name = "Better Orcish Cuirass",template = armorTemplate,baseArmor = armorTemplate.baseArmor + 10}
+--  --This is the new record we want to create, with a record provided as a template.
+-- local recordDraft = types.Armor.createRecordDraft(armorTable)--Need to convert the table into the record draft
+-- local newRecord = world.createRecord(recordDraft)--This creates the actual record
+-- world.createObject(newRecord.id):moveInto(playerActor)--Create an instance of this object, and move it into the player's inventory
 
 
 --- @{#Book} functions
@@ -853,7 +1381,13 @@
 -- @type Book
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#BookRecord> records A read-only list of all @{#BookRecord}s in the world database.
+
+---
+-- A read-only list of all @{#BookRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #BookRecord.
+-- @field [parent=#Book] #list<#BookRecord> records
+-- @usage local record = types.Book.records['example_recordid']
+-- @usage local record = types.Book.records[1]
 
 ---
 -- Whether the object is a Book.
@@ -891,7 +1425,7 @@
 -- @field #string speechcraft "speechcraft"
 -- @field #string unarmored "unarmored"
 
---- DEPRECATED, use @{openmw.core#SKILL}
+--- DEPRECATED, use @{openmw.core#Skill}
 -- @field [parent=#Book] #BookSKILL SKILL
 
 ---
@@ -905,9 +1439,9 @@
 -- @field #string id The record ID of the book
 -- @field #string name Name of the book
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this book (can be empty)
+-- @field #string mwscript MWScript on this book (can be nil)
 -- @field #string icon VFS path to the icon
--- @field #string enchant The enchantment ID of this book (can be empty)
+-- @field #string enchant The enchantment ID of this book (can be nil)
 -- @field #string text The text content of the book
 -- @field #number weight
 -- @field #number value
@@ -919,7 +1453,7 @@
 -- Creates a @{#BookRecord} without adding it to the world database.
 -- Use @{openmw_world#(world).createRecord} to add the record to the world.
 -- @function [parent=#Book] createRecordDraft
--- @param #BookRecord book A Lua table with the fields of a BookRecord.
+-- @param #BookRecord book A Lua table with the fields of a BookRecord, with an optional field `template` that accepts a @{#BookRecord} as a base.
 -- @return #BookRecord A strongly typed Book record.
 
 --- @{#Clothing} functions
@@ -929,7 +1463,13 @@
 -- @type Clothing
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#ClothingRecord> records A read-only list of all @{#ClothingRecord}s in the world database.
+
+---
+-- A read-only list of all @{#ClothingRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ClothingRecord.
+-- @field [parent=#Clothing] #list<#ClothingRecord> records
+-- @usage local record = types.Clothing.records['example_recordid']
+-- @usage local record = types.Clothing.records[1]
 
 ---
 -- Whether the object is a Clothing.
@@ -960,20 +1500,26 @@
 -- @return #ClothingRecord
 
 ---
--- Creates a @{#ClothingRecord} without adding it to the world database.
+-- Creates a @{#ClothingRecord} without adding it to the world database, for the clothing to appear correctly on the body, make sure to use a template as described below.
 -- Use @{openmw_world#(world).createRecord} to add the record to the world.
 -- @function [parent=#Clothing] createRecordDraft
--- @param #ClothingRecord clothing A Lua table with the fields of a ClothingRecord.
+-- @param #ClothingRecord clothing A Lua table with the fields of a ClothingRecord, with an additional field `template` that accepts a @{#ClothingRecord} as a base.
 -- @return #ClothingRecord A strongly typed clothing record.
+-- @usage local clothingTemplate = types.Clothing.record('exquisite_robe_01')
+-- local clothingTable = {name = "Better Exquisite Robe",template = clothingTemplate,enchantCapacity = clothingTemplate.enchantCapacity + 10}
+--  --This is the new record we want to create, with a record provided as a template.
+-- local recordDraft = types.Clothing.createRecordDraft(clothingTable)--Need to convert the table into the record draft
+-- local newRecord = world.createRecord(recordDraft)--This creates the actual record
+-- world.createObject(newRecord.id):moveInto(playerActor)--Create an instance of this object, and move it into the player's inventory
 
 ---
 -- @type ClothingRecord
 -- @field #string id Record id
 -- @field #string name Name of the clothing
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this clothing (can be empty)
+-- @field #string mwscript MWScript on this clothing (can be nil)
 -- @field #string icon VFS path to the icon
--- @field #string enchant The enchantment ID of this clothing (can be empty)
+-- @field #string enchant The enchantment ID of this clothing (can be nil)
 -- @field #number weight
 -- @field #number value
 -- @field #number type See @{#Clothing.TYPE}
@@ -989,7 +1535,13 @@
 -- @type Ingredient
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#IngredientRecord> records A read-only list of all @{#IngredientRecord}s in the world database.
+
+---
+-- A read-only list of all @{#IngredientRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #IngredientRecord.
+-- @field [parent=#Ingredient] #list<#IngredientRecord> records
+-- @usage local record = types.Ingredient.records['example_recordid']
+-- @usage local record = types.Ingredient.records[1]
 
 ---
 -- Whether the object is an Ingredient.
@@ -1008,7 +1560,7 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this potion (can be empty)
+-- @field #string mwscript MWScript on this potion (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #number weight
 -- @field #number value
@@ -1018,6 +1570,12 @@
 --- @{#Lockable} functions
 -- @field [parent=#types] #Lockable Lockable
 
+---
+-- Whether the object is a Lockable.
+-- @function [parent=#Lockable] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
 ---
 -- Returns the key record of a lockable object(door, container)
 -- @function [parent=#Lockable] getKeyRecord
@@ -1076,7 +1634,13 @@
 -- @type Light
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#LightRecord> records A read-only list of all @{#LightRecord}s in the world database.
+
+---
+-- A read-only list of all @{#LightRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #LightRecord.
+-- @field [parent=#Light] #list<#LightRecord> records
+-- @usage local record = types.Light.records['example_recordid']
+-- @usage local record = types.Light.records[1]
 
 ---
 -- Whether the object is a Light.
@@ -1084,6 +1648,13 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Creates a @{#LightRecord} without adding it to the world database.
+-- Use @{openmw_world#(world).createRecord} to add the record to the world.
+-- @function [parent=#Light] createRecordDraft
+-- @param #LightRecord light A Lua table with the fields of a LightRecord, with an optional field `template` that accepts a @{#LightRecord} as a base.
+-- @return #LightRecord A strongly typed Light record.
+
 ---
 -- Returns the read-only @{#LightRecord} of a Light
 -- @function [parent=#Light] record
@@ -1095,7 +1666,7 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this light (can be empty)
+-- @field #string mwscript MWScript on this light (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #string sound VFS path to the sound
 -- @field #number weight
@@ -1103,7 +1674,15 @@
 -- @field #number duration
 -- @field #number radius
 -- @field #number color
--- @field #boolean isCarriable
+-- @field #boolean isCarriable True if the light can be carried by actors and appears up in their inventory.
+-- @field #boolean isDynamic If true, the light will apply to actors and other moving objects
+-- @field #boolean isFire True if the light acts like a fire.
+-- @field #boolean isFlicker
+-- @field #boolean isFlickerSlow
+-- @field #boolean isNegative If true, the light will reduce light instead of increasing it.
+-- @field #boolean isOffByDefault If true, the light will not emit any light or sound while placed in the world. It will still work in the inventory.
+-- @field #boolean isPulse
+-- @field #boolean isPulseSlow
 
 
 
@@ -1114,7 +1693,13 @@
 -- @type Miscellaneous
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#MiscellaneousRecord> records A read-only list of all @{#MiscellaneousRecord}s in the world database.
+
+---
+-- A read-only list of all @{#MiscellaneousRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #MiscellaneousRecord.
+-- @field [parent=#Miscellaneous] #list<#MiscellaneousRecord> records
+-- @usage local record = types.Miscellaneous.records['example_recordid']
+-- @usage local record = types.Miscellaneous.records[1]
 
 ---
 -- Whether the object is a Miscellaneous.
@@ -1129,7 +1714,7 @@
 -- @return #MiscellaneousRecord
 
 ---
--- Returns the read-only soul of a miscellaneous item
+-- (DEPRECATED, use itemData(item).soul) Returns the read-only soul of a miscellaneous item
 -- @function [parent=#Miscellaneous] getSoul
 -- @param openmw.core#GameObject object
 -- @return #string
@@ -1138,11 +1723,11 @@
 -- Creates a @{#MiscellaneousRecord} without adding it to the world database.
 -- Use @{openmw_world#(world).createRecord} to add the record to the world.
 -- @function [parent=#Miscellaneous] createRecordDraft
--- @param #MiscellaneousRecord miscellaneous A Lua table with the fields of a MiscellaneousRecord.
+-- @param #MiscellaneousRecord miscellaneous A Lua table with the fields of a MiscellaneousRecord, with an optional field `template` that accepts a @{#MiscellaneousRecord} as a base.
 -- @return #MiscellaneousRecord A strongly typed Miscellaneous record.
 
 ---
--- Sets the soul of a miscellaneous item, intended for soul gem objects; Must be used in a global script.
+-- (DEPRECATED, use itemData(item).soul) Sets the soul of a miscellaneous item, intended for soul gem objects; Must be used in a global script.
 -- @function [parent=#Miscellaneous] setSoul
 -- @param openmw.core#GameObject object
 -- @param #string soulId Record ID for the soul of the creature to use
@@ -1152,7 +1737,7 @@
 -- @field #string id The record ID of the miscellaneous item
 -- @field #string name The name of the miscellaneous item
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this miscellaneous item (can be empty)
+-- @field #string mwscript MWScript on this miscellaneous item (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #number weight
 -- @field #number value
@@ -1165,7 +1750,13 @@
 -- @type Potion
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#PotionRecord> records A read-only list of all @{#PotionRecord}s in the world database.
+
+---
+-- A read-only list of all @{#PotionRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #PotionRecord.
+-- @field [parent=#Potion] #list<#PotionRecord> records
+-- @usage local record = types.Potion.records['example_recordid']
+-- @usage local record = types.Potion.records[1]
 
 ---
 -- Whether the object is a Potion.
@@ -1183,7 +1774,7 @@
 -- Creates a @{#PotionRecord} without adding it to the world database.
 -- Use @{openmw_world#(world).createRecord} to add the record to the world.
 -- @function [parent=#Potion] createRecordDraft
--- @param #PotionRecord potion A Lua table with the fields of a PotionRecord.
+-- @param #PotionRecord potion A Lua table with the fields of a PotionRecord, with an optional field `template` that accepts a @{#PotionRecord} as a base.
 -- @return #PotionRecord A strongly typed Potion record.
 
 ---
@@ -1191,7 +1782,7 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this potion (can be empty)
+-- @field #string mwscript MWScript on this potion (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #number weight
 -- @field #number value
@@ -1206,7 +1797,13 @@
 -- @type Weapon
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#WeaponRecord> records A read-only list of all @{#WeaponRecord}s in the world database.
+
+---
+-- A read-only list of all @{#WeaponRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #WeaponRecord.
+-- @field [parent=#Weapon] #list<#WeaponRecord> records
+-- @usage local record = types.Weapon.records['example_recordid']
+-- @usage local record = types.Weapon.records[1]
 
 ---
 -- Whether the object is a Weapon.
@@ -1245,9 +1842,9 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this weapon (can be empty)
+-- @field #string mwscript MWScript on this weapon (can be nil)
 -- @field #string icon VFS path to the icon
--- @field #string enchant
+-- @field #string enchant The enchantment ID of this weapon (can be nil)
 -- @field #boolean isMagical
 -- @field #boolean isSilver
 -- @field #number weight
@@ -1268,7 +1865,7 @@
 -- Creates a @{#WeaponRecord} without adding it to the world database.
 -- Use @{openmw_world#(world).createRecord} to add the record to the world.
 -- @function [parent=#Weapon] createRecordDraft
--- @param #WeaponRecord weapon A Lua table with the fields of a WeaponRecord.
+-- @param #WeaponRecord weapon A Lua table with the fields of a WeaponRecord, with an optional field `template` that accepts a @{#WeaponRecord} as a base.
 -- @return #WeaponRecord A strongly typed Weapon record.
 
 --- @{#Apparatus} functions
@@ -1278,7 +1875,14 @@
 -- @type Apparatus
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#ApparatusRecord> records A read-only list of all @{#ApparatusRecord}s in the world database.
+
+
+---
+-- A read-only list of all @{#ApparatusRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ApparatusRecord.
+-- @field [parent=#Apparatus] #list<#ApparatusRecord> records
+-- @usage local record = types.Apparatus.records['example_recordid']
+-- @usage local record = types.Apparatus.records[1]
 
 ---
 -- Whether the object is an Apparatus.
@@ -1307,7 +1911,7 @@
 -- @field #string id The record ID of the apparatus
 -- @field #string name The name of the apparatus
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this apparatus (can be empty)
+-- @field #string mwscript MWScript on this apparatus (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #number type The type of apparatus. See @{#Apparatus.TYPE}
 -- @field #number weight
@@ -1321,7 +1925,13 @@
 -- @type Lockpick
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#LockpickRecord> records A read-only list of all @{#LockpickRecord}s in the world database.
+
+---
+-- A read-only list of all @{#LockpickRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #LockpickRecord.
+-- @field [parent=#Lockpick] #list<#LockpickRecord> records
+-- @usage local record = types.Lockpick.records['example_recordid']
+-- @usage local record = types.Lockpick.records[1]
 
 ---
 -- Whether the object is a Lockpick.
@@ -1340,7 +1950,7 @@
 -- @field #string id The record ID of the lockpick
 -- @field #string name The name of the lockpick
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this lockpick (can be empty)
+-- @field #string mwscript MWScript on this lockpick (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #number maxCondition The maximum number of uses of this lockpick
 -- @field #number weight
@@ -1354,7 +1964,13 @@
 -- @type Probe
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#ProbeRecord> records A read-only list of all @{#ProbeRecord}s in the world database.
+
+---
+-- A read-only list of all @{#ProbeRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ProbeRecord.
+-- @field [parent=#Probe] #list<#ProbeRecord> records
+-- @usage local record = types.Probe.records['example_recordid']
+-- @usage local record = types.Probe.records[1]
 
 ---
 -- Whether the object is a Probe.
@@ -1373,7 +1989,7 @@
 -- @field #string id The record ID of the probe
 -- @field #string name The name of the probe
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this probe (can be empty)
+-- @field #string mwscript MWScript on this probe (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #number maxCondition The maximum number of uses of this probe
 -- @field #number weight
@@ -1387,7 +2003,13 @@
 -- @type Repair
 -- @extends #Item
 -- @field #Item baseType @{#Item}
--- @field #list<#RepairRecord> records A read-only list of all @{#RepairRecord}s in the world database.
+
+---
+-- A read-only list of all @{#RepairRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #RepairRecord.
+-- @field [parent=#Repair] #list<#RepairRecord> records
+-- @usage local record = types.Repair.records['example_recordid']
+-- @usage local record = types.Repair.records[1]
 
 ---
 -- Whether the object is a Repair.
@@ -1406,7 +2028,7 @@
 -- @field #string id The record ID of the repair tool
 -- @field #string name The name of the repair tool
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this repair tool (can be empty)
+-- @field #string mwscript MWScript on this repair tool (can be nil)
 -- @field #string icon VFS path to the icon
 -- @field #number maxCondition The maximum number of uses of this repair tool
 -- @field #number weight
@@ -1418,7 +2040,13 @@
 
 ---
 -- @type Activator
--- @field #list<#ActivatorRecord> records A read-only list of all @{#ActivatorRecord}s in the world database.
+
+---
+-- A read-only list of all @{#ActivatorRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ActivatorRecord.
+-- @field [parent=#Activator] #list<#ActivatorRecord> records
+-- @usage local record = types.Activator.records['example_recordid']
+-- @usage local record = types.Activator.records[1]
 
 ---
 -- Whether the object is an Activator.
@@ -1437,13 +2065,13 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this activator (can be empty)
+-- @field #string mwscript MWScript on this activator (can be nil)
 
 ---
 -- Creates a @{#ActivatorRecord} without adding it to the world database.
 -- Use @{openmw_world#(world).createRecord} to add the record to the world.
 -- @function [parent=#Activator] createRecordDraft
--- @param #ActivatorRecord activator A Lua table with the fields of a ActivatorRecord.
+-- @param #ActivatorRecord activator A Lua table with the fields of a ActivatorRecord, with an optional field `template` that accepts a @{#ActivatorRecord} as a base.
 -- @return #ActivatorRecord A strongly typed Activator record.
 
 
@@ -1455,7 +2083,13 @@
 -- @type Container
 -- @extends #Lockable
 -- @field #Lockable baseType @{#Lockable}
--- @field #list<#ContainerRecord> records A read-only list of all @{#ContainerRecord}s in the world database.
+
+---
+-- A read-only list of all @{#ContainerRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ContainerRecord.
+-- @field [parent=#Container] #list<#ContainerRecord> records
+-- @usage local record = types.Container.records['example_recordid']
+-- @usage local record = types.Container.records[1]
 
 ---
 -- Container content.
@@ -1477,13 +2111,13 @@
 
 ---
 -- Returns the total weight of everything in a container
--- @function [parent=#Container] encumbrance
+-- @function [parent=#Container] getEncumbrance
 -- @param openmw.core#GameObject object
 -- @return #number
 
 ---
 -- Returns the capacity of a container
--- @function [parent=#Container] capacity
+-- @function [parent=#Container] getCapacity
 -- @param openmw.core#GameObject object
 -- @return #number
 
@@ -1498,9 +2132,10 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this container (can be empty)
+-- @field #string mwscript MWScript on this container (can be nil)
 -- @field #number weight capacity of this container
-
+-- @field #boolean isOrganic Whether items can be placed in the container
+-- @field #boolean isRespawning Whether the container respawns its contents
 
 --------------------------------------------------------------------------------
 -- @{#Door} functions
@@ -1510,7 +2145,23 @@
 -- @type Door
 -- @extends #Lockable
 -- @field #Lockable baseType @{#Lockable}
--- @field #list<#DoorRecord> records A read-only list of all @{#DoorRecord}s in the world database.
+
+--- Door.STATE
+-- @type DoorSTATE
+-- @field #number Idle The door is either closed or open (usually closed).
+-- @field #number Opening The door is in the process of opening.
+-- @field #number Closing The door is in the process of closing.
+
+--- @{#DoorSTATE}
+-- @field [parent=#Door] #DoorSTATE STATE
+-- @usage local state = types.Door.STATE["Idle"]
+
+---
+-- A read-only list of all @{#DoorRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #DoorRecord.
+-- @field [parent=#Door] #list<#DoorRecord> records
+-- @usage local record = types.Door.records['example_recordid']
+-- @usage local record = types.Door.records[1]
 
 ---
 -- Whether the object is a Door.
@@ -1548,15 +2199,43 @@
 -- @param #any objectOrRecordId
 -- @return #DoorRecord
 
+---
+-- Gets the state of the door.
+-- @function [parent=#Door] getDoorState
+-- @param openmw.core#GameObject object
+-- @return #DoorSTATE
+
+---
+-- Checks if the door is fully open.
+-- Returns false if the door is currently opening or closing.
+-- @function [parent=#Door] isOpen
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+---
+-- Checks if the door is fully closed.
+-- Returns false if the door is currently opening or closing.
+-- @function [parent=#Door] isClosed
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+---
+-- Opens/Closes the door. Can only be used in global scripts or on self.
+-- @function [parent=#Door] activateDoor
+-- @param openmw.core#GameObject object
+-- @param #boolean openState Optional whether the door should be opened or closed. If not provided, the door will switch to the opposite state.
+-- @usage types.Door.activateDoor(doorObject)
+-- @usage types.Door.activateDoor(doorObject, true)
+-- @usage types.Door.activateDoor(doorObject, false)
+
 ---
 -- @type DoorRecord
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this door (can be empty)
--- @field #string openSound VFS path to the sound of opening
--- @field #string closeSound VFS path to the sound of closing
-
+-- @field #string mwscript MWScript on this door (can be nil)
+-- @field #string openSound The sound id for door opening
+-- @field #string closeSound The sound id for door closing
 
 
 --- Functions for @{#Static} objects
@@ -1564,7 +2243,13 @@
 
 ---
 -- @type Static
--- @field #list<#StaticRecord> records A read-only list of all @{#StaticRecord}s in the world database.
+
+---
+-- A read-only list of all @{#StaticRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #StaticRecord.
+-- @field [parent=#Static] #list<#StaticRecord> records
+-- @usage local record = types.Static.records['example_recordid']
+-- @usage local record = types.Static.records[1]
 
 ---
 -- Whether the object is a Static.
@@ -1589,7 +2274,13 @@
 
 ---
 -- @type CreatureLevelledList
--- @field #list<#CreatureLevelledListRecord> records A read-only list of all @{#CreatureLevelledListRecord}s in the world database.
+
+---
+-- A read-only list of all @{#CreatureLevelledListRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #CreatureLevelledListRecord.
+-- @field [parent=#CreatureLevelledList] #list<#CreatureLevelledListRecord> records
+-- @usage local record = types.CreatureLevelledList.records['example_recordid']
+-- @usage local record = types.CreatureLevelledList.records[1]
 
 ---
 -- Whether the object is a CreatureLevelledList.
@@ -1641,30 +2332,48 @@
 --- Functions for @{#ESM4Door} objects
 -- @field [parent=#types] #ESM4Door ESM4Door
 
+--- Functions for @{#ESM4Flora} objects
+-- @field [parent=#types] #ESM4Flora ESM4Flora
+
 --- Functions for @{#ESM4Terminal} objects
 -- @field [parent=#types] #ESM4Terminal ESM4Terminal
 
 --- Functions for @{#ESM4Ingredient} objects
 -- @field [parent=#types] #ESM4Ingredient ESM4Ingredient
 
+--- Functions for @{#ESM4ItemMod} objects
+-- @field [parent=#types] #ESM4ItemMod ESM4ItemMod
+
 --- Functions for @{#ESM4Light} objects
 -- @field [parent=#types] #ESM4Light ESM4Light
 
 --- Functions for @{#ESM4Miscellaneous} objects
 -- @field [parent=#types] #ESM4Miscellaneous ESM4Miscellaneous
 
+--- Functions for @{#ESM4MovableStatic} objects
+-- @field [parent=#types] #ESM4MovableStatic ESM4MovableStatic
+
 --- Functions for @{#ESM4Potion} objects
 -- @field [parent=#types] #ESM4Potion ESM4Potion
 
 --- Functions for @{#ESM4Static} objects
 -- @field [parent=#types] #ESM4Static ESM4Static
 
+--- Functions for @{#ESM4StaticCollection} objects
+-- @field [parent=#types] #ESM4StaticCollection ESM4StaticCollection
+
 --- Functions for @{#ESM4Weapon} objects
 -- @field [parent=#types] #ESM4Weapon ESM4Weapon
 
 ---
 -- @type ESM4Terminal
--- @field #list<#ESM4TerminalRecord> records A read-only list of all @{#ESM4TerminalRecord}s in the world database.
+
+---
+-- A read-only list of all @{#ESM4TerminalRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ESM4TerminalRecord.
+-- @field [parent=#ESM4Terminal] #list<#ESM4TerminalRecord> records
+-- @usage local record = types.ESM4Terminal.records['example_recordid']
+-- @usage local record = types.ESM4Terminal.records[1]
 
 ---
 -- Whether the object is a ESM4Terminal.
@@ -1729,9 +2438,11 @@
 -- @return #ESM4DoorRecord
 
 ---
--- Returns a read-only list of all @{#ESM4DoorRecord}s in the world database.
--- @function [parent=#ESM4Door] records
--- @return #list<#ESM4DoorRecord>
+-- A read-only list of all @{#ESM4DoorRecord}s in the world database.
+-- Implements [iterables#List](iterables.html#List) of #ESM4DoorRecord.
+-- @field [parent=#ESM4Door] #list<#ESM4DoorRecord> records
+-- @usage local record = types.ESM4Door.records['example_recordid']
+-- @usage local record = types.ESM4Door.records[1]
 
 ---
 -- @type ESM4DoorRecord
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 2fefe4fd84..c2587db821 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -1,6 +1,6 @@
 ---
 -- `openmw.ui` controls user interface.
--- Can be used only by local scripts, that are attached to a player.
+-- Can be used only by menu scripts and local scripts, that are attached to a player.
 -- @module ui
 -- @usage
 -- local ui = require('openmw.ui')
@@ -39,6 +39,14 @@
 -- Shows given message at the bottom of the screen.
 -- @function [parent=#ui] showMessage
 -- @param #string msg
+-- @param #table options An optional table with additional optional arguments. Can contain:
+--
+--   * `showInDialogue` - If true, this message will only be shown in the dialogue window. If false, it will always be shown in a message box.
+--                        When omitted, the message will be displayed in the dialogue window if it is open and will be shown at the bottom of the screen otherwise.
+-- @usage local params = {
+--    showInDialogue=false
+-- };
+-- ui.showMessage("Hello world", params)
 
 ---
 -- Predefined colors for console output
@@ -93,6 +101,11 @@
 -- @function [parent=#ui] registerSettingsPage
 -- @param #SettingsPageOptions page
 
+---
+-- Removes the settings page
+-- @function [parent=#ui] removeSettingsPage
+-- @param #SettingsPageOptions page must be the exact same table of options as the one passed to registerSettingsPage
+
 ---
 -- Table with settings page options, passed as an argument to ui.registerSettingsPage
 -- @type SettingsPageOptions
@@ -164,9 +177,9 @@
 
 ---
 -- Content. An array-like container, which allows to reference elements by their name.
--- Implements [iterables#List](iterables.html#List) of #Layout and [iterables#Map](iterables.html#Map) of #string to #Layout.
+-- Implements [iterables#List](iterables.html#List) of #Layout or #Element and [iterables#Map](iterables.html#Map) of #string to #Layout or #Element.
 -- @type Content
--- @list <#Layout>
+-- @list <#any>
 -- @usage
 -- local content = ui.content {
 --    { name = 'input' },
@@ -200,27 +213,27 @@
 -- @function [parent=#Content] __index
 -- @param self
 -- @param #string name
--- @return #Layout
+-- @return #any
 
 ---
 -- Puts the layout at given index by shifting all the elements after it
 -- @function [parent=#Content] insert
 -- @param self
 -- @param #number index
--- @param #Layout layout
+-- @param #any layoutOrElement
 
 ---
 -- Adds the layout at the end of the Content
 -- (same as calling insert with `last index + 1`)
 -- @function [parent=#Content] add
 -- @param self
--- @param #Layout layout
+-- @param #any layoutOrElement
 
 ---
 -- Finds the index of the given layout. If it is not in the container, returns nil
 -- @function [parent=#Content] indexOf
 -- @param self
--- @param #Layout layout
+-- @param #any layoutOrElement
 -- @return #number, #nil index
 
 ---
@@ -228,10 +241,35 @@
 -- @type Element
 
 ---
--- Refreshes the rendered element to match the current layout state
+-- Refreshes the rendered element to match the current layout state.
+-- Refreshes positions and sizes, but not the layout of the child Elements.
 -- @function [parent=#Element] update
 -- @param self
 
+-- @usage
+-- local child = ui.create {
+--     type = ui.TYPE.Text,
+--     props = {
+--         text = 'child 1',
+--     },
+-- }
+-- local parent = ui.create {
+--     content = ui.content {
+--         child,
+--         {
+--             type = ui.TYPE.Text,
+--             props = {
+--                 text = 'parent 1',
+--             },
+--         }
+--     }
+-- }
+-- -- ...
+-- child.layout.props.text = 'child 2'
+-- parent.layout.content[2].props.text = 'parent 2'
+-- parent:update() -- will show 'parent 2', but 'child 1'
+
+
 ---
 -- Destroys the element
 -- @function [parent=#Element] destroy
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index 98d46096f4..9c6fd7985e 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -94,6 +94,7 @@
 -- @type Vector2
 -- @field #number x
 -- @field #number y
+-- @field #string xy01 swizzle support, any combination of fields can be used to construct a new vector including the 0/1 constants
 -- @usage
 -- v = util.vector2(3, 4)
 -- v.x, v.y       -- 3.0, 4.0
@@ -108,6 +109,9 @@
 -- v1 - v2        -- vector subtraction
 -- v1 * x         -- multiplication by a number
 -- v1 / x         -- division by a number
+-- v1.xx, v1.xyx  -- swizzle with standard fields
+-- v1.y1y, v1.x00 -- swizzle with 0/1 constant
+-- v1['0xy']      -- swizzle with 0/1 constant starting with 0 or 1
 
 ---
 -- Creates a new 2D vector. Vectors are immutable and can not be changed after creation.
@@ -195,6 +199,7 @@
 -- @field #number x
 -- @field #number y
 -- @field #number z
+-- @field #string xyz01 swizzle support, any combination of fields can be used to construct a new vector including the 0/1 constants
 -- @usage
 -- v = util.vector3(3, 4, 5)
 -- v.x, v.y, v.z  -- 3.0, 4.0, 5.0
@@ -210,6 +215,9 @@
 -- v1 - v2        -- vector subtraction
 -- v1 * x         -- multiplication by a number
 -- v1 / x         -- division by a number
+-- v1.zyz, v1.yx  -- swizzle with standard fields
+-- v1.w1y, v1.z0z -- swizzle with 0/1 constant
+-- v1['0xy']      -- swizzle with 0/1 constant starting with 0 or 1
 
 ---
 -- Creates a new 3D vector. Vectors are immutable and can not be changed after creation.
@@ -304,19 +312,23 @@
 -- @field #number y
 -- @field #number z
 -- @field #number w
+-- @field #string xyzw01 swizzle support, any combination of fields can be used to construct a new vector including the 0/1 constants
 -- @usage
 -- v = util.vector4(3, 4, 5, 6)
 -- v.x, v.y, v.z, v.w  -- 3.0, 4.0, 5.0, 6.0
--- str(v)         -- "(3.0, 4.0, 5.0, 6.0)"
--- v:length()     -- length
--- v:length2()    -- square of the length
--- v:normalize()  -- normalized vector
--- v1:dot(v2)     -- dot product (returns a number)
--- v1 * v2        -- dot product (returns a number)
--- v1 + v2        -- vector addition
--- v1 - v2        -- vector subtraction
--- v1 * x         -- multiplication by a number
--- v1 / x         -- division by a number
+-- str(v)           -- "(3.0, 4.0, 5.0, 6.0)"
+-- v:length()       -- length
+-- v:length2()      -- square of the length
+-- v:normalize()    -- normalized vector
+-- v1:dot(v2)       -- dot product (returns a number)
+-- v1 * v2          -- dot product (returns a number)
+-- v1 + v2          -- vector addition
+-- v1 - v2          -- vector subtraction
+-- v1 * x           -- multiplication by a number
+-- v1 / x           -- division by a number
+-- v1.zyz, v1.wwwx  -- swizzle with standard fields
+-- v1.w1, v1.z000   -- swizzle with 0/1 constant
+-- v1['000w']       -- swizzle with 0/1 constant starting with 0 or 1
 
 ---
 -- Creates a new 4D vector. Vectors are immutable and can not be changed after creation.
diff --git a/files/lua_api/openmw/vfs.lua b/files/lua_api/openmw/vfs.lua
new file mode 100644
index 0000000000..ba381a1249
--- /dev/null
+++ b/files/lua_api/openmw/vfs.lua
@@ -0,0 +1,159 @@
+---
+-- `openmw.vfs` provides read-only access to data directories via VFS.
+-- Interface is very similar to "io" library.
+-- @module vfs
+-- @usage local vfs = require('openmw.vfs')
+
+
+
+---
+-- @type FileHandle
+-- @field #string fileName VFS path to related file
+
+---
+-- Close a file handle
+-- @function [parent=#FileHandle] close
+-- @param self
+-- @return #boolean true if a call succeeds without errors.
+-- @return #nil, #string nil plus the error message in case of any error.
+
+---
+-- Get an iterator function to fetch the next line from given file.
+-- Throws an exception if file is closed.
+--
+-- Hint: since garbage collection works once per frame,
+-- you will get the whole file in RAM if you read it in one frame.
+-- So if you need to read a really large file, it is better to split reading
+-- between different frames (e.g. by keeping a current position in file
+-- and using a "seek" to read from saved position).
+-- @function [parent=#FileHandle] lines
+-- @param self
+-- @return #function Iterator function to get next line
+-- @usage f = vfs.open("Test\\test.txt");
+-- for line in f:lines() do
+--     print(line);
+-- end
+
+---
+-- Set new position in file.
+-- Throws an exception if file is closed or seek base is incorrect.
+-- @function [parent=#FileHandle] seek
+-- @param self
+-- @param #string whence Seek base (optional, "cur" by default). Can be:
+--
+--   * "set" - seek from beginning of file;
+--   * "cur" - seek from current position;
+--   * "end" - seek from end of file (offset needs to be <= 0);
+-- @param #number offset Offset from given base (optional, 0 by default)
+-- @return #number new position in file if a call succeeds without errors.
+-- @return #nil, #string nil plus the error message in case of any error.
+-- @usage -- set pointer to beginning of file
+-- f = vfs.open("Test\\test.txt");
+-- f:seek("set");
+-- @usage -- print current position in file
+-- f = vfs.open("Test\\test.txt");
+-- print(f:seek());
+-- @usage -- print file size
+-- f = vfs.open("Test\\test.txt");
+-- print(f:seek("end"));
+
+---
+-- Read data from file to strings.
+-- Throws an exception if file is closed, if there is too many arguments or if an invalid format encountered.
+--
+-- Hint: since garbage collection works once per frame,
+-- you will get the whole file in RAM if you read it in one frame.
+-- So if you need to read a really large file, it is better to split reading
+-- between different frames (e.g. by keeping a current position in file
+-- and using a "seek" to read from saved position).
+-- @function [parent=#FileHandle] read
+-- @param self
+-- @param ... Read formats (up to 20 arguments, default value is one "*l"). Can be:
+--
+--   * "\*a" (or "*all") - reads the whole file, starting at the current position as #string. On end of file, it returns the empty string.
+--   * "\*l" (or "*line") - reads the next line (skipping the end of line), returning nil on end of file (nil and error message if error occured);
+--   * "\*n" (or "*number") - read a floating point value as #number (nil and error message if error occured);
+--   * number - reads a #string with up to this number of characters, returning nil on end of file (nil and error message if error occured). If number is 0 and end of file is not reached, it reads nothing and returns an empty string;
+-- @return #string One #string for every format if a call succeeds without errors. One #string for every successfully handled format, nil for first failed format.
+-- @usage -- read three numbers from file
+-- f = vfs.open("Test\\test.txt");
+-- local n1, n2, n3 = f:read("*number", "*number", "*number");
+-- @usage -- read 10 bytes from file
+-- f = vfs.open("Test\\test.txt");
+-- local n4 = f:read(10);
+-- @usage -- read until end of file
+-- f = vfs.open("Test\\test.txt");
+-- local n5 = f:read("*all");
+-- @usage -- read a line from file
+-- f = vfs.open("Test\\test.txt");
+-- local n6 = f:read();
+-- @usage -- try to read three numbers from file with "1" content
+-- f = vfs.open("one.txt");
+-- print(f:read("*number", "*number", "*number"));
+-- -- prints(1, nil)
+
+---
+-- Check if file exists in VFS
+-- @function [parent=#vfs] fileExists
+-- @param #string fileName Path to file in VFS
+-- @return #boolean (true - exists, false - does not exist)
+-- @usage local exists = vfs.fileExists("Test\\test.txt");
+
+---
+-- Open a file
+-- @function [parent=#vfs] open
+-- @param #string fileName Path to file in VFS
+-- @return #FileHandle Opened file handle if a call succeeds without errors.
+-- @return #nil, #string nil plus the error message in case of any error.
+-- @usage f, msg = vfs.open("Test\\test.txt");
+-- -- print file name or error message
+-- if (f == nil)
+--     print(msg);
+-- else
+--     print(f.fileName);
+-- end
+
+---
+-- Get an iterator function to fetch the next line from file with given path.
+-- Throws an exception if file is closed or file with given path does not exist.
+-- Closes file automatically when it fails to read any more bytes.
+--
+-- Hint: since garbage collection works once per frame,
+-- you will get the whole file in RAM if you read it in one frame.
+-- So if you need to read a really large file, it is better to split reading
+-- between different frames (e.g. by keeping a current position in file
+-- and using a "seek" to read from saved position).
+-- @function [parent=#vfs] lines
+-- @param #string fileName Path to file in VFS
+-- @return #function Iterator function to get next line
+-- @usage for line in vfs.lines("Test\\test.txt") do
+--     print(line);
+-- end
+
+---
+-- Get iterator function to fetch file names with given path prefix from VFS
+-- @function [parent=#vfs] pathsWithPrefix
+-- @param #string path Path prefix
+-- @return #function Function to get next file name
+-- @usage -- get all files with given prefix from VFS index
+-- for fileName in vfs.pathsWithPrefix("Music\\Explore") do
+--     print(fileName);
+-- end
+-- @usage -- get some first files
+-- local getNextFile = vfs.pathsWithPrefix("Music\\Explore");
+-- local firstFile = getNextFile();
+-- local secondFile = getNextFile();
+
+---
+-- Detect a file handle type
+-- @function [parent=#vfs] type
+-- @param #any handle Object to check
+-- @return #string File handle type. Can be:
+--
+--   * "file" - an argument is a valid opened @{openmw.vfs#FileHandle};
+--   * "closed file" - an argument is a valid closed @{openmw.vfs#FileHandle};
+--   * nil - an argument is not a @{openmw.vfs#FileHandle};
+-- @usage f = vfs.open("Test\\test.txt");
+-- print(vfs.type(f));
+
+return nil
diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua
index 7907da5047..0a5b16dc8f 100644
--- a/files/lua_api/openmw/world.lua
+++ b/files/lua_api/openmw/world.lua
@@ -22,6 +22,10 @@
 -- Functions related to MWScript.
 -- @type MWScriptFunctions
 
+---
+-- @type MWScriptVariables
+-- @map <#string, #number>
+
 ---
 -- Returns local mwscript on ``object``. Returns `nil` if the script doesn't exist or is not started.
 -- @function [parent=#MWScriptFunctions] getLocalScript
@@ -29,6 +33,12 @@
 -- @param openmw.core#GameObject player (optional) Will be used in multiplayer mode to get the script if there is a separate instance for each player. Currently has no effect.
 -- @return #MWScript, #nil
 
+---
+-- Returns mutable global variables. In multiplayer, these may be specific to the provided player.
+-- @function [parent=#MWScriptFunctions] getGlobalVariables
+-- @param openmw.core#GameObject player (optional) Will be used in multiplayer mode to get the globals if there is a separate instance for each player. Currently has no effect.
+-- @return #MWScriptVariables
+
 ---
 -- Returns global mwscript with given recordId. Returns `nil` if the script doesn't exist or is not started.
 -- Currently there can be only one instance of each mwscript, but in multiplayer it will be possible to have a separate instance per player.
@@ -42,6 +52,7 @@
 -- @field #string recordId Id of the script
 -- @field openmw.core#GameObject object The object the script is attached to.
 -- @field openmw.core#GameObject player The player the script refers to.
+-- @field #boolean isRunning Whether the script is currently running
 -- @field #MWScriptVariables variables Local variables of the script (mutable)
 -- @usage
 -- for _, script in ipairs(world.mwscript.getLocalScripts(object)) do
@@ -57,6 +68,12 @@
 -- @param #string cellName
 -- @return openmw.core#Cell
 
+---
+-- Loads a cell by ID provided
+-- @function [parent=#world] getCellById
+-- @param #string cellId
+-- @return openmw.core#Cell
+
 ---
 -- Loads an exterior cell by grid indices
 -- @function [parent=#world] getExteriorCell
@@ -109,12 +126,12 @@
 ---
 -- Pause the game starting from the next frame.
 -- @function [parent=#world] pause
--- @param #string tag (optional) The game will be paused until `unpause` is called with the same tag.
+-- @param #string tag (optional, empty string by default) The game will be paused until `unpause` is called with the same tag.
 
 ---
 -- Remove given tag from the list of pause tags. Resume the game starting from the next frame if the list became empty.
 -- @function [parent=#world] unpause
--- @param #string tag (optional) Needed to undo `pause` called with this tag.
+-- @param #string tag (optional, empty string by default) Needed to undo `pause` called with this tag.
 
 ---
 -- The tags that are currently pausing the game.
@@ -134,6 +151,7 @@
 ---
 -- Create a new instance of the given record.
 -- After creation the object is in the disabled state. Use :teleport to place to the world or :moveInto to put it into a container or an inventory.
+-- Note that dynamically created creatures, NPCs, and container inventories will not respawn.
 -- @function [parent=#world] createObject
 -- @param #string recordId Record ID. Non-generated IDs are always lowercase. If a generated ID is provided, it must be provided exactly as generated.
 -- @param #number count (optional, 1 by default) The number of objects in stack
@@ -151,13 +169,38 @@
 -- Creates a custom record in the world database; the record ID from this record is case sensitive if generated.
 -- Eventually meant to support all records, but the current
 -- set of supported types is limited to:
+--
 -- * @{openmw.types#PotionRecord},
 -- * @{openmw.types#ArmorRecord},
 -- * @{openmw.types#BookRecord},
 -- * @{openmw.types#MiscellaneousRecord},
--- * @{openmw.types#ActivatorRecord}
+-- * @{openmw.types#ClothingRecord},
+-- * @{openmw.types#WeaponRecord},
+-- * @{openmw.types#ActivatorRecord},
+-- * @{openmw.types#LightRecord}
 -- @function [parent=#world] createRecord
 -- @param #any record A record to be registered in the database. Must be one of the supported types. The id field is not used, one will be generated for you.
 -- @return #any A new record added to the database. The type is the same as the input's.
 
+--- @{#VFX}: Visual effects
+-- @field [parent=#world] #VFX vfx
+
+---
+-- Spawn a VFX at the given location in the world. Best invoked through the SpawnVfx global event
+-- @function [parent=#VFX] spawn
+-- @param #string model string model path (normally taken from a record such as @{openmw.types#StaticRecord.model} or similar)
+-- @param openmw.util#Vector3 position
+-- @param #table options optional table of parameters. Can contain:
+--
+--   * `mwMagicVfx` - Boolean that if true causes the textureOverride parameter to only affect nodes with the Nif::RC_NiTexturingProperty property set. (default: true).
+--   * `particleTextureOverride` - Name of a particle texture that should override this effect's default texture. (default: "")
+--   * `scale` - A number that scales the size of the vfx (Default: 1)
+--
+-- @usage -- Spawn a sanctuary effect near the player
+-- local effect = core.magic.effects.records[core.magic.EFFECT_TYPE.Sanctuary]
+-- local pos = self.position + util.vector3(0, 100, 0)
+-- local model = types.Static.record(effect.castingStatic).model
+-- core.sendGlobalEvent('SpawnVfx', {model = model, position = pos})
+--
+
 return nil
diff --git a/files/lua_api/utf8.doclua b/files/lua_api/utf8.doclua
new file mode 100644
index 0000000000..6c054f4401
--- /dev/null
+++ b/files/lua_api/utf8.doclua
@@ -0,0 +1,77 @@
+-------------------------------------------------------------------------------
+-- UTF-8 Support. 
+-- This library provides basic support for UTF-8 encoding.
+-- It provides all its functions inside the table utf8.
+-- This library does not provide any support for Unicode other than the handling of the encoding.
+-- Any operation that needs the meaning of a character, such as character classification, is outside its scope.
+--
+-- Unless stated otherwise, all functions that expect a byte position as a parameter assume that 
+-- the given position is either the start of a byte sequence or one plus the length of the subject string.
+-- As in the string library, negative indices count from the end of the string.
+-- @module utf8
+
+-------------------------------------------------------------------------------
+-- Receives zero or more integers, converts each one to its
+-- corresponding UTF-8 byte sequence, and returns a string with the concatenation
+-- of all these sequences.
+-- @function [parent=#utf8] char
+-- @param ... zero or more integers.
+-- @return #string
+
+-------------------------------------------------------------------------------
+-- The pattern which matches exactly one UTF-8 byte sequence, assuming that
+-- the subject is a valid UTF-8 string.
+-- @function [parent=#utf8] charpattern
+-- @return #string
+
+-------------------------------------------------------------------------------
+-- Returns values so that the construction
+--
+--     for p, c in utf8.codes(s) do body end
+--
+-- will iterate over all characters in string s, with p being the position (in bytes)
+-- and c the code point of each character.
+-- It raises an error if it meets any invalid byte sequence.
+-- @function [parent=#utf8] codes
+-- @param #string s string to handle.
+
+-------------------------------------------------------------------------------
+-- Returns the codepoints (as integers) from all characters in s that start
+-- between byte position i and j (both included). The default for i is 1 and for j is i.
+-- It raises an error if it meets any invalid byte sequence.
+-- @function [parent=#utf8] codepoint
+-- @param #string s string to handle
+-- @param #number i the initial position (default value is 1)
+-- @param #number j the final position (default value is i)
+-- @return #number the codepoints of each character in s
+
+-------------------------------------------------------------------------------
+-- Returns the number of UTF-8 characters in string s that start
+-- between positions i and j (both inclusive).
+-- The default for i is 1 and for j is -1.
+-- If it finds any invalid byte sequence,
+-- returns a false value plus the position of the first invalid byte.
+-- @function [parent=#utf8] len
+-- @param #string s string to handle
+-- @param #number i the initial position (default value is 1)
+-- @param #number j the final position (default value is -1)
+-- @return #number the number of utf8 characters in s
+
+-------------------------------------------------------------------------------
+-- Returns the position (in bytes) where the encoding of the n-th character of s
+-- (counting from position i) starts. A negative n gets characters before position i.
+-- The default for i is 1 when n is non-negative and #s + 1 otherwise,
+-- so that utf8.offset(s, -n) gets the offset of the n-th character from the end of the string.
+-- If the specified character is neither in the subject nor right after its end, the function returns nil.
+--
+-- As a special case, when n is 0 the function returns the
+-- start of the encoding of the character that contains the i-th byte of s.
+--
+-- This function assumes that s is a valid UTF-8 string.
+-- @function [parent=#utf8] offset
+-- @param #string s string to handle
+-- @param #number n the n-th character
+-- @param #number i the initial position (default value is 1 if n is is non-negative and #s + 1 otherwise)
+-- @return #number
+
+return nil
diff --git a/files/mac/openmw-Info.plist.in b/files/mac/openmw-Info.plist.in
index 20dc36afa5..c0282c0284 100644
--- a/files/mac/openmw-Info.plist.in
+++ b/files/mac/openmw-Info.plist.in
@@ -8,8 +8,8 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>openmw-launcher</string>
-    <key>CFBundleIdentifier</key>
-    <string>org.openmw.openmw</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.openmw.openmw</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
@@ -20,14 +20,16 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-    <key>CFBundleShortVersionString</key>
-    <string>${OPENMW_VERSION}</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${OPENMW_VERSION}</string>
 	<key>CFBundleVersion</key>
 	<string>${OPENMW_VERSION}</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.role-playing-games</string>
 	<key>NSHumanReadableCopyright</key>
 	<string></string>
 	<key>NSHighResolutionCapable</key>
diff --git a/files/opencs/activator.png b/files/opencs/activator.png
deleted file mode 100644
index ded6ab835b..0000000000
Binary files a/files/opencs/activator.png and /dev/null differ
diff --git a/files/opencs/activator.svg b/files/opencs/activator.svg
new file mode 100644
index 0000000000..11a23003da
--- /dev/null
+++ b/files/opencs/activator.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-5"
+       id="linearGradient2320"
+       x1="2.6458335"
+       y1="14.816667"
+       x2="5.8208332"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-5">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-5"
+       id="linearGradient2322"
+       x1="3.1750002"
+       y1="14.816651"
+       x2="5.2916675"
+       y2="14.816651"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-5"
+       id="linearGradient2324"
+       x1="5.6885424"
+       y1="14.816667"
+       x2="6.3500004"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-5"
+       id="linearGradient2326"
+       x1="4.17975"
+       y1="16.49861"
+       x2="5.3575182"
+       y2="16.49861"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-5"
+       id="linearGradient2328"
+       x1="2.2552035"
+       y1="15.843752"
+       x2="3.3670816"
+       y2="15.843752"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-5"
+       id="linearGradient2330"
+       x1="2.2552028"
+       y1="13.789582"
+       x2="3.3670833"
+       y2="13.789582"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-5"
+       id="linearGradient2332"
+       x1="4.17975"
+       y1="13.134723"
+       x2="5.3575163"
+       y2="13.134723"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="activator"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7323517,-8.0000099,-47.301008)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1388"
+       width="4.2333331"
+       height="4.2333331"
+       x="2.1166692"
+       y="12.7"
+       rx="1.9824198e-15" />
+    <path
+       id="path1591"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2320);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 4.2333336,13.229167 a 1.5875001,1.5874996 0 0 0 -1.5875001,1.5875 1.5875001,1.5874996 0 0 0 1.5875001,1.5875 1.5875001,1.5874996 0 0 0 1.5874998,-1.5875 1.5875001,1.5874996 0 0 0 -1.5874998,-1.5875 z m 0,0.264583 A 1.3229167,1.3229167 0 0 1 5.5562504,14.816667 1.3229167,1.3229167 0 0 1 4.2333336,16.139583 1.3229167,1.3229167 0 0 1 2.9104169,14.816667 1.3229167,1.3229167 0 0 1 4.2333336,13.49375 Z" />
+    <path
+       id="path1598"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2322);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 4.2173138,13.758333 A 1.0583334,1.0583334 0 0 0 3.1750002,14.816667 1.0583334,1.0583334 0 0 0 4.2333336,15.875 1.0583334,1.0583334 0 0 0 5.2916674,14.816667 1.0583334,1.0583334 0 0 0 4.2333336,13.758333 a 1.0583334,1.0583334 0 0 0 -0.016021,0 z m 0.00259,0.264584 a 0.79374999,0.79374999 0 0 1 0.013427,0 0.79374999,0.79374999 0 0 1 0.7937496,0.79375 0.79374999,0.79374999 0 0 1 -0.7937496,0.79375 0.79374999,0.79374999 0 0 1 -0.7937501,-0.79375 0.79374999,0.79374999 0 0 1 0.7803143,-0.79375 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2324);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 5.6885424,14.2875 v 0.264584 h 0.396875 v 0.529166 h -0.396875 v 0.264584 c 0,0 0.264583,0 0.396875,0 0.264583,0 0.264583,0 0.264583,-0.264584 0,-0.176389 0,-0.529166 0,-0.529166 0,-0.264584 0,-0.264584 -0.264583,-0.264584 z"
+       id="path1605" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2326);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 5.1862854,16.037131 -0.251634,0.08176 0.122641,0.377451 -0.5032668,0.163521 -0.1226411,-0.377451 -0.2516344,0.08176 c 0,0 0.081761,0.251634 0.1226411,0.377451 0.081761,0.251633 0.081761,0.251633 0.333395,0.169872 0.1677562,-0.05451 0.5032672,-0.163521 0.5032672,-0.163521 0.251634,-0.08176 0.251634,-0.08176 0.169873,-0.333394 z"
+       id="path1607" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2328);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 3.3670817,16.100122 3.2115641,15.886069 2.890485,16.119347 2.5794493,15.691242 2.9005284,15.457965 2.7450107,15.243911 c 0,0 -0.2140526,0.155519 -0.321079,0.233278 -0.2140517,0.155518 -0.2140517,0.155518 -0.058533,0.369571 0.1036816,0.142701 0.3110358,0.428104 0.3110358,0.428104 0.1555176,0.214053 0.1555176,0.214053 0.3695702,0.05853 z"
+       id="path1609" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2330);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 2.7450088,14.389422 2.9005278,14.17537 2.5794483,13.942092 2.890485,13.513988 3.2115635,13.747266 3.3670834,13.533213 c 0,0 -0.2140533,-0.155518 -0.3210794,-0.233277 C 2.8319519,13.144419 2.8319519,13.144419 2.6764334,13.358476 2.572756,13.50118 2.3653976,13.78658 2.3653976,13.78658 c -0.1555189,0.214052 -0.1555189,0.214052 0.058538,0.369569 z"
+       id="path1611" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2332);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 4.1797501,13.26916 0.2516335,0.08176 0.1226416,-0.377452 0.5032662,0.163522 -0.122641,0.377451 0.251634,0.08176 c 0,0 0.08176,-0.251634 0.122641,-0.377451 0.08176,-0.251633 0.08176,-0.251633 -0.169878,-0.333393 -0.167758,-0.0545 -0.5032668,-0.163521 -0.5032668,-0.163521 -0.2516336,-0.08176 -0.2516336,-0.08176 -0.3333918,0.169876 z"
+       id="path1613" />
+  </g>
+</svg>
diff --git a/files/opencs/apparatus.png b/files/opencs/apparatus.png
deleted file mode 100644
index 4e95397dfa..0000000000
Binary files a/files/opencs/apparatus.png and /dev/null differ
diff --git a/files/opencs/apparatus.svg b/files/opencs/apparatus.svg
new file mode 100644
index 0000000000..1345efee56
--- /dev/null
+++ b/files/opencs/apparatus.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2316"
+       x1="7.4083333"
+       y1="15.610416"
+       x2="11.641667"
+       y2="15.610416"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2318"
+       x1="7.4311438"
+       y1="13.585216"
+       x2="9.7828169"
+       y2="13.585216"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="apparatus"
+     style="display:inline"
+     transform="matrix(3.7795264,0,0,3.7795277,-27.999988,-48.000001)">
+    <path
+       id="path1548"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2316);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 7.4083332,14.2875 c 0,1.058334 10e-8,1.852084 0.7937501,2.116667 v 0.529166 h 2.6458337 v -0.529166 c 0.79375,-0.264583 0.79375,-1.058333 0.79375,-2.116667 z m 0.2645835,0.264583 h 3.7041663 c -0.0043,0.391937 -0.02302,0.776349 -0.08992,1.021643 -0.08422,0.308823 -0.201392,0.472102 -0.522965,0.579293 -0.108066,0.03605 -0.180927,0.0049 -0.180868,0.118856 V 16.66875 H 8.4666666 l 10e-8,-0.396875 c 5.96e-5,-0.113922 -0.072801,-0.0828 -0.1808676,-0.118856 C 7.9642258,16.045828 7.847058,15.882549 7.7628336,15.573726 7.6959349,15.328432 7.6772196,14.94402 7.6729167,14.552083 Z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2318);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 8.0303333,14.440792 c 0,0 -0.2549422,-0.503321 -0.5872624,-1.214834 -0.051288,-0.109811 0.072913,-0.283564 0.1805731,-0.367422 0.1272316,-0.0991 0.335854,-0.186629 0.4261393,-0.102012 0.6564188,0.615209 1.7330335,1.691503 1.7330335,1.691503 l -0.443406,-0.08626 c 0,0 -0.8603506,-0.879948 -1.300715,-1.309642 -0.1226325,-0.119661 -0.3779304,0.08975 -0.3032537,0.272244 0.1220055,0.29815 0.5843882,1.043318 0.5843882,1.043318 z"
+       id="path1575" />
+  </g>
+</svg>
diff --git a/files/opencs/armor.png b/files/opencs/armor.png
deleted file mode 100644
index 6f5cc83c59..0000000000
Binary files a/files/opencs/armor.png and /dev/null differ
diff --git a/files/opencs/armor.svg b/files/opencs/armor.svg
new file mode 100644
index 0000000000..e7925a23bc
--- /dev/null
+++ b/files/opencs/armor.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2334"
+       x1="12.7"
+       y1="14.834408"
+       x2="16.933334"
+       y2="14.834408"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2336"
+       x1="13.229167"
+       y1="14.816667"
+       x2="16.404167"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="armor"
+     style="display:inline"
+     transform="matrix(3.7795254,0,0,3.7481122,-47.999972,-47.601024)">
+    <path
+       id="path1648"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2334);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 12.7,12.7 c -10e-7,2.645834 0.529166,3.307291 1.984375,4.233333 0.07443,0.04731 0.190154,0.04731 0.264584,0 1.455208,-0.926042 1.984375,-1.587499 1.984375,-4.233333 z m 0.264584,0.264583 h 3.704166 c 0,1.984375 -0.463021,2.869609 -1.736328,3.673161 -0.06513,0.04105 -0.16638,0.04105 -0.23151,0 -1.273308,-0.803552 -1.736328,-1.688786 -1.736328,-3.673161 z" />
+    <path
+       id="path1653"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2336);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 14.816667,16.404167 c 1.364557,-0.881951 1.49242,-1.658193 1.5875,-3.175 h -1.5875 -1.5875 c 0.09508,1.516807 0.222943,2.293049 1.5875,3.175 z m 0,-2.910417 h 1.30638 c -0.115736,1.322698 -0.265299,1.809261 -1.30638,2.588086 -1.041081,-0.778825 -1.190644,-1.265388 -1.30638,-2.588086 z" />
+  </g>
+</svg>
diff --git a/files/opencs/attribute.png b/files/opencs/attribute.png
deleted file mode 100644
index c124567179..0000000000
Binary files a/files/opencs/attribute.png and /dev/null differ
diff --git a/files/opencs/attribute.svg b/files/opencs/attribute.svg
new file mode 100644
index 0000000000..5e02090f07
--- /dev/null
+++ b/files/opencs/attribute.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2232"
+       x1="2.1166666"
+       y1="41.275002"
+       x2="6.3499999"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="attribute"
+     transform="matrix(3.7795255,0,0,3.7795259,-7.9999953,-147.99994)"
+     style="display:inline">
+    <path
+       id="rect1081"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2232);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="M 3.9687499,39.158335 2.1166666,42.862502 2.453597,43.391668 H 6.0130694 L 6.3499999,42.862502 4.4979166,39.158335 Z m 0.1638143,0.264583 h 0.2015381 l 0.2645832,0.529167 H 3.8679809 Z m -0.396875,0.79375 h 0.995288 l 0.396875,0.79375 h -1.789038 z m -0.5291666,1.058334 h 2.0536213 l 0.396875,0.79375 H 2.8096476 Z m -0.5291667,1.058333 h 3.1119546 l 0.2361616,0.472323 -0.2046388,0.321427 h -3.175 L 2.4411946,42.805658 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/birthsign.png b/files/opencs/birthsign.png
deleted file mode 100644
index 861dbd4d10..0000000000
Binary files a/files/opencs/birthsign.png and /dev/null differ
diff --git a/files/opencs/birthsign.svg b/files/opencs/birthsign.svg
new file mode 100644
index 0000000000..c9316ed9d6
--- /dev/null
+++ b/files/opencs/birthsign.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2222"
+       x1="8.2020836"
+       y1="40.481251"
+       x2="10.847917"
+       y2="40.481251"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2224"
+       x1="7.4083333"
+       y1="42.068752"
+       x2="8.4666662"
+       y2="42.068752"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2226"
+       x1="8.9958334"
+       y1="42.597919"
+       x2="10.054167"
+       y2="42.597919"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2228"
+       x1="10.583333"
+       y1="42.068752"
+       x2="11.641667"
+       y2="42.068752"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2230"
+       x1="7.4083333"
+       y1="40.613544"
+       x2="11.641667"
+       y2="40.613544"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="birthsign"
+     transform="matrix(3.7795264,0,0,3.7795278,-27.999988,-148.00001)"
+     style="display:inline">
+    <path
+       id="path10688"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2222);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 9.5249999,39.158335 a 1.3229166,1.3229166 0 0 0 -1.3229167,1.322916 1.3229166,1.3229166 0 0 0 1.3229167,1.322917 1.3229166,1.3229166 0 0 0 1.3229171,-1.322917 1.3229166,1.3229166 0 0 0 -1.3229171,-1.322916 z m -0.01602,0.264583 a 1.0583333,1.0583333 0 0 1 0.01602,0 1.0583333,1.0583333 0 0 1 1.0583331,1.058333 1.0583333,1.0583333 0 0 1 -1.0583331,1.058334 1.0583333,1.0583333 0 0 1 -1.0583333,-1.058334 1.0583333,1.0583333 0 0 1 1.0423133,-1.058333 z" />
+    <path
+       id="rect10697"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2224);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 7.6729166,41.539585 c -0.1465789,0 -0.2645834,0.118004 -0.2645834,0.264583 v 0.529167 c 0,0.146579 0.1180045,0.264583 0.2645834,0.264583 h 0.5291666 c 0.146579,0 0.2645834,-0.118004 0.2645834,-0.264583 v -0.529167 c 0,-0.146579 -0.1180044,-0.264583 -0.2645834,-0.264583 z m 0,0.264583 h 0.5291666 v 0.529167 H 7.6729166 Z" />
+    <path
+       id="path10718"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2226);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 9.2604166,42.068753 c -0.1465789,0 -0.2645833,0.118005 -0.2645833,0.264584 v 0.529166 c 0,0.14658 0.1180044,0.264584 0.2645833,0.264584 h 0.5291667 c 0.146579,0 0.2645837,-0.118004 0.2645837,-0.264584 v -0.529166 c 0,-0.146579 -0.1180047,-0.264584 -0.2645837,-0.264584 z m 0,0.264584 h 0.5291667 v 0.529166 H 9.2604166 Z" />
+    <path
+       id="path10720"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2228);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 10.847917,41.539587 c -0.146579,0 -0.264584,0.118005 -0.264584,0.264584 v 0.529166 c 0,0.14658 0.118005,0.264584 0.264584,0.264584 h 0.529166 c 0.146579,0 0.264584,-0.118004 0.264584,-0.264584 v -0.529166 c 0,-0.146579 -0.118005,-0.264584 -0.264584,-0.264584 z m 0,0.264584 h 0.529166 v 0.529166 h -0.529166 z" />
+    <path
+       id="path10722"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2230);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 7.9374999,40.216668 c -0.2922507,0 -0.5291667,0.177686 -0.5291667,0.396875 0,0.219189 0.236916,0.396875 0.5291667,0.396875 H 9.2604165 9.7895832 11.1125 c 0.292251,0 0.529167,-0.177686 0.529167,-0.396875 0,-0.219189 -0.236916,-0.396875 -0.529167,-0.396875 h -0.432015 v 0.264583 H 11.1125 c 0.0019,-2.4e-5 0.0038,-2.4e-5 0.0057,0 0.09451,0.0024 0.169547,0.06084 0.169499,0.132292 0,0.07309 -0.07845,0.132334 -0.175183,0.132292 h -0.0057 -1.3172328 -0.5291667 -1.3172322 -0.00568 c -0.096734,4.2e-5 -0.1751831,-0.0592 -0.1751831,-0.132292 -4.81e-5,-0.07145 0.074991,-0.130014 0.1694987,-0.132292 0.00189,-2.4e-5 0.00379,-2.4e-5 0.00568,0 h 0.432015 v -0.264583 z" />
+  </g>
+</svg>
diff --git a/files/opencs/body-part.png b/files/opencs/body-part.png
deleted file mode 100644
index 8baec72024..0000000000
Binary files a/files/opencs/body-part.png and /dev/null differ
diff --git a/files/opencs/body-part.svg b/files/opencs/body-part.svg
new file mode 100644
index 0000000000..60c06defc8
--- /dev/null
+++ b/files/opencs/body-part.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2234"
+       x1="12.700004"
+       y1="41.275002"
+       x2="16.662027"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2236"
+       x1="15.261501"
+       y1="42.025791"
+       x2="15.91278"
+       y2="42.025791"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="body-part"
+     transform="matrix(3.7795264,0,0,3.7795278,-47.999995,-148.00001)"
+     style="display:inline">
+    <path
+       id="path1689"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2234);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 14.305075,39.158335 c 0.660363,1.331254 0.764294,1.869768 0.764294,2.462382 0,0.424307 -0.988158,0.901957 -1.840199,0.987536 -0.18112,0.0063 -0.529166,0.09876 -0.529166,0.518832 0,0.229584 0.339402,0.264584 0.529166,0.264584 h 3.024106 c 0.686469,-0.431602 0.364641,-0.995913 0.07028,-1.802474 -0.223239,-0.779487 -0.183967,-1.148525 -0.183967,-2.43086 z m 0.432014,0.264584 h 1.137915 c 0.01315,1.138401 -0.05581,1.388856 0.167431,2.168342 0.294362,0.806564 0.370625,1.401879 0.09715,1.535824 h -2.910417 c -0.324061,0 -0.321976,-0.267568 0,-0.293523 0.859047,-0.06925 2.12235,-0.654593 2.12235,-1.212845 0.0016,-0.218358 0.106445,-0.895485 -0.614431,-2.197798 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2236);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 15.261501,42.27091 c 0.204639,0.05209 0.511182,-0.240606 0.55025,-0.599654 0.113481,0.139526 0.14858,0.519555 0.01464,0.635827 -0.133946,0.116272 -0.449543,0.08661 -0.564885,-0.03617 z"
+       id="path1693" />
+  </g>
+</svg>
diff --git a/files/opencs/book.png b/files/opencs/book.png
deleted file mode 100644
index fdecb1585a..0000000000
Binary files a/files/opencs/book.png and /dev/null differ
diff --git a/files/opencs/book.svg b/files/opencs/book.svg
new file mode 100644
index 0000000000..b34827d7b1
--- /dev/null
+++ b/files/opencs/book.svg
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2338"
+       x1="17.991667"
+       y1="13.62678"
+       x2="20.108334"
+       y2="13.62678"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2340"
+       x1="19.84375"
+       y1="14.816667"
+       x2="20.372917"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2342"
+       x1="17.991667"
+       y1="14.948958"
+       x2="18.25625"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2344"
+       x1="21.960417"
+       y1="14.948958"
+       x2="22.225"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2346"
+       x1="17.991667"
+       y1="15.478861"
+       x2="20.108334"
+       y2="15.478861"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2348"
+       x1="17.991667"
+       y1="16.008026"
+       x2="20.108334"
+       y2="16.008026"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2350"
+       x1="20.108332"
+       y1="13.62678"
+       x2="22.224998"
+       y2="13.62678"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2352"
+       x1="20.108332"
+       y1="16.008026"
+       x2="22.224998"
+       y2="16.008026"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2354"
+       x1="20.108332"
+       y1="15.478861"
+       x2="22.224998"
+       y2="15.478861"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="book"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-67.999998,-48.000002)">
+    <path
+       id="path1701"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2338);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 20.108334,13.493751 h -0.264583 c -0.631361,-0.523199 -1.676055,-0.176816 -1.852084,0.264583 l 0.04547,0.264583 c 0.176029,-0.441399 1.167806,-0.797084 1.806609,-0.264583 h 0.264583 z" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2340);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1714"
+       width="0.5291667"
+       height="2.3812501"
+       x="19.84375"
+       y="13.626042" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2342);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1716"
+       width="0.26458335"
+       height="2.3812501"
+       x="17.991667"
+       y="13.758333" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2344);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1718"
+       width="0.26458335"
+       height="2.3812501"
+       x="21.960417"
+       y="13.758333" />
+    <path
+       id="path1736"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2346);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 20.108334,15.345832 h -0.264583 c -0.631361,-0.523199 -1.676055,-0.176816 -1.852084,0.264583 l 0.04547,0.264583 c 0.176029,-0.441399 1.167806,-0.797084 1.806609,-0.264583 h 0.264583 z" />
+    <path
+       id="path1738"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2348);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 20.108334,15.874998 h -0.264583 c -0.631361,-0.523199 -1.676055,-0.176816 -1.852084,0.264583 l 0.04547,0.264583 c 0.176029,-0.441399 1.167806,-0.797084 1.806609,-0.264583 h 0.264583 z" />
+    <path
+       id="path1740"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2350);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 20.108331,13.493751 h 0.264583 c 0.631361,-0.523199 1.676055,-0.176816 1.852084,0.264583 l -0.04547,0.264583 c -0.176029,-0.441399 -1.167806,-0.797084 -1.806609,-0.264583 h -0.264583 z" />
+    <path
+       id="path1742"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2352);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 20.108331,15.874998 h 0.264583 c 0.631361,-0.523199 1.676055,-0.176816 1.852084,0.264583 l -0.04547,0.264583 C 22.003499,15.962765 21.011722,15.60708 20.372919,16.139581 h -0.264583 z" />
+    <path
+       id="path1744"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2354);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 20.108331,15.345832 h 0.264583 c 0.631361,-0.523199 1.676055,-0.176816 1.852084,0.264583 l -0.04547,0.264583 c -0.176029,-0.441399 -1.167806,-0.797084 -1.806609,-0.264583 h -0.264583 z" />
+  </g>
+</svg>
diff --git a/files/opencs/brush-circle.png b/files/opencs/brush-circle.png
deleted file mode 100644
index 22e92c1c7f..0000000000
Binary files a/files/opencs/brush-circle.png and /dev/null differ
diff --git a/files/opencs/brush-circle.svg b/files/opencs/brush-circle.svg
new file mode 100644
index 0000000000..9a7334055d
--- /dev/null
+++ b/files/opencs/brush-circle.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="matrix(0.01348304,5.4290978e-4,-5.4290978e-4,0.01348304,-8.3169871,11.902656)"
+     id="g3861"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:7.41072;stroke-dasharray:none;stroke-opacity:1">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:14.1112;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1223.0877,970.60693 c 3.4659,1.1301 69.3268,-132.17231 0.01,1.65348 22.4324,7.9982 57.8129,20.83702 84.2736,35.72149 31.47,17.7026 95.0975,62.919 130.2191,93.4513 159.6062,-258.85749 217.7622,-402.8573 250.8816,-481.45696 1.4672,-3.6726 -10.6381,-224.03518 -7.9288,-242.38296 0.1439,-0.97479 -4.6307,-160.00282 -6.6178,-156.89403 -185.4652,290.15856 -351.8616,515.32983 -450.8377,749.90768 z m -18.5993,36.81547 c -10.343,-2.1435 -12.6893,2.7546 -14.3902,6.9154 -54.017,132.1446 -235.98278,450.7428 -258.39341,511.235 42.95377,6.6425 123.61141,56.0901 148.18501,89.6848 41.8408,-48.8743 238.2435,-354.2773 326.9039,-464.9703 3.3794,-4.2192 7.1429,-9.3124 11.2187,-15.1876 -31.8717,-28.1815 -90.6253,-67.9585 -118.9834,-84.5388 -27.4402,-16.0436 -52.8034,-27.3693 -75.3438,-35.4062 -5.3875,-1.921 -14.1678,-6.1689 -19.1968,-7.7323 z"
+       id="path3021"
+       transform="matrix(0.52516433,0,0,0.52516433,961.78994,-828.86591)" />
+    <g
+       id="g3795"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:7.41072;stroke-dasharray:none;stroke-opacity:1">
+      <path
+         id="path3793"
+         d="m 1432.3282,180.29088 c -0.3954,-0.0244 -0.6929,-0.0105 -1.091,-0.0361 -3.8526,-0.2484 -7.8422,-0.56196 -11.8738,-0.94553 -4.0316,-0.38357 -8.1046,-0.83644 -12.1828,-1.38194 -4.0783,-0.5455 -8.1539,-1.17502 -12.1465,-1.90928 -3.9927,-0.73421 -7.9173,-1.57768 -11.692,-2.52747 -3.7746,-0.94978 -7.3947,-2.0082 -10.8191,-3.20027 -1.7122,-0.59601 -3.3824,-1.22943 -4.9822,-1.89108 -1.5999,-0.66164 -3.1295,-1.36052 -4.6004,-2.09106 -1.4709,-0.73059 -2.8749,-1.48824 -4.2004,-2.29116 -1.3254,-0.80286 -2.5823,-1.64896 -3.7458,-2.52747 -1.1634,-0.8785 -2.2335,-1.78819 -3.2184,-2.74566 -0.9849,-0.95752 -1.8831,-1.96043 -2.673,-3.00029 -0.7898,-1.03985 -1.4765,-2.12929 -2.0547,-3.25479 -0.5782,-1.12557 -1.0501,-2.29484 -1.4001,-3.50943 -0.3501,-1.21459 -0.5856,-2.47515 -0.691,-3.78214 -0.1054,-1.307 -0.083,-2.65216 0.073,-4.05487 0.1559,-1.40277 0.2212,-2.7861 0.1819,-4.12766 -0.039,-1.34156 -0.1778,-2.64605 -0.4001,-3.92761 -0.2222,-1.28157 -0.5345,-2.5231 -0.9273,-3.74578 -0.3929,-1.22268 -0.8671,-2.41726 -1.4183,-3.58216 -0.5512,-1.16484 -1.1757,-2.31025 -1.8729,-3.41847 -0.6973,-1.10817 -1.4601,-2.18399 -2.2911,-3.23659 -0.8311,-1.05266 -1.7386,-2.07483 -2.6912,-3.07302 -0.9525,-0.9982 -1.9566,-1.98266 -3.0184,-2.92756 -1.0618,-0.94484 -2.1688,-1.85296 -3.3276,-2.74566 -1.1587,-0.8927 -2.375,-1.75864 -3.6185,-2.6002 -0.5162,-0.34947 -1.1071,-0.64116 -1.6365,-0.98196 -18.7596,41.685 -48.6658,67.50321 -110.1368,78.95234 -10.0671,1.87502 -6.7445,14.14668 0,14.14662 72.5797,0 156.074,-0.34097 218.4553,-19.58348 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3849"
+         d="m 1430.619,-12.707633 c -45.8854,0 -84.0461,33.091677 -91.8989,76.715697 -4.2316,15.792726 -8.9665,30.004108 -14.7104,42.767336 0.5294,0.3408 1.1203,0.63249 1.6365,0.98196 1.2435,0.84156 2.4598,1.7075 3.6185,2.6002 1.1588,0.8927 2.2658,1.80082 3.3276,2.74566 1.0618,0.9449 2.0659,1.92936 3.0184,2.92756 0.9526,0.99819 1.8601,2.02036 2.6912,3.07302 0.831,1.0526 1.5938,2.12842 2.2911,3.23658 0.6972,1.10823 1.3217,2.25364 1.8729,3.41848 0.5512,1.1649 1.0254,2.35948 1.4183,3.58216 0.3928,1.22268 0.7051,2.46421 0.9273,3.74578 0.2223,1.28156 0.3607,2.58605 0.4001,3.92761 0.039,1.34156 -0.026,2.72489 -0.1819,4.12766 -0.1558,1.40271 -0.1781,2.74787 -0.073,4.05487 0.1054,1.30699 0.3409,2.56755 0.691,3.78214 0.35,1.21459 0.8219,2.38386 1.4001,3.50942 0.5782,1.12551 1.2649,2.21495 2.0547,3.2548 0.7899,1.03986 1.6881,2.04277 2.673,3.00029 0.9849,0.95747 2.055,1.86716 3.2184,2.74566 1.1635,0.87851 2.4204,1.7246 3.7458,2.52747 1.3255,0.80292 2.7295,1.56057 4.2004,2.29116 1.4709,0.73054 3.0005,1.42942 4.6004,2.09106 1.5998,0.66165 3.27,1.29507 4.9822,1.89108 3.4244,1.19207 7.0445,2.25049 10.8191,3.20027 3.7747,0.94979 7.6993,1.79326 11.692,2.52746 3.9926,0.73426 8.0682,1.36379 12.1465,1.90929 4.0782,0.5455 8.1512,0.99837 12.1828,1.38194 4.0316,0.38356 8.0212,0.69713 11.8738,0.94553 0.3981,0.0256 0.6956,0.0122 1.091,0.0361 35.9837,-11.09972 64.9673,-28.45453 80.7161,-55.73206 6.9768,-13.08128 10.9282,-28.03414 10.9282,-43.89477 0,-51.568563 -41.7849,-93.371684 -93.3535,-93.371684 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <circle
+       style="fill:none;fill-opacity:0.8;stroke:#4d4d4d;stroke-width:0.367521;stroke-opacity:1"
+       id="path1"
+       cx="6.0803809"
+       cy="6.6884193"
+       r="4.1580262"
+       transform="matrix(74.047192,-2.9815935,2.9815935,74.047192,580.36067,-906.15614)" />
+  </g>
+</svg>
diff --git a/files/opencs/brush-custom.png b/files/opencs/brush-custom.png
deleted file mode 100644
index 58c0485502..0000000000
Binary files a/files/opencs/brush-custom.png and /dev/null differ
diff --git a/files/opencs/brush-custom.svg b/files/opencs/brush-custom.svg
new file mode 100644
index 0000000000..548ba179ab
--- /dev/null
+++ b/files/opencs/brush-custom.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+  </defs>
+  <g
+     id="brush-custom"
+     style="display:inline"
+     transform="translate(-96.39494,-63.540021)">
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2449"
+       width="12.699994"
+       height="12.699999"
+       x="95.514572"
+       y="63.76458" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+       d="m 101.20313,66.54271 c -1.678876,0 -3.042711,1.363835 -3.042711,3.042709 8.2e-5,0.61718 0.198856,1.213246 0.548288,1.720307 -0.178268,0.276987 -0.283678,0.594905 -0.283704,0.925526 0,0.948248 0.771543,1.719791 1.719787,1.719791 0.827,1.09e-4 1.52138,-0.595452 1.67639,-1.399397 0.27684,-0.05797 0.54302,-0.155514 0.79323,-0.287321 0.4243,0.549629 1.06517,0.89282 1.76372,0.892968 1.2405,0 2.24896,-1.008459 2.24896,-2.248958 0,-1.240499 -1.00846,-2.248958 -2.24896,-2.248958 -0.0962,-1.11e-4 -0.19147,0.01262 -0.28681,0.02479 -0.39574,-1.263941 -1.55476,-2.141357 -2.88819,-2.141457 z m 0,0.264584 c 1.25466,9.5e-5 2.35238,0.839655 2.68097,2.05052 l 0.0315,0.116271 0.11886,-0.02066 c 0.11342,-0.01979 0.22851,-0.02959 0.34365,-0.02946 1.09751,0 1.98437,0.886868 1.98437,1.984375 0,1.097508 -0.88686,1.984375 -1.98437,1.984375 -0.65001,-1.37e-4 -1.2585,-0.318322 -1.62936,-0.852143 l -0.0687,-0.09922 -0.10542,0.05943 c -0.27347,0.155496 -0.57095,0.263626 -0.88057,0.31936 l -0.0946,0.01707 -0.0134,0.09509 c -0.10037,0.720193 -0.71411,1.254281 -1.44126,1.254186 -0.805258,0 -1.455209,-0.649952 -1.455209,-1.455209 2.3e-5,-0.304604 0.09566,-0.601652 0.273367,-0.849042 l 0.05581,-0.07751 -0.05684,-0.07752 c -0.348953,-0.476242 -0.536839,-1.051359 -0.536919,-1.641761 0,-1.535882 1.242243,-2.778125 2.778121,-2.778125 z"
+       id="path2188" />
+    <g
+       id="g3795"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:7.41072;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(0.01348304,5.4290912e-4,-5.4290912e-4,0.01348304,88.077953,75.442677)">
+      <path
+         id="path3793"
+         d="m 1432.3282,180.29088 c -0.3954,-0.0244 -0.6929,-0.0105 -1.091,-0.0361 -3.8526,-0.2484 -7.8422,-0.56196 -11.8738,-0.94553 -4.0316,-0.38357 -8.1046,-0.83644 -12.1828,-1.38194 -4.0783,-0.5455 -8.1539,-1.17502 -12.1465,-1.90928 -3.9927,-0.73421 -7.9173,-1.57768 -11.692,-2.52747 -3.7746,-0.94978 -7.3947,-2.0082 -10.8191,-3.20027 -1.7122,-0.59601 -3.3824,-1.22943 -4.9822,-1.89108 -1.5999,-0.66164 -3.1295,-1.36052 -4.6004,-2.09106 -1.4709,-0.73059 -2.8749,-1.48824 -4.2004,-2.29116 -1.3254,-0.80286 -2.5823,-1.64896 -3.7458,-2.52747 -1.1634,-0.8785 -2.2335,-1.78819 -3.2184,-2.74566 -0.9849,-0.95752 -1.8831,-1.96043 -2.673,-3.00029 -0.7898,-1.03985 -1.4765,-2.12929 -2.0547,-3.25479 -0.5782,-1.12557 -1.0501,-2.29484 -1.4001,-3.50943 -0.3501,-1.21459 -0.5856,-2.47515 -0.691,-3.78214 -0.1054,-1.307 -0.083,-2.65216 0.073,-4.05487 0.1559,-1.40277 0.2212,-2.7861 0.1819,-4.12766 -0.039,-1.34156 -0.1778,-2.64605 -0.4001,-3.92761 -0.2222,-1.28157 -0.5345,-2.5231 -0.9273,-3.74578 -0.3929,-1.22268 -0.8671,-2.41726 -1.4183,-3.58216 -0.5512,-1.16484 -1.1757,-2.31025 -1.8729,-3.41847 -0.6973,-1.10817 -1.4601,-2.18399 -2.2911,-3.23659 -0.8311,-1.05266 -1.7386,-2.07483 -2.6912,-3.07302 -0.9525,-0.9982 -1.9566,-1.98266 -3.0184,-2.92756 -1.0618,-0.94484 -2.1688,-1.85296 -3.3276,-2.74566 -1.1587,-0.8927 -2.375,-1.75864 -3.6185,-2.6002 -0.5162,-0.34947 -1.1071,-0.64116 -1.6365,-0.98196 -18.7596,41.685 -48.6658,67.50321 -110.1368,78.95234 -10.0671,1.87502 -6.7445,14.14668 0,14.14662 72.5797,0 156.074,-0.34097 218.4553,-19.58348 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3849"
+         d="m 1430.619,-12.707633 c -45.8854,0 -84.0461,33.091677 -91.8989,76.715697 -4.2316,15.792726 -8.9665,30.004108 -14.7104,42.767336 0.5294,0.3408 1.1203,0.63249 1.6365,0.98196 1.2435,0.84156 2.4598,1.7075 3.6185,2.6002 1.1588,0.8927 2.2658,1.80082 3.3276,2.74566 1.0618,0.9449 2.0659,1.92936 3.0184,2.92756 0.9526,0.99819 1.8601,2.02036 2.6912,3.07302 0.831,1.0526 1.5938,2.12842 2.2911,3.23658 0.6972,1.10823 1.3217,2.25364 1.8729,3.41848 0.5512,1.1649 1.0254,2.35948 1.4183,3.58216 0.3928,1.22268 0.7051,2.46421 0.9273,3.74578 0.2223,1.28156 0.3607,2.58605 0.4001,3.92761 0.039,1.34156 -0.026,2.72489 -0.1819,4.12766 -0.1558,1.40271 -0.1781,2.74787 -0.073,4.05487 0.1054,1.30699 0.3409,2.56755 0.691,3.78214 0.35,1.21459 0.8219,2.38386 1.4001,3.50942 0.5782,1.12551 1.2649,2.21495 2.0547,3.2548 0.7899,1.03986 1.6881,2.04277 2.673,3.00029 0.9849,0.95747 2.055,1.86716 3.2184,2.74566 1.1635,0.87851 2.4204,1.7246 3.7458,2.52747 1.3255,0.80292 2.7295,1.56057 4.2004,2.29116 1.4709,0.73054 3.0005,1.42942 4.6004,2.09106 1.5998,0.66165 3.27,1.29507 4.9822,1.89108 3.4244,1.19207 7.0445,2.25049 10.8191,3.20027 3.7747,0.94979 7.6993,1.79326 11.692,2.52746 3.9926,0.73426 8.0682,1.36379 12.1465,1.90929 4.0782,0.5455 8.1512,0.99837 12.1828,1.38194 4.0316,0.38356 8.0212,0.69713 11.8738,0.94553 0.3981,0.0256 0.6956,0.0122 1.091,0.0361 35.9837,-11.09972 64.9673,-28.45453 80.7161,-55.73206 6.9768,-13.08128 10.9282,-28.03414 10.9282,-43.89477 0,-51.568563 -41.7849,-93.371684 -93.3535,-93.371684 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:14.1112;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1223.0877,970.60693 c 3.4659,1.1301 69.3268,-132.17231 0.01,1.65348 22.4324,7.9982 57.8129,20.83702 84.2736,35.72149 31.47,17.7026 95.0975,62.919 130.2191,93.4513 159.6062,-258.85749 217.7622,-402.8573 250.8816,-481.45696 1.4672,-3.6726 -10.6381,-224.03518 -7.9288,-242.38296 0.1439,-0.97479 -4.636,-160.00618 -6.6178,-156.89403 -183.2275,287.73306 -308.4059,492.56152 -450.8377,749.90768 z m -18.5993,36.81547 c -10.343,-2.1435 -12.6893,2.7546 -14.3902,6.9154 -54.017,132.1446 -235.98278,450.7428 -258.39341,511.235 42.95377,6.6425 123.61141,56.0901 148.18501,89.6848 41.8408,-48.8743 238.2435,-354.2773 326.9039,-464.9703 3.3794,-4.2192 7.1429,-9.3124 11.2187,-15.1876 -31.8717,-28.1815 -90.6253,-67.9585 -118.9834,-84.5388 -27.4402,-16.0436 -52.8034,-27.3693 -75.3438,-35.4062 -5.3875,-1.921 -14.1678,-6.1689 -19.1968,-7.7323 z"
+         id="path3021"
+         transform="matrix(0.52516428,8.6770679e-8,-8.6770679e-8,0.52516428,961.78997,-828.86587)" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/brush-point.png b/files/opencs/brush-point.png
deleted file mode 100644
index 19b2354f8c..0000000000
Binary files a/files/opencs/brush-point.png and /dev/null differ
diff --git a/files/opencs/brush-point.svg b/files/opencs/brush-point.svg
new file mode 100644
index 0000000000..11036b5374
--- /dev/null
+++ b/files/opencs/brush-point.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-2" />
+    </linearGradient>
+  </defs>
+  <g
+     id="brush-point"
+     style="display:inline"
+     transform="translate(-74.612486,-65.352077)">
+    <path
+       id="path1998"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 76.975838,71.657408 c -0.144291,0 -0.792839,0.121337 -0.792839,0.265625 0,0.144291 0.648546,0.263672 0.792839,0.263672 h 1.853515 c 0.144291,0 0.263672,-0.119384 0.263672,-0.263672 0,-0.144291 -0.119379,-0.265625 -0.263672,-0.265625 z m 3.96875,-3.439453 c 0,-0.144291 -0.119384,-0.792839 -0.263672,-0.792839 -0.144291,0 -0.265625,0.648546 -0.265625,0.792839 v 1.853515 c 0,0.144291 0.121337,0.263672 0.265625,0.263672 0.144291,0 0.263672,-0.119379 0.263672,-0.263672 z m 0,5.55664 c 0,-0.14429 -0.119384,-0.263671 -0.263672,-0.263671 -0.144291,0 -0.265625,0.119378 -0.265625,0.263671 v 1.851563 c 0,0.144291 0.121337,0.794792 0.265625,0.794792 0.144291,0 0.263672,-0.650499 0.263672,-0.794792 z m 1.58789,-2.117187 c -0.14429,0 -0.263671,0.121337 -0.263671,0.265625 0,0.144291 0.119378,0.263672 0.263671,0.263672 h 1.851563 c 0.144291,0 0.794792,-0.119384 0.794792,-0.263672 0,-0.144291 -0.650499,-0.265625 -0.794792,-0.265625 z" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 80.151619,70.864439 c -0.290872,0 -0.529297,0.238426 -0.529297,0.529297 v 1.058594 c 0,0.290872 0.238426,0.529297 0.529297,0.529297 h 1.058594 c 0.290872,0 0.529297,-0.238425 0.529297,-0.529297 v -1.058594 c 0,-0.290871 -0.238425,-0.529297 -0.529297,-0.529297 z m 0,0.265625 h 1.058594 c 0.14887,0 0.263672,0.114803 0.263672,0.263672 v 1.058594 c 0,0.14887 -0.114802,0.263672 -0.263672,0.263672 h -1.058594 c -0.148869,0 -0.263672,-0.114802 -0.263672,-0.263672 v -1.058594 c 0,-0.148869 0.114804,-0.263672 0.263672,-0.263672 z"
+       id="path1983" />
+    <g
+       id="g3795"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:7.41072;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(0.01348304,5.4290911e-4,-5.4290911e-4,0.01348304,66.295499,77.254733)">
+      <path
+         id="path3793"
+         d="m 1432.3282,180.29088 c -0.3954,-0.0244 -0.6929,-0.0105 -1.091,-0.0361 -3.8526,-0.2484 -7.8422,-0.56196 -11.8738,-0.94553 -4.0316,-0.38357 -8.1046,-0.83644 -12.1828,-1.38194 -4.0783,-0.5455 -8.1539,-1.17502 -12.1465,-1.90928 -3.9927,-0.73421 -7.9173,-1.57768 -11.692,-2.52747 -3.7746,-0.94978 -7.3947,-2.0082 -10.8191,-3.20027 -1.7122,-0.59601 -3.3824,-1.22943 -4.9822,-1.89108 -1.5999,-0.66164 -3.1295,-1.36052 -4.6004,-2.09106 -1.4709,-0.73059 -2.8749,-1.48824 -4.2004,-2.29116 -1.3254,-0.80286 -2.5823,-1.64896 -3.7458,-2.52747 -1.1634,-0.8785 -2.2335,-1.78819 -3.2184,-2.74566 -0.9849,-0.95752 -1.8831,-1.96043 -2.673,-3.00029 -0.7898,-1.03985 -1.4765,-2.12929 -2.0547,-3.25479 -0.5782,-1.12557 -1.0501,-2.29484 -1.4001,-3.50943 -0.3501,-1.21459 -0.5856,-2.47515 -0.691,-3.78214 -0.1054,-1.307 -0.083,-2.65216 0.073,-4.05487 0.1559,-1.40277 0.2212,-2.7861 0.1819,-4.12766 -0.039,-1.34156 -0.1778,-2.64605 -0.4001,-3.92761 -0.2222,-1.28157 -0.5345,-2.5231 -0.9273,-3.74578 -0.3929,-1.22268 -0.8671,-2.41726 -1.4183,-3.58216 -0.5512,-1.16484 -1.1757,-2.31025 -1.8729,-3.41847 -0.6973,-1.10817 -1.4601,-2.18399 -2.2911,-3.23659 -0.8311,-1.05266 -1.7386,-2.07483 -2.6912,-3.07302 -0.9525,-0.9982 -1.9566,-1.98266 -3.0184,-2.92756 -1.0618,-0.94484 -2.1688,-1.85296 -3.3276,-2.74566 -1.1587,-0.8927 -2.375,-1.75864 -3.6185,-2.6002 -0.5162,-0.34947 -1.1071,-0.64116 -1.6365,-0.98196 -18.7596,41.685 -48.6658,67.50321 -110.1368,78.95234 -10.0671,1.87502 -6.7445,14.14668 0,14.14662 72.5797,0 156.074,-0.34097 218.4553,-19.58348 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3849"
+         d="m 1430.619,-12.707633 c -45.8854,0 -84.0461,33.091677 -91.8989,76.715697 -4.2316,15.792726 -8.9665,30.004108 -14.7104,42.767336 0.5294,0.3408 1.1203,0.63249 1.6365,0.98196 1.2435,0.84156 2.4598,1.7075 3.6185,2.6002 1.1588,0.8927 2.2658,1.80082 3.3276,2.74566 1.0618,0.9449 2.0659,1.92936 3.0184,2.92756 0.9526,0.99819 1.8601,2.02036 2.6912,3.07302 0.831,1.0526 1.5938,2.12842 2.2911,3.23658 0.6972,1.10823 1.3217,2.25364 1.8729,3.41848 0.5512,1.1649 1.0254,2.35948 1.4183,3.58216 0.3928,1.22268 0.7051,2.46421 0.9273,3.74578 0.2223,1.28156 0.3607,2.58605 0.4001,3.92761 0.039,1.34156 -0.026,2.72489 -0.1819,4.12766 -0.1558,1.40271 -0.1781,2.74787 -0.073,4.05487 0.1054,1.30699 0.3409,2.56755 0.691,3.78214 0.35,1.21459 0.8219,2.38386 1.4001,3.50942 0.5782,1.12551 1.2649,2.21495 2.0547,3.2548 0.7899,1.03986 1.6881,2.04277 2.673,3.00029 0.9849,0.95747 2.055,1.86716 3.2184,2.74566 1.1635,0.87851 2.4204,1.7246 3.7458,2.52747 1.3255,0.80292 2.7295,1.56057 4.2004,2.29116 1.4709,0.73054 3.0005,1.42942 4.6004,2.09106 1.5998,0.66165 3.27,1.29507 4.9822,1.89108 3.4244,1.19207 7.0445,2.25049 10.8191,3.20027 3.7747,0.94979 7.6993,1.79326 11.692,2.52746 3.9926,0.73426 8.0682,1.36379 12.1465,1.90929 4.0782,0.5455 8.1512,0.99837 12.1828,1.38194 4.0316,0.38356 8.0212,0.69713 11.8738,0.94553 0.3981,0.0256 0.6956,0.0122 1.091,0.0361 35.9837,-11.09972 64.9673,-28.45453 80.7161,-55.73206 6.9768,-13.08128 10.9282,-28.03414 10.9282,-43.89477 0,-51.568563 -41.7849,-93.371684 -93.3535,-93.371684 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       transform="matrix(0.01348304,5.4290911e-4,-5.4290911e-4,0.01348304,66.295499,77.254733)"
+       id="g3861"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:7.41072;stroke-dasharray:none;stroke-opacity:1">
+      <path
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:14.1112;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1223.0877,970.60693 c 3.4659,1.1301 69.3268,-132.17231 0.01,1.65348 22.4324,7.9982 57.8129,20.83702 84.2736,35.72149 31.47,17.7026 95.0975,62.919 130.2191,93.4513 159.6062,-258.85749 217.7622,-402.8573 250.8816,-481.45696 1.4672,-3.6726 -10.6381,-224.03518 -7.9288,-242.38296 0.1439,-0.97479 -4.6307,-160.00282 -6.6178,-156.89403 -185.4652,290.15856 -351.8616,515.32983 -450.8377,749.90768 z m -18.5993,36.81547 c -10.343,-2.1435 -12.6893,2.7546 -14.3902,6.9154 -54.017,132.1446 -235.98278,450.7428 -258.39341,511.235 42.95377,6.6425 123.61141,56.0901 148.18501,89.6848 41.8408,-48.8743 238.2435,-354.2773 326.9039,-464.9703 3.3794,-4.2192 7.1429,-9.3124 11.2187,-15.1876 -31.8717,-28.1815 -90.6253,-67.9585 -118.9834,-84.5388 -27.4402,-16.0436 -52.8034,-27.3693 -75.3438,-35.4062 -5.3875,-1.921 -14.1678,-6.1689 -19.1968,-7.7323 z"
+         id="path3021"
+         transform="matrix(0.52516433,0,0,0.52516433,961.78994,-828.86591)" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/brush-square.png b/files/opencs/brush-square.png
deleted file mode 100644
index 08628772e7..0000000000
Binary files a/files/opencs/brush-square.png and /dev/null differ
diff --git a/files/opencs/brush-square.svg b/files/opencs/brush-square.svg
new file mode 100644
index 0000000000..6d85175b30
--- /dev/null
+++ b/files/opencs/brush-square.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="matrix(0.01348304,5.4290978e-4,-5.4290978e-4,0.01348304,-8.3169871,11.902656)"
+     id="g3861"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:7.41072;stroke-dasharray:none;stroke-opacity:1">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:14.1112;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1223.0877,970.60693 c 3.4659,1.1301 69.3268,-132.17231 0.01,1.65348 22.4324,7.9982 57.8129,20.83702 84.2736,35.72149 31.47,17.7026 95.0975,62.919 130.2191,93.4513 159.6062,-258.85749 217.7622,-402.8573 250.8816,-481.45696 1.4672,-3.6726 -10.6381,-224.03518 -7.9288,-242.38296 0.1439,-0.97479 -4.636,-160.00618 -6.6178,-156.89403 -183.2275,287.73306 -308.4059,492.56152 -450.8377,749.90768 z m -18.5993,36.81547 c -10.343,-2.1435 -12.6893,2.7546 -14.3902,6.9154 -54.017,132.1446 -235.98278,450.7428 -258.39341,511.235 42.95377,6.6425 123.61141,56.0901 148.18501,89.6848 41.8408,-48.8743 238.2435,-354.2773 326.9039,-464.9703 3.3794,-4.2192 7.1429,-9.3124 11.2187,-15.1876 -31.8717,-28.1815 -90.6253,-67.9585 -118.9834,-84.5388 -27.4402,-16.0436 -52.8034,-27.3693 -75.3438,-35.4062 -5.3875,-1.921 -14.1678,-6.1689 -19.1968,-7.7323 z"
+       id="path3021"
+       transform="matrix(0.52516433,0,0,0.52516433,961.78994,-828.86591)" />
+    <g
+       id="g3795"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:7.41072;stroke-dasharray:none;stroke-opacity:1">
+      <path
+         id="path3793"
+         d="m 1432.3282,180.29088 c -0.3954,-0.0244 -0.6929,-0.0105 -1.091,-0.0361 -3.8526,-0.2484 -7.8422,-0.56196 -11.8738,-0.94553 -4.0316,-0.38357 -8.1046,-0.83644 -12.1828,-1.38194 -4.0783,-0.5455 -8.1539,-1.17502 -12.1465,-1.90928 -3.9927,-0.73421 -7.9173,-1.57768 -11.692,-2.52747 -3.7746,-0.94978 -7.3947,-2.0082 -10.8191,-3.20027 -1.7122,-0.59601 -3.3824,-1.22943 -4.9822,-1.89108 -1.5999,-0.66164 -3.1295,-1.36052 -4.6004,-2.09106 -1.4709,-0.73059 -2.8749,-1.48824 -4.2004,-2.29116 -1.3254,-0.80286 -2.5823,-1.64896 -3.7458,-2.52747 -1.1634,-0.8785 -2.2335,-1.78819 -3.2184,-2.74566 -0.9849,-0.95752 -1.8831,-1.96043 -2.673,-3.00029 -0.7898,-1.03985 -1.4765,-2.12929 -2.0547,-3.25479 -0.5782,-1.12557 -1.0501,-2.29484 -1.4001,-3.50943 -0.3501,-1.21459 -0.5856,-2.47515 -0.691,-3.78214 -0.1054,-1.307 -0.083,-2.65216 0.073,-4.05487 0.1559,-1.40277 0.2212,-2.7861 0.1819,-4.12766 -0.039,-1.34156 -0.1778,-2.64605 -0.4001,-3.92761 -0.2222,-1.28157 -0.5345,-2.5231 -0.9273,-3.74578 -0.3929,-1.22268 -0.8671,-2.41726 -1.4183,-3.58216 -0.5512,-1.16484 -1.1757,-2.31025 -1.8729,-3.41847 -0.6973,-1.10817 -1.4601,-2.18399 -2.2911,-3.23659 -0.8311,-1.05266 -1.7386,-2.07483 -2.6912,-3.07302 -0.9525,-0.9982 -1.9566,-1.98266 -3.0184,-2.92756 -1.0618,-0.94484 -2.1688,-1.85296 -3.3276,-2.74566 -1.1587,-0.8927 -2.375,-1.75864 -3.6185,-2.6002 -0.5162,-0.34947 -1.1071,-0.64116 -1.6365,-0.98196 -18.7596,41.685 -48.6658,67.50321 -110.1368,78.95234 -10.0671,1.87502 -6.7445,14.14668 0,14.14662 72.5797,0 156.074,-0.34097 218.4553,-19.58348 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3849"
+         d="m 1430.619,-12.707633 c -45.8854,0 -84.0461,33.091677 -91.8989,76.715697 -4.2316,15.792726 -8.9665,30.004108 -14.7104,42.767336 0.5294,0.3408 1.1203,0.63249 1.6365,0.98196 1.2435,0.84156 2.4598,1.7075 3.6185,2.6002 1.1588,0.8927 2.2658,1.80082 3.3276,2.74566 1.0618,0.9449 2.0659,1.92936 3.0184,2.92756 0.9526,0.99819 1.8601,2.02036 2.6912,3.07302 0.831,1.0526 1.5938,2.12842 2.2911,3.23658 0.6972,1.10823 1.3217,2.25364 1.8729,3.41848 0.5512,1.1649 1.0254,2.35948 1.4183,3.58216 0.3928,1.22268 0.7051,2.46421 0.9273,3.74578 0.2223,1.28156 0.3607,2.58605 0.4001,3.92761 0.039,1.34156 -0.026,2.72489 -0.1819,4.12766 -0.1558,1.40271 -0.1781,2.74787 -0.073,4.05487 0.1054,1.30699 0.3409,2.56755 0.691,3.78214 0.35,1.21459 0.8219,2.38386 1.4001,3.50942 0.5782,1.12551 1.2649,2.21495 2.0547,3.2548 0.7899,1.03986 1.6881,2.04277 2.673,3.00029 0.9849,0.95747 2.055,1.86716 3.2184,2.74566 1.1635,0.87851 2.4204,1.7246 3.7458,2.52747 1.3255,0.80292 2.7295,1.56057 4.2004,2.29116 1.4709,0.73054 3.0005,1.42942 4.6004,2.09106 1.5998,0.66165 3.27,1.29507 4.9822,1.89108 3.4244,1.19207 7.0445,2.25049 10.8191,3.20027 3.7747,0.94979 7.6993,1.79326 11.692,2.52746 3.9926,0.73426 8.0682,1.36379 12.1465,1.90929 4.0782,0.5455 8.1512,0.99837 12.1828,1.38194 4.0316,0.38356 8.0212,0.69713 11.8738,0.94553 0.3981,0.0256 0.6956,0.0122 1.091,0.0361 35.9837,-11.09972 64.9673,-28.45453 80.7161,-55.73206 6.9768,-13.08128 10.9282,-28.03414 10.9282,-43.89477 0,-51.568563 -41.7849,-93.371684 -93.3535,-93.371684 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#808080;stroke-width:8.21086;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:24.154;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4"
+       width="551.00012"
+       height="551.00012"
+       x="759.14246"
+       y="-686.99188"
+       transform="rotate(-2.3058334)" />
+  </g>
+</svg>
diff --git a/files/opencs/camera-first-person.png b/files/opencs/camera-first-person.png
deleted file mode 100644
index b497198df5..0000000000
Binary files a/files/opencs/camera-first-person.png and /dev/null differ
diff --git a/files/opencs/camera-first-person.svg b/files/opencs/camera-first-person.svg
new file mode 100644
index 0000000000..4ad75a4776
--- /dev/null
+++ b/files/opencs/camera-first-person.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(63.499994)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient2809"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="camera-first-person"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-190.85285,-85.019482)">
+    <path
+       id="rect2331"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient2809);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="M 558.40946,259.99589 557.5,270 h 3 l 0.91695,11.00345 A 1.0867995,1.0867995 42.618179 0 0 562.5,282 h 5 a 1.0867995,1.0867995 137.38182 0 0 1.08305,-0.99655 L 569.5,270 h 2.75 l -0.90946,-10.00411 A 1.0950328,1.0950328 42.402786 0 0 570.25,259 H 559.5 a 1.0950328,1.0950328 137.59721 0 0 -1.09054,0.99589 z"
+       transform="scale(0.26458333)" />
+    <ellipse
+       style="font-variation-settings:normal;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.13229157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="ellipse2327"
+       cx="149.48953"
+       cy="67.071899"
+       rx="1.5874941"
+       ry="1.5875033" />
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.326641px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle2329"
+       cx="150.01872"
+       cy="67.204193"
+       r="0.52916664" />
+  </g>
+</svg>
diff --git a/files/opencs/camera-free.png b/files/opencs/camera-free.png
deleted file mode 100644
index d8e7ccae5d..0000000000
Binary files a/files/opencs/camera-free.png and /dev/null differ
diff --git a/files/opencs/camera-free.svg b/files/opencs/camera-free.svg
new file mode 100644
index 0000000000..c853de5d82
--- /dev/null
+++ b/files/opencs/camera-free.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(63.499994)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+  </defs>
+  <g
+     id="camera-free"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.3333335,-169.68618,-85.01945)">
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.1322916;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="ellipse2315"
+       cx="133.08542"
+       cy="72.628128"
+       r="1.3229166" />
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.1322916;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle2319"
+       cx="131.36563"
+       cy="68.130211"
+       r="1.4552083" />
+    <ellipse
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.237741px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle2317"
+       cx="123.01057"
+       cy="68.208794"
+       rx="0.48718452"
+       ry="0.46406204"
+       transform="matrix(1,0,0.12650781,0.99196561,0,0)" />
+    <ellipse
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.205204px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle2321"
+       cx="132.5358"
+       cy="72.584305"
+       rx="0.3821989"
+       ry="0.440696" />
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.1322916;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle2323"
+       cx="135.99583"
+       cy="69.056252"
+       r="1.984375" />
+    <ellipse
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.326641px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="ellipse2325"
+       cx="136.92188"
+       cy="69.171593"
+       rx="0.65753078"
+       ry="0.64905536" />
+  </g>
+</svg>
diff --git a/files/opencs/camera-orbit.png b/files/opencs/camera-orbit.png
deleted file mode 100644
index 1aedf28479..0000000000
Binary files a/files/opencs/camera-orbit.png and /dev/null differ
diff --git a/files/opencs/camera-orbit.svg b/files/opencs/camera-orbit.svg
new file mode 100644
index 0000000000..0833c5f2d1
--- /dev/null
+++ b/files/opencs/camera-orbit.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(63.499994)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient2502"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="camera-orbit"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-148.51954,-85.019482)">
+    <path
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient2502);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 114.81181,69.118264 c -3.49828,3.08633 1.51943,2.817376 3.58014,2.334121 2.06071,-0.483255 7.1306,-3.705601 -1.60983,-3.162598 7.34302,-2.156354 7.21991,2.475405 2.60397,3.889003 -4.95879,1.518595 -8.7571,-0.657262 -4.57428,-3.060526 z"
+       id="path2279" />
+    <ellipse
+       style="font-variation-settings:normal;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.13229157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="path2257"
+       cx="115.8875"
+       cy="68.659378"
+       rx="1.5874941"
+       ry="1.5875033" />
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="path2261"
+       cx="116.41667"
+       cy="69.056252"
+       r="0.52916664" />
+  </g>
+</svg>
diff --git a/files/opencs/cell.png b/files/opencs/cell.png
deleted file mode 100644
index 4c3fbe2515..0000000000
Binary files a/files/opencs/cell.png and /dev/null differ
diff --git a/files/opencs/cell.svg b/files/opencs/cell.svg
new file mode 100644
index 0000000000..9348165dc9
--- /dev/null
+++ b/files/opencs/cell.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Green"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="2.1166668"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientTransform="translate(21.166665,37.041663)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient4013"
+       gradientUnits="userSpaceOnUse"
+       x1="2.1166666"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,21.166665,37.041663)" />
+  </defs>
+  <g
+     id="cell"
+     transform="matrix(3.7795278,0,0,3.7795278,-87.999996,-147.99999)"
+     style="display:inline">
+    <path
+       id="path887"
+       style="fill:url(#linearGradient4011);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 24.077082,39.95208 h 2.645833 v 2.645833 c 0,0 -2.645833,0 -2.645833,0 z m -0.264584,-0.79375 v 0.529166 h -0.529166 v 0.264584 h 0.529166 v 2.645833 h -0.529166 v 0.264583 h 0.529166 v 0.529167 h 0.264584 v -0.529167 h 2.645833 v 0.529167 h 0.264583 v -0.529167 h 0.529167 V 42.597913 H 26.987498 V 39.95208 h 0.529167 V 39.687496 H 26.987498 V 39.15833 h -0.264583 v 0.529166 H 24.077082 V 39.15833 Z" />
+    <path
+       id="rect890"
+       style="fill:url(#linearGradient4013);fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 24.341665,40.216663 v 2.116667 h 2.116667 v -2.116667 z m 0.264583,0.264583 h 1.5875 v 1.5875 h -1.5875 z" />
+  </g>
+</svg>
diff --git a/files/opencs/class.png b/files/opencs/class.png
deleted file mode 100644
index 272f2630c7..0000000000
Binary files a/files/opencs/class.png and /dev/null differ
diff --git a/files/opencs/class.svg b/files/opencs/class.svg
new file mode 100644
index 0000000000..c9d5e7c5f5
--- /dev/null
+++ b/files/opencs/class.svg
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2220"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741-0">
+      <path
+         id="mask-powermask-path-effect1741_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 16.991666,59.324974 h 6.233333 v 6.233352 h -6.233333 z" />
+      <path
+         id="path1739-0"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect1741_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1741_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1741_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741-7">
+      <path
+         id="mask-powermask-path-effect1741-7_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 16.991666,59.324974 h 6.233333 v 6.233352 h -6.233333 z" />
+      <path
+         id="path1"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 16.991666,59.324974 h 6.233333 v 6.233352 h -6.233333 z" />
+      <path
+         id="path2"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect1741-7_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1741-7_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1741-7_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient4"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+  </defs>
+  <g
+     id="class"
+     transform="matrix(3.7795269,0,0,3.7795061,-67.999981,-147.99907)"
+     style="display:inline">
+    <g
+       id="g1724"
+       mask="url(#mask-powermask-path-effect1741-7)"
+       transform="translate(0,-21.166665)"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2220);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1">
+      <path
+         id="path843"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108333,60.324994 a 2.1166666,2.1166666 0 0 0 -2.116667,2.116667 2.1166666,2.1166666 0 0 0 2.116667,2.116665 2.1166666,2.1166666 0 0 0 2.116666,-2.116665 2.1166666,2.1166666 0 0 0 -2.116666,-2.116667 z m -0.02479,0.264583 a 1.8520806,1.8520806 0 0 1 0.02479,0 1.8520806,1.8520806 0 0 1 1.852082,1.852084 1.8520806,1.8520806 0 0 1 -1.852082,1.852083 1.8520806,1.8520806 0 0 1 -1.852084,-1.852083 1.8520806,1.8520806 0 0 1 1.827279,-1.852084 z" />
+      <path
+         id="path850"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#Main-6);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108333,60.854161 a 1.5875,1.5875 0 0 0 -1.5875,1.5875 1.5875,1.5875 0 0 0 1.5875,1.587499 1.5875,1.5875 0 0 0 1.587499,-1.587499 1.5875,1.5875 0 0 0 -1.587499,-1.5875 z m 5.29e-4,0.264583 a 1.3235013,1.3229139 0 0 1 1.323435,1.322917 1.3235013,1.3229139 0 0 1 -1.323435,1.322916 1.3235013,1.3229139 0 0 1 -1.323433,-1.322916 1.3235013,1.3229139 0 0 1 1.323433,-1.322917 z" />
+      <path
+         id="path860"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.094895,60.325002 a 0.79375,0.79375 0 0 0 -0.780315,0.79375 0.79375,0.79375 0 0 0 0.79375,0.79375 0.79375,0.79375 0 0 0 0.793749,-0.79375 0.79375,0.79375 0 0 0 -0.793749,-0.79375 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.29e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529166 0.52916664,0.52916664 0 0 1 -0.529166,0.529167 0.52916664,0.52916664 0 0 1 -0.529167,-0.529167 0.52916664,0.52916664 0 0 1 0.516247,-0.529166 z"
+         mask="none" />
+      <path
+         id="path867"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#Main-6);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 19.036561,62.441668 a 0.79375,0.79375 0 0 0 -0.780315,0.793749 0.79375,0.79375 0 0 0 0.79375,0.79375 0.79375,0.79375 0 0 0 0.79375,-0.79375 0.79375,0.79375 0 0 0 -0.79375,-0.793749 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.29e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529165 A 0.52916664,0.52916664 0 0 1 19.05,63.764584 0.52916664,0.52916664 0 0 1 18.520833,63.235417 0.52916664,0.52916664 0 0 1 19.03708,62.706252 Z" />
+      <path
+         id="path869"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 21.153232,62.441668 a 0.79375,0.79375 0 0 0 -0.780314,0.793749 0.79375,0.79375 0 0 0 0.793749,0.79375 0.79375,0.79375 0 0 0 0.79375,-0.79375 0.79375,0.79375 0 0 0 -0.79375,-0.793749 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.3e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529165 0.52916664,0.52916664 0 0 1 -0.529166,0.529167 0.52916664,0.52916664 0 0 1 -0.529167,-0.529167 0.52916664,0.52916664 0 0 1 0.516247,-0.529165 z" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/clothing.png b/files/opencs/clothing.png
deleted file mode 100644
index e42988e749..0000000000
Binary files a/files/opencs/clothing.png and /dev/null differ
diff --git a/files/opencs/clothing.svg b/files/opencs/clothing.svg
new file mode 100644
index 0000000000..9b1ffb54b3
--- /dev/null
+++ b/files/opencs/clothing.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2356"
+       x1="24.077084"
+       y1="15.345833"
+       x2="26.722918"
+       y2="15.345833"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2358"
+       x1="23.283335"
+       y1="14.022916"
+       x2="27.516666"
+       y2="14.022916"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2360"
+       x1="24.606251"
+       y1="13.49375"
+       x2="26.19375"
+       y2="13.49375"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="clothing"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-88.000008,-48.000002)">
+    <path
+       id="rect923"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2356);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 24.077084,14.022917 v 2.645833 h 2.645833 V 14.022917 H 26.458334 V 15.875 h -2.116667 v -1.852083 z m 0.264583,2.116666 h 2.116667 v 0.264584 h -2.116667 z" />
+    <path
+       id="rect939"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2358);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 24.232113,12.964583 -0.948779,0.94878 V 14.2875 l 0.79375,0.79375 0.187068,-0.187069 -0.716235,-0.716235 v -0.155029 l 0.79375,-0.79375 h 2.116667 l 0.79375,0.79375 v 0.155029 l -0.716235,0.716235 0.187068,0.187069 0.79375,-0.79375 v -0.374137 l -0.948779,-0.94878 z" />
+    <path
+       id="rect941"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2360);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 24.606251,13.229167 c 0,0.293158 0.236008,0.529166 0.529166,0.529166 h 0.529167 c 0.293159,0 0.529167,-0.236008 0.529167,-0.529166 -0.264584,0 -0.264584,0 -0.264584,0 0,0.14658 -0.118004,0.264583 -0.264583,0.264583 h -0.529167 c -0.146579,0 -0.264583,-0.118003 -0.264583,-0.264583 z" />
+  </g>
+</svg>
diff --git a/files/opencs/configure.svg b/files/opencs/configure.svg
new file mode 100644
index 0000000000..91a5efca5c
--- /dev/null
+++ b/files/opencs/configure.svg
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+
+<svg
+   version="1.0"
+   id="Livello_1"
+   width="128"
+   height="128.00018"
+   viewBox="0 0 119.999 120.061"
+   overflow="visible"
+   enable-background="new 0 0 119.999 120.061"
+   xml:space="preserve"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:ns="http://ns.adobe.com/SaveForWeb/1.0/"><defs
+     id="defs127"><linearGradient
+       id="linearGradient3291"><stop
+         style="stop-color:black;stop-opacity:1"
+         offset="0"
+         id="stop3293" /><stop
+         style="stop-color:black;stop-opacity:0"
+         offset="1"
+         id="stop3295" /></linearGradient><radialGradient
+       xlink:href="#linearGradient3291"
+       id="radialGradient3336"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.197802,0,92.82166)"
+       cx="63.912209"
+       cy="115.70919"
+       fx="33.953373"
+       fy="115.70919"
+       r="63.912209" /><linearGradient
+       xlink:href="#XMLID_11_"
+       id="linearGradient9291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1250507,0.1245433,0.1244801,1.1244802,-2.8257128,-11.708873)"
+       x1="41.188999"
+       y1="80.101601"
+       x2="27.6451"
+       y2="66.557701" /><linearGradient
+       id="linearGradient6141"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6143" /><stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6145" /></linearGradient><linearGradient
+       gradientTransform="translate(-3.0255781e-2,3.056501e-4)"
+       id="linearGradient5166"
+       gradientUnits="userSpaceOnUse"
+       x1="77.542931"
+       y1="41.868668"
+       x2="88.108376"
+       y2="31.303225"><stop
+         offset="0"
+         style="stop-color:#323232;stop-opacity:1;"
+         id="stop5168" /><stop
+         offset="0.75739998"
+         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop5170" /></linearGradient><linearGradient
+       y2="31.303225"
+       x2="88.108376"
+       y1="41.868668"
+       x1="77.542931"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_16_"
+       gradientTransform="translate(-3.0255781e-2,3.056501e-4)"><stop
+         id="stop92"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0" /><stop
+         id="stop106"
+         style="stop-color:#ffffff;stop-opacity:0.01898734;"
+         offset="0.75739998" /></linearGradient><linearGradient
+       xlink:href="#XMLID_18_"
+       id="linearGradient3295"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="-6.165"
+       y1="112.5049"
+       x2="11.0181"
+       y2="112.5049" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient3298"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0002442,-2.5378062e-4,-2.5378062e-4,1.0002442,8.6347844,-24.632129)"
+       x1="38.757801"
+       y1="7.4277"
+       x2="63.923302"
+       y2="7.4277" /><linearGradient
+       xlink:href="#XMLID_16_"
+       id="linearGradient3301"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.896055,39.032512)"
+       x1="76.281174"
+       y1="43.060352"
+       x2="86.611"
+       y2="31.303225" /><linearGradient
+       xlink:href="#XMLID_15_"
+       id="linearGradient3304"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.895791,39.125846)"
+       x1="76.919403"
+       y1="43.1436"
+       x2="100.6411"
+       y2="19.4214" /><linearGradient
+       xlink:href="#XMLID_14_"
+       id="linearGradient3307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="67.880402"
+       y1="6.4331002"
+       x2="105.3924"
+       y2="43.945599" /><linearGradient
+       xlink:href="#XMLID_13_"
+       id="linearGradient3310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.7074656,0.7074656,-0.7071068,-0.7071068,101.2385,185.78751)"
+       x1="-0.47799999"
+       y1="105.0586"
+       x2="6.3157001"
+       y2="111.8523" /><linearGradient
+       xlink:href="#XMLID_12_"
+       id="linearGradient3313"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.7074656,0.7074656,-0.7071068,-0.7071068,107.38512,183.20132)"
+       x1="1.3501"
+       y1="103.2324"
+       x2="8.1437998"
+       y2="110.0261" /><linearGradient
+       id="XMLID_10_"
+       gradientUnits="userSpaceOnUse"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702"
+       gradientTransform="matrix(0.7074589,0.7071,-0.7074589,0.7071,68.76314,-21.373694)"><stop
+         offset="0.0533"
+         style="stop-color:#555555"
+         id="stop10" /><stop
+         offset="0.21113414"
+         style="stop-color:#BBBBBB"
+         id="stop12" /><stop
+         offset="0.36265489"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop14" /><stop
+         offset="0.60322773"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop16" /><stop
+         offset="0.84976584"
+         style="stop-color:#e9e9e9;stop-opacity:1;"
+         id="stop18" /><stop
+         offset="1"
+         style="stop-color:#555555"
+         id="stop20" /></linearGradient><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5628683,-3.9649986e-4,-3.9652886e-4,1.562754,-20.23462,-103.35726)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0663866,2.7056218e-4,-2.7056218e-4,-1.0663866,9.2387294,154.26114)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10203"
+       x1="56.03125"
+       y1="121.5"
+       x2="72.031251"
+       y2="121.5"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10205"
+       x1="56.03125"
+       y1="110.5"
+       x2="72.031251"
+       y2="110.5"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0663866,2.7056218e-4,-2.7056218e-4,-1.0663866,9.2387294,154.26114)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10221"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="110.5"
+       x2="72.031251"
+       y2="110.5" /><linearGradient
+       xlink:href="#XMLID_14_"
+       id="linearGradient10223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="67.880402"
+       y1="6.4331002"
+       x2="105.3924"
+       y2="43.945599" /><linearGradient
+       xlink:href="#XMLID_15_"
+       id="linearGradient10225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.895791,39.125846)"
+       x1="76.919403"
+       y1="43.1436"
+       x2="100.6411"
+       y2="19.4214" /><linearGradient
+       xlink:href="#XMLID_16_"
+       id="linearGradient10227"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.895791,39.125846)"
+       x1="76.281174"
+       y1="43.060352"
+       x2="86.611"
+       y2="31.303225" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0002442,-2.5378062e-4,-2.5378062e-4,1.0002442,8.6347844,-24.632129)"
+       x1="38.757801"
+       y1="7.4277"
+       x2="63.923302"
+       y2="7.4277" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10231"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="121.5"
+       x2="72.031251"
+       y2="121.5" /><linearGradient
+       xlink:href="#XMLID_18_"
+       id="linearGradient10233"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="-6.165"
+       y1="112.5049"
+       x2="11.0181"
+       y2="112.5049" /><linearGradient
+       xlink:href="#XMLID_18_"
+       id="linearGradient10236"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,6.1427973,2.5178157)"
+       x1="-6.165"
+       y1="112.5049"
+       x2="11.0181"
+       y2="112.5049" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10239"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="121.5"
+       x2="72.031251"
+       y2="121.5"
+       gradientTransform="matrix(0.6632486,0.6632486,-0.6632486,0.6632486,45.21604,-10.083813)" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074589,0.7071,-0.7074589,0.7071,68.761161,-21.373784)"
+       x1="38.757801"
+       y1="7.4277"
+       x2="63.923302"
+       y2="7.4277" /><linearGradient
+       xlink:href="#XMLID_16_"
+       id="linearGradient10245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,-3.223487e-2,2.1565487e-4)"
+       x1="76.281174"
+       y1="43.060352"
+       x2="86.611"
+       y2="31.303225" /><linearGradient
+       xlink:href="#XMLID_15_"
+       id="linearGradient10248"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,-3.223487e-2,2.1565487e-4)"
+       x1="76.919403"
+       y1="43.1436"
+       x2="100.6411"
+       y2="19.4214" /><linearGradient
+       xlink:href="#XMLID_14_"
+       id="linearGradient10251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,6.1427973,2.5178157)"
+       x1="67.880402"
+       y1="6.4331002"
+       x2="105.3924"
+       y2="43.945599" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10254"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="110.5"
+       x2="72.031251"
+       y2="110.5"
+       gradientTransform="matrix(0.6632486,0.6632486,-0.6632486,0.6632486,45.21604,-10.083813)" /><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7071,0.7074589,0.7071,-0.7074589,-50.969871,98.357246)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074589,0.7071,-0.7074589,0.7071,68.761161,-21.373784)"
+       x1="51.339096"
+       y1="30.159527"
+       x2="51.326984"
+       y2="-17.582758" /><linearGradient
+       xlink:href="#linearGradient6141"
+       id="linearGradient6147"
+       x1="7.2493796"
+       y1="120.2508"
+       x2="57.625931"
+       y2="69.874252"
+       gradientUnits="userSpaceOnUse" /></defs><metadata
+     id="metadata3"><ns:sfw><ns:slices /><ns:sliceSourceBounds
+         y="3.97"
+         x="4"
+         height="120.061"
+         width="119.999"
+         bottomLeftOrigin="true" /></ns:sfw><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><linearGradient
+     id="XMLID_11_"
+     gradientUnits="userSpaceOnUse"
+     x1="41.188999"
+     y1="80.101601"
+     x2="27.6451"
+     y2="66.557701"
+     gradientTransform="translate(8.7075442,3.5814057)"><stop
+       offset="0.40830001"
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       id="stop25" /><stop
+       offset="0.50628459"
+       style="stop-color:#C3C3C3"
+       id="stop27" /><stop
+       offset="0.56008232"
+       style="stop-color:#8b8b8b;stop-opacity:1;"
+       id="stop29" /><stop
+       id="stop12212"
+       style="stop-color:#393939;stop-opacity:1;"
+       offset="0.67944592" /></linearGradient><linearGradient
+     id="XMLID_12_"
+     gradientUnits="userSpaceOnUse"
+     x1="1.3501"
+     y1="103.2324"
+     x2="8.1437998"
+     y2="110.0261"
+     gradientTransform="matrix(-1,0,0,-1,18.150444,221.94371)"><stop
+       offset="0"
+       style="stop-color:#EEEEEE"
+       id="stop36" /><stop
+       offset="1"
+       style="stop-color:#BBBBBB"
+       id="stop38" /></linearGradient><linearGradient
+     id="XMLID_13_"
+     gradientUnits="userSpaceOnUse"
+     x1="-0.47799999"
+     y1="105.0586"
+     x2="6.3157001"
+     y2="111.8523"
+     gradientTransform="matrix(-1,0,0,-1,11.978544,219.42611)"><stop
+       offset="0"
+       style="stop-color:#BBBBBB"
+       id="stop43" /><stop
+       offset="1"
+       style="stop-color:#555555"
+       id="stop45" /></linearGradient><linearGradient
+     id="XMLID_14_"
+     gradientUnits="userSpaceOnUse"
+     x1="67.880402"
+     y1="6.4331002"
+     x2="105.3924"
+     y2="43.945599"
+     gradientTransform="translate(6.1416442,2.5179057)"><stop
+       offset="0.0947"
+       style="stop-color:#666666;stop-opacity:1;"
+       id="stop50" /><stop
+       id="stop3330"
+       style="stop-color:#b7b7b7;stop-opacity:1;"
+       offset="0.40963161" /><stop
+       offset="0.50530702"
+       style="stop-color:#ffffff;stop-opacity:1;"
+       id="stop56" /><stop
+       id="stop3328"
+       style="stop-color:#a3a3a3;stop-opacity:1;"
+       offset="0.63043118" /><stop
+       offset="0.93489999"
+       style="stop-color:#646464;stop-opacity:1;"
+       id="stop62" /></linearGradient><linearGradient
+     id="XMLID_15_"
+     gradientUnits="userSpaceOnUse"
+     x1="76.919403"
+     y1="43.1436"
+     x2="100.6411"
+     y2="19.4214"
+     gradientTransform="translate(-3.0255781e-2,3.056501e-4)"><stop
+       offset="0"
+       style="stop-color:#aeaeae;stop-opacity:1;"
+       id="stop67" /><stop
+       offset="0.0602"
+       style="stop-color:#b2b2b2;stop-opacity:1;"
+       id="stop69" /><stop
+       offset="0.18103883"
+       style="stop-color:#d9d9d9;stop-opacity:1;"
+       id="stop71" /><stop
+       offset="0.3195"
+       style="stop-color:#ffffff;stop-opacity:1;"
+       id="stop73" /><stop
+       offset="0.43529999"
+       style="stop-color:#f4f4f4;stop-opacity:1;"
+       id="stop75" /><stop
+       offset="0.6028"
+       style="stop-color:#D4D4D4"
+       id="stop77" /><stop
+       offset="0.7633"
+       style="stop-color:#BBBBBB"
+       id="stop79" /><stop
+       offset="0.80790001"
+       style="stop-color:#b9bcc1;stop-opacity:1;"
+       id="stop81" /><stop
+       offset="0.92970002"
+       style="stop-color:#bdc0c3;stop-opacity:1;"
+       id="stop83" /><stop
+       offset="1"
+       style="stop-color:#b5b9bb;stop-opacity:1;"
+       id="stop85" /></linearGradient><linearGradient
+     id="XMLID_17_"
+     gradientUnits="userSpaceOnUse"
+     x1="38.757801"
+     y1="7.4277"
+     x2="63.923302"
+     y2="7.4277"
+     gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,68.728244,-21.373694)"><stop
+       offset="0"
+       style="stop-color:#3a3a3a;stop-opacity:1;"
+       id="stop111" /><stop
+       offset="0.60194176"
+       style="stop-color:#ffffff;stop-opacity:1;"
+       id="stop113" /><stop
+       offset="1"
+       style="stop-color:#888888"
+       id="stop115" /></linearGradient><linearGradient
+     id="XMLID_18_"
+     gradientUnits="userSpaceOnUse"
+     x1="-6.165"
+     y1="112.5049"
+     x2="11.0181"
+     y2="112.5049"
+     gradientTransform="translate(6.1416442,2.5179057)"><stop
+       offset="0"
+       style="stop-color:#BBBBBB"
+       id="stop120" /><stop
+       offset="1"
+       style="stop-color:#000000"
+       id="stop122" /></linearGradient><path
+     style="fill:url(#linearGradient10257)"
+     d="M 76.409451,31.804481 C 75.443086,30.924606 74.357677,30.748097 72.740857,32.364097 L 2.6023174,103.87059 C 2.5703077,103.90258 2.569153,103.93922 2.5401379,103.97422 C -0.95363288,107.73022 -0.88972357,113.60492 2.7681296,117.25992 C 6.4259848,120.91592 12.29792,120.98291 16.053828,117.48791 C 16.088848,117.45991 16.126446,117.45673 16.157461,117.42573 L 87.72613,47.307917 C 90.960771,44.076918 86.953486,42.972159 84.679332,40.696158 L 79.373343,35.390169 C 78.234266,34.251669 77.375816,32.684356 76.409451,31.804481 z M 16.053828,104.01567 C 18.984982,106.94689 18.986335,111.69819 16.053828,114.62765 C 13.124457,117.55553 8.3745634,117.55731 5.4418505,114.62765 C 2.5091357,111.69799 2.5109065,106.94669 5.4418505,104.01567 C 8.3727812,101.08623 13.121121,101.086 16.053828,104.01567 z "
+     id="path10166" /><path
+     style="fill:url(#linearGradient10254)"
+     d="M 17.380325,102.68918 C 14.447618,99.759506 9.6992784,99.759734 6.7683477,102.68918 C 6.5428061,102.91472 6.3373933,103.14849 6.1465522,103.39388 C 9.0905761,101.11028 13.348454,101.3131 16.053828,104.01567 C 18.759425,106.72134 18.965866,110.98021 16.675624,113.92295 C 16.920967,113.73233 17.15491,113.52645 17.380325,113.30115 C 20.312833,110.3717 20.31148,105.6204 17.380325,102.68918 z "
+     id="path10186" /><path
+     d="M 118.731,16.620217 L 103.19512,32.150217 C 99.80841,35.534217 93.549236,33.235217 90.160517,29.850217 C 86.776801,26.465216 84.475632,20.211217 87.86035,16.825217 L 103.40023,1.2962158 C 92.523716,-2.8617843 79.067889,3.9452161 74.82974,8.1812158 C 63.636062,19.367217 62.837657,34.722217 74.065352,45.942217 C 85.286043,57.160217 100.64883,56.490217 111.84151,45.303218 C 116.07966,41.066217 122.89111,27.489217 118.731,16.620217 z "
+     id="path64"
+     style="fill:url(#linearGradient10251)" /><path
+     d="M 77.659175,11.009216 C 72.74068,15.925216 70.031306,21.867217 70.031306,27.741217 L 70.030305,27.742217 C 70.031306,33.311217 72.404509,38.626217 76.894787,43.113217 C 81.422083,47.639217 86.7778,50.031218 92.381644,50.031217 L 92.381644,50.031217 C 98.22961,50.031218 104.1346,47.348218 109.01107,42.474217 C 111.8225,39.664217 115.5714,32.245217 115.93458,25.071217 C 111.35626,29.647217 106.02356,34.977217 106.02356,34.977217 C 100.96199,40.037217 92.379643,37.724217 87.331082,32.680217 C 84.259524,29.607217 82.198478,25.228217 82.198477,21.129217 C 82.199478,18.494217 83.050911,15.977216 85.028913,13.997217 C 85.029914,13.996217 90.524701,8.5042158 94.982962,4.049216 C 87.471153,4.3972165 80.050388,8.6212158 77.659175,11.009216 z "
+     id="path87"
+     style="fill:url(#linearGradient10248);fill-opacity:1.0" /><path
+     d="M 85.387095,16.818216 C 81.792271,20.411216 84.661727,27.477217 88.592721,31.406217 C 92.527718,35.337217 99.594302,38.205217 103.19012,34.613217 C 103.19012,34.613217 118.96412,17.234216 118.73,16.620217 L 103.19412,32.150217 C 99.80741,35.534218 93.548235,33.235217 90.159515,29.850217 C 86.775799,26.465216 84.474633,20.211217 87.85935,16.825217 L 103.39923,1.2962158 L 85.387095,16.818216 z "
+     id="path117"
+     style="fill:url(#linearGradient10260)" /><path
+     style="fill:url(#linearGradient10239)"
+     d="M 4.820055,104.72037 C 4.5726725,104.91226 4.3425471,105.11509 4.1153533,105.34217 C 1.1844093,108.27319 1.1826385,113.02448 4.1153533,115.95415 C 7.0480662,118.88381 11.79796,118.88203 14.727331,115.95415 C 14.952993,115.72872 15.158195,115.49477 15.349126,115.24945 C 12.406133,117.53606 8.148893,117.33187 5.4418505,114.62765 C 2.734806,111.92343 2.5308464,107.66392 4.820055,104.72037 z "
+     id="path10190" /><path
+     d="M 2.7691837,116.26123 C 1.0242958,114.51723 0.10383016,112.26923 -0.011225313,109.98622 C -0.15229878,112.60123 0.76716563,115.26323 2.7691816,117.26123 C 6.4270358,120.91723 12.302016,120.99023 16.057925,117.49522 C 16.092943,117.46722 16.134962,117.44623 16.165977,117.41523 L 17.166488,116.41622 C 13.410582,119.90922 6.427038,119.91723 2.7691837,116.26123 z "
+     id="path124"
+     style="fill:url(#linearGradient10236)" /><path
+     style="fill:url(#linearGradient6147);fill-opacity:1.0;fill-rule:nonzero;opacity:0.5"
+     d="M 43.21875 69.5625 L 2.8125 110.75 C 2.7783735 110.78411 2.7809338 110.80644 2.75 110.84375 C -0.97480066 114.84812 -0.93098327 121.10331 2.96875 125 C 6.8684854 128.89776 13.151978 128.97611 17.15625 125.25 C 17.193586 125.22015 17.216934 125.22055 17.25 125.1875 L 57.3125 85.9375 C 53.66929 79.550692 48.861858 73.979783 43.21875 69.5625 z M 11.5 108.5625 C 13.547005 108.56247 15.592932 109.34455 17.15625 110.90625 C 20.281231 114.0313 20.282673 119.09558 17.15625 122.21875 C 14.033171 125.34024 8.9703922 125.34214 5.84375 122.21875 C 2.7171056 119.09537 2.7189937 114.03109 5.84375 110.90625 C 7.406121 109.34467 9.4529953 108.56253 11.5 108.5625 z "
+     id="path2236"
+     transform="matrix(0.9379752,0,0,0.9379752,-3.0914126e-2,0)" /><path
+     d="M 15.537923,96.062539 C 14.713663,96.978699 14.388162,98.22441 14.530816,99.52305 C 14.682682,100.89492 15.361817,102.33182 16.533505,103.50003 C 18.808146,105.77775 22.084895,106.19602 23.991153,104.45332 C 24.002148,104.47231 67.492075,61.01118 77.726913,50.782827 C 77.294045,50.416137 69.737251,42.875414 69.288707,42.347047 C 66.356033,45.277862 15.537923,96.062539 15.537923,96.062539 z "
+     id="path33"
+     style="fill:url(#linearGradient9291);opacity:0.5" /><path
+     style="fill:url(#linearGradient3301)"
+     id="path108"
+     d="M 94.304331,48.937972 C 88.699488,48.937972 83.344772,46.545972 78.817475,42.019972 C 74.327198,37.532972 71.953994,32.217972 71.952993,26.648972 L 71.953994,26.647972 C 71.953994,20.773972 74.663368,14.831973 79.581863,9.9159745 C 80.407282,9.0909731 81.84201,8.0489732 83.661933,7.0219732 C 80.923544,8.3389732 78.759446,9.8199731 77.661889,10.915974 C 72.743394,15.831973 70.034021,21.773972 70.034021,27.647972 L 70.033021,27.648972 C 70.034021,33.217972 72.407224,38.532972 76.897502,43.019972 C 81.424798,47.545972 86.780515,49.937972 92.384357,49.937972 C 96.062223,49.937972 99.7631,48.874972 103.21585,46.874972 C 100.32739,48.224972 97.308855,48.937972 94.304331,48.937972 z " /></svg>
diff --git a/files/opencs/container.png b/files/opencs/container.png
deleted file mode 100644
index 336a05dbfe..0000000000
Binary files a/files/opencs/container.png and /dev/null differ
diff --git a/files/opencs/container.svg b/files/opencs/container.svg
new file mode 100644
index 0000000000..91b417e9e3
--- /dev/null
+++ b/files/opencs/container.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2362"
+       x1="29.094776"
+       y1="14.816666"
+       x2="32.288559"
+       y2="14.816666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2364"
+       x1="30.030209"
+       y1="13.361459"
+       x2="31.353125"
+       y2="13.361459"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="container"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-108.00001,-48.000002)">
+    <path
+       id="path984"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2362);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 29.633334,12.7 v 0.264583 c 0,0.426244 0.264583,0.08279 0.264583,0.529167 -0.715613,0.463044 -1.37628,1.653273 0,3.439583 h 1.5875 c 1.376281,-1.78631 0.715614,-2.976539 0,-3.439583 0,-0.446376 0.264584,-0.102923 0.264584,-0.529167 V 12.7 Z m 0.264583,0.264583 h 1.5875 c -0.07834,0.100665 -0.264583,0.264582 -0.264583,0.79375 0.718095,0.381372 1.301385,1.237143 0.14056,2.910417 h -1.339453 c -1.160825,-1.673274 -0.577535,-2.529045 0.14056,-2.910417 0,-0.529168 -0.186243,-0.693085 -0.264584,-0.79375 z" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2364);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1003"
+       width="1.3229167"
+       height="0.26458335"
+       x="30.030209"
+       y="13.229167"
+       rx="3.6718346e-17" />
+  </g>
+</svg>
diff --git a/files/opencs/creature.png b/files/opencs/creature.png
deleted file mode 100644
index 003684dca0..0000000000
Binary files a/files/opencs/creature.png and /dev/null differ
diff --git a/files/opencs/creature.svg b/files/opencs/creature.svg
new file mode 100644
index 0000000000..e7fe8cf5a3
--- /dev/null
+++ b/files/opencs/creature.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2366"
+       x1="33.866665"
+       y1="15.339633"
+       x2="38.099998"
+       y2="15.339633"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2368"
+       x1="34.131252"
+       y1="15.742709"
+       x2="37.835419"
+       y2="15.742709"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2370"
+       x1="35.454166"
+       y1="14.948958"
+       x2="35.71875"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2372"
+       x1="36.247917"
+       y1="14.948958"
+       x2="36.512501"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2374"
+       x1="35.58646"
+       y1="13.626042"
+       x2="36.380211"
+       y2="13.626042"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2376"
+       x1="34.660416"
+       y1="13.758335"
+       x2="35.189579"
+       y2="13.758335"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2378"
+       x1="36.777081"
+       y1="13.758334"
+       x2="37.306248"
+       y2="13.758334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2380"
+       x1="34.131248"
+       y1="13.75832"
+       x2="35.718746"
+       y2="13.75832"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2382"
+       x1="36.247913"
+       y1="13.75832"
+       x2="37.835415"
+       y2="13.75832"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="creature"
+     style="display:inline"
+     transform="matrix(3.7795202,0,0,3.7795278,-127.99974,-48.000002)">
+    <path
+       id="path1055"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2366);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 34.337953,14.010515 c -0.468809,0.463228 -0.471289,1.108824 -0.471289,1.518254 0,0.612415 0.731447,1.139982 1.5875,1.139982 h 1.058333 c 0.856053,0 1.5875,-0.527567 1.5875,-1.139982 0,-0.40943 -0.0025,-1.055026 -0.471289,-1.518254 l -0.202572,0.209806 c 0.357187,0.264171 0.409277,0.911565 0.409277,1.308448 0,0.47278 -0.688493,0.875398 -1.322916,0.875398 h -1.058333 c -0.634424,0 -1.322917,-0.402618 -1.322917,-0.875398 0,-0.396883 0.05209,-1.044277 0.409277,-1.308448 z" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2368);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1057"
+       width="3.7041667"
+       height="0.26458335"
+       x="34.131252"
+       y="15.610417"
+       rx="3.6718346e-17" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2370);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1059"
+       width="0.26458335"
+       height="0.26458335"
+       x="35.454166"
+       y="14.816667"
+       rx="3.6718346e-17" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2372);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1061"
+       width="0.26458335"
+       height="0.26458335"
+       x="36.247917"
+       y="14.816667"
+       rx="3.6718346e-17" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2374);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1063"
+       width="0.79375005"
+       height="0.26458335"
+       x="35.58646"
+       y="13.493751"
+       rx="3.6718346e-17" />
+    <path
+       id="rect1065"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2376);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 34.924997,13.493752 h 0.264583 v 0 0.529166 0 h -0.529166 v 0 0 -0.264584 c 0,-0.264583 0.264583,-0.264582 0.264583,-0.264582 z" />
+    <path
+       id="path1068"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2378);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 37.041663,13.493751 h 0.264584 v 0 0.529166 0 H 36.77708 v 0 0 -0.264584 c 0,-0.264583 0.264583,-0.264582 0.264583,-0.264582 z" />
+    <path
+       id="path1070"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2380);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 34.911561,12.964584 a 0.79375005,0.79375005 0 0 0 -0.780314,0.79375 0.79375005,0.79375005 0 0 0 0.79375,0.79375 0.79375005,0.79375005 0 0 0 0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.01344,0 z m 5.16e-4,0.264583 a 0.52916671,0.52916671 0 0 1 0.01292,0 0.52916671,0.52916671 0 0 1 0.529167,0.529167 0.52916671,0.52916671 0 0 1 -0.529167,0.529167 0.52916671,0.52916671 0 0 1 -0.529167,-0.529167 0.52916671,0.52916671 0 0 1 0.516247,-0.529167 z" />
+    <path
+       id="path1077"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2382);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 37.028227,12.964584 a 0.79375005,0.79375005 0 0 0 -0.780313,0.79375 0.79375005,0.79375005 0 0 0 0.793749,0.79375 0.79375005,0.79375005 0 0 0 0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.01344,0 z m 5.16e-4,0.264584 a 0.52916671,0.52916671 0 0 1 0.01292,0 0.52916671,0.52916671 0 0 1 0.529167,0.529166 0.52916671,0.52916671 0 0 1 -0.529167,0.529167 0.52916671,0.52916671 0 0 1 -0.529166,-0.529167 0.52916671,0.52916671 0 0 1 0.516246,-0.529166 z" />
+  </g>
+</svg>
diff --git a/files/opencs/debug-profile.png b/files/opencs/debug-profile.png
deleted file mode 100644
index ddb01da437..0000000000
Binary files a/files/opencs/debug-profile.png and /dev/null differ
diff --git a/files/opencs/debug-profile.svg b/files/opencs/debug-profile.svg
new file mode 100644
index 0000000000..28be0e4a16
--- /dev/null
+++ b/files/opencs/debug-profile.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient5"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="debug-profile"
+     transform="matrix(3.7795278,0,0,3.7794065,-207.99997,-207.99282)"
+     style="display:inline">
+    <path
+       id="path1761"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 209,202 a 2.9999865,1.9999999 0 0 0 -3,2 2.9999865,1.9999999 0 0 0 0.40234,1 H 209 a 1.9999864,0.99999996 0 0 1 -2,-1 1.9999864,0.99999996 0 0 1 1.93555,-1 1.9999864,0.99999996 0 0 1 0.0644,0 1.9999864,0.99999996 0 0 1 2,1 1.9999864,0.99999996 0 0 1 -1.93555,1 h 2.53321 A 2.9999865,1.9999999 0 0 0 212,204 a 2.9999865,1.9999999 0 0 0 -3,-2 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path1879"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 202.49805,201.50195 a 0.49999938,0.49999938 0 0 0 -0.49414,0.50196 v 1.99218 l 0.0801,0.28125 1.99024,2.97657 C 204.0283,207.50738 204,207.758 204,208 v 0.17383 l -1.70117,0.76172 -0.27344,0.29492 -0.99609,3.00391 a 0.49999938,0.49999938 0 0 0 0.31054,0.62695 0.49999938,0.49999938 0 0 0 0.63477,-0.3086 L 202.9043,209.75391 204,209.26953 V 209.5 c 0,0.81387 0.17708,1.73329 0.46094,2.64844 l -1.24024,0.82422 -0.2207,0.42187 v 2.99609 a 0.49999938,0.49999938 0 0 0 0.50195,0.50196 0.49999938,0.49999938 0 0 0 0.49414,-0.50196 v -2.73046 l 0.80274,-0.53516 c 0.15327,0.37806 0.32336,0.7488 0.50976,1.10156 0.39322,0.74413 0.85277,1.40937 1.37696,1.91211 C 207.20974,216.64142 207.81856,217 208.5,217 h 1 c 0.68144,0 1.29026,-0.35858 1.81445,-0.86133 0.52419,-0.50274 0.98374,-1.16798 1.37696,-1.91211 0.1864,-0.35276 0.35649,-0.7235 0.50976,-1.10156 l 0.79688,0.53516 v 2.73046 a 0.49999938,0.49999938 0 0 0 0.50195,0.50196 0.49999938,0.49999938 0 0 0 0.50391,-0.50196 v -2.99609 l -0.23047,-0.42187 -1.23633,-0.82227 C 213.82142,211.23447 214,210.31456 214,209.5 v -0.23242 l 1.09961,0.48633 0.92969,2.79882 a 0.49999938,0.49999938 0 0 0 0.62695,0.3086 0.49999938,0.49999938 0 0 0 0.31836,-0.62695 l -0.99805,-3.00391 -0.27148,-0.29492 L 214,208.17383 V 208 c 0,-0.24011 -0.0271,-0.48879 -0.0723,-0.74023 l 1.99024,-2.98243 0.082,-0.28125 v -1.99218 a 0.49999938,0.49999938 0 0 0 -0.50195,-0.50196 0.49999938,0.49999938 0 0 0 -0.49414,0.50196 v 1.8457 l -1.48047,2.21484 c -0.12453,-0.24081 -0.26999,-0.47429 -0.44922,-0.69336 C 212.42603,204.57887 211.38333,204 210,204 h -2 c -1.38333,0 -2.42603,0.57887 -3.07422,1.37109 -0.17826,0.21788 -0.32313,0.45004 -0.44726,0.68946 L 203,203.84961 v -1.8457 a 0.49999938,0.49999938 0 0 0 -0.50195,-0.50196 z M 208,205 h 2 c 1.11667,0 1.82397,0.42113 2.30078,1.00391 C 212.7776,206.58668 213,207.36111 213,208 v 1.5 c 0,1.19673 -0.47784,2.90744 -1.19141,4.25781 -0.35678,0.67519 -0.77223,1.26376 -1.18554,1.66016 C 210.20974,215.81437 209.81856,216 209.5,216 h -1 c -0.31856,0 -0.70974,-0.18563 -1.12305,-0.58203 -0.41331,-0.3964 -0.82876,-0.98497 -1.18554,-1.66016 C 205.47784,212.40744 205,210.69673 205,209.5 V 208 c 0,-0.63889 0.2224,-1.41332 0.69922,-1.99609 C 206.17603,205.42113 206.88333,205 208,205 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 56.488281,55.033203 a 0.1322915,0.1322915 0 0 0 -0.132812,0.132813 v 0.132812 l 0.03906,0.0918 0.265625,0.265625 a 0.1322915,0.1322915 0 0 0 0.185547,0 0.1322915,0.1322915 0 0 0 0,-0.1875 l -0.224609,-0.226562 v -0.07617 a 0.1322915,0.1322915 0 0 0 -0.132813,-0.132813 z"
+       id="path1867" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 57.810547,55.033203 a 0.1322915,0.1322915 0 0 0 -0.130859,0.132813 v 0.07617 l -0.226563,0.226562 a 0.1322915,0.1322915 0 0 0 0,0.1875 0.1322915,0.1322915 0 0 0 0.1875,0 l 0.263672,-0.265625 0.03906,-0.0918 v -0.132812 a 0.1322915,0.1322915 0 0 0 -0.132812,-0.132813 z"
+       id="path1871" />
+  </g>
+</svg>
diff --git a/files/opencs/dialogue-greeting.png b/files/opencs/dialogue-greeting.png
deleted file mode 100644
index de6b22b42c..0000000000
Binary files a/files/opencs/dialogue-greeting.png and /dev/null differ
diff --git a/files/opencs/dialogue-info.png b/files/opencs/dialogue-info.png
deleted file mode 100644
index 6242eddf4f..0000000000
Binary files a/files/opencs/dialogue-info.png and /dev/null differ
diff --git a/files/opencs/dialogue-info.svg b/files/opencs/dialogue-info.svg
new file mode 100644
index 0000000000..a0b4f4236e
--- /dev/null
+++ b/files/opencs/dialogue-info.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2244"
+       x1="34.131248"
+       y1="41.142712"
+       x2="37.835415"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2246"
+       x1="35.454163"
+       y1="40.745834"
+       x2="36.512497"
+       y2="40.745834"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="dialogue-info"
+     transform="matrix(3.7795277,0,0,3.7795278,-128.00003,-148.00001)"
+     style="display:inline">
+    <path
+       id="path1189"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2244);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 34.131247,39.158335 v 3.175 h 1.852083 l 0.79375,0.793751 h 0.264583 v -0.793751 h 0.793751 v -3.175 z m 0.264583,0.264584 h 3.175 v 2.645833 h -0.79375 v 0.684197 L 36.092884,42.068752 H 34.39583 Z" />
+    <path
+       id="rect1191"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2246);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 35.851039,39.687502 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.264583 c 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 c 0.07329,0 0.132292,-0.059 0.132292,-0.132292 v -0.264583 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m -0.264583,0.79375 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132291 0.132292,0.132291 h 0.132291 v 0.79375 h -0.132291 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 0.264583 0.264584 c 0.07329,0 0.132291,-0.059 0.132291,-0.132292 0,-0.07329 -0.059,-0.132292 -0.132291,-0.132292 h -0.132292 v -0.926041 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z" />
+  </g>
+</svg>
diff --git a/files/opencs/dialogue-journal.png b/files/opencs/dialogue-journal.png
deleted file mode 100644
index 086cb8a422..0000000000
Binary files a/files/opencs/dialogue-journal.png and /dev/null differ
diff --git a/files/opencs/dialogue-persuasion.png b/files/opencs/dialogue-persuasion.png
deleted file mode 100644
index 3138862c83..0000000000
Binary files a/files/opencs/dialogue-persuasion.png and /dev/null differ
diff --git a/files/opencs/dialogue-regular.png b/files/opencs/dialogue-regular.png
deleted file mode 100644
index 933afc5952..0000000000
Binary files a/files/opencs/dialogue-regular.png and /dev/null differ
diff --git a/files/opencs/dialogue-topic-infos.png b/files/opencs/dialogue-topic-infos.png
deleted file mode 100644
index 6242eddf4f..0000000000
Binary files a/files/opencs/dialogue-topic-infos.png and /dev/null differ
diff --git a/files/opencs/dialogue-topics.png b/files/opencs/dialogue-topics.png
deleted file mode 100644
index caa6d7e7cb..0000000000
Binary files a/files/opencs/dialogue-topics.png and /dev/null differ
diff --git a/files/opencs/dialogue-topics.svg b/files/opencs/dialogue-topics.svg
new file mode 100644
index 0000000000..57dd0b9444
--- /dev/null
+++ b/files/opencs/dialogue-topics.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2240"
+       x1="28.574999"
+       y1="41.275002"
+       x2="32.808331"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2242"
+       x1="29.104164"
+       y1="40.084377"
+       x2="30.956247"
+       y2="40.084377"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="dialogue-info1"
+     transform="matrix(3.7795252,0,0,3.7795252,-107.99993,-147.99991)"
+     style="display:inline">
+    <path
+       id="rect1130"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2240);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 28.574998,39.158335 v 3.175 h 1.852083 l 1.058333,1.058334 h 0.264583 v -1.058334 h 1.058334 v -3.175 z m 0.264583,0.264584 h 3.704166 v 2.645833 h -1.058333 v 0.94878 l -0.948779,-0.94878 h -1.697054 z" />
+    <path
+       id="rect1168"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2242);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 29.236456,39.687502 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.529166 c 0,0.07329 0.059,0.132292 0.132292,0.132292 h 1.5875 c 0.07329,0 0.132292,-0.059 0.132292,-0.132292 v -0.529166 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m 0.132292,0.264583 h 1.322916 v 0.264584 h -1.322916 z" />
+  </g>
+</svg>
diff --git a/files/opencs/dialogue-voice.png b/files/opencs/dialogue-voice.png
deleted file mode 100644
index 1d67745e55..0000000000
Binary files a/files/opencs/dialogue-voice.png and /dev/null differ
diff --git a/files/opencs/door.png b/files/opencs/door.png
deleted file mode 100644
index a1a823ecdc..0000000000
Binary files a/files/opencs/door.png and /dev/null differ
diff --git a/files/opencs/door.svg b/files/opencs/door.svg
new file mode 100644
index 0000000000..846e5efb8e
--- /dev/null
+++ b/files/opencs/door.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2314"
+       x1="39.687496"
+       y1="14.81664"
+       x2="42.862495"
+       y2="14.81664"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="door"
+     style="display:inline"
+     transform="matrix(3.7795277,0,0,3.779504,-148,-47.999599)">
+    <path
+       id="path1081"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2314);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.274996,12.699973 c -0.876752,0 -1.5875,0.710748 -1.5875,1.5875 v 2.645833 h 3.175 v -2.645833 c 0,-0.876752 -0.710747,-1.5875 -1.5875,-1.5875 z m 0,0.264584 c 0.730626,0 1.322917,0.59229 1.322917,1.322916 v 2.38125 H 42.33333 v -2.38125 c 0,-0.584504 -0.473824,-1.058337 -1.058334,-1.058333 -0.584509,1e-6 -1.058333,0.473833 -1.058333,1.058333 v 2.38125 H 39.95208 v -2.38125 c 0,-0.730626 0.592291,-1.322916 1.322916,-1.322916 z m 0,0.529166 c 0.438381,0 0.79375,0.355374 0.79375,0.79375 v 2.38125 h -1.5875 v -2.38125 c 0,-0.438376 0.35537,-0.79375 0.79375,-0.79375 z m 0.264584,1.322917 v 0.529166 h 0.264583 V 14.81664 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/editing-instance.png b/files/opencs/editing-instance.png
deleted file mode 100644
index 7349e8f66d..0000000000
Binary files a/files/opencs/editing-instance.png and /dev/null differ
diff --git a/files/opencs/editing-instance.svg b/files/opencs/editing-instance.svg
new file mode 100644
index 0000000000..92e20fade3
--- /dev/null
+++ b/files/opencs/editing-instance.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(63.499994,-1.8137688)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+  </defs>
+  <g
+     id="editing-instance"
+     style="display:inline"
+     transform="matrix(1.3333335,0,0,1.333334,-0.35277843,-127.35282)">
+    <path
+       id="path2834"
+       style="font-variation-settings:normal;display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 9.9218752,99.880206 v 3.704174 m -3.1750001,1.5875 3.1750005,-1.58756 m -2e-7,-3.704086 -3.1750005,-1.587546 M 3.571875,99.880211 v 3.704179 m 3.1750005,1.58755 -3.1750005,-1.58756 m 0,-3.704169 3.1750005,-1.587546" />
+    <path
+       id="path2840"
+       style="font-variation-settings:normal;display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.2116666;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 6.7468751,101.46771 9.9218756,99.880147 M 6.7468755,101.46777 3.571875,99.880211 m 3.1750001,1.587499 v 3.70417" />
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2566"
+       width="12.699999"
+       height="12.699994"
+       x="0.2645838"
+       y="95.514572" />
+  </g>
+</svg>
diff --git a/files/opencs/editing-pathgrid.png b/files/opencs/editing-pathgrid.png
deleted file mode 100644
index 0ec024cadf..0000000000
Binary files a/files/opencs/editing-pathgrid.png and /dev/null differ
diff --git a/files/opencs/editing-pathgrid.svg b/files/opencs/editing-pathgrid.svg
new file mode 100644
index 0000000000..d9c1774291
--- /dev/null
+++ b/files/opencs/editing-pathgrid.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(63.499994,-1.8137688)">
+      <stop
+         style="stop-color:#303030;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient2616"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(27.516637,49.231736)"
+       x1="23.547918"
+       y1="50.932293"
+       x2="24.870834"
+       y2="50.932293" />
+  </defs>
+  <g
+     id="editing-pathgrid"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-63.852829,-127.35283)">
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 54.239557,99.370405 -1.05833,0.52917 -1.058333,0.529175 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.529175 z"
+       id="use2493" />
+    <path
+       id="use2495"
+       style="font-variation-settings:normal;display:inline;opacity:1.0;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 58.472903,101.48666 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.017414 m -2.116663,0 c 0.88195,0.440974 1.76389,0.576434 2.645843,1.017414 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2616);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 51.990594,98.708823 -0.926041,1.455207 0.926041,1.45521 0.926043,-1.45521 z"
+       id="path2614" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path2614"
+       id="use2327"
+       width="100%"
+       height="100%"
+       transform="translate(4.4979166)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path2614"
+       id="use2329"
+       width="100%"
+       height="100%"
+       transform="translate(2.2489834,2.249249)"
+       style="display:inline" />
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2590"
+       width="12.699998"
+       height="12.699994"
+       x="47.88958"
+       y="95.514572" />
+  </g>
+</svg>
diff --git a/files/opencs/editing-terrain-movement.png b/files/opencs/editing-terrain-movement.png
deleted file mode 100644
index 40777334bd..0000000000
Binary files a/files/opencs/editing-terrain-movement.png and /dev/null differ
diff --git a/files/opencs/editing-terrain-movement.svg b/files/opencs/editing-terrain-movement.svg
new file mode 100644
index 0000000000..2bb945f0c8
--- /dev/null
+++ b/files/opencs/editing-terrain-movement.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="editing-terrain-movement"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-85.019514,-127.35283)">
+    <path
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:#303030;stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 70.114554,99.370405 -1.05833,0.529175 -1.058333,0.52917 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z"
+       id="path3258" />
+    <path
+       style="display:inline;fill:#c83200;fill-opacity:0.80000001;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 68.114183,102.24834 c 0,0 0.361476,-0.38306 0.941906,-0.86675 0.58043,0.0893 0.959585,0.44616 0.959585,0.44616 0,0 -0.652772,0.57134 -0.965312,0.89876 -0.448277,-0.28277 -0.936179,-0.47817 -0.936179,-0.47817 z"
+       id="path3196" />
+    <path
+       style="display:inline;fill:#c83200;fill-opacity:0.80000001;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 70.124376,101.74492 c 0,0 -0.543265,-0.4052 -0.944107,-0.45865 0,0 0.404809,-0.35028 0.925979,-0.44723 0.361714,0.0158 0.927517,0.43853 0.927517,0.43853 0,0 -0.414993,0.0841 -0.909389,0.46735 z"
+       id="path3200" />
+    <path
+       style="display:inline;fill:#c83200;fill-opacity:0.80000001;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 73.092232,100.97224 c 0,0 -0.202039,0.1187 -0.844171,0.18812 -0.387308,-0.25151 -0.821656,-0.44265 -0.821656,-0.44265 0,0 0.340188,-0.0217 0.757489,-0.19935 z"
+       id="path3204" />
+    <path
+       style="display:inline;fill:#c83200;fill-opacity:0.80000001;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 71.087315,102.78603 c 0,0 -0.373717,-0.39637 -0.954147,-0.88006 -0.416092,0.32804 -0.979321,0.88719 -0.979321,0.88719 0,0 0.549556,0.35765 0.958207,0.63547 0.382504,-0.26304 0.975261,-0.6426 0.975261,-0.6426 z"
+       id="path3208" />
+    <path
+       style="display:inline;fill:#c83200;fill-opacity:0.80000001;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.059883,103.57891 c 0,0 -0.376246,-0.20611 -0.874816,-0.71213 -0.468803,0.29021 -0.962774,0.6294 -0.962774,0.6294 0,0 0.516963,0.36509 0.918796,0.54368 z"
+       id="path3210" />
+    <path
+       style="display:inline;fill:#c83200;fill-opacity:0.80000001;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 71.190036,101.23622 c 0,0 0.349276,-0.0694 0.818076,-0.0768 0,0 -0.240108,-0.18461 -0.857748,-0.41529 -0.528333,0.007 -0.74009,0.0533 -0.74009,0.0533 0,0 0.0442,-0.052 0.779762,0.43873 z"
+       id="path3212" />
+    <path
+       id="path3298"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.132292;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 74.3479,101.48672 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.017411 m -2.116663,0 c 0.88195,0.440971 1.76389,0.576431 2.645843,1.017411 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843" />
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:none;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2592"
+       width="12.699998"
+       height="12.699994"
+       x="63.76458"
+       y="95.514572" />
+  </g>
+</svg>
diff --git a/files/opencs/editing-terrain-shape.png b/files/opencs/editing-terrain-shape.png
deleted file mode 100644
index a11bd95d54..0000000000
Binary files a/files/opencs/editing-terrain-shape.png and /dev/null differ
diff --git a/files/opencs/editing-terrain-shape.svg b/files/opencs/editing-terrain-shape.svg
new file mode 100644
index 0000000000..af532194a0
--- /dev/null
+++ b/files/opencs/editing-terrain-shape.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(0,-1.8137688)"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="objectBoundingBox"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#309430;stop-opacity:1;"
+         offset="0"
+         id="stop2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1"
+       gradientTransform="translate(0,-1.8137688)">
+      <stop
+         style="stop-color:#cc3030;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(0,-1.8137688)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#303030;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+  </defs>
+  <g
+     id="editing-terrain-shape"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-21.519464,-127.35283)">
+    <path
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 22.48956,99.370405 -1.05833,0.52917 -1.058333,0.529175 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.529175 z"
+       id="path2229" />
+    <path
+       id="path2231"
+       style="font-variation-settings:normal;display:inline;opacity:1.0;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 26.722906,101.48666 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.017414 m -2.116663,0 c 0.88195,0.440974 1.76389,0.576434 2.645843,1.017414 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843" />
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2579"
+       width="12.699998"
+       height="12.699994"
+       x="16.139584"
+       y="95.514572" />
+  </g>
+</svg>
diff --git a/files/opencs/editing-terrain-texture.png b/files/opencs/editing-terrain-texture.png
deleted file mode 100644
index 4a88353eea..0000000000
Binary files a/files/opencs/editing-terrain-texture.png and /dev/null differ
diff --git a/files/opencs/editing-terrain-texture.svg b/files/opencs/editing-terrain-texture.svg
new file mode 100644
index 0000000000..e0386d5061
--- /dev/null
+++ b/files/opencs/editing-terrain-texture.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="editing-terrain-texture"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-85.019514,-127.35283)">
+    <path
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f6f5f4;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 70.114554,99.370405 -1.05833,0.529175 -1.058333,0.52917 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z"
+       id="path3258" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 65.881221,101.48724 c 0,0 0.358847,0.19095 1.058339,0.42163 0.364629,-0.25301 1.04967,-0.69007 1.04967,-0.69007 0,0 -0.588311,-0.0301 -1.049678,-0.26073 z"
+       id="path3192" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 65.881221,102.54505 c 0,0 0.366219,-0.16792 1.05827,-0.63673 0.520898,0.15627 1.054113,0.36132 1.054113,0.36132 0,0 -0.451298,0.46972 -1.054052,0.80458 l -1.058331,-0.52917"
+       id="path3194" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 67.993599,102.27026 c 0,0 0.468905,-0.47075 1.049335,-0.95444 0.58043,0.0893 1.08017,0.51193 1.08017,0.51193 0,0 -0.75801,0.64369 -1.07055,0.97111 -0.42416,-0.28277 -1.058955,-0.5286 -1.058955,-0.5286 z"
+       id="path3196" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 67.997893,103.60371 c 0,0 0.556087,-0.29912 1.054661,-0.80514 0.468808,0.29021 1.062,0.69761 1.062,0.69761 0,0 -0.656494,0.45811 -1.05833,0.6367 z"
+       id="path3198" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 69.042934,101.31528 c 0,0 -0.584922,-0.0895 -1.05373,-0.0969 0,0 0.461813,-0.30863 1.07945,-0.53931 0.52834,0.007 1.04591,0.0965 1.04591,0.0965 0,0 -0.439111,0.0337 -1.07163,0.53971 z"
+       id="path3200" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 69.068624,100.6796 c 0,0 -0.616812,-0.009 -1.070731,-0.25061 l 1.058331,-0.529167 c 0.483691,0.238117 1.05834,0.421627 1.05834,0.421627 z"
+       id="path3202" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 74.35639,101.48724 c 0,0 -0.35885,0.19095 -1.058343,0.42163 -0.36463,-0.25301 -1.04967,-0.69007 -1.04967,-0.69007 0,0 0.58831,-0.0301 1.04968,-0.26073 z"
+       id="path3204" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 74.35639,102.54505 c 0,0 -0.36622,-0.16792 -1.058273,-0.63673 -0.5209,0.15627 -1.05411,0.36132 -1.05411,0.36132 0,0 0.4513,0.46972 1.05405,0.80458 l 1.058333,-0.52917"
+       id="path3206" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.244017,102.27026 c 0,0 -0.4689,-0.47075 -1.04933,-0.95444 -0.580423,0.0893 -1.080163,0.51193 -1.080163,0.51193 0,0 0.75801,0.64369 1.070543,0.97111 0.42416,-0.28277 1.05895,-0.5286 1.05895,-0.5286 z"
+       id="path3208" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.239717,103.60371 c 0,0 -0.55608,-0.29912 -1.05465,-0.80514 -0.468803,0.29021 -1.061993,0.69761 -1.061993,0.69761 0,0 0.65649,0.45811 1.058323,0.6367 z"
+       id="path3210" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 71.194687,101.31528 c 0,0 0.58492,-0.0895 1.05372,-0.0969 0,0 -0.4618,-0.30863 -1.07944,-0.53931 -0.528333,0.007 -1.045903,0.0965 -1.045903,0.0965 0,0 0.43911,0.0337 1.071623,0.53971 z"
+       id="path3212" />
+    <path
+       style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 71.168997,100.6796 c 0,0 0.61681,-0.009 1.07072,-0.25061 l -1.05832,-0.529167 c -0.483683,0.238117 -1.058333,0.421627 -1.058333,0.421627 z"
+       id="path3214" />
+    <path
+       id="path3298"
+       style="font-variation-settings:normal;display:inline;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.132292;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 74.3479,101.48672 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.017411 m -2.116663,0 c 0.88195,0.440971 1.76389,0.576431 2.645843,1.017411 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843" />
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2592"
+       width="12.699998"
+       height="12.699994"
+       x="63.76458"
+       y="95.514572" />
+  </g>
+</svg>
diff --git a/files/opencs/editing-terrain-vertex-paint.png b/files/opencs/editing-terrain-vertex-paint.png
deleted file mode 100644
index 2b3f0beac0..0000000000
Binary files a/files/opencs/editing-terrain-vertex-paint.png and /dev/null differ
diff --git a/files/opencs/editing-terrain-vertex-paint.svg b/files/opencs/editing-terrain-vertex-paint.svg
new file mode 100644
index 0000000000..188104f0a6
--- /dev/null
+++ b/files/opencs/editing-terrain-vertex-paint.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <script
+     id="script1"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+  <g
+     id="editing-terrain-vertex-paint"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-106.18619,-127.35283)">
+    <rect
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke-width:0.246511;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="rect1913"
+       width="5.9162631"
+       height="5.9162631"
+       x="-68.827797"
+       y="159.0508"
+       transform="matrix(0.89442719,-0.4472136,0.89442719,0.4472136,0,0)" />
+    <path
+       style="display:inline;fill:#0032a0;fill-opacity:0.80000001;stroke:none;stroke-width:0.284472px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 87.911411,103.50419 c 0,0 -0.290875,-0.13899 -0.86134,-0.68826 -0.511608,0.32436 -0.869557,0.57318 -0.869557,0.57318 0,0 0.47803,0.3237 0.89795,0.53619 z"
+       id="path3210" />
+    <path
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:#303030;stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+       d="m 85.989552,99.272155 -1.05833,0.529168 -1.058333,0.529177 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.529177 z"
+       id="path2245" />
+    <path
+       id="path2247"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+       d="m 90.222898,101.38091 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.017414 m -2.116663,0 c 0.88195,0.440974 1.76389,0.576434 2.645843,1.017414 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843" />
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="rect2594"
+       width="12.699998"
+       height="12.699994"
+       x="79.639572"
+       y="95.514572" />
+    <path
+       style="display:inline;fill:#0032a0;fill-opacity:0.80000001;stroke:none;stroke-width:0.370488px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.5842604,11.35362 c 0,0 -0.6557896,-0.355582 -1.1133861,-0.690693 -0.6628759,0.439985 -1.1222537,0.687164 -1.1222537,0.687164 0,0 0.5606146,0.290058 1.119089,0.561059 z"
+       id="path3210-0"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#0032a0;fill-opacity:0.80000001;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.2184555,10.499994 c 0,0 -0.5242594,-0.358953 -1.1525884,-0.7564507 C 6.4540024,10.331053 5.931261,10.646277 5.931261,10.646277 c 0,0 0.4908818,0.236197 1.1210557,0.55259 0.3990813,-0.212221 0.7833249,-0.454117 1.1661388,-0.698873 z"
+       id="path3210-8"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a03200;fill-opacity:0.8;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 15.210366,8.5366296 c 0,0 -0.319681,-0.1529595 -1.113375,-0.5566578 -0.493595,0.2483148 -1.080625,0.4426691 -1.080625,0.4426691 0,0 0.546247,0.3745788 1.106141,0.657899 z"
+       id="path3210-9"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a03200;fill-opacity:0.8;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.814424,9.2366004 c 0,0 -0.08449,-0.028999 -1.13744,-0.6999713 -1.007012,0.3356575 -1.118308,0.3790493 -1.118308,0.3790493 0,0 0.59695,0.587389 1.156844,0.870709 z"
+       id="path3210-1"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a03200;fill-opacity:0.8;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.78038,7.8229584 c 0,0 -0.297977,-0.1426242 -1.091671,-0.5463225 -0.441734,0.2166174 -0.987607,0.2731704 -0.987607,0.2731704 0,0 0.508006,0.3363382 1.020358,0.677536 0.326626,-0.1086572 0.720992,-0.2450246 1.05892,-0.4043839 z"
+       id="path3210-9-0"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a03200;fill-opacity:0.8;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.5465201,5.7062205 c 0,0 -0.2866081,-0.1384901 -1.0803021,-0.5421884 -0.493595,0.2483148 -1.0786188,0.5422068 -1.0786188,0.5422068 0.00185,0.01144 0.5329286,0.2288832 1.0772631,0.4157343 C 8.8968408,5.9810788 9.2021771,5.8579039 9.5465201,5.7062205 Z"
+       id="path3210-9-6"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a03200;fill-opacity:0.8;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.94282,6.4053962 c 0,0 -0.2793,-0.1393463 -1.0803018,-0.5401213 C 9.3513529,6.1166902 8.9069499,6.2635022 8.9069499,6.2635022 8.9058697,6.2646315 9.2718294,6.3774249 9.8856555,6.6043618 10.426611,6.566683 10.705962,6.489267 10.94282,6.4053962 Z"
+       id="path3210-9-5"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a03200;fill-opacity:0.8;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.0300839,6.2598267 c 0,0 -0.1501823,-0.026869 -0.9624798,-0.3954273 -0.493595,0.2483148 -1.0816585,0.5418878 -1.0816585,0.5418878 0,0 0.4139553,0.1606387 1.0637663,0.1948782 z"
+       id="path3210-9-56"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a0a000;fill-opacity:0.80000001;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.3785882,8.9157275 c 0,0 -0.2990104,-0.1033501 -1.1216432,-0.3809579 -0.4770585,0.3330641 -1.1374691,0.6989842 -1.1374691,0.6989842 0,0 0.5446259,0.2702732 1.1045199,0.5535934 C 4.4466164,9.6697777 4.6934101,9.5264369 5.3785882,8.9157275 Z"
+       id="path3210-9-52"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a0a000;fill-opacity:0.80000001;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.2173907,7.5588385 c 0,0 -0.4800605,-0.054866 -0.9719641,-0.2869981 -0.493595,0.2483148 -1.0936684,0.5513031 -1.0936684,0.5513031 0,0 0.3396051,0.1645856 1.0573552,0.4084418 z"
+       id="path3210-9-4"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+    <path
+       style="display:inline;fill:#a0a000;fill-opacity:0.80000001;stroke:none;stroke-width:0.379296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.920417,8.4221775 c 0,0 -0.4852533,-0.1454058 -1.0929122,-0.4426506 -0.493595,0.2483148 -1.1010878,0.5566762 -1.1010878,0.5566762 0,0 0.5276435,0.2612858 1.0875375,0.5446068 C 3.2682593,8.8451734 3.5885705,8.6362368 3.920417,8.4221775 Z"
+       id="path3210-9-1"
+       transform="matrix(0.74999935,0,0,0.74999963,79.639573,95.514575)" />
+  </g>
+  <script
+     id="mesh_polyfill"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+</svg>
diff --git a/files/opencs/scalable/editor-icons.svg b/files/opencs/editor-icons.svg
similarity index 99%
rename from files/opencs/scalable/editor-icons.svg
rename to files/opencs/editor-icons.svg
index d41fdbde60..921c5f6d8d 100644
--- a/files/opencs/scalable/editor-icons.svg
+++ b/files/opencs/editor-icons.svg
@@ -8973,9 +8973,9 @@
          height="100%" />
     </g>
     <g
-       id="scene-view-status-16"
+       id="scene-view-status-8"
        style="display:inline"
-       inkscape:label="scene-view-status-16"
+       inkscape:label="scene-view-status-8"
        transform="translate(63.499993)">
       <use
          x="0"
@@ -8997,9 +8997,9 @@
          transform="translate(126.99996)" />
     </g>
     <g
-       id="scene-view-status-17"
+       id="scene-view-status-9"
        style="display:inline"
-       inkscape:label="scene-view-status-17"
+       inkscape:label="scene-view-status-9"
        transform="translate(63.499993)">
       <use
          x="0"
@@ -9029,9 +9029,9 @@
          height="100%" />
     </g>
     <g
-       id="scene-view-status-18"
+       id="scene-view-status-10"
        style="display:inline"
-       inkscape:label="scene-view-status-18"
+       inkscape:label="scene-view-status-10"
        transform="translate(63.499993)">
       <use
          x="0"
@@ -9061,9 +9061,9 @@
          height="100%" />
     </g>
     <g
-       id="scene-view-status-19"
+       id="scene-view-status-11"
        style="display:inline"
-       inkscape:label="scene-view-status-19"
+       inkscape:label="scene-view-status-11"
        transform="translate(63.499993)">
       <use
          x="0"
@@ -9101,9 +9101,9 @@
          height="100%" />
     </g>
     <g
-       id="scene-view-status-21"
+       id="scene-view-status-13"
        style="display:inline"
-       inkscape:label="scene-view-status-21"
+       inkscape:label="scene-view-status-13"
        transform="translate(79.374991)">
       <use
          x="0"
@@ -9141,9 +9141,9 @@
          height="100%" />
     </g>
     <g
-       id="scene-view-status-22"
+       id="scene-view-status-14"
        style="display:inline"
-       inkscape:label="scene-view-status-22"
+       inkscape:label="scene-view-status-14"
        transform="translate(79.374991)">
       <use
          x="0"
@@ -9181,9 +9181,9 @@
          height="100%" />
     </g>
     <g
-       id="scene-view-status-23"
+       id="scene-view-status-15"
        style="display:inline"
-       inkscape:label="scene-view-status-23"
+       inkscape:label="scene-view-status-15"
        transform="translate(79.374991)">
       <use
          x="0"
@@ -9229,8 +9229,8 @@
          height="100%" />
     </g>
     <g
-       id="scene-view-status-20"
-       inkscape:label="scene-view-status-20"
+       id="scene-view-status-12"
+       inkscape:label="scene-view-status-12"
        transform="translate(126.99996,-15.874999)">
       <rect
          style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
diff --git a/files/opencs/enchantment.png b/files/opencs/enchantment.png
deleted file mode 100644
index 9bd54b8f0a..0000000000
Binary files a/files/opencs/enchantment.png and /dev/null differ
diff --git a/files/opencs/enchantment.svg b/files/opencs/enchantment.svg
new file mode 100644
index 0000000000..02849172f3
--- /dev/null
+++ b/files/opencs/enchantment.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2256"
+       x1="50.249126"
+       y1="41.275002"
+       x2="53.445831"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="enchantment"
+     transform="matrix(3.7795264,0,0,3.7795278,-187.99992,-148.00001)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1439"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741661"
+       y="39.158333"
+       rx="1.9824198e-15" />
+    <path
+       id="path1254"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2256);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.14158,39.422919 c -0.517835,0 -0.868273,0.700013 -0.892453,0.772562 l 0.02791,0.077 c 0.102317,-0.08372 0.33977,-0.320395 0.868164,-0.320395 0.331164,0 0.713135,0.237302 0.713135,0.689364 0,0.452414 -0.794579,1.159825 -1.322917,1.691886 v 0.264584 h 1.322912 v 0.529166 h 0.264583 V 42.59792 h 0.264583 c 0.115761,0.155225 0.264581,0.264583 0.529167,0.264583 0.264586,0 0.529167,-0.121753 0.529167,-0.396875 0,-0.275122 -0.264581,-0.396875 -0.529167,-0.396875 -0.264586,0 -0.413406,0.104095 -0.529167,0.264583 h -0.264583 v -0.529167 h -0.264583 v 0.529166 h -0.925008 c 0.532062,-0.528341 1.454174,-1.073533 1.454174,-1.691886 0,-0.826206 -0.2668,-1.21853 -1.245917,-1.21853 z m -0.341583,1.058333 v 0.529167 h 0.264584 c 0,-0.132292 0.132291,-0.264584 0.264583,-0.264584 v -0.264583 z m 1.852084,1.852083 h 0.529166 v 0.264584 h -0.529166 z" />
+  </g>
+</svg>
diff --git a/files/opencs/error-log.png b/files/opencs/error-log.png
deleted file mode 100644
index df698d1453..0000000000
Binary files a/files/opencs/error-log.png and /dev/null differ
diff --git a/files/opencs/error-log.svg b/files/opencs/error-log.svg
new file mode 100644
index 0000000000..1feb39dfe6
--- /dev/null
+++ b/files/opencs/error-log.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26458338,0,0,0.26459185,23.018732,7.1420691)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient8"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(19.843741,12.699998)"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="debug-profile"
+     transform="matrix(3.7795278,0,0,3.7794065,-207.99997,-207.99282)"
+     style="display:inline">
+    <path
+       id="rect2091"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.264587px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 55.297905,55.033197 v 4.233469 h 3.704166 v -4.233469 z m 0.264582,0.264592 h 3.175002 v 3.704286 h -3.175002 z" />
+    <g
+       id="debug-profile-8"
+       transform="matrix(0.74999994,0,0,0.75002401,14.291125,14.227909)"
+       style="display:inline">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1727"
+         width="4.2333331"
+         height="4.2333331"
+         x="55.033321"
+         y="55.033325"
+         rx="1.9824198e-15" />
+      <path
+         id="path1761"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 209,202 a 2.9999865,1.9999999 0 0 0 -3,2 2.9999865,1.9999999 0 0 0 0.40234,1 H 209 a 1.9999864,0.99999996 0 0 1 -2,-1 1.9999864,0.99999996 0 0 1 1.93555,-1 1.9999864,0.99999996 0 0 1 0.0644,0 1.9999864,0.99999996 0 0 1 2,1 1.9999864,0.99999996 0 0 1 -1.93555,1 h 2.53321 A 2.9999865,1.9999999 0 0 0 212,204 a 2.9999865,1.9999999 0 0 0 -3,-2 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="path1879"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 202.49805,201.50195 a 0.49999938,0.49999938 0 0 0 -0.49414,0.50196 v 1.99218 l 0.0801,0.28125 1.99024,2.97657 C 204.0283,207.50738 204,207.758 204,208 v 0.17383 l -1.70117,0.76172 -0.27344,0.29492 -0.99609,3.00391 a 0.49999938,0.49999938 0 0 0 0.31054,0.62695 0.49999938,0.49999938 0 0 0 0.63477,-0.3086 L 202.9043,209.75391 204,209.26953 V 209.5 c 0,0.81387 0.17708,1.73329 0.46094,2.64844 l -1.24024,0.82422 -0.2207,0.42187 v 2.99609 a 0.49999938,0.49999938 0 0 0 0.50195,0.50196 0.49999938,0.49999938 0 0 0 0.49414,-0.50196 v -2.73046 l 0.80274,-0.53516 c 0.15327,0.37806 0.32336,0.7488 0.50976,1.10156 0.39322,0.74413 0.85277,1.40937 1.37696,1.91211 C 207.20974,216.64142 207.81856,217 208.5,217 h 1 c 0.68144,0 1.29026,-0.35858 1.81445,-0.86133 0.52419,-0.50274 0.98374,-1.16798 1.37696,-1.91211 0.1864,-0.35276 0.35649,-0.7235 0.50976,-1.10156 l 0.79688,0.53516 v 2.73046 a 0.49999938,0.49999938 0 0 0 0.50195,0.50196 0.49999938,0.49999938 0 0 0 0.50391,-0.50196 v -2.99609 l -0.23047,-0.42187 -1.23633,-0.82227 C 213.82142,211.23447 214,210.31456 214,209.5 v -0.23242 l 1.09961,0.48633 0.92969,2.79882 a 0.49999938,0.49999938 0 0 0 0.62695,0.3086 0.49999938,0.49999938 0 0 0 0.31836,-0.62695 l -0.99805,-3.00391 -0.27148,-0.29492 L 214,208.17383 V 208 c 0,-0.24011 -0.0271,-0.48879 -0.0723,-0.74023 l 1.99024,-2.98243 0.082,-0.28125 v -1.99218 a 0.49999938,0.49999938 0 0 0 -0.50195,-0.50196 0.49999938,0.49999938 0 0 0 -0.49414,0.50196 v 1.8457 l -1.48047,2.21484 c -0.12453,-0.24081 -0.26999,-0.47429 -0.44922,-0.69336 C 212.42603,204.57887 211.38333,204 210,204 h -2 c -1.38333,0 -2.42603,0.57887 -3.07422,1.37109 -0.17826,0.21788 -0.32313,0.45004 -0.44726,0.68946 L 203,203.84961 v -1.8457 a 0.49999938,0.49999938 0 0 0 -0.50195,-0.50196 z M 208,205 h 2 c 1.11667,0 1.82397,0.42113 2.30078,1.00391 C 212.7776,206.58668 213,207.36111 213,208 v 1.5 c 0,1.19673 -0.47784,2.90744 -1.19141,4.25781 -0.35678,0.67519 -0.77223,1.26376 -1.18554,1.66016 C 210.20974,215.81437 209.81856,216 209.5,216 h -1 c -0.31856,0 -0.70974,-0.18563 -1.12305,-0.58203 -0.41331,-0.3964 -0.82876,-0.98497 -1.18554,-1.66016 C 205.47784,212.40744 205,210.69673 205,209.5 V 208 c 0,-0.63889 0.2224,-1.41332 0.69922,-1.99609 C 206.17603,205.42113 206.88333,205 208,205 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 56.488281,55.033203 a 0.1322915,0.1322915 0 0 0 -0.132812,0.132813 v 0.132812 l 0.03906,0.0918 0.265625,0.265625 a 0.1322915,0.1322915 0 0 0 0.185547,0 0.1322915,0.1322915 0 0 0 0,-0.1875 l -0.224609,-0.226562 v -0.07617 a 0.1322915,0.1322915 0 0 0 -0.132813,-0.132813 z"
+         id="path1867" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#Main-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 57.810547,55.033203 a 0.1322915,0.1322915 0 0 0 -0.130859,0.132813 v 0.07617 l -0.226563,0.226562 a 0.1322915,0.1322915 0 0 0 0,0.1875 0.1322915,0.1322915 0 0 0 0.1875,0 l 0.263672,-0.265625 0.03906,-0.0918 v -0.132812 a 0.1322915,0.1322915 0 0 0 -0.132812,-0.132813 z"
+         id="path1871" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/faction.png b/files/opencs/faction.png
deleted file mode 100644
index b58756bdc0..0000000000
Binary files a/files/opencs/faction.png and /dev/null differ
diff --git a/files/opencs/faction.svg b/files/opencs/faction.svg
new file mode 100644
index 0000000000..c0bba7f235
--- /dev/null
+++ b/files/opencs/faction.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2258"
+       x1="55.033333"
+       y1="41.275002"
+       x2="59.266663"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2260"
+       x1="56.356247"
+       y1="41.274986"
+       x2="57.943748"
+       y2="41.274986"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="faction"
+     transform="matrix(3.7795264,0,0,3.7795278,-207.99992,-148.00001)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1441"
+       width="4.2333331"
+       height="4.2333331"
+       x="55.033329"
+       y="39.158333"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1588"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2258);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 55.033331,39.158335 v 0.264584 h 0.79375 v 0.264583 h -0.529167 v 0.264583 h 0.264583 v 3.439584 h 0.264584 l 1.322916,-0.529167 1.322917,0.529167 h 0.264583 v -3.439584 h 0.264583 v -0.264583 h -0.529166 v -0.264583 h 0.79375 v -0.264584 z m 1.058333,0.264584 h 0.529167 v 0.264583 h -0.529167 z m 0.79375,0 h 0.529167 v 0.264583 h -0.529167 z m 0.79375,0 h 0.529166 v 0.264583 h -0.529166 z m -1.852083,0.529166 h 2.645833 v 3.175 l -1.322917,-0.529166 -1.322916,0.529166 z" />
+    <path
+       id="path1615"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2260);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 57.136562,40.481252 a 0.79374999,0.79374999 0 0 0 -0.780315,0.79375 0.79374999,0.79374999 0 0 0 0.79375,0.79375 0.79374999,0.79374999 0 0 0 0.79375,-0.79375 0.79374999,0.79374999 0 0 0 -0.79375,-0.79375 0.79374999,0.79374999 0 0 0 -0.01344,0 z m 5.29e-4,0.264583 a 0.5291661,0.52916788 0 0 1 0.01291,0 0.5291661,0.52916788 0 0 1 0.529167,0.529167 0.5291661,0.52916788 0 0 1 -0.529167,0.529167 0.5291661,0.52916788 0 0 1 -0.529166,-0.529167 0.5291661,0.52916788 0 0 1 0.516247,-0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/filter.png b/files/opencs/filter.png
deleted file mode 100644
index 55f442377c..0000000000
Binary files a/files/opencs/filter.png and /dev/null differ
diff --git a/files/opencs/filter.svg b/files/opencs/filter.svg
new file mode 100644
index 0000000000..12ae65d398
--- /dev/null
+++ b/files/opencs/filter.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2262"
+       x1="60.324997"
+       y1="41.142712"
+       x2="64.558327"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="filter"
+     transform="matrix(3.7795264,0,0,3.7795278,-227.99992,-148.00001)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1465"
+       width="4.2333331"
+       height="4.2333331"
+       x="60.325001"
+       y="39.158333"
+       rx="1.9824198e-15" />
+    <path
+       id="path1654"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2262);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 60.324997,39.158335 v 0.507463 l 1.5875,1.5875 v 1.322917 l 0.550871,0.55087 h 0.507462 v -1.873787 l 1.5875,-1.5875 v -0.507463 z m 0.264583,0.264584 h 3.704167 v 0.132291 l -1.5875,1.5875 v 1.719792 H 62.573955 L 62.17708,42.465627 V 41.14271 l -1.5875,-1.5875 z" />
+  </g>
+</svg>
diff --git a/files/opencs/global-variable.png b/files/opencs/global-variable.png
deleted file mode 100644
index e1642ac355..0000000000
Binary files a/files/opencs/global-variable.png and /dev/null differ
diff --git a/files/opencs/global-variable.svg b/files/opencs/global-variable.svg
new file mode 100644
index 0000000000..00221d24c8
--- /dev/null
+++ b/files/opencs/global-variable.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2170"
+       x1="4.1660156"
+       y1="189"
+       x2="13.324219"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="global-variable"
+     transform="matrix(3.7795278,0,0,3.7795278,-8.00001,-187.99999)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1509"
+       width="4.2333331"
+       height="4.2333331"
+       x="2.1166692"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="path1755"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2170);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 5.9140625,185 -0.080078,0.48828 0.8886718,0.16602 1.6425782,3.24804 -3.2011719,3.4668 -0.9082031,0.14648 L 4.1660156,193 h 2.7285156 l 0.089844,-0.47656 -0.8828125,-0.15625 2.59375,-2.8086 1.4199213,2.81055 -0.9531244,0.14844 L 9.0683594,193 h 3.3964846 l 0.07813,-0.48242 -0.90625,-0.16797 -1.9511721,-3.86328 2.6289061,-2.84571 0.919922,-0.15039 L 13.324219,185 H 10.59375 l -0.08984,0.48242 0.875,0.15625 -2.0234372,2.19141 -1.1074219,-2.19141 0.9667969,-0.15039 L 9.3085938,185 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/gmst.png b/files/opencs/gmst.png
deleted file mode 100644
index 2605fb4b96..0000000000
Binary files a/files/opencs/gmst.png and /dev/null differ
diff --git a/files/opencs/gmst.svg b/files/opencs/gmst.svg
new file mode 100644
index 0000000000..2d96e4cc39
--- /dev/null
+++ b/files/opencs/gmst.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2154"
+       x1="22"
+       y1="188.5"
+       x2="36"
+       y2="188.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2156"
+       x1="24"
+       y1="185.5"
+       x2="28"
+       y2="185.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2158"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2160"
+       x1="24"
+       y1="191.5"
+       x2="28"
+       y2="191.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2162"
+       x1="29"
+       y1="191.5"
+       x2="34"
+       y2="191.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="gmst"
+     transform="matrix(3.7795264,0,0,3.7795278,-27.999988,-187.99999)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1507"
+       width="4.2333331"
+       height="4.2333331"
+       x="7.4083323"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1797"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2154);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 22,181 v 15 h 14 v -15 z m 1,1 h 12 v 13 H 23 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="rect1804"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2156);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 24,183 v 5 h 4 v -3 h -2 v 1 h 1 v 1 h -2 v -3 h 1 2 v -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="rect1806"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2158);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 29,183 v 5 h 1 v -3.5 l 1.5,2.5 1.5,-2.5 v 3.5 h 1 v -5 H 33 L 31.5,185.5 30,183 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="rect1808"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2160);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 24,189 v 3 h 2.75 v 1 H 24 v 1 h 4 v -3 h -3 v -1 h 3 v -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="rect1810"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2162);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 29,189 v 1 h 2 v 4 h 1 v -4 h 2 v -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/info.png b/files/opencs/info.png
deleted file mode 100644
index d7bdad6cb1..0000000000
Binary files a/files/opencs/info.png and /dev/null differ
diff --git a/files/opencs/info.svg b/files/opencs/info.svg
new file mode 100644
index 0000000000..6594827943
--- /dev/null
+++ b/files/opencs/info.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+  </defs>
+  <g
+     id="info"
+     transform="matrix(3.7795278,0,0,3.7795278,-228.00002,-188.00002)"
+     style="display:inline;fill:#1d99fd;fill-opacity:1">
+    <rect
+       style="opacity:0;fill:#1d99fd;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+       id="rect6790"
+       width="4.2333331"
+       height="4.2333331"
+       x="60.325001"
+       y="49.741669"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1809"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#1d99fd;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 61.647915,51.429167 v 0.06458 a 0.1,0.1 45 0 0 0.1,0.1 l 0.329167,0 a 0.1,0.1 45 0 1 0.1,0.1 v 1.122917 a 0.1,0.1 135 0 1 -0.1,0.1 l -0.329167,0 a 0.1,0.1 135 0 0 -0.1,0.1 v 0.06458 a 0.1,0.1 45 0 0 0.1,0.1 l 1.3875,0 a 0.1,0.1 135 0 0 0.1,-0.1 v -0.06458 a 0.1,0.1 45 0 0 -0.1,-0.1 l -0.329166,0 a 0.1,0.1 45 0 1 -0.1,-0.1 v -1.3875 a 0.1,0.1 45 0 0 -0.1,-0.1 h -0.858334 a 0.1,0.1 135 0 0 -0.1,0.1 z" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#1d99fd;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1813"
+       width="0.52916718"
+       height="0.52916741"
+       x="62.177082"
+       y="50.535419"
+       rx="0.13229308"
+       ry="0.13229308" />
+  </g>
+</svg>
diff --git a/files/opencs/ingredient.png b/files/opencs/ingredient.png
deleted file mode 100644
index f31e6f5813..0000000000
Binary files a/files/opencs/ingredient.png and /dev/null differ
diff --git a/files/opencs/ingredient.svg b/files/opencs/ingredient.svg
new file mode 100644
index 0000000000..af2f736e64
--- /dev/null
+++ b/files/opencs/ingredient.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2298"
+       x1="44.692448"
+       y1="14.850656"
+       x2="48.418747"
+       y2="14.850656"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2302"
+       x1="44.726234"
+       y1="15.44105"
+       x2="47.230007"
+       y2="15.44105"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="ingredient"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-168.00001,-48.000002)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1372"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.450001"
+       y="12.7"
+       rx="1.9824198e-15" />
+    <path
+       id="path1112"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2298);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 48.418746,12.964584 c -1.243361,0 -3.934467,0.829085 -3.713469,3.444234 0,0 0.0093,0.206234 0.0093,0.259933 1.746944,0.368331 3.70417,-0.757662 3.70417,-3.439584 z m -0.264584,0.301274 v 0.227893 c -0.08419,1.366455 -0.965018,3.114878 -3.117122,2.89388 -0.0056,-0.0537 -0.02274,-0.24753 -0.02274,-0.24753 -0.09471,-1.767988 1.8965,-2.874243 3.13986,-2.874243 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2302);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 44.735297,16.384216 c -0.05833,0.02461 0.182844,0.256314 0.213106,0.242046 0.297543,-0.140285 0.537168,-0.305529 0.823482,-0.678781 0.554949,-0.723455 0.71781,-1.153972 1.458122,-1.692275 -0.606594,0.103773 -1.03702,0.826593 -1.654857,1.499632 -0.31705,0.345377 -0.67329,0.559102 -0.839853,0.629378 z"
+       id="path1110" />
+  </g>
+</svg>
diff --git a/files/opencs/instance.png b/files/opencs/instance.png
deleted file mode 100644
index ce63e64ed6..0000000000
Binary files a/files/opencs/instance.png and /dev/null differ
diff --git a/files/opencs/instance.svg b/files/opencs/instance.svg
new file mode 100644
index 0000000000..fe344c905d
--- /dev/null
+++ b/files/opencs/instance.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2266"
+       x1="7.9374995"
+       y1="30.691668"
+       x2="11.1125"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="instance"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-168,-187.99999)">
+    <path
+       id="path7443"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient2266);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="M 162.50391,181.99805 A 0.49999938,0.49999938 0 0 0 162.00195,182.5 v 2.99805 a 0.49999938,0.49999938 0 0 0 0.50196,0.50195 0.49999938,0.49999938 0 0 0 0.49414,-0.50195 v -2.4961 H 165.5 A 0.49999938,0.49999938 0 0 0 166.00195,182.5 0.49999938,0.49999938 0 0 0 165.5,181.99805 Z m 9.99414,0 a 0.49999938,0.49999938 0 0 0 -0.49414,0.50195 0.49999938,0.49999938 0 0 0 0.49414,0.50195 H 175 v 2.4961 a 0.49999938,0.49999938 0 0 0 0.50195,0.50195 0.49999938,0.49999938 0 0 0 0.49414,-0.50195 v -2.98828 a 0.49999938,0.49999938 0 0 0 0,-0.01 0.49999938,0.49999938 0 0 0 -0.49414,-0.50195 z M 165.5,185.00391 a 0.49999938,0.49999938 0 0 0 -0.50195,0.49414 v 6.98828 a 0.49999938,0.49999938 0 0 0 0,0.0176 0.49999938,0.49999938 0 0 0 0.50195,0.49414 h 6.99805 a 0.49999938,0.49999938 0 0 0 0.0586,-0.004 A 0.49999938,0.49999938 0 0 0 173,192.50391 v -6.99024 a 0.49999938,0.49999938 0 0 0 0,-0.0156 0.49999938,0.49999938 0 0 0 -0.50195,-0.49414 z M 166.00195,186 h 6.00196 v 6.00195 h -6.00196 z m -3.49804,6.00195 a 0.49999938,0.49999938 0 0 0 -0.50196,0.50196 v 2.98047 a 0.49999938,0.49999938 0 0 0 0,0.0156 0.49999938,0.49999938 0 0 0 0.50196,0.50195 H 165.5 A 0.49999938,0.49999938 0 0 0 166.00195,195.5 0.49999938,0.49999938 0 0 0 165.5,194.99805 h -2.50195 v -2.49414 a 0.49999938,0.49999938 0 0 0 -0.49414,-0.50196 z m 12.99804,0 A 0.49999938,0.49999938 0 0 0 175,192.50391 v 2.49414 h -2.50195 a 0.49999938,0.49999938 0 0 0 -0.49414,0.50195 0.49999938,0.49999938 0 0 0 0.49414,0.50195 h 3.0039 A 0.49999938,0.49999938 0 0 0 175.99609,195.5 v -2.99609 a 0.49999938,0.49999938 0 0 0 -0.49414,-0.50196 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <rect
+       style="font-variation-settings:normal;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect7651"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.449997"
+       y="49.741661"
+       ry="0" />
+  </g>
+</svg>
diff --git a/files/opencs/journal-topic-infos.png b/files/opencs/journal-topic-infos.png
deleted file mode 100644
index 4cc4464897..0000000000
Binary files a/files/opencs/journal-topic-infos.png and /dev/null differ
diff --git a/files/opencs/journal-topic-infos.svg b/files/opencs/journal-topic-infos.svg
new file mode 100644
index 0000000000..4351d0668b
--- /dev/null
+++ b/files/opencs/journal-topic-infos.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2252"
+       x1="44.449993"
+       y1="41.142712"
+       x2="48.418743"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2254"
+       x1="46.037495"
+       y1="41.010418"
+       x2="47.095829"
+       y2="41.010418"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="journal-topic-infos"
+     transform="matrix(3.7795217,0,0,3.7795278,-167.99972,-148.00001)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1445"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.450001"
+       y="39.158333"
+       rx="1.9824198e-15" />
+    <path
+       id="path1236"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2252);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 44.714577,39.158335 v 0.529167 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.264583 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.529166 h 3.704167 v -3.96875 z m 0.264583,0.264584 h 2.645834 v 3.439583 H 44.97916 v -0.264583 h 0.264584 V 42.333335 H 44.97916 v -0.264583 h 0.264584 V 41.804169 H 44.97916 v -0.264584 h 0.264584 V 41.275002 H 44.97916 v -0.264583 h 0.264584 V 40.745835 H 44.97916 v -0.264583 h 0.264584 V 40.216669 H 44.97916 v -0.264584 h 0.264584 V 39.687502 H 44.97916 Z m 2.910417,0 h 0.264583 v 3.439583 h -0.264583 z" />
+    <path
+       id="path1238"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2254);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 46.434371,39.952085 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.264583 c 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 c 0.07329,0 0.132292,-0.059 0.132292,-0.132292 v -0.264583 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m -0.264583,0.79375 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132291 0.132292,0.132291 h 0.132291 v 0.79375 h -0.132291 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 0.264583 0.264584 c 0.07329,0 0.132291,-0.059 0.132291,-0.132292 0,-0.07329 -0.059,-0.132292 -0.132291,-0.132292 h -0.132292 v -0.926041 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z" />
+  </g>
+</svg>
diff --git a/files/opencs/journal-topics.png b/files/opencs/journal-topics.png
deleted file mode 100644
index d4e58a2885..0000000000
Binary files a/files/opencs/journal-topics.png and /dev/null differ
diff --git a/files/opencs/journal-topics.svg b/files/opencs/journal-topics.svg
new file mode 100644
index 0000000000..ecb78d869b
--- /dev/null
+++ b/files/opencs/journal-topics.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2248"
+       x1="39.158333"
+       y1="41.142712"
+       x2="43.127083"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2250"
+       x1="40.216663"
+       y1="40.348961"
+       x2="42.068748"
+       y2="40.348961"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="journal-topics"
+     transform="matrix(3.7795264,0,0,3.7795278,-147.99995,-148.00001)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1447"
+       width="4.2333331"
+       height="4.2333331"
+       x="39.158333"
+       y="39.158333"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1204"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2248);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 39.422914,39.158335 v 0.529167 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.264583 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.529166 h 3.704167 v -3.96875 z m 0.264583,0.264584 h 2.645834 v 3.439583 h -2.645834 v -0.264583 h 0.264584 v -0.264584 h -0.264584 v -0.264583 h 0.264584 v -0.264583 h -0.264584 v -0.264584 h 0.264584 v -0.264583 h -0.264584 v -0.264583 h 0.264584 v -0.264584 h -0.264584 v -0.264583 h 0.264584 v -0.264583 h -0.264584 v -0.264584 h 0.264584 v -0.264583 h -0.264584 z m 2.910417,0 h 0.264583 v 3.439583 h -0.264583 z" />
+    <path
+       id="path1234"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2250);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 40.348956,39.952087 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.529167 c 0,0.07329 0.059,0.132291 0.132292,0.132291 h 1.5875 c 0.07329,0 0.132292,-0.059 0.132292,-0.132291 v -0.529167 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m 0.132292,0.264584 h 1.322916 v 0.264583 h -1.322916 z" />
+  </g>
+</svg>
diff --git a/files/opencs/land-heightmap.png b/files/opencs/land-heightmap.png
deleted file mode 100644
index 5b460a0024..0000000000
Binary files a/files/opencs/land-heightmap.png and /dev/null differ
diff --git a/files/opencs/land-heightmap.svg b/files/opencs/land-heightmap.svg
new file mode 100644
index 0000000000..701b246640
--- /dev/null
+++ b/files/opencs/land-heightmap.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2164"
+       x1="42"
+       y1="189"
+       x2="56"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="land-heightmap"
+     transform="matrix(3.7795278,0,0,3.7795278,-48.000013,-187.99999)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1505"
+       width="4.2333331"
+       height="4.2333331"
+       x="12.700003"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1888"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2164);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 42,182 v 14 h 14 v -14 z m 1,1 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 1 v 1 h -1 z m -11,2 h 1 v 2 h -1 z m 2,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1 v 2 h -1 z m -11,3 h 1 v 2 h -1 z m 2,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1 v 2 h -1 z m -11,3 h 1 v 2 h -1 z m 2,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1 v 2 h -1 z m -11,3 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 1 v 1 h -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/land-texture.png b/files/opencs/land-texture.png
deleted file mode 100644
index a96c4bf8c7..0000000000
Binary files a/files/opencs/land-texture.png and /dev/null differ
diff --git a/files/opencs/land-texture.svg b/files/opencs/land-texture.svg
new file mode 100644
index 0000000000..3f9c7dfe1b
--- /dev/null
+++ b/files/opencs/land-texture.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2166"
+       x1="17.991667"
+       y1="51.858334"
+       x2="22.224998"
+       y2="51.858334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2168"
+       x1="18.520832"
+       y1="51.858334"
+       x2="21.695831"
+       y2="51.858334"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="land-texture"
+     transform="matrix(3.7795278,0,0,3.7795278,-67.999998,-187.99999)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1503"
+       width="4.2333331"
+       height="4.2333331"
+       x="17.991665"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="path1973"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2166);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 17.991666,49.741665 v 4.233334 h 4.233333 v -4.233334 z m 0.264583,0.264584 h 3.704166 v 3.704166 h -3.704166 z" />
+    <path
+       id="path1975"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2168);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 18.520832,50.270832 v 3.175 h 3.175 v -3.175 z m 0.264584,0.264583 h 0.529166 v 0.529167 h 0.79375 v -0.529167 h 0.79375 v 0.529167 h 0.529167 v 0.79375 h -0.529167 v 0.79375 h 0.529167 v 0.529167 h -0.529167 v -0.529167 h -0.79375 v 0.529167 h -0.79375 v -0.529167 h -0.529166 v -0.79375 h 0.529166 v -0.79375 h -0.529166 z m 0.529166,1.322917 v 0.79375 h 0.79375 v -0.79375 z m 0.79375,0 h 0.79375 v -0.79375 h -0.79375 z" />
+  </g>
+</svg>
diff --git a/files/opencs/levelled-creature.png b/files/opencs/levelled-creature.png
deleted file mode 100644
index e6cb1f54c7..0000000000
Binary files a/files/opencs/levelled-creature.png and /dev/null differ
diff --git a/files/opencs/levelled-creature.svg b/files/opencs/levelled-creature.svg
new file mode 100644
index 0000000000..7c996d23a9
--- /dev/null
+++ b/files/opencs/levelled-creature.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2396"
+       x1="2.1166666"
+       y1="20.6313"
+       x2="6.3499999"
+       y2="20.6313"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2398"
+       x1="2.3812499"
+       y1="21.034376"
+       x2="6.0854168"
+       y2="21.034376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2400"
+       x1="2"
+       y1="84.999947"
+       x2="16"
+       y2="84.999947"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389-5">
+      <path
+         id="mask-powermask-path-effect1389-5_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 0.99999997,80.999893 H 17 V 89 H 0.99999997 Z" />
+      <path
+         id="mask-powermask-path-effect1389_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 0.99999997,80.999893 H 17 V 89 H 0.99999997 Z" />
+      <path
+         id="path1387-6"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2402"
+       x1="3.96875"
+       y1="21.166668"
+       x2="4.4979157"
+       y2="21.166668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2404"
+       x1="3.4788599"
+       y1="19.827215"
+       x2="4.9710684"
+       y2="19.827215"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       id="mask-powermask-path-effect1389_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1389_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1389_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <filter
+       id="mask-powermask-path-effect1389-5_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1389-5_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1389-5_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+  </defs>
+  <g
+     id="levelled-creature"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-8.0000003,-68.000005)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1412"
+       width="4.2333331"
+       height="4.2333331"
+       x="2.1166692"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="path1335"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2396);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 2.5879557,19.302182 c -0.4688086,0.463228 -0.4712891,1.108823 -0.4712891,1.518253 0,0.612416 0.7314471,1.139983 1.5875001,1.139983 H 4.7625 c 0.8560531,0 1.5875001,-0.527567 1.5875001,-1.139983 0,-0.40943 -0.00249,-1.055025 -0.4712891,-1.518253 l -0.2025716,0.209806 c 0.3571872,0.26417 0.4092773,0.911564 0.4092773,1.308447 0,0.47278 -0.6884932,0.875399 -1.3229167,0.875399 H 3.7041667 c -0.6344236,0 -1.3229167,-0.402619 -1.3229167,-0.875399 0,-0.396883 0.05209,-1.044277 0.4092773,-1.308447 z" />
+    <path
+       id="rect1337"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2398);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 2.38125,20.902084 v 0.264584 h 1.3229167 v -0.264584 z m 2.38125,0 v 0.264584 h 1.3229167 v -0.264584 z" />
+    <path
+       id="path1345"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2400);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="M 4.9492188,82 A 3.0000001,3.0000001 0 0 0 2,85 3.0000001,3.0000001 0 0 0 5,88 3.0000001,3.0000001 0 0 0 8,85 3.0000001,3.0000001 0 0 0 5,82 3.0000001,3.0000001 0 0 0 4.9492188,82 Z m 8.0000002,0 A 3.0000001,3.0000001 0 0 0 10,85 a 3.0000001,3.0000001 0 0 0 3,3 3.0000001,3.0000001 0 0 0 3,-3 3.0000001,3.0000001 0 0 0 -3,-3 3.0000001,3.0000001 0 0 0 -0.05078,0 z m -8.0000002,1 a 2.0000001,2.0000001 0 0 1 0.00195,0 A 2.0000001,2.0000001 0 0 1 5,83 2.0000001,2.0000001 0 0 1 7,85 2.0000001,2.0000001 0 0 1 5,87 2.0000001,2.0000001 0 0 1 3,85 2.0000001,2.0000001 0 0 1 4.9492188,83 Z m 8.0000002,0 a 2.0000001,2.0000001 0 0 1 0.002,0 2.0000001,2.0000001 0 0 1 0.04883,0 2.0000001,2.0000001 0 0 1 2,2 2.0000001,2.0000001 0 0 1 -2,2 2.0000001,2.0000001 0 0 1 -2,-2 2.0000001,2.0000001 0 0 1 1.949219,-2 z M 5,84 c 0,0 -1,10e-7 -1,1 v 1 h 2 v -2 z m 8,0 c 0,0 -1,10e-7 -1,1 v 1 h 2 v -2 z"
+       transform="matrix(0.26458334,0,0,0.26458334,1.8520833,-3.4395833)"
+       mask="url(#mask-powermask-path-effect1389-5)" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2402);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1353"
+       width="0.52916592"
+       height="0.52916592"
+       x="3.96875"
+       y="20.902084"
+       rx="3.6718346e-17" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2404);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 3.4788598,19.628363 c 0.04683,-0.486828 0.48153,-0.608541 0.742487,-0.608541 0.423486,0 0.7497214,0.25405 0.7497214,0.597173 0,0.305097 -0.3651434,0.532309 -0.3987644,0.563022 -0.125992,0.115091 -0.211803,0.11424 -0.235615,0.45459 h -0.354914 c -0.01585,-0.340026 0.05156,-0.493476 0.342308,-0.697632 0.07527,-0.05285 0.259652,-0.174733 0.259652,-0.338584 0,-0.186634 -0.156674,-0.280913 -0.347088,-0.280913 -0.190414,0 -0.340407,0.129816 -0.388814,0.360908 z"
+       id="path1355" />
+  </g>
+</svg>
diff --git a/files/opencs/levelled-item.png b/files/opencs/levelled-item.png
deleted file mode 100644
index 3c819c56d0..0000000000
Binary files a/files/opencs/levelled-item.png and /dev/null differ
diff --git a/files/opencs/levelled-item.svg b/files/opencs/levelled-item.svg
new file mode 100644
index 0000000000..e81aaed75b
--- /dev/null
+++ b/files/opencs/levelled-item.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2386"
+       x1="50.26144"
+       y1="14.816667"
+       x2="53.455223"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2388"
+       x1="51.196869"
+       y1="13.36146"
+       x2="52.519787"
+       y2="13.36146"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2390"
+       x1="51.593742"
+       y1="16.139584"
+       x2="52.12291"
+       y2="16.139584"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2392"
+       x1="51.103855"
+       y1="14.800131"
+       x2="52.596062"
+       y2="14.800131"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="levelled-item"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-187.99999,-48.000002)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1366"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741661"
+       y="12.7"
+       rx="1.9824198e-15" />
+    <path
+       id="path1268"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2386);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 50.799997,12.700001 v 0.264583 c 0,0.426244 0.264584,0.08279 0.264584,0.529167 -0.715614,0.463044 -1.376281,1.653273 0,3.439583 h 1.5875 c 1.37628,-1.78631 0.715613,-2.976539 0,-3.439583 0,-0.446376 0.264583,-0.102923 0.264583,-0.529167 v -0.264583 z m 0.264584,0.264583 h 1.5875 c -0.07834,0.100665 -0.264584,0.264582 -0.264584,0.79375 0.718095,0.381372 1.301385,1.237143 0.14056,2.910417 h -1.339453 c -1.160825,-1.673274 -0.577535,-2.529045 0.14056,-2.910417 0,-0.529168 -0.186243,-0.693085 -0.264583,-0.79375 z" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2388);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1270"
+       width="1.3229167"
+       height="0.26458335"
+       x="51.196869"
+       y="13.229168"
+       rx="3.6718346e-17" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2390);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1272"
+       width="0.52916592"
+       height="0.52916592"
+       x="51.593742"
+       y="15.875001"
+       rx="3.6718346e-17" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2392);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 51.103855,14.60128 c 0.04683,-0.486828 0.48153,-0.608541 0.742487,-0.608541 0.423486,0 0.749721,0.25405 0.749721,0.597173 0,0.305097 -0.365143,0.532309 -0.398764,0.563022 -0.125992,0.115091 -0.211803,0.11424 -0.235615,0.45459 H 51.60677 c -0.01585,-0.340026 0.05156,-0.493476 0.342308,-0.697632 0.07527,-0.05285 0.259652,-0.174733 0.259652,-0.338584 0,-0.186634 -0.156674,-0.280913 -0.347088,-0.280913 -0.190414,0 -0.340407,0.129816 -0.388814,0.360908 z"
+       id="path1278" />
+  </g>
+</svg>
diff --git a/files/opencs/light.png b/files/opencs/light.png
deleted file mode 100644
index 55d03bcd12..0000000000
Binary files a/files/opencs/light.png and /dev/null differ
diff --git a/files/opencs/light.svg b/files/opencs/light.svg
new file mode 100644
index 0000000000..35f0664f22
--- /dev/null
+++ b/files/opencs/light.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2310"
+       x1="7.6729169"
+       y1="20.902056"
+       x2="11.641667"
+       y2="20.902056"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2312"
+       x1="8.7312498"
+       y1="18.634495"
+       x2="9.8087034"
+       y2="18.634495"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="light"
+     style="display:inline"
+     transform="matrix(3.7795264,0,0,3.7465743,-27.999988,-67.267614)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1410"
+       width="4.2333331"
+       height="4.2333331"
+       x="7.4083323"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1005"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2310);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 9.2604167,19.579139 -0.529167,0.529167 v 1.322916 h -1.058333 v 0.264584 c 0,0.29316 0.236007,0.529166 0.529167,0.529166 H 10.31875 c 0.29316,0 0.529167,-0.236006 0.529167,-0.529166 0.52917,0 0.79375,-0.138564 0.79375,-0.661459 0,-0.537573 -0.377708,-0.661458 -0.661458,-0.661458 -0.25713,0 -0.661459,0.06577 -0.661459,0.396875 0,0.320575 0.264587,0.396875 0.529167,0.396875 v -0.264583 c -0.160619,0 -0.245463,0 -0.245463,-0.132292 0,-0.121612 0.100252,-0.132292 0.377755,-0.132292 0.32318,0 0.396875,0.197611 0.396875,0.396875 0,0.336315 -0.264577,0.396875 -0.529167,0.396875 H 9.7895837 v -1.852083 z m 0.107487,0.264584 h 0.157096 v 1.587499 h -0.529166 v -1.215429 z m -1.430404,1.852083 h 2.6458343 c 0,0 -4e-6,0.264583 -0.264584,0.264583 H 8.2020837 c -0.264585,0 -0.264584,-0.264583 -0.264584,-0.264583 z" />
+    <path
+       id="path1034"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2312);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 8.9808467,17.954432 c 0.174874,0.699492 -0.249597,0.644263 -0.249597,0.971517 0,0.241483 0.0899,0.388607 0.529167,0.388607 0.36296,0 0.548287,-0.146481 0.548287,-0.404626 0,-0.499817 -0.569263,-0.944354 -0.827857,-0.955498 z m 0.280087,0.445968 c 0.12115,0.108594 0.250338,0.237265 0.290938,0.454236 0,0.06718 -0.0068,0.126624 -0.03514,0.147794 -0.02826,0.02118 -0.108928,0.05426 -0.255798,0.05426 -0.17336,-0.02599 -0.257315,0.01369 -0.256315,-0.171565 0.0403,-0.110583 0.06666,-0.07326 0.125056,-0.152446 0.05866,-0.07948 0.108059,-0.19064 0.131259,-0.332279 z" />
+  </g>
+</svg>
diff --git a/files/opencs/lighting-lamp.png b/files/opencs/lighting-lamp.png
deleted file mode 100644
index c86517aa57..0000000000
Binary files a/files/opencs/lighting-lamp.png and /dev/null differ
diff --git a/files/opencs/lighting-lamp.svg b/files/opencs/lighting-lamp.svg
new file mode 100644
index 0000000000..5d34d68817
--- /dev/null
+++ b/files/opencs/lighting-lamp.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="lighting-lamp"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-190.85286,-127.35283)">
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#cccbc8;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.4;stroke-dasharray:0.264583, 0.79375;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect3540"
+       width="12.699989"
+       height="12.699994"
+       x="144.99161"
+       y="97.366661"
+       ry="0.13229166"
+       transform="translate(-1.8520833,-1.8520833)" />
+    <ellipse
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="ellipse3462"
+       cx="149.48958"
+       cy="101.86462"
+       rx="1.8521135"
+       ry="1.8521138" />
+    <path
+       id="ellipse3464"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="M 564.88672,370 A 15,15 0 0 0 550,385 a 15,15 0 0 0 15,15 15,15 0 0 0 15,-15 15,15 0 0 0 -15,-15 15,15 0 0 0 -0.11328,0 z M 565,371 a 14,14 0 0 1 14,14 14,14 0 0 1 -14,14 14,14 0 0 1 -14,-14 14,14 0 0 1 14,-14 z"
+       transform="scale(0.26458333)" />
+  </g>
+</svg>
diff --git a/files/opencs/lighting-moon.png b/files/opencs/lighting-moon.png
deleted file mode 100644
index 36a6e9b5b1..0000000000
Binary files a/files/opencs/lighting-moon.png and /dev/null differ
diff --git a/files/opencs/lighting-moon.svg b/files/opencs/lighting-moon.svg
new file mode 100644
index 0000000000..3d8fcdc9ea
--- /dev/null
+++ b/files/opencs/lighting-moon.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="lighting-moon"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-169.68621,-127.35283)">
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#3b3b40;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.4;stroke-dasharray:0.264583, 0.79375;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect3538"
+       width="12.699989"
+       height="12.699994"
+       x="129.11664"
+       y="97.366661"
+       ry="0.13229166"
+       transform="translate(-1.8520833,-1.8520833)" />
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#99c1f1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle3327"
+       cx="133.61461"
+       cy="101.86462"
+       r="3.7041888" />
+    <path
+       id="ellipse3325"
+       style="font-variation-settings:normal;display:inline;opacity:0.75;vector-effect:none;fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 131.57853,98.770197 a 3.7041888,3.7041888 0 0 0 -1.66811,3.094393 3.7041888,3.7041888 0 0 0 3.70416,3.70416 3.7041888,3.7041888 0 0 0 3.09439,-1.66811 3.7041888,3.7041888 0 0 1 -2.03606,0.60978 3.7041888,3.7041888 0 0 1 -3.70416,-3.70417 3.7041888,3.7041888 0 0 1 0.60978,-2.036053 z" />
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:0.75;vector-effect:none;fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle3331"
+       cx="134.93753"
+       cy="100.27711"
+       r="0.79374999" />
+    <circle
+       style="font-variation-settings:normal;display:inline;opacity:0.75;vector-effect:none;fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle3333"
+       cx="136.12811"
+       cy="101.73229"
+       r="0.39687499" />
+  </g>
+</svg>
diff --git a/files/opencs/lighting-sun.png b/files/opencs/lighting-sun.png
deleted file mode 100644
index a54d0ab124..0000000000
Binary files a/files/opencs/lighting-sun.png and /dev/null differ
diff --git a/files/opencs/lighting-sun.svg b/files/opencs/lighting-sun.svg
new file mode 100644
index 0000000000..2873a9f89c
--- /dev/null
+++ b/files/opencs/lighting-sun.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="lighting-sun"
+     style="display:inline"
+     transform="matrix(1.3333345,0,0,1.333334,-148.51953,-127.35283)">
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ccc2a3;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.4;stroke-dasharray:0.264583, 0.79375;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect3536"
+       width="12.699989"
+       height="12.699994"
+       x="113.24164"
+       y="97.366661"
+       ry="0.13229166"
+       transform="translate(-1.8520833,-1.8520833)" />
+    <ellipse
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f9f06b;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle3260"
+       cx="117.73962"
+       cy="101.86462"
+       rx="1.8521135"
+       ry="1.8521138" />
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f9f06b;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect3272"
+       width="0.52917033"
+       height="1.8520808"
+       x="117.47501"
+       y="97.366669"
+       ry="0.26458332" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3274"
+       width="100%"
+       height="100%"
+       transform="rotate(30,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3278"
+       width="100%"
+       height="100%"
+       transform="rotate(60,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3280"
+       width="100%"
+       height="100%"
+       transform="rotate(90,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3282"
+       width="100%"
+       height="100%"
+       transform="rotate(120,117.7396,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3284"
+       width="100%"
+       height="100%"
+       transform="rotate(150,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3286"
+       width="100%"
+       height="100%"
+       transform="rotate(180,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3288"
+       width="100%"
+       height="100%"
+       transform="rotate(-150,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3290"
+       width="100%"
+       height="100%"
+       transform="rotate(-120,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3292"
+       width="100%"
+       height="100%"
+       transform="rotate(-90,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3294"
+       width="100%"
+       height="100%"
+       transform="rotate(-60,117.73959,101.86459)"
+       style="display:inline" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3272"
+       id="use3296"
+       width="100%"
+       height="100%"
+       transform="rotate(-30,117.73959,101.86459)"
+       style="display:inline" />
+  </g>
+</svg>
diff --git a/files/opencs/list-added.png b/files/opencs/list-added.png
deleted file mode 100644
index 4da2659839..0000000000
Binary files a/files/opencs/list-added.png and /dev/null differ
diff --git a/files/opencs/list-added.svg b/files/opencs/list-added.svg
new file mode 100644
index 0000000000..ecfa8595e5
--- /dev/null
+++ b/files/opencs/list-added.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient2498"
+       x1="23.8125"
+       y1="4.2333331"
+       x2="26.987499"
+       y2="4.2333331"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="list-added"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-88.000018,-8.0000005)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1354"
+       width="4.2333331"
+       height="4.2333331"
+       x="23.283337"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1113"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2498);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 25.135416,2.6458331 v 1.322917 H 23.8125 v 0.529167 h 1.322916 v 1.3229163 h 0.529167 V 4.4979171 H 26.9875 v -0.529167 h -1.322917 v -1.322917 z" />
+  </g>
+</svg>
diff --git a/files/opencs/list-base.png b/files/opencs/list-base.png
deleted file mode 100644
index 336d4c59c1..0000000000
Binary files a/files/opencs/list-base.png and /dev/null differ
diff --git a/files/opencs/list-base.svg b/files/opencs/list-base.svg
new file mode 100644
index 0000000000..a050b15629
--- /dev/null
+++ b/files/opencs/list-base.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083333"
+       y1="4.2333331"
+       x2="11.641666"
+       y2="4.2333331" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083333"
+       y1="4.2333331"
+       x2="11.641666"
+       y2="4.2333331" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083333"
+       y1="4.2333331"
+       x2="11.641666"
+       y2="4.2333331" />
+  </defs>
+  <g
+     id="list-base"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-28.000002,-8.0000005)">
+    <rect
+       y="2.1166666"
+       x="7.4083333"
+       height="4.2333331"
+       width="4.2333331"
+       id="rect933"
+       style="opacity:0;fill:url(#linearGradient2);fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="M 8.4666703,3.175 V 5.2916666 H 10.583339 V 3.175 Z M 8.7312536,3.4395833 H 10.318756 V 5.0270832 H 8.7312536 Z"
+       style="fill:url(#linearGradient3);fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path922" />
+    <path
+       id="rect913"
+       style="fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7.9375036,2.6458333 v 3.175 h 3.1750024 v -3.175 z M 8.2020869,2.9104166 H 10.847923 V 5.5562499 H 8.2020869 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/list-modified.png b/files/opencs/list-modified.png
deleted file mode 100644
index 8b269a31d3..0000000000
Binary files a/files/opencs/list-modified.png and /dev/null differ
diff --git a/files/opencs/list-modified.svg b/files/opencs/list-modified.svg
new file mode 100644
index 0000000000..6efcab4cd4
--- /dev/null
+++ b/files/opencs/list-modified.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Orange">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Orange"
+       id="linearGradient2277"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="-3.7041662"
+       x2="22.225"
+       y2="-3.7041662"
+       gradientTransform="scale(0.26458333)" />
+  </defs>
+  <g
+     id="list-modified"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-48.000002,-8.0000005)">
+    <path
+       id="path924"
+       style="font-variation-settings:normal;vector-effect:none;fill:url(#linearGradient2277);fill-opacity:1;stroke:none;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 14.816666,2.6458333 a 1.5874996,1.5874997 0 0 0 -1.587499,1.5875 1.5874996,1.5874997 0 0 0 1.587499,1.5875 1.5874996,1.5874997 0 0 0 1.5875,-1.5875 1.5874996,1.5874997 0 0 0 -1.5875,-1.5875 z M 14.800646,3.175 a 1.0583329,1.058333 0 0 1 0.01602,0 A 1.0583329,1.058333 0 0 1 15.875,4.2333333 1.0583329,1.058333 0 0 1 14.816666,5.2916666 1.0583329,1.058333 0 0 1 13.758333,4.2333333 1.0583329,1.058333 0 0 1 14.800647,3.175 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/list-removed.png b/files/opencs/list-removed.png
deleted file mode 100644
index 618a202bb9..0000000000
Binary files a/files/opencs/list-removed.png and /dev/null differ
diff --git a/files/opencs/list-removed.svg b/files/opencs/list-removed.svg
new file mode 100644
index 0000000000..157d4ab5e1
--- /dev/null
+++ b/files/opencs/list-removed.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Orange">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Red"
+       id="linearGradient2537"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="list-removed"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-128.00003,-8.0000005)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1350"
+       width="4.2333331"
+       height="4.2333331"
+       x="33.866673"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="path1144"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2537);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 34.395832,3.9687501 v 0.529167 h 3.175 v -0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/lockpick.png b/files/opencs/lockpick.png
deleted file mode 100644
index 7b1865f504..0000000000
Binary files a/files/opencs/lockpick.png and /dev/null differ
diff --git a/files/opencs/lockpick.svg b/files/opencs/lockpick.svg
new file mode 100644
index 0000000000..b7e8ca1c3d
--- /dev/null
+++ b/files/opencs/lockpick.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Orange">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2300"
+       x1="12.964584"
+       y1="20.108334"
+       x2="16.933334"
+       y2="20.108334"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="lockpick"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-48.000013,-68.000005)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1408"
+       width="4.2333331"
+       height="4.2333331"
+       x="12.700003"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="path1156"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2300);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 16.554029,17.991667 -2.001945,2.006079 v 0.375171 l -1.5875,1.5875 V 22.225 h 0.112654 l 2.004012,-1.852083 h 0.388607 l 1.463477,-1.46451 v -0.91674 z m 0.114721,0.264583 v 0.529167 l -1.322916,1.322916 h -0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/magic-effect.png b/files/opencs/magic-effect.png
deleted file mode 100644
index 44b682bf4f..0000000000
Binary files a/files/opencs/magic-effect.png and /dev/null differ
diff --git a/files/opencs/magic-effect.svg b/files/opencs/magic-effect.svg
new file mode 100644
index 0000000000..0e949c04bb
--- /dev/null
+++ b/files/opencs/magic-effect.svg
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Orange">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2204"
+       x1="-25.818237"
+       y1="39.662796"
+       x2="-24.321527"
+       y2="39.662796"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2206"
+       x1="8.2020855"
+       y1="45.772919"
+       x2="9.2604179"
+       y2="45.772919"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2208"
+       x1="8.2020855"
+       y1="47.360416"
+       x2="9.2604179"
+       y2="47.360416"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2210"
+       x1="9.7895861"
+       y1="47.360416"
+       x2="10.847917"
+       y2="47.360416"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2186"
+       x1="27"
+       y1="163"
+       x2="31"
+       y2="163"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2212"
+       x1="8.9958334"
+       y1="48.154167"
+       x2="10.054167"
+       y2="48.154167"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2214"
+       x1="7.4083352"
+       y1="46.566669"
+       x2="8.4666681"
+       y2="46.566669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2216"
+       x1="10.583335"
+       y1="46.566669"
+       x2="11.641668"
+       y2="46.566669"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="magic-effect"
+     transform="matrix(3.7795278,0,0,3.7795278,-27.999998,-168)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1483"
+       width="4.2333331"
+       height="4.2333331"
+       x="7.4083323"
+       y="44.449997"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1699"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2204);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       transform="rotate(-45)"
+       d="m -25.631978,39.530506 h 1.124191 l 0.186259,0.132293 -0.186259,0.13229 h -1.124191 l -0.186259,-0.13229 z" />
+    <path
+       id="path1702"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2206);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 8.2402436,45.469002 0.7949232,0.794923 0.2252513,0.03816 -0.03816,-0.225249 -0.7949239,-0.794923 -0.2252483,-0.03816 z" />
+    <path
+       id="path1704"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2208);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 9.2222604,47.0565 -0.7949232,0.794923 -0.2252513,0.03816 0.03816,-0.225249 0.7949239,-0.794923 0.2252483,-0.03816 z" />
+    <path
+       id="path1706"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2210);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 9.8277434,47.0565 0.7949226,0.794923 0.225251,0.03816 -0.03816,-0.225249 -0.794923,-0.794923 -0.2252483,-0.03816 z" />
+    <path
+       id="path1708"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2186);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 28,161 c 1e-6,0.50001 -0.499999,1.00001 -1,1 v 2 c 0.500001,1e-5 1.000001,0.50001 1,1 h 2 c 1e-6,-0.49999 0.500001,-0.99999 1,-1 v -2 c -0.499999,1e-5 -0.999999,-0.49999 -1,-1 z m 0,1 h 2 v 2 h -2 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path1714"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2212);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 9.2604165,47.624999 c 3e-7,0.132294 -0.1322914,0.264586 -0.2645833,0.264583 v 0.529167 c 0.1322919,2e-6 0.2645836,0.132294 0.2645833,0.264583 h 0.5291667 c 3e-7,-0.132289 0.1322919,-0.264581 0.2645838,-0.264583 v -0.529167 c -0.1322919,3e-6 -0.2645835,-0.132289 -0.2645838,-0.264583 z m 0,0.264583 h 0.5291667 v 0.529167 H 9.2604165 Z" />
+    <path
+       id="path1716"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2214);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 7.6729184,46.037501 c 0,0.132294 -0.132292,0.264586 -0.264583,0.264583 v 0.529167 c 0.132291,2e-6 0.264583,0.132294 0.264583,0.264583 h 0.529167 c 0,-0.132289 0.132291,-0.264581 0.264583,-0.264583 v -0.529167 c -0.132292,3e-6 -0.264583,-0.132289 -0.264583,-0.264583 z m 0,0.264583 h 0.529167 v 0.529167 h -0.529167 z" />
+    <path
+       id="path1718"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2216);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 10.847918,46.037501 c 0,0.132294 -0.132292,0.264586 -0.264583,0.264583 v 0.529167 c 0.132291,2e-6 0.264583,0.132294 0.264583,0.264583 h 0.529167 c 0,-0.132289 0.132291,-0.264581 0.264583,-0.264583 v -0.529167 c -0.132292,3e-6 -0.264583,-0.132289 -0.264583,-0.264583 z m 0,0.264583 h 0.529167 v 0.529167 h -0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-close.png b/files/opencs/menu-close.png
deleted file mode 100644
index 81bc986775..0000000000
Binary files a/files/opencs/menu-close.png and /dev/null differ
diff --git a/files/opencs/menu-close.svg b/files/opencs/menu-close.svg
new file mode 100644
index 0000000000..fe2057dea9
--- /dev/null
+++ b/files/opencs/menu-close.svg
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-5">
+      <path
+         id="mask-powermask-path-effect3119_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path3117-7"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect3119_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-7" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-9">
+      <path
+         id="mask-powermask-path-effect3119_box-8"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path3117-8"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect3119_inverse-0"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive1-9"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive2-4"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-3">
+      <path
+         id="path3"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path4"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Red"
+       id="linearGradient4031"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-3-9">
+      <path
+         id="mask-powermask-path-effect3119-3_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path3-2"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path4-3"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect3119-3_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect3119-3_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect3119-3_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-3-7">
+      <path
+         id="mask-powermask-path-effect3119-3-7_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path1"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path2"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path5"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect3119-3-7_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect3119-3-7_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect3119-3-7_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+  </defs>
+  <g
+     id="menu-close"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-27.999998,-247.99997)">
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4031);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="path2014"
+       d="m 11.1125,67.733337 a 1.5875,1.5875 0 0 1 -1.5875004,1.5875 1.5875,1.5875 0 0 1 -1.5875,-1.5875 1.5875,1.5875 0 0 1 1.5875,-1.5875 1.5875,1.5875 0 0 1 1.5875004,1.5875 z" />
+    <path
+       d="m 8.7312489,66.939571 0.5681496,0.793757 -0.5667706,0.793743 h 0.4505184 l 0.3418591,-0.477482 0.3418593,0.477482 H 10.31737 L 9.7505997,67.733328 10.318749,66.939571 H 9.8661687 l -0.3411633,0.477497 -0.341176,-0.477497 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.374994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+       id="path1-5" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-exit.png b/files/opencs/menu-exit.png
deleted file mode 100644
index f583536fb6..0000000000
Binary files a/files/opencs/menu-exit.png and /dev/null differ
diff --git a/files/opencs/menu-exit.svg b/files/opencs/menu-exit.svg
new file mode 100644
index 0000000000..147da511a1
--- /dev/null
+++ b/files/opencs/menu-exit.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Red"
+       id="linearGradient6522"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="menu-exit"
+     transform="matrix(3.7795278,0,0,3.7795278,-148.00001,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1519"
+       width="4.2333331"
+       height="4.2333331"
+       x="39.158333"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="rect2073"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6522);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 39.6875,60.854168 v 3.175 h 3.175 v -3.175 z m 0.264584,0.79375 h 2.645833 v 2.116666 h -2.645833 z m 0.79375,0.79375 v 0.529166 h 1.058333 v -0.529166 z" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-merge.png b/files/opencs/menu-merge.png
deleted file mode 100644
index c76288ae16..0000000000
Binary files a/files/opencs/menu-merge.png and /dev/null differ
diff --git a/files/opencs/menu-merge.svg b/files/opencs/menu-merge.svg
new file mode 100644
index 0000000000..e2d7f394fb
--- /dev/null
+++ b/files/opencs/menu-merge.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2110"
+       x1="43"
+       y1="225"
+       x2="50"
+       y2="225"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2112"
+       x1="14.816667"
+       y1="62.441669"
+       x2="16.668751"
+       y2="62.441669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2114"
+       x1="13.229167"
+       y1="63.5"
+       x2="15.08125"
+       y2="63.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-merge"
+     transform="matrix(3.7795278,0,0,3.7795278,-48.000013,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1530"
+       width="4.2333331"
+       height="4.2333331"
+       x="12.700003"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1525"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2110);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 43,223 v 4 h 7 v -4 z m 1,1 h 5 v 2 h -5 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path1533"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2112);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 14.816667,61.912502 v 1.058333 h 1.852083 v -1.058333 z m 0.264583,0.264583 h 1.322917 v 0.529167 H 15.08125 Z" />
+    <path
+       id="path1535"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2114);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 13.229167,62.970835 v 1.058333 h 1.852083 v -1.058333 z m 0.264583,0.264583 h 1.322917 v 0.529167 H 13.49375 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-new-addon.png b/files/opencs/menu-new-addon.png
deleted file mode 100644
index df137b2b20..0000000000
Binary files a/files/opencs/menu-new-addon.png and /dev/null differ
diff --git a/files/opencs/menu-new-addon.svg b/files/opencs/menu-new-addon.svg
new file mode 100644
index 0000000000..46aaa1e1ec
--- /dev/null
+++ b/files/opencs/menu-new-addon.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2106"
+       x1="23"
+       y1="229.5"
+       x2="35"
+       y2="229.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2108"
+       x1="27"
+       y1="234"
+       x2="35"
+       y2="234"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-new-addon"
+     transform="matrix(3.7795278,0,0,3.7795188,-27.999998,-227.99943)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1532"
+       width="4.2333331"
+       height="4.2333331"
+       x="7.4083323"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="path1444"
+       style="fill:url(#linearGradient2106);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 23,222 v 15 h 3 v -1 h -2 v -13 h 6 v 4 h 4 v 5 h 1 v -6 l -4,-4 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path1449"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2108);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 29,231 v 2 h -2 v 4 h 8 v -4 h -2 v -2 z m 1,1 h 2 v 2 h 2 v 2 h -6 v -2 h 2 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-new-game.png b/files/opencs/menu-new-game.png
deleted file mode 100644
index 701daf34b1..0000000000
Binary files a/files/opencs/menu-new-game.png and /dev/null differ
diff --git a/files/opencs/menu-new-game.svg b/files/opencs/menu-new-game.svg
new file mode 100644
index 0000000000..416a774d30
--- /dev/null
+++ b/files/opencs/menu-new-game.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2104"
+       x1="3"
+       y1="229.5"
+       x2="15"
+       y2="229.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-new-game"
+     transform="matrix(3.7795278,0,0,3.7795188,-8.0000099,-227.99943)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1534"
+       width="4.2333331"
+       height="4.2333331"
+       x="2.1166692"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="path1440"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2104);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 3,222 v 15 h 12 v -11 l -4,-4 z m 1,1 h 6 v 4 h 4 v 9 H 4 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-new-window.png b/files/opencs/menu-new-window.png
deleted file mode 100644
index 4a42da0d12..0000000000
Binary files a/files/opencs/menu-new-window.png and /dev/null differ
diff --git a/files/opencs/menu-new-window.svg b/files/opencs/menu-new-window.svg
new file mode 100644
index 0000000000..33262366dc
--- /dev/null
+++ b/files/opencs/menu-new-window.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2116"
+       x1="18.520834"
+       y1="62.441669"
+       x2="21.695833"
+       y2="62.441669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2118"
+       x1="67"
+       y1="231"
+       x2="75"
+       y2="231"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-new-window"
+     transform="matrix(3.7795278,0,0,3.7795278,-67.999997,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1528"
+       width="4.2333331"
+       height="4.2333331"
+       x="17.991665"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2116);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 19.314584,64.029168 h -0.79375 v -3.174999 h 3.175 v 0.79375 h -0.264583 v -0.264584 h -2.645834 v 2.38125 h 0.529167 z"
+       id="path1537" />
+    <path
+       id="path1541"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2118);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 67,227 v 8 h 8 v -8 z m 1,2 h 6 v 5 h -6 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-open.png b/files/opencs/menu-open.png
deleted file mode 100644
index 3766e17549..0000000000
Binary files a/files/opencs/menu-open.png and /dev/null differ
diff --git a/files/opencs/menu-open.svg b/files/opencs/menu-open.svg
new file mode 100644
index 0000000000..a895b4157f
--- /dev/null
+++ b/files/opencs/menu-open.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2120"
+       x1="82"
+       y1="229"
+       x2="96"
+       y2="229"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-open"
+     transform="matrix(3.7795278,0,0,3.7795278,-88.000017,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1526"
+       width="4.2333331"
+       height="4.2333331"
+       x="23.283337"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="path1564"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2120);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 82,222 v 14 h 14 v -12 h -6 l -2,-2 z m 5,4 h 8 v 9 H 83 v -7 h 2 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-preferences.png b/files/opencs/menu-preferences.png
deleted file mode 100644
index 4644297ad0..0000000000
Binary files a/files/opencs/menu-preferences.png and /dev/null differ
diff --git a/files/opencs/menu-preferences.svg b/files/opencs/menu-preferences.svg
new file mode 100644
index 0000000000..f7c657deb2
--- /dev/null
+++ b/files/opencs/menu-preferences.svg
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2126"
+       x1="125"
+       y1="223.5"
+       x2="130"
+       y2="223.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2128"
+       x1="130"
+       y1="228.5"
+       x2="135"
+       y2="228.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2130"
+       x1="34.660416"
+       y1="63.63229"
+       x2="35.983334"
+       y2="63.63229"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2132"
+       x1="33.866669"
+       y1="62.309376"
+       x2="36.380211"
+       y2="62.309376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2134"
+       x1="36.115627"
+       y1="60.986462"
+       x2="38.099998"
+       y2="60.986462"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2136"
+       x1="33.866669"
+       y1="60.986462"
+       x2="35.057293"
+       y2="60.986462"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2138"
+       x1="37.438541"
+       y1="62.309376"
+       x2="38.100002"
+       y2="62.309376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2140"
+       x1="35.851044"
+       y1="63.632294"
+       x2="38.100006"
+       y2="63.632294"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2142"
+       x1="33.866665"
+       y1="63.632294"
+       x2="34.792709"
+       y2="63.632294"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-preferences"
+     transform="matrix(3.7795203,0,0,3.7795278,-127.99975,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1521"
+       width="4.2333331"
+       height="4.2333331"
+       x="33.866673"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="path2087"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2126);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 127.5,221 a 2.4999999,2.4999999 0 0 0 -2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,-2.5 2.4999999,2.4999999 0 0 0 -2.5,-2.5 z m 0,1 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path2089"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2128);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 132.5,226 a 2.4999999,2.4999999 0 0 0 -2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,-2.5 2.4999999,2.4999999 0 0 0 -2.5,-2.5 z m 0,1 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path2091"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2130);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 35.321875,62.970833 a 0.6614583,0.6614583 0 0 0 -0.661459,0.661458 0.6614583,0.6614583 0 0 0 0.661459,0.661458 0.6614583,0.6614583 0 0 0 0.661458,-0.661458 0.6614583,0.6614583 0 0 0 -0.661458,-0.661458 z m 0,0.264583 a 0.396875,0.396875 0 0 1 0.396875,0.396875 0.396875,0.396875 0 0 1 -0.396875,0.396875 0.396875,0.396875 0 0 1 -0.396875,-0.396875 0.396875,0.396875 0 0 1 0.396875,-0.396875 z" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2132);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect2095"
+       width="2.5135405"
+       height="0.26458237"
+       x="33.866669"
+       y="62.177086"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2134);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1311"
+       width="1.9843726"
+       height="0.26458332"
+       x="36.115627"
+       y="60.854168"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2136);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1313"
+       width="1.1906255"
+       height="0.26458332"
+       x="33.866669"
+       y="60.854168"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2138);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1315"
+       width="0.66145945"
+       height="0.26458237"
+       x="37.438541"
+       y="62.177086"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2140);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1317"
+       width="2.2489626"
+       height="0.26458359"
+       x="35.851044"
+       y="63.5"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2142);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1319"
+       width="0.92604423"
+       height="0.26458359"
+       x="33.866665"
+       y="63.5"
+       rx="1.3877792e-16" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-redo.png b/files/opencs/menu-redo.png
deleted file mode 100644
index 0cd0eedcae..0000000000
Binary files a/files/opencs/menu-redo.png and /dev/null differ
diff --git a/files/opencs/menu-redo.svg b/files/opencs/menu-redo.svg
new file mode 100644
index 0000000000..f19f236e7e
--- /dev/null
+++ b/files/opencs/menu-redo.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2096"
+       x1="50.281166"
+       y1="62.838539"
+       x2="52.926998"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2098"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-redo"
+     transform="matrix(3.7795278,0,0,3.7795278,-187.99999,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1511"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741661"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="path1343"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2096);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 52.926998,61.647913 v 0.264583 H 51.47179 c -0.511439,0 -0.926042,0.414602 -0.926042,0.926042 0,0.511439 0.414603,0.926041 0.926042,0.926041 h 0.396875 v 0.264584 H 51.47179 c -0.657564,0 -1.190625,-0.533062 -1.190625,-1.190625 0,-0.657564 0.533061,-1.190625 1.190625,-1.190625 z" />
+    <path
+       id="path1347"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2098);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 52.205595,60.854163 0.975651,0.926041 -0.975651,0.926042 -0.12299,-0.181901 0.65009,-0.611849 v -0.264583 l -0.65009,-0.611849 z" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-reload.png b/files/opencs/menu-reload.png
deleted file mode 100644
index 2b780598c4..0000000000
Binary files a/files/opencs/menu-reload.png and /dev/null differ
diff --git a/files/opencs/menu-reload.svg b/files/opencs/menu-reload.svg
new file mode 100644
index 0000000000..32cefa7548
--- /dev/null
+++ b/files/opencs/menu-reload.svg
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2146"
+       x1="61.899818"
+       y1="249"
+       x2="76.100182"
+       y2="249"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-61">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795278,0,0,3.7795278,-189.44141,-219.41797)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2096"
+       x1="50.281166"
+       y1="62.838539"
+       x2="52.926998"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098-8"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2096-5"
+       x1="50.286324"
+       y1="62.972603"
+       x2="52.024643"
+       y2="62.967445"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.27492098,-0.52917219)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098-4"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.3228271,-0.79375592)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2092"
+       x1="45.243748"
+       y1="62.838539"
+       x2="47.88958"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.26458362)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2094"
+       x1="44.989498"
+       y1="61.780205"
+       x2="46.088139"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.79373763)" />
+  </defs>
+  <g
+     id="menu-reload"
+     transform="matrix(3.7795278,0,0,3.7795278,-187.99999,-227.99997)"
+     style="display:inline">
+    <path
+       d="m 52.8211,61.122306 -2.004035,-0.0036 0.217103,-0.201119 c 0.158097,-0.150209 -0.07905,-0.375524 -0.237144,-0.225315 l -0.50101,0.476016 c -0.06587,0.06207 -0.06587,0.163247 0,0.225315 l 0.50101,0.476016 c 0.06533,0.06258 0.171817,0.06258 0.237144,0 0.06587,-0.06207 0.06585,-0.163246 -1.8e-5,-0.225315 L 50.817065,61.383321 H 52.8211 c 0.143894,-0.0027 0.357404,0.162378 0.360144,0.299094 v 0.391921 c 0,0.211563 0.264583,0.211563 0.264583,0 v -0.391921 c -0.0028,-0.311974 -0.296373,-0.566316 -0.624727,-0.563677 z m 0.07432,1.891352 c -0.158096,-0.149435 -0.394425,0.07511 -0.237143,0.225315 l 0.2171,0.261015 h -2.004033 c -0.143895,0.0027 -0.333193,-0.162379 -0.335933,-0.299097 v -0.39192 c -5.38e-4,-0.21105 -0.264046,-0.21105 -0.264584,0 v 0.39192 c 0.0028,0.311975 0.272162,0.56632 0.600517,0.56368 h 2.004035 l -0.217101,0.20112 c -0.06587,0.06207 -0.06587,0.163245 0,0.225314 0.06533,0.06258 0.171816,0.06258 0.237144,0 l 0.501007,-0.476016 c 0.06587,-0.06207 0.06587,-0.163245 0,-0.225314 z"
+       id="path1"
+       style="display:inline;overflow:hidden;fill:#4d4d4d;fill-opacity:1;stroke-width:0.00381524" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-save.png b/files/opencs/menu-save.png
deleted file mode 100644
index 4be88765be..0000000000
Binary files a/files/opencs/menu-save.png and /dev/null differ
diff --git a/files/opencs/menu-save.svg b/files/opencs/menu-save.svg
new file mode 100644
index 0000000000..c9cb6f4bef
--- /dev/null
+++ b/files/opencs/menu-save.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2100"
+       x1="202"
+       y1="229"
+       x2="216"
+       y2="229"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+  </defs>
+  <g
+     id="menu-save"
+     transform="matrix(3.7795278,0,0,3.7795278,-208,-227.99997)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1513"
+       width="4.2333331"
+       height="4.2333331"
+       x="55.033329"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="path1447"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2100);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 202,222 v 14 h 14 v -11 l -3,-3 z m 10.5,1 2.5,2.5 v 9.5 h -2 v -6 h -8 v 6 h -2 v -12 h 3 v 4 h 6 v -4 m -5,0 h 2 v 3 h -2 z m -1,7 h 6 v 5 h -6 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-search.png b/files/opencs/menu-search.png
deleted file mode 100644
index 1ec63f0e82..0000000000
Binary files a/files/opencs/menu-search.png and /dev/null differ
diff --git a/files/opencs/menu-search.svg b/files/opencs/menu-search.svg
new file mode 100644
index 0000000000..10b5b20b00
--- /dev/null
+++ b/files/opencs/menu-search.svg
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2444"
+       x1="4.2333331"
+       y1="68.527084"
+       x2="5.8208337"
+       y2="68.527084"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2152"
+       x1="2"
+       y1="246.5"
+       x2="11"
+       y2="246.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-search"
+     transform="matrix(3.7795278,0,0,3.7795278,-8.0000099,-247.99997)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1559"
+       width="4.2333331"
+       height="4.2333331"
+       x="2.1166692"
+       y="65.616653"
+       rx="1.9824198e-15" />
+    <path
+       id="path1935"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="M 6.5,242 A 4.5,4.5 0 0 0 2,246.5 4.5,4.5 0 0 0 6.5,251 4.5,4.5 0 0 0 11,246.5 4.5,4.5 0 0 0 6.5,242 Z m 0,1 A 3.5000002,3.5000002 0 0 1 10,246.5 3.5000002,3.5000002 0 0 1 6.5,250 3.5000002,3.5000002 0 0 1 3,246.5 3.5000002,3.5000002 0 0 1 6.5,243 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1942"
+       width="0.52916664"
+       height="0.52916664"
+       x="2.6458333"
+       y="68.791672" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1948"
+       width="0.52916664"
+       height="0.52916664"
+       x="3.4395833"
+       y="68.791672" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1950"
+       width="0.52916664"
+       height="0.52916664"
+       x="4.2333336"
+       y="68.791672" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2444);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 4.2333333,67.997918 1.3229166,1.322917 0.2031949,-0.06139 0.061389,-0.203195 -1.3229167,-1.322917 z"
+       id="path1952" />
+    <path
+       id="path2095"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2152);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="M 6.5,242 A 4.5,4.5 0 0 0 2,246.5 4.5,4.5 0 0 0 6.5,251 4.5,4.5 0 0 0 11,246.5 4.5,4.5 0 0 0 6.5,242 Z m 0,1 A 3.5000002,3.5000002 0 0 1 10,246.5 3.5000002,3.5000002 0 0 1 6.5,250 3.5000002,3.5000002 0 0 1 3,246.5 3.5000002,3.5000002 0 0 1 6.5,243 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-status-bar.png b/files/opencs/menu-status-bar.png
deleted file mode 100644
index dfb72b1e13..0000000000
Binary files a/files/opencs/menu-status-bar.png and /dev/null differ
diff --git a/files/opencs/menu-status-bar.svg b/files/opencs/menu-status-bar.svg
new file mode 100644
index 0000000000..a6b4d15d1e
--- /dev/null
+++ b/files/opencs/menu-status-bar.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2122"
+       x1="29.104166"
+       y1="61.912502"
+       x2="32.279167"
+       y2="61.912502"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2124"
+       x1="103"
+       y1="233.5"
+       x2="115"
+       y2="233.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-status-bar"
+     transform="matrix(3.7795278,0,0,3.7795278,-108.00001,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1523"
+       width="4.2333331"
+       height="4.2333331"
+       x="28.575001"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2122);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 29.104166,62.970835 v -2.116666 h 3.175 v 2.116666 h -0.264583 v -1.5875 H 29.36875 v 1.5875 z"
+       id="path2048" />
+    <path
+       id="rect2052"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2124);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 103,232 v 3 h 12 v -3 z m 1,1 h 10 v 1 h -10 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-undo.png b/files/opencs/menu-undo.png
deleted file mode 100644
index bd177ce65a..0000000000
Binary files a/files/opencs/menu-undo.png and /dev/null differ
diff --git a/files/opencs/menu-undo.svg b/files/opencs/menu-undo.svg
new file mode 100644
index 0000000000..1fffc9959d
--- /dev/null
+++ b/files/opencs/menu-undo.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2092"
+       x1="45.243748"
+       y1="62.838539"
+       x2="47.88958"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2094"
+       x1="44.989498"
+       y1="61.780205"
+       x2="46.088139"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-undo"
+     transform="matrix(3.7795278,0,0,3.7795278,-168.00001,-227.99998)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1517"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.450001"
+       y="60.324989"
+       rx="1.9824198e-15" />
+    <path
+       id="path1337"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 45.243747,61.647913 v 0.264583 h 1.455208 c 0.511439,0 0.926042,0.414602 0.926042,0.926042 0,0.511439 -0.414603,0.926041 -0.926042,0.926041 H 46.30208 v 0.264584 h 0.396875 c 0.657564,0 1.190625,-0.533062 1.190625,-1.190625 0,-0.657564 -0.533061,-1.190625 -1.190625,-1.190625 z" />
+    <path
+       id="path1339"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2094);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 45.96515,60.854163 -0.975651,0.926041 0.975651,0.926042 0.12299,-0.181901 -0.65009,-0.611849 v -0.264583 l 0.65009,-0.611849 z" />
+  </g>
+</svg>
diff --git a/files/opencs/menu-verify.png b/files/opencs/menu-verify.png
deleted file mode 100644
index a7878ebb3f..0000000000
Binary files a/files/opencs/menu-verify.png and /dev/null differ
diff --git a/files/opencs/menu-verify.svg b/files/opencs/menu-verify.svg
new file mode 100644
index 0000000000..d72d229edd
--- /dev/null
+++ b/files/opencs/menu-verify.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Orange">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2144"
+       x1="41.900211"
+       y1="248.99886"
+       x2="56.855469"
+       y2="248.99886"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="menu-verify"
+     transform="matrix(3.7795278,0,0,3.7795278,-48.000013,-247.99997)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1555"
+       width="4.2333331"
+       height="4.2333331"
+       x="12.700003"
+       y="65.616653"
+       rx="1.9824198e-15" />
+    <path
+       id="path2058"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2144);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 48.957031,241.89844 a 7.0999998,7.0999998 0 0 0 -0.08594,0.002 7.0999998,7.0999998 0 0 0 -5,2.18945 7.0999998,7.0999998 0 0 0 -0.578125,9.13282 7.0999998,7.0999998 0 0 0 8.902343,2.11718 7.0999998,7.0999998 0 0 0 3.59375,-8.41601 l -1.242187,0.38086 A 5.7999999,5.7999999 0 0 1 54.800781,249 5.7999999,5.7999999 0 0 1 49,254.80078 5.7999999,5.7999999 0 0 1 43.199219,249 5.7999999,5.7999999 0 0 1 49,243.19922 a 5.7999999,5.7999999 0 0 1 3.244141,0.99219 l 0.726562,-1.07813 a 7.0999998,7.0999998 0 0 0 -4.013672,-1.21484 z m 6.908203,0.43554 -7.798828,7.79688 -1.941406,-1.94141 -0.990234,0.99024 2.93164,2.93164 8.789063,-8.78711 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/metadata.png b/files/opencs/metadata.png
deleted file mode 100644
index 34c78ffd61..0000000000
Binary files a/files/opencs/metadata.png and /dev/null differ
diff --git a/files/opencs/metadata.svg b/files/opencs/metadata.svg
new file mode 100644
index 0000000000..acccf4f4b7
--- /dev/null
+++ b/files/opencs/metadata.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient1655"
+       gradientUnits="userSpaceOnUse"
+       x1="22"
+       y1="188.5"
+       x2="36"
+       y2="188.5" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient1676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(125.99999,-19.999999)"
+       x1="24"
+       y1="185.5"
+       x2="28"
+       y2="185.5" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient1659"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0.52916674,1.8520833)" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient1663"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="191.5"
+       x2="34"
+       y2="191.5"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0.52916674,1.8520833)" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient6474"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(114.99999,-19.999999)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+  </defs>
+  <g
+     id="metadata"
+     transform="matrix(3.7795278,0,0,3.7795278,-27.999998,-187.99999)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1641"
+       width="4.2333331"
+       height="4.2333331"
+       x="7.4083323"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="path1643"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1655);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 22,181 v 15 h 14 v -15 z m 1,1 h 12 v 13 H 23 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path1645"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1676);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 150,163 v 5 h 4 v -1 h -3 v -1 h 2 v -1 h -2 v -1 h 3 v -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,-29.897914,7.1437497)" />
+    <path
+       id="path1647"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1659);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 8.2020833,50.270833 v 1.322916 h 0.2645834 v -0.926041 l 0.396875,0.661458 0.3968754,-0.661458 v 0.926041 H 9.5250004 V 50.270833 H 9.2604171 l -0.3968754,0.661458 -0.396875,-0.661458 z" />
+    <path
+       id="path1651"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1663);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 8.2020833,51.858333 v 0.264583 H 8.73125 v 1.058333 h 0.2645838 v -1.058333 h 0.5291666 v -0.264583 z" />
+    <path
+       id="rect1681"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6474);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 150,169 v 5 h 1 v -2 h 2 v 2 h 1 v -5 h -1 -2 z m 1,1 h 2 v 1 h -2 z"
+       transform="matrix(0.26458333,0,0,0.26458333,-29.897914,7.1437497)" />
+  </g>
+</svg>
diff --git a/files/opencs/miscellaneous.png b/files/opencs/miscellaneous.png
deleted file mode 100644
index b21f6e2141..0000000000
Binary files a/files/opencs/miscellaneous.png and /dev/null differ
diff --git a/files/opencs/miscellaneous.svg b/files/opencs/miscellaneous.svg
new file mode 100644
index 0000000000..ac1bda5e5a
--- /dev/null
+++ b/files/opencs/miscellaneous.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2384"
+       x1="17.991669"
+       y1="20.108334"
+       x2="22.225"
+       y2="20.108334"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="miscellaneous"
+     style="display:inline"
+     transform="matrix(3.779526,0,0,3.7795277,-67.999965,-68.000002)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1406"
+       width="4.2333331"
+       height="4.2333331"
+       x="17.991665"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="path1204"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2384);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 20.6375,17.991667 -2.551782,3.439583 -0.09405,0.529167 0.264583,0.264583 0.529167,-0.264583 2.645833,-2.38125 0.793749,-1.058334 -0.264583,-0.529166 z m 0.275953,0.264583 h 0.8816 l 0.12299,0.238745 -0.619084,0.819588 -0.168465,0.03824 z m -0.239779,0.128158 0.204639,1.022159 -1.14205,0.240296 z m 0.275952,1.275374 -0.674894,0.60048 v -0.45682 z m -0.841292,0.183968 v 0.573609 l -1.474329,1.321366 -0.326078,0.164848 -0.03307,-0.03411 0.06459,-0.337447 1.158586,-1.563212 z" />
+  </g>
+</svg>
diff --git a/files/opencs/multitype.png b/files/opencs/multitype.png
deleted file mode 100644
index 05676e2de0..0000000000
Binary files a/files/opencs/multitype.png and /dev/null differ
diff --git a/files/opencs/multitype.svg b/files/opencs/multitype.svg
new file mode 100644
index 0000000000..c42da95866
--- /dev/null
+++ b/files/opencs/multitype.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2265"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083333"
+       y1="4.2333331"
+       x2="11.641666"
+       y2="4.2333331" />
+  </defs>
+  <g
+     id="list-base"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-28.000001,-8)">
+    <path
+       id="rect913"
+       style="fill:url(#linearGradient2265);fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7.9375036,2.6458333 v 3.175 h 3.1750024 v -3.175 z M 8.2020869,2.9104166 H 10.847923 V 5.5562499 H 8.2020869 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/npc.png b/files/opencs/npc.png
deleted file mode 100644
index 5b5b199be6..0000000000
Binary files a/files/opencs/npc.png and /dev/null differ
diff --git a/files/opencs/npc.svg b/files/opencs/npc.svg
new file mode 100644
index 0000000000..3ae9a3127c
--- /dev/null
+++ b/files/opencs/npc.svg
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient3">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105-3">
+      <path
+         id="mask-powermask-path-effect1105_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path1103-3"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect1105_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1105_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1105_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105-2">
+      <path
+         id="path1"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path2"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       xlink:href="#linearGradient3"
+       id="linearGradient2414"
+       x1="12.964583"
+       y1="25.4"
+       x2="16.933334"
+       y2="25.4"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105-7">
+      <path
+         id="mask-powermask-path-effect1105_box-3"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path1103-5"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2416"
+       x1="24.606249"
+       y1="20.108334"
+       x2="25.135416"
+       y2="20.108334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2418"
+       x1="25.929167"
+       y1="19.598701"
+       x2="26.855207"
+       y2="19.598701"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       id="mask-powermask-path-effect1105_inverse-6"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1105_primitive1-0"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1105_primitive2-4"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105-9">
+      <path
+         id="mask-powermask-path-effect1105-9_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path3"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path4"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect1105-9_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1105-9_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1105-9_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105-9-0">
+      <path
+         id="mask-powermask-path-effect1105-9_box-1"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path3-0"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path4-1"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect1105-9_inverse-6"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1105-9_primitive1-7"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1105-9_primitive2-6"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105-9-3">
+      <path
+         id="path5"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path6"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path7"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+  </defs>
+  <g
+     id="npc"
+     style="display:inline"
+     transform="matrix(3.7803973,0,0,3.5546338,-88.526434,-63.477765)">
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 14.816667,23.283334 c 0.513578,0 1.5875,0.423767 1.5875,1.5875 L 16.933334,25.4 v 0.529167 h -0.529167 c 0,0.930046 -0.361988,1.058334 -0.79375,1.058334 v 0.529166 h -1.852083 c 0,-0.372674 -0.0377,-0.857766 -0.255282,-1.071769 -0.336724,-0.334863 -0.538469,-1.063636 -0.538469,-1.574064 0,-1.020755 0.828782,-1.5875 1.852084,-1.5875 z"
+       id="path1078"
+       mask="url(#mask-powermask-path-effect1105-9)"
+       transform="translate(10.583333,-5.2916664)" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2416);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 24.606249,20.108334 v -0.264583 l 0.365869,-0.264583 0.163298,0.233577 -0.29559,0.163298 0.29559,0.42788 -0.163298,0.233578 z"
+       id="path1080" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2418);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 26.855207,19.314584 h -0.926041 l 0.463434,0.568234 0.187895,-0.15813 -0.258589,-0.241845 0.52834,0.100458 z"
+       id="path1111" />
+  </g>
+</svg>
diff --git a/files/opencs/object.png b/files/opencs/object.png
deleted file mode 100644
index 4f552151db..0000000000
Binary files a/files/opencs/object.png and /dev/null differ
diff --git a/files/opencs/object.svg b/files/opencs/object.svg
new file mode 100644
index 0000000000..8f9261fd18
--- /dev/null
+++ b/files/opencs/object.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Orange-2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2584-0" />
+    </linearGradient>
+  </defs>
+  <g
+     id="object"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.77117,-148,-187.58427)">
+    <ellipse
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.264876;stroke-dasharray:none;stroke-opacity:1"
+       id="path1"
+       cx="41.274998"
+       cy="51.863018"
+       rx="1.7196451"
+       ry="1.7237496" />
+  </g>
+</svg>
diff --git a/files/opencs/pathgrid.png b/files/opencs/pathgrid.png
deleted file mode 100644
index 710ff13576..0000000000
Binary files a/files/opencs/pathgrid.png and /dev/null differ
diff --git a/files/opencs/pathgrid.svg b/files/opencs/pathgrid.svg
new file mode 100644
index 0000000000..ba16efcacf
--- /dev/null
+++ b/files/opencs/pathgrid.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2174"
+       x1="88"
+       y1="185.5"
+       x2="94"
+       y2="185.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2172"
+       x1="24.077084"
+       y1="52.784374"
+       x2="25.664583"
+       y2="52.784374"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Blue-2"
+       id="linearGradient2492"
+       x1="25.929165"
+       y1="52.784374"
+       x2="27.252083"
+       y2="52.784374"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Blue-2"
+       id="linearGradient2494"
+       x1="23.547918"
+       y1="50.932293"
+       x2="24.870834"
+       y2="50.932293"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="pathgrid"
+     transform="matrix(3.7795278,0,0,3.7795235,-88.000018,-187.99978)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1501"
+       width="4.2333331"
+       height="4.2333331"
+       x="23.283337"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1979"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2174);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 88,184 v 1 h 5 v 2 h 1 v -3 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#62a0ea;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 24.209376,49.741668 -0.661458,1.190624 0.661458,1.190626 0.661459,-1.190626 z"
+       id="path1986" />
+    <path
+       id="path1988"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2172);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 25.664584,53.181251 v -0.264583 h -1.322917 v -0.529167 h -0.264583 v 0.79375 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2492);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 26.590624,53.974999 0.661458,-1.190624 -0.661458,-1.190626 -0.661459,1.190626 z"
+       id="path1990" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2494);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 24.209376,49.741668 -0.661458,1.190624 0.661458,1.190626 0.661459,-1.190626 z"
+       id="path7234" />
+  </g>
+</svg>
diff --git a/files/opencs/potion.png b/files/opencs/potion.png
deleted file mode 100644
index cb173bb9ed..0000000000
Binary files a/files/opencs/potion.png and /dev/null differ
diff --git a/files/opencs/potion.svg b/files/opencs/potion.svg
new file mode 100644
index 0000000000..b59d12683f
--- /dev/null
+++ b/files/opencs/potion.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2306"
+       x1="29.104166"
+       y1="20.108332"
+       x2="32.279167"
+       y2="20.108332"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient6468"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="potion"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.779527,-108.00001,-67.999988)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1402"
+       width="4.2333331"
+       height="4.2333331"
+       x="28.575001"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="path979"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2306);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 30.691666,17.991666 h -0.26458 c 0,0 -0.264584,0 -0.264584,0.264583 h -0.264586 v 0.264584 c 0,0 0.216853,0.149352 0.264584,0.264583 2e-6,0 0,0.355534 0,0.355534 -0.634225,0.224232 -1.058265,0.823851 -1.058334,1.496549 0,0.876752 0.710748,1.587499 1.5875,1.587499 0.876753,0 1.5875,-0.710747 1.5875,-1.587499 -6.9e-5,-0.672698 -0.424108,-1.272317 -1.058333,-1.496549 v -0.355534 c 0.04773,-0.115231 0.264583,-0.264583 0.264583,-0.264583 v -0.264584 h -0.264583 c 3e-6,-0.264583 -0.264581,-0.264583 -0.264581,-0.264583 z m -0.264583,0.264583 h 0.529167 v 0.264584 h -0.529167 z m 0,0.529167 h 0.529167 v 0.556038 c 0.615886,0.125719 1.058267,0.667461 1.058333,1.296045 0,0.730623 -0.592288,1.322911 -1.322917,1.322917 -0.730628,-6e-6 -1.322916,-0.592294 -1.322916,-1.322917 6.6e-5,-0.628584 0.442446,-1.170326 1.058333,-1.296045 z" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient6468);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 29.427734,19.857422 -0.117187,0.236328 c 0.56072,0.28036 1.116277,0.279297 1.380859,0.279297 0.264585,0 0.822092,0.0011 1.382813,-0.279297 l -0.119141,-0.236328 c -0.497614,0.248806 -0.999087,0.25 -1.263672,0.25 -0.264582,0 -0.766058,-0.0012 -1.263672,-0.25 z"
+       id="path6699" />
+  </g>
+</svg>
diff --git a/files/opencs/probe.png b/files/opencs/probe.png
deleted file mode 100644
index 2e405d3653..0000000000
Binary files a/files/opencs/probe.png and /dev/null differ
diff --git a/files/opencs/probe.svg b/files/opencs/probe.svg
new file mode 100644
index 0000000000..0d812c5ace
--- /dev/null
+++ b/files/opencs/probe.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2394"
+       x1="34.063038"
+       y1="20.097998"
+       x2="38.099998"
+       y2="20.097998"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="probe"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-128.00003,-68.000004)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1400"
+       width="4.2333331"
+       height="4.2333331"
+       x="33.866673"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="path1310"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2394);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 37.46128,17.991667 -3.398242,3.399275 v 0.132292 l 0.681095,0.681096 0.227375,-0.227377 -0.491442,-0.49506 v -0.133325 l 1.503267,-1.504818 h 0.926042 L 38.1,18.653125 v -0.661458 z m 0.109553,0.264583 0.264584,0.264583 -1.058334,1.058334 h -0.529166 z" />
+  </g>
+</svg>
diff --git a/files/opencs/qt.png b/files/opencs/qt.png
deleted file mode 100644
index 381cb2251f..0000000000
Binary files a/files/opencs/qt.png and /dev/null differ
diff --git a/files/opencs/qt.svg b/files/opencs/qt.svg
new file mode 100644
index 0000000000..26cccc69d8
--- /dev/null
+++ b/files/opencs/qt.svg
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-5">
+      <path
+         id="mask-powermask-path-effect3119_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path3117-7"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect3119_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-7" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-9">
+      <path
+         id="mask-powermask-path-effect3119_box-8"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path3117-8"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect3119_inverse-0"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive1-9"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive2-4"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119-3">
+      <path
+         id="path3"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path4"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#00c880;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Green"
+       id="linearGradient1726"
+       gradientUnits="userSpaceOnUse"
+       x1="2.1166668"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientTransform="translate(5.2916666)" />
+  </defs>
+  <g
+     id="qt"
+     transform="matrix(3.7795278,0,0,3.7795278,-128.00002,-207.99998)"
+     style="display:inline">
+    <path
+       id="rect1703"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1726);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 34.660415,55.827083 h 3.175 v 0 2.116667 0 0 l -0.529167,0.529167 h -3.175 v 0 0 0 0 -2.116667 z" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1863"
+       width="0.26458332"
+       height="1.5875"
+       x="36.512501"
+       y="56.356251"
+       rx="0.13229299"
+       ry="0.13229299" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1867"
+       width="0.79374999"
+       height="0.26458332"
+       x="36.247917"
+       y="56.620834"
+       rx="0.13229299"
+       ry="0.13229299" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1871"
+       width="0.52916664"
+       height="0.26458332"
+       x="36.512501"
+       y="57.679169"
+       rx="0.13229299"
+       ry="0.13229299" />
+    <path
+       id="rect1875"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 126.5,206 c -0.831,0 -1.5,0.669 -1.5,1.5 v 3 c 0,0.831 0.669,1.5 1.5,1.5 h 1 c 0.831,0 1.5,-0.669 1.5,-1.5 v -3 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m 0.25,1 h 0.5 c 0.4155,0 0.75,0.33449 0.75,0.75 v 2.5 c 0,0.4155 -0.33449,0.75 -0.75,0.75 h -0.5 c -0.4155,0 -0.75,-0.33449 -0.75,-0.75 v -2.5 c 0,-0.4155 0.33449,-0.75 0.75,-0.75 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="rect1907"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 35.621906,57.811459 0.229136,-0.132291 0.198438,0.343704 -0.229136,0.132291 z" />
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1788"
+       width="4.2333331"
+       height="4.2333331"
+       x="33.866669"
+       y="55.033325"
+       rx="1.9824198e-15" />
+  </g>
+</svg>
diff --git a/files/opencs/race.png b/files/opencs/race.png
deleted file mode 100644
index aeed2fdf3e..0000000000
Binary files a/files/opencs/race.png and /dev/null differ
diff --git a/files/opencs/race.svg b/files/opencs/race.svg
new file mode 100644
index 0000000000..cd7778127e
--- /dev/null
+++ b/files/opencs/race.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2462"
+       x1="12.700001"
+       y1="46.566666"
+       x2="14.816667"
+       y2="46.566666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient4027"
+       gradientUnits="userSpaceOnUse"
+       x1="14.816667"
+       y1="46.566666"
+       x2="16.933334"
+       y2="46.566666" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       x1="14.816667"
+       y1="46.566666"
+       x2="16.933334"
+       y2="46.566666" />
+  </defs>
+  <g
+     id="race"
+     transform="matrix(3.7795263,0,0,3.7795251,-47.999987,-167.99988)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1481"
+       width="4.2333331"
+       height="4.2333331"
+       x="12.700003"
+       y="44.449997"
+       rx="1.9824198e-15" />
+    <path
+       id="path1801"
+       mask="none"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 14.816667,44.449999 c -0.513578,0 -1.5875,0.423768 -1.5875,1.5875 l -0.529166,0.529167 v 0.529167 h 0.529166 c 0,0.930045 0.361988,1.058333 0.79375,1.058333 v 0.529167 h 0.79375 v -0.264584 h -0.529166 v -0.263548 a 0.26560994,0.26560994 0 0 0 -0.265617,-0.266134 c -0.189524,0 -0.294034,-0.02426 -0.366903,-0.09922 -0.07287,-0.07495 -0.160197,-0.262858 -0.160197,-0.693499 a 0.26560994,0.26560994 0 0 0 -0.265617,-0.265616 h -0.263549 v -0.154514 l 0.451135,-0.451135 a 0.26560994,0.26560994 0 0 0 0.07803,-0.187069 c 0,-0.500139 0.215724,-0.806127 0.496094,-1.018024 0.280156,-0.211738 0.641983,-0.304233 0.825789,-0.304374 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 13.361461,45.772914 h 0.926041 l -0.463434,0.568234 -0.187895,-0.15813 0.258589,-0.241845 -0.52834,0.100458 z"
+       id="path1805" />
+    <path
+       id="path1866"
+       mask="none"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4027);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 14.816667,44.449999 v 4.233334 h 0.79375 v -0.529167 c 0.431762,0 0.79375,-0.128288 0.79375,-1.058333 h 0.529167 v -0.529167 l -0.529167,-0.529167 c 0,-1.163732 -1.073922,-1.5875 -1.5875,-1.5875 z m 0.514697,1.322917 h 1.008724 l 0.03514,0.165365 -0.642855,-0.03979 0.333829,0.168981 -0.183968,0.109554 z" />
+  </g>
+</svg>
diff --git a/files/opencs/random.png b/files/opencs/random.png
deleted file mode 100644
index 2667630f5c..0000000000
Binary files a/files/opencs/random.png and /dev/null differ
diff --git a/files/opencs/raster/startup/big/configure.png b/files/opencs/raster/startup/big/configure.png
deleted file mode 100644
index f0be888a15..0000000000
Binary files a/files/opencs/raster/startup/big/configure.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/configure.png b/files/opencs/raster/startup/small/configure.png
deleted file mode 100644
index e91b7f7731..0000000000
Binary files a/files/opencs/raster/startup/small/configure.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/create-addon.png b/files/opencs/raster/startup/small/create-addon.png
deleted file mode 100644
index 64fd138be5..0000000000
Binary files a/files/opencs/raster/startup/small/create-addon.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/edit-content.png b/files/opencs/raster/startup/small/edit-content.png
deleted file mode 100644
index 6297f1169c..0000000000
Binary files a/files/opencs/raster/startup/small/edit-content.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/new-game.png b/files/opencs/raster/startup/small/new-game.png
deleted file mode 100644
index 0d7d14c558..0000000000
Binary files a/files/opencs/raster/startup/small/new-game.png and /dev/null differ
diff --git a/files/opencs/record-add.png b/files/opencs/record-add.png
deleted file mode 100644
index d477f19460..0000000000
Binary files a/files/opencs/record-add.png and /dev/null differ
diff --git a/files/opencs/record-add.svg b/files/opencs/record-add.svg
new file mode 100644
index 0000000000..d29682bc59
--- /dev/null
+++ b/files/opencs/record-add.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue-2"
+       id="linearGradient2498"
+       x1="23.8125"
+       y1="4.2333331"
+       x2="26.987499"
+       y2="4.2333331"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="record-add"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-88.000017,-8.0000009)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1354"
+       width="4.2333331"
+       height="4.2333331"
+       x="23.283337"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1113"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2498);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 25.135416,2.6458331 v 1.322917 H 23.8125 v 0.529167 h 1.322916 v 1.3229163 h 0.529167 V 4.4979171 H 26.9875 v -0.529167 h -1.322917 v -1.322917 z" />
+  </g>
+</svg>
diff --git a/files/opencs/record-clone.png b/files/opencs/record-clone.png
deleted file mode 100644
index 262a67a424..0000000000
Binary files a/files/opencs/record-clone.png and /dev/null differ
diff --git a/files/opencs/record-clone.svg b/files/opencs/record-clone.svg
new file mode 100644
index 0000000000..3014b2b4e0
--- /dev/null
+++ b/files/opencs/record-clone.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2422"
+       x1="28.839582"
+       y1="3.9687502"
+       x2="32.014584"
+       y2="3.9687502"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2184"
+       x1="14.816667"
+       y1="46.566666"
+       x2="16.933334"
+       y2="46.566666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Blue-2"
+       id="linearGradient2500"
+       x1="31.220833"
+       y1="5.6885419"
+       x2="32.543751"
+       y2="5.6885419"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="record-clone"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795273,-108.00001,-8)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1352"
+       width="4.2333331"
+       height="4.2333331"
+       x="28.575001"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1120"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 28.839583,2.1166671 v 3.7041663 h 1.058333 v -0.264583 h -0.79375 V 2.3812501 H 31.75 v 0.529167 h 0.264583 v -0.79375 z" />
+    <path
+       id="path1127"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2184);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 29.897916,2.9104171 v 3.4395833 h 1.322917 V 6.0854164 H 30.1625 V 3.1750001 h 2.116666 V 5.0270834 H 32.54375 V 2.9104171 Z" />
+    <path
+       id="rect1137"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2500);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 31.75,5.0270834 v 0.529167 h -0.529167 v 0.264583 H 31.75 v 0.529167 h 0.264583 v -0.529167 h 0.529167 v -0.264583 h -0.529167 v -0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/record-delete.png b/files/opencs/record-delete.png
deleted file mode 100644
index 817988a5d1..0000000000
Binary files a/files/opencs/record-delete.png and /dev/null differ
diff --git a/files/opencs/record-delete.svg b/files/opencs/record-delete.svg
new file mode 100644
index 0000000000..9a21973542
--- /dev/null
+++ b/files/opencs/record-delete.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Red-1"
+       id="linearGradient2537"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="record-delete"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-128.00003,-8.0000009)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1350"
+       width="4.2333331"
+       height="4.2333331"
+       x="33.866673"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="path1144"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2537);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 34.395832,3.9687501 v 0.529167 h 3.175 v -0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/record-down.png b/files/opencs/record-down.png
deleted file mode 100644
index 92fe788602..0000000000
Binary files a/files/opencs/record-down.png and /dev/null differ
diff --git a/files/opencs/record-down.svg b/files/opencs/record-down.svg
new file mode 100644
index 0000000000..1f3d8a385d
--- /dev/null
+++ b/files/opencs/record-down.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient6786"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95388135,0,0,1.0509393,2.6074109,-0.47696551)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="record-down"
+     transform="matrix(0,3.7795278,-3.7795278,0,44.000003,-188)"
+     style="display:inline">
+    <rect
+       style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect6780"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741665"
+       y="7.4083338"
+       rx="2.8318619e-14" />
+    <path
+       id="path6782"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6786);fill-opacity:1;stroke:none;stroke-width:0.26491px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120283,8.2042949 c -0.03261,-0.010163 -0.0557,0.014998 -0.0557,0.068972 v 2.4835411 c 0,0.09214 0.05209,0.118729 0.116333,0.05973 l 1.433536,-1.1996808 c 0.05017,-0.04607 0.05017,-0.1211999 0,-0.1672709 L 51.155284,8.2265564 c -0.01254,-0.011517 -0.02412,-0.01888 -0.035,-0.022267 z m 0.197668,0.5327694 0.992382,0.7967099 -0.992382,0.7939938 z" />
+  </g>
+</svg>
diff --git a/files/opencs/record-edit.png b/files/opencs/record-edit.png
deleted file mode 100644
index 8b94e16341..0000000000
Binary files a/files/opencs/record-edit.png and /dev/null differ
diff --git a/files/opencs/record-edit.svg b/files/opencs/record-edit.svg
new file mode 100644
index 0000000000..5e7a058782
--- /dev/null
+++ b/files/opencs/record-edit.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2267857,0,0,0.24804718,6.7279833,5.1097051)" />
+  </defs>
+  <g
+     id="record-edit"
+     transform="matrix(3.7795278,0,0,3.7795232,-128.00003,-187.99976)"
+     style="display:inline">
+    <path
+       id="rect2091"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.237178px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 34.395839,50.006244 v 3.968755 h 3.174999 v -3.968755 z m 0.226785,0.248047 h 2.721429 v 3.472661 h -2.721429 z" />
+    <path
+       d="m 38.051677,51.404278 c 0.05475,-0.05233 0.05112,-0.131045 -0.0036,-0.180683 l -0.132503,-0.119769 c -0.05194,-0.05233 -0.149254,-0.0596 -0.204007,-0.0073 l -0.252263,0.252774 0.341354,0.304088 m -1.817287,1.225931 v 0.301897 h 0.315924 l 1.447244,-1.47188 -0.336773,-0.305082 z"
+       fill=""
+       id="path1"
+       style="overflow:hidden;fill:#4d4d4d;fill-opacity:1;stroke-width:0.00321653" />
+  </g>
+</svg>
diff --git a/files/opencs/record-next.png b/files/opencs/record-next.png
deleted file mode 100644
index 76866e4734..0000000000
Binary files a/files/opencs/record-next.png and /dev/null differ
diff --git a/files/opencs/record-next.svg b/files/opencs/record-next.svg
new file mode 100644
index 0000000000..d3fb40a720
--- /dev/null
+++ b/files/opencs/record-next.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient6770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95393695,0,0,1.0509392,2.7307818,-0.47696343)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="record-next"
+     transform="matrix(3.7795278,0,0,3.7795278,-188.00001,-28.000003)"
+     style="display:inline">
+    <rect
+       style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect6764"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741665"
+       y="7.4083338"
+       rx="2.8318619e-14" />
+    <path
+       id="path6766"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6770);fill-opacity:1;stroke:none;stroke-width:0.264917px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120363,8.204296 c -0.03261,-0.010162 -0.05578,0.014998 -0.05578,0.068972 v 2.483541 c 0,0.09214 0.05211,0.118729 0.116355,0.05973 L 52.61445,9.6168633 c 0.05018,-0.046071 0.05018,-0.1211999 0,-0.167271 L 51.15519,8.2265626 c -0.01254,-0.011517 -0.02395,-0.01888 -0.03483,-0.022267 z m 0.197626,0.5327692 0.992304,0.7967099 -0.983218,0.7939939 z" />
+  </g>
+</svg>
diff --git a/files/opencs/record-preview.png b/files/opencs/record-preview.png
deleted file mode 100644
index e3adb6ede4..0000000000
Binary files a/files/opencs/record-preview.png and /dev/null differ
diff --git a/files/opencs/record-preview.svg b/files/opencs/record-preview.svg
new file mode 100644
index 0000000000..a516d6b596
--- /dev/null
+++ b/files/opencs/record-preview.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2424"
+       x1="40.481247"
+       y1="4.2333221"
+       x2="42.068748"
+       y2="4.2333221"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2426"
+       x1="40.87812"
+       y1="4.2333136"
+       x2="41.671894"
+       y2="4.2333136"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2428"
+       x1="41.274998"
+       y1="3.7041686"
+       x2="43.127083"
+       y2="3.7041686"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2430"
+       x1="39.422913"
+       y1="3.7041686"
+       x2="41.274998"
+       y2="3.7041686"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="record-preview"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-148.00001,-8.0000009)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1348"
+       width="4.2333331"
+       height="4.2333331"
+       x="39.158333"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="path1160"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2424);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.261561,3.4395861 a 0.79374999,0.79375052 0 0 0 -0.780314,0.79375 0.79374999,0.79375052 0 0 0 0.79375,0.7937503 0.79374999,0.79375052 0 0 0 0.79375,-0.7937503 0.79374999,0.79375052 0 0 0 -0.79375,-0.79375 0.79374999,0.79375052 0 0 0 -0.01344,0 z m 5.29e-4,0.264583 a 0.52916663,0.52916663 0 0 1 0.01291,0 0.52916663,0.52916663 0 0 1 0.529167,0.529167 A 0.52916663,0.52916663 0 0 1 41.275,4.7625024 0.52916663,0.52916663 0 0 1 40.745833,4.2333361 0.52916663,0.52916663 0 0 1 41.262081,3.7041691 Z" />
+    <path
+       id="ellipse1162"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2426);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.274997,3.8364611 a 0.396875,0.396875 0 0 0 -0.396875,0.396875 0.396875,0.396875 0 0 0 0.396875,0.396875 0.396875,0.396875 0 0 0 0.396875,-0.396875 0.396875,0.396875 0 0 0 0,-0.0083 0.27667566,0.27667566 0 0 1 -0.218591,0.106452 0.27667566,0.27667566 0 0 1 -0.276469,-0.276468 0.27667566,0.27667566 0 0 1 0.10697,-0.218075 0.396875,0.396875 0 0 0 -0.0088,-5.29e-4 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2428);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.274998,3.1750021 v 0.319409 c 0.861767,0 1.44543,0.520557 1.5875,0.738924 h 0.264583 c -0.213105,-0.491985 -0.995246,-1.058333 -1.852083,-1.058333 z"
+       id="path1177" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2430);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.274997,3.1750021 v 0.319409 c -0.861767,0 -1.44543,0.520557 -1.5875,0.738924 h -0.264583 c 0.213105,-0.491985 0.995246,-1.058333 1.852083,-1.058333 z"
+       id="path1179" />
+  </g>
+</svg>
diff --git a/files/opencs/record-previous.png b/files/opencs/record-previous.png
deleted file mode 100644
index 2009d84e04..0000000000
Binary files a/files/opencs/record-previous.png and /dev/null differ
diff --git a/files/opencs/record-previous.svg b/files/opencs/record-previous.svg
new file mode 100644
index 0000000000..dd03d27128
--- /dev/null
+++ b/files/opencs/record-previous.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient6778"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95389396,0,0,1.0509392,2.7330252,-0.47696299)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="record-previous"
+     transform="matrix(-3.7795278,0,0,-3.7795278,204,44.000003)"
+     style="display:inline">
+    <rect
+       style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect6772"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741665"
+       y="7.4083338"
+       rx="2.8318619e-14" />
+    <path
+       id="path6774"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6778);fill-opacity:1;stroke:none;stroke-width:0.264912px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120353,8.2042965 c -0.03261,-0.010163 -0.05577,0.014998 -0.05577,0.068972 V 10.75681 c 0,0.09214 0.05211,0.118729 0.116349,0.05973 l 1.43352,-1.1996813 c 0.05017,-0.046071 0.05017,-0.1211999 0,-0.167271 L 51.155435,8.2265631 c -0.01254,-0.011517 -0.02421,-0.01888 -0.03509,-0.022267 z M 51.31696,8.7370657 52.310301,9.5337756 51.31696,10.32777 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/record-revert.png b/files/opencs/record-revert.png
deleted file mode 100644
index bd177ce65a..0000000000
Binary files a/files/opencs/record-revert.png and /dev/null differ
diff --git a/files/opencs/record-revert.svg b/files/opencs/record-revert.svg
new file mode 100644
index 0000000000..11920a329a
--- /dev/null
+++ b/files/opencs/record-revert.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2432"
+       x1="45.243748"
+       y1="4.6302114"
+       x2="47.88958"
+       y2="4.6302114"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2434"
+       x1="44.989498"
+       y1="3.5718777"
+       x2="46.088139"
+       y2="3.5718777"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="record-revert"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-168.00001,-8.0000009)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1346"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.450001"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="path1265"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2432);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 45.243747,3.4395861 v 0.264583 h 1.455208 c 0.511439,0 0.926042,0.414602 0.926042,0.926042 0,0.5114393 -0.414603,0.9260413 -0.926042,0.9260413 H 46.30208 v 0.264584 h 0.396875 c 0.657564,0 1.190625,-0.533062 1.190625,-1.1906253 0,-0.657564 -0.533061,-1.190625 -1.190625,-1.190625 z" />
+    <path
+       id="path1284"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 45.96515,2.6458361 -0.975651,0.926041 0.975651,0.926042 0.12299,-0.181901 -0.65009,-0.611849 v -0.264583 l 0.65009,-0.611849 z" />
+  </g>
+</svg>
diff --git a/files/opencs/record-touch.png b/files/opencs/record-touch.png
deleted file mode 100644
index 808e1b6c4b..0000000000
Binary files a/files/opencs/record-touch.png and /dev/null differ
diff --git a/files/opencs/record-touch.svg b/files/opencs/record-touch.svg
new file mode 100644
index 0000000000..39e54c3ff1
--- /dev/null
+++ b/files/opencs/record-touch.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2163"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2267857,0,0,0.24804749,6.7279756,5.1096472)"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85714286,0,0,0.93750007,-102.57143,-168.68751)" />
+  </defs>
+  <g
+     id="record-touch"
+     transform="matrix(3.7795278,0,0,3.7795176,-128.00003,-187.99948)"
+     style="display:inline">
+    <path
+       id="rect2091"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.89642px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+       d="M 2,1 V 16.000002 H 13.999997 V 1 Z M 2.8571402,1.9374994 H 13.142856 V 15.062503 H 2.8571402 Z"
+       transform="matrix(0.26458331,0,0,0.26458402,33.866672,49.74166)" />
+    <ellipse
+       style="display:inline;fill:#fdb433;fill-opacity:1;stroke:#000000;stroke-width:0"
+       id="path1"
+       cx="37.306255"
+       cy="51.329163"
+       rx="0.79374993"
+       ry="0.79375207" />
+  </g>
+</svg>
diff --git a/files/opencs/record-up.png b/files/opencs/record-up.png
deleted file mode 100644
index c8bfa4a342..0000000000
Binary files a/files/opencs/record-up.png and /dev/null differ
diff --git a/files/opencs/record-up.svg b/files/opencs/record-up.svg
new file mode 100644
index 0000000000..28331ae42f
--- /dev/null
+++ b/files/opencs/record-up.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient6788"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95388135,0,0,1.0509393,2.6074049,-0.4769654)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="record-up"
+     transform="matrix(0,-3.7795278,3.7795278,0,-28.000003,204)"
+     style="display:inline">
+    <rect
+       style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect6756"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741665"
+       y="7.4083338"
+       rx="2.8318619e-14" />
+    <path
+       id="path6695"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6788);fill-opacity:1;stroke:none;stroke-width:0.26491px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 51.120277,8.2042951 c -0.03261,-0.010162 -0.0557,0.014998 -0.0557,0.068972 v 2.4835409 c 0,0.09214 0.05209,0.118729 0.116333,0.05974 l 1.433536,-1.1996855 c 0.05018,-0.04607 0.05018,-0.1211998 0,-0.167271 L 51.155278,8.2265617 c -0.01254,-0.011517 -0.02412,-0.01888 -0.035,-0.022267 z m 0.197668,0.5327694 0.992382,0.7967099 -0.992382,0.7939946 z" />
+  </g>
+</svg>
diff --git a/files/opencs/region-map.png b/files/opencs/region-map.png
deleted file mode 100644
index 7631847bee..0000000000
Binary files a/files/opencs/region-map.png and /dev/null differ
diff --git a/files/opencs/region-map.svg b/files/opencs/region-map.svg
new file mode 100644
index 0000000000..0067fb9901
--- /dev/null
+++ b/files/opencs/region-map.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2102"
+       x1="225"
+       y1="228.5"
+       x2="234"
+       y2="228.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Blue-2"
+       id="linearGradient2488"
+       x1="60.325001"
+       y1="62.441669"
+       x2="64.558334"
+       y2="62.441669"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="region-map"
+     transform="matrix(3.7795278,0,0,3.7795278,-228.00002,-228.00002)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1539"
+       width="4.2333331"
+       height="4.2333331"
+       x="60.325001"
+       y="60.325001"
+       rx="1.9824198e-15" />
+    <path
+       id="path1481"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2102);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 227,224 v 2 h -2 v 7 h 7 v -2 h 2 v -5 h -4 v -2 z m 1,1 h 1 v 1 h -1 z m -2,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -6,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -6,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path1499"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2488);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 60.325002,60.325001 v 2.38125 h 0.79375 v -1.322917 h 0.529167 v -0.529166 h 0.264583 v -0.529167 z m 1.852083,0 v 0.529167 h 0.79375 v 0.529166 h 1.058334 v 0.79375 h 0.529166 v -1.852083 z m 1.852084,2.116667 v 0.79375 h -0.529167 v 0.529166 h -0.79375 v 0.79375 h 1.852083 v -2.116666 z m -3.704167,0.529166 v 1.5875 h 2.116667 v -0.79375 h -1.322917 v -0.79375 z" />
+  </g>
+</svg>
diff --git a/files/opencs/region.png b/files/opencs/region.png
deleted file mode 100644
index 2ebaeb0285..0000000000
Binary files a/files/opencs/region.png and /dev/null differ
diff --git a/files/opencs/region.svg b/files/opencs/region.svg
new file mode 100644
index 0000000000..4458c7e376
--- /dev/null
+++ b/files/opencs/region.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2176"
+       x1="101"
+       y1="189"
+       x2="117"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="region"
+     transform="matrix(3.7795278,0,0,3.7795278,-108.00001,-187.99999)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1499"
+       width="4.2333331"
+       height="4.2333331"
+       x="28.575001"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1992"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2176);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 101,181 v 16 h 16 v -16 z m 1,1 h 5 v 4 h -2 v 4 h -3 z m 6,0 h 6 2 v 6 h -2 v -2 h -4 v -2 h -2 z m 0,3 h 1 v 1 h -1 z m -2,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -6,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 2 v 7 h -2 -4 v -3 h 2 v -2 h 2 z m -12,2 h 3 v 2 h 4 v 3 h -4 -3 z m 4,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/repair.png b/files/opencs/repair.png
deleted file mode 100644
index 1b5a9ccc11..0000000000
Binary files a/files/opencs/repair.png and /dev/null differ
diff --git a/files/opencs/repair.svg b/files/opencs/repair.svg
new file mode 100644
index 0000000000..5e2d09d58c
--- /dev/null
+++ b/files/opencs/repair.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-1">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2406"
+       x1="7.4083333"
+       y1="25.532291"
+       x2="11.641667"
+       y2="25.532291"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1447">
+      <path
+         id="mask-powermask-path-effect1447_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 6.4083334,23.077084 h 6.2333336 v 4.910417 H 6.4083334 Z" />
+      <path
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 7.6729166,24.341667 h 3.7041664 v 0.264583 l -1.058333,0.264583 -0.264583,0.621995 V 26.4215 c 0.28151,0.01578 0.67084,0.01464 0.926041,0.301417 H 8.2020832 c 0.476199,-0.268355 0.79375,-0.288311 0.79375,-0.48181 V 25.532292 C 8.1907673,25.056093 7.6729166,24.847155 7.6729166,24.341667 Z"
+         id="path1445" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2408"
+       x1="41.446728"
+       y1="18.654196"
+       x2="42.593815"
+       y2="18.654196"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-1"
+       id="linearGradient2410"
+       x1="41.754128"
+       y1="17.453333"
+       x2="42.23296"
+       y2="17.453333"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       id="mask-powermask-path-effect1447_inverse"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1447_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1447_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+  </defs>
+  <g
+     id="repair"
+     style="display:inline"
+     transform="matrix(3.7795256,0,0,3.7795278,-147.99991,-68.000004)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1398"
+       width="4.2333331"
+       height="4.2333331"
+       x="39.158333"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2406);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 7.4083334,24.077084 h 4.2333336 v 0.79375 l -1.173055,0.264583 -0.149862,0.428915 v 0.629419 c 0.267897,0 1.058334,0.153181 1.058334,0.79375 H 7.6729168 c 0,-0.636251 1.0583333,-0.622331 1.0583333,-0.88098 V 25.664584 C 7.9033937,25.214379 7.501351,24.981835 7.4083334,24.473959 Z"
+       id="path1409"
+       mask="url(#mask-powermask-path-effect1447)"
+       transform="translate(31.749997,-5.2916664)" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2408);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1428"
+       width="1.1470873"
+       height="0.11313022"
+       x="41.446728"
+       y="18.59763"
+       rx="3.6718346e-17"
+       transform="rotate(2.1988888)" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2410);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1430"
+       width="0.4788301"
+       height="0.15522514"
+       x="41.754128"
+       y="17.375719"
+       rx="3.6718346e-17"
+       transform="rotate(3.7917997)" />
+  </g>
+</svg>
diff --git a/files/opencs/resources-icon.png b/files/opencs/resources-icon.png
deleted file mode 100644
index d84c90d5dc..0000000000
Binary files a/files/opencs/resources-icon.png and /dev/null differ
diff --git a/files/opencs/resources-icon.svg b/files/opencs/resources-icon.svg
new file mode 100644
index 0000000000..2054ba0b2e
--- /dev/null
+++ b/files/opencs/resources-icon.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2268"
+       x1="12.964583"
+       y1="29.633335"
+       x2="14.2875"
+       y2="29.633335"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2270"
+       x1="14.816666"
+       y1="29.633335"
+       x2="16.139582"
+       y2="29.633335"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2272"
+       x1="12.964583"
+       y1="31.749998"
+       x2="14.2875"
+       y2="31.749998"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2274"
+       x1="14.816666"
+       y1="31.749998"
+       x2="16.139582"
+       y2="31.749998"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="resources-icon"
+     transform="matrix(3.7795278,0,0,3.7795278,-48.000013,-108.00002)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1433"
+       width="4.2333331"
+       height="4.2333331"
+       x="12.700003"
+       y="28.575003"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1106"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2268);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 12.964583,28.839585 v 1.058333 h 1.058333 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058333 v 0.264584 H 14.2875 v -0.264584 z" />
+    <path
+       id="path1117"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2270);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 14.816666,28.839585 v 1.058333 h 1.058332 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058333 v 0.264584 h 1.322916 v -0.264584 z" />
+    <path
+       id="path1119"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2272);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 12.964583,30.956249 v 1.058333 h 1.058333 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058334 v 0.264583 H 14.2875 v -0.264583 z" />
+    <path
+       id="path1121"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2274);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 14.816666,30.956249 v 1.058333 h 1.058332 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058333 v 0.264584 h 1.322916 v -0.264584 z" />
+  </g>
+</svg>
diff --git a/files/opencs/resources-mesh.png b/files/opencs/resources-mesh.png
deleted file mode 100644
index fdfa3528b1..0000000000
Binary files a/files/opencs/resources-mesh.png and /dev/null differ
diff --git a/files/opencs/resources-mesh.svg b/files/opencs/resources-mesh.svg
new file mode 100644
index 0000000000..ba93da8091
--- /dev/null
+++ b/files/opencs/resources-mesh.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient4"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="resources-mesh"
+     transform="matrix(3.7795278,0,0,3.7793645,-188.00001,-207.99033)"
+     style="display:inline">
+    <rect
+       style="font-variation-settings:normal;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1941"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741665"
+       y="55.033333" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 51.792969,55.050781 -1.71875,0.992188 -0.06641,0.115234 v 1.984375 l 0.06641,0.113281 1.71875,0.992188 h 0.130859 l 1.71875,-0.992188 0.06641,-0.113281 v -1.984375 l -0.06641,-0.115234 -1.71875,-0.992188 z m 0.06641,0.265625 1.585937,0.917969 v 1.832031 l -1.58789,0.916016 -1.585938,-0.916016 v -1.832031 z"
+       id="path2002" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 51.857422,55.033203 a 0.1322915,0.1322915 0 0 0 -0.13086,0.132813 v 0.925781 h -1.585937 -0.002 a 0.1322915,0.1322915 0 0 0 -0.03516,0.0059 0.1322915,0.1322915 0 0 0 -0.01758,0.0039 0.1322915,0.1322915 0 0 0 -0.0059,0.0039 0.1322915,0.1322915 0 0 0 -0.02539,0.01758 0.1322915,0.1322915 0 0 0 -0.0332,0.04102 0.1322915,0.1322915 0 0 0 -0.0098,0.01953 0.1322915,0.1322915 0 0 0 -0.002,0.01172 0.1322915,0.1322915 0 0 0 -0.0039,0.02344 0.1322915,0.1322915 0 0 0 0,0.0039 0.1322915,0.1322915 0 0 0 0,0.002 0.1322915,0.1322915 0 0 0 0.0039,0.0293 0.1322915,0.1322915 0 0 0 0.0078,0.02148 0.1322915,0.1322915 0 0 0 0.0059,0.01367 l 0.707031,1.654297 h -0.591797 a 0.1322915,0.1322915 0 0 0 -0.132813,0.132813 0.1322915,0.1322915 0 0 0 0.132813,0.132812 h 0.732422 l 0.886718,1.011719 h 0.199219 l 0.888672,-1.011719 h 0.732422 a 0.1322915,0.1322915 0 0 0 0.132813,-0.132812 0.1322915,0.1322915 0 0 0 -0.132813,-0.132813 h -0.591797 l 0.710938,-1.662109 0.002,-0.0039 a 0.1322915,0.1322915 0 0 0 0,-0.002 0.1322915,0.1322915 0 0 0 0.0098,-0.02734 0.1322915,0.1322915 0 0 0 0,-0.002 0.1322915,0.1322915 0 0 0 0.002,-0.02148 0.1322915,0.1322915 0 0 0 0,-0.0078 0.1322915,0.1322915 0 0 0 -0.0039,-0.02344 0.1322915,0.1322915 0 0 0 -0.002,-0.0078 0.1322915,0.1322915 0 0 0 -0.0078,-0.02148 0.1322915,0.1322915 0 0 0 -0.0039,-0.0059 0.1322915,0.1322915 0 0 0 -0.01367,-0.01953 0.1322915,0.1322915 0 0 0 -0.02148,-0.01953 0.1322915,0.1322915 0 0 0 -0.02734,-0.01758 0.1322915,0.1322915 0 0 0 -0.0293,-0.0078 0.1322915,0.1322915 0 0 0 -0.02344,-0.002 0.1322915,0.1322915 0 0 0 -0.0078,0 h -1.580078 v -0.925781 a 0.1322915,0.1322915 0 0 0 -0.132812,-0.132813 z m -1.519531,1.322266 h 1.30664 l -0.703125,1.40625 z m 1.734375,0 h 1.30664 l -0.603515,1.40625 z m -0.212891,0.164062 0.710937,1.423828 h -1.423828 z m -0.634766,1.689453 h 1.267579 l -0.634766,0.72461 z"
+       id="path1996" />
+  </g>
+</svg>
diff --git a/files/opencs/resources-music.png b/files/opencs/resources-music.png
deleted file mode 100644
index 53775109c5..0000000000
Binary files a/files/opencs/resources-music.png and /dev/null differ
diff --git a/files/opencs/resources-music.svg b/files/opencs/resources-music.svg
new file mode 100644
index 0000000000..bf81130e3c
--- /dev/null
+++ b/files/opencs/resources-music.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2282"
+       x1="23.547915"
+       y1="32.014591"
+       x2="25.135414"
+       y2="32.014591"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2284"
+       x1="25.664579"
+       y1="31.485422"
+       x2="27.252081"
+       y2="31.485422"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2286"
+       x1="24.870832"
+       y1="30.691669"
+       x2="25.135416"
+       y2="30.691669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2288"
+       x1="26.987499"
+       y1="30.162504"
+       x2="27.252083"
+       y2="30.162504"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2290"
+       x1="24.870832"
+       y1="29.196154"
+       x2="27.252083"
+       y2="29.196154"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2292"
+       x1="24.870832"
+       y1="29.989902"
+       x2="27.252083"
+       y2="29.989902"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="resources-music"
+     transform="matrix(3.7795278,0,0,3.7795278,-88.000017,-108.00002)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1429"
+       width="4.2333331"
+       height="4.2333331"
+       x="23.283337"
+       y="28.575003"
+       rx="1.9824198e-15" />
+    <ellipse
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2282);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="path1207"
+       cx="24.341665"
+       cy="32.014591"
+       rx="0.79374999"
+       ry="0.52916664" />
+    <ellipse
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2284);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="path1209"
+       cx="26.45833"
+       cy="31.485422"
+       rx="0.79374999"
+       ry="0.52916664" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2286);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1214"
+       width="0.26458332"
+       height="2.6458333"
+       x="24.870832"
+       y="29.368753"
+       rx="1.9824198e-15" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2288);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="rect1216"
+       width="0.26458332"
+       height="2.6458333"
+       x="26.987499"
+       y="28.839588"
+       rx="1.9824198e-15" />
+    <path
+       id="path1224"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2290);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 27.252083,28.683523 -2.38125,0.680061 v 0.345199 l 2.38125,-0.680063 z" />
+    <path
+       id="path1240"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2292);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 27.252083,29.477272 -2.38125,0.680061 v 0.3452 l 2.38125,-0.680064 z" />
+  </g>
+</svg>
diff --git a/files/opencs/resources-sound.png b/files/opencs/resources-sound.png
deleted file mode 100644
index 86871611f5..0000000000
Binary files a/files/opencs/resources-sound.png and /dev/null differ
diff --git a/files/opencs/resources-sound.svg b/files/opencs/resources-sound.svg
new file mode 100644
index 0000000000..c2019ca176
--- /dev/null
+++ b/files/opencs/resources-sound.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2276"
+       x1="17.991667"
+       y1="30.691668"
+       x2="21.960417"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="resources-sound"
+     transform="matrix(3.7795278,0,0,3.7795263,-67.999997,-107.99997)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1431"
+       width="4.2333331"
+       height="4.2333331"
+       x="17.991665"
+       y="28.575003"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1123"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2276);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 18.520833,28.575001 v 4.233334 h 0.264583 v -4.233334 z m 0.529166,0.529167 v 3.175 h 0.264584 v -3.175 z m 1.058334,0.264583 v 2.645834 h 0.264583 v -2.645834 z m -2.116667,0.529167 v 1.5875 h 0.264583 v -1.5875 z m 1.5875,0 v 1.5875 h 0.264583 v -1.5875 z m 1.058333,0.264583 v 1.058334 h 0.264584 v -1.058334 z m 0.529167,0.264584 v 0.529166 h 0.264583 v -0.529166 z m 0.529167,0 v 0.529166 h 0.264583 v -0.529166 z" />
+  </g>
+</svg>
diff --git a/files/opencs/resources-texture.png b/files/opencs/resources-texture.png
deleted file mode 100644
index a96c4bf8c7..0000000000
Binary files a/files/opencs/resources-texture.png and /dev/null differ
diff --git a/files/opencs/resources-texture.svg b/files/opencs/resources-texture.svg
new file mode 100644
index 0000000000..fd9fa88c93
--- /dev/null
+++ b/files/opencs/resources-texture.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2264"
+       x1="7.4083338"
+       y1="30.691668"
+       x2="11.641667"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient6472"
+       gradientUnits="userSpaceOnUse"
+       x1="7.9374995"
+       y1="30.691668"
+       x2="11.1125"
+       y2="30.691668" />
+  </defs>
+  <g
+     id="resources-texture"
+     transform="matrix(3.7795264,0,0,3.7795263,-27.999988,-107.99997)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1435"
+       width="4.2333331"
+       height="4.2333331"
+       x="7.4083323"
+       y="28.575003"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1042"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2264);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 7.4083337,28.575001 v 4.233334 h 4.2333333 v -4.233334 z m 0.264583,0.264584 h 3.7041663 v 3.704166 H 7.6729167 Z" />
+    <path
+       id="rect1049"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6472);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 7.9374997,29.104168 v 3.175 H 11.1125 v -3.175 z m 0.264584,0.264583 h 0.529166 v 0.529167 h 0.79375 V 29.368751 H 10.31875 v 0.529167 h 0.529167 v 0.79375 H 10.31875 v 0.79375 h 0.529167 v 0.529167 H 10.31875 V 31.485418 H 9.5249997 v 0.529167 h -0.79375 v -0.529167 h -0.529166 v -0.79375 h 0.529166 v -0.79375 h -0.529166 z m 0.529166,1.322917 v 0.79375 h 0.79375 v -0.79375 z m 0.79375,0 H 10.31875 v -0.79375 H 9.5249997 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/resources-video.png b/files/opencs/resources-video.png
deleted file mode 100644
index d86bc6025e..0000000000
Binary files a/files/opencs/resources-video.png and /dev/null differ
diff --git a/files/opencs/resources-video.svg b/files/opencs/resources-video.svg
new file mode 100644
index 0000000000..fa1ce3c1b6
--- /dev/null
+++ b/files/opencs/resources-video.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2278"
+       x1="28.574999"
+       y1="30.691668"
+       x2="32.808331"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2280"
+       x1="-31.750002"
+       y1="30.691675"
+       x2="-30.1625"
+       y2="30.691675"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="resources-video"
+     transform="matrix(3.7795262,0,0,3.7795278,-107.99996,-108.00002)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1426"
+       width="4.2333331"
+       height="4.2333331"
+       x="28.575001"
+       y="28.575003"
+       rx="1.9824198e-15" />
+    <path
+       id="rect1171"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2278);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 28.574999,28.839585 v 3.704166 h 4.233333 v -3.704166 z m 0.264583,0.264583 h 3.704167 v 0.264583 h -3.704167 z m 0,0.529167 h 3.704167 v 2.116666 h -3.704167 z m 0,2.38125 h 3.704167 v 0.264583 h -3.704167 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2280);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       id="path1186"
+       d="m -31.750001,30.691675 1.5875,-0.916543 0,1.833087 z"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index eef5c01bf8..282ab23f9a 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -1,187 +1,163 @@
 <RCC>
     <qresource prefix="/">
-        <file>openmw-cs.png</file>
-        <file>activator.png</file>
-        <file alias="list-added">list-added.png</file>
-        <file>apparatus.png</file>
-        <file>armor.png</file>
-        <file>attribute.png</file>
-        <file>list-base.png</file>
-        <file>birthsign.png</file>
-        <file>body-part.png</file>
-        <file>book.png</file>
-        <file>cell.png</file>
-        <file>class.png</file>
-        <file>clothing.png</file>
-        <file>container.png</file>
-        <file>creature.png</file>
-        <file>debug-profile.png</file>
-        <file>dialogue-info.png</file>
-        <file>dialogue-journal.png</file>
-        <file>dialogue-regular.png</file>
-        <file>dialogue-greeting.png</file>
-        <file>dialogue-persuasion.png</file>
-        <file>dialogue-voice.png</file>
-        <file>dialogue-topics.png</file>
-        <file>dialogue-topic-infos.png</file>
-        <file>journal-topic-infos.png</file>
-        <file>journal-topics.png</file>
-        <file>door.png</file>
-        <file>enchantment.png</file>
-        <file>error-log.png</file>
-        <file>faction.png</file>
-        <file>filter.png</file>
-        <file>global-variable.png</file>
-        <file>gmst.png</file>
-        <file>info.png</file>
-        <file>ingredient.png</file>
-        <file>instance.png</file>
-        <file>land-heightmap.png</file>
-        <file>land-texture.png</file>
-        <file>levelled-creature.png</file>
-        <file>levelled-item.png</file>
-        <file>light.png</file>
-        <file>lockpick.png</file>
-        <file>magic-effect.png</file>
-        <file>probe.png</file>
-        <file>menu-close.png</file>
-        <file>menu-exit.png</file>
-        <file>menu-new-addon.png</file>
-        <file>menu-new-game.png</file>
-        <file>menu-new-window.png</file>
-        <file>menu-merge.png</file>
-        <file>menu-open.png</file>
-        <file>menu-preferences.png</file>
-        <file>menu-reload.png</file>
-        <file>menu-redo.png</file>
-        <file>menu-save.png</file>
-        <file>menu-search.png</file>
-        <file>menu-status-bar.png</file>
-        <file>menu-undo.png</file>
-        <file>menu-verify.png</file>
-        <file>metadata.png</file>
-        <file>miscellaneous.png</file>
-        <file alias="list-modified">list-modified.png</file>
-        <file>npc.png</file>
-        <file>object.png</file>
-        <file>pathgrid.png</file>
-        <file>potion.png</file>
-        <file>qt.png</file>
-        <file>race.png</file>
-        <file>random.png</file>
-        <file alias="list-removed">list-removed.png</file>
-        <file>region.png</file>
-        <file>region-map.png</file>
-        <file>repair.png</file>
-        <file>run-log.png</file>
-        <file>run-openmw.png</file>
-        <file>scene.png</file>
-        <file>script.png</file>
-        <file>skill.png</file>
-        <file>start-script.png</file>
-        <file>stop-openmw.png</file>
-        <file>sound-generator.png</file>
-        <file>sound.png</file>
-        <file>spell.png</file>
-        <file>static.png</file>
-        <file>weapon.png</file>
-        <file>multitype.png</file>
-        <file alias="record-next">record-next.png</file>
-        <file alias="record-previous">record-previous.png</file>
-        <file alias="record-down">record-down.png</file>
-        <file alias="record-up">record-up.png</file>
-        <file alias="edit-delete">record-delete.png</file>
-        <file alias="edit-preview">record-preview.png</file>
-        <file alias="edit-clone">record-clone.png</file>
-        <file alias="edit-add">record-add.png</file>
-        <file alias="edit-edit">record-edit.png</file>
-        <file alias="edit-touch">record-touch.png</file>
-        <file alias="edit-undo">record-revert.png</file>
-        <file alias="resources-icon">resources-icon.png</file>
-        <file alias="resources-mesh">resources-mesh.png</file>
-        <file alias="resources-music">resources-music.png</file>
-        <file alias="resources-sound">resources-sound.png</file>
-        <file alias="resources-texture">resources-texture.png</file>
-        <file alias="resources-video">resources-video.png</file>
+        <file alias="activator">activator.svg</file>
+        <file alias="apparatus">apparatus.svg</file>
+        <file alias="armor">armor.svg</file>
+        <file alias="attribute">attribute.svg</file>
+        <file alias="birthsign">birthsign.svg</file>
+        <file alias="body-part">body-part.svg</file>
+        <file alias="book">book.svg</file>
+        <file alias="cell">cell.svg</file>
+        <file alias="class">class.svg</file>
+        <file alias="clothing">clothing.svg</file>
+        <file alias="container">container.svg</file>
+        <file alias="creature">creature.svg</file>
+        <file alias="debug-profile">debug-profile.svg</file>
+        <file alias="dialogue-info">dialogue-info.svg</file>
+        <file alias="dialogue-topics">dialogue-topics.svg</file>
+        <file alias="door">door.svg</file>
+        <file alias="edit-add">record-add.svg</file>
+        <file alias="edit-clone">record-clone.svg</file>
+        <file alias="edit-delete">record-delete.svg</file>
+        <file alias="edit-edit">record-edit.svg</file>
+        <file alias="edit-preview">record-preview.svg</file>
+        <file alias="edit-touch">record-touch.svg</file>
+        <file alias="edit-undo">record-revert.svg</file>
+        <file alias="enchantment">enchantment.svg</file>
+        <file alias="error-log">error-log.svg</file>
+        <file alias="faction">faction.svg</file>
+        <file alias="filter">filter.svg</file>
+        <file alias="global-variable">global-variable.svg</file>
+        <file alias="gmst">gmst.svg</file>
+        <file alias="info">info.svg</file>
+        <file alias="ingredient">ingredient.svg</file>
+        <file alias="instance">instance.svg</file>
+        <file alias="journal-topic-infos">journal-topic-infos.svg</file>
+        <file alias="journal-topics">journal-topics.svg</file>
+        <file alias="land-heightmap">land-heightmap.svg</file>
+        <file alias="land-texture">land-texture.svg</file>
+        <file alias="levelled-creature">levelled-creature.svg</file>
+        <file alias="levelled-item">levelled-item.svg</file>
+        <file alias="light">light.svg</file>
+        <file alias="list-added">list-added.svg</file>
+        <file alias="list-base">list-base.svg</file>
+        <file alias="list-modified">list-modified.svg</file>
+        <file alias="list-removed">list-removed.svg</file>
+        <file alias="lockpick">lockpick.svg</file>
+        <file alias="magic-effect">magic-effect.svg</file>
+        <file alias="menu-close">menu-close.svg</file>
+        <file alias="menu-exit">menu-exit.svg</file>
+        <file alias="menu-merge">menu-merge.svg</file>
+        <file alias="menu-new-addon">menu-new-addon.svg</file>
+        <file alias="menu-new-game">menu-new-game.svg</file>
+        <file alias="menu-new-window">menu-new-window.svg</file>
+        <file alias="menu-open">menu-open.svg</file>
+        <file alias="menu-preferences">menu-preferences.svg</file>
+        <file alias="menu-redo">menu-redo.svg</file>
+        <file alias="menu-reload">menu-reload.svg</file>
+        <file alias="menu-save">menu-save.svg</file>
+        <file alias="menu-search">menu-search.svg</file>
+        <file alias="menu-status-bar">menu-status-bar.svg</file>
+        <file alias="menu-undo">menu-undo.svg</file>
+        <file alias="menu-verify">menu-verify.svg</file>
+        <file alias="metadata">metadata.svg</file>
+        <file alias="miscellaneous">miscellaneous.svg</file>
+        <file alias="multitype">multitype.svg</file>
+        <file alias="npc">npc.svg</file>
+        <file alias="object">object.svg</file>
+        <file alias="openmw-cs">openmw-cs.png</file>
+        <file alias="pathgrid">pathgrid.svg</file>
         <file alias="placeholder">placeholder.png</file>
+        <file alias="potion">potion.svg</file>
+        <file alias="probe">probe.svg</file>
+        <file alias="qt">qt.svg</file>
+        <file alias="race">race.svg</file>
+        <file alias="record-down">record-down.svg</file>
+        <file alias="record-next">record-next.svg</file>
+        <file alias="record-previous">record-previous.svg</file>
+        <file alias="record-up">record-up.svg</file>
+        <file alias="region">region.svg</file>
+        <file alias="region-map">region-map.svg</file>
+        <file alias="repair">repair.svg</file>
+        <file alias="resources-icon">resources-icon.svg</file>
+        <file alias="resources-mesh">resources-mesh.svg</file>
+        <file alias="resources-music">resources-music.svg</file>
+        <file alias="resources-sound">resources-sound.svg</file>
+        <file alias="resources-texture">resources-texture.svg</file>
+        <file alias="resources-video">resources-video.svg</file>
+        <file alias="run-log">run-log.svg</file>
+        <file alias="run-openmw">run-openmw.svg</file>
+        <file alias="scene">scene.svg</file>
+        <file alias="script">script.svg</file>
+        <file alias="skill">skill.svg</file>
+        <file alias="sound-generator">sound-generator.svg</file>
+        <file alias="sound">sound.svg</file>
+        <file alias="spell">spell.svg</file>
+        <file alias="start-script">start-script.svg</file>
+        <file alias="static">static.svg</file>
+        <file alias="stop-openmw">stop-openmw.svg</file>
+        <file alias="weapon">weapon.svg</file>
     </qresource>
     <qresource prefix="/startup">
         <file alias="create-addon">raster/startup/big/create-addon.png</file>
         <file alias="create-game">raster/startup/big/new-game.png</file>
         <file alias="edit-content">raster/startup/big/edit-content.png</file>
-        <file alias="configure">raster/startup/small/configure.png</file>
+        <file alias="configure">configure.svg</file>
     </qresource>
     <qresource prefix="/scenetoolbar">
-        <file alias="night">lighting-moon.png</file>
-        <file alias="day">lighting-sun.png</file>
-        <file alias="bright">lighting-lamp.png</file>
-        <file alias="1st-person">camera-first-person.png</file>
-        <file alias="free-camera">camera-free.png</file>
-        <file alias="orbiting-camera">camera-orbit.png</file>
-        <file alias="play">run-game.png</file>
-        <file alias="scene-view-1">scene-view-instance.png</file>
-        <file alias="scene-view-16">scene-view-terrain.png</file>
-        <file alias="scene-view-4">scene-view-water.png</file>
-        <file alias="scene-view-2">scene-view-pathgrid.png</file>
-        <file alias="scene-view-8">scene-view-fog.png</file>
-        <file alias="scene-view-c0">scene-view-status-0.png</file>
-        <file alias="scene-view-c1">scene-view-status-1.png</file>
-        <file alias="scene-view-c2">scene-view-status-2.png</file>
-        <file alias="scene-view-c3">scene-view-status-3.png</file>
-        <file alias="scene-view-c4">scene-view-status-4.png</file>
-        <file alias="scene-view-c5">scene-view-status-5.png</file>
-        <file alias="scene-view-c6">scene-view-status-6.png</file>
-        <file alias="scene-view-c7">scene-view-status-7.png</file>
-        <file alias="scene-view-c8">scene-view-status-8.png</file>
-        <file alias="scene-view-c9">scene-view-status-9.png</file>
-        <file alias="scene-view-c10">scene-view-status-10.png</file>
-        <file alias="scene-view-c11">scene-view-status-11.png</file>
-        <file alias="scene-view-c12">scene-view-status-12.png</file>
-        <file alias="scene-view-c13">scene-view-status-13.png</file>
-        <file alias="scene-view-c14">scene-view-status-14.png</file>
-        <file alias="scene-view-c15">scene-view-status-15.png</file>
-        <file alias="scene-view-c16">scene-view-status-16.png</file>
-        <file alias="scene-view-c17">scene-view-status-17.png</file>
-        <file alias="scene-view-c18">scene-view-status-18.png</file>
-        <file alias="scene-view-c19">scene-view-status-19.png</file>
-        <file alias="scene-view-c20">scene-view-status-20.png</file>
-        <file alias="scene-view-c21">scene-view-status-21.png</file>
-        <file alias="scene-view-c22">scene-view-status-22.png</file>
-        <file alias="scene-view-c23">scene-view-status-23.png</file>
-        <file alias="scene-view-c24">scene-view-status-24.png</file>
-        <file alias="scene-view-c25">scene-view-status-25.png</file>
-        <file alias="scene-view-c26">scene-view-status-26.png</file>
-        <file alias="scene-view-c27">scene-view-status-27.png</file>
-        <file alias="scene-view-c28">scene-view-status-28.png</file>
-        <file alias="scene-view-c29">scene-view-status-29.png</file>
-        <file alias="scene-view-c30">scene-view-status-30.png</file>
-        <file alias="scene-view-c31">scene-view-status-31.png</file>
-        <file alias="scene-view-marker-2">scene-exterior-arrows.png</file>
-        <file alias="scene-view-marker-4">scene-exterior-borders.png</file>
-        <file alias="scene-view-marker-1">scene-exterior-markers.png</file>
-        <file alias="scene-view-marker-c0">scene-exterior-status-0.png</file>
-        <file alias="scene-view-marker-c1">scene-exterior-status-1.png</file>
-        <file alias="scene-view-marker-c2">scene-exterior-status-2.png</file>
-        <file alias="scene-view-marker-c3">scene-exterior-status-3.png</file>
-        <file alias="scene-view-marker-c4">scene-exterior-status-4.png</file>
-        <file alias="scene-view-marker-c5">scene-exterior-status-5.png</file>
-        <file alias="scene-view-marker-c6">scene-exterior-status-6.png</file>
-        <file alias="scene-view-marker-c7">scene-exterior-status-7.png</file>
-        <file alias="editing-instance">editing-instance.png</file>
-        <file alias="editing-pathgrid">editing-pathgrid.png</file>
-        <file alias="editing-terrain-movement">editing-terrain-movement.png</file>
-        <file alias="editing-terrain-shape">editing-terrain-shape.png</file>
-        <file alias="editing-terrain-texture">editing-terrain-texture.png</file>
-        <file alias="editing-terrain-vertex-paint">editing-terrain-vertex-paint.png</file>
-        <file alias="transform-move">transform-move.png</file>
-        <file alias="transform-rotate">transform-rotate.png</file>
-        <file alias="transform-scale">transform-scale.png</file>
-        <file alias="selection-mode-cube">selection-mode-cube.png</file>
-        <file alias="selection-mode-cube-corner">selection-mode-cube-corner.png</file>
-        <file alias="selection-mode-cube-sphere">selection-mode-cube-sphere.png</file>
-        <file alias="brush-point">brush-point.png</file>
-        <file alias="brush-square">brush-square.png</file>
-        <file alias="brush-circle">brush-circle.png</file>
-        <file alias="brush-custom">brush-custom.png</file>
+        <file alias="night">lighting-moon.svg</file>
+        <file alias="day">lighting-sun.svg</file>
+        <file alias="bright">lighting-lamp.svg</file>
+        <file alias="1st-person">camera-first-person.svg</file>
+        <file alias="free-camera">camera-free.svg</file>
+        <file alias="orbiting-camera">camera-orbit.svg</file>
+        <file alias="play">run-game.svg</file>
+        <file alias="scene-view-1">scene-view-instance.svg</file>
+        <file alias="scene-view-8">scene-view-terrain.svg</file>
+        <file alias="scene-view-4">scene-view-water.svg</file>
+        <file alias="scene-view-2">scene-view-pathgrid.svg</file>
+        <file alias="scene-view-c0">scene-view-status-0.svg</file>
+        <file alias="scene-view-c1">scene-view-status-1.svg</file>
+        <file alias="scene-view-c2">scene-view-status-2.svg</file>
+        <file alias="scene-view-c3">scene-view-status-3.svg</file>
+        <file alias="scene-view-c4">scene-view-status-4.svg</file>
+        <file alias="scene-view-c5">scene-view-status-5.svg</file>
+        <file alias="scene-view-c6">scene-view-status-6.svg</file>
+        <file alias="scene-view-c7">scene-view-status-7.svg</file>
+        <file alias="scene-view-c8">scene-view-status-8.svg</file>
+        <file alias="scene-view-c9">scene-view-status-9.svg</file>
+        <file alias="scene-view-c10">scene-view-status-10.svg</file>
+        <file alias="scene-view-c11">scene-view-status-11.svg</file>
+        <file alias="scene-view-c12">scene-view-status-12.svg</file>
+        <file alias="scene-view-c13">scene-view-status-13.svg</file>
+        <file alias="scene-view-c14">scene-view-status-14.svg</file>
+        <file alias="scene-view-c15">scene-view-status-15.svg</file>
+        <file alias="scene-view-marker-2">scene-exterior-arrows.svg</file>
+        <file alias="scene-view-marker-4">scene-exterior-borders.svg</file>
+        <file alias="scene-view-marker-1">scene-exterior-markers.svg</file>
+        <file alias="scene-view-marker-c0">scene-exterior-status-0.svg</file>
+        <file alias="scene-view-marker-c1">scene-exterior-status-1.svg</file>
+        <file alias="scene-view-marker-c2">scene-exterior-status-2.svg</file>
+        <file alias="scene-view-marker-c3">scene-exterior-status-3.svg</file>
+        <file alias="scene-view-marker-c4">scene-exterior-status-4.svg</file>
+        <file alias="scene-view-marker-c5">scene-exterior-status-5.svg</file>
+        <file alias="scene-view-marker-c6">scene-exterior-status-6.svg</file>
+        <file alias="scene-view-marker-c7">scene-exterior-status-7.svg</file>
+        <file alias="editing-instance">editing-instance.svg</file>
+        <file alias="editing-pathgrid">editing-pathgrid.svg</file>
+        <file alias="editing-terrain-movement">editing-terrain-movement.svg</file>
+        <file alias="editing-terrain-shape">editing-terrain-shape.svg</file>
+        <file alias="editing-terrain-texture">editing-terrain-texture.svg</file>
+        <file alias="editing-terrain-vertex-paint">editing-terrain-vertex-paint.svg</file>
+        <file alias="transform-move">transform-move.svg</file>
+        <file alias="transform-rotate">transform-rotate.svg</file>
+        <file alias="transform-scale">transform-scale.svg</file>
+        <file alias="selection-mode-cube">selection-mode-cube.svg</file>
+        <file alias="selection-mode-cube-corner">selection-mode-cube-corner.svg</file>
+        <file alias="selection-mode-cube-sphere">selection-mode-sphere.svg</file>
+        <file alias="brush-point">brush-point.svg</file>
+        <file alias="brush-square">brush-square.svg</file>
+        <file alias="brush-circle">brush-circle.svg</file>
+        <file alias="brush-custom">brush-custom.svg</file>
     </qresource>
 </RCC>
diff --git a/files/opencs/run-game.png b/files/opencs/run-game.png
deleted file mode 100644
index f5038654fa..0000000000
Binary files a/files/opencs/run-game.png and /dev/null differ
diff --git a/files/opencs/run-game.svg b/files/opencs/run-game.svg
new file mode 100644
index 0000000000..818d1dd5b7
--- /dev/null
+++ b/files/opencs/run-game.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="run-openmw"
+     transform="matrix(11.338583,0,0,11.338583,-563.99997,-563.99997)"
+     style="display:inline">
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0084bb;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="path6526"
+       d="m 53.055828,51.961969 -2.084719,1.199138 a 0.11547005,0.11547005 30.092328 0 1 -0.173044,-0.100279 l 0.0039,-2.404989 a 0.11547005,0.11547005 150.09233 0 1 0.173366,-0.09972 l 2.080844,1.205851 a 0.11547005,0.11547005 90.092328 0 1 -3.23e-4,0.2 z" />
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1782"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741661"
+       y="49.741661"
+       rx="1.9824198e-15" />
+  </g>
+</svg>
diff --git a/files/opencs/run-log.png b/files/opencs/run-log.png
deleted file mode 100644
index 463ead176d..0000000000
Binary files a/files/opencs/run-log.png and /dev/null differ
diff --git a/files/opencs/run-log.svg b/files/opencs/run-log.svg
new file mode 100644
index 0000000000..96e0d037b7
--- /dev/null
+++ b/files/opencs/run-log.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26458338,0,0,0.26459185,23.018732,7.1420691)" />
+  </defs>
+  <g
+     id="run-log"
+     transform="matrix(3.7795278,0,0,3.7794065,-207.99997,-207.99282)"
+     style="display:inline">
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.183633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+       id="path6526"
+       d="m 57.904031,57.222619 -1.429163,0.842578 a 0.07915963,0.08113535 0 0 1 -0.118629,-0.07046 l 0.0027,-1.689872 a 0.07915963,0.08113535 0 0 1 0.11885,-0.07007 l 1.426507,0.847294 a 0.07915963,0.08113535 0 0 1 -2.21e-4,0.140531 z" />
+    <path
+       id="rect2091"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.264587px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 55.297905,55.033197 v 4.233469 h 3.704166 v -4.233469 z m 0.264582,0.264592 h 3.175002 v 3.704286 h -3.175002 z" />
+  </g>
+</svg>
diff --git a/files/opencs/run-openmw.png b/files/opencs/run-openmw.png
deleted file mode 100644
index 1033d62baa..0000000000
Binary files a/files/opencs/run-openmw.png and /dev/null differ
diff --git a/files/opencs/run-openmw.svg b/files/opencs/run-openmw.svg
new file mode 100644
index 0000000000..f0ae78619e
--- /dev/null
+++ b/files/opencs/run-openmw.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="run-openmw"
+     transform="matrix(3.7795278,0,0,3.7795278,-187.99999,-187.99999)"
+     style="display:inline">
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0084bb;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="path6526"
+       d="m 53.055828,51.961969 -2.084719,1.199138 a 0.11547005,0.11547005 30.092328 0 1 -0.173044,-0.100279 l 0.0039,-2.404989 a 0.11547005,0.11547005 150.09233 0 1 0.173366,-0.09972 l 2.080844,1.205851 a 0.11547005,0.11547005 90.092328 0 1 -3.23e-4,0.2 z" />
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1782"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741661"
+       y="49.741661"
+       rx="1.9824198e-15" />
+  </g>
+</svg>
diff --git a/files/opencs/scalable/startup/configure.svgz b/files/opencs/scalable/startup/configure.svgz
deleted file mode 100644
index 1275ec53fa..0000000000
Binary files a/files/opencs/scalable/startup/configure.svgz and /dev/null differ
diff --git a/files/opencs/scene-exterior-arrows.png b/files/opencs/scene-exterior-arrows.png
deleted file mode 100644
index 661bb81ae7..0000000000
Binary files a/files/opencs/scene-exterior-arrows.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-arrows.svg b/files/opencs/scene-exterior-arrows.svg
new file mode 100644
index 0000000000..c99eb6fc8a
--- /dev/null
+++ b/files/opencs/scene-exterior-arrows.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient2099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-111.65414,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="scene-exterior-arrows"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795279,-1.0000018,-300.99998)">
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="rect2560"
+       width="12.699999"
+       height="12.699999"
+       x="0.2645838"
+       y="79.639572"
+       ry="0" />
+    <path
+       id="path2096"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient2099);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+       d="m 2.1166671,84.402082 v 1.058334 l 2.116667,-1.058334 z m 6.8791676,0 2.1166663,1.058334 v -1.058334 z m -6.8791676,4.233334 v 1.058333 h 2.116667 z m 8.9958339,0 -2.1166663,1.058333 h 2.1166663 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-borders.png b/files/opencs/scene-exterior-borders.png
deleted file mode 100644
index ec5040dc88..0000000000
Binary files a/files/opencs/scene-exterior-borders.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-borders.svg b/files/opencs/scene-exterior-borders.svg
new file mode 100644
index 0000000000..3c63b135bc
--- /dev/null
+++ b/files/opencs/scene-exterior-borders.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-exterior-borders"
+     style="display:inline"
+     transform="matrix(3.7795276,0,0,3.7795279,-61,-300.99998)">
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="rect2562"
+       width="12.699998"
+       height="12.699999"
+       x="16.139584"
+       y="79.639572" />
+    <path
+       id="path2636"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d;stop-opacity:1"
+       d="m 85.001953,316.49805 a 0.50004934,0.50004934 0 0 0 -0.228515,0.0527 L 61,328.43945 v 1.1211 l 23.773438,11.88867 a 0.50004934,0.50004934 0 0 0 0.451171,0 L 109,329.55859 v -1.11718 L 85.224609,316.55078 a 0.50004934,0.50004934 0 0 0 -0.222656,-0.0527 z m 0,1.0625 22.884767,11.44336 -22.884767,11.43359 -22.882812,-11.44141 z"
+       transform="scale(0.26458333)" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-markers.png b/files/opencs/scene-exterior-markers.png
deleted file mode 100644
index 6fffcbbcca..0000000000
Binary files a/files/opencs/scene-exterior-markers.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-markers.svg b/files/opencs/scene-exterior-markers.svg
new file mode 100644
index 0000000000..5203fed48d
--- /dev/null
+++ b/files/opencs/scene-exterior-markers.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-exterior-markers"
+     style="display:inline"
+     transform="matrix(3.7795282,0,0,3.7795279,-121.00001,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2674"
+       width="12.699996"
+       height="12.699995"
+       x="32.01458"
+       y="79.639572" />
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+       id="rect2105"
+       width="4.7625012"
+       height="2.6458344"
+       x="35.983326"
+       y="80.433334" />
+    <path
+       id="path2109"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d;stop-opacity:1"
+       d="m 38.697918,81.227082 0.460443,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.254763,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="rect2564"
+       width="12.699998"
+       height="12.699999"
+       x="32.01458"
+       y="79.639572" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-0.png b/files/opencs/scene-exterior-status-0.png
deleted file mode 100644
index 6fa47b4394..0000000000
Binary files a/files/opencs/scene-exterior-status-0.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-0.svg b/files/opencs/scene-exterior-status-0.svg
new file mode 100644
index 0000000000..667c253730
--- /dev/null
+++ b/files/opencs/scene-exterior-status-0.svg
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="translate(31.749997)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-64.029146,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient5"
+       gradientTransform="matrix(1.4005478,0,0,0.71400598,-111.12491,-7.7443123e-6)"
+       x1="114.21744"
+       y1="118.06098"
+       x2="121.92512"
+       y2="118.06098"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-2"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2-2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-88" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2-2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient6"
+       gradientTransform="matrix(1.3972769,0,0,0.71567745,-111.12491,-7.7443123e-6)"
+       x1="115.24224"
+       y1="118.52464"
+       x2="121.45313"
+       y2="118.52464"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="scene-exterior-status-0"
+     style="display:inline"
+     transform="matrix(3.7795272,0,0,3.7795279,-180.99997,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2676"
+       width="12.699998"
+       height="12.699999"
+       x="47.88958"
+       y="79.639572" />
+    <path
+       id="use2063"
+       style="font-variation-settings:normal;display:inline;opacity:0.25;vector-effect:none;fill:url(#Main-6);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       d="m 49.741661,84.402082 v 1.058334 l 2.116667,-1.058334 z m 6.879168,0 2.116666,1.058334 v -1.058334 z m -6.879168,4.233334 v 1.058333 h 2.116667 z m 8.995834,0 -2.116666,1.058333 h 2.116666 z" />
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:0.25;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2238"
+       width="4.7625012"
+       height="2.6458344"
+       x="51.858326"
+       y="80.433334" />
+    <path
+       id="use2240"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 54.572917,81.227082 0.460443,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.254763,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#linearGradient5);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="M 54.239574,84.402069 48.9479,87.0479 54.239574,89.693733 59.531228,87.0479 Z"
+       id="use2197" />
+    <path
+       id="use2199"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient6);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 58.472899,86.518733 c -0.881939,0.440975 -1.763888,0.576439 -2.645827,1.01741 -0.881939,0.440972 -1.763878,1.187453 -2.645827,1.628423 m 4.233315,-3.174999 c -0.881939,0.440972 -1.763888,0.08819 -2.645817,0.529166 -0.881938,0.440972 -1.763887,1.675694 -2.645836,2.116666 m 4.233325,-3.175 c -0.88194,0.440975 -1.763878,0.0882 -2.645827,0.529169 -0.881939,0.440972 -1.763888,1.675694 -2.645847,2.116666 m -1.058329,-0.529168 c 0.881949,-0.440973 1.763898,-1.187453 2.645847,-1.628425 0.881939,-0.440972 1.763888,-0.576436 2.645817,-1.017407 m -2.116648,0 c 0.881949,0.44097 1.763888,0.576432 2.645827,1.017406 0.881939,0.440972 1.763888,1.187453 2.645827,1.628426 m -6.349992,-2.116667 c 0.881958,0.440974 1.763898,0.08819 2.645836,0.529168 0.881929,0.440972 1.763878,1.675693 2.645817,2.116667 m -6.350002,-2.116667 c 0.908729,0.454354 1.809318,0.110897 2.693897,0.553182 0.884569,0.442286 1.753118,1.670316 2.597777,2.09265 m -6.350003,-2.116666 c 0.881949,0.440972 1.763898,0.576435 2.645847,1.017407 0.881939,0.440972 1.763888,1.187453 2.645817,1.628426" />
+    <path
+       id="use2648"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 54.240097,83.740108 a 0.13230472,0.13230472 0 0 0 -0.06046,0.01394 l -6.290056,3.145551 v 0.296625 l 6.290056,3.145544 a 0.13230472,0.13230472 0 0 0 0.119372,0 l 6.290572,-3.146063 v -0.295587 l -6.290572,-3.146063 a 0.13230472,0.13230472 0 0 0 -0.05891,-0.01394 z m 0,0.28112 6.054928,3.027722 -6.054928,3.025137 -6.054411,-3.027206 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-1.png b/files/opencs/scene-exterior-status-1.png
deleted file mode 100644
index 2e1ed0f650..0000000000
Binary files a/files/opencs/scene-exterior-status-1.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-1.svg b/files/opencs/scene-exterior-status-1.svg
new file mode 100644
index 0000000000..cabf1f75e0
--- /dev/null
+++ b/files/opencs/scene-exterior-status-1.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(31.749998)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,56.025515,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.154146,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient5"
+       gradientTransform="matrix(1.4005477,0,0,0.71400598,-95.249894,-7.7443125e-6)"
+       x1="114.21744"
+       y1="118.06098"
+       x2="121.92512"
+       y2="118.06098"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-2"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-88" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient6"
+       gradientTransform="matrix(1.3972768,0,0,0.71567745,-95.249894,-7.7443125e-6)"
+       x1="115.24224"
+       y1="118.52464"
+       x2="121.45313"
+       y2="118.52464"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="scene-exterior-status-1"
+     style="display:inline"
+     transform="matrix(3.7795275,0,0,3.7795279,-240.99998,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2678"
+       width="12.699998"
+       height="12.699999"
+       x="63.76458"
+       y="79.639572" />
+    <path
+       id="use2065"
+       style="font-variation-settings:normal;display:inline;opacity:0.25;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       d="m 65.616661,84.402082 v 1.058334 l 2.116667,-1.058334 z m 6.879168,0 2.116666,1.058334 v -1.058334 z m -6.879168,4.233334 v 1.058333 h 2.116667 z m 8.995834,0 -2.116666,1.058333 h 2.116666 z" />
+    <rect
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2242"
+       width="4.7625012"
+       height="2.6458344"
+       x="67.733322"
+       y="80.433334" />
+    <path
+       id="use2244"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 70.447915,81.227082 0.460443,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.254763,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       id="use2652"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 70.115095,83.740108 a 0.13230472,0.13230472 0 0 0 -0.06046,0.01394 l -6.290056,3.145551 v 0.296625 l 6.290056,3.145544 a 0.13230472,0.13230472 0 0 0 0.119372,0 l 6.290572,-3.146063 v -0.295587 l -6.290572,-3.146063 a 0.13230472,0.13230472 0 0 0 -0.05891,-0.01394 z m 0,0.28112 6.054928,3.027722 -6.054928,3.025137 -6.054411,-3.027206 z" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#linearGradient5);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="M 70.114573,84.402069 64.822899,87.0479 70.114573,89.693733 75.406226,87.0479 Z"
+       id="use2197" />
+    <path
+       id="use2199"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient6);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 74.347897,86.518733 c -0.881939,0.440975 -1.763887,0.576439 -2.645826,1.01741 -0.881939,0.440972 -1.763878,1.187453 -2.645827,1.628423 m 4.233315,-3.174999 c -0.881939,0.440972 -1.763888,0.08819 -2.645817,0.529166 -0.881939,0.440972 -1.763888,1.675694 -2.645836,2.116666 m 4.233324,-3.175 c -0.881939,0.440975 -1.763878,0.0882 -2.645827,0.529169 -0.881938,0.440972 -1.763887,1.675694 -2.645846,2.116666 m -1.058329,-0.529168 c 0.881949,-0.440973 1.763898,-1.187453 2.645847,-1.628425 0.881939,-0.440972 1.763887,-0.576436 2.645816,-1.017407 m -2.116647,0 c 0.881949,0.44097 1.763888,0.576432 2.645827,1.017406 0.881939,0.440972 1.763887,1.187453 2.645826,1.628426 m -6.349991,-2.116667 c 0.881958,0.440974 1.763897,0.08819 2.645836,0.529168 0.881929,0.440972 1.763878,1.675693 2.645817,2.116667 m -6.350002,-2.116667 c 0.908728,0.454354 1.809317,0.110897 2.693896,0.553182 0.884569,0.442286 1.753118,1.670316 2.597777,2.09265 m -6.350002,-2.116666 c 0.881949,0.440972 1.763898,0.576435 2.645847,1.017407 0.881939,0.440972 1.763887,1.187453 2.645816,1.628426" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-2.png b/files/opencs/scene-exterior-status-2.png
deleted file mode 100644
index 8ccd356aa9..0000000000
Binary files a/files/opencs/scene-exterior-status-2.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-2.svg b/files/opencs/scene-exterior-status-2.svg
new file mode 100644
index 0000000000..2a1234e667
--- /dev/null
+++ b/files/opencs/scene-exterior-status-2.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(95.249992)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.07000434,0,0,0.07000434,78.32341,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-32.279149,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient5"
+       gradientTransform="matrix(1.4005482,0,0,0.71400598,-79.374955,-7.7443118e-6)"
+       x1="114.21744"
+       y1="118.06098"
+       x2="121.92512"
+       y2="118.06098"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-2"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-88" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient6"
+       gradientTransform="matrix(1.3972773,0,0,0.71567745,-79.374955,-7.7443118e-6)"
+       x1="115.24224"
+       y1="118.52464"
+       x2="121.45313"
+       y2="118.52464"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="scene-exterior-status-2"
+     style="display:inline"
+     transform="matrix(3.7795262,0,0,3.7795279,-300.99985,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2680"
+       width="12.699998"
+       height="12.699999"
+       x="79.639572"
+       y="79.639572" />
+    <path
+       id="use2067"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       d="m 81.491658,84.402082 v 1.058334 l 2.116667,-1.058334 z m 6.879168,0 2.116666,1.058334 v -1.058334 z m -6.879168,4.233334 v 1.058333 h 2.116667 z m 8.995834,0 -2.116666,1.058333 h 2.116666 z" />
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:0.25;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2246"
+       width="4.7625012"
+       height="2.6458344"
+       x="83.608322"
+       y="80.433334" />
+    <path
+       id="use2248"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 86.322912,81.227082 0.460443,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.254763,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       id="use2654"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 85.990093,83.740108 a 0.13230472,0.13230472 0 0 0 -0.06046,0.01394 l -6.290056,3.145551 v 0.296625 l 6.290056,3.145544 a 0.13230472,0.13230472 0 0 0 0.119372,0 l 6.290572,-3.146063 v -0.295587 l -6.290572,-3.146063 a 0.13230472,0.13230472 0 0 0 -0.05891,-0.01394 z m 0,0.28112 6.054928,3.027722 -6.054928,3.025137 -6.054411,-3.027206 z" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#linearGradient5);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="M 85.989568,84.402069 80.697893,87.0479 85.989568,89.693733 91.281223,87.0479 Z"
+       id="use2197" />
+    <path
+       id="use2199"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient6);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 90.222894,86.518733 c -0.881939,0.440975 -1.763888,0.576439 -2.645827,1.01741 -0.88194,0.440972 -1.763879,1.187453 -2.645828,1.628423 m 4.233316,-3.174999 c -0.881939,0.440972 -1.763888,0.08819 -2.645817,0.529166 -0.88194,0.440972 -1.763889,1.675694 -2.645838,2.116666 m 4.233326,-3.175 c -0.881939,0.440975 -1.763878,0.0882 -2.645827,0.529169 -0.881939,0.440972 -1.763889,1.675694 -2.645848,2.116666 m -1.058329,-0.529168 c 0.881949,-0.440973 1.763899,-1.187453 2.645848,-1.628425 0.881939,-0.440972 1.763888,-0.576436 2.645817,-1.017407 m -2.116648,0 c 0.881949,0.44097 1.763888,0.576432 2.645828,1.017406 0.881939,0.440972 1.763888,1.187453 2.645827,1.628426 M 83.8729,85.460399 c 0.881959,0.440974 1.763898,0.08819 2.645838,0.529168 0.881929,0.440972 1.763878,1.675693 2.645817,2.116667 m -6.350004,-2.116667 c 0.908729,0.454354 1.809318,0.110897 2.693898,0.553182 0.884569,0.442286 1.753118,1.670316 2.597777,2.09265 m -6.350004,-2.116666 c 0.881949,0.440972 1.763899,0.576435 2.645848,1.017407 0.881939,0.440972 1.763888,1.187453 2.645817,1.628426" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-3.png b/files/opencs/scene-exterior-status-3.png
deleted file mode 100644
index 70fdc4111e..0000000000
Binary files a/files/opencs/scene-exterior-status-3.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-3.svg b/files/opencs/scene-exterior-status-3.svg
new file mode 100644
index 0000000000..b76cf0dac0
--- /dev/null
+++ b/files/opencs/scene-exterior-status-3.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-16.404152,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient5"
+       gradientTransform="matrix(5.2934088,0,0,2.6986056,-600.99959,-301.00002)"
+       x1="114.21744"
+       y1="118.06098"
+       x2="121.92512"
+       y2="118.06098"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-2"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-88" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient6"
+       gradientTransform="matrix(5.2810463,0,0,2.704923,-600.99959,-301.00002)"
+       x1="115.24224"
+       y1="118.52464"
+       x2="121.45313"
+       y2="118.52464"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#linearGradient5);stroke-width:0.800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+     d="m 23.999976,17.999996 -20.0000249,9.999995 20.0000249,10 19.99995,-10 z"
+     id="use2197" />
+  <path
+     id="use2199"
+     style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient6);stroke-width:0.800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+     d="m 39.999943,25.99999 c -3.333312,1.666677 -6.666662,2.178667 -9.999974,3.84533 -3.333313,1.666665 -6.666625,4.488011 -9.999975,6.15467 M 35.999923,23.999992 c -3.333312,1.666666 -6.666662,0.333317 -9.999937,1.999998 -3.333312,1.666666 -6.666662,6.333332 -10.000012,7.999998 M 31.999941,21.999987 c -3.333313,1.666677 -6.666625,0.333355 -9.999975,2.000009 -3.333312,1.666666 -6.666662,6.333332 -10.00005,7.999998 M 7.9999335,29.999989 c 3.3333495,-1.66667 6.6667005,-4.488012 10.0000505,-6.154678 3.333312,-1.666666 6.666662,-2.178656 9.999937,-3.845318 m -7.999927,0 c 3.33335,1.666659 6.666662,2.178641 9.999975,3.845315 3.333312,1.666666 6.666662,4.488011 9.999974,6.154681 M 15.999974,21.999987 c 3.333387,1.666674 6.6667,0.333317 10.000012,2.000005 3.333275,1.666666 6.666625,6.333329 9.999937,8.000002 M 11.999916,23.999992 c 3.434565,1.717244 6.838366,0.419139 10.181656,2.090767 3.343253,1.671632 6.625957,6.313006 9.818369,7.909229 M 7.9999335,25.99999 c 3.3333495,1.666666 6.6667005,2.178652 10.0000505,3.845318 3.333312,1.666666 6.666662,4.488012 9.999937,6.154682" />
+  <g
+     id="scene-exterior-status-3"
+     style="display:inline"
+     transform="matrix(3.779518,0,0,3.7795279,-360.9989,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2682"
+       width="12.699994"
+       height="12.699999"
+       x="95.514572"
+       y="79.639572" />
+    <path
+       id="use2069"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       d="m 97.366655,84.402082 v 1.058334 l 2.116667,-1.058334 z m 6.879165,0 2.11667,1.058334 v -1.058334 z m -6.879165,4.233334 v 1.058333 h 2.116667 z m 8.995835,0 -2.11667,1.058333 h 2.11667 z" />
+    <rect
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2250"
+       width="4.7625012"
+       height="2.6458344"
+       x="99.483322"
+       y="80.433334" />
+    <path
+       id="use2252"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 102.19791,81.227082 0.46045,0.530717 v 0.527617 h 0.26457 v -0.527617 l 0.46045,-0.530717 h -0.33797 l -0.25476,0.318326 -0.25477,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       id="use2656"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 101.86509,83.740108 a 0.13230472,0.13230472 0 0 0 -0.0605,0.01394 l -6.290056,3.145551 v 0.296625 l 6.290056,3.145544 a 0.13230472,0.13230472 0 0 0 0.11937,0 l 6.29057,-3.146063 V 86.900122 L 101.924,83.754059 a 0.13230472,0.13230472 0 0 0 -0.0589,-0.01394 z m 0,0.28112 6.05493,3.027722 -6.05493,3.025137 -6.05441,-3.027206 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-4.png b/files/opencs/scene-exterior-status-4.png
deleted file mode 100644
index 2f2b907fc8..0000000000
Binary files a/files/opencs/scene-exterior-status-4.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-4.svg b/files/opencs/scene-exterior-status-4.svg
new file mode 100644
index 0000000000..afe0215302
--- /dev/null
+++ b/files/opencs/scene-exterior-status-4.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(317.49996)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.00490061,0,0,0.00490061,121.73427,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.52916,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient5"
+       gradientTransform="matrix(1.4005495,0,0,0.714006,-47.625147,-1.044431e-5)"
+       x1="114.21744"
+       y1="118.06098"
+       x2="121.92512"
+       y2="118.06098"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-2"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-88" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient6"
+       gradientTransform="matrix(1.3972786,0,0,0.71567748,-47.625147,-1.044431e-5)"
+       x1="115.24224"
+       y1="118.52464"
+       x2="121.45313"
+       y2="118.52464"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="scene-exterior-status-4"
+     style="display:inline"
+     transform="matrix(3.7795228,0,0,3.7795279,-420.99927,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2684"
+       width="12.699989"
+       height="12.699999"
+       x="111.38956"
+       y="79.639572" />
+    <path
+       id="use2071"
+       style="font-variation-settings:normal;display:inline;opacity:0.25;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       d="m 113.24165,84.402082 v 1.058334 l 2.11666,-1.058334 z m 6.87916,0 2.11667,1.058334 v -1.058334 z m -6.87916,4.233334 v 1.058333 h 2.11666 z m 8.99583,0 -2.11667,1.058333 h 2.11667 z" />
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:0.25;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2254"
+       width="4.7625012"
+       height="2.6458344"
+       x="115.35831"
+       y="80.433334" />
+    <path
+       id="use2256"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 118.07291,81.227082 0.46044,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.25476,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#linearGradient5);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 117.73953,84.402069 -5.29168,2.645832 5.29168,2.645833 5.29166,-2.645833 z"
+       id="use2197" />
+    <path
+       id="use2199"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient6);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 121.97286,86.518734 c -0.88194,0.440975 -1.76389,0.576439 -2.64583,1.01741 -0.88194,0.440972 -1.76388,1.187453 -2.64583,1.628423 m 4.23332,-3.174999 c -0.88194,0.440972 -1.76389,0.08819 -2.64582,0.529166 -0.88194,0.440972 -1.76389,1.675694 -2.64584,2.116666 m 4.23333,-3.175 c -0.88194,0.440975 -1.76388,0.0882 -2.64583,0.529169 -0.88194,0.440972 -1.76389,1.675694 -2.64585,2.116666 m -1.05833,-0.529168 c 0.88195,-0.440973 1.7639,-1.187453 2.64585,-1.628425 0.88194,-0.440972 1.76389,-0.576436 2.64582,-1.017407 m -2.11665,0 c 0.88195,0.44097 1.76389,0.576432 2.64583,1.017406 0.88194,0.440972 1.76389,1.187453 2.64583,1.628426 m -6.35,-2.116667 c 0.88196,0.440974 1.7639,0.08819 2.64584,0.529168 0.88193,0.440972 1.76388,1.675693 2.64582,2.116667 m -6.35001,-2.116667 c 0.90873,0.454354 1.80932,0.110897 2.6939,0.553182 0.88457,0.442286 1.75312,1.670316 2.59778,2.09265 m -6.35001,-2.116666 c 0.88195,0.440972 1.7639,0.576435 2.64585,1.017407 0.88194,0.440972 1.76389,1.187453 2.64582,1.628426" />
+    <path
+       id="use2658"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 117.74009,83.740108 a 0.13230472,0.13230472 0 0 0 -0.0605,0.01394 l -6.29006,3.145551 v 0.296625 l 6.29006,3.145544 a 0.13230472,0.13230472 0 0 0 0.11937,0 l 6.29057,-3.146063 V 86.900122 L 117.799,83.754059 a 0.13230472,0.13230472 0 0 0 -0.0589,-0.01394 z m 0,0.28112 6.05493,3.027722 -6.05493,3.025137 -6.05441,-3.027206 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-5.png b/files/opencs/scene-exterior-status-5.png
deleted file mode 100644
index b294c1b15a..0000000000
Binary files a/files/opencs/scene-exterior-status-5.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-5.svg b/files/opencs/scene-exterior-status-5.svg
new file mode 100644
index 0000000000..fc3a7eb7f3
--- /dev/null
+++ b/files/opencs/scene-exterior-status-5.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(476.24994)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.00129662,0,0,0.00129662,143.33384,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(15.34582,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(15.345798,-0.26459571)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       id="Main-60"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-60"
+       id="linearGradient5"
+       gradientTransform="matrix(1.4005477,0,0,0.71400603,-31.749963,-1.2413332e-5)"
+       x1="114.21744"
+       y1="118.06098"
+       x2="121.92512"
+       y2="118.06098"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-60"
+       id="linearGradient6"
+       gradientTransform="matrix(1.3972768,0,0,0.71567751,-31.749963,-1.2413332e-5)"
+       x1="115.24224"
+       y1="118.52464"
+       x2="121.45313"
+       y2="118.52464"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="scene-exterior-status-5"
+     style="display:inline"
+     transform="matrix(3.7795275,0,0,3.7795279,-480.99975,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2686"
+       width="12.699989"
+       height="12.699999"
+       x="127.26453"
+       y="79.639572" />
+    <rect
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2258"
+       width="4.7625012"
+       height="2.6458344"
+       x="131.23331"
+       y="80.433334" />
+    <path
+       id="use2260"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 133.94791,81.227082 0.46044,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.25476,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       id="use2077"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient1-2);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       d="M 129.11656,84.402066 V 85.4604 l 2.11666,-1.058334 z m 6.87916,0 2.11666,1.058334 v -1.058334 z m -6.87916,4.233334 v 1.058333 h 2.11666 z m 8.99582,0 -2.11666,1.058333 h 2.11666 z" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#linearGradient5);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 133.61451,84.402069 -5.29167,2.645833 5.29167,2.645834 5.29166,-2.645834 z"
+       id="use2197" />
+    <path
+       id="use2199"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient6);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 137.84784,86.518736 c -0.88193,0.440974 -1.76388,0.576438 -2.64582,1.017409 -0.88195,0.440972 -1.76389,1.187453 -2.64584,1.628424 m 4.23332,-3.175 c -0.88193,0.440973 -1.76388,0.08819 -2.64582,0.529167 -0.88194,0.440972 -1.76389,1.675694 -2.64584,2.116666 m 4.23334,-3.175 c -0.88194,0.440974 -1.76389,0.0882 -2.64584,0.529169 -0.88194,0.440972 -1.76389,1.675694 -2.64584,2.116665 m -1.05833,-0.529167 c 0.88195,-0.440973 1.76389,-1.187454 2.64584,-1.628426 0.88194,-0.440972 1.76389,-0.576435 2.64583,-1.017407 m -2.11666,0 c 0.88195,0.44097 1.76389,0.576433 2.64584,1.017406 0.88194,0.440972 1.76389,1.187454 2.64582,1.628427 m -6.35,-2.116667 c 0.88196,0.440973 1.7639,0.08819 2.64584,0.529167 0.88194,0.440972 1.76389,1.675694 2.64582,2.116667 m -6.35,-2.116667 c 0.90872,0.454355 1.80931,0.110897 2.69389,0.553183 0.88457,0.442286 1.75313,1.670316 2.59779,2.09265 m -6.35001,-2.116666 c 0.88195,0.440972 1.76389,0.576435 2.64584,1.017407 0.88194,0.440972 1.76389,1.187453 2.64583,1.628426" />
+    <path
+       id="use2660"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 133.61508,83.740108 a 0.13230472,0.13230472 0 0 0 -0.0605,0.01394 l -6.29006,3.145551 v 0.296625 l 6.29006,3.145544 a 0.13230472,0.13230472 0 0 0 0.11937,0 l 6.29057,-3.146063 v -0.295587 l -6.29057,-3.146063 a 0.13230472,0.13230472 0 0 0 -0.0589,-0.01394 z m 0,0.28112 6.05493,3.027722 -6.05493,3.025137 -6.05441,-3.027206 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-6.png b/files/opencs/scene-exterior-status-6.png
deleted file mode 100644
index 872568b266..0000000000
Binary files a/files/opencs/scene-exterior-status-6.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-6.svg b/files/opencs/scene-exterior-status-6.svg
new file mode 100644
index 0000000000..2a73b15bb1
--- /dev/null
+++ b/files/opencs/scene-exterior-status-6.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(666.74992)">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(3.4306404e-4,0,0,3.4306404e-4,164.9237,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(31.2208,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(31.220771,-0.26459622)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       id="Main-2"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-88" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient5"
+       gradientTransform="matrix(1.4005478,0,0,0.71400603,-15.874992,-1.2924314e-5)"
+       x1="114.21744"
+       y1="118.06098"
+       x2="121.92512"
+       y2="118.06098"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-2"
+       id="linearGradient6"
+       gradientTransform="matrix(1.3972769,0,0,0.71567751,-15.874992,-1.2924314e-5)"
+       x1="115.24224"
+       y1="118.52464"
+       x2="121.45313"
+       y2="118.52464"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="scene-exterior-status-6"
+     style="display:inline"
+     transform="matrix(3.7795274,0,0,3.7795279,-540.99966,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2688"
+       width="12.699989"
+       height="12.699999"
+       x="143.13951"
+       y="79.639572" />
+    <rect
+       style="font-variation-settings:normal;display:inline;opacity:0.25;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2262"
+       width="4.7625012"
+       height="2.6458344"
+       x="147.10831"
+       y="80.433334" />
+    <path
+       id="use2264"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 149.8229,81.227082 0.46044,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.25476,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       id="use2077"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient1-2);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       d="M 144.99154,84.402066 V 85.4604 l 2.11666,-1.058334 z m 6.87915,0 2.11667,1.058334 v -1.058334 z m -6.87915,4.233333 v 1.058333 h 2.11666 z m 8.99582,0 -2.11667,1.058333 h 2.11667 z" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#linearGradient5);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 149.48949,84.402069 -5.29167,2.645833 5.29167,2.645833 5.29166,-2.645833 z"
+       id="use2197" />
+    <path
+       id="use2199"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient6);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 153.72282,86.518735 c -0.88194,0.440975 -1.76389,0.576439 -2.64583,1.01741 -0.88194,0.440972 -1.76388,1.187453 -2.64583,1.628423 m 4.23332,-3.174999 c -0.88194,0.440972 -1.76389,0.08819 -2.64582,0.529166 -0.88194,0.440972 -1.76389,1.675694 -2.64584,2.116666 m 4.23333,-3.175 c -0.88194,0.440975 -1.76388,0.0882 -2.64583,0.529169 -0.88194,0.440972 -1.76389,1.675694 -2.64584,2.116666 m -1.05833,-0.529168 c 0.88195,-0.440973 1.76389,-1.187453 2.64584,-1.628425 0.88194,-0.440972 1.76389,-0.576436 2.64582,-1.017407 m -2.11665,0 c 0.88195,0.44097 1.76389,0.576432 2.64583,1.017406 0.88194,0.440972 1.76389,1.187453 2.64583,1.628426 m -6.35,-2.116667 c 0.88196,0.440974 1.7639,0.08819 2.64584,0.529168 0.88193,0.440972 1.76388,1.675693 2.64582,2.116667 m -6.35,-2.116667 c 0.90872,0.454354 1.80931,0.110897 2.69389,0.553182 0.88457,0.442286 1.75312,1.670316 2.59778,2.09265 m -6.35,-2.116666 c 0.88195,0.440972 1.76389,0.576435 2.64584,1.017407 0.88194,0.440972 1.76389,1.187453 2.64582,1.628426" />
+    <path
+       id="use2662"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 149.49006,83.740108 a 0.13230472,0.13230472 0 0 0 -0.0605,0.01394 l -6.29006,3.145551 v 0.296625 l 6.29006,3.145544 a 0.13230472,0.13230472 0 0 0 0.11937,0 l 6.29057,-3.146063 v -0.295587 l -6.29057,-3.146063 a 0.13230472,0.13230472 0 0 0 -0.0589,-0.01394 z m 0,0.28112 6.05493,3.027722 -6.05493,3.025137 -6.05441,-3.027206 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-status-7.png b/files/opencs/scene-exterior-status-7.png
deleted file mode 100644
index c19431025c..0000000000
Binary files a/files/opencs/scene-exterior-status-7.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-status-7.svg b/files/opencs/scene-exterior-status-7.svg
new file mode 100644
index 0000000000..221c69050b
--- /dev/null
+++ b/files/opencs/scene-exterior-status-7.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient2"
+       gradientTransform="translate(888.99988)">
+      <stop
+         style="stop-color:#304d4d;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(888.99988)"
+       xlink:href="#linearGradient2">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(9.0769026e-5,0,0,9.0769026e-5,186.511,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#4d4d4d;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#4d4d4d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.09578,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+  </defs>
+  <g
+     id="scene-exterior-status-7"
+     style="display:inline"
+     transform="matrix(3.779526,0,0,3.7795279,-600.99936,-300.99998)">
+    <rect
+       style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#4d4d4d"
+       id="frame2690"
+       width="12.699989"
+       height="12.699999"
+       x="159.0145"
+       y="79.639572" />
+    <path
+       id="use2077"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#303030"
+       d="m 160.86659,84.402082 v 1.058334 l 2.11666,-1.058334 z m 6.87916,0 2.11667,1.058334 v -1.058334 z m -6.87916,4.233334 v 1.058333 h 2.11666 z m 8.99583,0 -2.11667,1.058333 h 2.11667 z" />
+    <path
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f5f5f5;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#303030"
+       d="m 165.36454,84.402085 -5.29167,2.645833 5.29167,2.645834 5.29167,-2.645834 z"
+       id="use2197" />
+    <path
+       id="use2199"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#4d4d4d"
+       d="m 169.59788,86.518752 c -0.88194,0.440974 -1.76389,0.576438 -2.64583,1.017409 -0.88195,0.440972 -1.76389,1.187453 -2.64584,1.628424 m 4.23333,-3.175 c -0.88194,0.440973 -1.76389,0.08819 -2.64583,0.529167 -0.88194,0.440972 -1.76389,1.675694 -2.64584,2.116666 m 4.23334,-3.175 c -0.88194,0.440974 -1.76389,0.0882 -2.64584,0.529169 -0.88194,0.440972 -1.76389,1.675694 -2.64584,2.116665 m -1.05833,-0.529167 c 0.88195,-0.440973 1.76389,-1.187454 2.64584,-1.628426 0.88194,-0.440972 1.76389,-0.576435 2.64583,-1.017407 m -2.11666,0 c 0.88195,0.44097 1.76389,0.576433 2.64584,1.017406 0.88194,0.440972 1.76389,1.187454 2.64583,1.628427 m -6.35001,-2.116667 c 0.88196,0.440973 1.7639,0.08819 2.64584,0.529167 0.88194,0.440972 1.76389,1.675694 2.64583,2.116667 m -6.35001,-2.116667 c 0.90872,0.454355 1.80931,0.110897 2.69389,0.553183 0.88457,0.442286 1.75313,1.670316 2.59779,2.09265 m -6.35001,-2.116666 c 0.88195,0.440972 1.76389,0.576435 2.64584,1.017407 0.88194,0.440972 1.76389,1.187453 2.64583,1.628426" />
+    <rect
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#4d4d4d"
+       id="use2266"
+       width="4.7625012"
+       height="2.6458344"
+       x="162.98329"
+       y="80.433334" />
+    <path
+       id="use2268"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 165.69788,81.227082 0.46044,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.25476,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z" />
+    <path
+       id="use2664"
+       style="color:#4d4d4d;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#4d4d4d;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#4d4d4d;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#4d4d4d"
+       d="m 165.36504,83.740108 a 0.13230472,0.13230472 0 0 0 -0.0605,0.01394 l -6.29006,3.145551 v 0.296625 l 6.29006,3.145544 a 0.13230472,0.13230472 0 0 0 0.11937,0 l 6.29057,-3.146063 v -0.295587 l -6.29057,-3.146063 a 0.13230472,0.13230472 0 0 0 -0.0589,-0.01394 z m 0,0.28112 6.05493,3.027722 -6.05493,3.025137 -6.05441,-3.027206 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-fog.png b/files/opencs/scene-view-fog.png
deleted file mode 100644
index 65ea108ac5..0000000000
Binary files a/files/opencs/scene-view-fog.png and /dev/null differ
diff --git a/files/opencs/scene-view-instance.png b/files/opencs/scene-view-instance.png
deleted file mode 100644
index 6f5e7cb2ac..0000000000
Binary files a/files/opencs/scene-view-instance.png and /dev/null differ
diff --git a/files/opencs/scene-view-instance.svg b/files/opencs/scene-view-instance.svg
new file mode 100644
index 0000000000..8fe27a1bab
--- /dev/null
+++ b/files/opencs/scene-view-instance.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,81.44286,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-instance"
+     style="display:inline"
+     transform="matrix(3.7795276,0,0,3.7795276,-0.99999996,-420.99999)">
+    <rect
+       style="fill:none;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect1371"
+       width="12.7"
+       height="12.7"
+       x="0.26458332"
+       y="111.38958"
+       ry="0" />
+    <g
+       id="use1363"
+       transform="translate(31.749998)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle4"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle5"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle6"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-pathgrid.png b/files/opencs/scene-view-pathgrid.png
deleted file mode 100644
index edb350b8b5..0000000000
Binary files a/files/opencs/scene-view-pathgrid.png and /dev/null differ
diff --git a/files/opencs/scene-view-pathgrid.svg b/files/opencs/scene-view-pathgrid.svg
new file mode 100644
index 0000000000..b1a0c8845e
--- /dev/null
+++ b/files/opencs/scene-view-pathgrid.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,81.44286,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-pathgrid"
+     style="display:inline"
+     transform="matrix(3.7795276,0,0,3.7795276,-60.999994,-420.99999)">
+    <rect
+       style="display:inline;fill:none;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="use1373"
+       width="12.7"
+       height="12.7"
+       x="16.139582"
+       y="111.38958"
+       ry="0" />
+    <path
+       id="use1367"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 17.727088,114.5646 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529173,1.05832 0.529173,1.05835 0.529162,-1.05835 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-0.png b/files/opencs/scene-view-status-0.png
deleted file mode 100644
index 1906fd89cd..0000000000
Binary files a/files/opencs/scene-view-status-0.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-0.svg b/files/opencs/scene-view-status-0.svg
new file mode 100644
index 0000000000..a21c207d94
--- /dev/null
+++ b/files/opencs/scene-view-status-0.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <g
+     id="scene-view-status-0"
+     style="display:inline"
+     transform="matrix(3.7795265,0,0,3.7795307,-780.99919,-421.00026)" />
+</svg>
diff --git a/files/opencs/scene-view-status-1.png b/files/opencs/scene-view-status-1.png
deleted file mode 100644
index 6f5e7cb2ac..0000000000
Binary files a/files/opencs/scene-view-status-1.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-1.svg b/files/opencs/scene-view-status-1.svg
new file mode 100644
index 0000000000..cfcc7203c2
--- /dev/null
+++ b/files/opencs/scene-view-status-1.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,81.44286,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-1"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-1.0000018,-421.00026)">
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect2582"
+       width="12.699999"
+       height="12.699989"
+       x="0.2645838"
+       y="111.38956" />
+    <g
+       id="use2522"
+       transform="translate(31.749998)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle6"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle7"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle8"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-10.png b/files/opencs/scene-view-status-10.png
deleted file mode 100644
index 1216c180fe..0000000000
Binary files a/files/opencs/scene-view-status-10.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-10.svg b/files/opencs/scene-view-status-10.svg
new file mode 100644
index 0000000000..d97ddb8634
--- /dev/null
+++ b/files/opencs/scene-view-status-10.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,875.19269,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-10"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-540.99978,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2600"
+       width="12.699999"
+       height="12.699989"
+       x="143.13951"
+       y="111.38956" />
+    <g
+       id="use2576"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(158.81609,-0.529153)">
+      <path
+         id="path29"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path30"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+    <path
+       id="use2554"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 144.72701,114.5646 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-11.png b/files/opencs/scene-view-status-11.png
deleted file mode 100644
index dbe8276f07..0000000000
Binary files a/files/opencs/scene-view-status-11.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-11.svg b/files/opencs/scene-view-status-11.svg
new file mode 100644
index 0000000000..f63a170a97
--- /dev/null
+++ b/files/opencs/scene-view-status-11.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1049.8176,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-11"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-600.99972,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2602"
+       width="12.699999"
+       height="12.699989"
+       x="159.0145"
+       y="111.38956" />
+    <path
+       id="use2558"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 160.60199,114.5646 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z" />
+    <g
+       id="use2576"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(174.69107,-0.529153)">
+      <path
+         id="path29"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path30"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+    <g
+       id="use2560"
+       transform="translate(190.4999)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle20"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle21"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle22"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-12.png b/files/opencs/scene-view-status-12.png
deleted file mode 100644
index ba6d1f3235..0000000000
Binary files a/files/opencs/scene-view-status-12.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-12.svg b/files/opencs/scene-view-status-12.svg
new file mode 100644
index 0000000000..87fb4fd3ed
--- /dev/null
+++ b/files/opencs/scene-view-status-12.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1176.8176,119.35669)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-12"
+     transform="matrix(3.7795257,0,0,3.7795307,-420.99963,-481.00019)"
+     style="display:inline">
+    <path
+       id="use2126"
+       style="display:inline;font-variation-settings:normal;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 117.73954,131.23333 -6.35,3.175 v 0.52917 l 6.35,3.175 6.35,-3.175 v -0.52917 z" />
+    <rect
+       style="display:inline;opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2811"
+       width="12.699989"
+       height="12.699989"
+       x="111.38956"
+       y="127.26453" />
+    <g
+       id="use2576"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(127.06613,15.345815)">
+      <path
+         id="path29"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path30"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-13.png b/files/opencs/scene-view-status-13.png
deleted file mode 100644
index 3651cd6094..0000000000
Binary files a/files/opencs/scene-view-status-13.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-13.svg b/files/opencs/scene-view-status-13.svg
new file mode 100644
index 0000000000..e83dded670
--- /dev/null
+++ b/files/opencs/scene-view-status-13.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1367.3175,119.35669)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-13"
+     style="display:inline"
+     transform="matrix(3.7795218,0,0,3.7795307,-660.99852,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2604"
+       width="12.699999"
+       height="12.699989"
+       x="174.88948"
+       y="111.38956" />
+    <path
+       id="use2562"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 181.23946,115.35833 -6.35,3.175 v 0.52917 l 6.35,3.175 6.35,-3.175 v -0.52917 z" />
+    <g
+       id="use2576"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(1.0000013,0,0,1,190.56606,-0.529153)">
+      <path
+         id="path29"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path30"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+    <g
+       id="use2566"
+       transform="translate(206.37488)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle25"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle26"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle27"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-14.png b/files/opencs/scene-view-status-14.png
deleted file mode 100644
index 4bddb7ebc3..0000000000
Binary files a/files/opencs/scene-view-status-14.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-14.svg b/files/opencs/scene-view-status-14.svg
new file mode 100644
index 0000000000..dbbc9331ea
--- /dev/null
+++ b/files/opencs/scene-view-status-14.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1780.0673,119.35669)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-14"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-720.99956,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2614"
+       width="12.699999"
+       height="12.699989"
+       x="190.76445"
+       y="111.38956" />
+    <path
+       id="use2568"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 197.11444,115.35833 -6.34999,3.175 v 0.52917 l 6.34999,3.175 6.35,-3.175 v -0.52917 z" />
+    <g
+       id="use2576"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(206.44103,-0.529153)">
+      <path
+         id="path29"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path30"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+    <path
+       id="use2572"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 192.35195,114.5646 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-15.png b/files/opencs/scene-view-status-15.png
deleted file mode 100644
index bdd43407c9..0000000000
Binary files a/files/opencs/scene-view-status-15.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-15.svg b/files/opencs/scene-view-status-15.svg
new file mode 100644
index 0000000000..93b523f09c
--- /dev/null
+++ b/files/opencs/scene-view-status-15.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,2224.5669,119.35669)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-15"
+     style="display:inline"
+     transform="matrix(3.7795265,0,0,3.7795307,-780.99919,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2616"
+       width="12.699999"
+       height="12.699989"
+       x="206.63943"
+       y="111.38956" />
+    <path
+       id="use2574"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 212.98942,115.35833 -6.34999,3.175 v 0.52917 l 6.34999,3.175 6.35,-3.175 v -0.52917 z" />
+    <g
+       id="use2576"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(222.24984)">
+      <path
+         id="path29"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path30"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+    <path
+       id="use2578"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 208.22693,114.5646 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z m 1.5875,-0.79375 -0.52917,1.05832 0.52917,1.05835 0.52916,-1.05835 z" />
+    <g
+       id="use2580"
+       transform="translate(238.12484)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle30"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle31"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle32"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-16.png b/files/opencs/scene-view-status-16.png
deleted file mode 100644
index b0051eb127..0000000000
Binary files a/files/opencs/scene-view-status-16.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-17.png b/files/opencs/scene-view-status-17.png
deleted file mode 100644
index def1560323..0000000000
Binary files a/files/opencs/scene-view-status-17.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-18.png b/files/opencs/scene-view-status-18.png
deleted file mode 100644
index 7d92726876..0000000000
Binary files a/files/opencs/scene-view-status-18.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-19.png b/files/opencs/scene-view-status-19.png
deleted file mode 100644
index 17b75ce0e2..0000000000
Binary files a/files/opencs/scene-view-status-19.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-2.png b/files/opencs/scene-view-status-2.png
deleted file mode 100644
index edb350b8b5..0000000000
Binary files a/files/opencs/scene-view-status-2.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-2.svg b/files/opencs/scene-view-status-2.svg
new file mode 100644
index 0000000000..656c5d9d39
--- /dev/null
+++ b/files/opencs/scene-view-status-2.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,113.19286,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-2"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-61.000007,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2584"
+       width="12.699999"
+       height="12.699989"
+       x="16.139584"
+       y="111.38956" />
+    <path
+       id="use2524"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 17.727088,114.5646 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529173,1.05832 0.529173,1.05835 0.529162,-1.05835 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-20.png b/files/opencs/scene-view-status-20.png
deleted file mode 100644
index bb950d94e3..0000000000
Binary files a/files/opencs/scene-view-status-20.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-21.png b/files/opencs/scene-view-status-21.png
deleted file mode 100644
index 76ad0022c7..0000000000
Binary files a/files/opencs/scene-view-status-21.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-22.png b/files/opencs/scene-view-status-22.png
deleted file mode 100644
index e33820a166..0000000000
Binary files a/files/opencs/scene-view-status-22.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-23.png b/files/opencs/scene-view-status-23.png
deleted file mode 100644
index 6c1fcc54f2..0000000000
Binary files a/files/opencs/scene-view-status-23.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-24.png b/files/opencs/scene-view-status-24.png
deleted file mode 100644
index 057532b77a..0000000000
Binary files a/files/opencs/scene-view-status-24.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-25.png b/files/opencs/scene-view-status-25.png
deleted file mode 100644
index 061336c995..0000000000
Binary files a/files/opencs/scene-view-status-25.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-26.png b/files/opencs/scene-view-status-26.png
deleted file mode 100644
index 8fbcf68c63..0000000000
Binary files a/files/opencs/scene-view-status-26.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-27.png b/files/opencs/scene-view-status-27.png
deleted file mode 100644
index 30eb053b9b..0000000000
Binary files a/files/opencs/scene-view-status-27.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-28.png b/files/opencs/scene-view-status-28.png
deleted file mode 100644
index 3a8f77457d..0000000000
Binary files a/files/opencs/scene-view-status-28.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-29.png b/files/opencs/scene-view-status-29.png
deleted file mode 100644
index eff6106662..0000000000
Binary files a/files/opencs/scene-view-status-29.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-3.png b/files/opencs/scene-view-status-3.png
deleted file mode 100644
index ddf27c2db1..0000000000
Binary files a/files/opencs/scene-view-status-3.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-3.svg b/files/opencs/scene-view-status-3.svg
new file mode 100644
index 0000000000..fa9e83cf25
--- /dev/null
+++ b/files/opencs/scene-view-status-3.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,160.81785,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-3"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-121,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2586"
+       width="12.699999"
+       height="12.699989"
+       x="32.01458"
+       y="111.38956" />
+    <path
+       id="use2526"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 33.602086,114.5646 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529173,1.05832 0.529173,1.05835 0.529162,-1.05835 z" />
+    <g
+       id="use2528"
+       transform="translate(63.499994)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle8"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle9"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle10"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-30.png b/files/opencs/scene-view-status-30.png
deleted file mode 100644
index 63ce7d0d25..0000000000
Binary files a/files/opencs/scene-view-status-30.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-31.png b/files/opencs/scene-view-status-31.png
deleted file mode 100644
index 1906fd89cd..0000000000
Binary files a/files/opencs/scene-view-status-31.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-4.png b/files/opencs/scene-view-status-4.png
deleted file mode 100644
index 246c5aae92..0000000000
Binary files a/files/opencs/scene-view-status-4.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-4.svg b/files/opencs/scene-view-status-4.svg
new file mode 100644
index 0000000000..8fc4e9c31a
--- /dev/null
+++ b/files/opencs/scene-view-status-4.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,224.31784,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-4"
+     style="display:inline"
+     transform="matrix(3.7795274,0,0,3.7795307,-180.99997,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2588"
+       width="12.699999"
+       height="12.699989"
+       x="47.88958"
+       y="111.38956" />
+    <path
+       id="use2530"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 54.239577,115.35833 -6.349999,3.175 v 0.52917 l 6.349999,3.175 6.35,-3.175 v -0.52917 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-5.png b/files/opencs/scene-view-status-5.png
deleted file mode 100644
index 63d37f8be5..0000000000
Binary files a/files/opencs/scene-view-status-5.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-5.svg b/files/opencs/scene-view-status-5.svg
new file mode 100644
index 0000000000..0955f7044b
--- /dev/null
+++ b/files/opencs/scene-view-status-5.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,303.69283,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-5"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-240.99999,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2590"
+       width="12.699999"
+       height="12.699989"
+       x="63.764576"
+       y="111.38956" />
+    <path
+       id="use2532"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 70.114575,115.35833 -6.349999,3.175 v 0.52917 l 6.349999,3.175 6.349999,-3.175 v -0.52917 z" />
+    <g
+       id="use2534"
+       transform="translate(95.24999)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle10"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle11"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle12"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-6.png b/files/opencs/scene-view-status-6.png
deleted file mode 100644
index 051aa64ae7..0000000000
Binary files a/files/opencs/scene-view-status-6.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-6.svg b/files/opencs/scene-view-status-6.svg
new file mode 100644
index 0000000000..4321be4269
--- /dev/null
+++ b/files/opencs/scene-view-status-6.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,494.19281,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-6"
+     style="display:inline"
+     transform="matrix(3.7795273,0,0,3.7795307,-300.99993,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2592"
+       width="12.699999"
+       height="12.699989"
+       x="79.639572"
+       y="111.38956" />
+    <path
+       id="use2536"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 85.989573,115.35833 -6.349999,3.175 v 0.52917 l 6.349999,3.175 6.35,-3.175 v -0.52917 z" />
+    <path
+       id="use2538"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 81.22708,114.5646 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529173,1.05832 0.529173,1.05835 0.529162,-1.05835 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-7.png b/files/opencs/scene-view-status-7.png
deleted file mode 100644
index 6b2e5fdc16..0000000000
Binary files a/files/opencs/scene-view-status-7.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-7.svg b/files/opencs/scene-view-status-7.svg
new file mode 100644
index 0000000000..afda11876f
--- /dev/null
+++ b/files/opencs/scene-view-status-7.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,716.44277,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-7"
+     style="display:inline"
+     transform="matrix(3.7795258,0,0,3.7795307,-360.99976,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2594"
+       width="12.699999"
+       height="12.699989"
+       x="95.514572"
+       y="111.38956" />
+    <path
+       id="use2540"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 101.86456,115.35833 -6.349995,3.175 v 0.52917 l 6.349995,3.175 6.35,-3.175 v -0.52917 z" />
+    <path
+       id="use2542"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 97.102071,114.5646 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.587499,-0.79375 -0.529172,1.05832 0.529172,1.05835 0.52916,-1.05835 z" />
+    <g
+       id="use2544"
+       transform="translate(126.99998)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle12"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle13"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle14"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-8.png b/files/opencs/scene-view-status-8.png
deleted file mode 100644
index 65ea108ac5..0000000000
Binary files a/files/opencs/scene-view-status-8.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-8.svg b/files/opencs/scene-view-status-8.svg
new file mode 100644
index 0000000000..f0f71b0f5c
--- /dev/null
+++ b/files/opencs/scene-view-status-8.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,716.44277,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-8"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-420.99991,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2596"
+       width="12.699999"
+       height="12.699989"
+       x="111.38955"
+       y="111.38956" />
+    <g
+       id="use2546"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(126.99996)">
+      <path
+         id="path14"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path15"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-status-9.png b/files/opencs/scene-view-status-9.png
deleted file mode 100644
index 72d0d9fb77..0000000000
Binary files a/files/opencs/scene-view-status-9.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-9.svg b/files/opencs/scene-view-status-9.svg
new file mode 100644
index 0000000000..598b408732
--- /dev/null
+++ b/files/opencs/scene-view-status-9.svg
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,716.44277,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-status-9"
+     style="display:inline"
+     transform="matrix(3.7795279,0,0,3.7795307,-480.99983,-421.00026)">
+    <rect
+       style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="use2598"
+       width="12.699999"
+       height="12.699989"
+       x="127.26453"
+       y="111.38956" />
+    <g
+       id="use2576"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.99999702,0,0,0.99997478,142.87492,0.00291574)">
+      <path
+         id="path29"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path30"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+    <g
+       id="use2550"
+       transform="translate(158.74994)"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle16"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle17"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#303030;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="circle18"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-terrain.png b/files/opencs/scene-view-terrain.png
deleted file mode 100644
index b0051eb127..0000000000
Binary files a/files/opencs/scene-view-terrain.png and /dev/null differ
diff --git a/files/opencs/scene-view-terrain.svg b/files/opencs/scene-view-terrain.svg
new file mode 100644
index 0000000000..0aef600261
--- /dev/null
+++ b/files/opencs/scene-view-terrain.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,81.44286,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-terrain"
+     style="display:inline"
+     transform="matrix(3.7795276,0,0,3.7795276,-120.99999,-420.99999)">
+    <rect
+       style="display:inline;fill:none;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="use1375"
+       width="12.7"
+       height="12.7"
+       x="32.01458"
+       y="111.38958"
+       ry="0" />
+    <g
+       id="use1365"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(47.624995)">
+      <path
+         id="path1"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#cc9465;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path2"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#303030;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+  </g>
+</svg>
diff --git a/files/opencs/scene-view-water.png b/files/opencs/scene-view-water.png
deleted file mode 100644
index 246c5aae92..0000000000
Binary files a/files/opencs/scene-view-water.png and /dev/null differ
diff --git a/files/opencs/scene-view-water.svg b/files/opencs/scene-view-water.svg
new file mode 100644
index 0000000000..68edc166e4
--- /dev/null
+++ b/files/opencs/scene-view-water.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   preserveAspectRatio="xMidYMid"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main"
+       gradientTransform="translate(190.49998)">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="matrix(0.01852198,0,0,0.01852198,100.09806,0)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)"
+         d="m 4.2207031,24.023437 c -0.1753477,0 -0.3947923,0.03618 -0.6035156,0.166016 -0.2087233,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 A 0.28666925,0.28666925 0 0 0 4.125,25.033203 c -0.1437029,0.106531 -0.2727825,0.217419 -0.3457031,0.369141 -0.080497,0.167484 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851562,-0.267579 c 0.010216,-0.146016 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.029361,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034486,-0.08545 0.1640625,-0.148438 0.1212278,-0.125967 0.2675781,-0.317186 0.2675781,-0.583984 0,-0.262483 -0.1335657,-0.499873 -0.3261719,-0.652344 -0.1926061,-0.15247 -0.441767,-0.232421 -0.7109375,-0.232422 z m 0.015625,0.873047 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,49.692863,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.816406,23.548828 c -0.462586,0 -0.865246,0.128541 -1.142578,0.351563 -0.277331,0.223021 -0.443359,0.532159 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.394661 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.69336 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.280369,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+  </defs>
+  <g
+     id="scene-view-water"
+     style="display:inline"
+     transform="matrix(3.7795271,0,0,3.7795276,-180.99996,-420.99999)">
+    <rect
+       style="display:inline;fill:none;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="use1377"
+       width="12.7"
+       height="12.7"
+       x="47.88958"
+       y="111.38958"
+       ry="0" />
+    <path
+       id="use1369"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 54.239577,115.35833 -6.349999,3.175 v 0.52917 l 6.349999,3.175 6.35,-3.175 v -0.52917 z" />
+  </g>
+</svg>
diff --git a/files/opencs/scene.png b/files/opencs/scene.png
deleted file mode 100644
index a9fc03f769..0000000000
Binary files a/files/opencs/scene.png and /dev/null differ
diff --git a/files/opencs/scene.svg b/files/opencs/scene.svg
new file mode 100644
index 0000000000..a516d6b596
--- /dev/null
+++ b/files/opencs/scene.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2424"
+       x1="40.481247"
+       y1="4.2333221"
+       x2="42.068748"
+       y2="4.2333221"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2426"
+       x1="40.87812"
+       y1="4.2333136"
+       x2="41.671894"
+       y2="4.2333136"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2428"
+       x1="41.274998"
+       y1="3.7041686"
+       x2="43.127083"
+       y2="3.7041686"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2430"
+       x1="39.422913"
+       y1="3.7041686"
+       x2="41.274998"
+       y2="3.7041686"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="record-preview"
+     style="display:inline"
+     transform="matrix(3.7795278,0,0,3.7795278,-148.00001,-8.0000009)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1348"
+       width="4.2333331"
+       height="4.2333331"
+       x="39.158333"
+       y="2.1166668"
+       rx="1.9824198e-15" />
+    <path
+       id="path1160"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2424);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.261561,3.4395861 a 0.79374999,0.79375052 0 0 0 -0.780314,0.79375 0.79374999,0.79375052 0 0 0 0.79375,0.7937503 0.79374999,0.79375052 0 0 0 0.79375,-0.7937503 0.79374999,0.79375052 0 0 0 -0.79375,-0.79375 0.79374999,0.79375052 0 0 0 -0.01344,0 z m 5.29e-4,0.264583 a 0.52916663,0.52916663 0 0 1 0.01291,0 0.52916663,0.52916663 0 0 1 0.529167,0.529167 A 0.52916663,0.52916663 0 0 1 41.275,4.7625024 0.52916663,0.52916663 0 0 1 40.745833,4.2333361 0.52916663,0.52916663 0 0 1 41.262081,3.7041691 Z" />
+    <path
+       id="ellipse1162"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2426);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.274997,3.8364611 a 0.396875,0.396875 0 0 0 -0.396875,0.396875 0.396875,0.396875 0 0 0 0.396875,0.396875 0.396875,0.396875 0 0 0 0.396875,-0.396875 0.396875,0.396875 0 0 0 0,-0.0083 0.27667566,0.27667566 0 0 1 -0.218591,0.106452 0.27667566,0.27667566 0 0 1 -0.276469,-0.276468 0.27667566,0.27667566 0 0 1 0.10697,-0.218075 0.396875,0.396875 0 0 0 -0.0088,-5.29e-4 z" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2428);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.274998,3.1750021 v 0.319409 c 0.861767,0 1.44543,0.520557 1.5875,0.738924 h 0.264583 c -0.213105,-0.491985 -0.995246,-1.058333 -1.852083,-1.058333 z"
+       id="path1177" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2430);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 41.274997,3.1750021 v 0.319409 c -0.861767,0 -1.44543,0.520557 -1.5875,0.738924 h -0.264583 c 0.213105,-0.491985 0.995246,-1.058333 1.852083,-1.058333 z"
+       id="path1179" />
+  </g>
+</svg>
diff --git a/files/opencs/script.png b/files/opencs/script.png
deleted file mode 100644
index 29d622e19f..0000000000
Binary files a/files/opencs/script.png and /dev/null differ
diff --git a/files/opencs/script.svg b/files/opencs/script.svg
new file mode 100644
index 0000000000..76f3b7b28c
--- /dev/null
+++ b/files/opencs/script.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="script"
+     transform="matrix(3.7795278,0,0,3.7795232,-128.00003,-187.99976)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1497"
+       width="4.2333331"
+       height="4.2333331"
+       x="33.866673"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="rect2091"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 122,181 v 16 h 14 v -16 z m 1,1 h 12 v 14 h -12 z m 1,1 v 1 h 1 v -1 z m 2,0 v 1 h 8 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 5 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 2 v -1 z m -2,2 v 1 h 1 v -1 z m 0,2 v 1 h 1 v -1 z m 2,0 v 1 h 6 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 3 v -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/selection-mode-cube-corner.png b/files/opencs/selection-mode-cube-corner.png
deleted file mode 100644
index b69ef1782f..0000000000
Binary files a/files/opencs/selection-mode-cube-corner.png and /dev/null differ
diff --git a/files/opencs/selection-mode-cube-corner.svg b/files/opencs/selection-mode-cube-corner.svg
new file mode 100644
index 0000000000..21c28e1fc3
--- /dev/null
+++ b/files/opencs/selection-mode-cube-corner.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-2" />
+    </linearGradient>
+  </defs>
+  <g
+     id="selection-mode-cube-corner"
+     style="display:inline"
+     transform="matrix(0.95633709,0,0,0.97689208,-70.343751,-63.444673)">
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.675929,76.010117 8.085388,-1.488233 3.370361,3.890874 -8.140511,1.599832 z"
+       id="path6-9" />
+    <path
+       style="display:inline;fill:#1d99fd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.0598711;stroke-opacity:1"
+       d="m 81.173331,76.932574 4.8674,-0.904283 2.028956,2.364179 -4.900584,0.972093 z"
+       id="path6-9-4" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.642959,68.667241 -0.0041,7.322622"
+       id="path7" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 79.986786,72.658937 -8.54e-4,7.368065"
+       id="path8" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 84.763819,67.211494 0.0099,7.346147"
+       id="path9" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 88.176341,71.120908 -0.004,7.324058"
+       id="path10" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.683046,68.699562 8.085387,-1.488233 3.370362,3.890874 -8.140511,1.599832 z"
+       id="path6-9-9" />
+  </g>
+</svg>
diff --git a/files/opencs/selection-mode-cube-sphere.png b/files/opencs/selection-mode-cube-sphere.png
deleted file mode 100644
index cb5432eea6..0000000000
Binary files a/files/opencs/selection-mode-cube-sphere.png and /dev/null differ
diff --git a/files/opencs/selection-mode-cube.png b/files/opencs/selection-mode-cube.png
deleted file mode 100644
index 1344a3fb1a..0000000000
Binary files a/files/opencs/selection-mode-cube.png and /dev/null differ
diff --git a/files/opencs/selection-mode-cube.svg b/files/opencs/selection-mode-cube.svg
new file mode 100644
index 0000000000..d237a7746a
--- /dev/null
+++ b/files/opencs/selection-mode-cube.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-2" />
+    </linearGradient>
+  </defs>
+  <g
+     id="selection-mode-cube"
+     style="display:inline;stroke-width:0.183665;stroke-dasharray:none"
+     transform="matrix(0.94403189,0,0,0.96988505,-69.504358,-62.928849)">
+    <path
+       style="display:inline;fill:#1d99fd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.183665;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.785755,76.027483 8.191425,-1.499019 3.414563,3.919074 -8.247271,1.611427 z"
+       id="path6-9" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.183665;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.752352,68.631388 -0.0042,7.375694"
+       id="path7" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.183665;stroke-dasharray:none;stroke-opacity:1"
+       d="m 80.140033,72.652014 -8.65e-4,7.421467"
+       id="path8" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.183665;stroke-dasharray:none;stroke-opacity:1"
+       d="m 84.979715,67.165089 0.01,7.39939"
+       id="path9" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.183665;stroke-dasharray:none;stroke-opacity:1"
+       d="m 88.436992,71.102838 -0.0041,7.377141"
+       id="path10" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.183665;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.792965,68.663942 8.191425,-1.499019 3.414563,3.919074 -8.247271,1.611427 z"
+       id="path6-9-9" />
+  </g>
+</svg>
diff --git a/files/opencs/selection-mode-sphere.svg b/files/opencs/selection-mode-sphere.svg
new file mode 100644
index 0000000000..64bfbb0916
--- /dev/null
+++ b/files/opencs/selection-mode-sphere.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-2" />
+    </linearGradient>
+  </defs>
+  <g
+     id="selection-mode-sphere"
+     style="display:inline"
+     transform="matrix(0.95633709,0,0,0.97689208,-70.52014,-63.444673)">
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.860371,76.010117 8.085388,-1.488233 3.370361,3.890874 -8.140511,1.599832 z"
+       id="path6-9" />
+    <path
+       style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 84.948261,67.211494 0.0099,7.346147"
+       id="path9" />
+    <g
+       id="layer1"
+       transform="matrix(1.0456564,0,0,1.0236545,73.739836,64.945427)"
+       style="display:inline">
+      <ellipse
+         style="fill:#1d99fd;fill-opacity:1;stroke:none;stroke-width:0.100474;stroke-opacity:1"
+         id="path11"
+         cx="8.4666662"
+         cy="8.4666662"
+         rx="3.5277777"
+         ry="3.5277779" />
+    </g>
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.827402,68.667241 -0.0041,7.322622"
+       id="path7" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 80.171228,72.658937 -8.53e-4,7.368065"
+       id="path8" />
+    <path
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 88.360783,71.120908 -0.004,7.324058"
+       id="path10" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.18246;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.867489,68.699562 8.085387,-1.488233 3.370361,3.890874 -8.14051,1.599832 z"
+       id="path6-9-9" />
+  </g>
+</svg>
diff --git a/files/opencs/skill.png b/files/opencs/skill.png
deleted file mode 100644
index 0ef7cb1cb7..0000000000
Binary files a/files/opencs/skill.png and /dev/null differ
diff --git a/files/opencs/skill.svg b/files/opencs/skill.svg
new file mode 100644
index 0000000000..21ae4d12c8
--- /dev/null
+++ b/files/opencs/skill.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2180"
+       x1="141"
+       y1="189"
+       x2="157"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="skill"
+     transform="matrix(3.7795276,0,0,3.7795232,-148,-187.99976)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1495"
+       width="4.2333331"
+       height="4.2333331"
+       x="39.158333"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="rect2146"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2180);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 146.5,181 c -0.27702,0 -0.5,0.223 -0.5,0.5 v 2 c 0,0.27702 0.223,0.5 0.5,0.5 h 2.5 v 1 h -5 v -0.5 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 2 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 V 186 h 5 v 2 h -4 v 1 1 h -0.5 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 2 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 H 146 v -1 h 3 v 6 h -4 v -0.5 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 2 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 V 196 h 7 v 0.5 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 0.5 h -2 v -4 h 4 v 0.5 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 0.5 h -4 v -3 h 3 v 0.5 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 0.5 h -3 v -2 h 2.5 c 0.27702,0 0.5,-0.223 0.5,-0.5 v -2 c 0,-0.27702 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 h 5 v 1 h -5 z m -5,3 h 1 v 1 h -1 z m 12,1 h 1 v 1 h -1 z m 1,4 h 1 v 1 h -1 z m -10,1 h 1 v 1 h -1 z m -2,4 h 1 v 1 h -1 z m 10,0 h 1 v 1 h -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+  </g>
+</svg>
diff --git a/files/opencs/sound-generator.png b/files/opencs/sound-generator.png
deleted file mode 100644
index 79833df9c3..0000000000
Binary files a/files/opencs/sound-generator.png and /dev/null differ
diff --git a/files/opencs/sound-generator.svg b/files/opencs/sound-generator.svg
new file mode 100644
index 0000000000..4e27f19f41
--- /dev/null
+++ b/files/opencs/sound-generator.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2294"
+       x1="33.866669"
+       y1="30.691666"
+       x2="38.099998"
+       y2="30.691666"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="sound-generator"
+     transform="matrix(3.7795278,0,0,3.7795278,-128.00003,-108.00002)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1424"
+       width="4.2333331"
+       height="4.2333331"
+       x="33.866673"
+       y="28.575003"
+       rx="1.9824198e-15" />
+    <path
+       id="path1662"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2294);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 35.924421,29.104166 -1.058333,0.79375 H 34.13125 v 0.79375 0.79375 h 0.734838 l 1.058333,0.793751 h 0.05891 0.264584 v -1.587501 -1.5875 h -0.264584 z m 0.05891,0.281635 v 1.305865 1.305865 l -1.058333,-0.79375 v -0.512115 -0.512114 z m 1.360641,-0.315743 -0.170016,0.202573 c 0.419401,0.351984 0.661566,0.871503 0.661458,1.419034 -1.73e-4,0.547435 -0.242518,1.066749 -0.661974,1.418519 l 0.170532,0.203089 c 0.479304,-0.402221 0.756088,-0.995897 0.756026,-1.621608 6.1e-5,-0.625711 -0.276722,-1.219386 -0.756026,-1.621607 z m -0.510048,0.608232 -0.170532,0.203089 c 0.23961,0.200945 0.378086,0.497569 0.378272,0.810286 -1.86e-4,0.312717 -0.138662,0.609342 -0.378272,0.810287 l 0.170532,0.203089 c 0.299459,-0.251396 0.472372,-0.622383 0.472324,-1.013376 4.8e-5,-0.390993 -0.172865,-0.761979 -0.472324,-1.013375 z m -2.438091,0.48421 h 0.205671 0.05891 v 0.281635 0.247531 0.247531 0.281636 h -0.05891 -0.205671 v -0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/sound.png b/files/opencs/sound.png
deleted file mode 100644
index 86871611f5..0000000000
Binary files a/files/opencs/sound.png and /dev/null differ
diff --git a/files/opencs/sound.svg b/files/opencs/sound.svg
new file mode 100644
index 0000000000..ead929c862
--- /dev/null
+++ b/files/opencs/sound.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient3131"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="30.691668"
+       x2="21.960417"
+       y2="30.691668"
+       gradientTransform="matrix(1.5999994,0,0,1,-10.794989,8.2675378e-8)" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2264"
+       x1="7.4083338"
+       y1="30.691668"
+       x2="11.641667"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5,0,0,1.6,6.0324979,-18.415001)" />
+  </defs>
+  <g
+     id="sound"
+     transform="matrix(2.3622048,0,0,2.3622039,-39.499997,-64.499979)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect3125"
+       width="4.2333331"
+       height="4.2333331"
+       x="17.991665"
+       y="28.575003"
+       rx="1.9824198e-15" />
+    <path
+       id="path3127"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3131);fill-opacity:1;stroke:none;stroke-width:0.334674px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 18.838333,28.575001 v 4.233334 h 0.423332 v -4.233334 z m 0.846662,0.846667 v 2.540001 h 0.423336 v -2.540001 z m 1.693335,0 v 2.540001 h 0.423334 v -2.540001 z m -3.386665,0.423334 v 1.693333 h 0.423333 v -1.693333 z m 2.539997,0 v 1.693333 h 0.423335 v -1.693333 z m 1.693334,0 v 1.693333 h 0.423336 v -1.693333 z" />
+    <rect
+       style="display:inline;opacity:0;fill:#a51d2d;stroke-width:0.999998px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1435"
+       width="15.999994"
+       height="15.999994"
+       x="0"
+       y="6.0146972e-06"
+       rx="7.4926078e-15"
+       transform="matrix(0.42333331,0,0,0.42333347,16.721665,27.305001)" />
+    <path
+       id="rect1042"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2264);fill-opacity:1;stroke:none;stroke-width:0.40989px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 17.144998,27.305001 v 6.773334 h 6.35 v -6.773334 z m 0.396874,0.423334 h 5.55625 v 5.926666 h -5.55625 z" />
+  </g>
+</svg>
diff --git a/files/opencs/spell.png b/files/opencs/spell.png
deleted file mode 100644
index 5890ea751b..0000000000
Binary files a/files/opencs/spell.png and /dev/null differ
diff --git a/files/opencs/spell.svg b/files/opencs/spell.svg
new file mode 100644
index 0000000000..e726d85a7e
--- /dev/null
+++ b/files/opencs/spell.svg
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2188"
+       x1="2.6458333"
+       y1="46.434372"
+       x2="2.9104166"
+       y2="46.434372"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2190"
+       x1="3.175"
+       y1="46.434376"
+       x2="3.4395833"
+       y2="46.434376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2192"
+       x1="3.4395833"
+       y1="46.963547"
+       x2="3.7041667"
+       y2="46.963547"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2194"
+       x1="5.0270834"
+       y1="46.43438"
+       x2="5.2916665"
+       y2="46.43438"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2196"
+       x1="4.7624998"
+       y1="46.963547"
+       x2="5.0270829"
+       y2="46.963547"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2198"
+       x1="5.5562501"
+       y1="46.434372"
+       x2="5.8208332"
+       y2="46.434372"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2200"
+       x1="1"
+       y1="174"
+       x2="17"
+       y2="174"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2202"
+       x1="1"
+       y1="163"
+       x2="17"
+       y2="163"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2218"
+       x1="3.7041683"
+       y1="46.302086"
+       x2="4.7625012"
+       y2="46.302086"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="spell"
+     transform="matrix(3.7795255,0,0,3.7795278,-7.9999954,-168)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1485"
+       width="4.2333331"
+       height="4.2333331"
+       x="2.1166692"
+       y="44.449997"
+       rx="1.9824198e-15" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2188);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1536"
+       width="0.26458332"
+       height="1.8520834"
+       x="2.6458333"
+       y="45.508331"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2190);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1538"
+       width="0.26458332"
+       height="0.26458332"
+       x="3.175"
+       y="46.302082"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2192);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1540"
+       width="0.26458332"
+       height="0.26458332"
+       x="3.4395833"
+       y="46.831253"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2194);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1542"
+       width="0.26458332"
+       height="0.26458332"
+       x="5.0270834"
+       y="46.302086"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2196);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1544"
+       width="0.26458332"
+       height="0.26458332"
+       x="4.7624998"
+       y="46.831253"
+       rx="1.3877792e-16" />
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2198);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1546"
+       width="0.26458332"
+       height="1.8520834"
+       x="5.5562501"
+       y="45.508331"
+       rx="1.3877792e-16" />
+    <path
+       id="rect1548"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2200);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="M 2.5,172 C 2.2229984,172 2,172.22299 2,172.5 V 173 H 1 v 2 h 1 v 0.5 c 0,0.277 0.2229999,0.5 0.5,0.5 h 13 c 0.277002,0 0.5,-0.22299 0.5,-0.5 V 175 h 1 v -2 h -1 v -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 h 12 v 2 H 3 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="rect1552"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2202);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="M 2.5,161 C 2.2229984,161 2,161.223 2,161.5 V 162 H 1 v 2 h 1 v 0.5 c 0,0.27701 0.2229984,0.5 0.5,0.5 h 13 c 0.277002,0 0.5,-0.223 0.5,-0.5 V 164 h 1 v -2 h -1 v -0.5 c 0,-0.27701 -0.222998,-0.5 -0.5,-0.5 z m 0.5,1 h 12 v 2 H 3 Z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       id="path1720"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2218);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 3.9687513,45.772918 c 0,0.132294 -0.132292,0.264586 -0.264583,0.264583 v 0.529167 c 0.132291,2e-6 0.264583,0.132294 0.264583,0.264583 h 0.529167 c 0,-0.132289 0.132291,-0.264581 0.264583,-0.264583 v -0.529167 c -0.132292,3e-6 -0.264583,-0.132289 -0.264583,-0.264583 z m 0,0.264583 h 0.529167 v 0.529167 h -0.529167 z" />
+  </g>
+</svg>
diff --git a/files/opencs/start-script.png b/files/opencs/start-script.png
deleted file mode 100644
index 73ed157b9e..0000000000
Binary files a/files/opencs/start-script.png and /dev/null differ
diff --git a/files/opencs/start-script.svg b/files/opencs/start-script.svg
new file mode 100644
index 0000000000..f7348c493a
--- /dev/null
+++ b/files/opencs/start-script.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2182"
+       x1="162"
+       y1="189"
+       x2="176"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Blue-2"
+       id="linearGradient2490"
+       x1="47.36042"
+       y1="53.048962"
+       x2="48.418751"
+       y2="53.048962"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="start-script"
+     transform="matrix(3.7795278,0,0,3.7795208,-168.00001,-187.99964)"
+     style="display:inline">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1493"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.450001"
+       y="49.741661"
+       rx="1.9824198e-15" />
+    <path
+       id="path1895"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2182);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 162,181 v 16 h 9 v -1 h -8 v -14 h 12 v 9 h 1 v -10 z m 2,2 v 1 h 1 v -1 z m 2,0 v 1 h 8 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 5 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 2 v -1 z m -2,2 v 1 h 1 v -1 z m 0,2 v 1 h 1 v -1 z m 2,0 v 1 h 5 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 3 v -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    <path
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2490);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+       d="m 48.418752,53.181252 -0.79375,0.79375 h -0.264583 v -1.852083 h 0.264583 l 0.79375,0.79375 z"
+       id="path1897" />
+  </g>
+</svg>
diff --git a/files/opencs/static.png b/files/opencs/static.png
deleted file mode 100644
index 9f458e5d04..0000000000
Binary files a/files/opencs/static.png and /dev/null differ
diff --git a/files/opencs/static.svg b/files/opencs/static.svg
new file mode 100644
index 0000000000..8e8ce541ce
--- /dev/null
+++ b/files/opencs/static.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2304"
+       x1="44.449993"
+       y1="20.108332"
+       x2="48.683331"
+       y2="20.108332"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       x1="44.449993"
+       y1="20.108332"
+       x2="48.683331"
+       y2="20.108332" />
+  </defs>
+  <g
+     id="static"
+     style="display:inline"
+     transform="matrix(3.7795226,0,0,3.779527,-167.99976,-67.999988)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1396"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.450001"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="rect889"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 44.449995,17.991666 v 4.233332 h 4.233334 v -4.233332 z m 0.264583,0.264584 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z M 44.714578,19.05 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.793749 h 0.264584 v 0.529168 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529168 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529168 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529168 h -0.79375 z m -2.910418,0.79375 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.79375 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z" />
+    <path
+       id="path1181"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2304);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 44.449995,17.991666 v 4.233332 h 4.233334 v -4.233332 z m 0.264583,0.264584 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z M 44.714578,19.05 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.793749 h 0.264584 v 0.529168 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529168 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529168 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529168 h -0.79375 z m -2.910418,0.79375 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.79375 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z" />
+  </g>
+</svg>
diff --git a/files/opencs/stop-openmw.png b/files/opencs/stop-openmw.png
deleted file mode 100644
index d8f8096724..0000000000
Binary files a/files/opencs/stop-openmw.png and /dev/null differ
diff --git a/files/opencs/stop-openmw.svg b/files/opencs/stop-openmw.svg
new file mode 100644
index 0000000000..73c5936fee
--- /dev/null
+++ b/files/opencs/stop-openmw.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Red-1"
+       id="linearGradient4025"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662"
+       gradientTransform="translate(0,5.2916666)" />
+  </defs>
+  <g
+     id="stop-openmw"
+     transform="matrix(3.7795278,0,0,3.7795278,-168.00004,-188.00002)"
+     style="display:inline">
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4025);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect1645"
+       width="2.6458333"
+       height="2.6458333"
+       x="45.243748"
+       y="50.535412"
+       rx="2.8318619e-14" />
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1774"
+       width="4.2333331"
+       height="4.2333331"
+       x="44.450008"
+       y="49.741669"
+       rx="1.9824198e-15" />
+  </g>
+</svg>
diff --git a/files/opencs/transform-move.png b/files/opencs/transform-move.png
deleted file mode 100644
index 1e5bd573d3..0000000000
Binary files a/files/opencs/transform-move.png and /dev/null differ
diff --git a/files/opencs/transform-move.svg b/files/opencs/transform-move.svg
new file mode 100644
index 0000000000..0cbe1c89f4
--- /dev/null
+++ b/files/opencs/transform-move.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs1">
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient1351"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#1d99fd;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+  </defs>
+  <script
+     id="script1"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+  <script
+     id="mesh_polyfill"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+  <g
+     id="transform-move"
+     style="display:inline"
+     transform="matrix(1.3333335,0,0,1.3333335,-0.35277843,-85.019448)">
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2459"
+       width="12.699999"
+       height="12.699999"
+       x="0.2645838"
+       y="63.76458" />
+    <path
+       id="path2155"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1351);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 6.6145834,74.612502 -1.0583333,-1.5875 h 0.5291667 v -1.852083 h 1.0583333 v 1.852083 H 7.6729168 Z M 2.1166673,70.114585 3.7041668,69.056252 v 0.529167 h 1.8520833 v 1.058333 H 3.7041668 v 0.529167 z m 8.9958327,0 -1.5874995,-1.058333 v 0.529167 H 7.6729172 v 1.058333 h 1.8520833 v 0.529167 z m -4.4979168,-4.497919 -1.0583333,1.5875 h 0.5291667 v 1.852083 h 1.0583333 v -1.852083 h 0.5291667 z m -0.5291664,3.968753 h 1.0583333 v 1.058333 H 6.0854168 Z" />
+  </g>
+</svg>
diff --git a/files/opencs/transform-rotate.png b/files/opencs/transform-rotate.png
deleted file mode 100644
index b6c6bc58a7..0000000000
Binary files a/files/opencs/transform-rotate.png and /dev/null differ
diff --git a/files/opencs/transform-rotate.svg b/files/opencs/transform-rotate.svg
new file mode 100644
index 0000000000..83f2ca19a7
--- /dev/null
+++ b/files/opencs/transform-rotate.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#1d99fd;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient2147"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662"
+       gradientTransform="translate(-2.1238232e-6,-3.4830508e-5)" />
+  </defs>
+  <script
+     id="script1"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+  <script
+     id="mesh_polyfill"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+  <g
+     id="transform-rotate"
+     style="display:inline"
+     transform="matrix(1.3333336,0,0,1.3333335,-21.519449,-85.019448)">
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2461"
+       width="12.699998"
+       height="12.699999"
+       x="16.139584"
+       y="63.76458" />
+    <path
+       id="path2173"
+       mask="none"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2147);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 23.718448,66.063632 -0.422713,1.392679 c 0.261452,0.0794 0.509761,0.196938 0.736906,0.348816 l 0.808734,-1.210259 c -0.346148,-0.231333 -0.724531,-0.41034 -1.122927,-0.531236 z m -3.580661,0.531236 c -1.59297,1.064453 -2.272468,3.066073 -1.656746,4.880321 0.61593,1.814293 2.373637,2.988713 4.285527,2.863391 1.911922,-0.125257 3.501349,-1.519053 3.875216,-3.398243 L 25.21448,70.656634 c -0.258621,1.299922 -1.399499,2.236122 -2.724897,2.236039 -1.534316,0 -2.778125,-1.243809 -2.778125,-2.778125 -3.4e-5,-0.927824 0.463121,-1.794419 1.23455,-2.309937 l 0.484195,0.724612 0.871637,-2.505441 -2.648249,-0.153574 z m 5.34541,0.526066 -1.029395,1.029394 c 0.193237,0.193171 0.356914,0.413795 0.48576,0.65474 l 1.283641,-0.686262 C 26.026949,67.7516 25.777598,67.415355 25.483201,67.120932 Z m 1.057302,1.764749 -1.392682,0.422196 c 0.07942,0.261529 0.119825,0.533347 0.11989,0.80667 h 1.455209 c -4.4e-5,-0.416365 -0.06151,-0.830443 -0.182417,-1.228866 z" />
+  </g>
+</svg>
diff --git a/files/opencs/transform-scale.png b/files/opencs/transform-scale.png
deleted file mode 100644
index c641259bd7..0000000000
Binary files a/files/opencs/transform-scale.png and /dev/null differ
diff --git a/files/opencs/transform-scale.svg b/files/opencs/transform-scale.svg
new file mode 100644
index 0000000000..14a8062daf
--- /dev/null
+++ b/files/opencs/transform-scale.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#1d99fd;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Blue"
+       id="linearGradient6478"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+  </defs>
+  <script
+     id="script1"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+  <script
+     id="mesh_polyfill"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+  <g
+     id="transform-scale"
+     style="display:inline"
+     transform="matrix(1.3333336,0,0,1.3333335,-42.686114,-85.019457)">
+    <rect
+       style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2463"
+       width="12.699998"
+       height="12.699999"
+       x="32.01458"
+       y="63.76458" />
+    <path
+       id="rect2195"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient6478);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       d="m 34.395833,66.145833 v 1.058333 h 0.79375 v -0.264583 h 6.35 v 6.35 h -0.264584 v 0.79375 h 0.264584 0.529166 0.264584 v -7.14375 -0.529167 -0.264583 h -7.14375 z m 0,1.5875 v 0.79375 h 0.79375 v -0.79375 z m 0,1.322916 v 0.79375 h 0.79375 v -0.79375 z m 0,1.322917 v 3.704167 H 38.1 v -3.704167 z m 4.233333,2.910417 v 0.79375 h 0.79375 v -0.79375 z m 1.322917,0 v 0.79375 h 0.79375 v -0.79375 z" />
+  </g>
+</svg>
diff --git a/files/opencs/weapon.png b/files/opencs/weapon.png
deleted file mode 100644
index e2c1d3dc16..0000000000
Binary files a/files/opencs/weapon.png and /dev/null differ
diff --git a/files/opencs/weapon.svg b/files/opencs/weapon.svg
new file mode 100644
index 0000000000..6168812305
--- /dev/null
+++ b/files/opencs/weapon.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="16.000000pt"
+   height="16.000000pt"
+   viewBox="0 0 16.000000 16.000000"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg2"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="Main">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <linearGradient
+       id="Red">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       id="Main-6">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-3" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <linearGradient
+       id="Blue"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-8" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       id="Blue-2"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484-2" />
+    </linearGradient>
+    <linearGradient
+       id="Red-1"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-3"
+       id="linearGradient2412"
+       x1="49.741661"
+       y1="20.116692"
+       x2="53.991711"
+       y2="20.116692"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="weapon"
+     style="display:inline"
+     transform="matrix(3.7646634,0,0,3.7646623,-187.26061,-67.732549)">
+    <rect
+       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+       id="rect1390"
+       width="4.2333331"
+       height="4.2333331"
+       x="49.741661"
+       y="17.991667"
+       rx="1.9824198e-15" />
+    <path
+       id="path1467"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2412);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 49.741662,17.991667 c 0.09866,0.503824 0.186284,0.621705 0.570401,1.195248 l 2.123017,2.09817 -0.445069,0.523261 0.234226,0.211571 0.572225,-0.539344 c 0.164436,0.122335 0.594222,0.509892 0.887574,0.761143 l 0.307673,-0.307672 C 53.740458,21.640691 53.3529,21.210905 53.230565,21.046469 l 0.539345,-0.572225 -0.21157,-0.234227 -0.523261,0.44507 -2.09817,-2.123018 c -0.573544,-0.384116 -0.691424,-0.471741 -1.195247,-0.570402 z m 0.280633,0.280633 c 0.242046,0.0684 0.748789,0.421099 1.061873,0.692082 l 1.816074,1.852617 -0.166626,0.166627 -0.16626,0.16626 -1.852978,-1.815714 c -0.27099,-0.313077 -0.623677,-0.819828 -0.692082,-1.061874 z" />
+  </g>
+</svg>
diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index aacdc1dd96..d20d0740a8 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -21,6 +21,15 @@ Copyright 2020 Bret Curtis <psi29a@gmail.com>
   </p>
  </description>
  <launchable type="desktop-id">org.openmw.launcher.desktop</launchable>
+ <developer id="org.openmw">
+   <name>OpenMW Contributors</name>
+ </developer>
+
+ <branding>
+  <color type="primary" scheme_preference="light">#dcccb8</color>
+  <color type="primary" scheme_preference="dark">#574526</color>
+ </branding>
+
  <screenshots>
   <screenshot type="default">
    <image>https://wiki.openmw.org/images/Openmw_0.11.1_launcher_1.png</image>
@@ -28,15 +37,15 @@ Copyright 2020 Bret Curtis <psi29a@gmail.com>
   </screenshot>
   <screenshot>
    <image>https://wiki.openmw.org/images/0.40_Screenshot-Balmora_3.png</image>
-   <caption>The Mournhold's plaza on OpenMW</caption>
+   <caption>Balmora at morning on OpenMW</caption>
   </screenshot>
   <screenshot>
    <image>https://wiki.openmw.org/images/Screenshot_mournhold_plaza_0.35.png</image>
-   <caption>Vivec seen from Ebonheart on OpenMW</caption>
+   <caption>The Mournhold's plaza on OpenMW</caption>
   </screenshot>
   <screenshot>
    <image>https://wiki.openmw.org/images/Screenshot_Vivec_seen_from_Ebonheart_0.35.png</image>
-   <caption>Balmora at morning on OpenMW</caption>
+   <caption>Vivec seen from Ebonheart on OpenMW</caption>
   </screenshot>
  </screenshots>
  <categories>
diff --git a/files/openmw.cfg b/files/openmw.cfg
index 37ecda3b1d..c059e14796 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -2,18 +2,11 @@
 # Modifications should be done on the user openmw.cfg file instead
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
-content=builtin.omwscripts
 data-local="?userdata?data"
 user-data="?userdata?"
 config="?userconfig?"
 resources=${OPENMW_RESOURCE_FILES}
 data=${OPENMW_RESOURCE_FILES}/vfs-mw
-script-blacklist=Museum
-script-blacklist=MockChangeScript
-script-blacklist=doortestwarp
-script-blacklist=WereChange2Script
-script-blacklist=wereDreamScript2
-script-blacklist=wereDreamScript3
 
 # lighting
 fallback=LightAttenuation_UseConstant,0
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index c9949f2447..b79b33427c 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -2,18 +2,11 @@
 # Modifications should be done on the user openmw.cfg file instead
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
-content=builtin.omwscripts
 data-local="?userdata?data"
 user-data="?userdata?"
 config="?userconfig?"
 resources=./resources
 data=./resources/vfs-mw
-script-blacklist=Museum
-script-blacklist=MockChangeScript
-script-blacklist=doortestwarp
-script-blacklist=WereChange2Script
-script-blacklist=wereDreamScript2
-script-blacklist=wereDreamScript3
 
 # lighting
 fallback=LightAttenuation_UseConstant,0
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 5c473bea81..a5b8426f19 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -119,6 +119,9 @@ object paging min size merge factor = 0.3
 # Controls how inexpensive an object needs to be to utilize 'min size merge factor'.
 object paging min size cost multiplier = 25
 
+# Don't draw water if it's evaluated to be below all visible terrain
+water culling = true
+
 [Fog]
 
 # If true, use extended fog parameters for distant terrain not controlled by
@@ -218,14 +221,14 @@ keyboard navigation = true
 color topic enable = false
 
 # The color of dialogue topic keywords that gives unique actor responses
-# Format R G B A or empty for no special formatting
-# Default to blue
 color topic specific = 0.45 0.5 0.8 1
+color topic specific over = 0.6 0.6 0.85 1
+color topic specific pressed = 0.3 0.35 0.75 1
 
 # The color of dialogue topic keywords that gives already read responses
-# Format R G B A or empty for no special formatting
-# Default to grey
 color topic exhausted = 0.3 0.3 0.3 1
+color topic exhausted over = 0.55 0.55 0.55 1
+color topic exhausted pressed = 0.45 0.45 0.45 1
 
 [HUD]
 
@@ -284,6 +287,10 @@ rebalance soul gem values = false
 # Allow to load per-group KF-files from Animations folder
 use additional anim sources = false
 
+# Use smooth transitions between animations making them a lot less jarring. Also allows to load modded animation blending
+# configs (.yaml/.json config files).
+smooth animation transitions = false
+
 # Make the disposition change of merchants caused by barter dealings permanent
 barter disposition change is permanent = false
 
@@ -365,6 +372,11 @@ unarmed creature attacks damage armor = false
 # 2 = Cylinder
 actor collision shape type = 0
 
+# When false the player character will base movement on animations. This will sway the camera 
+# while moving in third person like in vanilla, and reproduce movement bugs caused by glitchy 
+# vanilla animations.
+player movement ignores animation = false
+
 [General]
 
 # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).
@@ -400,20 +412,23 @@ console history buffer size = 4096
 
 [Shaders]
 
-# Force rendering with shaders. By default, only bump-mapped objects will use shaders.
-# Enabling this option may cause slightly different visuals if the "clamp lighting" option
-# is set to false. Otherwise, there should not be a visual difference.
+# Force rendering with shaders, even for objects that don't strictly need them.
+# By default, only objects with certain effects, such as bump or normal maps will use shaders.
+# With enhancements enabled, such as "enable shadows" and "reverse z", shaders must be used for all objects, as if this setting is true.
+# Some settings, such as "clamp lighting" only apply to objects using shaders, so enabling this option may cause slightly different visuals when used at the same time.
+# Otherwise, there should not be a visual difference.
 force shaders = false
 
-# Force the use of per pixel lighting. By default, only bump mapped objects use per-pixel lighting.
-# Has no effect if the 'force shaders' option is false.
-# Enabling per-pixel lighting can result in visual differences to the original MW engine. It is not
-# recommended to enable this option when using vanilla Morrowind files, because certain lights in Morrowind
-# rely on vertex lighting to look as intended.
+# Force the use of per pixel lighting. By default, only bump and normal mapped objects use per-pixel lighting.
+# Only affects objects drawn with shaders (see "force shaders" option).
+# Enabling per-pixel lighting can result in visual differences to the original MW engine as
+# certain lights in Morrowind rely on vertex lighting to look as intended.
+# Note that groundcover shaders and particle effects ignore this setting.
 force per pixel lighting = false
 
 # Restrict the amount of lighting that an object can receive to a maximum of (1,1,1).
-# Only affects objects that render with shaders (see 'force shaders' option). Always affects terrain.
+# Only affects objects that render with shaders (see 'force shaders' option).
+# When disabled, terrain is always drawn with shaders to prevent seams between tiles that are and that aren't.
 # Setting this option to 'true' results in fixed-function compatible lighting, but the lighting
 # may appear 'dull' and there might be color shifts.
 # Setting this option to 'false' results in more realistic lighting.
@@ -464,11 +479,15 @@ apply lighting to environment maps = false
 # 'force per pixel lighting' is enabled.
 lighting method = shaders compatibility
 
-# Sets the bounding sphere multiplier of light sources if 'lighting method' is
-# not 'legacy'. These are used to determine if an object should receive
-# lighting. Higher values will allow for smoother transitions of light sources,
-# but may carry a performance cost and requires a higher number of 'max lights'
-# set.
+# Use the traditional light attenuation formula.
+# This disables OpenMW's adjustment to the formula that ensures point lights can properly fade out.
+# When 'lighting method' is set to 'legacy', this setting is always true.
+classic falloff = false
+
+# Sets the bounding sphere multiplier of light sources.
+# The bounding sphere is used to determine if an object should receive lighting.
+# Higher values will allow for smoother transitions of light sources,
+# but may carry a performance cost and require a higher number of 'max lights' set.
 light bounds multiplier = 1.65
 
 # The distance from the camera at which lights fade away completely.
@@ -485,6 +504,7 @@ max lights = 8
 # Sets minimum ambient brightness of interior cells. Levels below this threshold will have their
 # ambient values adjusted to balance the darker interiors.
 # When 'lighting method' is set to 'legacy', this setting will have no effect.
+# This setting will also have no effect if 'classic falloff' is true.
 minimum interior brightness = 0.08
 
 # Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
@@ -559,9 +579,6 @@ character =
 # Automatically save the game whenever the player rests.
 autosave = true
 
-# Display the time played on each save file in the load menu.
-timeplayed = false
-
 # The maximum number of quick (or auto) save slots to have.
 # If all slots are used, the  oldest save is reused
 max quicksaves = 1
@@ -604,6 +621,9 @@ hrtf enable = -1
 # Specifies which HRTF to use when HRTF is used. Blank means use the default.
 hrtf =
 
+# Specifies whether to use camera as audio listener
+camera listener = false
+
 [Video]
 
 # Resolution of the OpenMW window or screen.
@@ -641,10 +661,6 @@ contrast = 1.0
 # Video gamma setting.  (>0.0).  No effect in Linux.
 gamma = 1.0
 
-# Type of screenshot to take (regular, cylindrical, spherical or planet), optionally followed by
-# screenshot width, height and cubemap resolution in pixels. (e.g. spherical 1600 1000 1200)
-screenshot type = regular
-
 [Water]
 
 # Enable water shader with reflections and optionally refraction.
@@ -669,6 +685,12 @@ small feature culling pixel size = 20.0
 # By what factor water downscales objects. Only works with water shader and refractions on.
 refraction scale = 1.0
 
+# Make incident sunlight spread through water.
+sunlight scattering = true
+
+# Fade and wobble water plane edges to avoid harsh shoreline transitions.
+wobbly shores = true
+
 [Windows]
 
 # Location and sizes of windows as a fraction of the OpenMW window or
@@ -847,6 +869,17 @@ postprocessor maximized w = 0.97
 postprocessor maximized h = 0.875
 postprocessor maximized = false
 
+# Debug window for viewing logs and profiling
+debug x = 0.70
+debug y = 0.00
+debug w = 0.30
+debug h = 1.00
+debug maximized x = 0.015
+debug maximized y = 0.02
+debug maximized w = 0.97
+debug maximized h = 0.875
+debug maximized = false
+
 [Navigator]
 
 # Enable navigator (true, false). When enabled background threads are started to build navmesh for world geometry.
@@ -953,7 +986,7 @@ enable agents paths render = false
 enable recast mesh render = false
 
 # Max number of navmesh tiles (value >= 0)
-max tiles number = 512
+max tiles number = 1024
 
 # Min time duration for the same tile update in milliseconds (value >= 0)
 min update interval ms = 250
@@ -971,6 +1004,9 @@ write to navmeshdb = true
 # Approximate maximum file size of navigation mesh cache stored on disk in bytes (value > 0)
 max navmeshdb file size = 2147483648
 
+# Wait until all queued async navmesh jobs are processed before exiting the engine (true, false)
+wait for all jobs on exit = false
+
 [Shadows]
 
 # Enable or disable shadows. Bear in mind that this will force OpenMW to use shaders as if "[Shaders]/force shaders" was set to true.
@@ -985,10 +1021,7 @@ maximum shadow map distance = 8192
 # Fraction of the maximum distance at which shadows begin to gradually fade away.
 shadow fade start = 0.9
 
-# If true, allow shadow maps to overlap. Counter-intuitively, will produce better results when the light is behind the camera. When enabled, OpenMW uses Cascaded Shadow Maps and when disabled, it uses Parallel Split Shadow Maps.
-allow shadow map overlap = true
-
-# Indirectly controls where to split the shadow map(s). Values closer to 1.0 bring more detail closer to the camera (potentially excessively so), and values closer to 0.0 spread it more evenly across the whole viewing distance. 0.5 is recommended for most viewing distances by the original Parallel Split Shadow Maps paper, but this does not take into account use of a Light Space Perspective transformation, so other values may be preferable. If some of the terms used here go over your head, you might not want to change this, especially not without reading the associated papers first. When "allow shadow map overlap" is combined with a higher-than-default viewing distance, values closer to 1.0 will prevent nearby shadows losing a lot of quality.
+# Indirectly controls where to split the shadow map(s). Values closer to 1.0 bring more detail closer to the camera (potentially excessively so), and values closer to 0.0 spread it more evenly across the whole viewing distance. 0.5 is recommended for most viewing distances by the original Parallel Split Shadow Maps paper, but this does not take into account use of a Light Space Perspective transformation, so other values may be preferable. If some of the terms used here go over your head, you might not want to change this, especially not without reading the associated papers first. When using a higher-than-default viewing distance, values closer to 1.0 will prevent nearby shadows losing a lot of quality.
 split point uniform logarithmic ratio = 0.5
 
 # Indirectly controls where to split the shadow map(s). Positive values move split points away from the camera and negative values move them towards the camera. Intended to be used in conjunction with changes to 'split point uniform logarithmic ratio' to counteract side effects, but may cause additional, more serious side effects. Read the Parallel Split Shadow Maps paper by F Zhang et al before changing.
@@ -1121,9 +1154,6 @@ weathersnow = meshes/snow.nif
 # Blizzard weather effect
 weatherblizzard = meshes/blizzard.nif
 
-# Enable to write logs when loading unsupported nif file
-write nif debug log = true
-
 [Groundcover]
 
 # enable separate groundcover handling
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 1b73acf758..bcb1a22fb2 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -16,6 +16,7 @@ set(SHADER_FILES
     lib/particle/occlusion.glsl
     lib/util/quickstep.glsl
     lib/util/coordinates.glsl
+    lib/util/distortion.glsl
     lib/core/fragment.glsl
     lib/core/fragment.h.glsl
     lib/core/fragment_multiview.glsl
@@ -38,13 +39,12 @@ set(SHADER_FILES
     compatibility/objects.frag
     compatibility/terrain.vert
     compatibility/terrain.frag
-    compatibility/s360.frag
-    compatibility/s360.vert
     compatibility/shadows_vertex.glsl
     compatibility/shadows_fragment.glsl
     compatibility/shadowcasting.vert
     compatibility/shadowcasting.frag
     compatibility/vertexcolors.glsl
+    compatibility/normals.glsl
     compatibility/multiview_resolve.vert
     compatibility/multiview_resolve.frag
     compatibility/depthclipped.vert
diff --git a/files/shaders/compatibility/bs/default.frag b/files/shaders/compatibility/bs/default.frag
index 8c429947b0..5068c01d80 100644
--- a/files/shaders/compatibility/bs/default.frag
+++ b/files/shaders/compatibility/bs/default.frag
@@ -1,5 +1,5 @@
 #version 120
-#pragma import_defines(FORCE_OPAQUE)
+#pragma import_defines(FORCE_OPAQUE, DISTORTION)
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -24,9 +24,10 @@ varying vec2 emissiveMapUV;
 #if @normalMap
 uniform sampler2D normalMap;
 varying vec2 normalMapUV;
-varying vec4 passTangent;
 #endif
 
+uniform sampler2D opaqueDepthTex;
+
 varying float euclideanDepth;
 varying float linearDepth;
 
@@ -39,20 +40,30 @@ uniform float alphaRef;
 uniform float emissiveMult;
 uniform float specStrength;
 uniform bool useTreeAnim;
+uniform float distortionStrength;
 
 #include "lib/light/lighting.glsl"
 #include "lib/material/alpha.glsl"
+#include "lib/util/distortion.glsl"
 
 #include "compatibility/vertexcolors.glsl"
 #include "compatibility/shadows_fragment.glsl"
 #include "compatibility/fog.glsl"
+#include "compatibility/normals.glsl"
 
 void main()
 {
-    vec3 normal = normalize(passNormal);
-
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
+
+#if defined(DISTORTION) && DISTORTION
+    vec2 screenCoords = gl_FragCoord.xy / (screenRes * @distorionRTRatio);
+    gl_FragData[0].a *= getDiffuseColor().a;
+    gl_FragData[0] = applyDistortion(gl_FragData[0], distortionStrength, gl_FragCoord.z, texture2D(opaqueDepthTex, screenCoords).x);
+
+    return;
+#endif
+
     gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, diffuseMapUV);
 #else
     gl_FragData[0] = vec4(1.0);
@@ -63,39 +74,34 @@ void main()
         gl_FragData[0].a *= diffuseColor.a;
     gl_FragData[0].a = alphaTest(gl_FragData[0].a, alphaRef);
 
+    vec3 specularColor = getSpecularColor().xyz;
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
-
-    vec3 normalizedNormal = normal;
-    vec3 normalizedTangent = normalize(passTangent.xyz);
-    vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
-    mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
-
-    normal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
+#if @reconstructNormalZ
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
+#endif
+    vec3 viewNormal = normalToView(normal);
+    specularColor *= normalTex.a;
+#else
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
 #endif
-    vec3 viewNormal = normalize(gl_NormalMatrix * normal);
 
     float shadowing = unshadowedLightRatio(linearDepth);
-    vec3 diffuseLight, ambientLight;
-    doLighting(passViewPos, viewNormal, shadowing, diffuseLight, ambientLight);
+    vec3 diffuseLight, ambientLight, specularLight;
+    doLighting(passViewPos, viewNormal, gl_FrontMaterial.shininess, shadowing, diffuseLight, ambientLight, specularLight);
+    vec3 diffuse = diffuseColor.xyz * diffuseLight;
+    vec3 ambient = getAmbientColor().xyz * ambientLight;
     vec3 emission = getEmissionColor().xyz * emissiveMult;
 #if @emissiveMap
     emission *= texture2D(emissiveMap, emissiveMapUV).xyz;
 #endif
-    vec3 lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
+    vec3 lighting = diffuse + ambient + emission;
+    vec3 specular = specularColor * specularLight * specStrength;
 
     clampLightingResult(lighting);
 
-    gl_FragData[0].xyz *= lighting;
-
-    float shininess = gl_FrontMaterial.shininess;
-    vec3 matSpec = getSpecularColor().xyz * specStrength;
-#if @normalMap
-    matSpec *= normalTex.a;
-#endif
-
-    if (matSpec != vec3(0.0))
-        gl_FragData[0].xyz += getSpecular(viewNormal, normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
+    gl_FragData[0].xyz = gl_FragData[0].xyz * lighting + specular;
 
     gl_FragData[0] = applyFogAtDist(gl_FragData[0], euclideanDepth, linearDepth, far);
 
diff --git a/files/shaders/compatibility/bs/default.vert b/files/shaders/compatibility/bs/default.vert
index 712a3f3d0c..21942ec91e 100644
--- a/files/shaders/compatibility/bs/default.vert
+++ b/files/shaders/compatibility/bs/default.vert
@@ -36,6 +36,7 @@ varying vec3 passNormal;
 
 #include "compatibility/vertexcolors.glsl"
 #include "compatibility/shadows_vertex.glsl"
+#include "compatibility/normals.glsl"
 
 void main(void)
 {
@@ -45,6 +46,14 @@ void main(void)
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
+    passColor = gl_Color;
+    passViewPos = viewPos.xyz;
+    passNormal = gl_Normal.xyz;
+    normalToViewMatrix = gl_NormalMatrix;
+
+#if @normalMap
+    normalToViewMatrix *= generateTangentSpace(gl_MultiTexCoord7.xyzw, passNormal);
+#endif
 
 #if @diffuseMap
     diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
@@ -56,15 +65,11 @@ void main(void)
 
 #if @normalMap
     normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
-    passTangent = gl_MultiTexCoord7.xyzw;
 #endif
 
-    passColor = gl_Color;
-    passViewPos = viewPos.xyz;
-    passNormal = gl_Normal.xyz;
 
 #if @shadows_enabled
-    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
     setupShadowCoords(viewPos, viewNormal);
 #endif
 }
diff --git a/files/shaders/compatibility/bs/nolighting.frag b/files/shaders/compatibility/bs/nolighting.frag
index 4a5c1c3b42..c9e3ca4e13 100644
--- a/files/shaders/compatibility/bs/nolighting.frag
+++ b/files/shaders/compatibility/bs/nolighting.frag
@@ -14,6 +14,7 @@ uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
 #endif
 
+varying vec3 passViewPos;
 varying vec3 passNormal;
 varying float euclideanDepth;
 varying float linearDepth;
@@ -22,6 +23,7 @@ varying float passFalloff;
 uniform vec2 screenRes;
 uniform bool useFalloff;
 uniform float far;
+uniform float near;
 uniform float alphaRef;
 
 #include "lib/material/alpha.glsl"
@@ -30,6 +32,15 @@ uniform float alphaRef;
 #include "compatibility/fog.glsl"
 #include "compatibility/shadows_fragment.glsl"
 
+#if @softParticles
+#include "lib/particle/soft.glsl"
+
+uniform sampler2D opaqueDepthTex;
+uniform float particleSize;
+uniform bool particleFade;
+uniform float softFalloffDepth;
+#endif
+
 void main()
 {
 #if @diffuseMap
@@ -48,6 +59,24 @@ void main()
 
     gl_FragData[0] = applyFogAtDist(gl_FragData[0], euclideanDepth, linearDepth, far);
 
+#if !defined(FORCE_OPAQUE) && @softParticles
+    vec2 screenCoords = gl_FragCoord.xy / screenRes;
+    vec3 viewVec = normalize(passViewPos.xyz);
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
+
+    gl_FragData[0].a *= calcSoftParticleFade(
+        viewVec,
+        passViewPos,
+        viewNormal,
+        near,
+        far,
+        texture2D(opaqueDepthTex, screenCoords).x,
+        particleSize,
+        particleFade,
+        softFalloffDepth
+    );
+#endif
+
 #if defined(FORCE_OPAQUE) && FORCE_OPAQUE
     gl_FragData[0].a = 1.0;
 #endif
diff --git a/files/shaders/compatibility/bs/nolighting.vert b/files/shaders/compatibility/bs/nolighting.vert
index 27be3396ce..57cedc6e94 100644
--- a/files/shaders/compatibility/bs/nolighting.vert
+++ b/files/shaders/compatibility/bs/nolighting.vert
@@ -15,6 +15,7 @@ varying vec2 diffuseMapUV;
 #endif
 
 varying vec3 passNormal;
+varying vec3 passViewPos;
 varying float euclideanDepth;
 varying float linearDepth;
 varying float passFalloff;
@@ -41,6 +42,7 @@ void main(void)
 #endif
 
     passColor = gl_Color;
+    passViewPos = viewPos.xyz;
     passNormal = gl_Normal.xyz;
 
     if (useFalloff)
@@ -61,7 +63,7 @@ void main(void)
     }
 
 #if @shadows_enabled
-    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
     setupShadowCoords(viewPos, viewNormal);
 #endif
 }
diff --git a/files/shaders/compatibility/groundcover.frag b/files/shaders/compatibility/groundcover.frag
index 9dfd71b32e..96a79c8793 100644
--- a/files/shaders/compatibility/groundcover.frag
+++ b/files/shaders/compatibility/groundcover.frag
@@ -18,7 +18,6 @@ varying vec2 diffuseMapUV;
 #if @normalMap
 uniform sampler2D normalMap;
 varying vec2 normalMapUV;
-varying vec4 passTangent;
 #endif
 
 // Other shaders respect forcePPL, but legacy groundcover mods were designed to work with vertex lighting.
@@ -44,23 +43,10 @@ varying vec3 passNormal;
 #include "lib/light/lighting.glsl"
 #include "lib/material/alpha.glsl"
 #include "fog.glsl"
+#include "compatibility/normals.glsl"
 
 void main()
 {
-    vec3 normal = normalize(passNormal);
-
-#if @normalMap
-    vec4 normalTex = texture2D(normalMap, normalMapUV);
-
-    vec3 normalizedNormal = normal;
-    vec3 normalizedTangent = normalize(passTangent.xyz);
-    vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
-    mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
-
-    normal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
-#endif
-    vec3 viewNormal = normalize(gl_NormalMatrix * normal);
-
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
 #else
@@ -72,14 +58,25 @@ void main()
 
     gl_FragData[0].a = alphaTest(gl_FragData[0].a, alphaRef);
 
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, normalMapUV);
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
+#if @reconstructNormalZ
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
+#endif
+    vec3 viewNormal = normalToView(normal);
+#else
+    vec3 viewNormal = normalToView(normalize(passNormal));
+#endif
+
     float shadowing = unshadowedLightRatio(linearDepth);
 
     vec3 lighting;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;
 #else
-    vec3 diffuseLight, ambientLight;
-    doLighting(passViewPos, viewNormal, shadowing, diffuseLight, ambientLight);
+    vec3 diffuseLight, ambientLight, specularLight;
+    doLighting(passViewPos, viewNormal, gl_FrontMaterial.shininess, shadowing, diffuseLight, ambientLight, specularLight);
     lighting = diffuseLight + ambientLight;
 #endif
 
diff --git a/files/shaders/compatibility/groundcover.vert b/files/shaders/compatibility/groundcover.vert
index dd8d083a47..8cf53a19e0 100644
--- a/files/shaders/compatibility/groundcover.vert
+++ b/files/shaders/compatibility/groundcover.vert
@@ -21,7 +21,6 @@ varying vec2 diffuseMapUV;
 
 #if @normalMap
 varying vec2 normalMapUV;
-varying vec4 passTangent;
 #endif
 
 // Other shaders respect forcePPL, but legacy groundcover mods were designed to work with vertex lighting.
@@ -41,6 +40,7 @@ centroid varying vec3 shadowDiffuseLighting;
 varying vec3 passNormal;
 
 #include "shadows_vertex.glsl"
+#include "compatibility/normals.glsl"
 #include "lib/light/lighting.glsl"
 #include "lib/view/depth.glsl"
 
@@ -149,8 +149,14 @@ void main(void)
 
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
+    passNormal = rotation3(rotation) * gl_Normal.xyz;
+    normalToViewMatrix = gl_NormalMatrix;
+#if @normalMap
+    normalToViewMatrix *= generateTangentSpace(gl_MultiTexCoord7.xyzw * rotation, passNormal);
+#endif
+
 #if (!PER_PIXEL_LIGHTING || @shadows_enabled)
-    vec3 viewNormal = normalize((gl_NormalMatrix * rotation3(rotation) * gl_Normal).xyz);
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
 #endif
 
 #if @diffuseMap
@@ -159,15 +165,14 @@ void main(void)
 
 #if @normalMap
     normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
-    passTangent = gl_MultiTexCoord7.xyzw * rotation;
 #endif
 
-    passNormal = rotation3(rotation) * gl_Normal.xyz;
 #if PER_PIXEL_LIGHTING
     passViewPos = viewPos.xyz;
 #else
-    vec3 diffuseLight, ambientLight;
-    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
+    vec3 diffuseLight, ambientLight, specularLight;
+    vec3 unusedShadowSpecular;
+    doLighting(viewPos.xyz, viewNormal, gl_FrontMaterial.shininess, diffuseLight, ambientLight, specularLight, shadowDiffuseLighting, unusedShadowSpecular);
     passLighting = diffuseLight + ambientLight;
     clampLightingResult(passLighting);
 #endif
diff --git a/files/shaders/compatibility/normals.glsl b/files/shaders/compatibility/normals.glsl
new file mode 100644
index 0000000000..8df16a4b12
--- /dev/null
+++ b/files/shaders/compatibility/normals.glsl
@@ -0,0 +1,14 @@
+varying mat3 normalToViewMatrix;
+
+mat3 generateTangentSpace(vec4 tangent, vec3 normal)
+{
+    vec3 normalizedNormal = normalize(normal);
+    vec3 normalizedTangent = normalize(tangent.xyz);
+    vec3 binormal = cross(normalizedTangent, normalizedNormal) * tangent.w;
+    return mat3(normalizedTangent, binormal, normalizedNormal);
+}
+
+vec3 normalToView(vec3 normal)
+{
+    return normalize(normalToViewMatrix * normal);
+}
diff --git a/files/shaders/compatibility/objects.frag b/files/shaders/compatibility/objects.frag
index 4ef463cb34..8bd9664b41 100644
--- a/files/shaders/compatibility/objects.frag
+++ b/files/shaders/compatibility/objects.frag
@@ -1,5 +1,5 @@
 #version 120
-#pragma import_defines(FORCE_OPAQUE)
+#pragma import_defines(FORCE_OPAQUE, DISTORTION)
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -37,7 +37,6 @@ varying vec2 emissiveMapUV;
 #if @normalMap
 uniform sampler2D normalMap;
 varying vec2 normalMapUV;
-varying vec4 passTangent;
 #endif
 
 #if @envMap
@@ -67,18 +66,24 @@ uniform vec2 screenRes;
 uniform float near;
 uniform float far;
 uniform float alphaRef;
+uniform float distortionStrength;
 
-#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+#define PER_PIXEL_LIGHTING (@normalMap || @specularMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
+centroid varying vec3 passSpecular;
 centroid varying vec3 shadowDiffuseLighting;
+centroid varying vec3 shadowSpecularLighting;
 #else
 uniform float emissiveMult;
-#endif
 uniform float specStrength;
+#endif
 varying vec3 passViewPos;
 varying vec3 passNormal;
+#if @normalMap || @diffuseParallax
+varying vec4 passTangent;
+#endif
 
 #if @additiveBlending
 #define ADDITIVE_BLENDING
@@ -87,17 +92,19 @@ varying vec3 passNormal;
 #include "lib/light/lighting.glsl"
 #include "lib/material/parallax.glsl"
 #include "lib/material/alpha.glsl"
+#include "lib/util/distortion.glsl"
 
 #include "fog.glsl"
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
+#include "compatibility/normals.glsl"
 
 #if @softParticles
 #include "lib/particle/soft.glsl"
 
-uniform sampler2D opaqueDepthTex;
 uniform float particleSize;
 uniform bool particleFade;
+uniform float softFalloffDepth;
 #endif
 
 #if @particleOcclusion
@@ -106,53 +113,45 @@ uniform sampler2D orthoDepthMap;
 varying vec3 orthoDepthMapCoord;
 #endif
 
+uniform sampler2D opaqueDepthTex;
+
 void main()
 {
 #if @particleOcclusion
     applyOcclusionDiscard(orthoDepthMapCoord, texture2D(orthoDepthMap, orthoDepthMapCoord.xy * 0.5 + 0.5).r);
 #endif
 
-#if @diffuseMap
-    vec2 adjustedDiffuseUV = diffuseMapUV;
-#endif
-
-    vec3 normal = normalize(passNormal);
-    vec3 viewVec = normalize(passViewPos.xyz);
-
-#if @normalMap
-    vec4 normalTex = texture2D(normalMap, normalMapUV);
-
-    vec3 normalizedNormal = normal;
-    vec3 normalizedTangent = normalize(passTangent.xyz);
-    vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
-    mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
-
-    normal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
-#endif
+    // only offset diffuse and normal maps for now, other textures are more likely to be using a completely different UV set
+    vec2 offset = vec2(0.0);
 
+#if @parallax || @diffuseParallax
 #if @parallax
-    vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
-    vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
-    vec3 eyeDir = normalize(cameraPos - objectPos);
-    vec2 offset = getParallaxOffset(eyeDir, tbnTranspose, normalTex.a, (passTangent.w > 0.0) ? -1.f : 1.f);
-    adjustedDiffuseUV += offset; // only offset diffuse for now, other textures are more likely to be using a completely different UV set
-
-    // TODO: check not working as the same UV buffer is being bound to different targets
-    // if diffuseMapUV == normalMapUV
-#if 1
-    // fetch a new normal using updated coordinates
-    normalTex = texture2D(normalMap, adjustedDiffuseUV);
-
-    normal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    float height = texture2D(normalMap, normalMapUV).a;
+    float flipY = (passTangent.w > 0.0) ? -1.f : 1.f;
+#else
+    float height = texture2D(diffuseMap, diffuseMapUV).a;
+    // FIXME: shouldn't be necessary, but in this path false-positives are common
+    float flipY = -1.f;
+#endif
+    offset = getParallaxOffset(transpose(normalToViewMatrix) * normalize(-passViewPos), height, flipY);
 #endif
 
-#endif
-
-vec3 viewNormal = normalize(gl_NormalMatrix * normal);
+vec2 screenCoords = gl_FragCoord.xy / screenRes;
 
 #if @diffuseMap
-    gl_FragData[0] = texture2D(diffuseMap, adjustedDiffuseUV);
-    gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, adjustedDiffuseUV);
+    gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV + offset);
+
+#if defined(DISTORTION) && DISTORTION
+    gl_FragData[0].a *= getDiffuseColor().a;
+    gl_FragData[0] = applyDistortion(gl_FragData[0], distortionStrength, gl_FragCoord.z, texture2D(opaqueDepthTex, screenCoords / @distorionRTRatio).x);
+    return;
+#endif
+
+#if @diffuseParallax
+    gl_FragData[0].a = 1.0;
+#else
+    gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, diffuseMapUV + offset);
+#endif
 #else
     gl_FragData[0] = vec4(1.0);
 #endif
@@ -167,6 +166,19 @@ vec3 viewNormal = normalize(gl_NormalMatrix * normal);
 
     gl_FragData[0].a = alphaTest(gl_FragData[0].a, alphaRef);
 
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, normalMapUV + offset);
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
+#if @reconstructNormalZ
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
+#endif
+    vec3 viewNormal = normalToView(normal);
+#else
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
+#endif
+
+    vec3 viewVec = normalize(passViewPos);
+
 #if @detailMap
     gl_FragData[0].xyz *= texture2D(detailMap, detailMapUV).xyz * 2.0;
 #endif
@@ -207,19 +219,27 @@ vec3 viewNormal = normalize(gl_NormalMatrix * normal);
 #endif
 
     float shadowing = unshadowedLightRatio(-passViewPos.z);
-    vec3 lighting;
+    vec3 lighting, specular;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;
+    specular = passSpecular + shadowSpecularLighting * shadowing;
 #else
-    vec3 diffuseLight, ambientLight;
-    doLighting(passViewPos, viewNormal, shadowing, diffuseLight, ambientLight);
-    vec3 emission = getEmissionColor().xyz * emissiveMult;
-    lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
+#if @specularMap
+    vec4 specTex = texture2D(specularMap, specularMapUV);
+    float shininess = specTex.a * 255.0;
+    vec3 specularColor = specTex.xyz;
+#else
+    float shininess = gl_FrontMaterial.shininess;
+    vec3 specularColor = getSpecularColor().xyz;
+#endif
+    vec3 diffuseLight, ambientLight, specularLight;
+    doLighting(passViewPos, viewNormal, shininess, shadowing, diffuseLight, ambientLight, specularLight);
+    lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz * emissiveMult;
+    specular = specularColor * specularLight * specStrength;
 #endif
 
     clampLightingResult(lighting);
-
-    gl_FragData[0].xyz *= lighting;
+    gl_FragData[0].xyz = gl_FragData[0].xyz * lighting + specular;
 
 #if @envMap && !@preLightEnv
     gl_FragData[0].xyz += envEffect;
@@ -229,24 +249,8 @@ vec3 viewNormal = normalize(gl_NormalMatrix * normal);
     gl_FragData[0].xyz += texture2D(emissiveMap, emissiveMapUV).xyz;
 #endif
 
-#if @specularMap
-    vec4 specTex = texture2D(specularMap, specularMapUV);
-    float shininess = specTex.a * 255.0;
-    vec3 matSpec = specTex.xyz;
-#else
-    float shininess = gl_FrontMaterial.shininess;
-    vec3 matSpec = getSpecularColor().xyz;
-#endif
-
-    matSpec *= specStrength;
-    if (matSpec != vec3(0.0))
-    {
-        gl_FragData[0].xyz += getSpecular(viewNormal, viewVec, shininess, matSpec) * shadowing;
-    }
-
     gl_FragData[0] = applyFogAtPos(gl_FragData[0], passViewPos, far);
 
-    vec2 screenCoords = gl_FragCoord.xy / screenRes;
 #if !defined(FORCE_OPAQUE) && @softParticles
     gl_FragData[0].a *= calcSoftParticleFade(
         viewVec,
@@ -256,7 +260,8 @@ vec3 viewNormal = normalize(gl_NormalMatrix * normal);
         far,
         texture2D(opaqueDepthTex, screenCoords).x,
         particleSize,
-        particleFade
+        particleFade,
+        softFalloffDepth
     );
 #endif
 
diff --git a/files/shaders/compatibility/objects.vert b/files/shaders/compatibility/objects.vert
index 1ea4a1553f..081ff909cf 100644
--- a/files/shaders/compatibility/objects.vert
+++ b/files/shaders/compatibility/objects.vert
@@ -31,7 +31,6 @@ varying vec2 emissiveMapUV;
 
 #if @normalMap
 varying vec2 normalMapUV;
-varying vec4 passTangent;
 #endif
 
 #if @envMap
@@ -50,18 +49,25 @@ varying vec2 specularMapUV;
 varying vec2 glossMapUV;
 #endif
 
-#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+#define PER_PIXEL_LIGHTING (@normalMap || @specularMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
+centroid varying vec3 passSpecular;
 centroid varying vec3 shadowDiffuseLighting;
+centroid varying vec3 shadowSpecularLighting;
 uniform float emissiveMult;
+uniform float specStrength;
 #endif
 varying vec3 passViewPos;
 varying vec3 passNormal;
+#if @normalMap || @diffuseParallax
+varying vec4 passTangent;
+#endif
 
 #include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
+#include "compatibility/normals.glsl"
 
 #include "lib/light/lighting.glsl"
 #include "lib/view/depth.glsl"
@@ -84,9 +90,18 @@ void main(void)
 
     vec4 viewPos = modelToView(gl_Vertex);
     gl_ClipVertex = viewPos;
+    passColor = gl_Color;
+    passViewPos = viewPos.xyz;
+    passNormal = gl_Normal.xyz;
+    normalToViewMatrix = gl_NormalMatrix;
 
-#if (@envMap || !PER_PIXEL_LIGHTING || @shadows_enabled)
-    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+#if @normalMap || @diffuseParallax
+    passTangent = gl_MultiTexCoord7.xyzw;
+    normalToViewMatrix *= generateTangentSpace(passTangent, passNormal);
+#endif
+
+#if @envMap || !PER_PIXEL_LIGHTING || @shadows_enabled
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
 #endif
 
 #if @envMap
@@ -118,7 +133,6 @@ void main(void)
 
 #if @normalMap
     normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
-    passTangent = gl_MultiTexCoord7.xyzw;
 #endif
 
 #if @bumpMap
@@ -133,17 +147,14 @@ void main(void)
     glossMapUV = (gl_TextureMatrix[@glossMapUV] * gl_MultiTexCoord@glossMapUV).xy;
 #endif
 
-    passColor = gl_Color;
-    passViewPos = viewPos.xyz;
-    passNormal = gl_Normal.xyz;
-
 #if !PER_PIXEL_LIGHTING
-    vec3 diffuseLight, ambientLight;
-    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
-    vec3 emission = getEmissionColor().xyz * emissiveMult;
-    passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
+    vec3 diffuseLight, ambientLight, specularLight;
+    doLighting(viewPos.xyz, viewNormal, gl_FrontMaterial.shininess, diffuseLight, ambientLight, specularLight, shadowDiffuseLighting, shadowSpecularLighting);
+    passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz * emissiveMult;
+    passSpecular = getSpecularColor().xyz * specularLight * specStrength;
     clampLightingResult(passLighting);
     shadowDiffuseLighting *= getDiffuseColor().xyz;
+    shadowSpecularLighting *= getSpecularColor().xyz * specStrength;
 #endif
 
 #if (@shadows_enabled)
diff --git a/files/shaders/compatibility/ripples_blobber.frag b/files/shaders/compatibility/ripples_blobber.frag
index ea874af83e..805143eb02 100644
--- a/files/shaders/compatibility/ripples_blobber.frag
+++ b/files/shaders/compatibility/ripples_blobber.frag
@@ -13,14 +13,14 @@ uniform vec2 offset;
 
 void main()
 {
-    vec2 uv = (gl_FragCoord.xy + offset) / @ripple_map_size;
+    vec2 uv = (gl_FragCoord.xy + offset) / @rippleMapSize;
 
     vec4 color = texture2D(imageIn, uv);
     float wavesizeMultiplier = getTemporalWaveSizeMultiplier(osg_SimulationTime);
     for (int i = 0; i < positionCount; ++i)
     {
         float wavesize = wavesizeMultiplier * positions[i].z;
-        float displace = clamp(2.0 * abs(length((positions[i].xy + offset) - gl_FragCoord.xy) / wavesize - 1.0), 0.0, 1.0);
+        float displace = clamp(0.2 * abs(length((positions[i].xy + offset) - gl_FragCoord.xy) / wavesize - 1.0) + 0.8, 0.0, 1.0);
         color.rg = mix(vec2(-1.0), color.rg, displace);
     }
 
diff --git a/files/shaders/compatibility/ripples_simulate.frag b/files/shaders/compatibility/ripples_simulate.frag
index f36cab5b40..fb416df2c6 100644
--- a/files/shaders/compatibility/ripples_simulate.frag
+++ b/files/shaders/compatibility/ripples_simulate.frag
@@ -6,9 +6,9 @@ uniform sampler2D imageIn;
 
 void main()
 {
-    vec2 uv = gl_FragCoord.xy / @ripple_map_size;
+    vec2 uv = gl_FragCoord.xy / @rippleMapSize;
 
-    float pixelSize = 1.0 / @ripple_map_size;
+    float pixelSize = 1.0 / @rippleMapSize;
 
     float oneOffset = pixelSize;
     float oneAndHalfOffset = 1.5 * pixelSize;
diff --git a/files/shaders/compatibility/s360.frag b/files/shaders/compatibility/s360.frag
deleted file mode 100644
index 7e7241e174..0000000000
--- a/files/shaders/compatibility/s360.frag
+++ /dev/null
@@ -1,21 +0,0 @@
-#version 120
-
-varying vec2 uv;
-uniform samplerCube cubeMap;
-uniform int mapping;
-
-#include "lib/util/coordinates.glsl"
-
-void main(void)
-{
-    vec3 c;
-
-    if (mapping == 0)
-        c = sphericalCoords(uv);
-    else if (mapping == 1)
-        c = cylindricalCoords(uv);
-    else
-        c = planetCoords(uv);
-
-    gl_FragData[0] = textureCube(cubeMap,c);
-}
diff --git a/files/shaders/compatibility/s360.vert b/files/shaders/compatibility/s360.vert
deleted file mode 100644
index ad96620c3f..0000000000
--- a/files/shaders/compatibility/s360.vert
+++ /dev/null
@@ -1,9 +0,0 @@
-#version 120
-
-varying vec2 uv;
-
-void main(void)
-{
-    gl_Position = gl_Vertex;
-    uv = (gl_Vertex.xy * vec2(1.0,-1.0) + vec2(1.0)) / 2;
-}
diff --git a/files/shaders/compatibility/shadows_fragment.glsl b/files/shaders/compatibility/shadows_fragment.glsl
index 2945edff3d..3c7a37a162 100644
--- a/files/shaders/compatibility/shadows_fragment.glsl
+++ b/files/shaders/compatibility/shadows_fragment.glsl
@@ -22,31 +22,25 @@ float unshadowedLightRatio(float distance)
     if (fade == 1.0)
         return shadowing;
 #endif
-    #if @shadowMapsOverlap
-        bool doneShadows = false;
-        @foreach shadow_texture_unit_index @shadow_texture_unit_list
-            if (!doneShadows)
+    bool doneShadows = false;
+    @foreach shadow_texture_unit_index @shadow_texture_unit_list
+        if (!doneShadows)
+        {
+            vec3 shadowXYZ = shadowSpaceCoords@shadow_texture_unit_index.xyz / shadowSpaceCoords@shadow_texture_unit_index.w;
+#if @perspectiveShadowMaps
+            vec3 shadowRegionXYZ = shadowRegionCoords@shadow_texture_unit_index.xyz / shadowRegionCoords@shadow_texture_unit_index.w;
+#endif
+            if (all(lessThan(shadowXYZ.xy, vec2(1.0, 1.0))) && all(greaterThan(shadowXYZ.xy, vec2(0.0, 0.0))))
             {
-                vec3 shadowXYZ = shadowSpaceCoords@shadow_texture_unit_index.xyz / shadowSpaceCoords@shadow_texture_unit_index.w;
-#if @perspectiveShadowMaps
-                vec3 shadowRegionXYZ = shadowRegionCoords@shadow_texture_unit_index.xyz / shadowRegionCoords@shadow_texture_unit_index.w;
-#endif
-                if (all(lessThan(shadowXYZ.xy, vec2(1.0, 1.0))) && all(greaterThan(shadowXYZ.xy, vec2(0.0, 0.0))))
-                {
-                    shadowing = min(shadow2DProj(shadowTexture@shadow_texture_unit_index, shadowSpaceCoords@shadow_texture_unit_index).r, shadowing);
+                shadowing = min(shadow2DProj(shadowTexture@shadow_texture_unit_index, shadowSpaceCoords@shadow_texture_unit_index).r, shadowing);
 
-                    doneShadows = all(lessThan(shadowXYZ, vec3(0.95, 0.95, 1.0))) && all(greaterThan(shadowXYZ, vec3(0.05, 0.05, 0.0)));
+                doneShadows = all(lessThan(shadowXYZ, vec3(0.95, 0.95, 1.0))) && all(greaterThan(shadowXYZ, vec3(0.05, 0.05, 0.0)));
 #if @perspectiveShadowMaps
-                    doneShadows = doneShadows && all(lessThan(shadowRegionXYZ, vec3(1.0, 1.0, 1.0))) && all(greaterThan(shadowRegionXYZ.xy, vec2(-1.0, -1.0)));
+                doneShadows = doneShadows && all(lessThan(shadowRegionXYZ, vec3(1.0, 1.0, 1.0))) && all(greaterThan(shadowRegionXYZ.xy, vec2(-1.0, -1.0)));
 #endif
-                }
             }
-        @endforeach
-    #else
-        @foreach shadow_texture_unit_index @shadow_texture_unit_list
-            shadowing = min(shadow2DProj(shadowTexture@shadow_texture_unit_index, shadowSpaceCoords@shadow_texture_unit_index).r, shadowing);
-        @endforeach
-    #endif
+        }
+    @endforeach
 #if @limitShadowMapDistance
     shadowing = mix(shadowing, 1.0, fade);
 #endif
@@ -84,4 +78,4 @@ void applyShadowDebugOverlay()
         }
     @endforeach
 #endif // SHADOWS
-}
\ No newline at end of file
+}
diff --git a/files/shaders/compatibility/shadows_vertex.glsl b/files/shaders/compatibility/shadows_vertex.glsl
index 08daf620bf..23fbc74988 100644
--- a/files/shaders/compatibility/shadows_vertex.glsl
+++ b/files/shaders/compatibility/shadows_vertex.glsl
@@ -3,7 +3,6 @@
 #if SHADOWS
     @foreach shadow_texture_unit_index @shadow_texture_unit_list
         uniform mat4 shadowSpaceMatrix@shadow_texture_unit_index;
-        uniform int shadowTextureUnit@shadow_texture_unit_index;
         varying vec4 shadowSpaceCoords@shadow_texture_unit_index;
 
 #if @perspectiveShadowMaps
@@ -19,7 +18,6 @@
 void setupShadowCoords(vec4 viewPos, vec3 viewNormal)
 {
 #if SHADOWS
-    // This matrix has the opposite handedness to the others used here, so multiplication must have the vector to the left. Alternatively it could be transposed after construction, but that's extra work for the GPU just to make the code look a tiny bit cleaner.
     vec4 shadowOffset;
     @foreach shadow_texture_unit_index @shadow_texture_unit_list
 #if @perspectiveShadowMaps
@@ -46,4 +44,4 @@ void setupShadowCoords(vec4 viewPos, vec3 viewNormal)
 #endif
     @endforeach
 #endif // SHADOWS
-}
\ No newline at end of file
+}
diff --git a/files/shaders/compatibility/terrain.frag b/files/shaders/compatibility/terrain.frag
index a2fbddf3f7..9d89217f35 100644
--- a/files/shaders/compatibility/terrain.frag
+++ b/files/shaders/compatibility/terrain.frag
@@ -23,11 +23,13 @@ uniform sampler2D blendMap;
 varying float euclideanDepth;
 varying float linearDepth;
 
-#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+#define PER_PIXEL_LIGHTING (@normalMap || @specularMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
+centroid varying vec3 passSpecular;
 centroid varying vec3 shadowDiffuseLighting;
+centroid varying vec3 shadowSpecularLighting;
 #endif
 varying vec3 passViewPos;
 varying vec3 passNormal;
@@ -40,76 +42,58 @@ uniform float far;
 #include "lib/light/lighting.glsl"
 #include "lib/material/parallax.glsl"
 #include "fog.glsl"
+#include "compatibility/normals.glsl"
 
 void main()
 {
     vec2 adjustedUV = (gl_TextureMatrix[0] * vec4(uv, 0.0, 1.0)).xy;
 
-    vec3 normal = normalize(passNormal);
-
-#if @normalMap
-    vec4 normalTex = texture2D(normalMap, adjustedUV);
-
-    vec3 normalizedNormal = normal;
-    vec3 tangent = vec3(1.0, 0.0, 0.0);
-    vec3 binormal = normalize(cross(tangent, normalizedNormal));
-    tangent = normalize(cross(normalizedNormal, binormal)); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
-    mat3 tbnTranspose = mat3(tangent, binormal, normalizedNormal);
-
-    normal = tbnTranspose * (normalTex.xyz * 2.0 - 1.0);
-#endif
-
 #if @parallax
-    vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
-    vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
-    vec3 eyeDir = normalize(cameraPos - objectPos);
-    adjustedUV += getParallaxOffset(eyeDir, tbnTranspose, normalTex.a, 1.f);
-
-    // update normal using new coordinates
-    normalTex = texture2D(normalMap, adjustedUV);
-
-    normal = tbnTranspose * (normalTex.xyz * 2.0 - 1.0);
+    adjustedUV += getParallaxOffset(transpose(normalToViewMatrix) * normalize(-passViewPos), texture2D(normalMap, adjustedUV).a, 1.f);
 #endif
-
-    vec3 viewNormal = normalize(gl_NormalMatrix * normal);
-
     vec4 diffuseTex = texture2D(diffuseMap, adjustedUV);
     gl_FragData[0] = vec4(diffuseTex.xyz, 1.0);
 
+    vec4 diffuseColor = getDiffuseColor();
+    gl_FragData[0].a *= diffuseColor.a;
+
 #if @blendMap
     vec2 blendMapUV = (gl_TextureMatrix[1] * vec4(uv, 0.0, 1.0)).xy;
     gl_FragData[0].a *= texture2D(blendMap, blendMapUV).a;
 #endif
 
-    vec4 diffuseColor = getDiffuseColor();
-    gl_FragData[0].a *= diffuseColor.a;
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, adjustedUV);
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
+#if @reconstructNormalZ
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
+#endif
+    vec3 viewNormal = normalToView(normal);
+#else
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
+#endif
 
     float shadowing = unshadowedLightRatio(linearDepth);
-    vec3 lighting;
+    vec3 lighting, specular;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;
+    specular = passSpecular + shadowSpecularLighting * shadowing;
 #else
-    vec3 diffuseLight, ambientLight;
-    doLighting(passViewPos, viewNormal, shadowing, diffuseLight, ambientLight);
+#if @specularMap
+    float shininess = 128.0; // TODO: make configurable
+    vec3 specularColor = vec3(diffuseTex.a);
+#else
+    float shininess = gl_FrontMaterial.shininess;
+    vec3 specularColor = getSpecularColor().xyz;
+#endif
+    vec3 diffuseLight, ambientLight, specularLight;
+    doLighting(passViewPos, viewNormal, shininess, shadowing, diffuseLight, ambientLight, specularLight);
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
+    specular = specularColor * specularLight;
 #endif
 
     clampLightingResult(lighting);
-
-    gl_FragData[0].xyz *= lighting;
-
-#if @specularMap
-    float shininess = 128.0; // TODO: make configurable
-    vec3 matSpec = vec3(diffuseTex.a);
-#else
-    float shininess = gl_FrontMaterial.shininess;
-    vec3 matSpec = getSpecularColor().xyz;
-#endif
-
-    if (matSpec != vec3(0.0))
-    {
-        gl_FragData[0].xyz += getSpecular(viewNormal, normalize(passViewPos), shininess, matSpec) * shadowing;
-    }
+    gl_FragData[0].xyz = gl_FragData[0].xyz * lighting + specular;
 
     gl_FragData[0] = applyFogAtDist(gl_FragData[0], euclideanDepth, linearDepth, far);
 
diff --git a/files/shaders/compatibility/terrain.vert b/files/shaders/compatibility/terrain.vert
index 5e154d912a..cbfb7769ba 100644
--- a/files/shaders/compatibility/terrain.vert
+++ b/files/shaders/compatibility/terrain.vert
@@ -13,17 +13,20 @@ varying vec2 uv;
 varying float euclideanDepth;
 varying float linearDepth;
 
-#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+#define PER_PIXEL_LIGHTING (@normalMap || @specularMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
+centroid varying vec3 passSpecular;
 centroid varying vec3 shadowDiffuseLighting;
+centroid varying vec3 shadowSpecularLighting;
 #endif
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
+#include "compatibility/normals.glsl"
 
 #include "lib/light/lighting.glsl"
 #include "lib/view/depth.glsl"
@@ -37,20 +40,29 @@ void main(void)
     euclideanDepth = length(viewPos.xyz);
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
-#if (!PER_PIXEL_LIGHTING || @shadows_enabled)
-    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
-#endif
-
     passColor = gl_Color;
     passNormal = gl_Normal.xyz;
     passViewPos = viewPos.xyz;
+    normalToViewMatrix = gl_NormalMatrix;
+
+#if @normalMap
+    mat3 tbnMatrix = generateTangentSpace(vec4(1.0, 0.0, 0.0, 1.0), passNormal);
+    tbnMatrix[0] = normalize(cross(tbnMatrix[2], tbnMatrix[1])); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
+    normalToViewMatrix *= tbnMatrix;
+#endif
+
+#if !PER_PIXEL_LIGHTING || @shadows_enabled
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
+#endif
 
 #if !PER_PIXEL_LIGHTING
-    vec3 diffuseLight, ambientLight;
-    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
+    vec3 diffuseLight, ambientLight, specularLight;
+    doLighting(viewPos.xyz, viewNormal, gl_FrontMaterial.shininess, diffuseLight, ambientLight, specularLight, shadowDiffuseLighting, shadowSpecularLighting);
     passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
+    passSpecular = getSpecularColor().xyz * specularLight;
     clampLightingResult(passLighting);
     shadowDiffuseLighting *= getDiffuseColor().xyz;
+    shadowSpecularLighting *= getSpecularColor().xyz;
 #endif
 
     uv = gl_MultiTexCoord0.xy;
diff --git a/files/shaders/compatibility/water.frag b/files/shaders/compatibility/water.frag
index 83fb8a53e0..749dcf27cd 100644
--- a/files/shaders/compatibility/water.frag
+++ b/files/shaders/compatibility/water.frag
@@ -10,26 +10,19 @@
 
 #include "lib/core/fragment.h.glsl"
 
-#define REFRACTION @refraction_enabled
-
 // Inspired by Blender GLSL Water by martinsh ( https://devlog-martinsh.blogspot.de/2012/07/waterundewater-shader-wip.html )
 
 // tweakables -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
 const float VISIBILITY = 2500.0;
+const float VISIBILITY_DEPTH = VISIBILITY * 1.5;
+const float DEPTH_FADE = 0.15;
 
-const float BIG_WAVES_X = 0.1; // strength of big waves
-const float BIG_WAVES_Y = 0.1;
-
-const float MID_WAVES_X = 0.1; // strength of middle sized waves
-const float MID_WAVES_Y = 0.1;
-const float MID_WAVES_RAIN_X = 0.2;
-const float MID_WAVES_RAIN_Y = 0.2;
-
-const float SMALL_WAVES_X = 0.1; // strength of small waves
-const float SMALL_WAVES_Y = 0.1;
-const float SMALL_WAVES_RAIN_X = 0.3;
-const float SMALL_WAVES_RAIN_Y = 0.3;
+const vec2 BIG_WAVES = vec2(0.1, 0.1); // strength of big waves
+const vec2 MID_WAVES = vec2(0.1, 0.1); // strength of middle sized waves
+const vec2 MID_WAVES_RAIN = vec2(0.2, 0.2);
+const vec2 SMALL_WAVES = vec2(0.1, 0.1); // strength of small waves
+const vec2 SMALL_WAVES_RAIN = vec2(0.3, 0.3);
 
 const float WAVE_CHOPPYNESS = 0.05;                // wave choppyness
 const float WAVE_SCALE = 75.0;                     // overall wave scale
@@ -39,21 +32,26 @@ const float BUMP_RAIN = 2.5;
 const float REFL_BUMP = 0.10;                      // reflection distortion amount
 const float REFR_BUMP = 0.07;                      // refraction distortion amount
 
+#if @sunlightScattering
 const float SCATTER_AMOUNT = 0.3;                  // amount of sunlight scattering
 const vec3 SCATTER_COLOUR = vec3(0.0,1.0,0.95);    // colour of sunlight scattering
+const vec3 SUN_EXT = vec3(0.45, 0.55, 0.68);       // sunlight extinction
+#endif
 
-const vec3 SUN_EXT = vec3(0.45, 0.55, 0.68);       //sunlight extinction
-
+const float SUN_SPEC_FADING_THRESHOLD = 0.15;       // visibility at which sun specularity starts to fade
 const float SPEC_HARDNESS = 256.0;                 // specular highlights hardness
 
 const float BUMP_SUPPRESS_DEPTH = 300.0;           // at what water depth bumpmap will be suppressed for reflections and refractions (prevents artifacts at shores)
+const float REFR_FOG_DISTORT_DISTANCE = 3000.0;    // at what distance refraction fog will be calculated using real water depth instead of distorted depth (prevents splotchy shores)
 
 const vec2 WIND_DIR = vec2(0.5f, -0.8f);
 const float WIND_SPEED = 0.2f;
 
 const vec3 WATER_COLOR = vec3(0.090195, 0.115685, 0.12745);
 
+#if @wobblyShores
 const float WOBBLY_SHORE_FADE_DISTANCE = 6200.0;   // fade out wobbly shores to mask precision errors, the effect is almost impossible to see at a distance
+#endif
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -
 
@@ -80,6 +78,7 @@ uniform float near;
 uniform float far;
 
 uniform float rainIntensity;
+uniform bool enableRainRipples;
 
 uniform vec2 screenRes;
 
@@ -95,7 +94,6 @@ uniform vec2 screenRes;
 void main(void)
 {
     vec2 UV = worldPos.xy / (8192.0*5.0) * 3.0;
-    UV.y *= -1.0;
 
     float shadow = unshadowedLightRatio(linearDepth);
 
@@ -112,7 +110,7 @@ void main(void)
 
     vec4 rainRipple;
 
-    if (rainIntensity > 0.01)
+    if (rainIntensity > 0.01 && enableRainRipples)
         rainRipple = rainCombined(position.xy/1000.0, waterTimer) * clamp(rainIntensity, 0.0, 1.0);
     else
         rainRipple = vec4(0.0);
@@ -125,61 +123,61 @@ void main(void)
     float distortionLevel = 2.0;
     rippleAdd += distortionLevel * vec3(texture2D(rippleMap, rippleMapUV).ba * blendFar * blendClose, 0.0);
 
-    vec2 bigWaves = vec2(BIG_WAVES_X,BIG_WAVES_Y);
-    vec2 midWaves = mix(vec2(MID_WAVES_X,MID_WAVES_Y),vec2(MID_WAVES_RAIN_X,MID_WAVES_RAIN_Y),rainIntensity);
-    vec2 smallWaves = mix(vec2(SMALL_WAVES_X,SMALL_WAVES_Y),vec2(SMALL_WAVES_RAIN_X,SMALL_WAVES_RAIN_Y),rainIntensity);
+    vec2 bigWaves = BIG_WAVES;
+    vec2 midWaves = mix(MID_WAVES, MID_WAVES_RAIN, rainIntensity);
+    vec2 smallWaves = mix(SMALL_WAVES, SMALL_WAVES_RAIN, rainIntensity);
     float bump = mix(BUMP,BUMP_RAIN,rainIntensity);
 
     vec3 normal = (normal0 * bigWaves.x + normal1 * bigWaves.y + normal2 * midWaves.x +
                    normal3 * midWaves.y + normal4 * smallWaves.x + normal5 * smallWaves.y + rippleAdd);
     normal = normalize(vec3(-normal.x * bump, -normal.y * bump, normal.z));
 
-    vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(lcalcPosition(0).xyz, 0.0)).xyz);
+    vec3 sunWorldDir = normalize((gl_ModelViewMatrixInverse * vec4(lcalcPosition(0).xyz, 0.0)).xyz);
     vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
-    vec3 vVec = normalize(position.xyz - cameraPos.xyz);
+    vec3 viewDir = normalize(position.xyz - cameraPos.xyz);
 
     float sunFade = length(gl_LightModel.ambient.xyz);
 
     // fresnel
     float ior = (cameraPos.z>0.0)?(1.333/1.0):(1.0/1.333); // air to water; water to air
-    float fresnel = clamp(fresnel_dielectric(vVec, normal, ior), 0.0, 1.0);
-
-    float radialise = 1.0;
-
-#if @radialFog
-    float radialDepth = distance(position.xyz, cameraPos);
-    // TODO: Figure out how to properly radialise refraction depth and thus underwater fog
-    // while avoiding oddities when the water plane is close to the clipping plane
-    // radialise = radialDepth / linearDepth;
-#else
-    float radialDepth = 0.0;
-#endif
+    float fresnel = clamp(fresnel_dielectric(viewDir, normal, ior), 0.0, 1.0);
 
     vec2 screenCoordsOffset = normal.xy * REFL_BUMP;
-#if REFRACTION
-    float depthSample = linearizeDepth(sampleRefractionDepthMap(screenCoords), near, far) * radialise;
-    float depthSampleDistorted = linearizeDepth(sampleRefractionDepthMap(screenCoords-screenCoordsOffset), near, far) * radialise;
-    float surfaceDepth = linearizeDepth(gl_FragCoord.z, near, far) * radialise;
+#if @waterRefraction
+    float depthSample = linearizeDepth(sampleRefractionDepthMap(screenCoords), near, far);
+    float surfaceDepth = linearizeDepth(gl_FragCoord.z, near, far);
     float realWaterDepth = depthSample - surfaceDepth;  // undistorted water depth in view direction, independent of frustum
-    screenCoordsOffset *= clamp(realWaterDepth / BUMP_SUPPRESS_DEPTH,0,1);
+    float depthSampleDistorted = linearizeDepth(sampleRefractionDepthMap(screenCoords - screenCoordsOffset), near, far);
+    float waterDepthDistorted = max(depthSampleDistorted - surfaceDepth, 0.0);
+    screenCoordsOffset *= clamp(realWaterDepth / BUMP_SUPPRESS_DEPTH, 0.0, 1.0);
 #endif
     // reflection
     vec3 reflection = sampleReflectionMap(screenCoords + screenCoordsOffset).rgb;
 
-    // specular
-    float specular = pow(max(dot(reflect(vVec, normal), lVec), 0.0),SPEC_HARDNESS) * shadow;
-
     vec3 waterColor = WATER_COLOR * sunFade;
 
     vec4 sunSpec = lcalcSpecular(0);
+    // alpha component is sun visibility; we want to start fading lighting effects when visibility is low
+    sunSpec.a = min(1.0, sunSpec.a / SUN_SPEC_FADING_THRESHOLD);
+
+    // specular
+    float specular = pow(max(dot(reflect(viewDir, normal), sunWorldDir), 0.0), SPEC_HARDNESS) * shadow * sunSpec.a;
 
     // artificial specularity to make rain ripples more noticeable
     vec3 skyColorEstimate = vec3(max(0.0, mix(-0.3, 1.0, sunFade)));
     vec3 rainSpecular = abs(rainRipple.w)*mix(skyColorEstimate, vec3(1.0), 0.05)*0.5;
+    float waterTransparency = clamp(fresnel * 6.0 + specular, 0.0, 1.0);
 
-#if REFRACTION
-    // no alpha here, so make sure raindrop ripple specularity gets properly subdued
-    rainSpecular *= clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);
+#if @waterRefraction
+    // selectively nullify screenCoordsOffset to eliminate remaining shore artifacts, not needed for reflection
+    if (cameraPos.z > 0.0 && realWaterDepth <= VISIBILITY_DEPTH && waterDepthDistorted > VISIBILITY_DEPTH)
+        screenCoordsOffset = vec2(0.0);
+
+    depthSampleDistorted = linearizeDepth(sampleRefractionDepthMap(screenCoords - screenCoordsOffset), near, far);
+    waterDepthDistorted = max(depthSampleDistorted - surfaceDepth, 0.0);
+
+    // fade to realWaterDepth at a distance to compensate for physically inaccurate depth calculation
+    waterDepthDistorted = mix(waterDepthDistorted, realWaterDepth, min(surfaceDepth / REFR_FOG_DISTORT_DISTANCE, 1.0));
 
     // refraction
     vec3 refraction = sampleRefractionMap(screenCoords - screenCoordsOffset).rgb;
@@ -189,32 +187,52 @@ void main(void)
     if (cameraPos.z < 0.0)
         refraction = clamp(refraction * 1.5, 0.0, 1.0);
     else
-        refraction = mix(refraction, waterColor, clamp(depthSampleDistorted/VISIBILITY, 0.0, 1.0));
+    {
+        float depthCorrection = sqrt(1.0 + 4.0 * DEPTH_FADE * DEPTH_FADE);
+        float factor = DEPTH_FADE * DEPTH_FADE / (-0.5 * depthCorrection + 0.5 - waterDepthDistorted / VISIBILITY) + 0.5 * depthCorrection + 0.5;
+        refraction = mix(refraction, waterColor, clamp(factor, 0.0, 1.0));
+    }
 
-    // sunlight scattering
-    // normal for sunlight scattering
-    vec3 lNormal = (normal0 * bigWaves.x * 0.5 + normal1 * bigWaves.y * 0.5 + normal2 * midWaves.x * 0.2 +
-                    normal3 * midWaves.y * 0.2 + normal4 * smallWaves.x * 0.1 + normal5 * smallWaves.y * 0.1 + rippleAdd);
-    lNormal = normalize(vec3(-lNormal.x * bump, -lNormal.y * bump, lNormal.z));
-    float sunHeight = lVec.z;
-    vec3 scatterColour = mix(SCATTER_COLOUR*vec3(1.0,0.4,0.0), SCATTER_COLOUR, clamp(1.0-exp(-sunHeight*SUN_EXT), 0.0, 1.0));
-    vec3 lR = reflect(lVec, lNormal);
-    float lightScatter = clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
-    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * sunSpec.xyz + rainSpecular;
-    gl_FragData[0].w = 1.0;
+#if @sunlightScattering
+    vec3 scatterNormal = (normal0 * bigWaves.x * 0.5 + normal1 * bigWaves.y * 0.5 + normal2 * midWaves.x * 0.2 +
+                          normal3 * midWaves.y * 0.2 + normal4 * smallWaves.x * 0.1 + normal5 * smallWaves.y * 0.1 + rippleAdd);
+    scatterNormal = normalize(vec3(-scatterNormal.xy * bump, scatterNormal.z));
+    float sunHeight = sunWorldDir.z;
+    vec3 scatterColour = mix(SCATTER_COLOUR * vec3(1.0, 0.4, 0.0), SCATTER_COLOUR, max(1.0 - exp(-sunHeight * SUN_EXT), 0.0));
+    float scatterLambert = max(dot(sunWorldDir, scatterNormal) * 0.7 + 0.3, 0.0);
+    float scatterReflectAngle = max(dot(reflect(sunWorldDir, scatterNormal), viewDir) * 2.0 - 1.2, 0.0);
+    float lightScatter = scatterLambert * scatterReflectAngle * SCATTER_AMOUNT * sunFade * sunSpec.a * max(1.0 - exp(-sunHeight), 0.0);
+    refraction = mix(refraction, scatterColour, lightScatter);
+#endif
 
+    gl_FragData[0].rgb = mix(refraction, reflection, fresnel);
+    gl_FragData[0].a = 1.0;
+    // no alpha here, so make sure raindrop ripple specularity gets properly subdued
+    rainSpecular *= waterTransparency;
+#else
+    gl_FragData[0].rgb = mix(waterColor, reflection, (1.0 + fresnel) * 0.5);
+    gl_FragData[0].a = waterTransparency;
+#endif
+
+    gl_FragData[0].rgb += specular * sunSpec.rgb + rainSpecular;
+
+#if @waterRefraction && @wobblyShores
     // wobbly water: hard-fade into refraction texture at extremely low depth, with a wobble based on normal mapping
     vec3 normalShoreRippleRain = texture2D(normalMap,normalCoords(UV, 2.0, 2.7, -1.0*waterTimer,  0.05,  0.1,  normal3)).rgb - 0.5
                                + texture2D(normalMap,normalCoords(UV, 2.0, 2.7,      waterTimer,  0.04, -0.13, normal4)).rgb - 0.5;
-    float verticalWaterDepth = realWaterDepth * mix(abs(vVec.z), 1.0, 0.2); // an estimate
+    float viewFactor = mix(abs(viewDir.z), 1.0, 0.2);
+    float verticalWaterDepth = realWaterDepth * viewFactor; // an estimate
     float shoreOffset = verticalWaterDepth - (normal2.r + mix(0.0, normalShoreRippleRain.r, rainIntensity) + 0.15)*8.0;
-    float fuzzFactor = min(1.0, 1000.0/surfaceDepth) * mix(abs(vVec.z), 1.0, 0.2);
+    float fuzzFactor = min(1.0, 1000.0 / surfaceDepth) * viewFactor;
     shoreOffset *= fuzzFactor;
     shoreOffset = clamp(mix(shoreOffset, 1.0, clamp(linearDepth / WOBBLY_SHORE_FADE_DISTANCE, 0.0, 1.0)), 0.0, 1.0);
-    gl_FragData[0].xyz = mix(rawRefraction, gl_FragData[0].xyz, shoreOffset);
+    gl_FragData[0].rgb = mix(rawRefraction, gl_FragData[0].rgb, shoreOffset);
+#endif
+
+#if @radialFog
+    float radialDepth = distance(position.xyz, cameraPos);
 #else
-    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + rainSpecular;
-    gl_FragData[0].w = clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);
+    float radialDepth = 0.0;
 #endif
 
     gl_FragData[0] = applyFogAtDist(gl_FragData[0], radialDepth, linearDepth, far);
diff --git a/files/shaders/compatibility/water.vert b/files/shaders/compatibility/water.vert
index 93796a7b9c..a67f412a07 100644
--- a/files/shaders/compatibility/water.vert
+++ b/files/shaders/compatibility/water.vert
@@ -21,7 +21,7 @@ void main(void)
     position = gl_Vertex;
 
     worldPos = position.xyz + nodePosition.xyz;
-    rippleMapUV = (worldPos.xy - playerPos.xy + (@ripple_map_size * @ripple_map_world_scale / 2.0)) / @ripple_map_size / @ripple_map_world_scale;
+    rippleMapUV = (worldPos.xy - playerPos.xy + (@rippleMapSize * @rippleMapWorldScale / 2.0)) / @rippleMapSize / @rippleMapWorldScale;
 
     vec4 viewPos = modelToView(gl_Vertex);
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
diff --git a/files/shaders/core/ripples_blobber.comp b/files/shaders/core/ripples_blobber.comp
index 76c8afff60..235f58a5ba 100644
--- a/files/shaders/core/ripples_blobber.comp
+++ b/files/shaders/core/ripples_blobber.comp
@@ -23,7 +23,7 @@ void main()
     for (int i = 0; i < positionCount; ++i)
     {
         float wavesize = wavesizeMultiplier * positions[i].z;
-        float displace = clamp(2.0 * abs(length((positions[i].xy + offset) - vec2(gl_GlobalInvocationID.xy)) / wavesize - 1.0), 0.0, 1.0);
+        float displace = clamp(0.2 * abs(length((positions[i].xy + offset) - vec2(gl_GlobalInvocationID.xy)) / wavesize - 1.0) + 0.8, 0.0, 1.0);
         color.rg = mix(vec2(-1.0), color.rg, displace);
     }
 
diff --git a/files/shaders/lib/core/fragment.glsl b/files/shaders/lib/core/fragment.glsl
index 68fbe5e39d..9b983148cb 100644
--- a/files/shaders/lib/core/fragment.glsl
+++ b/files/shaders/lib/core/fragment.glsl
@@ -9,7 +9,7 @@ vec4 sampleReflectionMap(vec2 uv)
     return texture2D(reflectionMap, uv);
 }
 
-#if @refraction_enabled
+#if @waterRefraction
 uniform sampler2D refractionMap;
 uniform sampler2D refractionDepthMap;
 
diff --git a/files/shaders/lib/core/fragment.h.glsl b/files/shaders/lib/core/fragment.h.glsl
index 1bc2a1f79a..b8c3f9a32b 100644
--- a/files/shaders/lib/core/fragment.h.glsl
+++ b/files/shaders/lib/core/fragment.h.glsl
@@ -6,7 +6,7 @@
 
 vec4 sampleReflectionMap(vec2 uv);
 
-#if @refraction_enabled
+#if @waterRefraction
 vec4 sampleRefractionMap(vec2 uv);
 float sampleRefractionDepthMap(vec2 uv);
 #endif
diff --git a/files/shaders/lib/core/fragment_multiview.glsl b/files/shaders/lib/core/fragment_multiview.glsl
index cc804d6c80..2880087104 100644
--- a/files/shaders/lib/core/fragment_multiview.glsl
+++ b/files/shaders/lib/core/fragment_multiview.glsl
@@ -12,7 +12,7 @@ vec4 sampleReflectionMap(vec2 uv)
     return texture(reflectionMap, vec3((uv), gl_ViewID_OVR));
 }
 
-#if @refraction_enabled
+#if @waterRefraction
 
 uniform sampler2DArray refractionMap;
 uniform sampler2DArray refractionDepthMap;
diff --git a/files/shaders/lib/light/lighting.glsl b/files/shaders/lib/light/lighting.glsl
index 8c1262ba4d..4a86233294 100644
--- a/files/shaders/lib/light/lighting.glsl
+++ b/files/shaders/lib/light/lighting.glsl
@@ -3,15 +3,13 @@
 
 #include "lighting_util.glsl"
 
-void perLightSun(out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
+float calcLambert(vec3 viewNormal, vec3 lightDir, vec3 viewDir)
 {
-    vec3 lightDir = normalize(lcalcPosition(0));
-    float lambert = dot(viewNormal.xyz, lightDir);
-
+    float lambert = dot(viewNormal, lightDir);
 #ifndef GROUNDCOVER
     lambert = max(lambert, 0.0);
 #else
-    float eyeCosine = dot(normalize(viewPos), viewNormal.xyz);
+    float eyeCosine = dot(viewNormal, viewDir);
     if (lambert < 0.0)
     {
         lambert = -lambert;
@@ -19,86 +17,67 @@ void perLightSun(out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
     }
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
-
-    diffuseOut = lcalcDiffuse(0).xyz * lambert;
+    return lambert;
 }
 
-void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
+float calcSpecIntensity(vec3 viewNormal, vec3 viewDir, float shininess, vec3 lightDir)
 {
-    vec3 lightPos = lcalcPosition(lightIndex) - viewPos;
-    float lightDistance = length(lightPos);
-
-// cull non-FFP point lighting by radius, light is guaranteed to not fall outside this bound with our cutoff
-#if !@lightingMethodFFP
-    float radius = lcalcRadius(lightIndex);
-
-    if (lightDistance > radius * 2.0)
+    if (dot(viewNormal, lightDir) > 0.0)
     {
-        ambientOut = vec3(0.0);
-        diffuseOut = vec3(0.0);
-        return;
+        vec3 halfVec = normalize(lightDir - viewDir);
+        float NdotH = max(dot(viewNormal, halfVec), 0.0);
+        return pow(NdotH, shininess);
     }
-#endif
 
-    lightPos = normalize(lightPos);
-
-    float illumination = lcalcIllumination(lightIndex, lightDistance);
-    ambientOut = lcalcAmbient(lightIndex) * illumination;
-    float lambert = dot(viewNormal.xyz, lightPos) * illumination;
-
-#ifndef GROUNDCOVER
-    lambert = max(lambert, 0.0);
-#else
-    float eyeCosine = dot(normalize(viewPos), viewNormal.xyz);
-    if (lambert < 0.0)
-    {
-        lambert = -lambert;
-        eyeCosine = -eyeCosine;
-    }
-    lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
-#endif
-
-    diffuseOut = lcalcDiffuse(lightIndex) * lambert;
+    return 0.0;
 }
 
 #if PER_PIXEL_LIGHTING
-void doLighting(vec3 viewPos, vec3 viewNormal, float shadowing, out vec3 diffuseLight, out vec3 ambientLight)
+void doLighting(vec3 viewPos, vec3 viewNormal, float shininess, float shadowing, out vec3 diffuseLight, out vec3 ambientLight, out vec3 specularLight)
 #else
-void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 ambientLight, out vec3 shadowDiffuse)
+void doLighting(vec3 viewPos, vec3 viewNormal, float shininess, out vec3 diffuseLight, out vec3 ambientLight, out vec3 specularLight, out vec3 shadowDiffuse, out vec3 shadowSpecular)
 #endif
 {
-    vec3 ambientOut, diffuseOut;
+    vec3 viewDir = normalize(viewPos);
+    shininess = max(shininess, 1e-4);
 
-    perLightSun(diffuseOut, viewPos, viewNormal);
+    vec3 sunDir = normalize(lcalcPosition(0));
+    diffuseLight = lcalcDiffuse(0) * calcLambert(viewNormal, sunDir, viewDir);
     ambientLight = gl_LightModel.ambient.xyz;
+    specularLight = lcalcSpecular(0).xyz * calcSpecIntensity(viewNormal, viewDir, shininess, sunDir);
 #if PER_PIXEL_LIGHTING
-    diffuseLight = diffuseOut * shadowing;
+    diffuseLight *= shadowing;
+    specularLight *= shadowing;
 #else
-    shadowDiffuse = diffuseOut;
+    shadowDiffuse = diffuseLight;
+    shadowSpecular = specularLight;
     diffuseLight = vec3(0.0);
+    specularLight = vec3(0.0);
 #endif
 
     for (int i = @startLight; i < @endLight; ++i)
     {
 #if @lightingMethodUBO
-        perLightPoint(ambientOut, diffuseOut, PointLightIndex[i], viewPos, viewNormal);
+        int lightIndex = PointLightIndex[i];
 #else
-        perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
+        int lightIndex = i;
 #endif
-        ambientLight += ambientOut;
-        diffuseLight += diffuseOut;
+        vec3 lightPos = lcalcPosition(lightIndex) - viewPos;
+        float lightDistance = length(lightPos);
+
+        // cull non-FFP point lighting by radius, light is guaranteed to not fall outside this bound with our cutoff
+#if !@classicFalloff && !@lightingMethodFFP
+        if (lightDistance > lcalcRadius(lightIndex) * 2.0)
+            continue;
+#endif
+
+        vec3 lightDir = lightPos / lightDistance;
+
+        float illumination = lcalcIllumination(lightIndex, lightDistance);
+        diffuseLight += lcalcDiffuse(lightIndex) * calcLambert(viewNormal, lightDir, viewDir) * illumination;
+        ambientLight += lcalcAmbient(lightIndex) * illumination;
+        specularLight += lcalcSpecular(lightIndex).xyz * calcSpecIntensity(viewNormal, viewDir, shininess, lightDir) * illumination;
     }
 }
 
-vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
-{
-    vec3 lightDir = normalize(lcalcPosition(0));
-    float NdotL = dot(viewNormal, lightDir);
-    if (NdotL <= 0.0)
-        return vec3(0.0);
-    vec3 halfVec = normalize(lightDir - viewDirection);
-    float NdotH = dot(viewNormal, halfVec);
-    return pow(max(NdotH, 0.0), max(1e-4, shininess)) * lcalcSpecular(0).xyz * matSpec;
-}
-
 #endif
diff --git a/files/shaders/lib/light/lighting_util.glsl b/files/shaders/lib/light/lighting_util.glsl
index afa38af86b..b56afe285b 100644
--- a/files/shaders/lib/light/lighting_util.glsl
+++ b/files/shaders/lib/light/lighting_util.glsl
@@ -59,6 +59,39 @@ uniform int PointLightCount;
 
 #endif
 
+float lcalcConstantAttenuation(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][0].w;
+#elif @lightingMethodUBO
+    return @getLight[lightIndex].attenuation.x;
+#else
+    return @getLight[lightIndex].constantAttenuation;
+#endif
+}
+
+float lcalcLinearAttenuation(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][1].w;
+#elif @lightingMethodUBO
+    return @getLight[lightIndex].attenuation.y;
+#else
+    return @getLight[lightIndex].linearAttenuation;
+#endif
+}
+
+float lcalcQuadraticAttenuation(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][2].w;
+#elif @lightingMethodUBO
+    return @getLight[lightIndex].attenuation.z;
+#else
+    return @getLight[lightIndex].quadraticAttenuation;
+#endif
+}
+
 #if !@lightingMethodFFP
 float lcalcRadius(int lightIndex)
 {
@@ -70,17 +103,14 @@ float lcalcRadius(int lightIndex)
 }
 #endif
 
-float lcalcIllumination(int lightIndex, float lightDistance)
+float lcalcIllumination(int lightIndex, float dist)
 {
-#if @lightingMethodPerObjectUniform
-    float illumination = clamp(1.0 / (@getLight[lightIndex][0].w + @getLight[lightIndex][1].w * lightDistance + @getLight[lightIndex][2].w * lightDistance * lightDistance), 0.0, 1.0);
-    return (illumination * (1.0 - quickstep((lightDistance / lcalcRadius(lightIndex)) - 1.0)));
-#elif @lightingMethodUBO
-    float illumination = clamp(1.0 / (@getLight[lightIndex].attenuation.x + @getLight[lightIndex].attenuation.y * lightDistance + @getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
-    return (illumination * (1.0 - quickstep((lightDistance / lcalcRadius(lightIndex)) - 1.0)));
-#else
-    return clamp(1.0 / (@getLight[lightIndex].constantAttenuation + @getLight[lightIndex].linearAttenuation * lightDistance + @getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
+    float illumination = 1.0 / (lcalcConstantAttenuation(lightIndex) + lcalcLinearAttenuation(lightIndex) * dist + lcalcQuadraticAttenuation(lightIndex) * dist * dist);
+#if !@classicFalloff && !@lightingMethodFFP
+    // Fade illumination between the radius and the radius doubled to diminish pop-in
+    illumination *= 1.0 - quickstep((dist / lcalcRadius(lightIndex)) - 1.0);
 #endif
+    return illumination;
 }
 
 vec3 lcalcPosition(int lightIndex)
diff --git a/files/shaders/lib/material/parallax.glsl b/files/shaders/lib/material/parallax.glsl
index 7f4ce2d1dc..5525281f75 100644
--- a/files/shaders/lib/material/parallax.glsl
+++ b/files/shaders/lib/material/parallax.glsl
@@ -4,10 +4,9 @@
 #define PARALLAX_SCALE 0.04
 #define PARALLAX_BIAS -0.02
 
-vec2 getParallaxOffset(vec3 eyeDir, mat3 tbnTranspose, float height, float flipY)
+vec2 getParallaxOffset(vec3 eyeDir, float height, float flipY)
 {
-    vec3 TSeyeDir = normalize(eyeDir * tbnTranspose);
-    return vec2(TSeyeDir.x, TSeyeDir.y * flipY) * ( height * PARALLAX_SCALE + PARALLAX_BIAS );
+    return vec2(eyeDir.x, eyeDir.y * flipY) * ( height * PARALLAX_SCALE + PARALLAX_BIAS );
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/files/shaders/lib/particle/soft.glsl b/files/shaders/lib/particle/soft.glsl
index c415d8402b..99336bc039 100644
--- a/files/shaders/lib/particle/soft.glsl
+++ b/files/shaders/lib/particle/soft.glsl
@@ -19,7 +19,8 @@ float calcSoftParticleFade(
     float far,
     float depth,
     float size,
-    bool fade
+    bool fade,
+    float softFalloffDepth
     )
 {
     float euclidianDepth = length(viewPos);
@@ -32,13 +33,12 @@ float calcSoftParticleFade(
     float falloff = size * falloffMultiplier;
     float delta = particleDepth - sceneDepth;
 
-    const float nearMult = 300.0;
     float viewBias = 1.0;
 
     if (fade)
     {
         float VdotN = dot(viewDir, viewNormal);
-        viewBias = abs(VdotN) * quickstep(euclidianDepth / nearMult) * (1.0 - pow(1.0 + VdotN, 1.3));
+        viewBias = abs(VdotN) * quickstep(euclidianDepth / softFalloffDepth) * (1.0 - pow(1.0 - abs(VdotN), 1.3));
     }
 
     const float shift = 0.845;
diff --git a/files/shaders/lib/util/distortion.glsl b/files/shaders/lib/util/distortion.glsl
new file mode 100644
index 0000000000..e0ccf6f2ec
--- /dev/null
+++ b/files/shaders/lib/util/distortion.glsl
@@ -0,0 +1,32 @@
+#ifndef LIB_UTIL_DISTORTION
+#define LIB_UTIL_DISTORTION
+
+vec4 applyDistortion(in vec4 color, in float strength, in float pixelDepth, in float sceneDepth)
+{
+    vec4 distortion = color;
+    float invOcclusion = 1.0;
+
+    // TODO: Investigate me. Alpha-clipping is enabled for refraction for what seems an arbitrary threshold, even when
+    // there are no associated NIF properties.
+    if (distortion.a < 0.1)
+        discard;
+
+    distortion.b = 0.0;
+
+#if @reverseZ
+    if (pixelDepth < sceneDepth)
+#else
+    if (pixelDepth > sceneDepth)
+#endif
+    {
+        invOcclusion = 0.0;
+        distortion.b = 1.0;
+    }
+    distortion.rg = color.rg * 2.0 - 1.0;
+
+    distortion.rg *= invOcclusion * strength;
+
+    return distortion;
+}
+
+#endif
diff --git a/files/shaders/lib/util/quickstep.glsl b/files/shaders/lib/util/quickstep.glsl
index 2baa0a7430..e505886337 100644
--- a/files/shaders/lib/util/quickstep.glsl
+++ b/files/shaders/lib/util/quickstep.glsl
@@ -4,8 +4,8 @@
 float quickstep(float x)
 {
     x = clamp(x, 0.0, 1.0);
-    x = 1.0 - x*x;
-    x = 1.0 - x*x;
+    x = 1.0 - x * x;
+    x = 1.0 - x * x;
     return x;
 }
 
diff --git a/files/shaders/lib/water/rain_ripples.glsl b/files/shaders/lib/water/rain_ripples.glsl
index 4e5f85017b..6ec3f101fe 100644
--- a/files/shaders/lib/water/rain_ripples.glsl
+++ b/files/shaders/lib/water/rain_ripples.glsl
@@ -1,8 +1,6 @@
 #ifndef LIB_WATER_RIPPLES
 #define LIB_WATER_RIPPLES
 
-#define RAIN_RIPPLE_DETAIL @rain_ripple_detail
-
 const float RAIN_RIPPLE_GAPS = 10.0;
 const float RAIN_RIPPLE_RADIUS = 0.2;
 
@@ -51,7 +49,7 @@ vec4 circle(vec2 coords, vec2 corner, float adjusted_time)
   float d = length(toCenter);
   float ringfollower = (phase-d/r)/RAIN_RING_TIME_OFFSET-1.0; // -1.0 ~ +1.0 cover the breadth of the ripple's ring
 
-#if RAIN_RIPPLE_DETAIL > 0
+#if @rainRippleDetail > 0
 // normal mapped ripples
   if(ringfollower < -1.0 || ringfollower > 1.0)
     return vec4(0.0);
@@ -88,7 +86,7 @@ vec4 rain(vec2 uv, float time)
   vec2 f_part = fract(uv);
   vec2 i_part = floor(uv);
   float adjusted_time = time * 1.2 + randPhase(i_part);
-#if RAIN_RIPPLE_DETAIL > 0
+#if @rainRippleDetail > 0
   vec4 a = circle(f_part, i_part, adjusted_time);
   vec4 b = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET);
   vec4 c = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET*2.0);
@@ -115,11 +113,11 @@ vec4 rainCombined(vec2 uv, float time) // returns ripple normal in xyz and fake
   return
     rain(uv, time)
   + rain(complex_mult(uv, vec2(0.4, 0.7)) + vec2(1.2, 3.0),time)
-    #if RAIN_RIPPLE_DETAIL == 2
+#if @rainRippleDetail == 2
       + rain(uv * 0.75 + vec2( 3.7,18.9),time)
       + rain(uv * 0.9  + vec2( 5.7,30.1),time)
       + rain(uv * 1.0  + vec2(10.5 ,5.7),time)
-    #endif
+#endif
   ;
 }
 
diff --git a/files/shaders/lib/water/ripples.glsl b/files/shaders/lib/water/ripples.glsl
index 07856d7236..8620039f3c 100644
--- a/files/shaders/lib/water/ripples.glsl
+++ b/files/shaders/lib/water/ripples.glsl
@@ -11,9 +11,9 @@ vec4 applySprings(in vec4 samplerData, in vec4 n, in vec4 n2)
     vec4 storage = vec4(0.0, samplerData.r, 0.0, 0.0);
 
     // Tweak to look most like water, not a physically accurate simulation
-    const float a = 0.14;
-    const float udamp = 0.02;
-    const float vdamp = 0.02;
+    const float a = 0.28;
+    const float udamp = 0.04;
+    const float vdamp = 0.04;
 
     // Apply 2d wave equation with dampening
     // Continous impulse needed to maintain simulation, otherwise ripples will fade
@@ -21,7 +21,7 @@ vec4 applySprings(in vec4 samplerData, in vec4 n, in vec4 n2)
     storage.r = a * nsum + ((2.0 - udamp - vdamp) - 4.0 * a) * samplerData.r - (1.0 - vdamp) * samplerData.g;
 
     // Calculate normal and store in blue-alpha channel
-    storage.ba = 2.0 * (n.xy - n.zw) + 0.5 * (n2.xy - n2.zw);
+    storage.ba = 2.0 * (n.xz - n.yw) + 0.5 * (n2.xz - n2.yw);
 
     return storage;
 }
diff --git a/files/ui/graphicspage.ui b/files/ui/graphicspage.ui
deleted file mode 100644
index bb900ccb2d..0000000000
--- a/files/ui/graphicspage.ui
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>GraphicsPage</class>
- <widget class="QWidget" name="GraphicsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>650</width>
-    <height>358</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item alignment="Qt::AlignTop">
-    <widget class="QTabWidget" name="DisplayTabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="DisplayWrapper">
-      <attribute name="title">
-       <string>Display</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0">
-         <item row="5" column="0">
-          <widget class="QLabel" name="screenLabel">
-           <property name="text">
-            <string>Screen:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QComboBox" name="antiAliasingComboBox">
-           <item>
-            <property name="text">
-             <string>0</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>2</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>4</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>8</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>16</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <widget class="QComboBox" name="screenComboBox"/>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="windowModeLabel">
-           <property name="text">
-            <string>Window Mode:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QLabel" name="resolutionLabel">
-           <property name="text">
-            <string>Resolution:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="vSyncLabel">
-           <property name="text">
-            <string>Vertical Sync:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="antiAliasingLabel">
-           <property name="text">
-            <string>Anti-aliasing:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <layout class="QGridLayout" name="resolutionLayout">
-           <item row="1" column="2">
-            <layout class="QHBoxLayout" name="customResolutionLayout" stretch="1,0,1">
-             <item>
-              <widget class="QSpinBox" name="customWidthSpinBox">
-               <property name="minimum">
-                <number>800</number>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="multiplyLabel">
-               <property name="text">
-                <string> x </string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="customHeightSpinBox">
-               <property name="minimum">
-                <number>600</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="1" column="1">
-            <widget class="QRadioButton" name="customRadioButton">
-             <property name="text">
-              <string>Custom:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QRadioButton" name="standardRadioButton">
-             <property name="text">
-              <string>Standard:</string>
-             </property>
-             <property name="checkable">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="2">
-            <widget class="QComboBox" name="resolutionComboBox"/>
-           </item>
-          </layout>
-         </item>
-         <item row="3" column="1">
-          <widget class="QComboBox" name="windowModeComboBox">
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Fullscreen</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Windowed Fullscreen</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Windowed</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="windowBorderCheckBox">
-           <property name="text">
-            <string>Window Border</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QComboBox" name="vSyncComboBox">
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Disabled</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Enabled</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Adaptive</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="framerateLimitCheckBox">
-           <property name="text">
-            <string>Framerate Limit:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QDoubleSpinBox" name="framerateLimitSpinBox">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="suffix">
-            <string> FPS</string>
-           </property>
-           <property name="decimals">
-            <number>1</number>
-           </property>
-           <property name="minimum">
-            <double>1.000000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>1000.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>15.000000000000000</double>
-           </property>
-           <property name="value">
-            <double>300.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="LightingWrapper">
-      <attribute name="title">
-       <string>Lighting</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="lightingLayout">
-       <item>
-        <layout class="QHBoxLayout" name="lightingMethodLayout">
-         <item>
-          <widget class="QLabel" name="lightingMethodLabel">
-           <property name="text">
-            <string>Lighting Method:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="lightingMethodComboBox">
-           <item>
-            <property name="text">
-             <string>legacy</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>shaders compatibility</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>shaders</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="ShadowWrapper">
-      <attribute name="title">
-       <string>Shadows</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <layout class="QGridLayout" name="shadowsLayout" columnstretch="0,0">
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="playerShadowsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enable Player Shadows</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="actorShadowsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enable Actor Shadows</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="objectShadowsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enable Object Shadows</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="terrainShadowsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enable Terrain Shadows</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QCheckBox" name="indoorShadowsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind's data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enable Indoor Shadows</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="shadowComputeSceneBoundsLabel">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Shadow Near Far Computation Method:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <widget class="QComboBox" name="shadowComputeSceneBoundsComboBox">
-           <item>
-            <property name="text">
-             <string>bounds</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>primitives</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>none</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QLabel" name="shadowResolutionLabel">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Shadow Map Resolution:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="QComboBox" name="shadowResolutionComboBox">
-           <item>
-            <property name="text">
-             <string>512</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>1024</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>2048</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>4096</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="7" column="0">
-          <widget class="QCheckBox" name="shadowDistanceCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Shadow Distance Limit:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QSpinBox" name="shadowDistanceSpinBox">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="suffix">
-            <string> unit(s)</string>
-           </property>
-           <property name="minimum">
-            <number>512</number>
-           </property>
-           <property name="maximum">
-            <number>81920</number>
-           </property>
-           <property name="value">
-            <number>8192</number>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="0">
-          <widget class="QLabel" name="fadeStartLabel">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Fade Start Multiplier:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="1">
-          <widget class="QDoubleSpinBox" name="fadeStartSpinBox">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="decimals">
-            <number>2</number>
-           </property>
-           <property name="minimum">
-            <double>0.000000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>1.000000000000000</double>
-           </property>
-           <property name="value">
-            <double>0.900000000000000</double>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/files/ui/settingspage.ui b/files/ui/settingspage.ui
deleted file mode 100644
index c61b4f4229..0000000000
--- a/files/ui/settingspage.ui
+++ /dev/null
@@ -1,1361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SettingsPage</class>
- <widget class="QWidget" name="SettingsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>732</width>
-    <height>503</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="pageVerticalLayout">
-   <item>
-    <widget class="QTabWidget" name="AdvancedTabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="GameMechanics">
-      <attribute name="title">
-       <string>Game Mechanics</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <layout class="QGridLayout" name="gridLayout_3">
-         <item row="5" column="0">
-          <widget class="QCheckBox" name="permanentBarterDispositionChangeCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Permanent barter disposition changes</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="followersAttackOnSightCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Followers defend immediately</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="uncappedDamageFatigueCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Uncapped Damage Fatigue</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <widget class="QCheckBox" name="classicCalmSpellsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Classic Calm spells behavior</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="rebalanceSoulGemValuesCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Soulgem values rebalance</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="swimUpwardCorrectionCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Swim upward correction</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QCheckBox" name="enchantedWeaponsMagicalCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weaponry without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enchanted weapons are magical</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QCheckBox" name="stealingFromKnockedOutCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Always allow stealing from knocked out actors</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="classicReflectedAbsorbSpellsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored -- like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Classic reflected Absorb spells behavior</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QCheckBox" name="enableNavigatorCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable navigator. When enabled background threads are started to build nav mesh for world geometry. Pathfinding system uses nav mesh to build paths. When disabled only pathgrid is used to build paths. Single-core CPU systems may have big performance impact on exiting interior location and moving across exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn’t know where to go when you stand behind that stone and casting a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Build nav mesh for world geometry</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="QCheckBox" name="avoidCollisionsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>NPCs avoid collisions</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="normaliseRaceSpeedCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don't use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Racial variation in speed fix</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QCheckBox" name="canLootDuringDeathAnimationCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor's script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Can loot during death animation</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="allowNPCToFollowOverWaterSurfaceCheckBox">
-           <property name="toolTip">
-            <string>Give NPC an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.</string>
-           </property>
-           <property name="text">
-            <string>Always allow NPC to follow over water surface</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="unarmedCreatureAttacksDamageArmorCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Unarmed creature attacks damage armor</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="requireAppropriateAmmunitionCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allow non-standard ammunition solely to bypass normal weapon resistance or weakness.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Only appropriate ammunition bypasses normal weapon resistance</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QGridLayout" name="gridLayoutGameMechanics2">
-         <item row="0" column="0">
-          <widget class="QLabel" name="unarmedFactorsStrengthLabel">
-           <property name="text">
-            <string>Factor strength into hand-to-hand combat:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QComboBox" name="unarmedFactorsStrengthComboBox">
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Off</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Affect werewolves</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Do not affect werewolves</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="physicsThreadsLabel">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Background physics threads:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QSpinBox" name="physicsThreadsSpinBox"/>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="labelActorCollisionShapeType">
-           <property name="text">
-            <string>Actor collision shape type:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QComboBox" name="actorCollisonShapeTypeComboBox">
-           <property name="toolTip">
-            <string>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency bewtween available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</string>
-           </property>
-           <property name="currentText">
-            <string>Axis-aligned bounding box</string>
-           </property>
-           <item>
-            <property name="text">
-             <string>Axis-aligned bounding box</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Rotating box</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Cylinder</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacerGameMechanics">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Visuals">
-      <attribute name="title">
-       <string>Visuals</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <widget class="QScrollArea" name="visualsScrollArea">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="visualsScrollAreaWidgetContents">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>680</width>
-            <height>882</height>
-           </rect>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <item>
-            <widget class="QGroupBox" name="animationsGroup">
-             <property name="title">
-              <string>Animations</string>
-             </property>
-             <layout class="QGridLayout" name="animationsLayout">
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="magicItemAnimationsCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Use magic item animation</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QCheckBox" name="smoothMovementCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Smooth movement</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="animSourcesCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Use additional animation sources</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QCheckBox" name="turnToMovementDirectionCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character's body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Turn to movement direction</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <layout class="QVBoxLayout" name="sheathingLayout">
-                <property name="leftMargin">
-                 <number>20</number>
-                </property>
-                <item>
-                 <widget class="QCheckBox" name="weaponSheathingCheckBox">
-                  <property name="enabled">
-                   <bool>false</bool>
-                  </property>
-                  <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  </property>
-                  <property name="text">
-                   <string>Weapon sheathing</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QCheckBox" name="shieldSheathingCheckBox">
-                  <property name="enabled">
-                   <bool>false</bool>
-                  </property>
-                  <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  </property>
-                  <property name="text">
-                   <string>Shield sheathing</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="shadersGroup">
-             <property name="title">
-              <string>Shaders</string>
-             </property>
-             <layout class="QGridLayout" name="shaderLayout">
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="autoUseObjectNormalMapsCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
-                  (see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
-                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Auto use object normal maps</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QCheckBox" name="autoUseTerrainNormalMapsCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See 'auto use object normal maps'. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Auto use terrain normal maps</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="autoUseObjectSpecularMapsCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
-                  (see 'specular map pattern', e.g. for a base texture foo.dds,
-                  the specular map texture would have to be named foo_spec.dds).
-                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
-                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Auto use object specular maps</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QCheckBox" name="autoUseTerrainSpecularMapsCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Auto use terrain specular maps</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="bumpMapLocalLightingCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
-                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
-                  Affected objects will use shaders.
-                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Bump/reflect map local lighting</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Use anti-alias alpha testing</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QCheckBox" name="softParticlesCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Soft Particles</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QCheckBox" name="adjustCoverageForAlphaTestCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Adjust coverage for alpha test</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QCheckBox" name="weatherParticleOcclusionCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Weather Particle Occlusion</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="fogGroup">
-             <property name="title">
-              <string>Fog</string>
-             </property>
-             <layout class="QGridLayout" name="fogLayout">
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="radialFogCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
-                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Radial fog</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QCheckBox" name="exponentialFogCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Exponential fog</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="skyBlendingCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Sky blending</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="skyBlendingStartLabel">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Sky blending start</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QDoubleSpinBox" name="skyBlendingStartComboBox">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="decimals">
-                 <number>3</number>
-                </property>
-                <property name="minimum">
-                 <double>0.000000000000000</double>
-                </property>
-                <property name="maximum">
-                 <double>1.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.005000000000000</double>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="terrainGroup">
-             <property name="title">
-              <string>Terrain</string>
-             </property>
-             <layout class="QGridLayout" name="terrainLayout">
-              <item row="0" column="0">
-               <layout class="QHBoxLayout" name="viewingDistanceLayout">
-                <item>
-                 <widget class="QLabel" name="viewingDistanceLabel">
-                  <property name="text">
-                   <string>Viewing distance</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QDoubleSpinBox" name="viewingDistanceComboBox">
-                  <property name="suffix">
-                   <string> Cells</string>
-                  </property>
-                  <property name="minimum">
-                   <double>0.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.500000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item row="1" column="0">
-               <layout class="QHBoxLayout" name="objectPagingMinSizeLayout">
-                <item>
-                 <widget class="QLabel" name="objectPagingMinSizeLabel">
-                  <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  </property>
-                  <property name="text">
-                   <string>Object paging min size</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QDoubleSpinBox" name="objectPagingMinSizeComboBox">
-                  <property name="decimals">
-                   <number>3</number>
-                  </property>
-                  <property name="minimum">
-                   <double>0.000000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>0.250000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.005000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="distantLandCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Distant land</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <layout class="QVBoxLayout" name="distantLandLayout">
-                <property name="leftMargin">
-                 <number>20</number>
-                </property>
-                <item>
-                 <widget class="QCheckBox" name="activeGridObjectPagingCheckBox">
-                  <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  </property>
-                  <property name="text">
-                   <string>Active grid object paging</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="miscGroup">
-             <property name="title">
-              <string>Models</string>
-             </property>
-             <layout class="QGridLayout" name="miscLayout">
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="nightDaySwitchesCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Day night switch nodes</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="postprocessGroup">
-             <property name="title">
-              <string>Post Processing</string>
-             </property>
-             <layout class="QGridLayout" name="postprocessLayout">
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="postprocessEnabledCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Enable post processing</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <layout class="QVBoxLayout">
-                <property name="leftMargin">
-                 <number>20</number>
-                </property>
-                <item>
-                 <widget class="QCheckBox" name="postprocessTransparentPostpassCheckBox">
-                  <property name="enabled">
-                   <bool>false</bool>
-                  </property>
-                  <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  </property>
-                  <property name="text">
-                   <string>Transparent postpass</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <layout class="QHBoxLayout">
-                  <item>
-                   <widget class="QLabel" name="postprocessHDRTimeLabel">
-                    <property name="enabled">
-                     <bool>false</bool>
-                    </property>
-                    <property name="toolTip">
-                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                    </property>
-                    <property name="text">
-                     <string>Auto exposure speed</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QDoubleSpinBox" name="postprocessHDRTimeComboBox">
-                    <property name="enabled">
-                     <bool>false</bool>
-                    </property>
-                    <property name="decimals">
-                     <number>3</number>
-                    </property>
-                    <property name="minimum">
-                     <double>0.010000000000000</double>
-                    </property>
-                    <property name="maximum">
-                     <double>10.000000000000000</double>
-                    </property>
-                    <property name="singleStep">
-                     <double>0.001000000000000</double>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Audio">
-      <attribute name="title">
-       <string>Audio</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QLabel" name="audioDeviceSelectorLabel">
-           <property name="toolTip">
-            <string>Select your preferred audio device.</string>
-           </property>
-           <property name="text">
-            <string>Audio Device</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="audioDeviceSelectorComboBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>283</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Default</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QLabel" name="enableHRTFLabel">
-           <property name="toolTip">
-            <string>This setting controls HRTF, which simulates 3D sound on stereo systems.</string>
-           </property>
-           <property name="text">
-            <string>HRTF</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="enableHRTFComboBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>283</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Automatic</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Off</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>On</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QLabel" name="hrtfProfileSelectorLabel">
-           <property name="toolTip">
-            <string>Select your preferred HRTF profile.</string>
-           </property>
-           <property name="text">
-            <string>HRTF Profile</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="hrtfProfileSelectorComboBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>283</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Default</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Interface">
-      <attribute name="title">
-       <string>Interface</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="1">
-          <widget class="QComboBox" name="showOwnedComboBox">
-           <property name="currentIndex">
-            <number>1</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Off</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Tool Tip Only</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Crosshair Only</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Tool Tip and Crosshair</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QDoubleSpinBox" name="scalingSpinBox">
-           <property name="decimals">
-            <number>2</number>
-           </property>
-           <property name="minimum">
-            <double>0.500000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>8.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>0.250000000000000</double>
-           </property>
-           <property name="value">
-            <double>1.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QSpinBox" name="fontSizeSpinBox">
-           <property name="minimum">
-            <number>12</number>
-           </property>
-           <property name="maximum">
-            <number>18</number>
-           </property>
-           <property name="singleStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>16</number>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="scalingLabel">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>GUI scaling factor</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QCheckBox" name="showEffectDurationCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Show effect duration</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QCheckBox" name="changeDialogTopicsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you're talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Change dialogue topic color</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="fontSizeLabel">
-           <property name="toolTip">
-            <string>Size of characters in game texts.</string>
-           </property>
-           <property name="text">
-            <string>Font size</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="0">
-          <widget class="QCheckBox" name="useZoomOnMapCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Can zoom on maps</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QCheckBox" name="graphicHerbalismCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enable graphic herbalism</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <widget class="QCheckBox" name="showProjectileDamageCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Show projectile damage</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QCheckBox" name="showMeleeInfoCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Show melee info</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="QCheckBox" name="stretchBackgroundCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Stretch menu background</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="showOwnedLabel">
-           <property name="text">
-            <string>Show owned objects</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="showEnchantChanceCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Show enchant chance</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="BugFixes">
-      <attribute name="title">
-       <string>Bug Fixes</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <widget class="QCheckBox" name="preventMerchantEquippingCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Merchant equipping fix</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="trainersTrainingSkillsBasedOnBaseSkillCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Trainers choose their training skills based on their base skill points</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Miscellaneous">
-      <attribute name="title">
-       <string>Miscellaneous</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
-       <item>
-        <widget class="QGroupBox" name="savesGroup">
-         <property name="title">
-          <string>Saves</string>
-         </property>
-         <layout class="QVBoxLayout" name="savesGroupVerticalLayout">
-          <item>
-           <widget class="QCheckBox" name="timePlayedCheckbox">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Add &quot;Time Played&quot; to saves</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="maximumQuicksavesLayout">
-            <item>
-             <widget class="QLabel" name="maximumQuicksavesLabel">
-              <property name="text">
-               <string>Maximum Quicksaves</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="maximumQuicksavesComboBox">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="otherGroup">
-         <property name="title">
-          <string>Other</string>
-         </property>
-         <layout class="QVBoxLayout" name="otherGroupVerticalLayout">
-          <item>
-           <layout class="QHBoxLayout" name="screenshotFormatLayout">
-            <item>
-             <widget class="QLabel" name="screenshotFormatLabel">
-              <property name="text">
-               <string>Screenshot Format</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="screenshotFormatComboBox">
-              <item>
-               <property name="text">
-                <string>JPG</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>PNG</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>TGA</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="notifyOnSavedScreenshotCheckBox">
-            <property name="text">
-             <string>Notify on saved screenshot</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Testing">
-      <attribute name="title">
-       <string>Testing</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <widget class="QLabel" name="testingLabel">
-         <property name="text">
-          <string>These settings are intended for testing mods and will cause issues if used for normal gameplay.</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="Line" name="testingLine">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="grabCursorCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Grab cursor</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="skipMenuCheckBox">
-         <property name="text">
-          <string>Skip menu and generate default character</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="startDefaultCharacterAtHorizontalLayout">
-         <item>
-          <spacer name="startDefaultCharacterAtHorizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="startDefaultCharacterAtLabel">
-           <property name="text">
-            <string>Start default character at</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="startDefaultCharacterAtField">
-           <property name="placeholderText">
-            <string>default cell</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Run script after startup:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="runScriptAfterStartupHorizontalLayout">
-         <item>
-          <widget class="QLineEdit" name="runScriptAfterStartupField"/>
-         </item>
-         <item>
-          <widget class="QPushButton" name="runScriptAfterStartupBrowseButton">
-           <property name="text">
-            <string>Browse…</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/files/windows/QWindowsVistaDark/checkbox-checked-disabled.svg b/files/windows/QWindowsVistaDark/checkbox-checked-disabled.svg
new file mode 100644
index 0000000000..2c630f0b8a
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/checkbox-checked-disabled.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<rect x="50" y="50" width="1200" height="1200" style="stroke:#7e7e7e;stroke-width:100;fill:#505050;" />
+<polyline points="250,700 500,950 1100,350" stroke="#7e7e7e" stroke-width="150" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/checkbox-checked.svg b/files/windows/QWindowsVistaDark/checkbox-checked.svg
new file mode 100644
index 0000000000..a9164e1c72
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/checkbox-checked.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<rect x="50" y="50" width="1200" height="1200" style="stroke:#7e7e7e;stroke-width:100;fill:none;" />
+<polyline points="250,700 500,950 1100,350" stroke="#7e7e7e" stroke-width="150" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/checkbox-empty-disabled.svg b/files/windows/QWindowsVistaDark/checkbox-empty-disabled.svg
new file mode 100644
index 0000000000..5e4660fd8a
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/checkbox-empty-disabled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<rect x="50" y="50" width="1200" height="1200" style="stroke:#7e7e7e;stroke-width:100;fill:#505050;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/checkbox-empty.svg b/files/windows/QWindowsVistaDark/checkbox-empty.svg
new file mode 100644
index 0000000000..43dd3887ce
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/checkbox-empty.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<rect x="50" y="50" width="1200" height="1200" style="stroke:#7e7e7e;stroke-width:100;fill:none;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/checkbox-half-disabled.svg b/files/windows/QWindowsVistaDark/checkbox-half-disabled.svg
new file mode 100644
index 0000000000..ade83d8df5
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/checkbox-half-disabled.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<rect x="50" y="50" width="1200" height="1200" style="stroke:#7e7e7e;stroke-width:100;fill:#505050;" />
+<rect x="350" y="350" width="600" height="600" style="stroke:#7e7e7e;stroke-width:100;fill:#7e7e7e;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/checkbox-half.svg b/files/windows/QWindowsVistaDark/checkbox-half.svg
new file mode 100644
index 0000000000..4f6aa9a032
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/checkbox-half.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<rect x="50" y="50" width="1200" height="1200" style="stroke:#7e7e7e;stroke-width:100;fill:none;" />
+<rect x="350" y="350" width="600" height="600" style="stroke:#7e7e7e;stroke-width:100;fill:#7e7e7e;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/dark.qrc b/files/windows/QWindowsVistaDark/dark.qrc
new file mode 100644
index 0000000000..0a96026acd
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/dark.qrc
@@ -0,0 +1,32 @@
+<RCC>
+	<qresource prefix="/dark">
+		<file>dark_win10.qss</file>
+		<file>dark_win11.qss</file>
+		<file>checkbox-checked.svg</file>
+		<file>checkbox-checked-disabled.svg</file>
+		<file>checkbox-empty.svg</file>
+		<file>checkbox-empty-disabled.svg</file>
+		<file>checkbox-half.svg</file>
+		<file>checkbox-half-disabled.svg</file>
+		<file>dockwidget-close.svg</file>
+		<file>dockwidget-undock.svg</file>
+		<file>down-triangle.svg</file>
+		<file>down-triangle-spinbox.svg</file>
+		<file>dropdown-arrow.svg</file>
+		<file>left-triangle-tabbar.svg</file>
+		<file>radiobutton-checked.svg</file>
+		<file>radiobutton-checked-disabled.svg</file> 
+		<file>radiobutton-empty.svg</file>
+		<file>radiobutton-empty-disabled.svg</file>
+		<file>right-triangle-tabbar.svg</file>
+		<file>scrollbar-arrow-down.svg</file>
+		<file>scrollbar-arrow-left.svg</file>
+		<file>scrollbar-arrow-right.svg</file>
+		<file>scrollbar-arrow-up.svg</file>
+		<file>size-grip.svg</file>
+		<file>table-header-sort-arrow-down.svg</file>
+		<file>table-header-sort-arrow-up.svg</file>
+		<file>up-triangle.svg</file>
+		<file>up-triangle-spinbox.svg</file>
+	</qresource>
+</RCC>
diff --git a/files/windows/QWindowsVistaDark/dark_win10.qss b/files/windows/QWindowsVistaDark/dark_win10.qss
new file mode 100644
index 0000000000..0028845131
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/dark_win10.qss
@@ -0,0 +1,632 @@
+QMenu
+{
+    border: 1px solid #4e4e4e;
+}
+QMenuBar
+{
+    background-color: #232323;
+    color: #dcdcdc;
+    border: 0px;
+}
+QMenu, QMessageBox
+{
+    background-color: #232323;
+    color: #dcdcdc;
+    border: 1px solid #4e4e4e;
+}
+QScrollArea
+{
+    border: 1px solid #4e4e4e;
+}
+QMenuBar::item
+{
+    background-color: #232323;
+    color: #dcdcdc;
+}
+QMenuBar
+{
+    border-color: #404040;
+}
+QMenuBar::item:hover, QMenuBar::item:selected, QMenu::item:hover, QMenu::item:selected
+{
+    background-color: #404040;
+    color: #dcdcdc;
+}
+QMenuBar::item:disabled, QMenu::item:disabled
+{
+    color: #919191;
+}
+QMenu::separator
+{
+    height: 1px;
+    background-color: #4e4e4e;
+    margin-left: 2px;
+    margin-right: 2px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+QToolTip, QColumnView, QListView, QTableView, QTableWidget, QTreeView
+{
+    background-color: #232323;
+    alternate-background-color: #282828;
+    border: 1px solid #4e4e4e;
+    selection-background-color: #505050;
+    gridline-color: #606060;
+}
+
+QHeaderView::section
+{
+    background-color: #232323;
+    border: 0px;
+    border-right: 1px solid #4e4e4e;
+}
+QHeaderView::section:hover, QHeaderView::section:checked
+{
+    background-color: #202020;
+}
+QHeaderView::down-arrow
+{
+    subcontrol-origin: content;
+    subcontrol-position: right;
+    image: url(:/dark/table-header-sort-arrow-down.svg);
+    width: 10px;
+    height: 7px;
+    background: transparent;
+    left: -5px;
+}
+QHeaderView::up-arrow
+{
+    subcontrol-origin: content;
+    subcontrol-position: right;
+    image: url(:/dark/table-header-sort-arrow-up.svg);
+    width: 10px;
+    height: 7px;
+    background: transparent;
+    left: -5px;
+}
+
+QTabWidget::pane
+{
+    border: 1px solid #4e4e4e;
+    top: -1px;
+}
+QTabBar
+{
+    outline: 0px;
+}
+QTabBar::tab
+{
+    background-color: #232323;
+    border-left: 1px solid #4e4e4e;
+    border-right: 1px solid #4e4e4e;
+    border-top: 1px solid #4e4e4e;
+    border-bottom: 1px solid #4e4e4e;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    padding-left: 9px;
+    padding-right: 10px;
+    margin-right: -1px;
+}
+QTabBar::tab:only-one
+{
+    margin-right: 0px;
+}
+QTabBar::tab:last
+{
+    margin-right: 0px;
+}
+QTabBar::tab:hover
+{
+    background-color: #404040;
+}
+QTabBar::tab:selected
+{
+    border-bottom: 0px;
+    background-color: #1e1e1e;
+    padding-bottom: 4px;
+}
+QTabBar::tab:!selected
+{
+    margin-top: 2px;
+}
+
+QProgressBar
+{
+    background-color: #1e1e1e;
+    border: 1px solid #4e4e4e;
+    color: #dfe1e2;
+    text-align: center;
+}
+QProgressBar:disabled
+{
+    background-color: #1e1e1e;
+    border: 1px solid #4e4e4e;
+    color: #788d9c;
+    text-align: center;
+}
+QProgressBar::chunk
+{
+    background-color: #0e651e;
+    color: #19232D;
+}
+QProgressBar::chunk:disabled
+{
+    background-color: #404040;
+    color: #788D9C;
+}
+
+QSizeGrip
+{
+    image: url(:/dark/size-grip.svg);
+}
+
+QDockWidget
+{
+    background-color: #232323;
+    titlebar-close-icon: url(:/dark/dockwidget-close.svg);
+    titlebar-normal-icon: url(:/dark/dockwidget-undock.svg);
+}
+QDockWidget::title
+{
+    background-color: #212121;
+}
+QDockWidget::float-button
+{
+    border: 0;
+}
+QDockWidget::close-button
+{
+    border: 0;
+}
+QDockWidget::float-button:hover
+{
+    background-color: #4e4e4e;
+}
+QDockWidget::float-button:pressed
+{
+    background-color: #5e5e5e;
+}
+QDockWidget::close-button:hover
+{
+    background-color: #4e4e4e;
+}
+QDockWidget::close-button:pressed
+{
+    background-color: #5e5e5e;
+}
+
+QPushButton
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    padding: 2px;
+}
+
+QToolButton[autoRaise="false"]
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    padding: 2px;
+}
+
+QWizard QPushButton
+{
+    min-width: 67px;
+}
+QDialogButtonBox QPushButton
+{
+    min-width: 67px;
+}
+QPushButton:hover, QToolButton:hover
+{
+    background-color: #404040;
+}
+QDialogButtonBox QPushButton:focus, QToolButton:focus
+{
+    border: 2px solid #7e7e7e;
+}
+QPushButton:pressed, QToolButton:pressed
+{
+    border: 1px solid #7e7e7e;
+}
+QPushButton:selected, QToolButton:selected
+{
+    border: 1px solid #7e7e7e;
+}
+QPushButton:disabled, QToolButton:disabled
+{
+    background-color: #313131;
+}
+
+/* the dropdownarrow on the right of the button in menu popup mode */
+QToolButton[popupMode="1"]
+{
+    padding-right: 19px;
+}
+QToolButton::menu-button
+{
+    border: 0px;
+    border-left: 1px solid #4e4e4e;
+    width: 18px;
+}
+QToolButton::menu-arrow
+{
+    image: url(:/dark/down-triangle.svg);
+    width: 14px;
+}
+
+QToolBar
+{
+    border: 0px;
+}
+QToolBar QToolButton
+{
+    border: 0px;
+    padding: 0px;
+    padding-left: 3px;
+    padding-right: 2px;
+    background-color: #1e1e1e;
+}
+QToolBar QToolButton:hover
+{
+    background-color: #404040;
+}
+QToolBar QToolButton:checked
+{
+    background-color: #505050;
+}
+QToolBar QToolButton:focus
+{
+    background-color: #404040;
+}
+QToolBar QToolButton:disabled
+{
+    background-color: #242424;
+}
+QToolBar::separator
+{
+    min-width: 0px;
+    width: 1px;
+    margin-left: 3px;
+    margin-right: 2px;
+    background-color: #4e4e4e;
+}
+
+QGroupBox
+{
+    border: 1px solid #4e4e4e;
+    margin-top: 9px;
+    padding-top: 7px;
+    padding-bottom: 0px;
+    padding-left: 1px;
+    padding-right: 1px;
+}
+QGroupBox::title
+{
+    subcontrol-origin: margin;
+    subcontrol-position: top left;
+    left: 9px;
+    padding-top: 1px;
+    min-width: 0px;
+}
+
+QLineEdit, QTextEdit, QPlainTextEdit
+{
+    border: 1px solid #4e4e4e;
+}
+QLineEdit:disabled, QTextEdit, QPlainTextEdit:disabled
+{
+    background-color: #313131;
+}
+
+QComboBox
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    margin: 0px;
+    padding-left: 3px;
+    padding-right: 3px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+}
+QComboBox:hover
+{
+    background-color: #404040;
+	border: 1px solid #4e4e4e;
+}
+QComboBox:disabled
+{
+    background-color: #313131;
+}
+QComboBox:selected
+{
+    background-color: #404040;
+}
+QComboBox:editable {
+    background-color: #232323;
+}
+QComboBox::drop-down
+{
+    border: 0px;
+}
+QComboBox::down-arrow
+{
+    image: url(:/dark/dropdown-arrow.svg);
+    height: 10px;
+    width: 15px;
+}
+QComboBox QAbstractItemView
+{
+    background-color: #232323;
+    selection-background-color: #404040;
+    border: 1px solid #4e4e4e;
+    padding: 0px;
+    margin: 0px;
+    outline: 0px;
+}
+QComboBox QAbstractItemView::item:selected
+{
+    color: #dcdcdc;
+    background-color: #404040;
+}
+QComboBox QAbstractItemView::item:last
+{
+    border: 0px;
+}
+
+QScrollBar:vertical
+{
+    border: 0px;
+    background: #2a2a2a;
+    width: 15px;
+    margin: 15px 0px;
+}
+QScrollBar::handle:vertical
+{
+    border: 0px;
+    background: #606060;
+    min-height: 20px;
+}
+QScrollBar::add-line:vertical
+{
+    border: 0px;
+    background: #232323;
+    height: 15px;
+    subcontrol-position: bottom;
+    subcontrol-origin: margin;
+}
+QScrollBar::sub-line:vertical
+{
+    border: 0px;
+    background: #232323;
+    height: 15px;
+    subcontrol-position: top;
+    subcontrol-origin: margin;
+}
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
+{
+    border: 0px;
+    background: none;
+}
+QScrollBar::up-arrow:vertical
+{
+    image: url(:/dark/scrollbar-arrow-up.svg);
+    height: 15px;
+}
+QScrollBar::down-arrow:vertical
+{
+    image: url(:/dark/scrollbar-arrow-down.svg);
+    height: 15px;
+}
+QScrollBar:horizontal
+{
+    border: 0px;
+    background: #2a2a2a;
+    height: 15px;
+    margin: 0px 15px;
+}
+QScrollBar::handle:horizontal
+{
+    border: 0px;
+    background: #606060;
+    min-width: 20px;
+}
+QScrollBar::add-line:horizontal
+{
+    border: 0px;
+    background: #232323;
+    width: 15px;
+    subcontrol-position: right;
+    subcontrol-origin: margin;
+}
+QScrollBar::sub-line:horizontal
+{
+    border: 0px;
+    background: #232323;
+    width: 15px;
+    subcontrol-position: left;
+    subcontrol-origin: margin;
+}
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal
+{
+    border: 0px;
+    background: none;
+}
+QScrollBar::left-arrow:horizontal
+{
+    image: url(:/dark/scrollbar-arrow-left.svg);
+    width: 15px;
+}
+QScrollBar::right-arrow:horizontal
+{
+    image: url(:/dark/scrollbar-arrow-right.svg);
+    width: 15px;
+}
+
+QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox
+{
+    border: 1px solid #4e4e4e;
+    padding-right: 15px;
+}
+QSpinBox:disabled, QDateEdit:disabled, QDateTimeEdit:disabled, QTimeEdit:disabled, QDoubleSpinBox:disabled
+{
+    background-color: #313131;
+}
+QSpinBox::up-button, QDateEdit::up-button, QDateTimeEdit::up-button, QTimeEdit::up-button, QDoubleSpinBox::up-button
+{
+    border: 1px solid #4e4e4e;
+    subcontrol-origin: margin;
+    subcontrol-position: top right;
+    width: 12px;
+	height: 6px;
+	margin: 2px 2px;
+}
+QSpinBox::down-button, QDateEdit::down-button, QDateTimeEdit::down-button, QTimeEdit::down-button, QDoubleSpinBox::down-button
+{
+    border: 1px solid #4e4e4e;
+    subcontrol-origin: margin;
+    subcontrol-position: bottom right;
+    width: 12px;
+	height: 6px;
+	margin: 2px 2px;
+}
+QSpinBox::up-button:hover, QDateEdit::up-button:hover, QDateTimeEdit::up-button:hover, QTimeEdit::up-button:hover, QDoubleSpinBox::up-button:hover
+{
+    background-color: #404040;
+}
+QSpinBox::down-button:hover, QDateEdit::down-button:hover, QDateTimeEdit::down-button:hover, QTimeEdit::down-button:hover, QDoubleSpinBox::down-button:hover
+{
+    background-color: #404040;
+}
+QSpinBox::up-arrow, QDateEdit::up-arrow, QDateTimeEdit::up-arrow, QTimeEdit::up-arrow, QDoubleSpinBox::up-arrow
+{
+    image: url(:/dark/up-triangle-spinbox.svg);
+    width: 10px;
+    height: 5px;
+}
+QSpinBox::down-arrow, QDateEdit::down-arrow, QDateTimeEdit::down-arrow, QTimeEdit::down-arrow, QDoubleSpinBox::down-arrow
+{
+    image: url(:/dark/down-triangle-spinbox.svg);
+    width: 10px;
+    height: 5px;
+}
+
+QSlider::handle
+{
+    background-color: #dcdcdc;
+}
+QSlider::handle:disabled
+{
+    background-color: #4e4e4e;
+}
+
+QCheckBox
+{
+    padding: 2px 0px;
+}
+QCheckBox::indicator
+{
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    width: 13px;
+    height: 13px;
+}
+QCheckBox::indicator:unchecked, QObject::indicator:unchecked
+{
+    image: url(:/dark/checkbox-empty.svg);
+}
+QCheckBox::indicator:unchecked:disabled, QObject::indicator:unchecked:disabled
+{
+    image: url(:/dark/checkbox-empty-disabled.svg);
+}
+QCheckBox::indicator:checked, QObject::indicator:checked
+{
+    image: url(:/dark/checkbox-checked.svg);
+}
+QCheckBox::indicator:hover, QObject::indicator:hover
+{
+    background-color: #404040;
+}
+QCheckBox::indicator:checked:disabled, QObject::indicator:checked:disabled
+{
+    image: url(:/dark/checkbox-checked-disabled.svg);
+}
+QCheckBox::indicator:indeterminate, QObject::indicator:indeterminate
+{
+    image: url(:/dark/checkbox-half.svg);
+}
+QCheckBox::indicator:indeterminate:disabled, QObject::indicator:indeterminate:disabled
+{
+    image: url(:/dark/checkbox-half-disabled.svg);
+}
+
+QRadioButton
+{
+    padding: 2px 0px;
+}
+QRadioButton::indicator
+{
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    width: 13px;
+    height: 13px;
+}
+QRadioButton::indicator:hover
+{
+    background-color: qradialgradient(cx:0.5, cy:0.5, radius: 0.5,
+                fx:0.5, fy:0.5, stop:0 #404040, stop:1 transparent);
+}
+QRadioButton::indicator:unchecked
+{
+    image: url(:/dark/radiobutton-empty.svg);
+}
+QRadioButton::indicator:unchecked:disabled
+{
+    image: url(:/dark/radiobutton-empty-disabled.svg);
+}
+QRadioButton::indicator:checked
+{
+    image: url(:/dark/radiobutton-checked.svg);
+}
+QRadioButton::indicator:checked:disabled
+{
+    image: url(:/dark/radiobutton-checked-disabled.svg);
+}
+
+QListView::indicator:unchecked
+{
+    image: url(:/dark/checkbox-empty.svg);
+}
+QListView::indicator:checked
+{
+    image: url(:/dark/checkbox-checked.svg);
+}
+QListView::indicator:indeterminate
+{
+    image: url(:/dark/checkbox-half.svg);
+}
+
+QTabBar QToolButton
+{
+    background-color: #232323;
+    min-width: 0px;
+}
+QTabBar QToolButton::left-arrow
+{
+    image: url(:/dark/left-triangle-tabbar.svg);
+}
+QTabBar QToolButton::right-arrow
+{
+    image: url(:/dark/right-triangle-tabbar.svg);
+}
+QTableCornerButton::section
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    border-top: 0px;
+    border-left: 0px;
+    border-bottom: 0px;
+}
diff --git a/files/windows/QWindowsVistaDark/dark_win11.qss b/files/windows/QWindowsVistaDark/dark_win11.qss
new file mode 100644
index 0000000000..19fb1581d6
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/dark_win11.qss
@@ -0,0 +1,643 @@
+QMenu
+{
+    border: 1px solid #4e4e4e;
+}
+QMenuBar
+{
+    background-color: #232323;
+    color: #dcdcdc;
+    border: 0px;
+}
+QMenu, QMessageBox
+{
+    background-color: #232323;
+    color: #dcdcdc;
+    border: 1px solid #4e4e4e;
+}
+QScrollArea
+{
+    border: 1px solid #4e4e4e;
+}
+QMenuBar::item
+{
+    background-color: #232323;
+    color: #dcdcdc;
+}
+QMenuBar
+{
+    border-color: #404040;
+}
+QMenuBar::item:hover, QMenuBar::item:selected, QMenu::item:hover, QMenu::item:selected
+{
+    background-color: #404040;
+    color: #dcdcdc;
+}
+QMenuBar::item:disabled, QMenu::item:disabled
+{
+    color: #919191;
+}
+QMenu::separator
+{
+    height: 1px;
+    background-color: #4e4e4e;
+    margin-left: 2px;
+    margin-right: 2px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+QToolTip, QColumnView, QListView, QTableView, QTableWidget, QTreeView
+{
+    background-color: #232323;
+    alternate-background-color: #282828;
+    border: 1px solid #4e4e4e;
+    selection-background-color: #505050;
+    gridline-color: #606060;
+}
+
+QHeaderView::section
+{
+    background-color: #232323;
+    border: 0px;
+    border-right: 1px solid #4e4e4e;
+}
+QHeaderView::section:hover, QHeaderView::section:checked
+{
+    background-color: #202020;
+}
+QHeaderView::down-arrow
+{
+    subcontrol-origin: content;
+    subcontrol-position: right;
+    image: url(:/dark/table-header-sort-arrow-down.svg);
+    width: 10px;
+    height: 7px;
+    background: transparent;
+    left: -5px;
+}
+QHeaderView::up-arrow
+{
+    subcontrol-origin: content;
+    subcontrol-position: right;
+    image: url(:/dark/table-header-sort-arrow-up.svg);
+    width: 10px;
+    height: 7px;
+    background: transparent;
+    left: -5px;
+}
+
+QTabWidget::pane
+{
+    border: 1px solid #4e4e4e;
+    top: -1px;
+}
+QTabBar
+{
+    outline: 0px;
+}
+QTabBar::tab
+{
+    background-color: #232323;
+    border-left: 1px solid #4e4e4e;
+    border-right: 1px solid #4e4e4e;
+    border-top: 1px solid #4e4e4e;
+    border-bottom: 1px solid #4e4e4e;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    padding-left: 9px;
+    padding-right: 10px;
+    margin-right: -1px;
+    border-top-right-radius: 2px;
+    border-top-left-radius: 2px;
+}
+QTabBar::tab:only-one
+{
+    margin-right: 0px;
+}
+QTabBar::tab:last
+{
+    margin-right: 0px;
+}
+QTabBar::tab:hover
+{
+    background-color: #404040;
+}
+QTabBar::tab:selected
+{
+    border-bottom: 0px;
+    background-color: #1e1e1e;
+    padding-bottom: 4px;
+}
+QTabBar::tab:!selected
+{
+    margin-top: 2px;
+}
+
+QProgressBar
+{
+    background-color: #1e1e1e;
+    border: 1px solid #4e4e4e;
+    color: #dfe1e2;
+    text-align: center;
+}
+QProgressBar:disabled
+{
+    background-color: #1e1e1e;
+    border: 1px solid #4e4e4e;
+    color: #788d9c;
+    text-align: center;
+}
+QProgressBar::chunk
+{
+    background-color: #0e651e;
+    color: #19232D;
+}
+QProgressBar::chunk:disabled
+{
+    background-color: #404040;
+    color: #788D9C;
+}
+
+QSizeGrip
+{
+    image: url(:/dark/size-grip.svg);
+}
+
+QDockWidget
+{
+    background-color: #232323;
+    titlebar-close-icon: url(:/dark/dockwidget-close.svg);
+    titlebar-normal-icon: url(:/dark/dockwidget-undock.svg);
+}
+QDockWidget::title
+{
+    background-color: #212121;
+}
+QDockWidget::float-button
+{
+    border: 0;
+}
+QDockWidget::close-button
+{
+    border: 0;
+}
+QDockWidget::float-button:hover
+{
+    background-color: #4e4e4e;
+}
+QDockWidget::float-button:pressed
+{
+    background-color: #5e5e5e;
+}
+QDockWidget::close-button:hover
+{
+    background-color: #4e4e4e;
+}
+QDockWidget::close-button:pressed
+{
+    background-color: #5e5e5e;
+}
+
+QPushButton
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    padding: 2px;
+    border-radius: 5px;
+}
+
+QToolButton
+{
+    border-radius: 2px;
+}
+
+QToolButton[autoRaise="false"]
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    padding: 2px;
+}
+
+QWizard QPushButton
+{
+    min-width: 67px;
+}
+QDialogButtonBox QPushButton
+{
+    min-width: 67px;
+}
+QPushButton:hover, QToolButton:hover
+{
+    background-color: #404040;
+}
+QDialogButtonBox QPushButton:focus, QToolButton:focus
+{
+    border: 1px solid #7e7e7e;
+}
+QPushButton:pressed, QToolButton:pressed
+{
+    border: 1px solid #7e7e7e;
+}
+QPushButton:selected, QToolButton:selected
+{
+    border: 1px solid #7e7e7e;
+}
+QPushButton:disabled, QToolButton:disabled
+{
+    background-color: #313131;
+}
+
+/* the dropdownarrow on the right of the button in menu popup mode */
+QToolButton[popupMode="1"]
+{
+    padding-right: 19px;
+}
+QToolButton::menu-button
+{
+    border: 0px;
+    border-left: 1px solid #4e4e4e;
+    width: 18px;
+}
+QToolButton::menu-arrow
+{
+    image: url(:/dark/down-triangle.svg);
+    width: 14px;
+}
+
+QToolBar
+{
+    border: 0px;
+}
+QToolBar QToolButton
+{
+    border: 0px;
+    padding: 0px;
+    padding-left: 3px;
+    padding-right: 2px;
+    background-color: #1e1e1e;
+}
+QToolBar QToolButton:hover
+{
+    background-color: #404040;
+}
+QToolBar QToolButton:checked
+{
+    background-color: #505050;
+}
+QToolBar QToolButton:focus
+{
+    background-color: #404040;
+}
+QToolBar QToolButton:disabled
+{
+    background-color: #242424;
+}
+QToolBar::separator
+{
+    min-width: 0px;
+    width: 1px;
+    margin-left: 3px;
+    margin-right: 2px;
+    background-color: #4e4e4e;
+}
+
+QGroupBox
+{
+    border: 1px solid #4e4e4e;
+    margin-top: 9px;
+    padding-top: 7px;
+    padding-bottom: 0px;
+    padding-left: 1px;
+    padding-right: 1px;
+}
+QGroupBox::title
+{
+    subcontrol-origin: margin;
+    subcontrol-position: top left;
+    left: 9px;
+    padding-top: 1px;
+    min-width: 0px;
+}
+
+QLineEdit, QTextEdit, QPlainTextEdit
+{
+    border: 1px solid #4e4e4e;
+    border-radius: 2px;
+}
+QLineEdit:disabled, QTextEdit, QPlainTextEdit:disabled
+{
+    background-color: #313131;
+}
+
+QComboBox
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    margin: 0px;
+    padding-left: 3px;
+    padding-right: 3px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+    border-radius: 2px;
+}
+QComboBox:hover
+{
+    background-color: #404040;
+	border: 1px solid #4e4e4e;
+}
+QComboBox:disabled
+{
+    background-color: #313131;
+}
+QComboBox:selected
+{
+    background-color: #404040;
+}
+QComboBox:editable {
+    background-color: #232323;
+}
+QComboBox::drop-down
+{
+    border: 0px;
+}
+QComboBox::down-arrow
+{
+    image: url(:/dark/dropdown-arrow.svg);
+    height: 10px;
+    width: 15px;
+}
+QComboBox QAbstractItemView
+{
+    background-color: #232323;
+    selection-background-color: #404040;
+    border: 1px solid #4e4e4e;
+    padding: 0px;
+    margin: 0px;
+    outline: 0px;
+}
+QComboBox QAbstractItemView::item:selected
+{
+    color: #dcdcdc;
+    background-color: #404040;
+}
+QComboBox QAbstractItemView::item:last
+{
+    border: 0px;
+}
+
+QScrollBar:vertical
+{
+    border: 0px;
+    background: #2a2a2a;
+    width: 15px;
+    margin: 15px 0px;
+}
+QScrollBar::handle:vertical
+{
+    border: 0px;
+    background: #606060;
+    min-height: 20px;
+}
+QScrollBar::add-line:vertical
+{
+    border: 0px;
+    background: #232323;
+    height: 15px;
+    subcontrol-position: bottom;
+    subcontrol-origin: margin;
+}
+QScrollBar::sub-line:vertical
+{
+    border: 0px;
+    background: #232323;
+    height: 15px;
+    subcontrol-position: top;
+    subcontrol-origin: margin;
+}
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
+{
+    border: 0px;
+    background: none;
+}
+QScrollBar::up-arrow:vertical
+{
+    image: url(:/dark/scrollbar-arrow-up.svg);
+    height: 15px;
+}
+QScrollBar::down-arrow:vertical
+{
+    image: url(:/dark/scrollbar-arrow-down.svg);
+    height: 15px;
+}
+QScrollBar:horizontal
+{
+    border: 0px;
+    background: #2a2a2a;
+    height: 15px;
+    margin: 0px 15px;
+}
+QScrollBar::handle:horizontal
+{
+    border: 0px;
+    background: #606060;
+    min-width: 20px;
+}
+QScrollBar::add-line:horizontal
+{
+    border: 0px;
+    background: #232323;
+    width: 15px;
+    subcontrol-position: right;
+    subcontrol-origin: margin;
+}
+QScrollBar::sub-line:horizontal
+{
+    border: 0px;
+    background: #232323;
+    width: 15px;
+    subcontrol-position: left;
+    subcontrol-origin: margin;
+}
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal
+{
+    border: 0px;
+    background: none;
+}
+QScrollBar::left-arrow:horizontal
+{
+    image: url(:/dark/scrollbar-arrow-left.svg);
+    width: 15px;
+}
+QScrollBar::right-arrow:horizontal
+{
+    image: url(:/dark/scrollbar-arrow-right.svg);
+    width: 15px;
+}
+
+QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox
+{
+    border: 1px solid #4e4e4e;
+    border-radius: 2px;
+    padding-right: 15px;
+}
+QSpinBox:disabled, QDateEdit:disabled, QDateTimeEdit:disabled, QTimeEdit:disabled, QDoubleSpinBox:disabled
+{
+    background-color: #313131;
+}
+QSpinBox::up-button, QDateEdit::up-button, QDateTimeEdit::up-button, QTimeEdit::up-button, QDoubleSpinBox::up-button
+{
+    border: 1px solid #4e4e4e;
+    subcontrol-origin: margin;
+    subcontrol-position: top right;
+    width: 12px;
+    height: 6px;
+    margin: 2px 2px;
+}
+QSpinBox::down-button, QDateEdit::down-button, QDateTimeEdit::down-button, QTimeEdit::down-button, QDoubleSpinBox::down-button
+{
+    border: 1px solid #4e4e4e;
+    subcontrol-origin: margin;
+    subcontrol-position: bottom right;
+    width: 12px;
+    height: 6px;
+    margin: 2px 2px;
+}
+QSpinBox::up-button:hover, QDateEdit::up-button:hover, QDateTimeEdit::up-button:hover, QTimeEdit::up-button:hover, QDoubleSpinBox::up-button:hover
+{
+    background-color: #404040;
+}
+QSpinBox::down-button:hover, QDateEdit::down-button:hover, QDateTimeEdit::down-button:hover, QTimeEdit::down-button:hover, QDoubleSpinBox::down-button:hover
+{
+    background-color: #404040;
+}
+QSpinBox::up-arrow, QDateEdit::up-arrow, QDateTimeEdit::up-arrow, QTimeEdit::up-arrow, QDoubleSpinBox::up-arrow
+{
+    image: url(:/dark/up-triangle-spinbox.svg);
+    width: 10px;
+    height: 5px;
+}
+QSpinBox::down-arrow, QDateEdit::down-arrow, QDateTimeEdit::down-arrow, QTimeEdit::down-arrow, QDoubleSpinBox::down-arrow
+{
+    image: url(:/dark/down-triangle-spinbox.svg);
+    width: 10px;
+    height: 5px;
+}
+
+QSlider::handle
+{
+    background-color: #dcdcdc;
+}
+QSlider::handle:disabled
+{
+    background-color: #4e4e4e;
+}
+
+QCheckBox
+{
+    padding: 2px 0px;
+}
+QCheckBox::indicator
+{
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    width: 13px;
+    height: 13px;
+}
+QCheckBox::indicator:unchecked, QObject::indicator:unchecked
+{
+    image: url(:/dark/checkbox-empty.svg);
+}
+QCheckBox::indicator:unchecked:disabled, QObject::indicator:unchecked:disabled
+{
+    image: url(:/dark/checkbox-empty-disabled.svg);
+}
+QCheckBox::indicator:checked, QObject::indicator:checked
+{
+    image: url(:/dark/checkbox-checked.svg);
+}
+QCheckBox::indicator:hover, QObject::indicator:hover
+{
+    background-color: #404040;
+}
+QCheckBox::indicator:checked:disabled, QObject::indicator:checked:disabled
+{
+    image: url(:/dark/checkbox-checked-disabled.svg);
+}
+QCheckBox::indicator:indeterminate, QObject::indicator:indeterminate
+{
+    image: url(:/dark/checkbox-half.svg);
+}
+QCheckBox::indicator:indeterminate:disabled, QObject::indicator:indeterminate:disabled
+{
+    image: url(:/dark/checkbox-half-disabled.svg);
+}
+
+QRadioButton
+{
+    padding: 2px 0px;
+}
+QRadioButton::indicator
+{
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    width: 13px;
+    height: 13px;
+}
+QRadioButton::indicator:hover
+{
+    background-color: qradialgradient(cx:0.5, cy:0.5, radius: 0.5,
+                fx:0.5, fy:0.5, stop:0 #404040, stop:1 transparent);
+}
+QRadioButton::indicator:unchecked
+{
+    image: url(:/dark/radiobutton-empty.svg);
+}
+QRadioButton::indicator:unchecked:disabled
+{
+    image: url(:/dark/radiobutton-empty-disabled.svg);
+}
+QRadioButton::indicator:checked
+{
+    image: url(:/dark/radiobutton-checked.svg);
+}
+QRadioButton::indicator:checked:disabled
+{
+    image: url(:/dark/radiobutton-checked-disabled.svg);
+}
+
+QListView::indicator:unchecked
+{
+    image: url(:/dark/checkbox-empty.svg);
+}
+QListView::indicator:checked
+{
+    image: url(:/dark/checkbox-checked.svg);
+}
+QListView::indicator:indeterminate
+{
+    image: url(:/dark/checkbox-half.svg);
+}
+
+QTabBar QToolButton
+{
+    background-color: #232323;
+    min-width: 0px;
+}
+QTabBar QToolButton::left-arrow
+{
+    image: url(:/dark/left-triangle-tabbar.svg);
+}
+QTabBar QToolButton::right-arrow
+{
+    image: url(:/dark/right-triangle-tabbar.svg);
+}
+QTableCornerButton::section
+{
+    background-color: #232323;
+    border: 1px solid #4e4e4e;
+    border-top: 0px;
+    border-left: 0px;
+    border-bottom: 0px;
+}
diff --git a/files/windows/QWindowsVistaDark/dockwidget-close.svg b/files/windows/QWindowsVistaDark/dockwidget-close.svg
new file mode 100644
index 0000000000..a58a58caa9
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/dockwidget-close.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<line x1="100" y1="100" x2="1200" y2="1200" stroke="#7e7e7e" stroke-width="100" />
+<line x1="100" y1="1200" x2="1200" y2="100" stroke="#7e7e7e" stroke-width="100" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/dockwidget-undock.svg b/files/windows/QWindowsVistaDark/dockwidget-undock.svg
new file mode 100644
index 0000000000..a3d7563030
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/dockwidget-undock.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1300" height="1300" viewBox="0 0 1300 1300" xmlns="http://www.w3.org/2000/svg">
+<rect x="50" y="350" width="900" height="900" style="stroke:#7e7e7e;stroke-width:100;fill:none;" />
+<polyline points="350,350 350,50 1250,50 1250,950 950,950" stroke="#7e7e7e" stroke-width="100" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/down-triangle-spinbox.svg b/files/windows/QWindowsVistaDark/down-triangle-spinbox.svg
new file mode 100644
index 0000000000..4c33227289
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/down-triangle-spinbox.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="40" viewBox="0 0 100 40" xmlns="http://www.w3.org/2000/svg">
+<polyline points="20,5 50,35 80,5" fill="#cfcfcf" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/down-triangle.svg b/files/windows/QWindowsVistaDark/down-triangle.svg
new file mode 100644
index 0000000000..33227a8385
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/down-triangle.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="20,40 50,70 80,40" fill="#cfcfcf" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/dropdown-arrow.svg b/files/windows/QWindowsVistaDark/dropdown-arrow.svg
new file mode 100644
index 0000000000..7462030402
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/dropdown-arrow.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="20,50 50,80 80,50" stroke="#cfcfcf" stroke-width="15" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/left-triangle-tabbar.svg b/files/windows/QWindowsVistaDark/left-triangle-tabbar.svg
new file mode 100644
index 0000000000..01b2c6ad35
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/left-triangle-tabbar.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="40" height="100" viewBox="0 0 40 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="35,20 5,50 35,80" fill="#cfcfcf" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/radiobutton-checked-disabled.svg b/files/windows/QWindowsVistaDark/radiobutton-checked-disabled.svg
new file mode 100644
index 0000000000..7cef56e7c8
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/radiobutton-checked-disabled.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1000" height="1000" viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg">
+<circle cx="500" cy="500" r="450" style="stroke:#7e7e7e;stroke-width:100;fill:#505050;" />
+<circle cx="500" cy="500" r="250" style="fill:#7e7e7e;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/radiobutton-checked.svg b/files/windows/QWindowsVistaDark/radiobutton-checked.svg
new file mode 100644
index 0000000000..3f1a655397
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/radiobutton-checked.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1000" height="1000" viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg">
+<circle cx="500" cy="500" r="450" style="stroke:#7e7e7e;stroke-width:100;fill:none;" />
+<circle cx="500" cy="500" r="250" style="fill:#7e7e7e;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/radiobutton-empty-disabled.svg b/files/windows/QWindowsVistaDark/radiobutton-empty-disabled.svg
new file mode 100644
index 0000000000..693e47d72d
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/radiobutton-empty-disabled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1000" height="1000" viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg">
+<circle cx="500" cy="500" r="450" style="stroke:#7e7e7e;stroke-width:100;fill:#505050;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/radiobutton-empty.svg b/files/windows/QWindowsVistaDark/radiobutton-empty.svg
new file mode 100644
index 0000000000..11bfe01b83
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/radiobutton-empty.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1000" height="1000" viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg">
+<circle cx="500" cy="500" r="450" style="stroke:#7e7e7e;stroke-width:100;fill:none;" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/right-triangle-tabbar.svg b/files/windows/QWindowsVistaDark/right-triangle-tabbar.svg
new file mode 100644
index 0000000000..8829c91647
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/right-triangle-tabbar.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="40" height="100" viewBox="0 0 40 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="5,20 35,50 5,80" fill="#cfcfcf" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/scrollbar-arrow-down.svg b/files/windows/QWindowsVistaDark/scrollbar-arrow-down.svg
new file mode 100644
index 0000000000..af3da3e57d
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/scrollbar-arrow-down.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="25,35 50,60 75,35" stroke="#cfcfcf" stroke-width="15" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/scrollbar-arrow-left.svg b/files/windows/QWindowsVistaDark/scrollbar-arrow-left.svg
new file mode 100644
index 0000000000..fe7fb8849b
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/scrollbar-arrow-left.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="65,25 40,50 65,75" stroke="#cfcfcf" stroke-width="15" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/scrollbar-arrow-right.svg b/files/windows/QWindowsVistaDark/scrollbar-arrow-right.svg
new file mode 100644
index 0000000000..4a8ea9739b
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/scrollbar-arrow-right.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="35,25 60,50 35,75" stroke="#cfcfcf" stroke-width="15" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/scrollbar-arrow-up.svg b/files/windows/QWindowsVistaDark/scrollbar-arrow-up.svg
new file mode 100644
index 0000000000..119ff9de25
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/scrollbar-arrow-up.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="25,65 50,40 75,65" stroke="#cfcfcf" stroke-width="15" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/size-grip.svg b/files/windows/QWindowsVistaDark/size-grip.svg
new file mode 100644
index 0000000000..9c530e4b61
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/size-grip.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="size-grip"
+     transform="translate(-16,2)">
+    <rect
+       style="fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0466667"
+       id="rect1"
+       width="2"
+       height="2"
+       x="27"
+       y="10" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect1"
+       id="use1"
+       transform="translate(-3)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect1"
+       id="use2"
+       transform="translate(-6)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect1"
+       id="use3"
+       transform="translate(0,-3)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect1"
+       id="use4"
+       transform="translate(-3,-3)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect1"
+       id="use5"
+       transform="translate(0,-6)" />
+  </g>
+</svg>
diff --git a/files/windows/QWindowsVistaDark/table-header-sort-arrow-down.svg b/files/windows/QWindowsVistaDark/table-header-sort-arrow-down.svg
new file mode 100644
index 0000000000..f9eab3ee41
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/table-header-sort-arrow-down.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="60" height="50" viewBox="0 0 60 50" xmlns="http://www.w3.org/2000/svg">
+<polyline points="5,10 30,35 55,10" stroke="#cfcfcf" stroke-width="10" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/table-header-sort-arrow-up.svg b/files/windows/QWindowsVistaDark/table-header-sort-arrow-up.svg
new file mode 100644
index 0000000000..ed4a4822af
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/table-header-sort-arrow-up.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="60" height="50" viewBox="0 0 60 50" xmlns="http://www.w3.org/2000/svg">
+<polyline points="5,35 30,10 55,35" stroke="#dcdcdc" stroke-width="10" fill="none" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/up-triangle-spinbox.svg b/files/windows/QWindowsVistaDark/up-triangle-spinbox.svg
new file mode 100644
index 0000000000..4dc1312209
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/up-triangle-spinbox.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="40" viewBox="0 0 100 40" xmlns="http://www.w3.org/2000/svg">
+<polyline points="20,35 50,5 80,35" fill="#dcdcdc" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/QWindowsVistaDark/up-triangle.svg b/files/windows/QWindowsVistaDark/up-triangle.svg
new file mode 100644
index 0000000000..d8be2c7d92
--- /dev/null
+++ b/files/windows/QWindowsVistaDark/up-triangle.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<polyline points="20,60 50,30 80,60" fill="#dcdcdc" />
+</svg>
\ No newline at end of file
diff --git a/files/windows/openmw-cs.exe.manifest b/files/windows/openmw-cs.exe.manifest
new file mode 100644
index 0000000000..3107f64706
--- /dev/null
+++ b/files/windows/openmw-cs.exe.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
\ No newline at end of file
diff --git a/files/wizard/icons/dollar.svg b/files/wizard/icons/dollar.svg
new file mode 100644
index 0000000000..60c5a4b23c
--- /dev/null
+++ b/files/wizard/icons/dollar.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg
+   height="48"
+   width="48"
+   version="1.1"
+   id="Capa_1"
+   viewBox="0 0 30.72 30.72"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs11" />
+<g
+   id="g11"
+   transform="matrix(0.06,0,0,0.06222222,0,-0.56888864)">
+	<g
+   id="g1">
+		<path
+   style="fill:#74d24f"
+   d="M 496,112 H 16 c -8.82,0 -16,7.18 -16,16 v 256 c 0,8.82 7.18,16 16,16 h 480 c 8.82,0 16,-7.18 16,-16 V 128 c 0,-8.82 -7.18,-16 -16,-16 z"
+   id="path1" />
+	</g>
+	<g
+   id="g2">
+		<path
+   style="fill:#ffefbc"
+   d="m 472,192 c -22.055,0 -40,-17.945 -40,-40 0,-4.422 -3.578,-8 -8,-8 H 88 c -4.422,0 -8,3.578 -8,8 0,22.055 -17.945,40 -40,40 -4.422,0 -8,3.578 -8,8 v 112 c 0,4.422 3.578,8 8,8 22.055,0 40,17.945 40,40 0,4.422 3.578,8 8,8 h 336 c 4.422,0 8,-3.578 8,-8 0,-22.055 17.945,-40 40,-40 4.422,0 8,-3.578 8,-8 V 200 c 0,-4.422 -3.578,-8 -8,-8 z"
+   id="path2" />
+	</g>
+	<g
+   id="g3">
+		<path
+   style="fill:#869b55"
+   d="m 128,256 c 0,48.221 26.691,90.175 66.081,112 H 317.92 C 357.309,346.175 384,304.221 384,256 384,207.779 357.309,165.825 317.919,144 H 194.08 C 154.691,165.825 128,207.779 128,256 Z"
+   id="path3" />
+	</g>
+	<g
+   id="g4">
+		<path
+   style="fill:#ffefbc"
+   d="m 256,244 c -16.023,0 -28,-8.445 -28,-16 0,-7.555 11.977,-16 28,-16 16.023,0 28,8.445 28,16 0,6.625 5.375,12 12,12 6.625,0 12,-5.375 12,-12 0,-19.236 -16.824,-34.862 -40,-38.932 V 184 c 0,-6.625 -5.375,-12 -12,-12 -6.625,0 -12,5.375 -12,12 v 5.068 c -23.176,4.07 -40,19.695 -40,38.932 0,22.43 22.844,40 52,40 16.023,0 28,8.445 28,16 0,7.555 -11.977,16 -28,16 -16.023,0 -28,-8.445 -28,-16 0,-6.625 -5.375,-12 -12,-12 -6.625,0 -12,5.375 -12,12 0,19.236 16.824,34.862 40,38.932 V 328 c 0,6.625 5.375,12 12,12 6.625,0 12,-5.375 12,-12 v -5.068 c 23.176,-4.07 40,-19.695 40,-38.932 0,-22.43 -22.844,-40 -52,-40 z"
+   id="path4" />
+	</g>
+	<g
+   id="g5">
+		<circle
+   style="fill:#74d24f"
+   cx="80"
+   cy="256"
+   r="24"
+   id="circle4" />
+	</g>
+	<g
+   id="g6">
+		<circle
+   style="fill:#74d24f"
+   cx="432"
+   cy="256"
+   r="24"
+   id="circle5" />
+	</g>
+	<g
+   id="g7">
+		<circle
+   style="fill:#869b55"
+   cx="40"
+   cy="152"
+   r="16"
+   id="circle6" />
+	</g>
+	<g
+   id="g8">
+		<circle
+   style="fill:#869b55"
+   cx="472"
+   cy="152"
+   r="16"
+   id="circle7" />
+	</g>
+	<g
+   id="g9">
+		<circle
+   style="fill:#869b55"
+   cx="40"
+   cy="360"
+   r="16"
+   id="circle8" />
+	</g>
+	<g
+   id="g10">
+		<circle
+   style="fill:#869b55"
+   cx="472"
+   cy="360"
+   r="16"
+   id="circle9" />
+	</g>
+</g>
+</svg>
diff --git a/files/wizard/icons/folder.svg b/files/wizard/icons/folder.svg
new file mode 100644
index 0000000000..a976bad226
--- /dev/null
+++ b/files/wizard/icons/folder.svg
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   id="svg97"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9766">
+      <stop
+         style="stop-color:#6194cb;stop-opacity:1;"
+         offset="0"
+         id="stop9768" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop9770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3096">
+      <stop
+         id="stop3098"
+         offset="0"
+         style="stop-color:#424242;stop-opacity:1;" />
+      <stop
+         id="stop3100"
+         offset="1.0000000"
+         style="stop-color:#777777;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1789">
+      <stop
+         style="stop-color:#202020;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop1790" />
+      <stop
+         style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop1791" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3983">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.87628865;"
+         offset="0.0000000"
+         id="stop3984" />
+      <stop
+         style="stop-color:#fffffe;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop3985" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       xlink:href="#linearGradient1789"
+       id="radialGradient238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.055022,-0.02734504,0.177703,1.190929,-3.572177,-7.125301)"
+       cx="20.706017"
+       cy="37.517986"
+       fx="20.706017"
+       fy="37.517986"
+       r="30.905205" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="6.1802502"
+       x2="15.514889"
+       y1="31.36775"
+       x1="18.112709"
+       id="linearGradient3104"
+       xlink:href="#linearGradient3096" />
+    <linearGradient
+       xlink:href="#linearGradient3983"
+       id="linearGradient491"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.516844,0,0,0.708978,-0.879573,-1.318166)"
+       x1="6.2297964"
+       y1="13.773066"
+       x2="9.8980894"
+       y2="66.834053" />
+    <linearGradient
+       xlink:href="#linearGradient9766"
+       id="linearGradient9772"
+       x1="22.175976"
+       y1="36.987999"
+       x2="22.065331"
+       y2="32.050499"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="46.689312"
+       x2="12.853771"
+       y1="32.567184"
+       x1="13.035696"
+       gradientTransform="matrix(1.317489,0,0,0.816256,-0.879573,-1.318166)"
+       id="linearGradient322"
+       xlink:href="#linearGradient319" />
+    <linearGradient
+       id="linearGradient319">
+      <stop
+         id="stop320"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop321"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:date>2009-01-13, 2020-12-18</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner, Daniel S. Fowler</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:source>https://tekeye.uk/free_resources/tango_desktop_project/index</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>folder</rdf:li>
+            <rdf:li>directory</rdf:li>
+            <rdf:li>icon</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>https://tekeye.uk/</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>https://tekeye.uk/free_resources/tango_desktop_project/images/folder.svg</dc:identifier>
+        <dc:coverage>computing</dc:coverage>
+        <dc:description>A representation of a folder for file storage.</dc:description>
+        <dc:language>en-GB</dc:language>
+        <dc:relation>https://tekeye.uk/free_resources/tango_desktop_project/images/folder-remote.svg</dc:relation>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(0.18110236,0,0,0.18029774,0.81889764,0.85315151)">
+    <g
+       id="g95"
+       transform="matrix(5.5294093,0,0,5.5293987,-0.61953982,-5.1472721)">
+      <g
+         style="display:inline"
+         transform="matrix(0.02262383,0,0,0.02086758,43.38343,36.36962)"
+         id="g6707">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="rect6709"
+           width="1339.6335"
+           height="478.35718"
+           x="-1559.2523"
+           y="-150.69685" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           id="path6711" />
+        <path
+           id="path6713"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      </g>
+      <path
+         d="m 4.5217805,38.687417 c 0.021796,0.416304 0.4599049,0.832609 0.8762095,0.832609 h 31.327021 c 0.416302,0 0.810812,-0.416305 0.789016,-0.832609 L 36.577584,11.460682 c -0.0218,-0.416303 -0.459897,-0.832616 -0.876201,-0.832616 H 22.43051 c -0.485057,0 -1.234473,-0.315589 -1.401644,-1.1066322 L 20.417475,6.6283628 C 20.262006,5.8926895 19.535261,5.5904766 19.118957,5.5904766 H 4.3400975 c -0.4163128,0 -0.8108208,0.4163041 -0.7890249,0.8326083 z"
+         id="path216"
+         style="fill:url(#radialGradient238);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3104);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path9788"
+         d="M 5.2265927,22.5625 H 35.492173"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path9784"
+         d="M 5.0421736,18.5625 H 35.489104"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 4.9806965,12.5625 H 35.488057"
+         id="path9778" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.3861577,32.5625 H 35.494881"
+         id="path9798" />
+      <path
+         id="path9800"
+         d="M 5.5091398,34.5625 H 35.496893"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.0421736,16.5625 H 35.489104"
+         id="path9782" />
+      <path
+         id="path9780"
+         d="M 5.0114345,14.5625 H 35.48858"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path9776"
+         d="M 4.9220969,10.5625 H 20.202912"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 4.8737534,8.5624999 H 19.657487"
+         id="path9774" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.3246666,28.5625 H 35.493876"
+         id="path9794" />
+      <path
+         id="path9792"
+         d="M 5.2880638,26.5625 H 35.493184"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.2265927,24.5625 H 35.492173"
+         id="path9790" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.1958537,20.5625 H 35.491649"
+         id="path9786" />
+      <path
+         id="path9796"
+         d="M 5.3246666,30.5625 H 35.493876"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.5091398,36.5625 H 35.496893"
+         id="path9802" />
+      <path
+         style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.451429;fill:url(#linearGradient491);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.2138;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 6.068343,38.864023 c 0.016343,0.312228 -0.1809113,0.520379 -0.4985848,0.416303 v 0 C 5.2520766,39.176251 5.033027,38.968099 5.0166756,38.65587 L 4.068956,6.5913839 C 4.0526131,6.2791558 4.2341418,6.0906134 4.5463699,6.0906134 L 18.96842,6.0429196 c 0.312228,0 0.931943,0.3004727 1.132936,1.3221818 l 0.573489,2.8155346 C 20.247791,9.715379 20.255652,9.7010175 20.037287,9.0239299 L 19.631192,7.7647478 C 19.412142,7.0371009 18.932991,6.9328477 18.620763,6.9328477 H 5.7329889 c -0.3122276,0 -0.5094814,0.2081522 -0.4931306,0.5203887 L 6.1778636,38.968099 Z"
+         id="path219" />
+      <g
+         style="fill:#ffffff;fill-opacity:0.757062;fill-rule:nonzero;stroke:none;stroke-width:0.999465;stroke-miterlimit:4"
+         id="g220"
+         transform="matrix(1.040764,0,0.05449252,1.040764,-8.670199,2.670594)">
+        <path
+           style="fill:#ffffff;fill-opacity:0.508475"
+           d="m 42.417183,8.5151772 c 0.0051,-0.097113 -0.128161,-0.2469882 -0.235117,-0.2470056 l -13.031401,-0.00212 c 0,0 0.911714,0.5879545 2.201812,0.5962436 l 11.053497,0.07102 c 0.01109,-0.2117278 0.0027,-0.2560322 0.01121,-0.4181395 z"
+           id="path221" />
+      </g>
+      <path
+         style="color:#000000;display:block;visibility:visible;fill:url(#linearGradient9772);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 39.783532,39.51062 c 1.143894,-0.04406 1.963076,-1.096299 2.047035,-2.321005 0.791787,-11.548687 1.65936,-21.231949 1.65936,-21.231949 0.07215,-0.247484 -0.167911,-0.494967 -0.48014,-0.494967 H 8.6386304 c 0,0 -1.8503191,21.866892 -1.8503191,21.866892 -0.1145551,0.982066 -0.4660075,1.804718 -1.5498358,2.183713 z"
+         id="path233" />
+      <path
+         id="path304"
+         d="m 9.6202444,16.463921 32.7910986,0.06481 -1.574046,20.001979 c -0.08432,1.071511 -0.450678,1.428215 -1.872656,1.428215 -1.871502,0 -28.677968,-0.03241 -31.394742,-0.03241 0.2335983,-0.320811 0.3337557,-0.988623 0.3350963,-1.004612 z"
+         style="opacity:0.465909;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient322);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path323"
+         d="M 9.6202481,16.223182 8.4536014,31.866453 c 0,0 8.2961546,-4.148078 18.6663476,-4.148078 10.370193,0 15.55529,-11.495193 15.55529,-11.495193 z"
+         style="fill:#ffffff;fill-opacity:0.0892857;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/files/wizard/icons/preferences-desktop-locale.svg b/files/wizard/icons/preferences-desktop-locale.svg
new file mode 100644
index 0000000000..51098cfa13
--- /dev/null
+++ b/files/wizard/icons/preferences-desktop-locale.svg
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   id="svg11300"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title148">Locale Preferences Icon</title>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient2913">
+      <stop
+         style="stop-color:white;stop-opacity:0.43877551;"
+         offset="0"
+         id="stop2915" />
+      <stop
+         id="stop2921"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2917" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2877">
+      <stop
+         style="stop-color:#75507b;stop-opacity:1;"
+         offset="0"
+         id="stop2879" />
+      <stop
+         id="stop2885"
+         offset="0.25709054"
+         style="stop-color:#a984af;stop-opacity:1;" />
+      <stop
+         style="stop-color:#513755;stop-opacity:1;"
+         offset="0.5655992"
+         id="stop2887" />
+      <stop
+         style="stop-color:#875c8e;stop-opacity:1;"
+         offset="1"
+         id="stop2881" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2865">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2867" />
+      <stop
+         id="stop2873"
+         offset="0.25568181"
+         style="stop-color:#9ced4b;stop-opacity:1;" />
+      <stop
+         style="stop-color:#64b813;stop-opacity:1;"
+         offset="0.59400827"
+         id="stop2875" />
+      <stop
+         style="stop-color:#8eea34;stop-opacity:1;"
+         offset="1"
+         id="stop2869" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient6761"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6763"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6765"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       xlink:href="#linearGradient2865"
+       id="linearGradient2871"
+       x1="10.029842"
+       y1="28.695923"
+       x2="46.026699"
+       y2="28.695923"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0154047,0,0,0.97776882,-0.164004,0.32227608)" />
+    <linearGradient
+       xlink:href="#linearGradient2877"
+       id="linearGradient2883"
+       x1="3.1234348"
+       y1="17.789515"
+       x2="39.120289"
+       y2="17.789515"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0154047,0,0,0.97776881,-0.05761325,0.0798138)" />
+    <linearGradient
+       xlink:href="#linearGradient2913"
+       id="linearGradient2919"
+       x1="10.964451"
+       y1="28.712873"
+       x2="36.336609"
+       y2="27.445059"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient2913"
+       id="linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       x1="4.1213179"
+       y1="24.253414"
+       x2="33.066338"
+       y2="25.661276" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner, Daniel S. Fowler</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://tekeye.uk/free_resources/tango_desktop_project/index</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:title>Locale Preferences Icon</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>locale</rdf:li>
+            <rdf:li>settings</rdf:li>
+            <rdf:li>preferences</rdf:li>
+            <rdf:li>location</rdf:li>
+            <rdf:li>flag</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>icon</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:date> 2021-01-02</dc:date>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>https://tekeye.uk/</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-locale.svg</dc:identifier>
+        <dc:relation>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-screensaver.svg</dc:relation>
+        <dc:language>en-GB</dc:language>
+        <dc:coverage>computing</dc:coverage>
+        <dc:description>An icon for locale settings.</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(0.17322834,0,0,0.18209601,1.8267717,0.63275188)">
+    <g
+       id="g146"
+       transform="matrix(5.3725693,0,0,5.3725694,-6.3889238,-4.0101781)">
+      <g
+         id="g6753"
+         transform="matrix(0.01971468,0,0,0.03343226,38.92492,24.71253)">
+        <rect
+           y="-150.69685"
+           x="-1559.2523"
+           height="478.35718"
+           width="1339.6335"
+           id="rect6755"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6761);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           id="path6757"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6763);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6765);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           id="path6759" />
+      </g>
+      <g
+         transform="matrix(0.01971468,0,0,0.03343226,46.17276,35.14236)"
+         id="g6707">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="rect6709"
+           width="1339.6335"
+           height="478.35718"
+           x="-1559.2523"
+           y="-150.69685" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           id="path6711" />
+        <path
+           id="path6713"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      </g>
+      <path
+         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient2883);fill-opacity:1;fill-rule:evenodd;stroke:#5c3566;stroke-width:0.996406;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 3.6216391,6.1344628 c 9.3237929,-6.39532928 26.0362549,1.9013142 35.5359699,0 V 30.6787 c -9.147873,2.938395 -24.980731,-6.222482 -35.5359699,0 z"
+         id="rect15576" />
+      <path
+         id="path16462"
+         d="m 4.6213179,6.8032613 c 7.9771481,-5.728237 23.8335951,1.944544 33.0355491,0.5 l -0.125,23.2897917 c -6.814844,2.192704 -22.737708,-5.704436 -32.8480491,-1.125 z"
+         style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.629213;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path16504"
+         d="m 10.528047,17.040871 c 9.323793,-6.395329 26.036255,1.901314 35.53597,0 v 24.544238 c -9.147873,2.938394 -24.980731,-6.222483 -35.53597,0 z"
+         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient2871);fill-opacity:1;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.996406;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.629213;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2919);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 11.464451,17.654135 c 7.977148,-5.728237 23.833595,1.944544 33.035549,0.5 l -0.125,23.37818 c -6.814844,2.192704 -22.737708,-5.704436 -32.848049,-1.125 z"
+         id="path16506" />
+    </g>
+  </g>
+</svg>
diff --git a/files/wizard/icons/system-installer.svg b/files/wizard/icons/system-installer.svg
new file mode 100644
index 0000000000..7d95eea080
--- /dev/null
+++ b/files/wizard/icons/system-installer.svg
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   id="svg14603"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title103">System Installer Icon</title>
+  <defs
+     id="defs3">
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient5031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient5027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       id="linearGradient7844">
+      <stop
+         id="stop7846"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7848"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7834">
+      <stop
+         id="stop7836"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7838"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7670">
+      <stop
+         id="stop7672"
+         offset="0"
+         style="stop-color:#dfdfdf;stop-opacity:1;" />
+      <stop
+         id="stop7674"
+         offset="1.0000000"
+         style="stop-color:#c0c0c0;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.008511,0,0,1,-47.59576,-0.285714)"
+       gradientUnits="userSpaceOnUse"
+       y2="40.857143"
+       x2="72.85714"
+       y1="9.7142859"
+       x1="64.571426"
+       id="linearGradient7676"
+       xlink:href="#linearGradient7670" />
+    <linearGradient
+       gradientTransform="translate(-2)"
+       gradientUnits="userSpaceOnUse"
+       y2="0.50379461"
+       x2="19.323767"
+       y1="11.312428"
+       x1="19.362535"
+       id="linearGradient7840"
+       xlink:href="#linearGradient7834" />
+    <linearGradient
+       id="aigrd1"
+       gradientUnits="userSpaceOnUse"
+       x1="14.9966"
+       y1="11.1885"
+       x2="32.511002"
+       y2="34.307499">
+      <stop
+         offset="0"
+         style="stop-color:#EBEBEB"
+         id="stop3034" />
+      <stop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="stop3036" />
+      <stop
+         offset="1"
+         style="stop-color:#EBEBEB"
+         id="stop3038" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd2"
+       gradientUnits="userSpaceOnUse"
+       x1="12.2744"
+       y1="32.4165"
+       x2="35.391201"
+       y2="14.2033">
+      <stop
+         offset="0"
+         style="stop-color:#FBFBFB"
+         id="stop3043" />
+      <stop
+         offset="0.5"
+         style="stop-color:#B6B6B6"
+         id="stop3045" />
+      <stop
+         offset="1"
+         style="stop-color:#E4E4E4"
+         id="stop3047" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4236">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.32673267;"
+         offset="0.0000000"
+         id="stop4238" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.60396039;"
+         offset="1.0000000"
+         id="stop4240" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6028">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6030" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6032" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6036">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6038" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6040" />
+    </linearGradient>
+    <linearGradient
+       y2="14.2033"
+       x2="35.391201"
+       y1="32.4165"
+       x1="12.2744"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3394">
+      <stop
+         id="stop3396"
+         style="stop-color:#fff307;stop-opacity:1.0000000;"
+         offset="0.0000000" />
+      <stop
+         id="stop3398"
+         style="stop-color:#166eff;stop-opacity:1.0000000;"
+         offset="0.50000000" />
+      <stop
+         id="stop3400"
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <radialGradient
+       r="22.728432"
+       fy="37.595428"
+       fx="24.546707"
+       cy="37.595428"
+       cx="24.546707"
+       gradientTransform="matrix(1,0,0,0.333333,0,25.06362)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10566"
+       xlink:href="#linearGradient7844" />
+    <linearGradient
+       y2="34.307499"
+       x2="32.511002"
+       y1="11.1885"
+       x1="14.9966"
+       gradientTransform="matrix(0.683145,0,0,0.683145,18.55581,18.12886)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10568"
+       xlink:href="#aigrd1" />
+    <linearGradient
+       y2="14.2033"
+       x2="35.391201"
+       y1="32.4165"
+       x1="12.2744"
+       gradientTransform="matrix(0.705308,0,0,0.705308,18.02392,17.61692)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10570"
+       xlink:href="#aigrd2" />
+    <linearGradient
+       y2="28"
+       x2="29"
+       y1="14.625"
+       x1="21.125"
+       gradientTransform="matrix(0.717302,0,0,0.717302,17.73603,18.06909)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10572"
+       xlink:href="#linearGradient4236" />
+    <linearGradient
+       y2="28"
+       x2="29"
+       y1="14.625"
+       x1="21.125"
+       gradientTransform="matrix(0.717302,0,0,0.717302,17.73603,18.06909)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10574"
+       xlink:href="#linearGradient4236" />
+    <linearGradient
+       y2="54.698483"
+       x2="48.798885"
+       y1="3.6100161"
+       x1="10.50172"
+       gradientTransform="matrix(0.573842,0,0,0.573842,20.97995,19.56347)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10576"
+       xlink:href="#linearGradient6036" />
+    <linearGradient
+       y2="18.366575"
+       x2="17.742729"
+       y1="31.494707"
+       x1="28.702885"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10578"
+       xlink:href="#linearGradient6028" />
+    <radialGradient
+       r="21.333334"
+       fy="27.569166"
+       fx="37.751469"
+       cy="27.569166"
+       cx="37.751469"
+       gradientTransform="matrix(0.441746,0.498655,-0.407098,0.360624,32.00755,10.21308)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10580"
+       xlink:href="#linearGradient3394" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>System Installer Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner, Daniel S. Fowler</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://tekeye.uk/free_resources/tango_desktop_project/index</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:date> 2021-01-02</dc:date>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>https://tekeye.uk/</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/system-installer.svg</dc:identifier>
+        <dc:relation>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-screensaver.svg</dc:relation>
+        <dc:language>en-GB</dc:language>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>install</rdf:li>
+            <rdf:li>setup</rdf:li>
+            <rdf:li>packages</rdf:li>
+            <rdf:li>manager</rdf:li>
+            <rdf:li>settings</rdf:li>
+            <rdf:li>preferences</rdf:li>
+            <rdf:li>cd</rdf:li>
+            <rdf:li>dvd</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>icon</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:coverage>computing</dc:coverage>
+        <dc:description>An icon for system setup and installation.</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(0.1653543,0,0,0.16681119,2.8346457,3.4986993)">
+    <g
+       id="g101"
+       transform="matrix(5.9766957,0,0,5.9767047,-14.855812,-21.310431)">
+      <path
+         id="path7822"
+         d="M 7.0663522,9.8326324 11.142857,5.5714286 h 23.571429 l 4.320377,4.3622191 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#6b6c69;fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <g
+         id="g5022"
+         transform="matrix(0.0201828,0,0,0.02086758,41.09416,37.29644)">
+        <rect
+           y="-150.69685"
+           x="-1559.2523"
+           height="478.35718"
+           width="1339.6335"
+           id="rect4173"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           id="path5058"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           id="path5018" />
+      </g>
+      <rect
+         ry="1.4285715"
+         rx="1.4285721"
+         y="9.4285717"
+         x="6.5756874"
+         height="31.142857"
+         width="32.848644"
+         id="rect6910"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7676);fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="rect7826"
+         d="m 38.857143,22.756128 v 16.428573 c 0,0.474857 -0.363132,0.857143 -0.814198,0.857143 H 15.874474 l 0.04939,-17.285716 c 0,0 22.93328,0 22.933279,0 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#a40000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path7824"
+         d="m 15.379549,11.285714 v 28"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 38.857143,22.613273 V 11.470414 c 0,-0.474857 -0.363132,-0.857143 -0.814198,-0.857143 H 15.874474 l 0.04939,12.000002 c 0,0 22.93328,0 22.933279,0 z"
+         id="path10582" />
+      <path
+         id="rect7829"
+         d="m 11.512932,6.5274685 c 0,0 22.772115,0 22.772115,0 0,0 4.256999,4.2569985 4.256999,4.2569985 v 28.431057 c 0,0.287766 -0.231668,0.519434 -0.519434,0.519434 H 7.9773979 c -0.2877664,0 -0.519434,-0.231668 -0.519434,-0.519434 V 10.784467 c 0,0 4.0549681,-4.2569985 4.0549681,-4.2569985 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.625668;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7840);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <g
+         transform="translate(-0.999997,-0.285714)"
+         id="g10554">
+        <ellipse
+           transform="matrix(0.55024,0,0,0.55024,19.89726,20.62321)"
+           id="path10170"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.625668;fill:url(#radialGradient10566);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:11;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           cx="24.546707"
+           cy="37.595428"
+           rx="22.728432"
+           ry="7.5761442" />
+        <g
+           id="g10156"
+           transform="translate(-1.642857,-2.642857)">
+          <path
+             style="fill:url(#linearGradient10568);fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+             d="m 34.951289,21.954475 c -6.626509,0 -11.955042,5.328533 -11.955042,11.955042 0,6.626509 5.328533,11.955042 11.955042,11.955042 6.62651,0 11.955043,-5.328533 11.955043,-11.955042 0,-6.626509 -5.328533,-11.955042 -11.955043,-11.955042 z m 0,14.824252 c -1.571234,0 -2.86921,-1.297976 -2.86921,-2.86921 0,-1.571234 1.297976,-2.86921 2.86921,-2.86921 1.571234,0 2.86921,1.297976 2.86921,2.86921 0,1.571234 -1.297976,2.86921 -2.86921,2.86921 z"
+             id="path3040" />
+          <path
+             style="fill:url(#linearGradient10570);fill-rule:nonzero;stroke:#808080;stroke-miterlimit:4;stroke-opacity:1"
+             d="m 34.951305,21.566644 c -6.841486,0 -12.342888,5.501401 -12.342888,12.342888 0,6.841486 5.501402,12.342887 12.342888,12.342887 6.841487,0 12.342888,-5.501401 12.342888,-12.342887 0,-6.841487 -5.501401,-12.342888 -12.342888,-12.342888 z m 0,15.30518 c -1.622208,0 -2.962293,-1.340084 -2.962293,-2.962292 0,-1.622208 1.340085,-2.962293 2.962293,-2.962293 1.622208,0 2.962293,1.340085 2.962293,2.962293 0,1.622208 -1.340085,2.962292 -2.962293,2.962292 z"
+             id="path3049" />
+          <path
+             style="opacity:0.11;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+             d="m 34.951289,28.111323 c -3.237952,0 -5.798194,2.635543 -5.798194,5.798194 0,3.237954 2.635543,5.798195 5.798194,5.798195 3.237953,0 5.798195,-2.635543 5.798195,-5.798195 0,-3.237953 -2.635544,-5.798194 -5.798195,-5.798194 z m 0,8.960846 c -1.731928,0 -3.162651,-1.430723 -3.162651,-3.162652 0,-1.731928 1.430723,-3.162651 3.162651,-3.162651 1.731928,0 3.162651,1.430723 3.162651,3.162651 0,1.731929 -1.430723,3.162652 -3.162651,3.162652 z"
+             id="path3051" />
+          <path
+             id="path3916"
+             d="m 38.150519,22.816711 -2.063876,8.030725 c 0.645402,0.171876 1.161538,0.571243 1.512147,1.123894 l 7.111176,-4.332097 c -1.454832,-2.369804 -3.789773,-4.113338 -6.559447,-4.822522 z"
+             style="fill:url(#linearGradient10572);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4;stroke-opacity:1" />
+          <path
+             style="fill:url(#linearGradient10574);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4;stroke-opacity:1"
+             d="m 30.911911,44.678269 2.717288,-7.833804 c -0.629082,-0.224368 -1.110628,-0.664826 -1.414602,-1.244438 l -7.44334,3.73264 c 1.255025,2.481415 3.438679,4.411057 6.140654,5.345602 z"
+             id="path4214" />
+          <path
+             id="path5264"
+             d="m 34.951287,22.548803 c -6.29708,0 -11.360712,5.063632 -11.360712,11.360712 0,6.297081 5.063632,11.360712 11.360712,11.360712 6.297081,0 11.360712,-5.063631 11.360712,-11.360712 0,-6.29708 -5.063631,-11.360712 -11.360712,-11.360712 z"
+             style="opacity:0.546448;fill:none;fill-rule:nonzero;stroke:url(#linearGradient10576);stroke-miterlimit:4;stroke-opacity:1" />
+          <circle
+             transform="matrix(0.573842,0,0,0.573842,21.03068,19.61419)"
+             id="path6026"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.672131;fill:none;fill-opacity:0.316384;fill-rule:nonzero;stroke:url(#linearGradient10578);stroke-width:1.62159;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+             cx="24.306795"
+             cy="24.930641"
+             r="6.0987959" />
+          <path
+             id="path3390"
+             d="m 34.951289,23.065643 c -6.010605,0 -10.843874,4.833269 -10.843874,10.843874 0,6.010605 4.833269,10.843874 10.843874,10.843874 6.010606,0 10.843875,-4.833269 10.843875,-10.843874 0,-6.010605 -4.833269,-10.843874 -10.843875,-10.843874 z m 0,13.446404 c -1.425195,0 -2.60253,-1.177335 -2.60253,-2.60253 0,-1.425195 1.177335,-2.60253 2.60253,-2.60253 1.425195,0 2.60253,1.177335 2.60253,2.60253 0,1.425195 -1.177335,2.60253 -2.60253,2.60253 z"
+             style="opacity:0.114286;fill:url(#radialGradient10580);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/files/wizard/icons/tango/48x48/dollar.png b/files/wizard/icons/tango/48x48/dollar.png
deleted file mode 100644
index a14ba2505d..0000000000
Binary files a/files/wizard/icons/tango/48x48/dollar.png and /dev/null differ
diff --git a/files/wizard/icons/tango/48x48/folder.png b/files/wizard/icons/tango/48x48/folder.png
deleted file mode 100644
index e93d7cf8f8..0000000000
Binary files a/files/wizard/icons/tango/48x48/folder.png and /dev/null differ
diff --git a/files/wizard/icons/tango/48x48/preferences-desktop-locale.png b/files/wizard/icons/tango/48x48/preferences-desktop-locale.png
deleted file mode 100644
index f56497bd23..0000000000
Binary files a/files/wizard/icons/tango/48x48/preferences-desktop-locale.png and /dev/null differ
diff --git a/files/wizard/icons/tango/48x48/system-installer.png b/files/wizard/icons/tango/48x48/system-installer.png
deleted file mode 100644
index dbd08f7e2f..0000000000
Binary files a/files/wizard/icons/tango/48x48/system-installer.png and /dev/null differ
diff --git a/files/wizard/icons/tango/index.theme b/files/wizard/icons/tango/index.theme
deleted file mode 100644
index 3ffebebc9a..0000000000
--- a/files/wizard/icons/tango/index.theme
+++ /dev/null
@@ -1,8 +0,0 @@
-[Icon Theme]
-Name=Tango
-Comment=Tango Theme
-Inherits=default
-Directories=48x48
-
-[48x48]
-Size=48
\ No newline at end of file
diff --git a/files/wizard/wizard.qrc b/files/wizard/wizard.qrc
index 7dbb8fe080..6f7bf69eb0 100644
--- a/files/wizard/wizard.qrc
+++ b/files/wizard/wizard.qrc
@@ -1,10 +1,9 @@
 <RCC>
-  <qresource prefix="icons/tango">
-    <file alias="48x48/preferences-desktop-locale.png">icons/tango/48x48/preferences-desktop-locale.png</file>
-    <file alias="index.theme">icons/tango/index.theme</file>
-    <file alias="48x48/folder.png">icons/tango/48x48/folder.png</file>
-    <file alias="48x48/system-installer.png">icons/tango/48x48/system-installer.png</file>
-    <file alias="48x48/dollar.png">icons/tango/48x48/dollar.png</file>
+  <qresource prefix="">
+    <file alias="preferences-desktop-locale">icons/preferences-desktop-locale.svg</file>
+    <file alias="folder">icons/folder.svg</file>
+    <file alias="system-installer">icons/system-installer.svg</file>
+    <file alias="dollar">icons/dollar.svg</file>
   </qresource>
   <qresource prefix="images">
     <file alias="intropage-background.png">images/intropage-background.png</file>    
diff --git a/scripts/data/integration_tests/test_lua_api/builtin.omwscripts b/scripts/data/integration_tests/test_lua_api/builtin.omwscripts
deleted file mode 100644
index 8b7db327c5..0000000000
--- a/scripts/data/integration_tests/test_lua_api/builtin.omwscripts
+++ /dev/null
@@ -1 +0,0 @@
-# It is an empty file that overrides builtin.omwscripts and disables builtin scripts
diff --git a/scripts/data/integration_tests/test_lua_api/player.lua b/scripts/data/integration_tests/test_lua_api/player.lua
index 62344af3d2..18229a3cd8 100644
--- a/scripts/data/integration_tests/test_lua_api/player.lua
+++ b/scripts/data/integration_tests/test_lua_api/player.lua
@@ -5,26 +5,122 @@ local core = require('openmw.core')
 local input = require('openmw.input')
 local types = require('openmw.types')
 local nearby = require('openmw.nearby')
+local camera = require('openmw.camera')
 
-input.setControlSwitch(input.CONTROL_SWITCH.Fighting, false)
-input.setControlSwitch(input.CONTROL_SWITCH.Jumping, false)
-input.setControlSwitch(input.CONTROL_SWITCH.Looking, false)
-input.setControlSwitch(input.CONTROL_SWITCH.Magic, false)
-input.setControlSwitch(input.CONTROL_SWITCH.VanityMode, false)
-input.setControlSwitch(input.CONTROL_SWITCH.ViewMode, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Controls, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Fighting, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Jumping, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Looking, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Magic, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.VanityMode, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.ViewMode, false)
+
+local function rotate(object, targetPitch, targetYaw)
+    local endTime = core.getSimulationTime() + 1
+    while core.getSimulationTime() < endTime do
+        object.controls.jump = false
+        object.controls.run = true
+        object.controls.movement = 0
+        object.controls.sideMovement = 0
+        if targetPitch ~= nil then
+            object.controls.pitchChange = util.normalizeAngle(targetPitch - object.rotation:getPitch()) * 0.5
+        end
+        if targetYaw ~= nil then
+            object.controls.yawChange = util.normalizeAngle(targetYaw - object.rotation:getYaw()) * 0.5
+        end
+        coroutine.yield()
+    end
+end
+
+local function rotateByYaw(object, target)
+    rotate(object, nil, target)
+end
+
+local function rotateByPitch(object, target)
+    rotate(object, target, nil)
+end
+
+testing.registerLocalTest('playerYawRotation',
+    function()
+        local initialAlphaXZ, initialGammaXZ = self.rotation:getAnglesXZ()
+        local initialAlphaZYX, initialBetaZYX, initialGammaZYX = self.rotation:getAnglesZYX()
+
+        local targetYaw = math.rad(90)
+        rotateByYaw(self, targetYaw)
+
+        testing.expectEqualWithDelta(self.rotation:getYaw(), targetYaw, 0.05, 'Incorrect yaw rotation')
+
+        local alpha1, gamma1 = self.rotation:getAnglesXZ()
+        testing.expectEqualWithDelta(alpha1, initialAlphaXZ, 0.05, 'Alpha rotation in XZ convention should not change')
+        testing.expectEqualWithDelta(gamma1, targetYaw, 0.05, 'Incorrect gamma rotation in XZ convention')
+
+        local alpha2, beta2, gamma2 = self.rotation:getAnglesZYX()
+        testing.expectEqualWithDelta(alpha2, targetYaw, 0.05, 'Incorrect alpha rotation in ZYX convention')
+        testing.expectEqualWithDelta(beta2, initialBetaZYX, 0.05, 'Beta rotation in ZYX convention should not change')
+        testing.expectEqualWithDelta(gamma2, initialGammaZYX, 0.05, 'Gamma rotation in ZYX convention should not change')
+    end)
+
+testing.registerLocalTest('playerPitchRotation',
+    function()
+        local initialAlphaXZ, initialGammaXZ = self.rotation:getAnglesXZ()
+        local initialAlphaZYX, initialBetaZYX, initialGammaZYX = self.rotation:getAnglesZYX()
+
+        local targetPitch = math.rad(90)
+        rotateByPitch(self, targetPitch)
+
+        testing.expectEqualWithDelta(self.rotation:getPitch(), targetPitch, 0.05, 'Incorrect pitch rotation')
+
+        local alpha1, gamma1 = self.rotation:getAnglesXZ()
+        testing.expectEqualWithDelta(alpha1, targetPitch, 0.05, 'Incorrect alpha rotation in XZ convention')
+        testing.expectEqualWithDelta(gamma1, initialGammaXZ, 0.05, 'Gamma rotation in XZ convention should not change')
+
+        local alpha2, beta2, gamma2 = self.rotation:getAnglesZYX()
+        testing.expectEqualWithDelta(alpha2, initialAlphaZYX, 0.05, 'Alpha rotation in ZYX convention should not change')
+        testing.expectEqualWithDelta(beta2, initialBetaZYX, 0.05, 'Beta rotation in ZYX convention should not change')
+        testing.expectEqualWithDelta(gamma2, targetPitch, 0.05, 'Incorrect gamma rotation in ZYX convention')
+    end)
+
+testing.registerLocalTest('playerPitchAndYawRotation',
+    function()
+        local targetPitch = math.rad(-30)
+        local targetYaw = math.rad(-60)
+        rotate(self, targetPitch, targetYaw)
+
+        testing.expectEqualWithDelta(self.rotation:getPitch(), targetPitch, 0.05, 'Incorrect pitch rotation')
+        testing.expectEqualWithDelta(self.rotation:getYaw(), targetYaw, 0.05, 'Incorrect yaw rotation')
+
+        local alpha1, gamma1 = self.rotation:getAnglesXZ()
+        testing.expectEqualWithDelta(alpha1, targetPitch, 0.05, 'Incorrect alpha rotation in XZ convention')
+        testing.expectEqualWithDelta(gamma1, targetYaw, 0.05, 'Incorrect gamma rotation in XZ convention')
+
+        local alpha2, beta2, gamma2 = self.rotation:getAnglesZYX()
+        testing.expectEqualWithDelta(alpha2, math.rad(-56), 0.05, 'Incorrect alpha rotation in ZYX convention')
+        testing.expectEqualWithDelta(beta2, math.rad(-25), 0.05, 'Incorrect beta rotation in ZYX convention')
+        testing.expectEqualWithDelta(gamma2, math.rad(-16), 0.05, 'Incorrect gamma rotation in ZYX convention')
+    end)
 
 testing.registerLocalTest('playerRotation',
     function()
-        local endTime = core.getSimulationTime() + 1
+        local rotation = math.sqrt(2)
+        local endTime = core.getSimulationTime() + 3
         while core.getSimulationTime() < endTime do
             self.controls.jump = false
             self.controls.run = true
             self.controls.movement = 0
             self.controls.sideMovement = 0
-            self.controls.yawChange = util.normalizeAngle(math.rad(90) - self.rotation:getYaw()) * 0.5
+            self.controls.pitchChange = rotation
+            self.controls.yawChange = rotation
             coroutine.yield()
+
+            local alpha1, gamma1 = self.rotation:getAnglesXZ()
+            testing.expectThat(alpha1, testing.isNotNan(), 'Alpha rotation in XZ convention is nan')
+            testing.expectThat(gamma1, testing.isNotNan(), 'Gamma rotation in XZ convention is nan')
+
+            local alpha2, beta2, gamma2 = self.rotation:getAnglesZYX()
+            testing.expectThat(alpha2, testing.isNotNan(), 'Alpha rotation in ZYX convention is nan')
+            testing.expectThat(beta2, testing.isNotNan(), 'Beta rotation in ZYX convention is nan')
+            testing.expectThat(gamma2, testing.isNotNan(), 'Gamma rotation in ZYX convention is nan')
         end
-        testing.expectEqualWithDelta(self.rotation:getYaw(), math.rad(90), 0.05, 'Incorrect rotation')
     end)
 
 testing.registerLocalTest('playerForwardRunning',
@@ -40,8 +136,7 @@ testing.registerLocalTest('playerForwardRunning',
             coroutine.yield()
         end
         local direction, distance = (self.position - startPos):normalize()
-        local normalizedDistance = distance / types.Actor.runSpeed(self)
-        testing.expectEqualWithDelta(normalizedDistance, 1, 0.2, 'Normalized forward runned distance')
+        testing.expectGreaterThan(distance, 0, 'Run forward, distance')
         testing.expectEqualWithDelta(direction.x, 0, 0.1, 'Run forward, X coord')
         testing.expectEqualWithDelta(direction.y, 1, 0.1, 'Run forward, Y coord')
     end)
@@ -59,16 +154,15 @@ testing.registerLocalTest('playerDiagonalWalking',
             coroutine.yield()
         end
         local direction, distance = (self.position - startPos):normalize()
-        local normalizedDistance = distance / types.Actor.walkSpeed(self)
-        testing.expectEqualWithDelta(normalizedDistance, 1, 0.2, 'Normalized diagonally walked distance')
+        testing.expectGreaterThan(distance, 0, 'Walk diagonally, distance')
         testing.expectEqualWithDelta(direction.x, -0.707, 0.1, 'Walk diagonally, X coord')
         testing.expectEqualWithDelta(direction.y, -0.707, 0.1, 'Walk diagonally, Y coord')
     end)
 
 testing.registerLocalTest('findPath',
     function()
-        local src = util.vector3(4096, 4096, 867.237)
-        local dst = util.vector3(4500, 4500, 700.216)
+        local src = util.vector3(4096, 4096, 1745)
+        local dst = util.vector3(4500, 4500, 1745.95263671875)
         local options = {
             agentBounds = types.Actor.getPathfindingAgentBounds(self),
             includeFlags = nearby.NAVIGATOR_FLAGS.Walk + nearby.NAVIGATOR_FLAGS.Swim,
@@ -82,36 +176,174 @@ testing.registerLocalTest('findPath',
         }
         local status, path = nearby.findPath(src, dst, options)
         testing.expectEqual(status, nearby.FIND_PATH_STATUS.Success, 'Status')
-        testing.expectLessOrEqual((path[path:size()] - dst):length(), 1, 'Last path point')
+        testing.expectLessOrEqual((path[#path] - dst):length(), 1,
+            'Last path point '  .. testing.formatActualExpected(path[#path], dst))
     end)
 
 testing.registerLocalTest('findRandomPointAroundCircle',
     function()
-        local position = util.vector3(4096, 4096, 867.237)
+        local position = util.vector3(4096, 4096, 1745.95263671875)
         local maxRadius = 100
         local options = {
             agentBounds = types.Actor.getPathfindingAgentBounds(self),
             includeFlags = nearby.NAVIGATOR_FLAGS.Walk,
         }
         local result = nearby.findRandomPointAroundCircle(position, maxRadius, options)
-        testing.expectGreaterThan((result - position):length(), 1, 'Random point')
+        testing.expectGreaterThan((result - position):length(), 1,
+            'Random point ' .. testing.formatActualExpected(result, position))
     end)
 
 testing.registerLocalTest('castNavigationRay',
     function()
-        local src = util.vector3(4096, 4096, 867.237)
-        local dst = util.vector3(4500, 4500, 700.216)
+        local src = util.vector3(4096, 4096, 1745)
+        local dst = util.vector3(4500, 4500, 1745.95263671875)
         local options = {
             agentBounds = types.Actor.getPathfindingAgentBounds(self),
             includeFlags = nearby.NAVIGATOR_FLAGS.Walk + nearby.NAVIGATOR_FLAGS.Swim,
         }
         local result = nearby.castNavigationRay(src, dst, options)
-        testing.expectLessOrEqual((result - dst):length(), 1, 'Navigation hit point')
+        testing.expectLessOrEqual((result - dst):length(), 1,
+            'Navigation hit point ' .. testing.formatActualExpected(result, dst))
+    end)
+
+testing.registerLocalTest('findNearestNavMeshPosition',
+    function()
+        local position = util.vector3(4096, 4096, 2000)
+        local options = {
+            agentBounds = types.Actor.getPathfindingAgentBounds(self),
+            includeFlags = nearby.NAVIGATOR_FLAGS.Walk + nearby.NAVIGATOR_FLAGS.Swim,
+            searchAreaHalfExtents = util.vector3(1000, 1000, 1000),
+        }
+        local result = nearby.findNearestNavMeshPosition(position, options)
+        local expected = util.vector3(4096, 4096, 1746.27099609375)
+        testing.expectLessOrEqual((result - expected):length(), 1,
+            'Navigation mesh position ' .. testing.formatActualExpected(result, expected))
+    end)
+
+testing.registerLocalTest('playerMemoryLimit',
+    function()
+        local ok, err = pcall(function()
+            local str = 'a'
+            while true do
+                str = str .. str
+            end
+        end)
+        testing.expectEqual(ok, false, 'Script reaching memory limit should fail')
+        testing.expectEqual(err, 'not enough memory')
+    end)
+
+testing.registerLocalTest('playerWeaponAttack',
+    function()
+        camera.setMode(camera.MODE.ThirdPerson)
+
+        local options = {
+            agentBounds = types.Actor.getPathfindingAgentBounds(self),
+        }
+        local duration = 10
+        local endTime = core.getSimulationTime() + duration
+        local nextTime = 0
+        local use = self.ATTACK_TYPE.NoAttack
+
+        local attributes = {}
+        for k, v in pairs(types.Actor.stats.attributes) do
+            attributes[k] = v(self).base
+        end
+
+        types.Actor.stats.attributes.speed(self).base = 100
+        types.Actor.stats.attributes.strength(self).base = 1000
+        types.Actor.stats.attributes.agility(self).base = 1000
+
+        local weaponId = 'basic_dagger1h'
+        local weapon = types.Actor.inventory(self):find(weaponId)
+
+        local isWeapon = function(actual)
+            if actual == nil then
+                return weaponId .. ' is not found'
+            end
+            if actual.recordId ~= weaponId then
+                return 'found weapon recordId does not match expected: actual=' .. tostring(actual.id)
+                       .. ', expected=' .. weaponId
+            end
+            return ''
+        end
+        testing.expectThat(weapon, isWeapon)
+
+        types.Actor.setEquipment(self, {[types.Actor.EQUIPMENT_SLOT.CarriedRight] = weapon})
+
+        coroutine.yield()
+
+        testing.expectThat(types.Actor.getEquipment(self, types.Actor.EQUIPMENT_SLOT.CarriedRight), isWeapon)
+
+        types.Actor.setStance(self, types.Actor.STANCE.Weapon)
+
+        local previousHealth = nil
+        local targetActor = nil
+
+        while true do
+            local time = core.getSimulationTime()
+            testing.expectLessOrEqual(time, endTime, 'Did not damage any targets in ' .. duration .. ' seconds')
+
+            if targetActor ~= nil and types.Actor.stats.dynamic.health(targetActor).current < previousHealth then
+                print('Dealt ' .. (previousHealth - types.Actor.stats.dynamic.health(targetActor).current) .. ' damage to ' .. tostring(targetActor))
+                break
+            end
+
+            local minDistance = nil
+            for i, actor in ipairs(nearby.actors) do
+                if actor.id ~= self.id then
+                    local distance = (actor.position - self.position):length()
+                    if minDistance == nil or minDistance > distance then
+                        minDistance = distance
+                        targetActor = actor
+                    end
+                end
+            end
+            testing.expectNotEqual(targetActor, nil, 'No attack targets found')
+
+            previousHealth = types.Actor.stats.dynamic.health(targetActor).current
+
+            local destination = nil
+            if minDistance > 100 then
+                local status, path = nearby.findPath(self.position, targetActor.position, options)
+
+                testing.expectEqual(status, nearby.FIND_PATH_STATUS.Success,
+                    'Failed to find path from ' .. tostring(self.position) .. ' to ' .. tostring(targetActor.position))
+
+                destination = path[2]
+                use = self.ATTACK_TYPE.NoAttack
+
+                self.controls.run = true
+                self.controls.movement = 1
+            else
+                destination = targetActor.position
+
+                if nextTime < time then
+                    if use == 0 then
+                        use = self.ATTACK_TYPE.Any
+                        nextTime = time + 0.5
+                    else
+                        use = self.ATTACK_TYPE.NoAttack
+                    end
+                end
+            end
+            self.controls.use = use
+
+            local direction = destination - self.position
+            direction = direction:normalize()
+            self.controls.yawChange = util.normalizeAngle(math.atan2(direction.x, direction.y) - self.rotation:getYaw())
+            self.controls.pitchChange = util.normalizeAngle(math.asin(util.clamp(-direction.z, -1, 1)) - self.rotation:getPitch())
+
+            coroutine.yield()
+        end
+
+        for k, v in pairs(types.Actor.stats.attributes) do
+            v(self).base = attributes[k]
+        end
     end)
 
 return {
     engineHandlers = {
-        onUpdate = testing.updateLocal,
+        onFrame = testing.updateLocal,
     },
     eventHandlers = testing.eventHandlers
 }
diff --git a/scripts/data/integration_tests/test_lua_api/test.lua b/scripts/data/integration_tests/test_lua_api/test.lua
index acc43eca2a..78f2d956f7 100644
--- a/scripts/data/integration_tests/test_lua_api/test.lua
+++ b/scripts/data/integration_tests/test_lua_api/test.lua
@@ -1,7 +1,11 @@
-local testing = require('testing_util')
+local testing = require('testing_util')
 local core = require('openmw.core')
 local async = require('openmw.async')
 local util = require('openmw.util')
+local types = require('openmw.types')
+local vfs = require('openmw.vfs')
+local world = require('openmw.world')
+local I = require('openmw.interfaces')
 
 local function testTimers()
     testing.expectAlmostEqual(core.getGameTimeScale(), 30, 'incorrect getGameTimeScale() result')
@@ -27,7 +31,9 @@ local function testTimers()
         ts2 = core.getSimulationTime() - startSimulationTime
     end)
 
-    while not (ts1 and ts2 and th1 and th2) do coroutine.yield() end
+    while not (ts1 and ts2 and th1 and th2) do
+        coroutine.yield()
+    end
 
     testing.expectGreaterOrEqual(th1, 36, 'async:newGameTimer failed')
     testing.expectGreaterOrEqual(ts1, 0.5, 'async:newSimulationTimer failed')
@@ -42,7 +48,17 @@ local function testTeleport()
     testing.expectEqualWithDelta(player.position.x, 100, 1, 'incorrect position after teleporting')
     testing.expectEqualWithDelta(player.position.y, 50, 1, 'incorrect position after teleporting')
     testing.expectEqualWithDelta(player.position.z, 500, 1, 'incorrect position after teleporting')
-    testing.expectEqualWithDelta(player.rotation:getYaw(), math.rad(90), 0.05, 'incorrect rotation after teleporting')
+    testing.expectEqualWithDelta(player.rotation:getYaw(), math.rad(90), 0.05, 'incorrect yaw rotation after teleporting')
+    testing.expectEqualWithDelta(player.rotation:getPitch(), math.rad(0), 0.05, 'incorrect pitch rotation after teleporting')
+
+    local rotationX1, rotationZ1 = player.rotation:getAnglesXZ()
+    testing.expectEqualWithDelta(rotationX1, math.rad(0), 0.05, 'incorrect x rotation from getAnglesXZ after teleporting')
+    testing.expectEqualWithDelta(rotationZ1, math.rad(90), 0.05, 'incorrect z rotation from getAnglesXZ after teleporting')
+
+    local rotationZ2, rotationY2, rotationX2 = player.rotation:getAnglesZYX()
+    testing.expectEqualWithDelta(rotationZ2, math.rad(90), 0.05, 'incorrect z rotation from getAnglesZYX after teleporting')
+    testing.expectEqualWithDelta(rotationY2, math.rad(0), 0.05, 'incorrect y rotation from getAnglesZYX after teleporting')
+    testing.expectEqualWithDelta(rotationX2, math.rad(0), 0.05, 'incorrect x rotation from getAnglesZYX after teleporting')
 
     player:teleport('', player.position, {rotation=util.transform.rotateZ(math.rad(-90)), onGround=true})
     coroutine.yield()
@@ -64,14 +80,231 @@ local function testGetGMST()
     testing.expectEqual(core.getGMST('Level_Up_Level2'), 'something')
 end
 
+local function testMWScript()
+    local variableStoreCount = 18
+    local variableStore = world.mwscript.getGlobalVariables(player)
+    testing.expectEqual(variableStoreCount, #variableStore)
+
+    variableStore.year = 5
+    testing.expectEqual(5, variableStore.year)
+    variableStore.year = 1
+    local indexCheck = 0
+    for index, value in ipairs(variableStore) do
+        testing.expectEqual(variableStore[index], value)
+        indexCheck = indexCheck + 1
+    end
+    testing.expectEqual(variableStoreCount, indexCheck)
+    indexCheck = 0
+    for index, value in pairs(variableStore) do
+        testing.expectEqual(variableStore[index], value)
+        indexCheck = indexCheck + 1
+    end
+    testing.expectEqual(variableStoreCount, indexCheck)
+end
+
+local function testRecordStore(store, storeName, skipPairs)
+    testing.expect(store.records)
+    local firstRecord = store.records[1]
+    if not firstRecord then
+        return
+    end
+    testing.expectEqual(firstRecord.id, store.records[firstRecord.id].id)
+    local status, _ = pcall(function()
+        for index, value in ipairs(store.records) do
+            if value.id == firstRecord.id then
+                testing.expectEqual(index, 1, storeName)
+                break
+            end
+        end
+    end)
+
+    testing.expectEqual(status, true, storeName)
+end
+
+local function testRecordStores()
+    for key, type in pairs(types) do
+        if type.records then
+            testRecordStore(type, key)
+        end
+    end
+    testRecordStore(core.magic.enchantments, "enchantments")
+    testRecordStore(core.magic.effects, "effects", true)
+    testRecordStore(core.magic.spells, "spells")
+
+    testRecordStore(core.stats.Attribute, "Attribute")
+    testRecordStore(core.stats.Skill, "Skill")
+
+    testRecordStore(core.sound, "sound")
+    testRecordStore(core.factions, "factions")
+
+    testRecordStore(types.NPC.classes, "classes")
+    testRecordStore(types.NPC.races, "races")
+    testRecordStore(types.Player.birthSigns, "birthSigns")
+end
+
+local function testRecordCreation()
+    local newLight = {
+        isCarriable = true,
+        isDynamic = true,
+        isFire =false,
+        isFlicker = false,
+        isFlickerSlow = false,
+        isNegative = false,
+        isOffByDefault = false,
+        isPulse = false,
+        weight = 1,
+        value = 10,
+        duration = 12,
+        radius = 30,
+        color = 5,
+        name = "TestLight",
+        model = "meshes/marker_door.dae"
+    }
+    local draft = types.Light.createRecordDraft(newLight)
+    local record = world.createRecord(draft)
+    for key, value in pairs(newLight) do
+        testing.expectEqual(record[key], value)
+    end
+end
+
+local function testUTF8Chars()
+    testing.expectEqual(utf8.codepoint("😀"), 0x1F600)
+
+    local chars = {}
+
+    for codepoint = 0, 0x10FFFF do
+        local char = utf8.char(codepoint)
+        local charSize = string.len(char)
+
+        testing.expect(not chars[char], nil, "Duplicate UTF-8 character: " .. char)
+        chars[char] = true
+
+        if codepoint <= 0x7F then
+            testing.expectEqual(charSize, 1)
+        elseif codepoint <= 0x7FF then
+            testing.expectEqual(charSize, 2)
+        elseif codepoint <= 0xFFFF then
+            testing.expectEqual(charSize, 3)
+        elseif codepoint <= 0x10FFFF then
+            testing.expectEqual(charSize, 4)
+        end
+
+        testing.expectEqual(utf8.codepoint(char), codepoint)
+        testing.expectEqual(utf8.len(char), 1)
+    end
+end
+
+local function testUTF8Strings()
+    local utf8str = "Hello, 你好, 🌎!"
+
+    local str = ""
+    for utf_char in utf8str:gmatch(utf8.charpattern) do
+        str = str .. utf_char
+    end
+    testing.expectEqual(str, utf8str)
+
+    testing.expectEqual(utf8.len(utf8str), 13)
+    testing.expectEqual(utf8.offset(utf8str, 9), 11)
+end
+
+local function testMemoryLimit()
+    local ok, err = pcall(function()
+        local t = {}
+        local n = 1
+        while true do
+            t[n] = n
+            n = n + 1
+        end
+    end)
+    testing.expectEqual(ok, false, 'Script reaching memory limit should fail')
+    testing.expectEqual(err, 'not enough memory')
+end
+
 local function initPlayer()
-    player:teleport('', util.vector3(4096, 4096, 867.237), util.transform.identity)
+    player:teleport('', util.vector3(4096, 4096, 1745), util.transform.identity)
     coroutine.yield()
 end
 
+local function testVFS()
+    local file = 'test_vfs_dir/lines.txt'
+    testing.expectEqual(vfs.fileExists(file), true, 'lines.txt should exist')
+    testing.expectEqual(vfs.fileExists('test_vfs_dir/nosuchfile'), false, 'nosuchfile should not exist')
+
+    local getLine = vfs.lines(file)
+    for _,v in pairs({ '1', '2', '', '4' }) do
+        testing.expectEqual(getLine(), v)
+    end
+    testing.expectEqual(getLine(), nil, 'All lines should have been read')
+    local ok = pcall(function()
+        vfs.lines('test_vfs_dir/nosuchfile')
+    end)
+    testing.expectEqual(ok, false, 'Should not be able to read lines from nonexistent file')
+
+    local getPath = vfs.pathsWithPrefix('test_vfs_dir/')
+    testing.expectEqual(getPath(), file)
+    testing.expectEqual(getPath(), nil, 'All paths should have been read')
+
+    local handle = vfs.open(file)
+    testing.expectEqual(vfs.type(handle), 'file', 'File should be open')
+    testing.expectEqual(handle.fileName, file)
+
+    local n1, n2, _, l3, l4 = handle:read("*n", "*number", "*l", "*line", "*l")
+    testing.expectEqual(n1, 1)
+    testing.expectEqual(n2, 2)
+    testing.expectEqual(l3, '')
+    testing.expectEqual(l4, '4')
+
+    testing.expectEqual(handle:seek('set', 0), 0, 'Reading should happen from the start of the file')
+    testing.expectEqual(handle:read("*a"), '1\n2\n\n4')
+
+    testing.expectEqual(handle:close(), true, 'File should be closeable')
+    testing.expectEqual(vfs.type(handle), 'closed file', 'File should be closed')
+end
+
+local function testCommitCrime()
+    initPlayer()
+    local player = world.players[1]
+    testing.expectEqual(player == nil, false, 'A viable player reference should exist to run `testCommitCrime`')
+    testing.expectEqual(I.Crimes == nil, false, 'Crimes interface should be available in global contexts')
+
+    -- Reset crime level to have a clean slate
+    types.Player.setCrimeLevel(player, 0)
+    testing.expectEqual(I.Crimes.commitCrime(player, { type = types.Player.OFFENSE_TYPE.Theft, victim = player, arg = 100}).wasCrimeSeen, false, "Running the crime with the player as the victim should not result in a seen crime")
+    testing.expectEqual(I.Crimes.commitCrime(player, { type = types.Player.OFFENSE_TYPE.Theft, arg = 50 }).wasCrimeSeen, false, "Running the crime with no victim and a type shouldn't raise errors")
+    testing.expectEqual(I.Crimes.commitCrime(player, { type = types.Player.OFFENSE_TYPE.Murder }).wasCrimeSeen, false, "Running a murder crime should work even without a victim")
+
+    -- Create a mockup target for crimes
+    local victim = world.createObject(types.NPC.record(player).id)
+    victim:teleport(player.cell, player.position + util.vector3(0, 300, 0))
+    coroutine.yield()
+
+    -- Reset crime level for testing with a valid victim
+    types.Player.setCrimeLevel(player, 0)
+    testing.expectEqual(I.Crimes.commitCrime(player, { victim = victim, type = types.Player.OFFENSE_TYPE.Theft, arg = 50 }).wasCrimeSeen, true, "Running a crime with a valid victim should notify them when the player is not sneaking, even if it's not explicitly passed in")
+    testing.expectEqual(types.Player.getCrimeLevel(player), 0, "Crime level should not change if the victim's alarm value is low and there's no other witnesses")
+end
+
+local function testRecordModelProperty()
+    initPlayer()
+    local player = world.players[1]
+    testing.expectEqual(types.NPC.record(player).model, 'meshes/basicplayer.dae')
+end
+
 tests = {
     {'timers', testTimers},
-    {'playerRotation', function()
+    {'rotating player with controls.yawChange should change rotation', function()
+        initPlayer()
+        testing.runLocalTest(player, 'playerYawRotation')
+    end},
+    {'rotating player with controls.pitchChange should change rotation', function()
+        initPlayer()
+        testing.runLocalTest(player, 'playerPitchRotation')
+    end},
+    {'rotating player with controls.pitchChange and controls.yawChange should change rotation', function()
+        initPlayer()
+        testing.runLocalTest(player, 'playerPitchAndYawRotation')
+    end},
+    {'rotating player should not lead to nan rotation', function()
         initPlayer()
         testing.runLocalTest(player, 'playerRotation')
     end},
@@ -95,8 +328,30 @@ tests = {
         initPlayer()
         testing.runLocalTest(player, 'castNavigationRay')
     end},
+    {'findNearestNavMeshPosition', function()
+        initPlayer()
+        testing.runLocalTest(player, 'findNearestNavMeshPosition')
+    end},
     {'teleport', testTeleport},
     {'getGMST', testGetGMST},
+    {'recordStores', testRecordStores},
+    {'recordCreation', testRecordCreation},
+    {'utf8Chars', testUTF8Chars},
+    {'utf8Strings', testUTF8Strings},
+    {'mwscript', testMWScript},
+    {'testMemoryLimit', testMemoryLimit},
+    {'playerMemoryLimit', function()
+        initPlayer()
+        testing.runLocalTest(player, 'playerMemoryLimit')
+    end},
+    {'player with equipped weapon on attack should damage health of other actors', function()
+        initPlayer()
+        world.createObject('basic_dagger1h', 1):moveInto(player)
+        testing.runLocalTest(player, 'playerWeaponAttack')
+    end},
+    {'vfs', testVFS},
+    {'testCommitCrime', testCommitCrime},
+    {'recordModelProperty', testRecordModelProperty},
 }
 
 return {
diff --git a/scripts/data/integration_tests/test_lua_api/test.omwscripts b/scripts/data/integration_tests/test_lua_api/test.omwscripts
index 97f523afbd..80507392f7 100644
--- a/scripts/data/integration_tests/test_lua_api/test.omwscripts
+++ b/scripts/data/integration_tests/test_lua_api/test.omwscripts
@@ -1,3 +1,2 @@
 GLOBAL: test.lua
 PLAYER: player.lua
-
diff --git a/scripts/data/integration_tests/test_lua_api/test_vfs_dir/lines.txt b/scripts/data/integration_tests/test_lua_api/test_vfs_dir/lines.txt
new file mode 100644
index 0000000000..ab3afc0237
--- /dev/null
+++ b/scripts/data/integration_tests/test_lua_api/test_vfs_dir/lines.txt
@@ -0,0 +1,4 @@
+1
+2
+
+4
\ No newline at end of file
diff --git a/scripts/data/integration_tests/testing_util/testing_util.lua b/scripts/data/integration_tests/testing_util/testing_util.lua
index db67cd3b1a..7b886636ed 100644
--- a/scripts/data/integration_tests/testing_util/testing_util.lua
+++ b/scripts/data/integration_tests/testing_util/testing_util.lua
@@ -31,8 +31,12 @@ function M.runLocalTest(obj, name)
     currentLocalTest = name
     currentLocalTestError = nil
     obj:sendEvent('runLocalTest', name)
-    while currentLocalTest do coroutine.yield() end
-    if currentLocalTestError then error(currentLocalTestError, 2) end
+    while currentLocalTest do
+        coroutine.yield()
+    end
+    if currentLocalTestError then
+        error(currentLocalTestError, 2)
+    end
 end
 
 function M.expect(cond, delta, msg)
@@ -77,6 +81,12 @@ function M.expectEqual(v1, v2, msg)
     end
 end
 
+function M.expectNotEqual(v1, v2, msg)
+    if v1 == v2 then
+        error(string.format('%s: %s == %s', msg or '', v1, v2), 2)
+    end
+end
+
 function M.closeToVector(expected, maxDistance)
     return function(actual)
         local distance = (expected - actual):length()
@@ -133,6 +143,20 @@ function M.elementsAreArray(expected)
     end
 end
 
+---
+-- Matcher verifying that given number is not a nan.
+-- @function isNotNan
+-- @usage
+-- expectThat(value, isNotNan())
+function M.isNotNan(expected)
+    return function(actual)
+        if actual ~= actual then
+            return 'actual value is nan, expected to be not nan'
+        end
+        return ''
+    end
+end
+
 ---
 -- Verifies that given value matches provided matcher.
 -- @function expectThat
@@ -154,6 +178,10 @@ function M.expectThat(value, matcher, msg)
     end
 end
 
+function M.formatActualExpected(actual, expected)
+    return string.format('actual: %s, expected: %s', actual, expected)
+end
+
 local localTests = {}
 local localTestRunner = nil
 
@@ -163,7 +191,9 @@ end
 
 function M.updateLocal()
     if localTestRunner and coroutine.status(localTestRunner) ~= 'dead' then
-        coroutine.resume(localTestRunner)
+        if not core.isWorldPaused() then
+            coroutine.resume(localTestRunner)
+        end
     else
         localTestRunner = nil
     end
@@ -178,7 +208,9 @@ M.eventHandlers = {
         end
         localTestRunner = coroutine.create(function()
             local status, err = pcall(fn)
-            if status then err = nil end
+            if status then
+                err = nil
+            end
             core.sendGlobalEvent('localTestFinished', {name=name, errMsg=err})
         end)
     end,
diff --git a/scripts/data/morrowind_tests/.gitignore b/scripts/data/morrowind_tests/.gitignore
new file mode 100644
index 0000000000..baa5e491ee
--- /dev/null
+++ b/scripts/data/morrowind_tests/.gitignore
@@ -0,0 +1 @@
+test_workdir/*
\ No newline at end of file
diff --git a/scripts/data/morrowind_tests/builtin.omwscripts b/scripts/data/morrowind_tests/builtin.omwscripts
deleted file mode 100644
index 8b7db327c5..0000000000
--- a/scripts/data/morrowind_tests/builtin.omwscripts
+++ /dev/null
@@ -1 +0,0 @@
-# It is an empty file that overrides builtin.omwscripts and disables builtin scripts
diff --git a/scripts/data/morrowind_tests/global.lua b/scripts/data/morrowind_tests/global.lua
new file mode 100644
index 0000000000..fb7113d1b1
--- /dev/null
+++ b/scripts/data/morrowind_tests/global.lua
@@ -0,0 +1,35 @@
+local testing = require('testing_util')
+local util = require('openmw.util')
+local world = require('openmw.world')
+local core = require('openmw.core')
+local types = require('openmw.types')
+
+if not core.contentFiles.has('Morrowind.esm') then
+    error('This test requires Morrowind.esm')
+end
+
+function makeTests(modules)
+    local tests = {}
+
+    for _, moduleName in ipairs(modules) do
+        local module = require(moduleName)
+        for _, v in ipairs(module) do
+            table.insert(tests, {string.format('[%s] %s', moduleName, v[1]), v[2]})
+        end
+    end
+
+    return tests
+end
+
+local testModules = {
+    'global_issues',
+    'global_dialogues',
+    'global_mwscript',
+}
+
+return {
+    engineHandlers = {
+        onUpdate = testing.testRunner(makeTests(testModules)),
+    },
+    eventHandlers = testing.eventHandlers,
+}
diff --git a/scripts/data/morrowind_tests/global_dialogues.lua b/scripts/data/morrowind_tests/global_dialogues.lua
new file mode 100644
index 0000000000..397eb8461c
--- /dev/null
+++ b/scripts/data/morrowind_tests/global_dialogues.lua
@@ -0,0 +1,47 @@
+local testing = require('testing_util')
+local core = require('openmw.core')
+
+function iterateOverRecords(records)
+    local firstRecordId = nil
+    local lastRecordId = nil
+    local count = 0
+    for _, v in ipairs(records) do
+        firstRecordId = firstRecordId or v.id
+        lastRecordId = v.id
+        count = count + 1
+    end
+    return firstRecordId, lastRecordId, count
+end
+
+return {
+    {'Should support iteration over journal dialogues', function()
+        local firstRecordId, lastRecordId, count = iterateOverRecords(core.dialogue.journal.records)
+        testing.expectEqual(firstRecordId, '11111 test journal')
+        testing.expectEqual(lastRecordId, 'va_vamprich')
+        testing.expectEqual(count, 632)
+    end},
+    {'Should support iteration over topic dialogues', function()
+        local firstRecordId, lastRecordId, count = iterateOverRecords(core.dialogue.topic.records)
+        testing.expectEqual(firstRecordId, '1000-drake pledge')
+        testing.expectEqual(lastRecordId, 'zenithar')
+        testing.expectEqual(count, 1698)
+    end},
+    {'Should support iteration over greeting dialogues', function()
+        local firstRecordId, lastRecordId, count = iterateOverRecords(core.dialogue.greeting.records)
+        testing.expectEqual(firstRecordId, 'greeting 0')
+        testing.expectEqual(lastRecordId, 'greeting 9')
+        testing.expectEqual(count, 10)
+    end},
+    {'Should support iteration over persuasion dialogues', function()
+        local firstRecordId, lastRecordId, count = iterateOverRecords(core.dialogue.persuasion.records)
+        testing.expectEqual(firstRecordId, 'admire fail')
+        testing.expectEqual(lastRecordId, 'taunt success')
+        testing.expectEqual(count, 10)
+    end},
+    {'Should support iteration over voice dialogues', function()
+        local firstRecordId, lastRecordId, count = iterateOverRecords(core.dialogue.voice.records)
+        testing.expectEqual(firstRecordId, 'alarm')
+        testing.expectEqual(lastRecordId, 'thief')
+        testing.expectEqual(count, 8)
+    end},
+}
diff --git a/scripts/data/morrowind_tests/global_issues.lua b/scripts/data/morrowind_tests/global_issues.lua
new file mode 100644
index 0000000000..2afad085b0
--- /dev/null
+++ b/scripts/data/morrowind_tests/global_issues.lua
@@ -0,0 +1,40 @@
+local testing = require('testing_util')
+local util = require('openmw.util')
+local world = require('openmw.world')
+local core = require('openmw.core')
+local types = require('openmw.types')
+
+return {
+    {'Player should be able to walk up stairs in Ebonheart docks (#4247)', function()
+        world.players[1]:teleport('', util.vector3(19867, -102180, -79), util.transform.rotateZ(math.rad(91)))
+        coroutine.yield()
+        testing.runLocalTest(world.players[1], 'Player should be able to walk up stairs in Ebonheart docks (#4247)')
+    end},
+    {'Guard in Imperial Prison Ship should find path (#7241)', function()
+        world.players[1]:teleport('Imperial Prison Ship', util.vector3(61, -135, -105), util.transform.rotateZ(math.rad(-20)))
+        coroutine.yield()
+        testing.runLocalTest(world.players[1], 'Guard in Imperial Prison Ship should find path (#7241)')
+    end},
+    {'Should keep reference to an object moved into container (#7663)', function()
+        world.players[1]:teleport('ToddTest', util.vector3(2176, 3648, -191), util.transform.rotateZ(math.rad(0)))
+        coroutine.yield()
+        local barrel = world.createObject('barrel_01', 1)
+        local fargothRing = world.createObject('ring_keley', 1)
+        coroutine.yield()
+        testing.expectEqual(types.Container.inventory(barrel):find('ring_keley'), nil)
+        fargothRing:moveInto(types.Container.inventory(barrel))
+        coroutine.yield()
+        testing.expectEqual(fargothRing.recordId, 'ring_keley')
+        local isFargothRing = function(actual)
+            if actual == nil then
+                return 'ring_keley is not found'
+            end
+            if actual.id ~= fargothRing.id then
+                return 'found ring_keley id does not match expected: actual=' .. tostring(actual.id)
+                       .. ', expected=' .. tostring(fargothRing.id)
+            end
+            return ''
+        end
+        testing.expectThat(types.Container.inventory(barrel):find('ring_keley'), isFargothRing)
+    end},
+}
diff --git a/scripts/data/morrowind_tests/global_mwscript.lua b/scripts/data/morrowind_tests/global_mwscript.lua
new file mode 100644
index 0000000000..a4347ea66e
--- /dev/null
+++ b/scripts/data/morrowind_tests/global_mwscript.lua
@@ -0,0 +1,51 @@
+local testing = require('testing_util')
+local core = require('openmw.core')
+local world = require('openmw.world')
+
+function iterateOverVariables(variables)
+    local first = nil
+    local last = nil
+    local count = 0
+    for k, _ in pairs(variables) do
+        first = first or k
+        last = k
+        count = count + 1
+    end
+    return first, last, count
+end
+
+return {
+    {'Should support iteration over an empty set of script variables', function()
+        local mainVars = world.mwscript.getGlobalScript('main').variables
+        local first, last, count = iterateOverVariables(mainVars)
+        testing.expectEqual(first, nil)
+        testing.expectEqual(last, nil)
+        testing.expectEqual(count, 0)
+        testing.expectEqual(count, #mainVars)
+    end},
+    {'Should support iteration of script variables', function()
+        local jiub = world.getObjectByFormId(core.getFormId('Morrowind.esm', 172867))
+        local jiubVars = world.mwscript.getLocalScript(jiub).variables
+        local first, last, count = iterateOverVariables(jiubVars)
+
+        testing.expectEqual(first, 'state')
+        testing.expectEqual(last, 'timer')
+        testing.expectEqual(count, 3)
+        testing.expectEqual(count, #jiubVars)
+    end},
+    {'Should support numeric and string indices for getting and setting', function()
+        local jiub = world.getObjectByFormId(core.getFormId('Morrowind.esm', 172867))
+        local jiubVars = world.mwscript.getLocalScript(jiub).variables
+
+        testing.expectEqual(jiubVars[1], jiubVars.state)
+        testing.expectEqual(jiubVars[2], jiubVars.wandering)
+        testing.expectEqual(jiubVars[3], jiubVars.timer)
+
+        jiubVars[1] = 123;
+        testing.expectEqual(jiubVars.state, 123)
+        jiubVars.wandering = 42;
+        testing.expectEqual(jiubVars[2], 42)
+        jiubVars[3] = 1.25;
+        testing.expectEqual(jiubVars.timer, 1.25)
+    end},
+}
diff --git a/scripts/data/morrowind_tests/test.omwscripts b/scripts/data/morrowind_tests/morrowind_tests.omwscripts
similarity index 50%
rename from scripts/data/morrowind_tests/test.omwscripts
rename to scripts/data/morrowind_tests/morrowind_tests.omwscripts
index 80507392f7..7455690608 100644
--- a/scripts/data/morrowind_tests/test.omwscripts
+++ b/scripts/data/morrowind_tests/morrowind_tests.omwscripts
@@ -1,2 +1,2 @@
-GLOBAL: test.lua
+GLOBAL: global.lua
 PLAYER: player.lua
diff --git a/scripts/data/morrowind_tests/openmw.cfg b/scripts/data/morrowind_tests/openmw.cfg
index a8e18932ba..4693c186b4 100644
--- a/scripts/data/morrowind_tests/openmw.cfg
+++ b/scripts/data/morrowind_tests/openmw.cfg
@@ -7,5 +7,5 @@ data-local=test_workdir
 data=../integration_tests/testing_util
 data=.
 content=Morrowind.esm
-content=test.omwscripts
+content=morrowind_tests.omwscripts
 fallback-archive=Morrowind.bsa
diff --git a/scripts/data/morrowind_tests/player.lua b/scripts/data/morrowind_tests/player.lua
index b9e791829d..7435b49553 100644
--- a/scripts/data/morrowind_tests/player.lua
+++ b/scripts/data/morrowind_tests/player.lua
@@ -6,12 +6,12 @@ local util = require('openmw.util')
 local types = require('openmw.types')
 local nearby = require('openmw.nearby')
 
-input.setControlSwitch(input.CONTROL_SWITCH.Fighting, false)
-input.setControlSwitch(input.CONTROL_SWITCH.Jumping, false)
-input.setControlSwitch(input.CONTROL_SWITCH.Looking, false)
-input.setControlSwitch(input.CONTROL_SWITCH.Magic, false)
-input.setControlSwitch(input.CONTROL_SWITCH.VanityMode, false)
-input.setControlSwitch(input.CONTROL_SWITCH.ViewMode, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Fighting, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Jumping, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Looking, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.Magic, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.VanityMode, false)
+types.Player.setControlSwitch(self, types.Player.CONTROL_SWITCH.ViewMode, false)
 
 testing.registerLocalTest('Player should be able to walk up stairs in Ebonheart docks (#4247)',
     function()
@@ -42,8 +42,8 @@ testing.registerLocalTest('Guard in Imperial Prison Ship should find path (#7241
         }
         local status, path = nearby.findPath(src, dst, options)
         testing.expectEqual(status, nearby.FIND_PATH_STATUS.Success, 'Status')
-        testing.expectLessOrEqual((util.vector2(path[path:size()].x, path[path:size()].y) - util.vector2(dst.x, dst.y)):length(), 1, 'Last path point x, y')
-        testing.expectLessOrEqual(path[path:size()].z - dst.z, 20, 'Last path point z')
+        testing.expectLessOrEqual((util.vector2(path[#path].x, path[#path].y) - util.vector2(dst.x, dst.y)):length(), 1, 'Last path point x, y')
+        testing.expectLessOrEqual(path[#path].z - dst.z, 20, 'Last path point z')
         if agentBounds.shapeType == nearby.COLLISION_SHAPE_TYPE.Aabb then
             testing.expectThat(path, testing.elementsAreArray({
                 testing.closeToVector(util.vector3(34.29737091064453125, 806.3817138671875, 112.76610565185546875), 1e-1),
@@ -78,7 +78,7 @@ testing.registerLocalTest('Guard in Imperial Prison Ship should find path (#7241
 
 return {
     engineHandlers = {
-        onUpdate = testing.updateLocal,
+        onFrame = testing.updateLocal,
     },
     eventHandlers = testing.eventHandlers
 }
diff --git a/scripts/data/morrowind_tests/test.lua b/scripts/data/morrowind_tests/test.lua
deleted file mode 100644
index 8898420b82..0000000000
--- a/scripts/data/morrowind_tests/test.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local testing = require('testing_util')
-local util = require('openmw.util')
-local world = require('openmw.world')
-local core = require('openmw.core')
-
-if not core.contentFiles.has('Morrowind.esm') then
-    error('This test requires Morrowind.esm')
-end
-
-local tests = {
-    {'Player should be able to walk up stairs in Ebonheart docks (#4247)', function()
-        world.players[1]:teleport('', util.vector3(19867, -102180, -79), util.transform.rotateZ(math.rad(91)))
-        coroutine.yield()
-        testing.runLocalTest(world.players[1], 'Player should be able to walk up stairs in Ebonheart docks (#4247)')
-    end},
-    {'Guard in Imperial Prison Ship should find path (#7241)', function()
-        world.players[1]:teleport('Imperial Prison Ship', util.vector3(61, -135, -105), util.transform.rotateZ(math.rad(-20)))
-        coroutine.yield()
-        testing.runLocalTest(world.players[1], 'Guard in Imperial Prison Ship should find path (#7241)')
-    end},
-}
-
-return {
-    engineHandlers = {
-        onUpdate = testing.testRunner(tests),
-    },
-    eventHandlers = testing.eventHandlers,
-}
diff --git a/scripts/integration_tests.py b/scripts/integration_tests.py
index da2b9aa7fe..17f89fbe2f 100755
--- a/scripts/integration_tests.py
+++ b/scripts/integration_tests.py
@@ -13,14 +13,19 @@ parser.add_argument("--omw", type=str, default="openmw", help="path to openmw bi
 parser.add_argument(
     "--workdir", type=str, default="integration_tests_output", help="directory for temporary files and logs"
 )
+parser.add_argument("--verbose", action='store_true', help="print all openmw output")
 args = parser.parse_args()
 
 example_suite_dir = Path(args.example_suite).resolve()
-example_suite_content = example_suite_dir / "game_template" / "data" / "template.omwgame"
-if not example_suite_content.is_file():
-    sys.exit(
-        f"{example_suite_content} not found, use 'git clone https://gitlab.com/OpenMW/example-suite/' to get it"
-    )
+
+content_paths = (
+    example_suite_dir / "game_template" / "data" / "template.omwgame",
+    example_suite_dir / "example_animated_creature" / "data" / "landracer.omwaddon",
+    example_suite_dir / "the_hub" / "data" / "the_hub.omwaddon",
+)
+for path in content_paths:
+    if not path.is_file():
+        sys.exit(f"{path} is not found, use 'git clone https://gitlab.com/OpenMW/example-suite/' to get it")
 
 openmw_binary = Path(args.omw).resolve()
 if not openmw_binary.is_file():
@@ -42,15 +47,17 @@ def runTest(name):
     shutil.copyfile(example_suite_dir / "settings.cfg", config_dir / "settings.cfg")
     test_dir = tests_dir / name
     with open(config_dir / "openmw.cfg", "w", encoding="utf-8") as omw_cfg:
+        for path in content_paths:
+            omw_cfg.write(f'data="{path.parent}"\n')
         omw_cfg.writelines(
             (
-                f'data="{example_suite_dir}{os.sep}game_template{os.sep}data"\n',
                 f'data="{testing_util_dir}"\n',
                 f'data-local="{test_dir}"\n',
                 f'user-data="{userdata_dir}"\n',
-                "content=template.omwgame\n",
             )
         )
+        for path in content_paths:
+            omw_cfg.write(f'content={path.name}\n')
         if (test_dir / "openmw.cfg").exists():
             omw_cfg.write(open(test_dir / "openmw.cfg").read())
         elif (test_dir / "test.omwscripts").exists():
@@ -61,6 +68,10 @@ def runTest(name):
             "resolution x = 640\n"
             "resolution y = 480\n"
             "framerate limit = 60\n"
+            "[Game]\n"
+            "smooth animation transitions = true\n"
+            "[Lua]\n"
+            f"memory limit = {1024 * 1024 * 256}\n"
         )
     stdout_lines = list()
     exit_ok = True
@@ -78,7 +89,10 @@ def runTest(name):
     ) as process:
         quit_requested = False
         for line in process.stdout:
-            stdout_lines.append(line)
+            if args.verbose:
+                sys.stdout.write(line)
+            else:
+                stdout_lines.append(line)
             words = line.split(" ")
             if len(words) > 1 and words[1] == "E]":
                 print(line, end="")
@@ -102,7 +116,7 @@ def runTest(name):
             exit_ok = False
     if os.path.exists(config_dir / "openmw.log"):
         shutil.copyfile(config_dir / "openmw.log", work_dir / f"{name}.{time_str}.log")
-    if not exit_ok:
+    if not exit_ok and not args.verbose:
         sys.stdout.writelines(stdout_lines)
     if test_success and exit_ok:
         print(f"{name} succeeded")
@@ -116,6 +130,7 @@ for entry in tests_dir.glob("test_*"):
     if entry.is_dir():
         if not runTest(entry.name):
             status = -1
-shutil.rmtree(config_dir, ignore_errors=True)
-shutil.rmtree(userdata_dir, ignore_errors=True)
+if status == 0:
+    shutil.rmtree(config_dir, ignore_errors=True)
+    shutil.rmtree(userdata_dir, ignore_errors=True)
 exit(status)
diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index d8dab2ad1a..81739c1b57 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -7,6 +7,7 @@ set of keys over given range of frames.
 
 import click
 import collections
+import json
 import matplotlib.pyplot
 import numpy
 import operator
@@ -22,11 +23,13 @@ import termtables
               help='Print a list of all present keys in the input file.')
 @click.option('--regexp_match', is_flag=True,
               help='Use all metric that match given key. '
-                   'Can be used with stats, timeseries, commulative_timeseries, hist, hist_threshold')
+                   'Can be used with stats, timeseries, cumulative_timeseries, hist, hist_threshold')
 @click.option('--timeseries', type=str, multiple=True,
               help='Show a graph for given metric over time.')
-@click.option('--commulative_timeseries', type=str, multiple=True,
-              help='Show a graph for commulative sum of a given metric over time.')
+@click.option('--cumulative_timeseries', type=str, multiple=True,
+              help='Show a graph for cumulative sum of a given metric over time.')
+@click.option('--timeseries_delta', type=str, multiple=True,
+              help='Show a graph for delta between neighbouring frames of a given metric over time.')
 @click.option('--hist', type=str, multiple=True,
               help='Show a histogram for all values of given metric.')
 @click.option('--hist_ratio', nargs=2, type=str, multiple=True,
@@ -41,14 +44,20 @@ import termtables
                    'between Physics Actors and physics_time_taken. Format: --plot <x> <y> <function>.')
 @click.option('--stats', type=str, multiple=True,
               help='Print table with stats for a given metric containing min, max, mean, median etc.')
+@click.option('--stats_sum', is_flag=True,
+              help='Add a row to stats table for a sum per frame of all given stats metrics.')
+@click.option('--stats_sort_by', type=str, default=None, multiple=True,
+              help='Sort stats table by given fields (source, key, sum, min, max etc).')
+@click.option('--stats_table_format', type=click.Choice(['markdown', 'json']), default='markdown',
+              help='Print table with stats in given format.')
 @click.option('--precision', type=int,
               help='Format floating point numbers with given precision')
 @click.option('--timeseries_sum', is_flag=True,
               help='Add a graph to timeseries for a sum per frame of all given timeseries metrics.')
-@click.option('--commulative_timeseries_sum', is_flag=True,
-              help='Add a graph to timeseries for a sum per frame of all given commulative timeseries.')
-@click.option('--stats_sum', is_flag=True,
-              help='Add a row to stats table for a sum per frame of all given stats metrics.')
+@click.option('--cumulative_timeseries_sum', is_flag=True,
+              help='Add a graph to timeseries for a sum per frame of all given cumulative timeseries.')
+@click.option('--timeseries_delta_sum', is_flag=True,
+              help='Add a graph to timeseries for a sum per frame of all given timeseries delta.')
 @click.option('--begin_frame', type=int, default=0,
               help='Start processing from this frame.')
 @click.option('--end_frame', type=int, default=sys.maxsize,
@@ -63,13 +72,12 @@ import termtables
               help='Threshold for hist_over.')
 @click.option('--show_common_path_prefix', is_flag=True,
               help='Show common path prefix when applied to multiple files.')
-@click.option('--stats_sort_by', type=str, default=None, multiple=True,
-              help='Sort stats table by given fields (source, key, sum, min, max etc).')
 @click.argument('path', type=click.Path(), nargs=-1)
 def main(print_keys, regexp_match, timeseries, hist, hist_ratio, stdev_hist, plot, stats, precision,
          timeseries_sum, stats_sum, begin_frame, end_frame, path,
-         commulative_timeseries, commulative_timeseries_sum, frame_number_name,
-         hist_threshold, threshold_name, threshold_value, show_common_path_prefix, stats_sort_by):
+         cumulative_timeseries, cumulative_timeseries_sum, frame_number_name,
+         hist_threshold, threshold_name, threshold_value, show_common_path_prefix, stats_sort_by,
+         timeseries_delta, timeseries_delta_sum, stats_table_format):
     sources = {v: list(read_data(v)) for v in path} if path else {'stdin': list(read_data(None))}
     if not show_common_path_prefix and len(sources) > 1:
         longest_common_prefix = os.path.commonprefix(list(sources.keys()))
@@ -89,9 +97,12 @@ def main(print_keys, regexp_match, timeseries, hist, hist_ratio, stdev_hist, plo
     if timeseries:
         draw_timeseries(sources=frames, keys=matching_keys(timeseries), add_sum=timeseries_sum,
                         begin_frame=begin_frame, end_frame=end_frame)
-    if commulative_timeseries:
-        draw_commulative_timeseries(sources=frames, keys=matching_keys(commulative_timeseries), add_sum=commulative_timeseries_sum,
+    if cumulative_timeseries:
+        draw_cumulative_timeseries(sources=frames, keys=matching_keys(cumulative_timeseries), add_sum=cumulative_timeseries_sum,
                                     begin_frame=begin_frame, end_frame=end_frame)
+    if timeseries_delta:
+        draw_timeseries_delta(sources=frames, keys=matching_keys(timeseries_delta), add_sum=timeseries_delta_sum,
+                              begin_frame=begin_frame, end_frame=end_frame)
     if hist:
         draw_hists(sources=frames, keys=matching_keys(hist))
     if hist_ratio:
@@ -101,7 +112,8 @@ def main(print_keys, regexp_match, timeseries, hist, hist_ratio, stdev_hist, plo
     if plot:
         draw_plots(sources=frames, plots=plot)
     if stats:
-        print_stats(sources=frames, keys=matching_keys(stats), stats_sum=stats_sum, precision=precision, sort_by=stats_sort_by)
+        print_stats(sources=frames, keys=matching_keys(stats), stats_sum=stats_sum, precision=precision,
+                    sort_by=stats_sort_by, table_format=stats_table_format)
     if hist_threshold:
         draw_hist_threshold(sources=frames, keys=matching_keys(hist_threshold), begin_frame=begin_frame,
                             threshold_name=threshold_name, threshold_value=threshold_value)
@@ -135,18 +147,20 @@ def collect_per_frame(sources, keys, begin_frame, end_frame, frame_number_name):
     end_frame = min(end_frame, max(v[-1][frame_number_name] for v in sources.values()) + 1)
     for name in sources.keys():
         for key in keys:
-            result[name][key] = [0] * (end_frame - begin_frame)
+            result[name][key] = [None] * (end_frame - begin_frame)
     for name, frames in sources.items():
+        max_index = 0
         for frame in frames:
             number = frame[frame_number_name]
             if begin_frame <= number < end_frame:
                 index = number - begin_frame
+                max_index = max(max_index, index)
                 for key in keys:
                     if key in frame:
                         result[name][key][index] = frame[key]
-    for name in result.keys():
         for key in keys:
-            result[name][key] = numpy.array(result[name][key])
+            values = result[name][key][:max_index + 1]
+            result[name][key] = numpy.array(values)
     return result, begin_frame, end_frame
 
 
@@ -164,26 +178,44 @@ def draw_timeseries(sources, keys, add_sum, begin_frame, end_frame):
     x = numpy.array(range(begin_frame, end_frame))
     for name, frames in sources.items():
         for key in keys:
-            ax.plot(x, frames[key], label=f'{key}:{name}')
+            y = frames[key]
+            ax.plot(x[:len(y)], y, label=f'{key}:{name}')
         if add_sum:
-            ax.plot(x, numpy.sum(list(frames[k] for k in keys), axis=0), label=f'sum:{name}', linestyle='--')
+            y = sum_arrays_with_none([frames[k] for k in keys])
+            ax.plot(x[:len(y)], y, label=f'sum:{name}', linestyle='--')
     ax.grid(True)
     ax.legend()
     fig.canvas.manager.set_window_title('timeseries')
 
 
-def draw_commulative_timeseries(sources, keys, add_sum, begin_frame, end_frame):
+def draw_cumulative_timeseries(sources, keys, add_sum, begin_frame, end_frame):
     fig, ax = matplotlib.pyplot.subplots()
     x = numpy.array(range(begin_frame, end_frame))
     for name, frames in sources.items():
         for key in keys:
-            ax.plot(x, numpy.cumsum(frames[key]), label=f'{key}:{name}')
+            y = cumsum_with_none(frames[key])
+            ax.plot(x[:len(y)], y, label=f'{key}:{name}')
         if add_sum:
-            ax.plot(x, numpy.cumsum(numpy.sum(list(frames[k] for k in keys), axis=0)), label=f'sum:{name}',
-                    linestyle='--')
+            y = sum_arrays_with_none([cumsum_with_none(frames[k]) for k in keys])
+            ax.plot(x[:len(y)], y, label=f'sum:{name}', linestyle='--')
     ax.grid(True)
     ax.legend()
-    fig.canvas.manager.set_window_title('commulative_timeseries')
+    fig.canvas.manager.set_window_title('cumulative_timeseries')
+
+
+def draw_timeseries_delta(sources, keys, add_sum, begin_frame, end_frame):
+    fig, ax = matplotlib.pyplot.subplots()
+    x = numpy.array(range(begin_frame + 1, end_frame))
+    for name, frames in sources.items():
+        for key in keys:
+            y = diff_with_none(frames[key])
+            ax.plot(x[:len(y)], y, label=f'{key}:{name}')
+        if add_sum:
+            y = sum_arrays_with_none([diff_with_none(frames[k]) for k in keys])
+            ax.plot(x[:len(y)], y, label=f'sum:{name}', linestyle='--')
+    ax.grid(True)
+    ax.legend()
+    fig.canvas.manager.set_window_title('timeseries_delta')
 
 
 def draw_hists(sources, keys):
@@ -262,7 +294,7 @@ def draw_plots(sources, plots):
     fig.canvas.manager.set_window_title('plots')
 
 
-def print_stats(sources, keys, stats_sum, precision, sort_by):
+def print_stats(sources, keys, stats_sum, precision, sort_by, table_format):
     stats = list()
     for name, frames in sources.items():
         for key in keys:
@@ -272,11 +304,17 @@ def print_stats(sources, keys, stats_sum, precision, sort_by):
     metrics = list(stats[0].keys())
     if sort_by:
         stats.sort(key=operator.itemgetter(*sort_by))
-    termtables.print(
-        [list(v.values()) for v in stats],
-        header=metrics,
-        style=termtables.styles.markdown,
-    )
+    if table_format == 'markdown':
+        termtables.print(
+            [list(v.values()) for v in stats],
+            header=metrics,
+            style=termtables.styles.markdown,
+        )
+    elif table_format == 'json':
+        table = [dict(zip(metrics, row.values())) for row in stats]
+        print(json.dumps(table))
+    else:
+        print(f'Unsupported table format: {table_format}')
 
 
 def draw_hist_threshold(sources, keys, begin_frame, threshold_name, threshold_value):
@@ -323,13 +361,13 @@ def make_stats(source, key, values, precision):
         source=source,
         key=key,
         number=len(values),
-        min=fixed_float(min(values), precision),
-        max=fixed_float(max(values), precision),
-        sum=fixed_float(sum(values), precision),
-        mean=fixed_float(statistics.mean(values), precision),
-        median=fixed_float(statistics.median(values), precision),
-        stdev=fixed_float(statistics.stdev(values), precision),
-        q95=fixed_float(numpy.quantile(values, 0.95), precision),
+        min=fixed_float(min(values), precision) if values else '-',
+        max=fixed_float(max(values), precision) if values else '-',
+        sum=fixed_float(sum(values), precision) if values else '-',
+        mean=fixed_float(statistics.mean(values), precision) if values else '-',
+        median=fixed_float(statistics.median(values), precision) if values else '-',
+        stdev=fixed_float(statistics.stdev(float(v) for v in values), precision) if values else '-',
+        q95=fixed_float(numpy.quantile(values, 0.95), precision) if values else '-',
     )
 
 
@@ -340,5 +378,49 @@ def to_number(value):
         return float(value)
 
 
+def cumsum_with_none(values):
+    cumsum = None
+    result = list()
+    for v in values:
+        if v is None:
+            result.append(None)
+        elif cumsum is None:
+            cumsum = v
+            result.append(cumsum)
+        else:
+            cumsum += v
+            result.append(cumsum)
+    return numpy.array(result)
+
+
+def diff_with_none(values):
+    if len(values) < 2:
+        return numpy.array([])
+    prev = values[0]
+    result = list()
+    for v in values[1:]:
+        if prev is None:
+            result.append(v)
+            prev = v
+        elif v is None:
+            result.append(v)
+        else:
+            result.append(v - prev)
+            prev = v
+    return numpy.array(result)
+
+
+def sum_arrays_with_none(arrays):
+    size = max(len(v) for v in arrays)
+    result = list()
+    for i in range(size):
+        not_none_values = [v[i] for v in arrays if v[i] is not None]
+        if not_none_values:
+            result.append(sum(not_none_values))
+        else:
+            result.append(None)
+    return numpy.array(result)
+
+
 if __name__ == '__main__':
     main()